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/apis/modules/ryy.js b/apis/modules/ryy.js index 645d6da..6995459 100644 --- a/apis/modules/ryy.js +++ b/apis/modules/ryy.js @@ -3,17 +3,22 @@ import utils from '../../service/utils.js' export default { // 获取儿童手环信息 getChild(pages) { - return request.get('/childStay/records/getUserProtect',pages) + return request.get('/childStay/records/getUserProtect', pages) }, addRegistration(data) { - return request.post('/childAdopt/registration',data) + return request.post('/childAdopt/registration', data) }, // 获取历史记录和流程 getHistory(pages) { - return request.get('/childAdopt/registration/caseHistory',pages) + return request.get('/childAdopt/registration/caseHistory', pages) }, // 获取机构 getListRoles(pages) { - return request.get('/system/user/listRoles',pages) - } + return request.get('/system/user/listRoles', pages) + }, + // 添加悄悄话 + addInfo(data) { + return request.post('/childAdopt/infoes', data) + }, + } \ No newline at end of file diff --git a/common/config.js b/common/config.js index 811245d..bf8f9bc 100644 --- a/common/config.js +++ b/common/config.js @@ -1,7 +1,6 @@ - -let BASE_URL='http://8.130.38.56:8536'; +let BASE_URL = 'http://zhmz.rsxmzj.cn:8536'; // let BASE_URL='http://192.168.179.221:8536'; -export default BASE_URL +export default BASE_URL \ No newline at end of file diff --git a/pages.json b/pages.json index 725c11f..4080cc9 100644 --- a/pages.json +++ b/pages.json @@ -2,8 +2,7 @@ "easycom": { "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" }, - "pages": [ - { + "pages": [{ "path": "pages/home/home", "style": { "navigationStyle": "custom" @@ -189,12 +188,20 @@ "style": { "navigationStyle": "custom" } - },{ + }, + { + "path": "pages/whisper/whisperSuccess", + "style": { + "navigationStyle": "custom" + } + }, + { "path": "pages/mapdoorplate/mapdoorplate", "style": { "navigationStyle": "custom" } - }, { + }, + { "path": "pages/minorsos/minorsos", "style": { "navigationStyle": "custom" @@ -300,7 +307,7 @@ } }, - { + { "path": "pages/declaration/community", "style": { "navigationBarTitleText": "", @@ -310,170 +317,153 @@ }, { "path": "pages/declaration/list", "style": { - "navigationBarTitleText": "区域申报", + "navigationBarTitleText": "区域服务", "enablePullDownRefresh": false } - } - ,{ - "path" : "pages/declaration/declaration", - "style" : - { + }, { + "path": "pages/declaration/declaration", + "style": { "navigationStyle": "custom", - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "pages/declaration/declarationList", - "style" : - { - "navigationBarTitleText": "上报历史", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "pages/declaration/declarationListdetail", - "style" : - { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + }, { + "path": "pages/declaration/declarationList", + "style": { + "navigationBarTitleText": "上报历史", + "enablePullDownRefresh": false + } + + }, { + "path": "pages/declaration/declarationListdetail", + "style": { "navigationStyle": "custom", - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "pages/policy/policy", - "style" : - { - "navigationBarTitleText": "政策文件", + "navigationBarTitleText": "", "enablePullDownRefresh": false } - - } - ,{ - "path" : "pages/receiptRegistration/receiptRegistrationDetail", - "style" : - { - "navigationBarTitleText": "登记详情", - "enablePullDownRefresh": false - } - - }, + + }, + { + "path": "pages/policy/policy", + "style": { + "navigationBarTitleText": "政策文件", + "enablePullDownRefresh": false + } + + }, + { + "path": "pages/receiptRegistration/receiptRegistrationDetail", + "style": { + "navigationBarTitleText": "登记详情", + "enablePullDownRefresh": false + } + + }, { - "path" : "pages/receiptRegistration/organization", - "style" : - { - "navigationBarTitleText": "机构上报", - "enablePullDownRefresh": false - } - - }, + "path": "pages/receiptRegistration/organization", + "style": { + "navigationBarTitleText": "机构上报", + "enablePullDownRefresh": false + } + + }, { - "path" : "pages/receiptRegistration/townShip", - "style" : - { - "navigationBarTitleText": "乡镇上报", - "enablePullDownRefresh": false - } - - } - ,{ + "path": "pages/whisper/index", + "style": { + "navigationBarTitleText": "悄悄话", + "enablePullDownRefresh": false + } + + }, + { + "path": "pages/receiptRegistration/townShip", + "style": { + "navigationBarTitleText": "乡镇上报", + "enablePullDownRefresh": false + } + + }, { - "path" : "pages/policy/policydetail", - "style" : - { + "path": "pages/policy/policydetail", + "style": { "navigationStyle": "custom", - "navigationBarTitleText": "" + "navigationBarTitleText": "" + } + }, { + "path": "pages/receiptRegistration/receiptRegistrationSchedule", + "style": { + "navigationBarTitleText": "帮扶进度", + "enablePullDownRefresh": false } - } - ,{ - "path" : "pages/receiptRegistration/receiptRegistrationSchedule", - "style" : - { - "navigationBarTitleText": "帮扶进度", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "pages/declaration/declaration1", - "style" : - { + }, { + + "path": "pages/declaration/declaration1", + "style": { "navigationStyle": "custom", - "navigationBarTitleText": "" + "navigationBarTitleText": "" } - } - ,{ - "path" : "pages/receiptRegistration/receiptRegistration", - "style" : - { - "navigationBarTitleText": "个案接报登记", - "enablePullDownRefresh": false - } - - }, - { - "path": "pages/slgxx/slgxx", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/receiptRegistration/receiptRegistrationList", - "style" : - { - "navigationBarTitleText": "列表", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "pages/mapdoorplate/mapdoorplatelist", - "style" : - { - "navigationBarTitleText": "列表", - "enablePullDownRefresh": false - } - - }, - { - "path": "pages/xxqr/xxqr", - "style": { - "navigationStyle": "custom" - } + }, { + "path": "pages/receiptRegistration/receiptRegistration", + "style": { + "navigationBarTitleText": "个案接报登记", + "enablePullDownRefresh": false + } + }, { - "path" : "pages/declaration/newDeclaration", - "style" : - { + "path": "pages/slgxx/slgxx", + "style": { + "navigationStyle": "custom" + } + }, { + "path": "pages/receiptRegistration/receiptRegistrationList", + "style": { + "navigationBarTitleText": "列表", + "enablePullDownRefresh": false + } + + }, { + "path": "pages/mapdoorplate/mapdoorplatelist", + "style": { + "navigationBarTitleText": "列表", + "enablePullDownRefresh": false + } + + }, + { + "path": "pages/xxqr/xxqr", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/declaration/newDeclaration", + "style": { "navigationStyle": "custom", - "navigationBarTitleText" : "", - "enablePullDownRefresh" : false + "navigationBarTitleText": "", + "enablePullDownRefresh": false } }, { - "path" : "pages/declaration/newDeclarationdetail", - "style" : - { - "navigationBarTitleText" : "", + "path": "pages/declaration/newDeclarationdetail", + "style": { + "navigationBarTitleText": "", "navigationStyle": "custom", - "enablePullDownRefresh" : false + "enablePullDownRefresh": false } }, { - "path" : "pages/mapstakelinedetail/addmapstakelinedetail", - "style" : - { - "navigationBarTitleText" : "", - "enablePullDownRefresh" : false, + "path": "pages/mapstakelinedetail/addmapstakelinedetail", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, "navigationStyle": "custom" } } - ], + ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarBackgroundColor": "#ffffff" 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..65a45b8 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -1,34 +1,44 @@ + \ No newline at end of file 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/pages/receiptRegistration/organization.vue b/pages/receiptRegistration/organization.vue index 487c7b1..b553388 100644 --- a/pages/receiptRegistration/organization.vue +++ b/pages/receiptRegistration/organization.vue @@ -71,11 +71,15 @@ - - 其他信息 + + 其他信息 + - + + @@ -275,7 +279,8 @@ var minute = now.getMinutes(); //获取当前分钟数(0-59) var second = now.getSeconds(); //获取当前秒数(0-59) this.form.reportTime = year + "-" + (month < 10 ? "0" + month : month) + "-" + (day < 10 ? "0" + day : - day) + " " + (hour < 10 ? "0" + hour : hour) + ":" + (minute < 10 ? "0" + minute : minute) + ":" + ( + day) + " " + (hour < 10 ? "0" + hour : hour) + ":" + (minute < 10 ? "0" + minute : minute) + ":" + + ( second < 10 ? "0" + second : second); }, register() { diff --git a/pages/receiptRegistration/townShip.vue b/pages/receiptRegistration/townShip.vue index 6bd4836..5f646db 100644 --- a/pages/receiptRegistration/townShip.vue +++ b/pages/receiptRegistration/townShip.vue @@ -4,16 +4,21 @@ 上报历史 - + + + + + + 我要上报 - 我要上报 发生地点 - + @@ -23,7 +28,8 @@ 儿童姓名 - + @@ -46,7 +52,8 @@ 儿童年龄 - + @@ -56,30 +63,45 @@ 报告原因 - + - + + 其他信息 + + + + - 报告人信息 + + 报告人信息 + 姓名 - + @@ -89,7 +111,8 @@ 与儿童关系 - + @@ -99,7 +122,8 @@ 电话 - + @@ -122,7 +146,8 @@ 职业 - + @@ -132,31 +157,33 @@ 单位名称 - + - - - - 立即上报 - - + + + + 立即上报 + + - - + + + + \ No newline at end of file diff --git a/pages/whisper/whisperSuccess.scss b/pages/whisper/whisperSuccess.scss new file mode 100644 index 0000000..2bea399 --- /dev/null +++ b/pages/whisper/whisperSuccess.scss @@ -0,0 +1,103 @@ +.listBox{ + position: relative; + z-index: 1; +} +.content { + width: 100%; +} +.pay-price{ + width: 100%; + margin-top: 100rpx; + .icon{ + width: 250rpx; + height: 250rpx; + margin: 0 auto; + image{ + width: 100%; + height: 100%; + } + } + .price-data{ + text-align: center; + margin-top: 50rpx; + .list{ + width: 100%; + .title{ + font-size: 34rpx; + font-weight: bold; + } + .content{ + font-size: 30rpx; + color:#767676; + margin-top: 20rpx; + text{ + color: #3d3d3d; + } + } + } + } +} +.tips { + font-size: 28rpx; + margin: 50rpx 30rpx; + text { + color: #FF4848; + } +} +/* 跳转按钮 */ +.skip-btn{ + display: flex; + align-items: center; + justify-content: center; + width: 100%; + height: 100rpx; + margin-top: 70rpx; + .cart-add{ + display: flex; + align-items: center; + justify-content: center; + width: 35%; + image { + position: absolute; + z-index: 0; + width: 253rpx; + height: 80rpx; + } + text{ + font-size: 30rpx; + font-weight: bold; + color: #262626; + position: absolute; + z-index: 1; + left: 120rpx; + image { + position: absolute; + top: 6rpx; + left: -36rpx; + width: 28rpx; + height: 28rpx; + } + } + } + .buy-at{ + display: flex; + align-items: center; + justify-content: center; + width: 58%; + image { + position: absolute; + z-index: 0; + width: 415rpx; + height: 80rpx; + box-shadow: 5rpx 10rpx 20rpx 0 #b7c8ff; + border-radius: 100rpx; + } + text{ + font-size: 30rpx; + font-weight: bold; + color: #FFFFFF; + position: absolute; + z-index: 1; + } + } +} \ No newline at end of file diff --git a/pages/whisper/whisperSuccess.vue b/pages/whisper/whisperSuccess.vue new file mode 100644 index 0000000..a49f543 --- /dev/null +++ b/pages/whisper/whisperSuccess.vue @@ -0,0 +1,65 @@ + + + + + \ No newline at end of file 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/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/new/whisper.png b/static/new/whisper.png new file mode 100644 index 0000000..46d0dfd --- /dev/null +++ b/static/new/whisper.png