diff --git a/config/api.js b/config/api.js
index d51cf85..1db0a13 100644
--- a/config/api.js
+++ b/config/api.js
@@ -1,5 +1,5 @@
- export const api_url = '' //'https://admin.dbcdq.cn/'
+ export const api_url = 'https://admin.dbcdq.cn/'
const post = (url, data, returndata) => {
@@ -195,3 +195,4 @@ export const reassignOrder = (data, callback) => post('api/recover/order/reassig
export const smsCode = (data, callback) => post('api/recover/person/send', data, callback);
export const hallnotice = (data, callback) => post('api/recover/person/hallnotice', data, callback);
export const indexInfo = (data, callback) => get('api/recover/config/index', data, callback);
+export const escLogin = (data, callback) => post('api/recover/wxuser/logout', data, callback);
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c58989d..525d51c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1442,7 +1442,7 @@
overflow: auto;
}
.navItem{
- width: 116rpx;
+ // width: 116rpx;
flex-shrink:0;
background: #FFF;
border-radius: 10rpx;
@@ -1450,8 +1450,8 @@
font-weight: 500;
font-size: 28rpx;
color: #333333;
- padding: 23rpx 15rpx;
- margin: 0 10rpx;
+ padding: 23rpx 8rpx;
+ margin: 0 5rpx;
}
.navItemCheck{
border: 1px solid #FFD39E;
diff --git a/pages/mine/apply.vue b/pages/mine/apply.vue
index ca57417..666f41a 100644
--- a/pages/mine/apply.vue
+++ b/pages/mine/apply.vue
@@ -53,12 +53,18 @@
:show="showStartDate"
v-model="dateStart"
mode="date"
+ :minDate="1072915200000"
+ :maxDate="nowDate"
+ @cancel="showStartDate = false"
@confirm="confirmStartDate"
>
@@ -138,7 +144,8 @@
provinceList: [],
cityList: [],
provinceName: '',
- cityName: ''
+ cityName: '',
+ nowDate: Number(new Date())
}
},
components:{
diff --git a/pages/mine/detail.vue b/pages/mine/detail.vue
index b32d09f..0044067 100644
--- a/pages/mine/detail.vue
+++ b/pages/mine/detail.vue
@@ -69,15 +69,15 @@ export default {
}
this.$api.indexInfo(data,res=>{
if(res.code == '1'){
- console.log(res.data.basic.list,'nnnnnnnnnn')
- let arr = res.data.basic.list;
+ console.log(res.data.example.list,'nnnnnnnnnn')
+ let arr = res.data.example.list;
this.info = res.data
switch(this.type){
case 'about':
// this.info.title = res.data.about_title
// this.info.content = res.data.about_text
- this.info.title = arr.find((item,index)=>item.name == 'about_title').value
- this.info.content = arr.find((item,index)=>item.name == 'about_text').value
+ this.info.title = arr.find((item,index)=>item.name == 'app_about_title').value
+ this.info.content = arr.find((item,index)=>item.name == 'app_about_text').value
wx.setNavigationBarTitle({
title:"关于我们"
});
@@ -85,8 +85,8 @@ export default {
case 'userProt':
// this.info.title = res.data.xieyi_title
// this.info.content = res.data.xieyi
- this.info.title = arr.find((item,index)=>item.name == 'xieyi_title').value
- this.info.content = arr.find((item,index)=>item.name == 'xieyi').value
+ this.info.title = arr.find((item,index)=>item.name == 'app_xieyi_title').value
+ this.info.content = arr.find((item,index)=>item.name == 'app_xieyi').value
wx.setNavigationBarTitle({
title:"用户协议"
});
@@ -94,8 +94,8 @@ export default {
case 'privacy':
// this.info.title = res.data.privacy_title
// this.info.content = res.data.privacy_content
- this.info.title = arr.find((item,index)=>item.name == 'privacy_title').value
- this.info.content = arr.find((item,index)=>item.name == 'privacy_content').value
+ this.info.title = arr.find((item,index)=>item.name == 'app_privacy_title').value
+ this.info.content = arr.find((item,index)=>item.name == 'app_privacy_content').value
wx.setNavigationBarTitle({
title:"隐私政策"
});
@@ -103,8 +103,8 @@ export default {
case 'recycleProt':
// this.info.title = res.data.recycleProt_title
// this.info.content = res.data.recycleProt_content
- this.info.title = arr.find((item,index)=>item.name == 'recycleProt_title').value
- this.info.content = arr.find((item,index)=>item.name == 'recycleProt_content').value
+ this.info.title = arr.find((item,index)=>item.name == 'app_recycleProt_title').value
+ this.info.content = arr.find((item,index)=>item.name == 'app_recycleProt_content').value
wx.setNavigationBarTitle({
title:"用户回收协议"
});
diff --git a/pages/mine/edituser.vue b/pages/mine/edituser.vue
index 6c6c53e..71c14cd 100644
--- a/pages/mine/edituser.vue
+++ b/pages/mine/edituser.vue
@@ -140,9 +140,12 @@
uni.removeStorageSync('userToken')
uni.showToast({ title: res.msg , icon: 'success' })
setTimeout(()=>{
- uni.navigateBack({
- delta: 1
- })
+ uni.redirectTo({
+ url: '/pages/login/login'
+ });
+ // uni.navigateBack({
+ // delta: 1
+ // })
}, 2000)
}else{
uni.showToast({ title: res.msg , icon: 'fail' })
diff --git a/unpackage/dist/build/web/index.html b/unpackage/dist/build/web/index.html
index b0b8681..c96c3f0 100644
--- a/unpackage/dist/build/web/index.html
+++ b/unpackage/dist/build/web/index.html
@@ -1,2 +1,2 @@
回收小程序
\ No newline at end of file
+ document.write('')