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/manifest.json b/manifest.json index b655ee5..d784e66 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "数字民政服务平台", - "appid" : "__UNI__E8DBEA9", + "appid" : "__UNI__7C9DEDF", "description" : "", "versionName" : "1.0.2", "versionCode" : "100", diff --git a/pages.json b/pages.json index 0ecf7e5..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": "", @@ -314,166 +321,149 @@ "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/declarationListdetail.vue b/pages/declaration/declarationListdetail.vue index ca32be5..a471886 100644 --- a/pages/declaration/declarationListdetail.vue +++ b/pages/declaration/declarationListdetail.vue @@ -464,8 +464,8 @@ - - + + 批复文件下载 @@ -710,7 +710,7 @@ justify-content: center; width: 100%; height: 100rpx; - margin-top: 70rpx; + position: fixed; bottom: 30rpx; diff --git a/pages/home/home.vue b/pages/home/home.vue index 842bb45..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/whisper/index.vue b/pages/whisper/index.vue new file mode 100644 index 0000000..6ad0385 --- /dev/null +++ b/pages/whisper/index.vue @@ -0,0 +1,367 @@ + + + + + \ 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/img/02.jpg b/static/img/02.jpg deleted file mode 100644 index 53e714e..0000000 --- a/static/img/02.jpg +++ /dev/null diff --git a/static/img/07.jpg b/static/img/07.jpg deleted file mode 100644 index 9aaaffc..0000000 --- a/static/img/07.jpg +++ /dev/null diff --git a/static/ly/image11.png b/static/ly/image11.png index d47d27c..7d356a8 100644 --- a/static/ly/image11.png +++ b/static/ly/image11.png diff --git a/static/ly/image17.png b/static/ly/image17.png index c574929..1e5125d 100644 --- a/static/ly/image17.png +++ b/static/ly/image17.png diff --git a/static/ly/image18.png b/static/ly/image18.png index e5b90a8..47c9393 100644 --- a/static/ly/image18.png +++ b/static/ly/image18.png 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