会员相关更新、商品列表更新

pages/order_food/confirm_order.vue

@@ -94,15 +94,18 @@
 								<view class="method_list_top">
 									<view class="method_list_top_left">
 										<image class="icon" :src="item.url" mode="aspectFill"/>
-										<text class="name"> {{ item.name }} </text>
+										<view class="method_list_top_cen">
+											<view class="name"> {{ item.name }} </view>
+											<view class="method_list_bom" v-if="item.type == 1">
+												<text class="balance">会员卡余额 ￥{{amountVIP?amountVIP.amount:0}}</text>
+												<text class="topUpNow" @click="goRecharge">去充值</text>
+											</view>
+										</view>
 									</view>
 									<u-radio activeColor="#E8AD7B" icon-size="36" size="36" :name="index+1">
 									</u-radio>
 								</view>
-								<view class="method_list_bom" v-if="item.type == 1">
-									<text class="balance">会员卡余额 ￥{{amountVIP?amountVIP.amount:0}}</text>
-									<text class="topUpNow" @click="goRecharge">去充值</text>
-								</view>
+								
 							</view>
 					</block>
 				</u-radio-group>
@@ -361,16 +364,9 @@
 			goRecharge() {
 				// 判断是否绑定手机,只有下单时候有,会员列表肯定有
 				// console.log(this.amountVIP.isVip, '调试1')
-				if (this.amountVIP.isVip == 0) {
-					// 跳转到开通页面
-					uni.navigateTo({
-						url: '/pages/member/activatedmemberone?shopId=' + uni.cache.get('shopUser')
-					})
-				} else {
-					uni.pro.navigateTo('/pages/member/index', {
-						shopId: uni.cache.get('shopUser')
-					})
-				}
+				uni.pro.navigateTo('/pages/member/index', {
+					shopId: uni.cache.get('shopUser')
+				})
 			},
 			
 			/**
@@ -422,18 +418,26 @@
 				} else {
 					// 先判断是否设置支付密码。0是没设置。没设置的情况下跳转到设置页面。有的话输入支付密码
 					// console.log(isPwd,'是否设置了支付密码')
-					if (uni.cache.get('userInfo').isPwd == 0) {
-						uni.pro.navigateTo('/pages/user/repairpassword', {
-							shopId_id: uni.cache.get('shopUser')
-						})
+					if ( this.amountVIP.isVip == 0 ) {//非会员情况
+						
+						this.goRecharge();
 					} else {
-						uni.hideLoading()
-						// this.payPasswordShow = false;
-						this.ispws = true
-						this.$nextTick(() => {
-							// this.$refs.payPwd.onPayUp();
-						})
+						console.log(this.amountVIP)
+						if (uni.cache.get('userInfo').isPwd == 0) {
+							uni.navigateTo({
+								url: '/pages/member/setPassword?shopUserInfo=' + JSON.stringify(this.amountVIP)
+							})
+							
+						} else {
+							uni.hideLoading()
+							// this.payPasswordShow = false;
+							this.ispws = true
+							this.$nextTick(() => {
+								// this.$refs.payPwd.onPayUp();
+							})
+						}
 					}
+					
 				}
 			},
 			
@@ -534,8 +538,8 @@
 					} else if (res.data == 3) {
 						this.showToastUppop('未设置支付密码')
 						setTimeout(() => {
-							uni.pro.navigateTo('/pages/user/repairpassword', {
-								shopId_id: uni.cache.get('shopUser')
+							uni.navigateTo({
+								url: '/pages/member/setPassword?shopUserInfo=' + JSON.stringify(this.amountVIP)
 							})
 						}, 1500)
 			
@@ -906,24 +910,25 @@
 		.paymentMethod_content{
 			background-color: $uni-bg-color;
 			border-radius: 22rpx;
-			padding:30rpx 0;
+			padding:30rpx 0 0 0;
 			box-sizing: border-box;
 			.paymentMethod_title{
 				font-weight: 500;
 				font-size: 32rpx;
 				color: #333333;
-				margin-bottom: 30rpx;
+				// margin-bottom: 30rpx;
 				padding: 0 30rpx;
 				box-sizing: border-box;
 			}
 			.method_list{
-				padding: 20rpx 30rpx;
+				padding: 40rpx 30rpx;
 				box-sizing: border-box;
 				.method_list_top{
 					display: flex;
 					justify-content: space-between;
 					.method_list_top_left{
 						display: flex;
+						align-items: center;
 						.icon{
 							width: 54.67rpx!important;
 							height: 48rpx!important;
@@ -934,13 +939,18 @@
 							font-weight: 500;
 							color: #333;
 						}
+						.method_list_top_cen{
+							display: flex;
+							flex-direction: column;
+						}
 					}
+				
 				}
 				.method_list_bom{
 					display: flex;
+					align-items: center;
 					.balance{
 						margin-right: 20rpx;
-						margin-left: 70rpx;
 						font-size: 24rpx;
 					}
 					.topUpNow{