Commit 0d8fdbbf225f7728bcb9612987bbeba2d5a34454
1 parent
3eb65c13
gps修改
Showing
13 changed files
with
253 additions
and
121 deletions
.DS_Store
No preview for this file type
common/config.js
manifest.json
pages/funeral/funeral.vue
| @@ -110,29 +110,8 @@ | @@ -110,29 +110,8 @@ | ||
| 110 | }, | 110 | }, |
| 111 | onLoad() { | 111 | onLoad() { |
| 112 | uni.hideTabBar(); | 112 | uni.hideTabBar(); |
| 113 | - this.getGps(); | ||
| 114 | }, | 113 | }, |
| 115 | methods: { | 114 | methods: { |
| 116 | - // 获取gps定位 | ||
| 117 | - getGps(){ | ||
| 118 | - var info = { | ||
| 119 | - request:{ | ||
| 120 | - "Action":"GetVehicleTrackData", | ||
| 121 | - "UserId":"user", | ||
| 122 | - "Pwd":"6B18CFA67F76F079B0BFFBD773DC4494", | ||
| 123 | - "PlateNum":"川Zyb907", | ||
| 124 | - "ColorCode":"0", | ||
| 125 | - "BeginTime":"20231010090000", | ||
| 126 | - "EndTime":"20231010150000", | ||
| 127 | - "MinSpeed":"1", | ||
| 128 | - "NeedAddress":"0", | ||
| 129 | - } | ||
| 130 | - } | ||
| 131 | - info.request = JSON.stringify(info.request) | ||
| 132 | - this.API.getGps(info).then(res=>{ | ||
| 133 | - console.log("gps",res); | ||
| 134 | - }) | ||
| 135 | - }, | ||
| 136 | home() { | 115 | home() { |
| 137 | uni.navigateTo({ | 116 | uni.navigateTo({ |
| 138 | url: '/pages/home/home' | 117 | url: '/pages/home/home' |
pages/funeralcremation/funeralcremation.vue
| @@ -172,11 +172,12 @@ | @@ -172,11 +172,12 @@ | ||
| 172 | onLoad(params) { | 172 | onLoad(params) { |
| 173 | this.OrderType = params.type; | 173 | this.OrderType = params.type; |
| 174 | var now = new Date(); | 174 | var now = new Date(); |
| 175 | - this.nowdate = now | ||
| 176 | - this.from.scheduledCremationDate = now | 175 | + this.nowdate = this.timestampToTime(now) |
| 176 | + this.from.scheduledCremationDate = this.timestampToTime(now) | ||
| 177 | + console.log("时间",this.from.scheduledCremationDate); | ||
| 177 | // this.gethhsjsl(this.parseTime(now)); | 178 | // this.gethhsjsl(this.parseTime(now)); |
| 178 | this.getbsinfo(); | 179 | this.getbsinfo(); |
| 179 | - this.zxhhllist(now); | 180 | + this.zxhhllist(this.timestampToTime(now)); |
| 180 | }, | 181 | }, |
| 181 | onReady() { | 182 | onReady() { |
| 182 | this.$nextTick(() => { | 183 | this.$nextTick(() => { |
| @@ -208,8 +209,20 @@ | @@ -208,8 +209,20 @@ | ||
| 208 | }, 2000); | 209 | }, 2000); |
| 209 | }, | 210 | }, |
| 210 | methods:{ | 211 | methods:{ |
| 212 | + timestampToTime(timestamp) { | ||
| 213 | + timestamp = timestamp ? timestamp : null; | ||
| 214 | + let date = new Date(timestamp);//时间戳为10位需*1000,时间戳为13位的话不需乘1000 | ||
| 215 | + let Y = date.getFullYear() + '-'; | ||
| 216 | + let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'; | ||
| 217 | + let D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' '; | ||
| 218 | + let h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':'; | ||
| 219 | + let m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':'; | ||
| 220 | + let s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds(); | ||
| 221 | + return Y + M + D; | ||
| 222 | + }, | ||
| 211 | // 火化炉列表获取 | 223 | // 火化炉列表获取 |
| 212 | zxhhllist(date){ | 224 | zxhhllist(date){ |
| 225 | + console.log("初始化时间",date); | ||
| 213 | this.API.zxhhllist().then(res=>{ | 226 | this.API.zxhhllist().then(res=>{ |
| 214 | console.log("火化炉",res); | 227 | console.log("火化炉",res); |
| 215 | this.columns = []; | 228 | this.columns = []; |
| @@ -280,7 +293,7 @@ | @@ -280,7 +293,7 @@ | ||
| 280 | gethhsjsl(times){ | 293 | gethhsjsl(times){ |
| 281 | this.API.gethhsjsl().then(res=>{ | 294 | this.API.gethhsjsl().then(res=>{ |
| 282 | console.log("获取预约时间和数量",res); | 295 | console.log("获取预约时间和数量",res); |
| 283 | - console.log("时间",times); | 296 | + console.log("时间111",times); |
| 284 | this.sjlist = [] | 297 | this.sjlist = [] |
| 285 | for(let i = 0;i < res.data.length;i++){ | 298 | for(let i = 0;i < res.data.length;i++){ |
| 286 | if(res.data[i].DateStr == times){ | 299 | if(res.data[i].DateStr == times){ |
| @@ -327,10 +340,14 @@ | @@ -327,10 +340,14 @@ | ||
| 327 | console.log("火化炉id",this.hhlid); | 340 | console.log("火化炉id",this.hhlid); |
| 328 | this.zxhqhhltimelist(this.nowdate); | 341 | this.zxhqhhltimelist(this.nowdate); |
| 329 | this.hhlshow = false; | 342 | this.hhlshow = false; |
| 343 | + this.sjlist = [] | ||
| 330 | this.from.cremationFurnaceInfo = e.value[0]; | 344 | this.from.cremationFurnaceInfo = e.value[0]; |
| 331 | }, | 345 | }, |
| 332 | // 最新获取时间火化炉时间 | 346 | // 最新获取时间火化炉时间 |
| 333 | zxhqhhltimelist(time){ | 347 | zxhqhhltimelist(time){ |
| 348 | + // time = time + '' | ||
| 349 | + var reg = /[\t\r\f\n\s]*/g; | ||
| 350 | + time = time.replace(reg,''); | ||
| 334 | var infos = { | 351 | var infos = { |
| 335 | furnaceId:this.hhlid, | 352 | furnaceId:this.hhlid, |
| 336 | useStatus:"2", | 353 | useStatus:"2", |
| @@ -339,17 +356,30 @@ | @@ -339,17 +356,30 @@ | ||
| 339 | this.API.gethhsjsl(infos).then(res=>{ | 356 | this.API.gethhsjsl(infos).then(res=>{ |
| 340 | console.log("最新时间列表",res); | 357 | console.log("最新时间列表",res); |
| 341 | this.sjlist = [] | 358 | this.sjlist = [] |
| 359 | + console.log("选择的时间",time); | ||
| 360 | + | ||
| 342 | for(let i = 0;i < res.data.length;i++){ | 361 | for(let i = 0;i < res.data.length;i++){ |
| 362 | + console.log("时间是否正确",res.data[i].dateStr == time,res.data[i].dateStr,typeof(time),typeof(res.data[i].dateStr)); | ||
| 363 | + // if(res.data[i].dateStr === time){ | ||
| 364 | + // for(let s = 0;s < res.data[i].timeAndTotalList.length;s++){ | ||
| 365 | + // var info = { | ||
| 366 | + // time:"", | ||
| 367 | + // status:false | ||
| 368 | + // } | ||
| 369 | + // info.time = res.data[i].timeAndTotalList[s].timePeriod; | ||
| 370 | + // if(s == 0){ | ||
| 371 | + // info.status = true | ||
| 372 | + // this.from.scheduledCremationTime = res.data[i].timeAndTotalList[s].timePeriod; | ||
| 373 | + // } | ||
| 374 | + // this.sjlist.push(info) | ||
| 375 | + // } | ||
| 376 | + // } | ||
| 343 | for(let s = 0;s < res.data[i].timeAndTotalList.length;s++){ | 377 | for(let s = 0;s < res.data[i].timeAndTotalList.length;s++){ |
| 344 | var info = { | 378 | var info = { |
| 345 | time:"", | 379 | time:"", |
| 346 | status:false | 380 | status:false |
| 347 | } | 381 | } |
| 348 | info.time = res.data[i].timeAndTotalList[s].timePeriod; | 382 | info.time = res.data[i].timeAndTotalList[s].timePeriod; |
| 349 | - // if(s == 0){ | ||
| 350 | - // info.status = true | ||
| 351 | - // this.from.scheduledCremationTime = res.data[i].timeAndTotalList[s].timePeriod; | ||
| 352 | - // } | ||
| 353 | this.sjlist.push(info) | 383 | this.sjlist.push(info) |
| 354 | } | 384 | } |
| 355 | } | 385 | } |
| @@ -380,6 +410,7 @@ | @@ -380,6 +410,7 @@ | ||
| 380 | return | 410 | return |
| 381 | } | 411 | } |
| 382 | this.from.obituaryOrderNumber = this.bspersoninfo.obituaryOrderNumber | 412 | this.from.obituaryOrderNumber = this.bspersoninfo.obituaryOrderNumber |
| 413 | + this.from.furnaceId = this.hhlid | ||
| 383 | console.log("from",this.from); | 414 | console.log("from",this.from); |
| 384 | // return | 415 | // return |
| 385 | this.API.hhlyy(this.from).then(res=>{ | 416 | this.API.hhlyy(this.from).then(res=>{ |
pages/funeralreport/funeralreport.vue
| @@ -66,7 +66,7 @@ | @@ -66,7 +66,7 @@ | ||
| 66 | <view class="info-box"> | 66 | <view class="info-box"> |
| 67 | <view class="info-box-list"> | 67 | <view class="info-box-list"> |
| 68 | <view class="info-box-width"> | 68 | <view class="info-box-width"> |
| 69 | - <view><input v-model="from.deathCase" class="input-text" type="text" placeholder="请输入" placeholder-class="inputtext" /></view> | 69 | + <view @click="swyyshow = true"><input disabled v-model="from.deathCase" class="input-text" type="text" placeholder="请选择" placeholder-class="inputtext" /></view> |
| 70 | <view class="info-box-small">死亡原因</view> | 70 | <view class="info-box-small">死亡原因</view> |
| 71 | </view> | 71 | </view> |
| 72 | <view class="info-box-width" @click="timeshow = true"> | 72 | <view class="info-box-width" @click="timeshow = true"> |
| @@ -74,6 +74,7 @@ | @@ -74,6 +74,7 @@ | ||
| 74 | <view class="info-box-small">死亡日期</view> | 74 | <view class="info-box-small">死亡日期</view> |
| 75 | </view> | 75 | </view> |
| 76 | </view> | 76 | </view> |
| 77 | + <u-picker :show="swyyshow" @confirm="swyyconfirm" @close="swyyclose" :columns="swyycolumns"></u-picker> | ||
| 77 | </view> | 78 | </view> |
| 78 | </view> | 79 | </view> |
| 79 | <u-calendar minDate="2023-11-01" maxDate="3050-12-01" :show="timeshow" @confirm="timeconfirm" @close="timeclose"></u-calendar> | 80 | <u-calendar minDate="2023-11-01" maxDate="3050-12-01" :show="timeshow" @confirm="timeconfirm" @close="timeclose"></u-calendar> |
| @@ -181,6 +182,10 @@ | @@ -181,6 +182,10 @@ | ||
| 181 | ], | 182 | ], |
| 182 | timeshow:false, | 183 | timeshow:false, |
| 183 | jytimeshow:false, | 184 | jytimeshow:false, |
| 185 | + swyycolumns:[ | ||
| 186 | + ['自然死亡','疾病死亡','意外死亡'] | ||
| 187 | + ], | ||
| 188 | + swyyshow:false, | ||
| 184 | }; | 189 | }; |
| 185 | }, | 190 | }, |
| 186 | onPageScroll(e) {this.$refs.nv.pageScroll(e)}, | 191 | onPageScroll(e) {this.$refs.nv.pageScroll(e)}, |
| @@ -217,8 +222,9 @@ | @@ -217,8 +222,9 @@ | ||
| 217 | this.fileList.splice(event.index, 1) | 222 | this.fileList.splice(event.index, 1) |
| 218 | }, | 223 | }, |
| 219 | funeralreportmove(){ | 224 | funeralreportmove(){ |
| 225 | + // this.from.deceasedSex = this.sex | ||
| 220 | var info = JSON.stringify(this.from) | 226 | var info = JSON.stringify(this.from) |
| 221 | - console.log("提交的数据",this.from); | 227 | + console.log("提交的数据",this.from,this.sex); |
| 222 | // return | 228 | // return |
| 223 | // deceasedName deceasedAge idCardNumber ethnicity contactName contactPhone deathCase deathdate sex | 229 | // deceasedName deceasedAge idCardNumber ethnicity contactName contactPhone deathCase deathdate sex |
| 224 | if(this.from.deceasedName == '' || this.from.deceasedAge == '' || this.from.idCardNumber == '' || this.from.ethnicity == '' || this.from.contactName == '' || this.from.contactPhone == '' || this.from.deathCase == '' || this.from.deathdate == '请选择' || this.sex == '请选择'){ | 230 | if(this.from.deceasedName == '' || this.from.deceasedAge == '' || this.from.idCardNumber == '' || this.from.ethnicity == '' || this.from.contactName == '' || this.from.contactPhone == '' || this.from.deathCase == '' || this.from.deathdate == '请选择' || this.sex == '请选择'){ |
| @@ -240,6 +246,7 @@ | @@ -240,6 +246,7 @@ | ||
| 240 | xbconfirm(e){ | 246 | xbconfirm(e){ |
| 241 | this.xbshow = false | 247 | this.xbshow = false |
| 242 | this.sex = e.value[0] | 248 | this.sex = e.value[0] |
| 249 | + this.from.deceasedSex = e.value[0] | ||
| 243 | console.log("性别选择",e); | 250 | console.log("性别选择",e); |
| 244 | }, | 251 | }, |
| 245 | // 性别取消选择 | 252 | // 性别取消选择 |
| @@ -263,6 +270,17 @@ | @@ -263,6 +270,17 @@ | ||
| 263 | timeclose(){ | 270 | timeclose(){ |
| 264 | this.timeshow = false | 271 | this.timeshow = false |
| 265 | }, | 272 | }, |
| 273 | + // 死亡原因确认 | ||
| 274 | + swyyconfirm(e){ | ||
| 275 | + console.log("e",e); | ||
| 276 | + this.from.deathCase = e.value[0] | ||
| 277 | + this.swyyshow = false | ||
| 278 | + }, | ||
| 279 | + // 死亡原因取消 | ||
| 280 | + swyyclose(){ | ||
| 281 | + this.swyyshow = false | ||
| 282 | + } | ||
| 283 | + | ||
| 266 | } | 284 | } |
| 267 | } | 285 | } |
| 268 | </script> | 286 | </script> |
pages/funeralreportmove/funeralreportmove.vue
| @@ -3,7 +3,6 @@ | @@ -3,7 +3,6 @@ | ||
| 3 | <pyh-nv ref="nv" :config="nvConfig"></pyh-nv> | 3 | <pyh-nv ref="nv" :config="nvConfig"></pyh-nv> |
| 4 | <view class="listBox" :style="{'padding-top':(pageTop+'px')}"> | 4 | <view class="listBox" :style="{'padding-top':(pageTop+'px')}"> |
| 5 | <view class="content"> | 5 | <view class="content"> |
| 6 | - | ||
| 7 | <view class="message-list"> | 6 | <view class="message-list"> |
| 8 | <view class="titleall-box"> | 7 | <view class="titleall-box"> |
| 9 | <view class="titleall-left"><view class="titleall-left-line"></view>遗体接运信息<text style="color: red;">(必填)</text></view> | 8 | <view class="titleall-left"><view class="titleall-left-line"></view>遗体接运信息<text style="color: red;">(必填)</text></view> |
| @@ -22,7 +21,7 @@ | @@ -22,7 +21,7 @@ | ||
| 22 | <view class="info-box-list"> | 21 | <view class="info-box-list"> |
| 23 | <view class="info-box-width width100"> | 22 | <view class="info-box-width width100"> |
| 24 | <view @click="timeshow = true"> | 23 | <view @click="timeshow = true"> |
| 25 | - {{accessTime}} | 24 | + <label>{{accessTime}}</label> |
| 26 | </view> | 25 | </view> |
| 27 | <view class="info-box-small">接运时间</view> | 26 | <view class="info-box-small">接运时间</view> |
| 28 | </view> | 27 | </view> |
| @@ -41,7 +40,7 @@ | @@ -41,7 +40,7 @@ | ||
| 41 | <u-datetime-picker | 40 | <u-datetime-picker |
| 42 | :show="timeshow" | 41 | :show="timeshow" |
| 43 | mode="datetime" | 42 | mode="datetime" |
| 44 | - v-model="accessTime" | 43 | + v-model="accessTimeby" |
| 45 | @confirm="xztime" | 44 | @confirm="xztime" |
| 46 | @cancel="qxtime" | 45 | @cancel="qxtime" |
| 47 | ></u-datetime-picker> | 46 | ></u-datetime-picker> |
| @@ -86,6 +85,7 @@ | @@ -86,6 +85,7 @@ | ||
| 86 | ], | 85 | ], |
| 87 | 86 | ||
| 88 | accessTime:"请选择", | 87 | accessTime:"请选择", |
| 88 | + accessTimeby:2, | ||
| 89 | timeshow:false, | 89 | timeshow:false, |
| 90 | remarks:"", | 90 | remarks:"", |
| 91 | info:{} | 91 | info:{} |
| @@ -108,8 +108,9 @@ | @@ -108,8 +108,9 @@ | ||
| 108 | methods:{ | 108 | methods:{ |
| 109 | xztime(value){ | 109 | xztime(value){ |
| 110 | this.timeshow = false | 110 | this.timeshow = false |
| 111 | - console.log("value",value); | ||
| 112 | - this.accessTime = this.timestampToTime(value.value) | 111 | + var that = this; |
| 112 | + let selectTime =this.timestampToTime(value.value); | ||
| 113 | + that.accessTime = selectTime; | ||
| 113 | }, | 114 | }, |
| 114 | qxtime(){ | 115 | qxtime(){ |
| 115 | this.timeshow = false | 116 | this.timeshow = false |
| @@ -164,12 +165,7 @@ | @@ -164,12 +165,7 @@ | ||
| 164 | areaclose(){ | 165 | areaclose(){ |
| 165 | this.areashow = false | 166 | this.areashow = false |
| 166 | }, | 167 | }, |
| 167 | - // 时间选择 | ||
| 168 | - timeconfirm(e){ | ||
| 169 | - console.log(e); | ||
| 170 | - this.accessTime = e[0] | ||
| 171 | - this.timeshow = false; | ||
| 172 | - }, | 168 | + |
| 173 | timeclose(){ | 169 | timeclose(){ |
| 174 | this.timeshow = false | 170 | this.timeshow = false |
| 175 | }, | 171 | }, |
pages/home/home.vue
| @@ -21,7 +21,7 @@ | @@ -21,7 +21,7 @@ | ||
| 21 | </view> | 21 | </view> |
| 22 | <view class="list" @click="minor"> | 22 | <view class="list" @click="minor"> |
| 23 | <view><image src="/static/new/2.png" mode="heightFix"></image></view> | 23 | <view><image src="/static/new/2.png" mode="heightFix"></image></view> |
| 24 | - <view class="text">未成年保护</view> | 24 | + <view class="text">个案登记</view> |
| 25 | </view> | 25 | </view> |
| 26 | <view class="list" @click="map"> | 26 | <view class="list" @click="map"> |
| 27 | <view><image src="/static/new/3.png" mode="heightFix"></image></view> | 27 | <view><image src="/static/new/3.png" mode="heightFix"></image></view> |
| @@ -33,8 +33,8 @@ | @@ -33,8 +33,8 @@ | ||
| 33 | </view> | 33 | </view> |
| 34 | <view class="list" @click="lmpsb"> | 34 | <view class="list" @click="lmpsb"> |
| 35 | <view><image src="/static/new/image 1.png" mode="heightFix"></image></view> | 35 | <view><image src="/static/new/image 1.png" mode="heightFix"></image></view> |
| 36 | - <!-- <view class="text">路门牌上报</view> --> | ||
| 37 | - <view class="text">个案接报登记</view> | 36 | + <view class="text">路门牌上报</view> |
| 37 | + <!-- <view class="text">个案接报登记</view> --> | ||
| 38 | </view> | 38 | </view> |
| 39 | <view class="list" @click="toponym"> | 39 | <view class="list" @click="toponym"> |
| 40 | <view><image src="/static/new/image 2.png" mode="heightFix"></image></view> | 40 | <view><image src="/static/new/image 2.png" mode="heightFix"></image></view> |
| @@ -139,30 +139,68 @@ | @@ -139,30 +139,68 @@ | ||
| 139 | }, | 139 | }, |
| 140 | lmpsb(){ | 140 | lmpsb(){ |
| 141 | uni.navigateTo({ | 141 | uni.navigateTo({ |
| 142 | - // url:'/pages/mapdoorplate/mapdoorplate' | ||
| 143 | - url: '/pages/receiptRegistration/receiptRegistration' | 142 | + url:'/pages/mapdoorplate/mapdoorplate' |
| 143 | + // url: '/pages/receiptRegistration/receiptRegistration' | ||
| 144 | }) | 144 | }) |
| 145 | }, | 145 | }, |
| 146 | - minor() { | ||
| 147 | - uni.navigateTo({ | ||
| 148 | - url: '/pages/minor/minor' | 146 | + minor() { |
| 147 | + uni.navigateTo({ | ||
| 148 | + // url:'/pages/mapdoorplate/mapdoorplate' | ||
| 149 | + url: '/pages/receiptRegistration/receiptRegistration' | ||
| 149 | }) | 150 | }) |
| 151 | + // uni.navigateTo({ | ||
| 152 | + // url: '/pages/minor/minor' | ||
| 153 | + // }) | ||
| 150 | }, | 154 | }, |
| 151 | journalism() { | 155 | journalism() { |
| 152 | uni.navigateTo({ | 156 | uni.navigateTo({ |
| 153 | url: '/pages/journalism/journalism' | 157 | url: '/pages/journalism/journalism' |
| 154 | }) | 158 | }) |
| 159 | + }, | ||
| 160 | + // 获取用户信息 | ||
| 161 | + hquserinfo(){ | ||
| 162 | + var info = { | ||
| 163 | + userId:uni.getStorageSync("USERS_KEY").userId, | ||
| 164 | + } | ||
| 165 | + this.API.hquserinfo(info).then(res=>{ | ||
| 166 | + console.log("获取用户信息",res); | ||
| 167 | + this.user.nickName = res.data.nickName; | ||
| 168 | + this.user.avatar = res.data.avatar | ||
| 169 | + this.user.deptId = res.data.deptId | ||
| 170 | + console.log("信息",this.user); | ||
| 171 | + }) | ||
| 155 | }, | 172 | }, |
| 156 | funeral() { | 173 | funeral() { |
| 157 | - if(uni.getStorageSync('userjs') != '普通用户'){ | ||
| 158 | - uni.switchTab({ | ||
| 159 | - url: '/pages/my/my' | ||
| 160 | - }) | ||
| 161 | - }else{ | ||
| 162 | - uni.switchTab({ | ||
| 163 | - url: '/pages/funeral/funeral' | ||
| 164 | - }) | ||
| 165 | - } | 174 | + var info = { |
| 175 | + userId:uni.getStorageSync("USERS_KEY").userId, | ||
| 176 | + } | ||
| 177 | + this.API.hquserinfo(info).then(res=>{ | ||
| 178 | + console.log("获取用户信息",res); | ||
| 179 | + console.log("信息1",res.data.roles[0].roleName,uni.getStorageSync('userjs')); | ||
| 180 | + if(res.data.roles[0].roleName != uni.getStorageSync('userjs')){ | ||
| 181 | + uni.reLaunch({ | ||
| 182 | + url: '/pages/login/login' | ||
| 183 | + }); | ||
| 184 | + return | ||
| 185 | + } | ||
| 186 | + if(uni.getStorageSync('userjs') == null || uni.getStorageSync('userjs') == undefined){ | ||
| 187 | + uni.reLaunch({ | ||
| 188 | + url: '/pages/login/login' | ||
| 189 | + }); | ||
| 190 | + return | ||
| 191 | + } | ||
| 192 | + | ||
| 193 | + if(uni.getStorageSync('userjs') != '普通用户'){ | ||
| 194 | + uni.switchTab({ | ||
| 195 | + url: '/pages/my/my' | ||
| 196 | + }) | ||
| 197 | + }else{ | ||
| 198 | + uni.switchTab({ | ||
| 199 | + url: '/pages/funeral/funeral' | ||
| 200 | + }) | ||
| 201 | + } | ||
| 202 | + }) | ||
| 203 | + | ||
| 166 | }, | 204 | }, |
| 167 | map() { | 205 | map() { |
| 168 | uni.navigateTo({ | 206 | uni.navigateTo({ |
pages/my/my.vue
| @@ -10,7 +10,7 @@ | @@ -10,7 +10,7 @@ | ||
| 10 | <view class="my-top"> | 10 | <view class="my-top"> |
| 11 | <view class="user-info"> | 11 | <view class="user-info"> |
| 12 | <view class="portrait" @click="tzmy"> | 12 | <view class="portrait" @click="tzmy"> |
| 13 | - <image :src="Baseapi + user.avatar"></image> | 13 | + <image :src="user.avatar"></image> |
| 14 | </view> | 14 | </view> |
| 15 | <view class="info"> | 15 | <view class="info"> |
| 16 | <view class="nickname"> | 16 | <view class="nickname"> |
| @@ -18,54 +18,12 @@ | @@ -18,54 +18,12 @@ | ||
| 18 | </view> | 18 | </view> |
| 19 | <view class="rank"> | 19 | <view class="rank"> |
| 20 | <image src="../../static/id.png"></image> | 20 | <image src="../../static/id.png"></image> |
| 21 | - <text>{{user.roleIds}}</text> | 21 | + <text>{{user.userId}}</text> |
| 22 | <!-- <image class="rank-img" src="../../static/copy.png"></image> --> | 22 | <!-- <image class="rank-img" src="../../static/copy.png"></image> --> |
| 23 | </view> | 23 | </view> |
| 24 | </view> | 24 | </view> |
| 25 | </view> | 25 | </view> |
| 26 | </view> | 26 | </view> |
| 27 | - | ||
| 28 | - <!-- <view class="order-content"> | ||
| 29 | - <view class="titleall-box"> | ||
| 30 | - <view class="titleall-left"><view class="titleall-left-line"></view>商城订单</view> | ||
| 31 | - <view class="titleall-right" @click="onSkipOrder(0)">全部订单<image src="../../static/right1.png"></image></view> | ||
| 32 | - </view> | ||
| 33 | - <view class="order-info"> | ||
| 34 | - <view class="list" @click="onSkipOrder(1)"> | ||
| 35 | - <view class="icon"> | ||
| 36 | - <image src="../../static/my1.png"></image> | ||
| 37 | - </view> | ||
| 38 | - <view class="title"> | ||
| 39 | - <text>待付款</text> | ||
| 40 | - </view> | ||
| 41 | - </view> | ||
| 42 | - <view class="list" @click="onSkipOrder(2)"> | ||
| 43 | - <view class="icon"> | ||
| 44 | - <image src="../../static/my2.png"></image> | ||
| 45 | - </view> | ||
| 46 | - <view class="title"> | ||
| 47 | - <text>已付款</text> | ||
| 48 | - </view> | ||
| 49 | - </view> | ||
| 50 | - <view class="list" @click="onSkipOrder(2)"> | ||
| 51 | - <view class="icon"> | ||
| 52 | - <image src="../../static/my3.png"></image> | ||
| 53 | - </view> | ||
| 54 | - <view class="title"> | ||
| 55 | - <text>已完成</text> | ||
| 56 | - </view> | ||
| 57 | - </view> | ||
| 58 | - <view class="list" @click="onSkipOrder(3)"> | ||
| 59 | - <view class="icon"> | ||
| 60 | - <image src="../../static/my4.png"></image> | ||
| 61 | - </view> | ||
| 62 | - <view class="title"> | ||
| 63 | - <text>待评价</text> | ||
| 64 | - </view> | ||
| 65 | - </view> | ||
| 66 | - </view> | ||
| 67 | - </view> --> | ||
| 68 | - | ||
| 69 | <view class="message-list"> | 27 | <view class="message-list"> |
| 70 | <view class="titleall-box"> | 28 | <view class="titleall-box"> |
| 71 | <view class="titleall-left"><view class="titleall-left-line"></view>我的服务</view> | 29 | <view class="titleall-left"><view class="titleall-left-line"></view>我的服务</view> |
| @@ -193,7 +151,7 @@ | @@ -193,7 +151,7 @@ | ||
| 193 | }, | 151 | }, |
| 194 | user:{ | 152 | user:{ |
| 195 | nickName:"", | 153 | nickName:"", |
| 196 | - deptId:"", | 154 | + userId:"", |
| 197 | avatar:"" | 155 | avatar:"" |
| 198 | }, | 156 | }, |
| 199 | sjshow:false, | 157 | sjshow:false, |
| @@ -245,7 +203,7 @@ | @@ -245,7 +203,7 @@ | ||
| 245 | console.log("获取用户信息",res); | 203 | console.log("获取用户信息",res); |
| 246 | this.user.nickName = res.data.nickName; | 204 | this.user.nickName = res.data.nickName; |
| 247 | this.user.avatar = res.data.avatar | 205 | this.user.avatar = res.data.avatar |
| 248 | - this.user.deptId = res.data.deptId | 206 | + this.user.userId = res.data.userId |
| 249 | console.log("信息",this.user); | 207 | console.log("信息",this.user); |
| 250 | }) | 208 | }) |
| 251 | }, | 209 | }, |
pages/mydeathdetail/mydeathdetail.vue
| @@ -7,10 +7,11 @@ | @@ -7,10 +7,11 @@ | ||
| 7 | <view class="top"> | 7 | <view class="top"> |
| 8 | <view class="topphone"> | 8 | <view class="topphone"> |
| 9 | <view class="topphonebg"><image src="../../static/btn.png"></image></view> | 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 | </view> | 11 | </view> |
| 12 | <!-- <view class="topimg"><image src="../../static/img/05.jpg" mode="widthFix"></image></view> --> | 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 | </map> | 15 | </map> |
| 15 | </view> | 16 | </view> |
| 16 | 17 | ||
| @@ -137,6 +138,14 @@ | @@ -137,6 +138,14 @@ | ||
| 137 | longitude: 116.39742, | 138 | longitude: 116.39742, |
| 138 | iconPath: '../../../static/location.png' | 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 | onPageScroll(e) {this.$refs.nv.pageScroll(e)}, | 151 | onPageScroll(e) {this.$refs.nv.pageScroll(e)}, |
| @@ -150,6 +159,20 @@ | @@ -150,6 +159,20 @@ | ||
| 150 | // this.OrderType = params.type; | 159 | // this.OrderType = params.type; |
| 151 | }, | 160 | }, |
| 152 | methods:{ | 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,7 +205,11 @@ | ||
| 182 | this.API.getbsdetail(id).then(res=>{ | 205 | this.API.getbsdetail(id).then(res=>{ |
| 183 | console.log(11111); | 206 | console.log(11111); |
| 184 | console.log("用户订单",res); | 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 | this.number = res.data.funeralOrderDetailsInfoPo.quantityNumber | 213 | this.number = res.data.funeralOrderDetailsInfoPo.quantityNumber |
| 187 | this.price = res.data.funeralOrderDetailsInfoPo.unitPrice | 214 | this.price = res.data.funeralOrderDetailsInfoPo.unitPrice |
| 188 | this.API.getspjcxx(res.data.funeralOrderDetailsInfoPo.productId).then(res1=>{ | 215 | this.API.getspjcxx(res.data.funeralOrderDetailsInfoPo.productId).then(res1=>{ |
| @@ -209,6 +236,17 @@ | @@ -209,6 +236,17 @@ | ||
| 209 | "EndTime":"20231010150000", | 236 | "EndTime":"20231010150000", |
| 210 | "MinSpeed":"1", | 237 | "MinSpeed":"1", |
| 211 | "NeedAddress":"0", | 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 | info.request.BeginTime = BeginTime; | 252 | info.request.BeginTime = BeginTime; |
| @@ -224,6 +262,23 @@ | @@ -224,6 +262,23 @@ | ||
| 224 | this.longitude = res.Data[len].Longitude | 262 | this.longitude = res.Data[len].Longitude |
| 225 | this.covers[0].latitude = res.Data[len].Latitude | 263 | this.covers[0].latitude = res.Data[len].Latitude |
| 226 | this.covers[0].longitude = res.Data[len].Longitude | 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
| @@ -82,7 +82,7 @@ | @@ -82,7 +82,7 @@ | ||
| 82 | this.fileList.push({ | 82 | this.fileList.push({ |
| 83 | name:"1", | 83 | name:"1", |
| 84 | fileId:res.newFileName, | 84 | fileId:res.newFileName, |
| 85 | - url: this.BASE_URL + res.data.avatar | 85 | + url: res.data.avatar |
| 86 | }) | 86 | }) |
| 87 | this.nickName = res.data.nickName; | 87 | this.nickName = res.data.nickName; |
| 88 | }) | 88 | }) |
| @@ -96,7 +96,7 @@ | @@ -96,7 +96,7 @@ | ||
| 96 | var info = { | 96 | var info = { |
| 97 | userId:uni.getStorageSync("USERS_KEY").userId, | 97 | userId:uni.getStorageSync("USERS_KEY").userId, |
| 98 | nickName:this.nickName, | 98 | nickName:this.nickName, |
| 99 | - avtar:this.fileList[0].url | 99 | + avatar:this.fileList[0].url |
| 100 | } | 100 | } |
| 101 | this.API.xguserinfo(info).then(res=>{ | 101 | this.API.xguserinfo(info).then(res=>{ |
| 102 | console.log("修改用户信息",res); | 102 | console.log("修改用户信息",res); |
pages/myreservation/myreservation.vue
| @@ -37,9 +37,9 @@ | @@ -37,9 +37,9 @@ | ||
| 37 | <view class="goods-name-title" v-if="OrderType== 0">火化预约</view> | 37 | <view class="goods-name-title" v-if="OrderType== 0">火化预约</view> |
| 38 | <view class="goods-name-title" v-if="OrderType== 1">礼堂预约</view> | 38 | <view class="goods-name-title" v-if="OrderType== 1">礼堂预约</view> |
| 39 | <view class="goods-name-title" v-if="OrderType== 2">骨灰寄存</view> | 39 | <view class="goods-name-title" v-if="OrderType== 2">骨灰寄存</view> |
| 40 | - <view v-if="OrderType== 0">预约时间:{{item.scheduledCremationDate}}</view> | ||
| 41 | - <view v-if="OrderType== 1">预约时间:{{item.scheduledStartTime}}</view> | ||
| 42 | - <view v-if="OrderType== 2">预约时间:{{item.storageStartTime}}</view> | 40 | + <view v-if="OrderType== 0">预约时间:{{item.createdTime}}</view> |
| 41 | + <view v-if="OrderType== 1">预约时间:{{item.createdTime}}</view> | ||
| 42 | + <view v-if="OrderType== 2">预约时间:{{item.createdTime}}</view> | ||
| 43 | 43 | ||
| 44 | </view> | 44 | </view> |
| 45 | </view> | 45 | </view> |
pages/myreservationdetail/myreservationdetail.vue
| @@ -5,12 +5,14 @@ | @@ -5,12 +5,14 @@ | ||
| 5 | <view class="content"> | 5 | <view class="content"> |
| 6 | 6 | ||
| 7 | <view class="top"> | 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 | <view class="topphone"> | 10 | <view class="topphone"> |
| 9 | <view class="topphonebg"><image src="../../static/btn.png"></image></view> | 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 | </view> | 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 | <!-- <view class="topimg"><image src="../../static/img/05.jpg" mode="widthFix"></image></view> --> | 16 | <!-- <view class="topimg"><image src="../../static/img/05.jpg" mode="widthFix"></image></view> --> |
| 15 | </view> | 17 | </view> |
| 16 | 18 | ||
| @@ -135,6 +137,14 @@ | @@ -135,6 +137,14 @@ | ||
| 135 | longitude: 116.39742, | 137 | longitude: 116.39742, |
| 136 | iconPath: '../../../static/location.png' | 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 | onPageScroll(e) {this.$refs.nv.pageScroll(e)}, | 150 | onPageScroll(e) {this.$refs.nv.pageScroll(e)}, |
| @@ -147,6 +157,20 @@ | @@ -147,6 +157,20 @@ | ||
| 147 | // this.OrderType = params.type; | 157 | // this.OrderType = params.type; |
| 148 | }, | 158 | }, |
| 149 | methods:{ | 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,12 +203,18 @@ | ||
| 179 | this.API.getbsdetail(id).then(res=>{ | 203 | this.API.getbsdetail(id).then(res=>{ |
| 180 | console.log(11111); | 204 | console.log(11111); |
| 181 | console.log("用户订单",res); | 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 | this.info = res.data | 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 | this.hhtime = res.data.funeralCremationScheduledInfoPo.scheduledCremationTime | 215 | this.hhtime = res.data.funeralCremationScheduledInfoPo.scheduledCremationTime |
| 187 | this.hhdate = res.data.funeralCremationScheduledInfoPo.scheduledCremationDate | 216 | this.hhdate = res.data.funeralCremationScheduledInfoPo.scheduledCremationDate |
| 217 | + console.log("火化时间日期",this.hhtime,this.hhdate); | ||
| 188 | }) | 218 | }) |
| 189 | }, | 219 | }, |
| 190 | // 获取gps定位 | 220 | // 获取gps定位 |
| @@ -199,12 +229,24 @@ | @@ -199,12 +229,24 @@ | ||
| 199 | "Action":"GetVehicleTrackData", | 229 | "Action":"GetVehicleTrackData", |
| 200 | "UserId":"user", | 230 | "UserId":"user", |
| 201 | "Pwd":"6B18CFA67F76F079B0BFFBD773DC4494", | 231 | "Pwd":"6B18CFA67F76F079B0BFFBD773DC4494", |
| 232 | + // "PlateNum":"川ZVN180", | ||
| 202 | "PlateNum":vehicleNumber, | 233 | "PlateNum":vehicleNumber, |
| 203 | "ColorCode":"0", | 234 | "ColorCode":"0", |
| 204 | "BeginTime":"20231010090000", | 235 | "BeginTime":"20231010090000", |
| 205 | "EndTime":"20231010150000", | 236 | "EndTime":"20231010150000", |
| 206 | "MinSpeed":"1", | 237 | "MinSpeed":"1", |
| 207 | "NeedAddress":"0", | 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 | info.request.BeginTime = BeginTime; | 252 | info.request.BeginTime = BeginTime; |
| @@ -220,6 +262,21 @@ | @@ -220,6 +262,21 @@ | ||
| 220 | this.longitude = res.Data[len].Longitude | 262 | this.longitude = res.Data[len].Longitude |
| 221 | this.covers[0].latitude = res.Data[len].Latitude | 263 | this.covers[0].latitude = res.Data[len].Latitude |
| 222 | this.covers[0].longitude = res.Data[len].Longitude | 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 | }) |