'修改优化'

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); 

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;

pages/mine/apply.vue

@@ -53,12 +53,18 @@
 						:show="showStartDate"
 						v-model="dateStart"
 						mode="date"
+						:minDate="1072915200000"
+						:maxDate="nowDate"
+						@cancel="showStartDate = false"
 						@confirm="confirmStartDate"
 					></u-datetime-picker>
 					<u-datetime-picker
 						:show="showEndDate"
 						v-model="dateEnd"
 						mode="date"
+						:minDate="nowDate"
+						:maxDate="4070908800000"
+						@cancel="showEndDate = false"
 						@confirm="confirmEndDate"
 					></u-datetime-picker>
 				</view>
@@ -138,7 +144,8 @@
 				provinceList: [],
 				cityList: [],
 				provinceName: '',
-				cityName: ''
+				cityName: '',
+				nowDate: Number(new Date())
 			}
 		},
 		components:{ 

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:"用户回收协议"
 							});

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' })

unpackage/dist/build/web/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>回收小程序</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.ed4a2d2b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.1ff28878.js></script><script src=./static/js/index.4521fe76.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.ed4a2d2b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.1ff28878.js></script><script src=./static/js/index.34405216.js></script></body></html>