增加积分兑换与余额支付密码

App.vue

@@ -23,6 +23,7 @@
 			store_user_min_recharge: 0, //最小充值
 			yue_pay_status: 0, //余额支付开关
 			alipay_open: 0, //支付宝支付开关
+			integration_pay_open:0,//积分兑付开关
 			routine_logo: '', //首页logo
 			share_pic: '',
 			site_logo: '',
@@ -180,6 +181,7 @@
 					this.globalData.site_name = res.data.site_name
 					this.globalData.store_user_min_recharge = res.data.store_user_min_recharge
 					this.globalData.yue_pay_status = res.data.yue_pay_status
+					this.globalData.integration_pay_open=res.data.integration_pay_open
 					this.globalData.sys_intention_agree = res.data.sys_intention_agree
 					this.globalData.mer_intention_open = res.data.mer_intention_open
 					this.globalData.alipay_open = res.data.alipay_open

components/pay/index.vue

@@ -79,7 +79,7 @@
 					this.password += num;
 				}
 				if (this.password.length == 6) {
-					this.$emit('pay',{password:this.password})
+					this.$emit('payFunc',{password:this.password})
 					this.password = "";
 					// uni.showModal({
 					// 	title:'密码',

pages/users/order_confirm/index.vue

@@ -460,7 +460,7 @@
 			<checkDelivery :deliveryName="deliveryName" :isShowBox="isShowBox" :activeObj="activeObj" :radioList="radioList" @close="boxClose" @confirmBtn="getData">
 			</checkDelivery>
 		</block>
-		<pay :show_key="payShow" :price="299" :show_subTitle="true" :mix="true" @payFunc="pay"></pay>
+		<pay :show_key="payShow" :price="totalPrice" :show_subTitle="true" :mix="true" @payFunc="payFunc"></pay>
 		<!--优惠明细弹窗-->
 		<discountDetails :isShowDiscount="isShowDiscount" @close="closeDiscount" :couponData="couponData"></discountDetails>
 		<timeranges :isShow='isShow' :time='timeranges' @confrim="confrim" @cancel="cancels"></timeranges>
@@ -567,7 +567,7 @@
 						"icon": "haiyuefont haiyue-jifenduihuan",
 						value: 'integral',
 						title: '可用积分:',
-						payStatus: this.$store.getters.globalData.yue_pay_status,
+						payStatus: this.$store.getters.globalData.integration_pay_open,
 					},
 					{
 						"name": "线下支付",
@@ -768,10 +768,12 @@
 			that.invoice.invoice = false
 		},
 		methods: {
-			pay(val){
+			payFunc(val){
 				let data1=this.payInfo;
+				if(data1.balance_vert){
+					this.$delete(data1,'balance_vert')
+				}
 				data1.password=val.password;
-				console.log('val.password: ',val.password);
 				this.payment(data1);
 			},
 			/*预售协议*/
@@ -1275,6 +1277,7 @@
 				let that = this;
 				if(!data.password){
 					data.balance_vert=1;
+					this.payInfo=data;
 				}
 				createOrder(data).then(res => {
 					let status = res.data.status,
@@ -1285,7 +1288,6 @@
 					that.orderPay = true;
 					
 					uni.hideLoading();
-					console.log('status: ',status);
 					switch (status) {
 						case 'ORDER_EXIST':
 						case 'EXTEND_ORDER':
@@ -1299,6 +1301,7 @@
 							});
 							break;
 						case 'success':
+							that.payShow=false;
 							return that.$util.Tips({
 								title: res.message,
 								icon: 'success'
@@ -1307,6 +1310,9 @@
 								url: goPages
 							});
 							break;
+						case 'continue':
+							that.payShow=true;
+							break;
 						case 'alipay':
 						case "alipayQr":
 							uni.navigateTo({

pages/users/user_integral/index.vue

@@ -76,7 +76,7 @@
 				</view>
 			</view>
 		</view>
-		<pay :show_key="payShow" :show_subTitle="false" :mix="true" @pay="payFunc" @closeFuc="closeFunc"></pay>
+		<pay :show_key="payShow" :show_subTitle="false" :mix="true" @payFunc="payFunc" @closeFuc="closeFunc"></pay>
 	</view>
 </template>