frontend-uniapp / Civil-Affairs-Bureau-WeChar

Commit b958631bcb36647c4b319ef7d74953a876483161

Authored by 李宇
1 parent bfe7b4fc

2

Inline Side-by-side
Showing 10 changed files with 145 additions and 20 deletions
apis/modules/oauth.js
  View file @b958631
... ... @@ -27,6 +27,10 @@ export default {
27 27 getfbgl(data){
28 28 return request.get("/funeral/related/list",data)
29 29 },
  30 + // 获取殡葬文化、普法、办事、详情
  31 + getfbgldata(data){
  32 + return request.get("/funeral/related/"+data)
  33 + },
30 34 // 获取殡葬服务机构列表
31 35 getjg(){
32 36 return request.get('/funeral/agencies/list?pageNum=1&pageSize=10');
... ...
pages/funeralculture/funeralculture.vue
  View file @b958631
... ... @@ -48,7 +48,7 @@
48 48 computed:{
49 49 pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
50 50 },
51   - onShow() {
  51 + onLoad() {
52 52 this.getfbgl();
53 53 },
54 54 methods: {
... ...
pages/funeralguide/funeralguide.vue
  View file @b958631
... ... @@ -48,7 +48,7 @@
48 48 computed:{
49 49 pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
50 50 },
51   - onShow() {
  51 + onLoad() {
52 52 this.getfbgl();
53 53 },
54 54 methods: {
... ...
pages/funerallaw/funerallaw.vue
  View file @b958631
... ... @@ -9,7 +9,7 @@
9 9 <view class="name">
10 10 <text>{{item.title}}</text>
11 11 </view>
12   - <view class="edit" @click="tzdetail(item)">
  12 + <view class="edit" @click="tzdetail(item.id)">
13 13 <image src="../../static/right2.png"></image>
14 14 </view>
15 15 </view>
... ... @@ -48,7 +48,7 @@
48 48 computed:{
49 49 pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
50 50 },
51   - onShow() {
  51 + onLoad() {
52 52 this.getfbgl();
53 53 },
54 54 methods: {
... ... @@ -71,7 +71,7 @@
71 71 tzdetail(item){
72 72 console.log("ress",item);
73 73 uni.navigateTo({
74   - url:'/pages/xxdetail/xxdetail?info=' + JSON.stringify(item)
  74 + url:'/pages/xxdetail/xxdetail?info=' + item
75 75 })
76 76 }
77 77 },
... ...
pages/funeralproblem/funeralproblem.vue
  View file @b958631
... ... @@ -48,7 +48,7 @@
48 48 computed:{
49 49 pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
50 50 },
51   - onShow() {
  51 + onLoad() {
52 52 this.getfbgl();
53 53 },
54 54 methods: {
... ...
pages/my/my.vue
  View file @b958631
... ... @@ -10,7 +10,7 @@
10 10 <view class="my-top">
11 11 <view class="user-info">
12 12 <view class="portrait" @click="tzmy">
13   - <image :src="Baseapi + user.avatar"></image>
  13 + <image :src=" user.avatar"></image>
14 14 </view>
15 15 <view class="info">
16 16 <view class="nickname">
... ...
pages/mydeathdetail/mydeathdetail.vue
  View file @b958631
... ... @@ -7,10 +7,11 @@
7 7 <view class="top">
8 8 <view class="topphone">
9 9 <view class="topphonebg"><image src="../../static/btn.png"></image></view>
10   - <view class="topphonetext"><image src="../../static/phone1.png"></image>联系电话</view>
  10 + <view @click="lxdh" class="topphonetext"><image src="../../static/phone1.png"></image>联系电话</view>
11 11 </view>
12 12 <!-- <view class="topimg"><image src="../../static/img/05.jpg" mode="widthFix"></image></view> -->
13   - <map v-if="mapshow" style="width: 100%; height: 300px;" :latitude="latitude" :longitude="longitude" :markers="covers">
  13 + <!-- <map v-if="mapshow" style="width: 100%; height: 300px;" :latitude="latitude" :longitude="longitude" :markers="covers"> -->
  14 + <map v-if="mapshow" style="width: 100%; height: 300px;" :latitude="latitude" :longitude="longitude" scale="18" :polyline="polyline">
14 15 </map>
15 16 </view>
16 17  
... ... @@ -137,6 +138,14 @@
137 138 longitude: 116.39742,
138 139 iconPath: '../../../static/location.png'
139 140 }],
  141 +
  142 + polyline: [{
  143 + points: [],
  144 + color: "#31c27c",
  145 + width: 10,
  146 + arrowLine: true,
  147 + borderWidth: 2 //线的边框宽度，还有很多参数，请看文档
  148 + }]
140 149 };
141 150 },
142 151 onPageScroll(e) {this.$refs.nv.pageScroll(e)},
... ... @@ -150,6 +159,20 @@
150 159 // this.OrderType = params.type;
151 160 },
152 161 methods:{
  162 + lxdh(){
  163 + uni.showModal({
  164 + title: '联系电话',
  165 + content: '028-36241643',
  166 + success: function(res) {
  167 + if (res.confirm) {
  168 + console.log('点击了确认')
  169 + } else {
  170 + console.log('点击了取消')
  171 + }
  172 + }
  173 + })
  174 +
  175 + },
153 176 /**
154 177 * 返回点击
155 178 */
... ... @@ -182,7 +205,11 @@
182 205 this.API.getbsdetail(id).then(res=>{
183 206 console.log(11111);
184 207 console.log("用户订单",res);
185   - this.getGps(res.data.vehicleNumber);
  208 + if(res.data.vehicleNumber != null){
  209 + this.getGps(res.data.vehicleNumber);
  210 + }else{
  211 + this.mapshow = false
  212 + }
186 213 this.number = res.data.funeralOrderDetailsInfoPo.quantityNumber
187 214 this.price = res.data.funeralOrderDetailsInfoPo.unitPrice
188 215 this.API.getspjcxx(res.data.funeralOrderDetailsInfoPo.productId).then(res1=>{
... ... @@ -209,6 +236,17 @@
209 236 "EndTime":"20231010150000",
210 237 "MinSpeed":"1",
211 238 "NeedAddress":"0",
  239 +
  240 + // "Action":"GetVehicleGpsInfo",
  241 + // "UserId":"user",
  242 + // "Pwd":"6B18CFA67F76F079B0BFFBD773DC4494",
  243 + // "Vehicles":[
  244 + // {
  245 + // "PlateNum":vehicleNumber,
  246 + // "ColorCode":"1"
  247 + // }
  248 + // ],
  249 + // "NeedAddress":0
212 250 }
213 251 }
214 252 info.request.BeginTime = BeginTime;
... ... @@ -224,6 +262,23 @@
224 262 this.longitude = res.Data[len].Longitude
225 263 this.covers[0].latitude = res.Data[len].Latitude
226 264 this.covers[0].longitude = res.Data[len].Longitude
  265 +
  266 + // this.latitude = data[0][1]
  267 + // this.longitude = data[0][0]
  268 + let points = []
  269 + res.Data.forEach(item => {
  270 + points.push({
  271 + latitude: item.Latitude,
  272 + longitude: item.Longitude
  273 + })
  274 + })
  275 + this.polyline = [{
  276 + points: points,
  277 + color: "#31c27c",
  278 + width: 4,
  279 + arrowLine: true,
  280 + // borderWidth: 2 //线的边框宽度，还有很多参数，请看文档
  281 + }]
227 282 }
228 283  
229 284 })
... ...
pages/myinfo/myinfo.vue
  View file @b958631
... ... @@ -96,7 +96,7 @@
96 96 var info = {
97 97 userId:uni.getStorageSync("USERS_KEY").userId,
98 98 nickName:this.nickName,
99   - avtar:this.fileList[0].url
  99 + avatar:this.fileList[0].url
100 100 }
101 101 this.API.xguserinfo(info).then(res=>{
102 102 console.log("修改用户信息",res);
... ...
pages/myreservationdetail/myreservationdetail.vue
  View file @b958631
... ... @@ -5,12 +5,14 @@
5 5 <view class="content">
6 6  
7 7 <view class="top">
  8 + <map v-if="mapshow" style="width: 100%; height: 300px;" :latitude="latitude" :longitude="longitude" scale="18" :polyline="polyline">
  9 + </map>
8 10 <view class="topphone">
9 11 <view class="topphonebg"><image src="../../static/btn.png"></image></view>
10   - <view class="topphonetext"><image src="../../static/phone1.png"></image>联系电话</view>
  12 + <view @click="lxdh" class="topphonetext"><image src="../../static/phone1.png"></image>联系电话</view>
11 13 </view>
12   - <map v-if="mapshow" style="width: 100%; height: 300px;" :latitude="latitude" :longitude="longitude" :markers="covers">
13   - </map>
  14 + <!-- <map v-if="mapshow" style="width: 100%; height: 300px;" :latitude="latitude" :longitude="longitude" :markers="covers"> -->
  15 +
14 16 <!-- <view class="topimg"><image src="../../static/img/05.jpg" mode="widthFix"></image></view> -->
15 17 </view>
16 18  
... ... @@ -135,6 +137,14 @@
135 137 longitude: 116.39742,
136 138 iconPath: '../../../static/location.png'
137 139 }],
  140 +
  141 + polyline: [{
  142 + points: [],
  143 + color: "#31c27c",
  144 + width: 10,
  145 + arrowLine: true,
  146 + borderWidth: 2 //线的边框宽度，还有很多参数，请看文档
  147 + }]
138 148 };
139 149 },
140 150 onPageScroll(e) {this.$refs.nv.pageScroll(e)},
... ... @@ -147,6 +157,20 @@
147 157 // this.OrderType = params.type;
148 158 },
149 159 methods:{
  160 + lxdh(){
  161 + uni.showModal({
  162 + title: '联系电话',
  163 + content: '028-36241643',
  164 + success: function(res) {
  165 + if (res.confirm) {
  166 + console.log('点击了确认')
  167 + } else {
  168 + console.log('点击了取消')
  169 + }
  170 + }
  171 + })
  172 +
  173 + },
150 174 /**
151 175 * 返回点击
152 176 */
... ... @@ -179,12 +203,18 @@
179 203 this.API.getbsdetail(id).then(res=>{
180 204 console.log(11111);
181 205 console.log("用户订单",res);
182   - this.getGps(res.data.vehicleNumber);
  206 + // this.getGps(res.data.vehicleNumber);
  207 + if(res.data.vehicleNumber != ''){
  208 + this.getGps(res.data.vehicleNumber);
  209 + }else{
  210 + this.mapshow = false
  211 + }
183 212 this.info = res.data
184   - this.number = res.data.funeralOrderDetailsInfoPo.quantityNumber
185   - this.price = res.data.funeralOrderDetailsInfoPo.unitPrice
  213 + // this.number = res.data.funeralOrderDetailsInfoPo.quantityNumber
  214 + // this.price = res.data.funeralOrderDetailsInfoPo.unitPrice
186 215 this.hhtime = res.data.funeralCremationScheduledInfoPo.scheduledCremationTime
187 216 this.hhdate = res.data.funeralCremationScheduledInfoPo.scheduledCremationDate
  217 + console.log("火化时间日期",this.hhtime,this.hhdate);
188 218 })
189 219 },
190 220 // 获取gps定位
... ... @@ -199,12 +229,24 @@
199 229 "Action":"GetVehicleTrackData",
200 230 "UserId":"user",
201 231 "Pwd":"6B18CFA67F76F079B0BFFBD773DC4494",
  232 + // "PlateNum":"川ZVN180",
202 233 "PlateNum":vehicleNumber,
203 234 "ColorCode":"0",
204 235 "BeginTime":"20231010090000",
205 236 "EndTime":"20231010150000",
206 237 "MinSpeed":"1",
207 238 "NeedAddress":"0",
  239 +
  240 + // "Action":"GetVehicleGpsInfo",
  241 + // "UserId":"user",
  242 + // "Pwd":"6B18CFA67F76F079B0BFFBD773DC4494",
  243 + // "Vehicles":[
  244 + // {
  245 + // "PlateNum":vehicleNumber,
  246 + // "ColorCode":"1"
  247 + // }
  248 + // ],
  249 + // "NeedAddress":0
208 250 }
209 251 }
210 252 info.request.BeginTime = BeginTime;
... ... @@ -220,6 +262,21 @@
220 262 this.longitude = res.Data[len].Longitude
221 263 this.covers[0].latitude = res.Data[len].Latitude
222 264 this.covers[0].longitude = res.Data[len].Longitude
  265 +
  266 + let points = []
  267 + res.Data.forEach(item => {
  268 + points.push({
  269 + latitude: item.Latitude,
  270 + longitude: item.Longitude
  271 + })
  272 + })
  273 + this.polyline = [{
  274 + points: points,
  275 + color: "#31c27c",
  276 + width: 4,
  277 + arrowLine: true,
  278 + // borderWidth: 2 //线的边框宽度，还有很多参数，请看文档
  279 + }]
223 280 }
224 281  
225 282 })
... ...
pages/xxdetail/xxdetail.vue
  View file @b958631
... ... @@ -49,11 +49,20 @@
49 49 },
50 50 onLoad(item) {
51 51 console.log("res",item);
52   - this.info = JSON.parse(item.info)
53   - this.nvConfig.title = this.info.title + "详情页"
  52 +
  53 + this.gain(item.info)
  54 + // this.info = JSON.parse(item.info)
  55 + // this.nvConfig.title = this.info.title + "详情页"
54 56 },
55 57 methods: {
56   -
  58 + gain(e) {
  59 + this.API.getfbgldata(e).then(res => {
  60 + console.log(res);
  61 + this.info = res.data
  62 + // this.info = JSON.parse(item.info)
  63 + this.nvConfig.title = this.info.title + "详情页"
  64 + })
  65 + },
57 66 }
58 67 }
59 68 </script>
... ...