common/api/user.js

@@ -195,7 +195,7 @@ export default {
 			},
 			// 修改绑定手机号
 			changeMemberPhone({ old_mobile, old_code, new_mobile, new_code }) {
-				return vm.$u.post('Member/changeMemberInfo', {
+				return vm.$u.post('Member/memberChangeMobile', {
 					old_mobile: old_mobile,
 					old_code: old_code,
 					new_mobile: new_mobile,

components/mine/address-active/index.vue

@@ -118,16 +118,19 @@ export default {
 				// latitude,
 			}).then((res)=>{
 				if (res.errCode == 0) {
-					this.$refs.uToast.show({
+					uni.redirectTo({
-						title: res.message,
+						url: '/pageE/more/Address'
-						type: 'success',
+					});
-						// url: '/pageE/more/Address',
+					// this.$refs.uToast.show({
-						callback() {
+					// 	title: res.message,
-							uni.redirectTo({
+					// 	type: 'success',
-								url: '/pageE/more/Address'
+					// 	// url: '/pageE/more/Address',
-							});
+					// 	callback() {
-						}
+					// 		uni.redirectTo({
-					})
+					// 			url: '/pageE/more/Address'
+					// 		});
+					// 	}
+					// })
 				} else {
 					this.showToast(res.message, 'warning');
 				}
@@ -148,16 +151,19 @@ export default {
 				// latitude,
 			}).then((res)=>{
 				if (res.errCode == 0) {
-					this.$refs.uToast.show({
+					uni.redirectTo({
-						title: res.message,
+						url: '/pageE/more/Address'
-						type: 'success',
+					});
-						// url: '/pageE/more/Address',
+					// this.$refs.uToast.show({
-						callback() {
+					// 	title: res.message,
-							uni.redirectTo({
+					// 	type: 'success',
-								url: '/pageE/more/Address'
+					// 	// url: '/pageE/more/Address',
-							});
+					// 	callback() {
-						}
+					// 		uni.redirectTo({
-					})
+					// 			url: '/pageE/more/Address'
+					// 		});
+					// 	}
+					// })
 				} else {
 					this.showToast(res.message, 'warning');
 				}

manifest.json

@@ -91,7 +91,7 @@
             "https" : false
         },
         "router" : {
-            "base" : "history"
+            "base" : ""
         }
     }
 }

pageC/cart/index.vue

@@ -85,6 +85,7 @@ export default {
 		},
 		// 结算
 		settlementOrder() {
+			// 拼接后端需要的数据形式
 			let id = [], temp = '';
 			this.checkedGoods.forEach(item => {
 				temp = item.cart_id + '|' + item.goods_num;
@@ -147,16 +148,14 @@ export default {
 			this.cartUpdateNumber(e.index, e.value);
 		},
 		async cartUpdateNumber(id, number) {
-			try {
+			await this.$u.api.cartUpdateNumber({
-				await this.$u.api.cartUpdateNumber({
+				cart_id: id,
-					cart_id: id,
+				quantity: number,
-					quantity: number,
+			}).then(res => {
-				}).then(res => {
-					this.getCartList();
-				})
-			} catch (error) {
 				this.getCartList();
-			}
+			}).catch(() => {
+				this.geCartList();
+			})
 		},
 		totalChange(e) {
 			// 切换所有商品的状态
@@ -193,16 +192,7 @@ export default {
 		}
 	},
 	onNavigationBarButtonTap(btn) {
-		console.log(btn);
+		// console.log(btn);
-		// this.status = btn.text;
-		// #ifdef H5
-		if(this.status == '编辑'){
-			this.status = "完成";
-		} else {
-			this.status = "编辑";
-		}
-		console.log(this.status);
-		// #endif
 		if(btn.index == 0){
 			let pages = getCurrentPages();
 			let page = pages[pages.length - 1];

pageE/mine/EditUserInfo.vue

@@ -2,7 +2,7 @@
 	<view class="edit-info">
 		<view class="user-info">
 			<view class="info-avatar">
-				<image src="../static/mine/23.png"></image>
+				<image :src="avatar"></image>
 			</view>
 			<view class="info-item">
 				<view class="title">昵称</view>
@@ -26,7 +26,7 @@
 				<image src="../static/mine/21.png"></image>
 			</view>
 		</view>
-		<view class="edit-tips">注意：修改手机号需要原手机号获取验证码，无原手机验证码，请联系后台</view>
+		<view class="edit-tips">注意：修改手机号需要原手机号获取验证码，无原手机验证码，请联系客服</view>
 		<view class="edit-btn" @click="updateMemberInfo">完成</view>
 	</view>
 </template>
@@ -55,7 +55,7 @@ export default {
 				minute: false,
 				second: false
 			},
-			nickname: '胖胖',
+			nickname: '',
 			gender: '', // 1男  2女
 			birthday: '',
 			phoneNumber: '',
@@ -72,8 +72,9 @@ export default {
 					let userInfo = res.data.MemberArray;
 					[this.nickname, this.phoneNumber, this.birthday, this.gender, this.avatar] = [
 						userInfo.member_nickname,
-						userInfo.member_mobile, 
+						userInfo.member_mobile,
-						common.timestampToDate({timestamp: userInfo.member_birthday}), 
+						userInfo.member_birthday,
+						// common.timestampToDate({timestamp: userInfo.member_birthday}), 
 						userInfo.member_sex,
 						userInfo.member_avatar,
 					];

pageE/mine/MineInfo.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="information">
 		<view class="info-avatar">
-			<image src="../static/mine/23.png"></image>
+			<image :src="userInfo.member_avatar"></image>
 		</view>
 		<view class="info-item">
 			<view class="title">昵称</view>
@@ -13,7 +13,7 @@
 		</view>
 		<view class="info-item">
 			<view class="title">生日</view>
-			<view class="value">{{ userInfo.member_birthday | dateFormat }}</view>
+			<view class="value">{{ userInfo.member_birthday }}</view>
 		</view>
 		<view class="info-item">
 			<view class="title">手机号</view>
@@ -21,7 +21,7 @@
 		</view>
 		<view class="info-item">
 			<view class="title">等级</view>
-			<view class="value">{{ userInfo.level }}</view>
+			<view class="value">{{ userInfo.member_level }}</view>
 		</view>
 		<view class="info-item">
 			<view class="title">积分数</view>

pageE/mine/UpdatePhone.vue

@@ -24,11 +24,11 @@
 					<u-verification-code :seconds="seconds" @end="end" @start="start" ref="uNewCode" @change="newCodeChange" unique-key="new" change-text="x秒"></u-verification-code>
 					<view class="get-code" @click="getCode(1)">{{ btnText[1] }}</view>
 				</view>
-				<u-toast ref="uToast" />
 			</view>
 		</view>
 		<view class="tips">注意：修改手机号需要原手机号获取验证码，无原手机验证码，请联系客服</view>
 		<view class="btn" @click="changeMemberPhone">保存</view>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 <script>
@@ -43,6 +43,9 @@ export default {
 			seconds: 60, // 获取验证码间隔时间
 		}
 	},
+	onNavigationBarButtonTap(e) {
+		if( e.index == 0 ) uni.navigateBack();
+	},
 	methods: {
 		// 验证发送验证码
 		verifySendCode(type) {
@@ -102,6 +105,12 @@ export default {
 						this.$u.toast(res.message);
 						// 通知验证码组件内部开始倒计时
 						refs.start();
+					} else {
+						this.$refs.uToast.show({
+							type: 'error',
+							title: res.message,
+							duration: 3000,
+						})
 					}
 				}).catch(() => {
 					uni.hideLoading();
@@ -120,7 +129,12 @@ export default {
 				new_code: this.newCode,
 			}).then(res => {
 				if(res.errCode == 0) {
-					
+					uni.navigateBack();
+				} else {
+					this.$refs.uToast.show({
+						type: 'error',
+						title: res.message
+					})
 				}
 			})
 		},
@@ -129,7 +143,7 @@ export default {
 		},
 		start() {
 			// this.$u.toast('倒计时开始');
-		}
+		},
 	},
 };
 </script>

pageE/more/EditAddress.vue

@@ -41,11 +41,14 @@ export default {
 				address_id: this.address.address_id
 			}).then((res)=>{
 				if(res.errCode == 0) {
-					this.$refs.uToast.show({
+					uni.redirectTo({
-						title: res.message,
-						type: 'success',
 						url: '/pageE/more/Address'
-					})
+					});
+					// this.$refs.uToast.show({
+					// 	title: res.message,
+					// 	type: 'success',
+					// 	url: '/pageE/more/Address'
+					// })
 				} else {
 					this.$refs.uToast.show({
 						title: res.message,

pageE/tool/ManicureOrder.vue

@@ -56,11 +56,14 @@ export default {
 				time: new Date(this.time)
 			}).then((res)=>{
 				if(res.errCode == 0) {
-					this.$refs.uToast.show({
+					uni.redirectTo({
-						title: res.message,
-						type: 'success',
 						url: '/pageE/tool/Manicure'
-					})
+					});
+					// this.$refs.uToast.show({
+					// 	title: res.message,
+					// 	type: 'success',
+					// 	url: '/pageE/tool/Manicure'
+					// })
 				} else {
 					this.showToast(res.message, 'error');
 				}

pages.json

@@ -629,11 +629,7 @@
 										"fontSrc": "/static/fonts/customer.ttf",
 										"fontSize":"20"
 									}
-								],
+								]
-								"autoBackButton": true,
-								"backButton": {
-									"badgeText": "取消"
-								}
 							}
 						}
 					}
@@ -645,6 +641,7 @@
 						"app-plus": {
 							"titleSize": "36px",
 							"titleNView": {
+								"autoBackButton": false,
 								"backgroundColor": "#FFFFFF",
 								"titleColor": "#333333",
 								"buttons": [

pages/mine/index.vue

@@ -2,7 +2,7 @@
     <view class="mine">
         <view class="mine-top">
             <view class="top">
-				<image src="/static/image/mine/23.png" class="avatar" @click="toOtherPage('/mine/MineInfo')" />
+				<image :src="userInfo.member_avatar" class="avatar" @click="toOtherPage('/mine/MineInfo')" />
 				<view class="user-info">
 					<view class="info-left">
 						<view class="user-nickname" @click="toOtherPage('/mine/MineInfo')">{{ userInfo.member_nickname }}</view>
@@ -13,7 +13,7 @@
 					</view>
 					<view class="info-right">
 						<view class="info-phone">{{ userInfo.member_mobile | phoneFormat }}</view>
-						<view class="user-rank">等级:{{ userInfo.level }}级</view>
+						<view class="user-rank">等级:{{ userInfo.member_level }}级</view>
 					</view>
 				</view>
 				<view class="member-service" @click="toOtherPage('/mine/MemberServe')">会员服务</view>
@@ -32,7 +32,7 @@
 					<view>图文收藏</view>
 				</view>
 				<view @click="toOtherPage('/mine/Integral')">
-					<view>{{ userInfo.member_points }}</view>
+					<view>{{ userInfo ? userInfo.member_points : 0 }}</view>
 					<view>积分数</view>
 				</view>
 				<view @click="toOtherPage('/mine/MineConcerns')">