bug fix

manifest.json

@@ -2,7 +2,7 @@
   "name": "shop_mobile_uni",
   "appid": "__UNI__F904656",
   "description": "",
-  "versionName": "1.0.11",
+  "versionName": "1.0.13",
   "versionCode": "100",
   "transformPx": false,
   "app-plus": {
@@ -51,7 +51,7 @@
       "mode": "history",
       "base": "/uni"
     },
-    "publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/prod/1.0.11/",
+    "publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/test/1.0.13/",
     "optimization": {
       "treeShaking": {
         "enable": true

package.json

 {
   "name": "shop_mobile_uni",
-  "version": "1.0.7",
+  "version": "1.0.13",
   "description": "谛宝多多商城",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

pages/setaccount/setaccount.vue

@@ -31,12 +31,14 @@
 				<text class="eosfont right_icon">&#xe608;</text>
 			</view>
 		</view>
-		<view class="log_out">退出登录</view>
+		<view class="log_out" @click="logOut()">退出登录</view>
+		<BottomBar />
 	</view>
 </template>
 
 <script>
 	import TopBar from '../../components/TopBar/TopBar';
+	import BottomBar from "@/components/BottomBar/BottomBar.vue";
 	import { php } from '../../common/host.js';
 	export default {
 		data() {
@@ -65,10 +67,10 @@
 			},
 			changePass(type) {
 				if(type === 'phone') {
-					this.$jump(`/pages/setinfo/setinfo?type=${type}&phone=${this.data.phone_mob}`);
+					this.$jump(`/pages/setinfo/setinfo?type=${type}&phone=${this.data.phone_mob}`, 2);
 					return
 				}
-				this.$jump(`/pages/setinfo/setinfo?type=${type}`)
+				this.$jump(`/pages/setinfo/setinfo?type=${type}`, 2)
 			},
 			uploadImage() {
 				uni.chooseImage({
@@ -107,10 +109,14 @@
 						});
 					}
 				})
+			},
+			logOut() {
+				this.$jump(`${php}app=member&act=logout&synlogout=1`);
 			}
 		},
 		components: {
-			TopBar
+			TopBar,
+			BottomBar
 		}
 	}
 </script>
@@ -191,7 +197,7 @@
 		color: #212121;
 		font-size: 28rpx;
 		position: fixed;
-		bottom: 0;
+		bottom: 98rpx;
 		left: 0;
 	}
 </style>

pages/setinfo/components/changeLoginPass.vue

@@ -74,7 +74,7 @@
 				})
 			},
 			returnHome() {
-				this.$jump(`${php}app=member&act=logout&synlogout=1`);
+				this.$jump(`${php}app=member&act=logout`);
 			}
 		},
 		components: {

pages/setinfo/components/changePayPass.vue

@@ -39,9 +39,9 @@
 					});
 					return
 				}
-				if(this.new_password.length < 6) {
+				if(!/^[0-9a-zA-Z_]{6}$/.test(this.new_password)) {
 					uni.showToast({
-						title: '请设置6位支付密码',
+						title: '请设置6位支付密码,可以是字母、数字或下划线',
 						icon: 'none',
 						duration: 2000
 					});

pages/setinfo/components/changephone.vue

@@ -116,6 +116,13 @@
 				}
 			},
 			nextStep() {
+				if(!/^\d{6}$/.test(this.code)) {
+					uni.showToast({
+						title: '请输入6位数字验证码',
+						icon: 'none'
+					})
+					return
+				}
 				uni.request({
 					url: `/uni/api/member/check_code/${this.code}`,
 					method: 'GET',
@@ -124,11 +131,23 @@
 						if(res.data.code === 0) {
 							this.next = true;
 							this.countdown = '(60)重新获取';
+						} else {
+							uni.showToast({
+								title: res.data.message,
+								icon: 'none'
+							});
 						}
 					}
 				})
 			},
 			confirm() {
+				if(!/^\d{6}$/.test(this.newCode)) {
+					uni.showToast({
+						title: '请输入6位数字验证码',
+						icon: 'none'
+					})
+					return
+				}
 				uni.request({
 					url: `/uni/api/member/change_mobile`,
 					method: 'POST',