diff --git a/.DS_Store b/.DS_Store index 6c7d7cd..1710e34 100644 --- a/.DS_Store +++ b/.DS_Store diff --git a/apis/modules/oauth.js b/apis/modules/oauth.js index 83cbe82..e73237c 100644 --- a/apis/modules/oauth.js +++ b/apis/modules/oauth.js @@ -167,4 +167,14 @@ export default { pqxxqr(data){ return request.put('/funeral/call/editFuneralStatus',data) }, + + // 获取车辆信息 + // /funeral/vehicle/list + getcllist(data){ + return request.get('/funeral/vehicle/list',data) + }, + // 获取收敛工信息 + getclglist(data){ + return request.get('/funeral/driver/list',data) + }, } \ No newline at end of file diff --git a/pages.json b/pages.json index 725c11f..0ecf7e5 100644 --- a/pages.json +++ b/pages.json @@ -310,7 +310,7 @@ }, { "path": "pages/declaration/list", "style": { - "navigationBarTitleText": "区域申报", + "navigationBarTitleText": "区域服务", "enablePullDownRefresh": false } diff --git a/pages/declaration/list.vue b/pages/declaration/list.vue index 311541a..e3fcc9c 100644 --- a/pages/declaration/list.vue +++ b/pages/declaration/list.vue @@ -24,7 +24,7 @@ - 建筑物备案 + 建筑物名称备案 @@ -32,7 +32,7 @@ - 地名备案 + 地名申报 diff --git a/pages/funeralreport/funeralreport.vue b/pages/funeralreport/funeralreport.vue index ce26d11..5bff7a5 100644 --- a/pages/funeralreport/funeralreport.vue +++ b/pages/funeralreport/funeralreport.vue @@ -3,7 +3,6 @@ - 逝者信息（必填） @@ -37,7 +36,7 @@ 逝者民族 - + @@ -116,7 +115,7 @@ 死亡日期 - + @@ -143,7 +142,7 @@ 与逝者关系 - + 家属证件号码 @@ -230,8 +229,9 @@ ], timeshow:false, jytimeshow:false, + // 不详、车祸、触电、溺水、枪击、烧死、事故、摔、死胎、死刑、他杀、滝死、意外、中毒、坠楼、自杀 swyycolumns:[ - ['自然死亡','疾病死亡','意外死亡'] + ['病','不详','车祸','触电','溺水','枪击','烧死','事故','摔','死胎','死刑','他杀','滝死','意外','中毒','坠楼','自杀'] ], swyyshow:false, diff --git a/pages/home/home.vue b/pages/home/home.vue index 7e5b3fb..842bb45 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -90,7 +90,7 @@ - 区域服务 + 区域划分 diff --git a/pages/mydeathdetail/mydeathdetail.vue b/pages/mydeathdetail/mydeathdetail.vue index a93f3dc..1ec6eb7 100644 --- a/pages/mydeathdetail/mydeathdetail.vue +++ b/pages/mydeathdetail/mydeathdetail.vue @@ -77,20 +77,25 @@ @@ -134,7 +139,22 @@ width: 10, arrowLine: true, borderWidth: 2 //线的边框宽度，还有很多参数，请看文档 - }] + }], + + sjinfo:{ + name:"请选择" + }, + sjshow:false, + sjcolumns:[ + ['男', '女'] + ], + slginfo:{ + name:"请选择" + }, + slgshow:false, + slgcolumns:[ + ['男', '女'] + ], }; }, onPageScroll(e) {this.$refs.nv.pageScroll(e)}, @@ -142,12 +162,53 @@ pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight} }, onLoad(params) { + this.getcllist(); + this.getclglist(); this.info = JSON.parse(params.info) console.log(this.info); this.getbsdetail(this.info.orderNumber) + // this.OrderType = params.type; }, methods:{ + // 获取车辆信息 + getcllist(){ + var info = { + pageNum: 1, + pageSize: 10, + vehicleStatus: "0", + } + this.API.getcllist(info).then(res=>{ + console.log("车辆情况",res); + }) + }, + // + sjconfirm(e){ + this.sjshow = false + }, + sjclose(){ + this.sjshow = false + }, + // 获取收敛工信息 + getclglist(){ + // 收敛工司机 + var info = { + pageNum: 1, + pageSize: 10, + position: "收敛工", + status: "0", + }; + this.API.getclglist(info).then(res=>{ + console.log("收敛工",res); + }) + }, + slgconfirm(e){ + this.slgshow = false + }, + slgclose(){ + this.slgshow = false + }, + // lxdh(){ uni.showModal({ title: '联系电话', diff --git a/static/.DS_Store b/static/.DS_Store index cd30a17..104551d 100644 --- a/static/.DS_Store +++ b/static/.DS_Store diff --git a/static/img/.DS_Store b/static/img/.DS_Store new file mode 100644 index 0000000..3259b06 --- /dev/null +++ b/static/img/.DS_Store diff --git a/static/img/04.jpg b/static/img/04.jpg deleted file mode 100644 index 89a9d9e..0000000 --- a/static/img/04.jpg +++ /dev/null diff --git a/static/img/05.jpg b/static/img/05.jpg deleted file mode 100644 index 33cfc4c..0000000 --- a/static/img/05.jpg +++ /dev/null diff --git a/static/img/06.jpg b/static/img/06.jpg deleted file mode 100644 index 5b0d85a..0000000 --- a/static/img/06.jpg +++ /dev/null diff --git a/static/imgs/.DS_Store b/static/imgs/.DS_Store new file mode 100644 index 0000000..e0f19ba --- /dev/null +++ b/static/imgs/.DS_Store diff --git a/static/ly/.DS_Store b/static/ly/.DS_Store new file mode 100644 index 0000000..f15ff9b --- /dev/null +++ b/static/ly/.DS_Store diff --git a/static/ly/image5.png b/static/ly/image5.png index 9d7a2f7..97b33a2 100644 --- a/static/ly/image5.png +++ b/static/ly/image5.png diff --git a/static/ly/image6.png b/static/ly/image6.png index fafdcb1..a491da8 100644 --- a/static/ly/image6.png +++ b/static/ly/image6.png diff --git a/static/ly/image7.png b/static/ly/image7.png index 1a394c7..f48a3e4 100644 --- a/static/ly/image7.png +++ b/static/ly/image7.png diff --git a/static/ly/image8.png b/static/ly/image8.png index 6f69848..513b22e 100644 --- a/static/ly/image8.png +++ b/static/ly/image8.png