From 4aeb7d04c40318b743101f7fefedb8f91e8ad4ae Mon Sep 17 00:00:00 2001
From: ZF sun <34314687@qq.com>
Date: Thu, 4 Dec 2025 09:18:00 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=B7=BB=E5=8A=A0@dcloudio/uni-quicka?=
 =?UTF-8?q?pp-webview=E4=BE=9D=E8=B5=96=E5=8F=8A=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/common-payment/payment.js     | 2159 +++++++++++-----------
 components/payment/payment.vue           | 1376 +++++++-------
 manifest.json                            |   11 +-
 node_modules/jweixin-module/README.md    |    4 +-
 node_modules/jweixin-module/out/index.js |    1 -
 node_modules/jweixin-module/package.json |   80 +-
 package-lock.json                        |   28 +-
 package.json                             |    1 +
 8 files changed, 1866 insertions(+), 1794 deletions(-)
 delete mode 100644 node_modules/jweixin-module/out/index.js

diff --git a/components/common-payment/payment.js b/components/common-payment/payment.js
index eb91860..2fb1ef2 100644
--- a/components/common-payment/payment.js
+++ b/components/common-payment/payment.js
@@ -1,1078 +1,1083 @@
-import htmlParser from '@/common/js/html-parser';
-
-export default {
-	options: {
-		styleIsolation: 'shared'
-	},
-	data() {
-		return {
-			outTradeNo: '',
-			isIphoneX: false,
-			orderCreateData: {
-				is_balance: 0,
-				is_point: 1,
-				is_invoice: 0, // 是否需要发票 0 无发票  1 有发票
-				invoice_type: 0, // 发票类型  1 纸质 2 电子
-				invoice_title_type: 1, // 抬头类型  1 个人 2 企业
-				is_tax_invoice: 0, // 是否需要增值税专用发票  0 不需要 1 需要
-				/*coupon: {
-					coupon_id: 0
-				},*/
-				coupon: [],
-				delivery: {},
-				member_goods_card: {}, // 会员次卡
-				order_key: '',
-				buyer_message: ''
-			},
-			paymentData: null,
-			calculateData: null,
-			tempData: null,
-			storeId: 0,
-			deliveryTime: '', // 提货时间
-			memberAddress: null, // 会员收货地址
-			localMemberAddress: null, // 会员本地配送收货地址
-			isRepeat: false,
-			promotionInfo: null,
-			transactionAgreement: {}, // 购买须知
-			tempFormData: null,
-			menuButtonBounding: {}, // 小程序胶囊属性
-			storeConfig: null,
-			localConfig: null,
-			selectGoodsCard: {
-				skuId: 0,
-				itemId: 0,
-				cardList: {}
-			}, // 当前选择的次卡
-			storeData: [],
-			latitude: '',
-			longitude: '',
-			coupon_list: [],
-			modules: [],
-			
-			//商户
-			shop_goods_list:[],
-			merchCoupon: {
-				merch_id: 0,
-				data: []
-			},
-			selectCouponId:0
-		}
-	},
-	inject: ['promotion'],
-	created() {
-		// #ifdef MP
-		this.menuButtonBounding = uni.getMenuButtonBoundingClientRect();
-		// #endif
-		this.isIphoneX = this.$util.uniappIsIPhoneX()
-		if (this.storeToken) {
-			Object.assign(this.orderCreateData, uni.getStorageSync(this.createDataKey))
-			if (this.location) {
-				this.orderCreateData.latitude = this.location.latitude;
-				this.orderCreateData.longitude = this.location.longitude;
-				this.latitude = this.location.latitude;
-				this.longitude = this.location.longitude;
-			}
-			this.payment();
-		} else {
-			this.$nextTick(() => {
-				this.$refs.loadingCover.hide();
-				this.$refs.login.open(this.$util.getCurrentRoute().path)
-			})
-		}
-		this.getTransactionAgreement();
-	},
-	computed: {
-		goodsData() {
-			if (this.paymentData) {
-				this.paymentData.goods_list.forEach(item => {
-					if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
-				})
-				return this.paymentData;
-			}
-		},
-		calculateGoodsData() {
-			if (this.calculateData) {
-				this.calculateData.goods_list.forEach(item => {
-					if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
-				})
-				return this.calculateData;
-			}
-		},
-		// 余额可抵扣金额
-		balanceDeduct() {
-			if (this.calculateData) {
-				if (this.calculateData.member_account && this.calculateData.member_account.balance_total <= parseFloat(this.calculateData.order_money).toFixed(2)) {
-					return parseFloat(this.calculateData.member_account.balance_total).toFixed(2);
-				} else {
-					return parseFloat(this.calculateData.order_money).toFixed(2);
-				}
-			}
-		},
-		// 门店列表
-		storeList() {
-			return this.getStoreList();
-		},
-		// 门店信息
-		storeInfo() {
-			let storeList = this.getStoreList();
-			if (storeList && this.orderCreateData.delivery && this.orderCreateData.delivery.delivery_type != 'express' && this.storeId) {
-				return storeList[this.orderCreateData.delivery.store_id];
-			}
-			return null;
-		},
-		// 会员卡购买周期
-		cardChargeType() {
-			if (this.paymentData && this.paymentData.recommend_member_card && Object.keys(this.paymentData.recommend_member_card).length > 0) {
-				let charge_rule_arr = [];
-				let charge_rule = this.paymentData.recommend_member_card.charge_rule;
-				Object.keys(charge_rule).forEach((key, index) => {
-					switch (key) {
-						case 'week':
-							charge_rule_arr.push({
-								'key': key,
-								'value': charge_rule[key],
-								'title': '周卡',
-								unit: '周'
-							});
-							break;
-						case 'month':
-							charge_rule_arr.push({
-								'key': key,
-								'value': charge_rule[key],
-								'title': '月卡',
-								unit: '月'
-							});
-							break;
-						case 'quarter':
-							charge_rule_arr.push({
-								'key': key,
-								'value': charge_rule[key],
-								'title': '季卡',
-								unit: '季'
-							});
-							break;
-						case 'year':
-							charge_rule_arr.push({
-								'key': key,
-								'value': charge_rule[key],
-								'title': '年卡',
-								unit: '年'
-							});
-							break;
-					}
-				})
-				return charge_rule_arr;
-			}
-		}
-	},
-	watch: {
-		storeToken: function (nVal, oVal) {
-			this.payment();
-		},
-		deliveryTime: function (nVal) {
-			if (!nVal) this.$refs.timePopup.refresh();
-		},
-		location: function (nVal) {
-			if (nVal) {
-				this.orderCreateData.latitude = nVal.latitude;
-				this.orderCreateData.longitude = nVal.longitude;
-				this.latitude = nVal.latitude;
-				this.longitude = nVal.longitude;
-				this.payment();
-			}
-		},
-		calculateGoodsData(nVal) {
-			if (nVal && nVal.local_config && nVal.local_config.info.time_is_open && !this.deliveryTime) this.localtime('no');
-		}
-	},
-	methods: {
-		//多商户商品分类
-		goodsSpecFormat(goods_list){
-			goods_list.forEach(item => {
-				if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
-			})
-			return goods_list
-		},
-		/**
-		 * 父级页面onShow调用
-		 */
-		pageShow() {
-			if (uni.getStorageSync('addressBack')) {
-				uni.removeStorageSync('addressBack');
-				this.payment();
-			}
-		},
-		/**
-		 * 获取订单结算数据
-		 */
-		payment() {
-			this.$api.sendRequest({
-				url: this.api.payment,
-				data: this.handleCreateData(),
-				success: res => {
-					if (res.code == 0 && res.data) {
-						let data = res.data;
-
-						// #ifdef MP-WEIXIN
-						var scene = uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync().scene;
-						if ([1175, 1176, 1177, 1191, 1195].indexOf(scene) != -1 && data.delivery.express_type) {
-							data.delivery.express_type = data.delivery.express_type.filter(item => item.name == 'express');
-						}
-						// #endif
-
-						if (data) {
-							// 配送方式
-							if (data.delivery.express_type && data.delivery.express_type.length) {
-								let deliveryStorage = uni.getStorageSync('delivery');
-								let delivery = data.delivery.express_type[0];
-								data.delivery.express_type.forEach(item => {
-									if (deliveryStorage && item.name == deliveryStorage.delivery_type) {
-										delivery = item;
-									}
-									if (item.name == 'local') this.localConfig = item;
-									if (item.name == 'store') this.storeConfig = item;
-								})
-								this.selectDeliveryType(delivery, false, data.member_account);
-							}
-						}
-
-						// 地址、手机号
-						if (data.is_virtual) {
-							this.orderCreateData.member_address = {
-								mobile: data.member_account.mobile ? data.member_account.mobile : ''
-							}
-						}
-
-						//记录订单key
-						this.orderCreateData.order_key = data.order_key;
-
-						this.modules = data.modules;
-						
-						//记录多商户优惠券
-						this.orderCreateData.coupon = data.coupon
-						
-						//查询优惠券
-						this.getCouponList();
-
-						// 处理表单数据
-						data = this.handleGoodsFormData(data);
-
-						// 该方法在父级组件中
-						this.promotionInfo = this.promotion(data);
-
-						this.paymentData = data;
-						
-						this.$forceUpdate();
-						this.calculate();
-					} else {
-						this.$util.showToast({
-							title: res.message
-						});
-
-						setTimeout(() => {
-							this.$util.redirectTo('/pages/index/index');
-						}, 1000)
-					}
-				}
-			})
-		},
-		//查询优惠券
-		getCouponList() {
-			//查询优惠券
-			if (this.modules.indexOf('coupon') != -1) {
-				this.$api.sendRequest({
-					url: '/api/ordercreate/getcouponlist',
-					data: this.orderCreateData,
-					success: res => {
-						if (res.code == 0 && res.data) {
-							let data = res.data;
-							this.coupon_list = data;
-							this.$forceUpdate();
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-					}
-				});
-
-				// this.orderCreateData.coupon.coupon_id = 0;
-			}
-
-		},
-		/**
-		 * 处理商品表单数据
-		 * @param {Object} data
-		 */
-		handleGoodsFormData(data) {
-			let goodsFormData = uni.getStorageSync('goodFormData');
-			data.goods_list.forEach(item => {
-				if (item.goods_form) {
-					let formData = {};
-					if (item.form_data) {
-						item.form_data.map(formIem => {
-							formData[formIem.id] = formIem;
-						})
-					} else if (goodsFormData && goodsFormData.goods_id == item.goods_id) {
-						goodsFormData.form_data.map(formIem => {
-							formData[formIem.id] = formIem;
-						})
-					}
-					if (Object.keys(formData).length) {
-						item.goods_form.json_data.forEach(formIem => {
-							if (formData[formIem.id]) {
-								formIem.val = formData[formIem.id].val;
-							}
-						})
-					}
-				}
-			});
-			return data;
-		},
-		/**
-		 * 订单创建
-		 */
-		calculate() {
-			this.$api.sendRequest({
-				url: this.api.calculate,
-				data: this.handleCreateData(),
-				success: res => {
-					if (this.$refs.loadingCover && this.$refs.loadingCover.isShow) this.$refs.loadingCover.hide();
-					if (res.code == 0 && res.data) {
-
-						// 处理表单数据
-						this.calculateData = this.handleGoodsFormData(res.data);
-
-						//多商户商品
-						this.shop_goods_list = res.data.shop_goods_list
-						//---------
-						this.calculateData.coupon_list = this.coupon_list;
-						if (res.data.delivery) {
-							if (res.data.delivery.delivery_type == 'express') this.memberAddress = res.data.delivery.member_address;
-							if (res.data.delivery.delivery_type == 'local') {
-								this.localMemberAddress = res.data.delivery.member_address;
-							}
-						}
-						// 次卡
-						res.data.goods_list.forEach(item => {
-							if (item.member_card_list) {
-								if (this.orderCreateData.member_goods_card[item.sku_id]) {
-									let itemId = this.orderCreateData.member_goods_card[item.sku_id];
-									if (!item.member_card_list[itemId]) delete this.orderCreateData.member_goods_card[item.sku_id];
-								}
-							} else if (this.orderCreateData.member_goods_card[item.sku_id]) {
-								delete this.orderCreateData.member_goods_card[item.sku_id];
-							}
-						});
-						//多商户
-						this.orderCreateData.coupon = res.data.coupon
-						// if (!res.data.coupon_id) this.orderCreateData.coupon.coupon_id = 0;
-						// else this.orderCreateData.coupon.coupon_id = res.data.coupon_id;
-
-						this.$forceUpdate();
-					} else {
-						this.$util.showToast({
-							title: res.message
-						});
-					}
-				}
-			})
-		},
-		/**
-		 * 提交订单
-		 */
-		create() {
-			if (!this.verify() || this.isRepeat) return;
-			this.isRepeat = true;
-			uni.showLoading({
-				title: ''
-			});
-			this.$api.sendRequest({
-				url: this.api.create,
-				data: this.handleCreateData(),
-				success: res => {
-					uni.hideLoading();
-					if (res.code == 0) {
-						this.outTradeNo = res.data;
-						uni.removeStorageSync('deliveryTime');
-						uni.removeStorageSync('goodFormData');
-						uni.setStorageSync('paySource', '');
-						if (this.calculateData.pay_money == 0) {
-							// #ifdef MP
-							if (this.paymentData.is_virtual || this.orderCreateData.delivery.delivery_type == 'store') {
-								this.$util.subscribeMessage('ORDER_VERIFY_OUT_TIME,VERIFY_CODE_EXPIRE,VERIFY');
-							}
-							// #endif
-							this.$util.redirectTo('/pages_tool/pay/result', {
-								code: res.data
-							}, 'redirectTo');
-						} else {
-							this.openChoosePayment();
-						}
-						// 更新购物车数量
-						this.$store.dispatch('getCartNumber');
-					} else {
-						this.$util.showToast({
-							title: res.message
-						});
-						this.isRepeat = false;
-					}
-				}
-			})
-		},
-		/**
-		 * 处理订单计算、创建传参
-		 */
-		handleCreateData() {
-			let data = this.$util.deepClone(this.orderCreateData);
-			// 订单表单
-			if (this.$refs.form) {
-				data.form_data = {
-					form_id: this.paymentData.system_form.id,
-					form_data: this.$util.deepClone(this.$refs.form.formData)
-				};
-			}
-			// 商品表单
-			if (this.$refs.goodsForm) {
-				if (!data.form_data) data.form_data = {};
-				data.form_data.goods_form = {};
-				this.$refs.goodsForm.forEach(item => {
-					data.form_data.goods_form[item._props.customAttr.sku_id] = {
-						form_id: item._props.customAttr.form_id,
-						form_data: this.$util.deepClone(item.formData)
-					}
-				})
-			}
-			Object.keys(data).forEach((key) => {
-				let item = data[key];
-				if (typeof item == 'object') data[key] = JSON.stringify(item);
-			})
-
-			if (this.paymentData && this.orderCreateData.is_virtual == 0) {
-				if (data.member_address && this.orderCreateData.delivery && this.orderCreateData.delivery.delivery_type != 'store') {
-					delete data.member_address;
-				}
-			}
-
-			return data;
-		},
-		/**
-		 * 打开支付弹窗
-		 */
-		openChoosePayment() {
-			// #ifdef MP
-			if (this.paymentData.is_virtual) {
-				this.$util.subscribeMessage('ORDER_URGE_PAYMENT,ORDER_PAY');
-			} else {
-				switch (this.orderCreateData.delivery.delivery_type) {
-					case 'express': //物流配送
-						this.$util.subscribeMessage('ORDER_URGE_PAYMENT,ORDER_PAY,ORDER_DELIVERY');
-						break;
-					case 'store': //门店自提
-						this.$util.subscribeMessage('ORDER_URGE_PAYMENT,ORDER_PAY');
-						break;
-					case 'local': //同城配送
-						this.$util.subscribeMessage('ORDER_URGE_PAYMENT,ORDER_PAY,ORDER_DELIVERY');
-						break;
-				}
-			}
-			// #endif
-
-			this.$refs.choosePaymentPopup.getPayInfo(this.outTradeNo);
-		},
-		verify() {
-			if (this.paymentData.is_virtual == 1) {
-				if (!this.orderCreateData.member_address.mobile) {
-					this.$util.showToast({
-						title: '请输入预留手机'
-					});
-					return false;
-				}
-				if (!this.$util.verifyMobile(this.orderCreateData.member_address.mobile)) {
-					this.$util.showToast({
-						title: '请输入正确的手机号'
-					});
-					return false;
-				}
-			} else {
-				if (!this.orderCreateData.delivery || !this.orderCreateData.delivery.delivery_type) {
-					this.$util.showToast({
-						title: '商家未设置配送方式'
-					});
-					return false;
-				}
-				if (
-					(this.orderCreateData.delivery.delivery_type == 'express' && !this.memberAddress) ||
-					(this.orderCreateData.delivery.delivery_type == 'local' && !this.localMemberAddress)
-				) {
-					this.$util.showToast({
-						title: '请先选择您的收货地址'
-					});
-					return false;
-				}
-
-				if (this.orderCreateData.delivery.delivery_type == 'store') {
-					if (!this.orderCreateData.delivery.store_id) {
-						this.$util.showToast({
-							title: '没有可提货的门店,请选择其他配送方式'
-						});
-						return false;
-					}
-					if (!this.orderCreateData.member_address.mobile) {
-						this.$util.showToast({
-							title: '请输入预留手机'
-						});
-						return false;
-					}
-					if (!this.$util.verifyMobile(this.orderCreateData.member_address.mobile)) {
-						this.$util.showToast({
-							title: '请输入正确的手机号'
-						});
-						return false;
-					}
-					if (!this.deliveryTime) {
-						this.$util.showToast({
-							title: '请选择提货时间'
-						});
-						return false;
-					}
-				}
-
-				if (this.orderCreateData.delivery.delivery_type == 'local') {
-					if (!this.orderCreateData.delivery.store_id) {
-						this.$util.showToast({
-							title: '没有可配送的门店,请选择其他配送方式'
-						});
-						return false;
-					}
-					if (this.calculateGoodsData.config.local.is_use && this.calculateGoodsData.delivery.local.info.time_is_open == 1 && !this.deliveryTime) {
-						this.$util.showToast({
-							title: '请选择送达时间'
-						});
-						return false;
-					}
-				}
-			}
-
-			if (this.$refs.goodsForm) {
-				let formVerify = true;
-				for (let i = 0; i < this.$refs.goodsForm.length; i++) {
-					let item = this.$refs.goodsForm[i];
-					formVerify = item.verify();
-					if (!formVerify) {
-						break;
-					}
-				}
-				if (!formVerify) return false;
-			}
-			if (this.paymentData.system_form) {
-				let formVerify = this.$refs.form.verify();
-				if (!formVerify) return false;
-			}
-			return true;
-		},
-		/**
-		 * 选择收货地址
-		 */
-		selectAddress() {
-			var params = {
-				back: this.$util.getCurrentRoute().path,
-				local: 0,
-				type: 1
-			}
-			// 外卖配送需要定位地址
-			if (this.orderCreateData.delivery.delivery_type == 'local') {
-				params.local = 1;
-				params.type = 2;
-			}
-			this.$util.redirectTo('/pages_tool/member/address', params);
-		},
-		/**
-		 * 选择配送方式
-		 * @param data
-		 * @param calculate
-		 * @param member_account
-		 */
-		selectDeliveryType(data, calculate = true, member_account = null) {
-			if (this.orderCreateData.delivery && this.orderCreateData.delivery.delivery_type == data.name) return;
-
-			this.orderCreateData.delivery.buyer_ask_delivery_time = {
-				start_date: '',
-				end_date: ''
-			};
-			this.deliveryTime = '';
-
-			let delivery = {
-				delivery_type: data.name,
-				delivery_type_name: data.title
-			}
-			// 如果是门店配送
-			if (data.name == 'store' || data.name == 'local') {
-				if (data.store_list[0]) {
-					delivery.store_id = data.store_list[0].store_id;
-				}
-				this.storeId = delivery.store_id ? delivery.store_id : 0;
-
-				if (!this.orderCreateData.member_address) {
-					if (this.paymentData) {
-						this.orderCreateData.member_address = {
-							name: this.paymentData.member_account.nickname,
-							mobile: this.paymentData.member_account.mobile
-						};
-					} else if (member_account) {
-						this.orderCreateData.member_address = {
-							name: member_account.nickname,
-							mobile: member_account.mobile
-						};
-
-					}
-				}
-			}
-			
-			this.$set(this.orderCreateData, 'delivery', delivery);
-			uni.setStorageSync('delivery', delivery);
-
-			// 配送方式不为门店配送时
-			if (this.orderCreateData.delivery.delivery_type != 'express' && !this.location) this.$util.getLocation();
-			if (calculate) this.payment();
-
-			if (data.name == 'store') this.storetime('no');
-			if (data.name == 'local') this.localtime('no');
-		},
-		/**
-		 * 图片错误
-		 * @param {Object} index
-		 */
-		imageError(index) {
-			this.paymentData.goods_list[index].sku_image = this.$util.getDefaultImage().goods;
-			this.calculateData.goods_list[index].sku_image = this.$util.getDefaultImage().goods;
-			this.$forceUpdate();
-		},
-		/**
-		 * 选择门店
-		 * @param {Object} data
-		 */
-		selectPickupPoint(data) {
-			if (data.store_id != this.storeId) {
-				this.storeId = data.store_id;
-				this.orderCreateData.delivery.store_id = data.store_id;
-				this.payment();
-				this.resetDeliveryTime();
-				// 存储所选门店
-				let delivery = uni.getStorageSync('delivery');
-				delivery.store_id = data.store_id;
-				uni.setStorageSync('delivery', delivery)
-			}
-			this.$refs.deliveryPopup.close();
-		},
-		/**
-		 * 重置提货时间
-		 */
-		resetDeliveryTime() {
-			this.orderCreateData.delivery.buyer_ask_delivery_time = {
-				start_date: '',
-				end_date: ''
-			};
-			this.deliveryTime = '';
-			uni.removeStorageSync('deliveryTime');
-		},
-		/**
-		 * 门店
-		 */
-		storetime(type = '') {
-			if (this.storeInfo) {
-				let data = this.$util.deepClone(this.storeInfo);
-				data.delivery_time = typeof data.delivery_time == 'string' && data.delivery_time ? JSON.parse(data.delivery_time) : data.delivery_time;
-				if (!data.delivery_time || data.delivery_time.length == undefined && !data.delivery_time.length) {
-					data.delivery_time = [{
-						start_time: data.start_time,
-						end_time: data.end_time
-					}]
-				}
-				let obj = {
-					delivery: this.orderCreateData.delivery,
-					dataTime: data
-				}
-				this.$refs.timePopup.open(obj, type);
-				this.$forceUpdate();
-			}
-		},
-		/**
-		 * 选择自提时间
-		 * @param {Object} data
-		 */
-		selectPickupTime(data) {
-			this.deliveryTime = data.data.month + '(' + data.data.time + ')';
-
-			this.orderCreateData.delivery.buyer_ask_delivery_time = {
-				start_date:data.data.start_date,
-				end_date:data.data.end_date
-			};
-
-			//将时间缓存，避免切换地址时重置
-			uni.setStorageSync('deliveryTime', {
-				'deliveryTime': this.deliveryTime,
-				'buyer_ask_delivery_time': this.orderCreateData.delivery.buyer_ask_delivery_time,
-				'delivery_type': this.orderCreateData.delivery.delivery_type
-			});
-
-		},
-		storeImgError() {
-			this.storeInfo.store_image = this.$util.getDefaultImage().store;
-		},
-		openPopup(ref) {
-			if (ref == 'deliveryPopup' && (!this.storeList || Object.keys(this.storeList).length <= 1)) return;
-			this.tempData = this.$util.deepClone(this.orderCreateData);
-			this.$refs[ref].open();
-		},
-		closePopup(ref) {
-			this.orderCreateData = this.$util.deepClone(this.tempData);
-			this.$refs[ref].close();
-			this.tempData = null;
-		},
-		//优惠券单独多商户
-		/**
-		 * 显示店铺优惠券信息
-		 * @param {Object} siteId
-		 * @param {Object} couponData
-		 */
-		openSiteCoupon(merch_id) {
-		
-			this.tempData = this.$util.deepClone(this.orderCreateData);
-			this.merchCoupon.merch_id = merch_id;
-			this.selectCouponId = this.orderCreateData.coupon[merch_id].coupon_id;
-			// this.selectCouponMoney = this.orderCreateData.coupon[siteId].coupon_money;
-		
-			this.merchCoupon.data = this.coupon_list[merch_id];
-			this.$refs.couponPopup.open();
-			this.$forceUpdate();
-		},
-		/**商户选择券*/
-		selectCoupon(data,merch_id) {
-		
-			// if (this.orderCreateData.coupon[merch_id].coupon_id == data.coupon_id){
-			// 	this.orderCreateData.coupon[merch_id].coupon_id = 0
-			// }else{
-			// 	this.orderCreateData.coupon[merch_id].coupon_id = data.coupon_id
-			// };
-			if (this.selectCouponId != data.coupon_id) {
-				this.selectCouponId = data.coupon_id;
-			} else {
-				this.selectCouponId = 0;
-			}
-			this.$forceUpdate();
-			// this.orderCreateData.coupon[merch_id].coupon_id = data.coupon_id
-			console.log(this.selectCouponId)
-		},
-		//确定使用优惠券
-		useCpopon() {
-			console.log(this.merchCoupon.merch_id)
-			this.orderCreateData.coupon[this.merchCoupon.merch_id].coupon_id = this.selectCouponId;
-			console.log(this.orderCreateData.coupon)
-			this.$refs.couponPopup.close();
-			this.calculate();
-		},
-		
-		//-------------------
-		/**
-		 * 选择优惠券
-		 * @param {Object} data
-		 */
-		/*selectCoupon(data) {
-			if (this.orderCreateData.coupon.coupon_id == data.coupon_id) this.orderCreateData.coupon = {
-				coupon_id: 0
-			};
-			else this.orderCreateData.coupon = {
-				coupon_id: data.coupon_id
-			};
-		},*/
-		/**
-		 * 使用优惠券
-		 */
-		// useCpopon() {
-		// 	this.$refs.couponPopup.close();
-		// 	this.calculate();
-		// },
-		/**
-		 * 切换发票开关
-		 */
-		changeIsInvoice() {
-			if (this.orderCreateData.is_invoice == 0) {
-				this.orderCreateData.is_invoice = 1;
-				if (!this.orderCreateData.invoice_type) this.orderCreateData.invoice_type = this.goodsData.invoice.invoice_type.split(',')[0];
-			} else {
-				this.orderCreateData.is_invoice = 0;
-			}
-		},
-		/**
-		 * 切换发票类型
-		 * @param {Object} invoice_type
-		 */
-		changeInvoiceType(invoice_type) {
-			this.orderCreateData.invoice_type = invoice_type;
-		},
-		/**
-		 * 切换发票个人还是企业
-		 * @param {Object} invoice_title_type
-		 */
-		changeInvoiceTitleType(invoice_title_type) {
-			this.orderCreateData.invoice_title_type = invoice_title_type;
-		},
-		/**
-		 * 切换增值税专用发票开关
-		 */
-		changeIsTaxInvoice() {
-			if (this.orderCreateData.is_tax_invoice == 0) this.orderCreateData.is_tax_invoice = 1;
-			else this.orderCreateData.is_tax_invoice = 0;
-			this.$forceUpdate();
-		},
-		/**
-		 * 选择发票内容
-		 * @param {Object} invoice_content
-		 */
-		changeInvoiceContent(invoice_content) {
-			this.orderCreateData.invoice_content = invoice_content;
-			this.$forceUpdate();
-		},
-		/**
-		 * 验证发票内容
-		 */
-		invoiceVerify() {
-			if (!this.orderCreateData.invoice_title) {
-				this.$util.showToast({
-					title: '请填写发票抬头'
-				});
-				return false;
-			}
-			if (!this.orderCreateData.taxpayer_number && this.orderCreateData.invoice_title_type == 2) {
-				this.$util.showToast({
-					title: '请填写纳税人识别号'
-				});
-				return false;
-			}
-			if (this.orderCreateData.invoice_type == 1 && !this.orderCreateData.invoice_full_address && this.paymentData.is_virtual == 1) {
-				this.$util.showToast({
-					title: '请填写发票邮寄地址'
-				});
-				return false;
-			}
-			if (this.orderCreateData.invoice_type == 2 && !this.orderCreateData.invoice_email) {
-				this.$util.showToast({
-					title: '请填写邮箱'
-				});
-				return false;
-			}
-			if (this.orderCreateData.invoice_type == 2) {
-				var reg = /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/;
-				if (!reg.test(this.orderCreateData.invoice_email)) {
-					this.$util.showToast({
-						title: '请填写正确的邮箱'
-					});
-					return false;
-				}
-			}
-			if (!this.orderCreateData.invoice_content) {
-				this.$util.showToast({
-					title: '请选择发票内容'
-				});
-				return false;
-			}
-			return true;
-		},
-		/**
-		 * 保存发票设置
-		 */
-		saveInvoice() {
-			if (this.orderCreateData.is_invoice == 1 && !this.invoiceVerify()) return;
-			this.calculate();
-			this.$refs.invoicePopup.close();
-		},
-		/**
-		 * 保存留言
-		 */
-		saveBuyerMessage() {
-			this.$refs.buyerMessagePopup.close();
-		},
-		/**
-		 * 选择会员卡
-		 */
-		selectMemberCard() {
-			this.orderCreateData.is_open_card = this.orderCreateData.is_open_card ? 0 : 1;
-			if (!this.orderCreateData.member_card_unit) this.orderCreateData.member_card_unit = this.cardChargeType[0].key;
-			this.payment();
-		},
-		/**
-		 * 选择会员卡充值类型
-		 * @param {Object} key
-		 */
-		selectMembercardUnit(key) {
-			this.orderCreateData.member_card_unit = key;
-			this.calculate();
-		},
-		/**
-		 * 使用积分抵扣
-		 */
-		usePoint() {
-			this.orderCreateData.is_point = this.orderCreateData.is_point ? 0 : 1;
-			this.calculate();
-		},
-		/**
-		 * 支付弹窗关闭
-		 */
-		payClose() {
-			// 更新购物车数量
-			this.$store.dispatch('getCartNumber');
-			this.$util.redirectTo('/pages/order/detail', {
-				order_id: this.$refs.choosePaymentPopup.payInfo.order_id
-			}, 'redirectTo');
-		},
-		
-		/**
-		 * 同城配送送达时间
-		 */
-		localtime(type = '') {
-			if (this.calculateGoodsData && this.calculateGoodsData.config.local) {
-				let data = this.$util.deepClone(this.calculateGoodsData.delivery.local.info);
-				if (Object.keys(data).length) {
-					if (data.delivery_time) {
-						data.end_time = data.delivery_time[(data.delivery_time.length - 1)].end_time;
-					}
-
-					let obj = {
-						delivery: this.orderCreateData.delivery,
-						dataTime: data
-					}
-
-					this.$refs.timePopup.open(obj, type);
-				}
-
-			}
-		},
-		/**
-		 * 剩余起送价
-		 */
-		surplusStartMoney() {
-			let money = 0;
-			if (this.calculateData && this.calculateData.delivery && this.calculateData.delivery.delivery_type == 'local') {
-				let startDeliveryMoney = this.calculateGoodsData.delivery.start_money ?? 0;
-				money = parseFloat(startDeliveryMoney) - parseFloat(this.calculateData.goods_money);
-				money = money < 0 ? 0 : money;
-			}
-			return money;
-		},
-		/**
-		 * 交易协议
-		 */
-		getTransactionAgreement() {
-			this.$api.sendRequest({
-				url: '/api/order/transactionagreement',
-				success: res => {
-					if (res.data) {
-						this.transactionAgreement = res.data;
-						if (this.transactionAgreement.content) this.transactionAgreement.content = htmlParser(this.transactionAgreement.content);
-					}
-				}
-			})
-		},
-		editForm(index) {
-			this.tempFormData = {
-				index: index,
-				json_data: this.$util.deepClone(this.goodsData.goods_list[index].goods_form.json_data)
-			};
-			this.$refs.editFormPopup.open();
-		},
-		saveForm() {
-			if (this.$refs.tempForm.verify()) {
-				this.$set(this.paymentData.goods_list[this.tempFormData.index].goods_form, 'json_data', this.$refs.tempForm.formData);
-				this.$refs.editFormPopup.close();
-			}
-		},
-		/**
-		 * 切换次卡
-		 * @param {Object} index
-		 */
-		selectMemberGoodsCard(index) {
-			let sku_id = this.goodsData.goods_list[index].sku_id;
-			this.selectGoodsCard = {
-				skuId: sku_id,
-				itemId: this.orderCreateData.member_goods_card[sku_id] ? this.orderCreateData.member_goods_card[sku_id] : 0,
-				cardList: this.$util.deepClone(this.calculateGoodsData.goods_list[index].member_card_list),
-				click: (item_id) => {
-					this.selectGoodsCard.itemId = this.selectGoodsCard.itemId == item_id ? 0 : item_id;
-				}
-			}
-			this.$refs.memberGoodsCardPopup.open();
-		},
-		/**
-		 * 选择次卡
-		 */
-		saveMemberGoodsCard() {
-			this.orderCreateData.member_goods_card[this.selectGoodsCard.skuId] = this.selectGoodsCard.itemId || 0;
-			this.$refs.memberGoodsCardPopup.close();
-			this.payment();
-		},
-		back() {
-			uni.navigateBack({
-				delta: 1
-			});
-		},
-		getStoreList() {
-			let storeList = null;
-			if (this.orderCreateData.delivery) {
-				if (this.orderCreateData.delivery.delivery_type == 'local' && this.localConfig) {
-					storeList = this.localConfig.store_list;
-					storeList = storeList.reduce((res, item) => {
-						return {
-							...res,
-							[item.store_id]: item
-						};
-					}, {});
-
-				}
-				if (this.orderCreateData.delivery.delivery_type == 'store' && this.storeConfig) {
-					storeList = this.storeConfig.store_list;
-					storeList = storeList.reduce((res, item) => {
-						return {
-							...res,
-							[item.store_id]: item
-						};
-					}, {});
-				}
-			}
-			return storeList;
-		},
-		getStore(mescroll) {
-			this.$api.sendRequest({
-				url: '/api/store/getStorePage',
-				data: {
-					page_size: mescroll.size,
-					page: mescroll.num,
-					latitude: this.latitude ?? '',
-					longitude: this.longitude ?? '',
-					type: this.orderCreateData.delivery.delivery_type
-				},
-				success: res => {
-					let newArr = [];
-					let msg = res.message;
-					if (res.code == 0 && res.data) {
-						newArr = res.data.list;
-					}
-					mescroll.endSuccess(newArr.length);
-					//设置列表数据
-
-					if (mescroll.num == 1) this.storeData = []; //如果是第一页需手动制空列表
-					this.storeData = this.storeData.concat(newArr); //追加新数据
-				},
-				fail: res => {
-					mescroll.endErr();
-				}
-			});
-		}
-	},
-	filters: {
-		// 金额格式化输出
-		moneyFormat(money) {
-			return parseFloat(money).toFixed(2);
-		}
-	}
+import htmlParser from '@/common/js/html-parser';
+
+export default {
+	options: {
+		styleIsolation: 'shared'
+	},
+	data() {
+		return {
+			outTradeNo: '',
+			isIphoneX: false,
+			orderCreateData: {
+				is_balance: 0,
+				is_point: 1,
+				is_invoice: 0, // 是否需要发票 0 无发票  1 有发票
+				invoice_type: 0, // 发票类型  1 纸质 2 电子
+				invoice_title_type: 1, // 抬头类型  1 个人 2 企业
+				is_tax_invoice: 0, // 是否需要增值税专用发票  0 不需要 1 需要
+				/*coupon: {
+					coupon_id: 0
+				},*/
+				coupon: [],
+				delivery: {},
+				member_goods_card: {}, // 会员次卡
+				order_key: '',
+				buyer_message: ''
+			},
+			paymentData: null,
+			calculateData: null,
+			tempData: null,
+			storeId: 0,
+			deliveryTime: '', // 提货时间
+			memberAddress: null, // 会员收货地址
+			localMemberAddress: null, // 会员本地配送收货地址
+			isRepeat: false,
+			promotionInfo: null,
+			transactionAgreement: {}, // 购买须知
+			tempFormData: null,
+			menuButtonBounding: {}, // 小程序胶囊属性
+			storeConfig: null,
+			localConfig: null,
+			selectGoodsCard: {
+				skuId: 0,
+				itemId: 0,
+				cardList: {}
+			}, // 当前选择的次卡
+			storeData: [],
+			latitude: '',
+			longitude: '',
+			coupon_list: [],
+			modules: [],
+			
+			//商户
+			shop_goods_list:[],
+			merchCoupon: {
+				merch_id: 0,
+				data: []
+			},
+			selectCouponId:0
+		}
+	},
+	inject: ['promotion'],
+	created() {
+		// #ifdef MP
+		this.menuButtonBounding = uni.getMenuButtonBoundingClientRect();
+		// #endif
+		this.isIphoneX = this.$util.uniappIsIPhoneX()
+		if (this.storeToken) {
+			Object.assign(this.orderCreateData, uni.getStorageSync(this.createDataKey))
+			if (this.location) {
+				this.orderCreateData.latitude = this.location.latitude;
+				this.orderCreateData.longitude = this.location.longitude;
+				this.latitude = this.location.latitude;
+				this.longitude = this.location.longitude;
+			}
+			this.payment();
+		} else {
+			this.$nextTick(() => {
+				this.$refs.loadingCover.hide();
+				this.$refs.login.open(this.$util.getCurrentRoute().path)
+			})
+		}
+		this.getTransactionAgreement();
+	},
+	computed: {
+		goodsData() {
+			if (this.paymentData) {
+				this.paymentData.goods_list.forEach(item => {
+					if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
+				})
+				return this.paymentData;
+			}
+		},
+		calculateGoodsData() {
+			if (this.calculateData) {
+				this.calculateData.goods_list.forEach(item => {
+					if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
+				})
+				return this.calculateData;
+			}
+		},
+		// 余额可抵扣金额
+		balanceDeduct() {
+			if (this.calculateData) {
+				if (this.calculateData.member_account && this.calculateData.member_account.balance_total <= parseFloat(this.calculateData.order_money).toFixed(2)) {
+					return parseFloat(this.calculateData.member_account.balance_total).toFixed(2);
+				} else {
+					return parseFloat(this.calculateData.order_money).toFixed(2);
+				}
+			}
+		},
+		// 门店列表
+		storeList() {
+			return this.getStoreList();
+		},
+		// 门店信息
+		storeInfo() {
+			let storeList = this.getStoreList();
+			if (storeList && this.orderCreateData.delivery && this.orderCreateData.delivery.delivery_type != 'express' && this.storeId) {
+				return storeList[this.orderCreateData.delivery.store_id];
+			}
+			return null;
+		},
+		// 会员卡购买周期
+		cardChargeType() {
+			if (this.paymentData && this.paymentData.recommend_member_card && Object.keys(this.paymentData.recommend_member_card).length > 0) {
+				let charge_rule_arr = [];
+				let charge_rule = this.paymentData.recommend_member_card.charge_rule;
+				Object.keys(charge_rule).forEach((key, index) => {
+					switch (key) {
+						case 'week':
+							charge_rule_arr.push({
+								'key': key,
+								'value': charge_rule[key],
+								'title': '周卡',
+								unit: '周'
+							});
+							break;
+						case 'month':
+							charge_rule_arr.push({
+								'key': key,
+								'value': charge_rule[key],
+								'title': '月卡',
+								unit: '月'
+							});
+							break;
+						case 'quarter':
+							charge_rule_arr.push({
+								'key': key,
+								'value': charge_rule[key],
+								'title': '季卡',
+								unit: '季'
+							});
+							break;
+						case 'year':
+							charge_rule_arr.push({
+								'key': key,
+								'value': charge_rule[key],
+								'title': '年卡',
+								unit: '年'
+							});
+							break;
+					}
+				})
+				return charge_rule_arr;
+			}
+		}
+	},
+	watch: {
+		storeToken: function (nVal, oVal) {
+			this.payment();
+		},
+		deliveryTime: function (nVal) {
+			if (!nVal) this.$refs.timePopup.refresh();
+		},
+		location: function (nVal) {
+			if (nVal) {
+				this.orderCreateData.latitude = nVal.latitude;
+				this.orderCreateData.longitude = nVal.longitude;
+				this.latitude = nVal.latitude;
+				this.longitude = nVal.longitude;
+				this.payment();
+			}
+		},
+		calculateGoodsData(nVal) {
+			if (nVal && nVal.local_config && nVal.local_config.info.time_is_open && !this.deliveryTime) this.localtime('no');
+		}
+	},
+	methods: {
+		//多商户商品分类
+		goodsSpecFormat(goods_list){
+			goods_list.forEach(item => {
+				if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
+			})
+			return goods_list
+		},
+		/**
+		 * 父级页面onShow调用
+		 */
+		pageShow() {
+			if (uni.getStorageSync('addressBack')) {
+				uni.removeStorageSync('addressBack');
+				this.payment();
+			}
+		},
+		/**
+		 * 获取订单结算数据
+		 */
+		payment() {
+			this.$api.sendRequest({
+				url: this.api.payment,
+				data: this.handleCreateData(),
+				success: res => {
+					if (res.code == 0 && res.data) {
+						let data = res.data;
+
+						// #ifdef MP-WEIXIN
+						var scene = uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync().scene;
+						if ([1175, 1176, 1177, 1191, 1195].indexOf(scene) != -1 && data.delivery.express_type) {
+							data.delivery.express_type = data.delivery.express_type.filter(item => item.name == 'express');
+						}
+						// #endif
+
+						if (data) {
+							// 配送方式
+							if (data.delivery.express_type && data.delivery.express_type.length) {
+								let deliveryStorage = uni.getStorageSync('delivery');
+								let delivery = data.delivery.express_type[0];
+								data.delivery.express_type.forEach(item => {
+									if (deliveryStorage && item.name == deliveryStorage.delivery_type) {
+										delivery = item;
+									}
+									if (item.name == 'local') this.localConfig = item;
+									if (item.name == 'store') this.storeConfig = item;
+								})
+								this.selectDeliveryType(delivery, false, data.member_account);
+							}
+						}
+
+						// 地址、手机号
+						if (data.is_virtual) {
+							this.orderCreateData.member_address = {
+								mobile: data.member_account.mobile ? data.member_account.mobile : ''
+							}
+						}
+
+						//记录订单key
+						this.orderCreateData.order_key = data.order_key;
+
+						this.modules = data.modules;
+						
+						//记录多商户优惠券
+						this.orderCreateData.coupon = data.coupon
+						
+						//查询优惠券
+						this.getCouponList();
+
+						// 处理表单数据
+						data = this.handleGoodsFormData(data);
+
+						// 该方法在父级组件中
+						this.promotionInfo = this.promotion(data);
+
+						this.paymentData = data;
+						
+						this.$forceUpdate();
+						this.calculate();
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+
+						setTimeout(() => {
+							this.$util.redirectTo('/pages/index/index');
+						}, 1000)
+					}
+				}
+			})
+		},
+		//查询优惠券
+		getCouponList() {
+			//查询优惠券
+			if (this.modules.indexOf('coupon') != -1) {
+				this.$api.sendRequest({
+					url: '/api/ordercreate/getcouponlist',
+					data: this.orderCreateData,
+					success: res => {
+						if (res.code == 0 && res.data) {
+							let data = res.data;
+							this.coupon_list = data;
+							this.$forceUpdate();
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+
+				// this.orderCreateData.coupon.coupon_id = 0;
+			}
+
+		},
+		/**
+		 * 处理商品表单数据
+		 * @param {Object} data
+		 */
+		handleGoodsFormData(data) {
+			let goodsFormData = uni.getStorageSync('goodFormData');
+			data.goods_list.forEach(item => {
+				if (item.goods_form) {
+					let formData = {};
+					if (item.form_data) {
+						item.form_data.map(formIem => {
+							formData[formIem.id] = formIem;
+						})
+					} else if (goodsFormData && goodsFormData.goods_id == item.goods_id) {
+						goodsFormData.form_data.map(formIem => {
+							formData[formIem.id] = formIem;
+						})
+					}
+					if (Object.keys(formData).length) {
+						item.goods_form.json_data.forEach(formIem => {
+							if (formData[formIem.id]) {
+								formIem.val = formData[formIem.id].val;
+							}
+						})
+					}
+				}
+			});
+			return data;
+		},
+		/**
+		 * 订单创建
+		 */
+		calculate() {
+			this.$api.sendRequest({
+				url: this.api.calculate,
+				data: this.handleCreateData(),
+				success: res => {
+					if (this.$refs.loadingCover && this.$refs.loadingCover.isShow) this.$refs.loadingCover.hide();
+					if (res.code == 0 && res.data) {
+
+						// 处理表单数据
+						this.calculateData = this.handleGoodsFormData(res.data);
+
+						//多商户商品
+						this.shop_goods_list = res.data.shop_goods_list
+						//---------
+						this.calculateData.coupon_list = this.coupon_list;
+						if (res.data.delivery) {
+							if (res.data.delivery.delivery_type == 'express') this.memberAddress = res.data.delivery.member_address;
+							if (res.data.delivery.delivery_type == 'local') {
+								this.localMemberAddress = res.data.delivery.member_address;
+							}
+						}
+						// 次卡
+						res.data.goods_list.forEach(item => {
+							if (item.member_card_list) {
+								if (this.orderCreateData.member_goods_card[item.sku_id]) {
+									let itemId = this.orderCreateData.member_goods_card[item.sku_id];
+									if (!item.member_card_list[itemId]) delete this.orderCreateData.member_goods_card[item.sku_id];
+								}
+							} else if (this.orderCreateData.member_goods_card[item.sku_id]) {
+								delete this.orderCreateData.member_goods_card[item.sku_id];
+							}
+						});
+						//多商户
+						this.orderCreateData.coupon = res.data.coupon
+						// if (!res.data.coupon_id) this.orderCreateData.coupon.coupon_id = 0;
+						// else this.orderCreateData.coupon.coupon_id = res.data.coupon_id;
+
+						this.$forceUpdate();
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				}
+			})
+		},
+		/**
+		 * 提交订单
+		 */
+		create() {
+			if (!this.verify() || this.isRepeat) return;
+			this.isRepeat = true;
+			uni.showLoading({
+				title: ''
+			});
+			this.$api.sendRequest({
+				url: this.api.create,
+				data: this.handleCreateData(),
+				success: res => {
+					uni.hideLoading();
+					if (res.code == 0) {
+						this.outTradeNo = res.data;
+						uni.removeStorageSync('deliveryTime');
+						uni.removeStorageSync('goodFormData');
+						uni.setStorageSync('paySource', '');
+						if (this.calculateData.pay_money == 0) {
+							// #ifdef MP
+							if (this.paymentData.is_virtual || this.orderCreateData.delivery.delivery_type == 'store') {
+								this.$util.subscribeMessage('ORDER_VERIFY_OUT_TIME,VERIFY_CODE_EXPIRE,VERIFY');
+							}
+							// #endif
+							this.$util.redirectTo('/pages_tool/pay/result', {
+								code: res.data
+							}, 'redirectTo');
+						} else {
+							this.openChoosePayment();
+						}
+						// 更新购物车数量
+						this.$store.dispatch('getCartNumber');
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+						this.isRepeat = false;
+					}
+				}
+			})
+		},
+		/**
+		 * 处理订单计算、创建传参
+		 */
+		handleCreateData() {
+			let data = this.$util.deepClone(this.orderCreateData);
+			// 订单表单
+			if (this.$refs.form) {
+				data.form_data = {
+					form_id: this.paymentData.system_form.id,
+					form_data: this.$util.deepClone(this.$refs.form.formData)
+				};
+			}
+			// 商品表单
+			if (this.$refs.goodsForm) {
+				if (!data.form_data) data.form_data = {};
+				data.form_data.goods_form = {};
+				this.$refs.goodsForm.forEach(item => {
+					data.form_data.goods_form[item._props.customAttr.sku_id] = {
+						form_id: item._props.customAttr.form_id,
+						form_data: this.$util.deepClone(item.formData)
+					}
+				})
+			}
+			Object.keys(data).forEach((key) => {
+				let item = data[key];
+				if (typeof item == 'object') data[key] = JSON.stringify(item);
+			})
+
+			if (this.paymentData && this.orderCreateData.is_virtual == 0) {
+				if (data.member_address && this.orderCreateData.delivery && this.orderCreateData.delivery.delivery_type != 'store') {
+					delete data.member_address;
+				}
+			}
+
+			return data;
+		},
+		/**
+		 * 打开支付弹窗
+		 */
+		openChoosePayment() {
+			// #ifdef MP
+			if (this.paymentData.is_virtual) {
+				if(this.paymentData?.is_virtual_delivery == 1){
+					this.$util.subscribeMessage('ORDER_URGE_PAYMENT,ORDER_PAY,ORDER_DELIVERY');
+				}else{
+					this.$util.subscribeMessage('ORDER_URGE_PAYMENT,ORDER_PAY');
+				}
+			} else {
+				switch (this.orderCreateData.delivery.delivery_type) {
+					case 'express': //物流配送
+						this.$util.subscribeMessage('ORDER_URGE_PAYMENT,ORDER_PAY,ORDER_DELIVERY');
+						break;
+					case 'store': //门店自提
+						this.$util.subscribeMessage('ORDER_URGE_PAYMENT,ORDER_PAY');
+						break;
+					case 'local': //同城配送
+						this.$util.subscribeMessage('ORDER_URGE_PAYMENT,ORDER_PAY,ORDER_DELIVERY');
+						break;
+				}
+			}
+			// #endif
+
+			this.$refs.choosePaymentPopup.getPayInfo(this.outTradeNo);
+		},
+		verify() {
+			if (this.paymentData.is_virtual == 1) {
+				if (!this.orderCreateData.member_address.mobile) {
+					this.$util.showToast({
+						title: '请输入预留手机'
+					});
+					return false;
+				}
+				if (!this.$util.verifyMobile(this.orderCreateData.member_address.mobile)) {
+					this.$util.showToast({
+						title: '请输入正确的手机号'
+					});
+					return false;
+				}
+			} else {
+				if (!this.orderCreateData.delivery || !this.orderCreateData.delivery.delivery_type) {
+					this.$util.showToast({
+						title: '商家未设置配送方式'
+					});
+					return false;
+				}
+				if (
+					(this.orderCreateData.delivery.delivery_type == 'express' && !this.memberAddress) ||
+					(this.orderCreateData.delivery.delivery_type == 'local' && !this.localMemberAddress)
+				) {
+					this.$util.showToast({
+						title: '请先选择您的收货地址'
+					});
+					return false;
+				}
+
+				if (this.orderCreateData.delivery.delivery_type == 'store') {
+					if (!this.orderCreateData.delivery.store_id) {
+						this.$util.showToast({
+							title: '没有可提货的门店,请选择其他配送方式'
+						});
+						return false;
+					}
+					if (!this.orderCreateData.member_address.mobile) {
+						this.$util.showToast({
+							title: '请输入预留手机'
+						});
+						return false;
+					}
+					if (!this.$util.verifyMobile(this.orderCreateData.member_address.mobile)) {
+						this.$util.showToast({
+							title: '请输入正确的手机号'
+						});
+						return false;
+					}
+					if (!this.deliveryTime) {
+						this.$util.showToast({
+							title: '请选择提货时间'
+						});
+						return false;
+					}
+				}
+
+				if (this.orderCreateData.delivery.delivery_type == 'local') {
+					if (!this.orderCreateData.delivery.store_id) {
+						this.$util.showToast({
+							title: '没有可配送的门店,请选择其他配送方式'
+						});
+						return false;
+					}
+					if (this.calculateGoodsData.config.local.is_use && this.calculateGoodsData.delivery.local.info.time_is_open == 1 && !this.deliveryTime) {
+						this.$util.showToast({
+							title: '请选择送达时间'
+						});
+						return false;
+					}
+				}
+			}
+
+			if (this.$refs.goodsForm) {
+				let formVerify = true;
+				for (let i = 0; i < this.$refs.goodsForm.length; i++) {
+					let item = this.$refs.goodsForm[i];
+					formVerify = item.verify();
+					if (!formVerify) {
+						break;
+					}
+				}
+				if (!formVerify) return false;
+			}
+			if (this.paymentData.system_form) {
+				let formVerify = this.$refs.form.verify();
+				if (!formVerify) return false;
+			}
+			return true;
+		},
+		/**
+		 * 选择收货地址
+		 */
+		selectAddress() {
+			var params = {
+				back: this.$util.getCurrentRoute().path,
+				local: 0,
+				type: 1
+			}
+			// 外卖配送需要定位地址
+			if (this.orderCreateData.delivery.delivery_type == 'local') {
+				params.local = 1;
+				params.type = 2;
+			}
+			this.$util.redirectTo('/pages_tool/member/address', params);
+		},
+		/**
+		 * 选择配送方式
+		 * @param data
+		 * @param calculate
+		 * @param member_account
+		 */
+		selectDeliveryType(data, calculate = true, member_account = null) {
+			if (this.orderCreateData.delivery && this.orderCreateData.delivery.delivery_type == data.name) return;
+
+			this.orderCreateData.delivery.buyer_ask_delivery_time = {
+				start_date: '',
+				end_date: ''
+			};
+			this.deliveryTime = '';
+
+			let delivery = {
+				delivery_type: data.name,
+				delivery_type_name: data.title
+			};
+
+			// 如果是门店配送或者门店自提
+			if (data.name == 'store' || data.name == 'local') {
+				if (data.store_list[0]) {
+					delivery.store_id = data.store_list[0].store_id;
+				}
+				this.storeId = delivery.store_id ? delivery.store_id : 0;
+
+				if (!this.orderCreateData.member_address) {
+					if (this.paymentData) {
+						this.orderCreateData.member_address = {
+							name: this.paymentData.member_account.nickname,
+							mobile: this.paymentData.member_account.mobile
+						};
+					} else if (member_account) {
+						this.orderCreateData.member_address = {
+							name: member_account.nickname,
+							mobile: member_account.mobile
+						};
+
+					}
+				}
+			}
+
+			this.$set(this.orderCreateData, 'delivery', delivery);
+			uni.setStorageSync('delivery', delivery);
+
+			// 配送方式不为门店配送时
+			if (this.orderCreateData.delivery.delivery_type != 'express' && !this.location) this.$util.getLocation();
+			if (calculate) this.payment();
+
+			if (data.name == 'store') this.storetime('no');
+			if (data.name == 'local') this.localtime('no');
+		},
+		/**
+		 * 图片错误
+		 * @param {Object} index
+		 */
+		imageError(index) {
+			this.paymentData.goods_list[index].sku_image = this.$util.getDefaultImage().goods;
+			this.calculateData.goods_list[index].sku_image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		},
+		/**
+		 * 选择门店
+		 * @param {Object} data
+		 */
+		selectPickupPoint(data) {
+			if (data.store_id != this.storeId) {
+				this.storeId = data.store_id;
+				this.orderCreateData.delivery.store_id = data.store_id;
+				this.payment();
+				this.resetDeliveryTime();
+				// 存储所选门店
+				let delivery = uni.getStorageSync('delivery');
+				delivery.store_id = data.store_id;
+				uni.setStorageSync('delivery', delivery)
+			}
+			this.$refs.deliveryPopup.close();
+		},
+		/**
+		 * 重置提货时间
+		 */
+		resetDeliveryTime() {
+			this.orderCreateData.delivery.buyer_ask_delivery_time = {
+				start_date: '',
+				end_date: ''
+			};
+			this.deliveryTime = '';
+			uni.removeStorageSync('deliveryTime');
+		},
+		/**
+		 * 门店
+		 */
+		storetime(type = '') {
+			if (this.storeInfo) {
+				let data = this.$util.deepClone(this.storeInfo);
+				data.delivery_time = typeof data.delivery_time == 'string' && data.delivery_time ? JSON.parse(data.delivery_time) : data.delivery_time;
+				if (!data.delivery_time || data.delivery_time.length == undefined && !data.delivery_time.length) {
+					data.delivery_time = [{
+						start_time: data.start_time,
+						end_time: data.end_time
+					}]
+				}
+				let obj = {
+					delivery: this.orderCreateData.delivery,
+					dataTime: data
+				};
+				this.$refs.timePopup.open(obj, type);
+				this.$forceUpdate();
+			}
+		},
+		/**
+		 * 选择自提时间
+		 * @param {Object} data
+		 */
+		selectPickupTime(data) {
+			this.deliveryTime = data.data.month + '(' + data.data.time + ')';
+
+			this.orderCreateData.delivery.buyer_ask_delivery_time = {
+				start_date:data.data.start_date,
+				end_date:data.data.end_date
+			};
+
+			//将时间缓存，避免切换地址时重置
+			uni.setStorageSync('deliveryTime', {
+				'deliveryTime': this.deliveryTime,
+				'buyer_ask_delivery_time': this.orderCreateData.delivery.buyer_ask_delivery_time,
+				'delivery_type': this.orderCreateData.delivery.delivery_type
+			});
+
+		},
+		storeImgError() {
+			this.storeInfo.store_image = this.$util.getDefaultImage().store;
+		},
+		openPopup(ref) {
+			if (ref == 'deliveryPopup' && (!this.storeList || Object.keys(this.storeList).length <= 1)) return;
+			this.tempData = this.$util.deepClone(this.orderCreateData);
+			this.$refs[ref].open();
+		},
+		closePopup(ref) {
+			this.orderCreateData = this.$util.deepClone(this.tempData);
+			this.$refs[ref].close();
+			this.tempData = null;
+		},
+		//优惠券单独多商户
+		/**
+		 * 显示店铺优惠券信息
+		 * @param {Object} siteId
+		 * @param {Object} couponData
+		 */
+		openSiteCoupon(merch_id) {
+		
+			this.tempData = this.$util.deepClone(this.orderCreateData);
+			this.merchCoupon.merch_id = merch_id;
+			this.selectCouponId = this.orderCreateData.coupon[merch_id].coupon_id;
+			// this.selectCouponMoney = this.orderCreateData.coupon[siteId].coupon_money;
+		
+			this.merchCoupon.data = this.coupon_list[merch_id];
+			this.$refs.couponPopup.open();
+			this.$forceUpdate();
+		},
+		/**商户选择券*/
+		selectCoupon(data,merch_id) {
+		
+			// if (this.orderCreateData.coupon[merch_id].coupon_id == data.coupon_id){
+			// 	this.orderCreateData.coupon[merch_id].coupon_id = 0
+			// }else{
+			// 	this.orderCreateData.coupon[merch_id].coupon_id = data.coupon_id
+			// };
+			if (this.selectCouponId != data.coupon_id) {
+				this.selectCouponId = data.coupon_id;
+			} else {
+				this.selectCouponId = 0;
+			}
+			this.$forceUpdate();
+			// this.orderCreateData.coupon[merch_id].coupon_id = data.coupon_id
+			console.log(this.selectCouponId)
+		},
+		//确定使用优惠券
+		useCpopon() {
+			console.log(this.merchCoupon.merch_id)
+			this.orderCreateData.coupon[this.merchCoupon.merch_id].coupon_id = this.selectCouponId;
+			console.log(this.orderCreateData.coupon)
+			this.$refs.couponPopup.close();
+			this.calculate();
+		},
+		
+		//-------------------
+		/**
+		 * 选择优惠券
+		 * @param {Object} data
+		 */
+		/*selectCoupon(data) {
+			if (this.orderCreateData.coupon.coupon_id == data.coupon_id) this.orderCreateData.coupon = {
+				coupon_id: 0
+			};
+			else this.orderCreateData.coupon = {
+				coupon_id: data.coupon_id
+			};
+		},*/
+		/**
+		 * 使用优惠券
+		 */
+		// useCpopon() {
+		// 	this.$refs.couponPopup.close();
+		// 	this.calculate();
+		// },
+		/**
+		 * 切换发票开关
+		 */
+		changeIsInvoice() {
+			if (this.orderCreateData.is_invoice == 0) {
+				this.orderCreateData.is_invoice = 1;
+				if (!this.orderCreateData.invoice_type) this.orderCreateData.invoice_type = this.goodsData.invoice.invoice_type.split(',')[0];
+			} else {
+				this.orderCreateData.is_invoice = 0;
+			}
+		},
+		/**
+		 * 切换发票类型
+		 * @param {Object} invoice_type
+		 */
+		changeInvoiceType(invoice_type) {
+			this.orderCreateData.invoice_type = invoice_type;
+		},
+		/**
+		 * 切换发票个人还是企业
+		 * @param {Object} invoice_title_type
+		 */
+		changeInvoiceTitleType(invoice_title_type) {
+			this.orderCreateData.invoice_title_type = invoice_title_type;
+		},
+		/**
+		 * 切换增值税专用发票开关
+		 */
+		changeIsTaxInvoice() {
+			if (this.orderCreateData.is_tax_invoice == 0) this.orderCreateData.is_tax_invoice = 1;
+			else this.orderCreateData.is_tax_invoice = 0;
+			this.$forceUpdate();
+		},
+		/**
+		 * 选择发票内容
+		 * @param {Object} invoice_content
+		 */
+		changeInvoiceContent(invoice_content) {
+			this.orderCreateData.invoice_content = invoice_content;
+			this.$forceUpdate();
+		},
+		/**
+		 * 验证发票内容
+		 */
+		invoiceVerify() {
+			if (!this.orderCreateData.invoice_title) {
+				this.$util.showToast({
+					title: '请填写发票抬头'
+				});
+				return false;
+			}
+			if (!this.orderCreateData.taxpayer_number && this.orderCreateData.invoice_title_type == 2) {
+				this.$util.showToast({
+					title: '请填写纳税人识别号'
+				});
+				return false;
+			}
+			if (this.orderCreateData.invoice_type == 1 && !this.orderCreateData.invoice_full_address && this.paymentData.is_virtual == 1) {
+				this.$util.showToast({
+					title: '请填写发票邮寄地址'
+				});
+				return false;
+			}
+			if (this.orderCreateData.invoice_type == 2 && !this.orderCreateData.invoice_email) {
+				this.$util.showToast({
+					title: '请填写邮箱'
+				});
+				return false;
+			}
+			if (this.orderCreateData.invoice_type == 2) {
+				var reg = /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/;
+				if (!reg.test(this.orderCreateData.invoice_email)) {
+					this.$util.showToast({
+						title: '请填写正确的邮箱'
+					});
+					return false;
+				}
+			}
+			if (!this.orderCreateData.invoice_content) {
+				this.$util.showToast({
+					title: '请选择发票内容'
+				});
+				return false;
+			}
+			return true;
+		},
+		/**
+		 * 保存发票设置
+		 */
+		saveInvoice() {
+			if (this.orderCreateData.is_invoice == 1 && !this.invoiceVerify()) return;
+			this.calculate();
+			this.$refs.invoicePopup.close();
+		},
+		/**
+		 * 保存留言
+		 */
+		saveBuyerMessage() {
+			this.$refs.buyerMessagePopup.close();
+		},
+		/**
+		 * 选择会员卡
+		 */
+		selectMemberCard() {
+			this.orderCreateData.is_open_card = this.orderCreateData.is_open_card ? 0 : 1;
+			if (!this.orderCreateData.member_card_unit) this.orderCreateData.member_card_unit = this.cardChargeType[0].key;
+			this.payment();
+		},
+		/**
+		 * 选择会员卡充值类型
+		 * @param {Object} key
+		 */
+		selectMembercardUnit(key) {
+			this.orderCreateData.member_card_unit = key;
+			this.calculate();
+		},
+		/**
+		 * 使用积分抵扣
+		 */
+		usePoint() {
+			this.orderCreateData.is_point = this.orderCreateData.is_point ? 0 : 1;
+			this.calculate();
+		},
+		/**
+		 * 支付弹窗关闭
+		 */
+		payClose() {
+			// 更新购物车数量
+			this.$store.dispatch('getCartNumber');
+			this.$util.redirectTo('/pages/order/detail', {
+				order_id: this.$refs.choosePaymentPopup.payInfo.order_id
+			}, 'redirectTo');
+		},
+		
+		/**
+		 * 同城配送送达时间
+		 */
+		localtime(type = '') {
+			if (this.calculateGoodsData && this.calculateGoodsData.config.local) {
+				let data = this.$util.deepClone(this.calculateGoodsData.delivery.local.info);
+				if (Object.keys(data).length) {
+					if (data.delivery_time) {
+						data.end_time = data.delivery_time[(data.delivery_time.length - 1)].end_time;
+					}
+
+					let obj = {
+						delivery: this.orderCreateData.delivery,
+						dataTime: data
+					}
+
+					this.$refs.timePopup.open(obj, type);
+				}
+
+			}
+		},
+		/**
+		 * 剩余起送价
+		 */
+		surplusStartMoney() {
+			let money = 0;
+			if (this.calculateData && this.calculateData.delivery && this.calculateData.delivery.delivery_type == 'local') {
+				let startDeliveryMoney = this.calculateGoodsData.delivery.start_money ?? 0;
+				money = parseFloat(startDeliveryMoney) - parseFloat(this.calculateData.goods_money);
+				money = money < 0 ? 0 : money;
+			}
+			return money;
+		},
+		/**
+		 * 交易协议
+		 */
+		getTransactionAgreement() {
+			this.$api.sendRequest({
+				url: '/api/order/transactionagreement',
+				success: res => {
+					if (res.data) {
+						this.transactionAgreement = res.data;
+						if (this.transactionAgreement.content) this.transactionAgreement.content = htmlParser(this.transactionAgreement.content);
+					}
+				}
+			})
+		},
+		editForm(index) {
+			this.tempFormData = {
+				index: index,
+				json_data: this.$util.deepClone(this.goodsData.goods_list[index].goods_form.json_data)
+			};
+			this.$refs.editFormPopup.open();
+		},
+		saveForm() {
+			if (this.$refs.tempForm.verify()) {
+				this.$set(this.paymentData.goods_list[this.tempFormData.index].goods_form, 'json_data', this.$refs.tempForm.formData);
+				this.$refs.editFormPopup.close();
+			}
+		},
+		/**
+		 * 切换次卡
+		 * @param {Object} index
+		 */
+		selectMemberGoodsCard(index) {
+			let sku_id = this.goodsData.goods_list[index].sku_id;
+			this.selectGoodsCard = {
+				skuId: sku_id,
+				itemId: this.orderCreateData.member_goods_card[sku_id] ? this.orderCreateData.member_goods_card[sku_id] : 0,
+				cardList: this.$util.deepClone(this.calculateGoodsData.goods_list[index].member_card_list),
+				click: (item_id) => {
+					this.selectGoodsCard.itemId = this.selectGoodsCard.itemId == item_id ? 0 : item_id;
+				}
+			}
+			this.$refs.memberGoodsCardPopup.open();
+		},
+		/**
+		 * 选择次卡
+		 */
+		saveMemberGoodsCard() {
+			this.orderCreateData.member_goods_card[this.selectGoodsCard.skuId] = this.selectGoodsCard.itemId || 0;
+			this.$refs.memberGoodsCardPopup.close();
+			this.payment();
+		},
+		back() {
+			uni.navigateBack({
+				delta: 1
+			});
+		},
+		getStoreList() {
+			let storeList = null;
+			if (this.orderCreateData.delivery) {
+				if (this.orderCreateData.delivery.delivery_type == 'local' && this.localConfig) {
+					storeList = this.localConfig.store_list;
+					storeList = storeList.reduce((res, item) => {
+						return {
+							...res,
+							[item.store_id]: item
+						};
+					}, {});
+
+				}
+				if (this.orderCreateData.delivery.delivery_type == 'store' && this.storeConfig) {
+					storeList = this.storeConfig.store_list;
+					storeList = storeList.reduce((res, item) => {
+						return {
+							...res,
+							[item.store_id]: item
+						};
+					}, {});
+				}
+			}
+			return storeList;
+		},
+		getStore(mescroll) {
+			this.$api.sendRequest({
+				url: '/api/store/getStorePage',
+				data: {
+					page_size: mescroll.size,
+					page: mescroll.num,
+					latitude: this.latitude ?? '',
+					longitude: this.longitude ?? '',
+					type: this.orderCreateData.delivery.delivery_type
+				},
+				success: res => {
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data) {
+						newArr = res.data.list;
+					}
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+
+					if (mescroll.num == 1) this.storeData = []; //如果是第一页需手动制空列表
+					this.storeData = this.storeData.concat(newArr); //追加新数据
+				},
+				fail: res => {
+					mescroll.endErr();
+				}
+			});
+		}
+	},
+	filters: {
+		// 金额格式化输出
+		moneyFormat(money) {
+			return parseFloat(money).toFixed(2);
+		}
+	}
 }
\ No newline at end of file
diff --git a/components/payment/payment.vue b/components/payment/payment.vue
index 4147770..b240d20 100644
--- a/components/payment/payment.vue
+++ b/components/payment/payment.vue
@@ -1,654 +1,724 @@
-<template>
-    <view>
-        <!-- 选择支付方式弹窗 -->
-        <uni-popup ref="choosePaymentPopup" type="center" v-if="payInfo" :mask-click="false">
-            <view class="choose-payment-popup popup" @touchmove.prevent.stop>
-                <view class="popup-header">
-                    <text class="tit">支付方式</text>
-                    <text class="iconfont icon-close" @click="close()"></text>
-                </view>
-                <scroll-view scroll-y="true" class="popup-body">
-                    <view class="pay-money">
-                        <text class="money">支付金额{{ payMoney|moneyFormat }}元</text>
-                    </view>
-
-                    <view class="payment-item" v-if="balanceDeduct > 0 && balanceUsable && balanceConfig == 1">
-                        <view class="iconfont icon-yue"></view>
-                        <view class="info-wrap">
-                            <text class="name">余额支付</text>
-                            <view class="money">可用¥{{ balanceDeduct|moneyFormat }}</view>
-                        </view>
-                        <ns-switch class="balance-switch" @change="useBalance" :checked="isBalance == 1"></ns-switch>
-                    </view>
-                    <block v-if="payMoney > 0">
-                        <block v-if="payTypeList.length">
-                            <view class="payment-item" v-for="(item, index) in payTypeList" :key="index" @click="payIndex = index">
-                                <view class="iconfont" :class="item.icon"></view>
-                                <text class="name">{{ item.name }}</text>
-                                <text class="iconfont" :class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
-                            </view>
-                        </block>
-                        <block v-else>
-                            <view class="empty">平台尚未配置支付方式！</view>
-                        </block>
-                    </block>
-                </scroll-view>
-                <view class="popup-footer">
-                    <view class="confirm-btn color-base-bg" @click="confirm()">确认支付</view>
-                </view>
-            </view>
-        </uni-popup>
-    </view>
-</template>
-
-<!-- 新版支付组件 订单表为order表 的订单支付时使用该组件 -->
-<script>
-    import uniPopup from '@/components/uni-popup/uni-popup.vue';
-    import nsSwitch from '@/components/ns-switch/ns-switch.vue';
-
-    // #ifdef H5
-    import {
-        Weixin
-    } from 'common/js/wx-jssdk.js';
-    // #endif
-
-    export default {
-        name: 'payment',
-        components: {
-            uniPopup,
-            nsSwitch
-        },
-        props: {
-            // 是否可用余额支付
-            balanceUsable: {
-                type: Boolean,
-                default: true
-            }
-        },
-        data() {
-            return {
-                payIndex: 0,
-                // #ifdef H5
-                payTypeList: [{
-                        name: '支付宝支付',
-                        icon: 'icon-zhifubaozhifu-',
-                        type: 'alipay'
-                    },
-                    {
-                        name: '微信支付',
-                        icon: 'icon-weixin1',
-                        type: 'wechatpay'
-                    }
-                ],
-                timer: null,
-                // #endif
-                // #ifdef MP-WEIXIN
-                payTypeList: [{
-                    name: '微信支付',
-                    provider: 'wxpay',
-                    icon: 'icon-weixin1',
-                    type: 'wechatpay'
-                }],
-                // #endif
-                // #ifdef MP-ALIPAY
-                payTypeList: [{
-                    name: '支付宝支付',
-                    icon: 'icon-zhifubaozhifu-',
-                    type: 'alipay',
-                    provider: 'alipay'
-                }],
-                // #endif
-                payInfo: null,
-                balanceConfig: 0,
-                // 预售页面判断
-                sale: true,
-                isBalance: 0,
-                balance: 0
-            };
-        },
-        created(e) {
-            this.getPayType();
-            if (this.balanceUsable) this.getBalanceConfig();
-        },
-        computed: {
-            balanceDeduct() {
-                let money = 0;
-                if (this.payInfo && this.balance) {
-                    money = this.balance > this.payInfo.pay_money ? this.payInfo.pay_money : this.balance;
-                }
-                return money;
-            },
-            payMoney() {
-                let money = 0;
-                if (this.payInfo) {
-                    money = this.payInfo.pay_money;
-                    if (this.balanceDeduct && this.isBalance && this.balanceUsable) {
-                        money = this.payInfo.pay_money - this.balanceDeduct;
-                    }
-                }
-                return money;
-            }
-        },
-        methods: {
-            close() {
-                this.$emit('close');
-                this.$refs.choosePaymentPopup.close();
-            },
-            // 使用余额
-            useBalance() {
-                this.isBalance = this.isBalance ? 0 : 1;
-                this.$emit('useBalance', this.isBalance)
-            },
-            confirm() {
-                if (this.payTypeList.length == 0 && this.payMoney > 0) {
-                    this.$util.showToast({
-                        title: '请选择支付方式！'
-                    });
-                    return;
-                }
-                uni.showLoading({
-                    title: '支付中...',
-                    mask: true
-                });
-                this.pay();
-                uni.setStorageSync('pay_flag', 1);
-            },
-            getPayInfo(out_trade_no) {
-                this.$api.sendRequest({
-                    url: '/api/pay/info',
-                    data: {
-                        out_trade_no
-                    },
-                    success: res => {
-                        if (res.code >= 0 && res.data) {
-                            this.payInfo = res.data;
-                            if (this.balanceConfig && this.balanceUsable) this.getMemberBalance();
-                            setTimeout(() => {
-                                this.$refs.choosePaymentPopup.open();
-                            })
-                        } else {
-                            this.$util.showToast({
-                                title: '未获取到支付信息！'
-                            });
-                        }
-                    }
-                });
-            },
-            /**
-             * 获取余额配置
-             */
-            getBalanceConfig() {
-			
-                this.$api.sendRequest({
-                    url: '/api/pay/getBalanceConfig',
-                    data: {},
-                    success: res => {
-                        this.balanceConfig = res.data.balance_show;
-                    }
-                });
-            },
-            /**
-             * 获取用户余额
-             */
-            getMemberBalance() {
-                this.$api.sendRequest({
-                    url: '/api/memberaccount/usablebalance',
-                    success: res => {
-                        if (res.code == 0 && res.data) {
-                            this.balance = parseFloat(res.data.usable_balance);
-							//余额不足以抵扣整个订单时不显示
-							if(parseFloat(this.payMoney) > this.balance){
-								this.balanceConfig = 0
-							}
-                        }
-                    }
-                })
-            },
-            /**
-             * 查询支付方式
-             */
-            getPayType() {
-                this.$api.sendRequest({
-                    url: '/api/pay/type',
-                    success: res => {
-                        if (res.code == 0) {
-                            if (res.data.pay_type == '') {
-                                this.payTypeList = [];
-                            } else {
-                                this.payTypeList.forEach((val, key) => {
-                                    if (res.data.pay_type.indexOf(val.type) == -1) {
-                                        this.payTypeList.splice(key, 1);
-                                    }
-                                });
-                            }
-                        }
-                    }
-                });
-            },
-            // #ifdef H5
-            pay() {
-                var payType = this.payTypeList[this.payIndex];
-                var return_url = '';
-                if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
-                    return_url = '/pages_promotion/blindbox/index?outTradeNo=';
-                } else {
-                    return_url = '/pages_tool/pay/result?code=';
-                }
-                this.$api.sendRequest({
-                    url: '/api/pay/pay',
-                    data: {
-                        out_trade_no: this.payInfo.out_trade_no,
-                        pay_type: payType ? payType.type : '',
-                        return_url: encodeURIComponent(this.$config.h5Domain + return_url + this.payInfo
-                            .out_trade_no),
-                        is_balance: this.isBalance
-                    },
-                    success: res => {
-                        uni.hideLoading();
-                        if (res.code >= 0) {
-                            if (res.data.pay_success) {
-                                this.paySuccess();
-                                return;
-                            }
-                            switch (payType.type) {
-                                case 'alipay':
-                                    if (this.$util.isWeiXin()) {
-                                        var wx_alipay = encodeURIComponent(res.data.data);
-                                        this.$util.redirectTo('/pages_tool/pay/wx_pay', {
-                                            wx_alipay: wx_alipay,
-                                            out_trade_no: this.payInfo.out_trade_no
-                                        }, '', 'redirectTo');
-                                    } else {
-                                        location.href = res.data.data;
-                                        this.checkPayStatus();
-                                    }
-                                    break;
-                                case 'wechatpay':
-                                    if (this.$util.isWeiXin()) {
-                                        if (uni.getSystemInfoSync().platform == 'ios') {
-                                            var url = uni.getStorageSync('initUrl');
-                                        } else {
-                                            var url = location.href;
-                                        }
-                                        // 获取jssdk配置
-                                        this.$api.sendRequest({
-                                            url: '/wechat/api/wechat/jssdkconfig',
-                                            data: {
-                                                url: url
-                                            },
-                                            success: jssdkRes => {
-                                                var wxJS = new Weixin(),
-                                                    payData = res.data.data;
-                                                wxJS.init(jssdkRes.data);
-                                                wxJS.pay({
-                                                        timestamp: payData.timestamp ? payData.timestamp : payData.timeStamp,
-                                                        nonceStr: payData.nonceStr,
-                                                        package: payData.package,
-                                                        signType: payData.signType,
-                                                        paySign: payData.paySign
-                                                    },
-                                                    res => {
-                                                        if (res.errMsg == 'chooseWXPay:ok') {
-                                                            this.paySuccess();
-                                                        } else {
-                                                            this.$util.showToast({
-                                                                title: res.errMsg
-                                                            });
-                                                            setTimeout(() => {
-                                                                this.close();
-                                                            }, 1500)
-                                                        }
-                                                    },
-                                                    res => {
-                                                        this.$util.showToast({
-                                                            title: '您已取消支付'
-                                                        });
-                                                        this.resetpay();
-                                                    }
-                                                );
-                                            }
-                                        });
-                                    } else {
-                                        location.href = res.data.url;
-                                        this.checkPayStatus();
-                                    }
-                                    break;
-                            }
-                        } else {
-                            this.$util.showToast({
-                                title: res.message
-                            });
-                        }
-                    },
-                    fail: res => {
-                        uni.hideLoading();
-                        this.$util.showToast({
-                            title: 'request:fail'
-                        });
-                    }
-                });
-            },
-            checkPayStatus() {
-                this.timer = setInterval(() => {
-                    this.$api.sendRequest({
-                        url: '/api/pay/status',
-                        data: {
-                            out_trade_no: this.payInfo.out_trade_no
-                        },
-                        success: res => {
-                            if (res.code == 0) {
-                                if (res.data.pay_status == 2) {
-                                    clearInterval(this.timer);
-                                    this.paySuccess();
-                                }
-                            } else {
-                                clearInterval(this.timer);
-                            }
-                        }
-                    });
-                }, 1000);
-            },
-            // #endif
-            // #ifdef MP
-            pay() {
-                var payType = this.payTypeList[this.payIndex];
-                this.$api.sendRequest({
-                    url: '/api/pay/pay',
-                    data: {
-                        out_trade_no: this.payInfo.out_trade_no,
-                        pay_type: payType ? payType.type : '',
-                        scene: uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync().scene,
-                        is_balance: this.isBalance
-                    },
-                    success: res => {
-                        uni.hideLoading();
-                        if (res.code >= 0) {
-                            if (res.data.pay_success) {
-                                this.paySuccess();
-                                return;
-                            }
-                            var payData = res.data.data;
-
-                            // #ifdef MP-WEIXIN
-                            var scene = uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync().scene;
-                            if ([1175, 1176, 1177, 1191, 1195].indexOf(scene) != -1) {
-                                uni.requestOrderPayment({
-                                    timeStamp: payData.timeStamp,
-                                    nonceStr: payData.nonceStr,
-                                    package: payData.package,
-                                    signType: payData.signType,
-                                    paySign: payData.paySign,
-                                    success: res => {
-                                        this.paySuccess();
-                                    },
-                                    fail: res => {
-                                        this.flag = false;
-                                        if (res.errMsg == 'requestOrderPayment:fail cancel') {
-                                            this.$util.showToast({
-                                                title: '您已取消支付'
-                                            });
-                                            this.resetpay();
-                                        } else {
-                                            uni.showModal({
-                                                content: '支付失败,失败原因: ' + res.errMsg,
-                                                showCancel: false
-                                            });
-                                            setTimeout(() => {
-                                                this.close();
-                                            }, 1500)
-                                        }
-                                    }
-                                });
-                                return
-                            }
-                            // #endif
-
-                            uni.requestPayment({
-                                provider: payType.provider,
-                                ...payData,
-                                success: res => {
-                                    this.paySuccess();
-                                },
-                                fail: res => {
-                                    this.flag = false;
-                                    if (res.errMsg == 'requestPayment:fail cancel') {
-                                        this.$util.showToast({
-                                            title: '您已取消支付'
-                                        });
-                                        this.resetpay();
-                                    } else {
-                                        uni.showModal({
-                                            content: '支付失败,失败原因: ' + res.errMsg,
-                                            showCancel: false
-                                        });
-                                        setTimeout(() => {
-                                            this.close();
-                                        }, 1500)
-                                    }
-                                }
-                            });
-                        } else {
-                            this.$util.showToast({
-                                title: res.message
-                            });
-                        }
-                    },
-                    fail: res => {
-                        uni.hideLoading();
-                        this.$util.showToast({
-                            title: 'request:fail'
-                        });
-                    }
-                });
-            },
-            // #endif
-            /**
-             * 支付成功之后跳转
-             */
-            paySuccess() {
-                if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
-                    this.$util.redirectTo('/pages_promotion/blindbox/index', {
-                        outTradeNo: this.payInfo.out_trade_no
-                    }, 'redirectTo');
-                } else if (this.payInfo.return_url) {
-                    if (this.payInfo.return_url.indexOf('http://') != -1 || this.payInfo.return_url.indexOf('https://') != -1) location.replace(this.payInfo.return_url);
-                    else this.$util.redirectTo(this.payInfo.return_url, {}, 'redirectTo');
-                } else {
-                    this.$util.redirectTo('/pages_tool/pay/result', {
-                        code: this.payInfo.out_trade_no
-                    }, 'redirectTo');
-                }
-            },
-            /**
-             * 重置支付单据
-             */
-            resetpay() {
-                this.$api.sendRequest({
-                    url: '/api/pay/resetpay',
-                    data: {
-                        out_trade_no: this.payInfo.out_trade_no,
-                    },
-                    success: res => {
-                        if (res.code == 0) this.getPayInfo(res.data);
-                    }
-                })
-            }
-        },
-        // #ifdef H5
-        deactivated() {
-            clearInterval(this.timer);
-        },
-        // #endif
-    };
-</script>
-
-<style lang="scss" scoped>
-    .popup {
-        width: 75vw;
-        background: #fff;
-        border-top-left-radius: $border-radius;
-        border-top-right-radius: $border-radius;
-
-        .popup-header {
-            display: flex;
-            border-bottom: 2rpx solid $color-line;
-            position: relative;
-            padding: 40rpx;
-
-            .tit {
-                flex: 1;
-                font-size: $font-size-toolbar;
-                line-height: 1;
-                text-align: center;
-            }
-
-            .iconfont {
-                line-height: 1;
-                position: absolute;
-                right: 30rpx;
-                top: 50%;
-                transform: translate(0, -50%);
-                color: $color-tip;
-                font-size: $font-size-toolbar;
-            }
-        }
-
-        .popup-body {
-            height: calc(100% - 250rpx);
-
-            &.safe-area {
-                height: calc(100% - 270rpx);
-            }
-        }
-
-        .popup-footer {
-            height: 100rpx;
-
-            .confirm-btn {
-                height: 72rpx;
-                line-height: 72rpx;
-                color: #fff;
-                text-align: center;
-                margin: 20rpx 30rpx 0;
-                border-radius: $border-radius;
-            }
-
-            &.bottom-safe-area {
-                padding-bottom: constant(safe-area-inset-bottom);
-                padding-bottom: env(safe-area-inset-bottom);
-            }
-        }
-    }
-
-    .choose-payment-popup {
-        .payment-item {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            height: 90rpx;
-            margin: 0 30rpx;
-            border-bottom: 2rpx solid $color-line;
-            padding: 20rpx 0;
-
-            &:nth-child(2) {
-                padding-top: 0;
-            }
-
-            &:last-child {
-                border-bottom: none;
-            }
-
-            .iconfont {
-                font-size: 64rpx;
-            }
-
-            .icon-yue {
-                color: #faa218;
-            }
-
-            .icon-weixin1 {
-                color: #24af41;
-            }
-
-            .icon-zhifubaozhifu- {
-                color: #00a0e9;
-            }
-
-            .icon-checkboxblank {
-                font-size: 40rpx;
-                color: $color-line;
-            }
-
-            .icon-yuan_checked {
-                font-size: 40rpx;
-            }
-
-            .name {
-                margin-left: 20rpx;
-                font-size: $font-size-base;
-                flex: 1;
-            }
-
-            .info-wrap {
-                flex: 1;
-                margin-left: 20rpx;
-
-                .name {
-                    margin-left: 0;
-                    font-size: $font-size-base;
-                    flex: 1;
-                }
-
-                .money {
-                    color: $color-tip;
-                    font-size: $font-size-tag;
-                }
-            }
-
-            .box {
-                flex: 1;
-                padding: 0 10rpx;
-                line-height: inherit;
-                text-align: right;
-
-                input {
-                    font-size: $font-size-tag !important;
-                }
-            }
-
-            &.set-pay-password {
-                height: initial;
-
-                .box {
-                    font-size: $font-size-tag !important;
-                }
-            }
-        }
-
-        .pay-money {
-            text-align: center;
-            padding: 20rpx 0 40rpx 0;
-            background-color: #fff;
-            font-weight: bold;
-            margin-top: 30rpx;
-            line-height: 1;
-
-            .unit {
-                margin-right: 4rpx;
-                font-size: $font-size-tag;
-            }
-
-            .money {
-                font-size: $font-size-toolbar;
-            }
-        }
-    }
-
-    .empty {
-        width: 100%;
-        text-align: center;
-        padding: 40rpx 0;
-        color: $color-sub;
-        font-size: $font-size-tag;
-    }
+<template>
+    <view>
+        <!-- 选择支付方式弹窗 -->
+        <uni-popup ref="choosePaymentPopup" type="center" v-if="payInfo" :mask-click="false">
+            <view class="choose-payment-popup popup" @touchmove.prevent.stop>
+                <view class="popup-header">
+                    <text class="tit">支付方式</text>
+                    <text class="iconfont icon-close" @click="close()"></text>
+                </view>
+                <scroll-view scroll-y="true" class="popup-body">
+                    <view class="pay-money">
+                        <text class="money">支付金额{{ payMoney | moneyFormat }}元</text>
+                    </view>
+
+                    <view class="payment-item" v-if="balanceDeduct > 0 && balanceUsable && balanceConfig == 1">
+                        <view class="iconfont icon-yue"></view>
+                        <view class="info-wrap">
+                            <text class="name">余额抵扣</text>
+                            <view class="money">可用¥{{ balanceDeduct | moneyFormat }}</view>
+                        </view>
+                        <ns-switch class="balance-switch" @change="useBalance" :checked="isBalance == 1"></ns-switch>
+                    </view>
+                    <block v-if="payMoney > 0">
+                        <block v-if="payTypeList.length">
+                            <block v-for="(item, index) in payTypeList">
+                                <view v-if="offlineShow || item.type != 'offlinepay'" class="payment-item" :key="index"
+                                    @click="payIndex = index">
+                                    <view class="iconfont" :class="item.icon"></view>
+                                    <text class="name">{{ item.name }}</text>
+                                    <text class="iconfont"
+                                        :class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
+                                </view>
+                            </block>
+                        </block>
+                        <block v-else>
+                            <view class="empty">平台尚未配置支付方式！</view>
+                        </block>
+                    </block>
+                </scroll-view>
+                <view class="popup-footer">
+                    <view class="confirm-btn color-base-bg" @click="confirm()">确认支付</view>
+                </view>
+            </view>
+        </uni-popup>
+    </view>
+</template>
+
+<!-- 新版支付组件 订单表为order表 的订单支付时使用该组件 -->
+<script>
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import nsSwitch from '@/components/ns-switch/ns-switch.vue';
+
+// #ifdef H5
+import {
+    Weixin
+} from 'common/js/wx-jssdk.js';
+// #endif
+
+export default {
+    name: 'payment',
+    components: {
+        uniPopup,
+        nsSwitch
+    },
+    props: {
+        // 是否可用余额支付
+        balanceUsable: {
+            type: Boolean,
+            default: true
+        },
+    },
+    data() {
+        return {
+            payIndex: 0,
+            payTypeList: [
+                // #ifdef H5 || MP-ALIPAY
+                {
+                    name: '支付宝支付',
+                    icon: 'icon-zhifubaozhifu-',
+                    type: 'alipay'
+                },
+                // #endif
+                // #ifdef H5 || MP-WEIXIN
+                {
+                    name: '微信支付',
+                    icon: 'icon-weixin1',
+                    type: 'wechatpay'
+                },
+                // #endif
+                {
+                    name: '线下支付',
+                    icon: 'icondiy icon-yuezhifu',
+                    type: 'offlinepay'
+                },
+            ],
+            // #ifdef H5 
+            timer: null,
+            // #endif
+            payInfo: null,
+            balanceConfig: 0,
+            // 预售页面判断
+            sale: true,
+            isBalance: 0,
+            balance: 0,
+            //重置是否已完成，没有完成不能调用api/pay/pay
+            resetPayComplete: true,
+            repeatFlag: false,
+        };
+    },
+    created(e) {
+        this.getPayType();
+        if (this.balanceUsable) this.getBalanceConfig();
+    },
+    computed: {
+        balanceDeduct() {
+            let money = 0;
+            if (this.payInfo && this.balance) {
+                money = this.balance > this.payInfo.pay_money ? this.payInfo.pay_money : this.balance;
+            }
+            return money;
+        },
+        payMoney() {
+            let money = 0;
+            if (this.payInfo) {
+                money = this.payInfo.pay_money;
+                if (this.balanceDeduct && this.isBalance && this.balanceUsable) {
+                    money = this.payInfo.pay_money - this.balanceDeduct;
+                }
+            }
+            return money;
+        },
+        offlineShow() {
+            // 获取当前页面栈实例数组
+            const pages = getCurrentPages();
+            const currentPage = pages[pages.length - 1];
+            // 获取页面路由路径
+            let routePath = currentPage.route;
+            return this.$store.state.offlineWhiteList.length ? this.$store.state.offlineWhiteList.includes(routePath) : false
+        }
+    },
+    methods: {
+        /**
+         * 父级页面onShow调用
+         */
+        pageShow() {
+            if (this.payInfo) {
+                let offlinepay = uni.getStorageSync('offlinepay');
+                if (offlinepay) {
+                    uni.removeStorageSync('offlinepay');
+                    this.close()
+                }
+            } else {
+                uni.removeStorageSync('offlinepay');
+            }
+
+        },
+        close() {
+            this.$emit('close');
+            this.$refs.choosePaymentPopup.close();
+        },
+        // 使用余额
+        useBalance() {
+            this.isBalance = this.isBalance ? 0 : 1;
+            this.$emit('useBalance', this.isBalance)
+        },
+        confirm() {
+            if (this.payTypeList.length == 0 && this.payMoney > 0) {
+                this.$util.showToast({
+                    title: '请选择支付方式！'
+                });
+                return;
+            }
+            if (this.resetPayComplete == false) {
+                this.$util.showToast({
+                    title: '支付取消中，请稍后再试！'
+                });
+                return;
+            }
+            uni.showLoading({
+                title: '支付中...',
+                mask: true
+            });
+            if (this.repeatFlag) return;
+            this.repeatFlag = true;
+            this.pay();
+            uni.setStorageSync('pay_flag', 1);
+        },
+        getPayInfo(out_trade_no, callback) {
+            this.$api.sendRequest({
+                url: '/api/pay/info',
+                data: {
+                    out_trade_no
+                },
+                success: res => {
+                    if (res.code >= 0 && res.data) {
+                        this.payInfo = res.data;
+                        if (this.balanceConfig && this.balanceUsable) this.getMemberBalance();
+                        setTimeout(() => {
+                            this.$refs.choosePaymentPopup.open();
+                            if (typeof callback == 'function') callback();
+                        })
+                    } else {
+                        this.$util.showToast({
+                            title: '未获取到支付信息！'
+                        });
+                    }
+                }
+            });
+        },
+        /**
+         * 获取余额配置
+         */
+        getBalanceConfig() {
+            this.$api.sendRequest({
+                url: '/api/pay/getBalanceConfig',
+                data: {},
+                success: res => {
+                    this.balanceConfig = res.data.balance_show;
+                }
+            });
+        },
+        /**
+         * 获取用户余额
+         */
+        getMemberBalance() {
+            this.$api.sendRequest({
+                url: '/api/memberaccount/usablebalance',
+                success: res => {
+                    if (res.code == 0 && res.data) {
+                        this.balance = parseFloat(res.data.usable_balance);
+                    }
+                }
+            })
+        },
+        /**
+         * 查询支付方式
+         */
+        getPayType() {
+            this.$api.sendRequest({
+                url: '/api/pay/type',
+                success: res => {
+                    if (res.code == 0) {
+                        if (res.data.pay_type == '') {
+                            this.payTypeList = [];
+                        } else {
+                            this.payTypeList = this.payTypeList.filter((val, key) => {
+                                return res.data.pay_type.indexOf(val.type) != -1
+                            });
+                        }
+                    }
+                }
+            });
+        },
+        // #ifdef H5
+        pay() {
+            var payType = this.payTypeList[this.payIndex];
+            var return_url = '';
+            if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
+                return_url = '/pages_promotion/blindbox/index?outTradeNo=';
+            } else {
+                return_url = '/pages_tool/pay/result?code=';
+            }
+            this.$api.sendRequest({
+                url: '/api/pay/pay',
+                data: {
+                    out_trade_no: this.payInfo.out_trade_no,
+                    pay_type: payType ? payType.type : '',
+                    return_url: encodeURIComponent(this.$config.h5Domain + return_url + this.payInfo.out_trade_no),
+                    is_balance: this.isBalance
+                },
+                success: res => {
+                    uni.hideLoading();
+                    if (res.code >= 0) {
+                        if (res.data.pay_success) {
+                            this.paySuccess();
+                            return;
+                        }
+                        switch (payType.type) {
+                            case 'alipay':
+                                if (this.$util.isWeiXin()) {
+                                    var wx_alipay = encodeURIComponent(res.data.data);
+                                    this.$util.redirectTo('/pages_tool/pay/wx_pay', {
+                                        wx_alipay: wx_alipay,
+                                        out_trade_no: this.payInfo.out_trade_no
+                                    }, '', 'redirectTo');
+                                    this.repeatFlag = false;
+                                } else {
+                                    this.repeatFlag = false;
+                                    location.href = res.data.data;
+                                    this.checkPayStatus();
+                                }
+                                break;
+                            case 'wechatpay':
+                                if (this.$util.isWeiXin()) {
+                                    if (uni.getSystemInfoSync().platform == 'ios') {
+                                        var url = uni.getStorageSync('initUrl');
+                                    } else {
+                                        var url = location.href;
+                                    }
+                                    // 获取jssdk配置
+                                    this.$api.sendRequest({
+                                        url: '/wechat/api/wechat/jssdkconfig',
+                                        data: {
+                                            url: url
+                                        },
+                                        success: jssdkRes => {
+                                            var wxJS = new Weixin(),
+                                                payData = res.data.data;
+                                            wxJS.init(jssdkRes.data);
+                                            wxJS.pay({
+                                                timestamp: payData.timestamp ? payData.timestamp : payData.timeStamp,
+                                                nonceStr: payData.nonceStr,
+                                                package: payData.package,
+                                                signType: payData.signType,
+                                                paySign: payData.paySign
+                                            },
+                                                res => {
+                                                    if (res.errMsg == 'chooseWXPay:ok') {
+                                                        this.paySuccess();
+                                                        this.repeatFlag = false;
+                                                    } else {
+                                                        this.$util.showToast({
+                                                            title: res.errMsg
+                                                        });
+                                                        setTimeout(() => {
+                                                            this.close();
+                                                            this.repeatFlag = false;
+                                                        }, 1500)
+                                                    }
+                                                },
+                                                res => {
+                                                    this.$util.showToast({
+                                                        title: '您已取消支付'
+                                                    });
+                                                    this.resetpay();
+                                                    this.repeatFlag = false;
+                                                }
+                                            );
+                                        }
+                                    });
+                                } else {
+                                    this.repeatFlag = false;
+                                    location.href = res.data.url;
+                                    this.checkPayStatus();
+                                }
+                                break;
+                            case 'offlinepay':
+                                this.$util.redirectTo('/pages_tool/pay/offlinepay', {
+                                    outTradeNo: this.payInfo.out_trade_no
+                                });
+                                this.repeatFlag = false;
+                                break;
+
+                        }
+                    } else {
+                        this.$util.showToast({
+                            title: res.message
+                        });
+                        this.repeatFlag = false;
+                    }
+                },
+                fail: res => {
+                    uni.hideLoading();
+                    this.$util.showToast({
+                        title: 'request:fail'
+                    });
+                    this.repeatFlag = false;
+                }
+            });
+        },
+        checkPayStatus() {
+            this.timer = setInterval(() => {
+                this.$api.sendRequest({
+                    url: '/api/pay/status',
+                    data: {
+                        out_trade_no: this.payInfo.out_trade_no
+                    },
+                    success: res => {
+                        if (res.code == 0) {
+                            if (res.data.pay_status == 2) {
+                                clearInterval(this.timer);
+                                this.paySuccess();
+                            }
+                        } else {
+                            clearInterval(this.timer);
+                        }
+                    }
+                });
+            }, 1000);
+        },
+        // #endif
+        // #ifdef MP
+        pay() {
+            var payType = this.payTypeList[this.payIndex];
+            this.$api.sendRequest({
+                url: '/api/pay/pay',
+                data: {
+                    out_trade_no: this.payInfo.out_trade_no,
+                    pay_type: payType ? payType.type : '',
+                    scene: uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync().scene,
+                    is_balance: this.isBalance
+                },
+                success: res => {
+                    uni.hideLoading();
+                    if (res.code >= 0) {
+                        if (res.data.pay_success) {
+                            this.paySuccess();
+                            this.repeatFlag = false;
+                            return;
+                        }
+                        if (payType.type == 'offlinepay') {
+                            this.$util.redirectTo('/pages_tool/pay/offlinepay', {
+                                outTradeNo: this.payInfo.out_trade_no
+                            });
+                            this.repeatFlag = false;
+                        } else {
+                            var payData = res.data.data;
+
+                            // #ifdef MP-WEIXIN
+                            var scene = uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync().scene;
+                            if ([1175, 1176, 1177, 1191, 1195].indexOf(scene) != -1) {
+                                uni.requestOrderPayment({
+                                    timeStamp: payData.timeStamp,
+                                    nonceStr: payData.nonceStr,
+                                    package: payData.package,
+                                    signType: payData.signType,
+                                    paySign: payData.paySign,
+                                    success: res => {
+                                        this.paySuccess();
+                                        this.repeatFlag = false;
+                                    },
+                                    fail: res => {
+                                        this.flag = false;
+                                        if (res.errMsg == 'requestOrderPayment:fail cancel') {
+                                            this.$util.showToast({
+                                                title: '您已取消支付'
+                                            });
+                                            this.resetpay();
+                                            this.repeatFlag = false;
+                                        } else {
+                                            uni.showModal({
+                                                content: '支付失败,失败原因: ' + res.errMsg,
+                                                showCancel: false
+                                            });
+                                            setTimeout(() => {
+                                                this.close();
+                                                this.repeatFlag = false;
+                                            }, 1500)
+                                        }
+                                    }
+                                });
+                                return
+                            }
+                            // #endif
+
+                            uni.requestPayment({
+                                provider: payType.provider,
+                                ...payData,
+                                success: res => {
+                                    this.paySuccess();
+                                    this.repeatFlag = false;
+                                },
+                                fail: res => {
+                                    this.flag = false;
+                                    if (res.errMsg == 'requestPayment:fail cancel') {
+                                        this.$util.showToast({
+                                            title: '您已取消支付'
+                                        });
+                                        this.resetpay();
+                                        this.repeatFlag = false;
+                                    } else {
+                                        uni.showModal({
+                                            content: '支付失败,失败原因: ' + res.errMsg,
+                                            showCancel: false
+                                        });
+                                        setTimeout(() => {
+                                            this.close();
+                                            this.repeatFlag = false;
+                                        }, 1500)
+                                    }
+                                }
+                            });
+                        }
+                    } else {
+                        this.$util.showToast({
+                            title: res.message
+                        });
+                        this.repeatFlag = false;
+                    }
+                },
+                fail: res => {
+                    uni.hideLoading();
+                    this.$util.showToast({
+                        title: 'request:fail'
+                    });
+                    this.repeatFlag = false;
+                }
+            });
+        },
+        // #endif
+        /**
+         * 支付成功之后跳转
+         */
+        paySuccess() {
+            if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
+                this.$util.redirectTo('/pages_promotion/blindbox/index', {
+                    outTradeNo: this.payInfo.out_trade_no
+                }, 'redirectTo');
+            } else if (this.payInfo.return_url) {
+                if (this.payInfo.return_url.indexOf('http://') != -1 || this.payInfo.return_url.indexOf('https://') != -1) location.replace(this.payInfo.return_url);
+                else this.$util.redirectTo(this.payInfo.return_url, {}, 'redirectTo');
+            } else {
+                this.$util.redirectTo('/pages_tool/pay/result', {
+                    code: this.payInfo.out_trade_no
+                }, 'redirectTo');
+            }
+        },
+        /**
+         * 重置支付单据
+         */
+        resetpay() {
+            this.resetPayComplete = false;
+            this.$api.sendRequest({
+                url: '/api/pay/resetpay',
+                data: {
+                    out_trade_no: this.payInfo.out_trade_no,
+                },
+                success: res => {
+                    if (res.code == 0) {
+                        this.getPayInfo(res.data, () => {
+                            this.resetPayComplete = true;
+                        });
+                    } else {
+                        this.resetPayComplete = true;
+                    }
+                },
+                fail: res => {
+                    this.resetPayComplete = true;
+                }
+            })
+        }
+    },
+    // #ifdef H5
+    deactivated() {
+        clearInterval(this.timer);
+    },
+    // #endif
+};
+</script>
+
+<style lang="scss" scoped>
+.popup {
+    width: 75vw;
+    background: #fff;
+    border-top-left-radius: $border-radius;
+    border-top-right-radius: $border-radius;
+
+    .popup-header {
+        display: flex;
+        border-bottom: 2rpx solid $color-line;
+        position: relative;
+        padding: 40rpx;
+
+        .tit {
+            flex: 1;
+            font-size: $font-size-toolbar;
+            line-height: 1;
+            text-align: center;
+        }
+
+        .iconfont {
+            line-height: 1;
+            position: absolute;
+            right: 30rpx;
+            top: 50%;
+            transform: translate(0, -50%);
+            color: $color-tip;
+            font-size: $font-size-toolbar;
+        }
+    }
+
+    .popup-body {
+        height: calc(100% - 250rpx);
+
+        &.safe-area {
+            height: calc(100% - 270rpx);
+        }
+    }
+
+    .popup-footer {
+        height: 100rpx;
+
+        .confirm-btn {
+            height: 72rpx;
+            line-height: 72rpx;
+            color: #fff;
+            text-align: center;
+            margin: 20rpx 30rpx 0;
+            border-radius: $border-radius;
+        }
+
+        &.bottom-safe-area {
+            padding-bottom: constant(safe-area-inset-bottom);
+            padding-bottom: env(safe-area-inset-bottom);
+        }
+    }
+}
+
+.choose-payment-popup {
+    .payment-item {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        height: 90rpx;
+        margin: 0 30rpx;
+        border-bottom: 2rpx solid $color-line;
+        padding: 20rpx 0;
+
+        &:nth-child(2) {
+            padding-top: 0;
+        }
+
+        &:last-child {
+            border-bottom: none;
+        }
+
+        .iconfont {
+            font-size: 64rpx;
+        }
+
+        .icon-yue {
+            color: #faa218;
+        }
+
+        .icon-weixin1 {
+            color: #24af41;
+        }
+
+        .icon-yuezhifu {
+            color: #f9a647;
+        }
+
+        .icon-zhifubaozhifu- {
+            color: #00a0e9;
+        }
+
+        .icon-checkboxblank {
+            font-size: 40rpx;
+            color: $color-line;
+        }
+
+        .icon-yuan_checked {
+            font-size: 40rpx;
+        }
+
+        .name {
+            margin-left: 20rpx;
+            font-size: $font-size-base;
+            flex: 1;
+        }
+
+        .info-wrap {
+            flex: 1;
+            margin-left: 20rpx;
+
+            .name {
+                margin-left: 0;
+                font-size: $font-size-base;
+                flex: 1;
+            }
+
+            .money {
+                color: $color-tip;
+                font-size: $font-size-tag;
+            }
+        }
+
+        .box {
+            flex: 1;
+            padding: 0 10rpx;
+            line-height: inherit;
+            text-align: right;
+
+            input {
+                font-size: $font-size-tag !important;
+            }
+        }
+
+        &.set-pay-password {
+            height: initial;
+
+            .box {
+                font-size: $font-size-tag !important;
+            }
+        }
+    }
+
+    .pay-money {
+        text-align: center;
+        padding: 20rpx 0 40rpx 0;
+        background-color: #fff;
+        font-weight: bold;
+        margin-top: 30rpx;
+        line-height: 1;
+
+        .unit {
+            margin-right: 4rpx;
+            font-size: $font-size-tag;
+        }
+
+        .money {
+            font-size: $font-size-toolbar;
+        }
+    }
+}
+
+.empty {
+    width: 100%;
+    text-align: center;
+    padding: 40rpx 0;
+    color: $color-sub;
+    font-size: $font-size-tag;
+}
 </style>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 35441a3..bec6eaf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -54,8 +54,6 @@
             }
         }
     },
-    /* 快应用特有相关 */
-    "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
         "appid" : "wxa8f94045d9c2fc10",
@@ -126,5 +124,12 @@
     "uniStatistics" : {
         "version" : "2"
     },
-    "sassImplementationName" : "node-sass"
+    "sassImplementationName" : "node-sass",
+    /** 快应用配置 **/
+    "quickapp-webview" : {
+        "package" : "com.jieganfsj.fivegshop",
+        "minPlatformVersion" : 1070,
+        "versionName" : "1.0.0",
+        "versionCode" : 0
+    }
 }
diff --git a/node_modules/jweixin-module/README.md b/node_modules/jweixin-module/README.md
index f4e08bd..7c91d7b 100644
--- a/node_modules/jweixin-module/README.md
+++ b/node_modules/jweixin-module/README.md
@@ -19,8 +19,8 @@ https://unpkg.com/jweixin-module/out/index.js
 ## 使用
 
 ```js
-var wx = require('jweixin-module')
-wx.ready(function(){
+var jweixin = require('jweixin-module')
+jweixin.ready(function(){
     // TODO
 });
 ```
diff --git a/node_modules/jweixin-module/out/index.js b/node_modules/jweixin-module/out/index.js
deleted file mode 100644
index 807ab6a..0000000
--- a/node_modules/jweixin-module/out/index.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(e,n){"object"==typeof exports&&"object"==typeof module?module.exports=n(e):"function"==typeof define&&(define.amd||define.cmd)?define(function(){return n(e)}):n(e,!0)}(window,function(o,e){function c(n,e,i){o.WeixinJSBridge?WeixinJSBridge.invoke(n,r(e),function(e){a(n,e,i)}):d(n,i)}function i(n,i,t){o.WeixinJSBridge?WeixinJSBridge.on(n,function(e){t&&t.trigger&&t.trigger(e),a(n,e,i)}):d(n,t||i)}function r(e){return(e=e||{}).appId=M.appId,e.verifyAppId=M.appId,e.verifySignType="sha1",e.verifyTimestamp=M.timestamp+"",e.verifyNonceStr=M.nonceStr,e.verifySignature=M.signature,e}function n(e){return{timeStamp:e.timestamp+"",nonceStr:e.nonceStr,package:e.package,paySign:e.paySign,signType:e.signType||"SHA1"}}function a(e,n,i){"openEnterpriseChat"==e&&(n.errCode=n.err_code),delete n.err_code,delete n.err_desc,delete n.err_detail;var t=n.errMsg;t||(t=n.err_msg,delete n.err_msg,t=function(e,n){var i=e,t=f[i];t&&(i=t);var o="ok";if(n){var r=n.indexOf(":");"confirm"==(o=n.substring(r+1))&&(o="ok"),"failed"==o&&(o="fail"),-1!=o.indexOf("failed_")&&(o=o.substring(7)),-1!=o.indexOf("fail_")&&(o=o.substring(5)),"access denied"!=(o=(o=o.replace(/_/g," ")).toLowerCase())&&"no permission to execute"!=o||(o="permission denied"),"config"==i&&"function not exist"==o&&(o="ok"),""==o&&(o="fail")}return n=i+":"+o}(e,t),n.errMsg=t),(i=i||{})._complete&&(i._complete(n),delete i._complete),t=n.errMsg||"",M.debug&&!i.isInnerInvoke&&alert(JSON.stringify(n));var o=t.indexOf(":");switch(t.substring(o+1)){case"ok":i.success&&i.success(n);break;case"cancel":i.cancel&&i.cancel(n);break;default:i.fail&&i.fail(n)}i.complete&&i.complete(n)}function s(e){if(e){for(var n=0,i=e.length;n<i;++n){var t=e[n],o=p[t];o&&(e[n]=o)}return e}}function d(e,n){if(!(!M.debug||n&&n.isInnerInvoke)){var i=f[e];i&&(e=i),n&&n._complete&&delete n._complete,console.log('"'+e+'",',n||"")}}function l(){return(new Date).getTime()}function u(e){I&&(o.WeixinJSBridge?e():t.addEventListener&&t.addEventListener("WeixinJSBridgeReady",e,!1))}if(!o.jWeixin){var p={config:"preVerifyJSAPI",onMenuShareTimeline:"menu:share:timeline",onMenuShareAppMessage:"menu:share:appmessage",onMenuShareQQ:"menu:share:qq",onMenuShareWeibo:"menu:share:weiboApp",onMenuShareQZone:"menu:share:QZone",previewImage:"imagePreview",getLocation:"geoLocation",openProductSpecificView:"openProductViewWithPid",addCard:"batchAddCard",openCard:"batchViewCard",chooseWXPay:"getBrandWCPayRequest",openEnterpriseRedPacket:"getRecevieBizHongBaoRequest",startSearchBeacons:"startMonitoringBeacons",stopSearchBeacons:"stopMonitoringBeacons",onSearchBeacons:"onBeaconsInRange",consumeAndShareCard:"consumedShareCard",openAddress:"editAddress"},f=function(){var e={};for(var n in p)e[p[n]]=n;return e}(),t=o.document,m=t.title,g=navigator.userAgent.toLowerCase(),h=navigator.platform.toLowerCase(),v=!(!h.match("mac")&&!h.match("win")),S=-1!=g.indexOf("wxdebugger"),I=-1!=g.indexOf("micromessenger"),y=-1!=g.indexOf("android"),_=-1!=g.indexOf("iphone")||-1!=g.indexOf("ipad"),w=(O=g.match(/micromessenger\/(\d+\.\d+\.\d+)/)||g.match(/micromessenger\/(\d+\.\d+)/))?O[1]:"",k={initStartTime:l(),initEndTime:0,preVerifyStartTime:0,preVerifyEndTime:0},T={version:1,appId:"",initTime:0,preVerifyTime:0,networkType:"",isPreVerifyOk:1,systemType:_?1:y?2:-1,clientVersion:w,url:encodeURIComponent(location.href)},M={},P={_completes:[]},x={state:0,data:{}};u(function(){k.initEndTime=l()});var A=!1,V=[],C={config:function(e){d("config",M=e);var t=!1!==M.check;u(function(){if(t)c(p.config,{verifyJsApiList:s(M.jsApiList)},function(){P._complete=function(e){k.preVerifyEndTime=l(),x.state=1,x.data=e},P.success=function(e){T.isPreVerifyOk=0},P.fail=function(e){P._fail?P._fail(e):x.state=-1};var t=P._completes;return t.push(function(){!function(e){if(!(v||S||M.debug||w<"6.0.2"||T.systemType<0)){var i=new Image;T.appId=M.appId,T.initTime=k.initEndTime-k.initStartTime,T.preVerifyTime=k.preVerifyEndTime-k.preVerifyStartTime,C.getNetworkType({isInnerInvoke:!0,success:function(e){T.networkType=e.networkType;var n="https://open.weixin.qq.com/sdk/report?v="+T.version+"&o="+T.isPreVerifyOk+"&s="+T.systemType+"&c="+T.clientVersion+"&a="+T.appId+"&n="+T.networkType+"&i="+T.initTime+"&p="+T.preVerifyTime+"&u="+T.url;i.src=n}})}}()}),P.complete=function(e){for(var n=0,i=t.length;n<i;++n)t[n]();P._completes=[]},P}()),k.preVerifyStartTime=l();else{x.state=1;for(var e=P._completes,n=0,i=e.length;n<i;++n)e[n]();P._completes=[]}}),C.invoke||(C.invoke=function(e,n,i){o.WeixinJSBridge&&WeixinJSBridge.invoke(e,r(n),i)},C.on=function(e,n){o.WeixinJSBridge&&WeixinJSBridge.on(e,n)})},ready:function(e){0!=x.state?e():(P._completes.push(e),!I&&M.debug&&e())},error:function(e){w<"6.0.2"||(-1==x.state?e(x.data):P._fail=e)},checkJsApi:function(e){c("checkJsApi",{jsApiList:s(e.jsApiList)},(e._complete=function(e){if(y){var n=e.checkResult;n&&(e.checkResult=JSON.parse(n))}e=function(e){var n=e.checkResult;for(var i in n){var t=f[i];t&&(n[t]=n[i],delete n[i])}return e}(e)},e))},onMenuShareTimeline:function(e){i(p.onMenuShareTimeline,{complete:function(){c("shareTimeline",{title:e.title||m,desc:e.title||m,img_url:e.imgUrl||"",link:e.link||location.href,type:e.type||"link",data_url:e.dataUrl||""},e)}},e)},onMenuShareAppMessage:function(n){i(p.onMenuShareAppMessage,{complete:function(e){"favorite"===e.scene?c("sendAppMessage",{title:n.title||m,desc:n.desc||"",link:n.link||location.href,img_url:n.imgUrl||"",type:n.type||"link",data_url:n.dataUrl||""}):c("sendAppMessage",{title:n.title||m,desc:n.desc||"",link:n.link||location.href,img_url:n.imgUrl||"",type:n.type||"link",data_url:n.dataUrl||""},n)}},n)},onMenuShareQQ:function(e){i(p.onMenuShareQQ,{complete:function(){c("shareQQ",{title:e.title||m,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareWeibo:function(e){i(p.onMenuShareWeibo,{complete:function(){c("shareWeiboApp",{title:e.title||m,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareQZone:function(e){i(p.onMenuShareQZone,{complete:function(){c("shareQZone",{title:e.title||m,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},updateTimelineShareData:function(e){c("updateTimelineShareData",{title:e.title,link:e.link,imgUrl:e.imgUrl},e)},updateAppMessageShareData:function(e){c("updateAppMessageShareData",{title:e.title,desc:e.desc,link:e.link,imgUrl:e.imgUrl},e)},startRecord:function(e){c("startRecord",{},e)},stopRecord:function(e){c("stopRecord",{},e)},onVoiceRecordEnd:function(e){i("onVoiceRecordEnd",e)},playVoice:function(e){c("playVoice",{localId:e.localId},e)},pauseVoice:function(e){c("pauseVoice",{localId:e.localId},e)},stopVoice:function(e){c("stopVoice",{localId:e.localId},e)},onVoicePlayEnd:function(e){i("onVoicePlayEnd",e)},uploadVoice:function(e){c("uploadVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadVoice:function(e){c("downloadVoice",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},translateVoice:function(e){c("translateVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},chooseImage:function(e){c("chooseImage",{scene:"1|2",count:e.count||9,sizeType:e.sizeType||["original","compressed"],sourceType:e.sourceType||["album","camera"]},(e._complete=function(e){if(y){var n=e.localIds;try{n&&(e.localIds=JSON.parse(n))}catch(e){}}},e))},getLocation:function(e){},previewImage:function(e){c(p.previewImage,{current:e.current,urls:e.urls},e)},uploadImage:function(e){c("uploadImage",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadImage:function(e){c("downloadImage",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},getLocalImgData:function(e){!1===A?(A=!0,c("getLocalImgData",{localId:e.localId},(e._complete=function(e){if(A=!1,0<V.length){var n=V.shift();wx.getLocalImgData(n)}},e))):V.push(e)},getNetworkType:function(e){c("getNetworkType",{},(e._complete=function(e){e=function(e){var n=e.errMsg;e.errMsg="getNetworkType:ok";var i=e.subtype;if(delete e.subtype,i)e.networkType=i;else{var t=n.indexOf(":"),o=n.substring(t+1);switch(o){case"wifi":case"edge":case"wwan":e.networkType=o;break;default:e.errMsg="getNetworkType:fail"}}return e}(e)},e))},openLocation:function(e){c("openLocation",{latitude:e.latitude,longitude:e.longitude,name:e.name||"",address:e.address||"",scale:e.scale||28,infoUrl:e.infoUrl||""},e)},getLocation:function(e){c(p.getLocation,{type:(e=e||{}).type||"wgs84"},(e._complete=function(e){delete e.type},e))},hideOptionMenu:function(e){c("hideOptionMenu",{},e)},showOptionMenu:function(e){c("showOptionMenu",{},e)},closeWindow:function(e){c("closeWindow",{},e=e||{})},hideMenuItems:function(e){c("hideMenuItems",{menuList:e.menuList},e)},showMenuItems:function(e){c("showMenuItems",{menuList:e.menuList},e)},hideAllNonBaseMenuItem:function(e){c("hideAllNonBaseMenuItem",{},e)},showAllNonBaseMenuItem:function(e){c("showAllNonBaseMenuItem",{},e)},scanQRCode:function(e){c("scanQRCode",{needResult:(e=e||{}).needResult||0,scanType:e.scanType||["qrCode","barCode"]},(e._complete=function(e){if(_){var n=e.resultStr;if(n){var i=JSON.parse(n);e.resultStr=i&&i.scan_code&&i.scan_code.scan_result}}},e))},openAddress:function(e){c(p.openAddress,{},(e._complete=function(e){var n;(n=e).postalCode=n.addressPostalCode,delete n.addressPostalCode,n.provinceName=n.proviceFirstStageName,delete n.proviceFirstStageName,n.cityName=n.addressCitySecondStageName,delete n.addressCitySecondStageName,n.countryName=n.addressCountiesThirdStageName,delete n.addressCountiesThirdStageName,n.detailInfo=n.addressDetailInfo,delete n.addressDetailInfo,e=n},e))},openProductSpecificView:function(e){c(p.openProductSpecificView,{pid:e.productId,view_type:e.viewType||0,ext_info:e.extInfo},e)},addCard:function(e){for(var n=e.cardList,i=[],t=0,o=n.length;t<o;++t){var r=n[t],a={card_id:r.cardId,card_ext:r.cardExt};i.push(a)}c(p.addCard,{card_list:i},(e._complete=function(e){var n=e.card_list;if(n){for(var i=0,t=(n=JSON.parse(n)).length;i<t;++i){var o=n[i];o.cardId=o.card_id,o.cardExt=o.card_ext,o.isSuccess=!!o.is_succ,delete o.card_id,delete o.card_ext,delete o.is_succ}e.cardList=n,delete e.card_list}},e))},chooseCard:function(e){c("chooseCard",{app_id:M.appId,location_id:e.shopId||"",sign_type:e.signType||"SHA1",card_id:e.cardId||"",card_type:e.cardType||"",card_sign:e.cardSign,time_stamp:e.timestamp+"",nonce_str:e.nonceStr},(e._complete=function(e){e.cardList=e.choose_card_info,delete e.choose_card_info},e))},openCard:function(e){for(var n=e.cardList,i=[],t=0,o=n.length;t<o;++t){var r=n[t],a={card_id:r.cardId,code:r.code};i.push(a)}c(p.openCard,{card_list:i},e)},consumeAndShareCard:function(e){c(p.consumeAndShareCard,{consumedCardId:e.cardId,consumedCode:e.code},e)},chooseWXPay:function(e){c(p.chooseWXPay,n(e),e)},openEnterpriseRedPacket:function(e){c(p.openEnterpriseRedPacket,n(e),e)},startSearchBeacons:function(e){c(p.startSearchBeacons,{ticket:e.ticket},e)},stopSearchBeacons:function(e){c(p.stopSearchBeacons,{},e)},onSearchBeacons:function(e){i(p.onSearchBeacons,e)},openEnterpriseChat:function(e){c("openEnterpriseChat",{useridlist:e.userIds,chatname:e.groupName},e)},launchMiniProgram:function(e){c("launchMiniProgram",{targetAppId:e.targetAppId,path:function(e){if("string"==typeof e&&0<e.length){var n=e.split("?")[0],i=e.split("?")[1];return n+=".html",void 0!==i?n+"?"+i:n}}(e.path),envVersion:e.envVersion},e)},miniProgram:{navigateBack:function(e){e=e||{},u(function(){c("invokeMiniProgramAPI",{name:"navigateBack",arg:{delta:e.delta||1}},e)})},navigateTo:function(e){u(function(){c("invokeMiniProgramAPI",{name:"navigateTo",arg:{url:e.url}},e)})},redirectTo:function(e){u(function(){c("invokeMiniProgramAPI",{name:"redirectTo",arg:{url:e.url}},e)})},switchTab:function(e){u(function(){c("invokeMiniProgramAPI",{name:"switchTab",arg:{url:e.url}},e)})},reLaunch:function(e){u(function(){c("invokeMiniProgramAPI",{name:"reLaunch",arg:{url:e.url}},e)})},postMessage:function(e){u(function(){c("invokeMiniProgramAPI",{name:"postMessage",arg:e.data||{}},e)})},getEnv:function(e){u(function(){e({miniprogram:"miniprogram"===o.__wxjs_environment})})}}},L=1,B={};return t.addEventListener("error",function(e){if(!y){var n=e.target,i=n.tagName,t=n.src;if(("IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i)&&-1!=t.indexOf("wxlocalresource://")){e.preventDefault(),e.stopPropagation();var o=n["wx-id"];if(o||(o=L++,n["wx-id"]=o),B[o])return;B[o]=!0,wx.ready(function(){wx.getLocalImgData({localId:t,success:function(e){n.src=e.localData}})})}}},!0),t.addEventListener("load",function(e){if(!y){var n=e.target,i=n.tagName;if(n.src,"IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i){var t=n["wx-id"];t&&(B[t]=!1)}}},!0),e&&(o.wx=o.jWeixin=C),C}var O});
\ No newline at end of file
diff --git a/node_modules/jweixin-module/package.json b/node_modules/jweixin-module/package.json
index 4f3cd45..df011ca 100644
--- a/node_modules/jweixin-module/package.json
+++ b/node_modules/jweixin-module/package.json
@@ -1,60 +1,26 @@
 {
-  "_from": "jweixin-module",
-  "_id": "jweixin-module@1.4.1",
-  "_inBundle": false,
-  "_integrity": "sha512-2R2oa1lYhAsclfjKSf3DP4ZiP1dcrQUbM7aklbeJA+UAg/LS7MqoA6UbTy1cs4sbB34z62K4bKW0Z9iazD8ejg==",
-  "_location": "/jweixin-module",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "tag",
-    "registry": true,
-    "raw": "jweixin-module",
     "name": "jweixin-module",
-    "escapedName": "jweixin-module",
-    "rawSpec": "",
-    "saveSpec": null,
-    "fetchSpec": "latest"
-  },
-  "_requiredBy": [
-    "#USER",
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.4.1.tgz",
-  "_shasum": "1fc8fa42622243f6c35651d272cd587debf56cd1",
-  "_spec": "jweixin-module",
-  "_where": "E:\\demo\\niushop_uniapp",
-  "author": {
-    "name": "Shengqiang Guo"
-  },
-  "bugs": {
-    "url": "https://github.com/zhetengbiji/jweixin-module/issues"
-  },
-  "bundleDependencies": false,
-  "deprecated": false,
-  "description": "微信JS-SDK",
-  "devDependencies": {
-    "textfile": "^1.2.0",
-    "uglify-js": "^3.4.9"
-  },
-  "homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
-  "keywords": [
-    "wxjssdk",
-    "weixin",
-    "jweixin",
-    "wechat",
-    "jssdk",
-    "wx"
-  ],
-  "license": "ISC",
-  "main": "out/index.js",
-  "name": "jweixin-module",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/zhetengbiji/jweixin-module.git"
-  },
-  "scripts": {
-    "build": "node build",
-    "prepublish": "npm run build"
-  },
-  "version": "1.4.1"
+    "version": "1.6.0",
+    "description": "微信JS-SDK",
+    "main": "lib/index.js",
+    "scripts": {},
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/zhetengbiji/jweixin-module.git"
+    },
+    "keywords": [
+        "wxjssdk",
+        "weixin",
+        "jweixin",
+        "wechat",
+        "jssdk",
+        "wx"
+    ],
+    "author": "Shengqiang Guo",
+    "license": "ISC",
+    "bugs": {
+        "url": "https://github.com/zhetengbiji/jweixin-module/issues"
+    },
+    "homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
+    "devDependencies": {}
 }
diff --git a/package-lock.json b/package-lock.json
index eb761f5..f43ba2b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,13 +1,23 @@
 {
-  "name": "uniappsaas",
+  "name": "frontend",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
+      "dependencies": {
+        "@dcloudio/uni-quickapp-webview": "^2.0.2-4080420251103001",
+        "jweixin-module": "^1.6.0"
+      },
       "devDependencies": {
         "terser-webpack-plugin": "^5.3.10"
       }
     },
+    "node_modules/@dcloudio/uni-quickapp-webview": {
+      "version": "2.0.2-4080420251103001",
+      "resolved": "https://registry.npmmirror.com/@dcloudio/uni-quickapp-webview/-/uni-quickapp-webview-2.0.2-4080420251103001.tgz",
+      "integrity": "sha512-dxDDk/37OoUZ6PmXhXS/9C8Y5tYRalU6FIXT5OlPf1co2VuLF0OrdqAmINJDWs1dBQgN7e6Hw+bkeK9+4SzLxQ==",
+      "license": "Apache-2.0"
+    },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.5",
       "resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
@@ -619,6 +629,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/jweixin-module": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",
+      "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==",
+      "license": "ISC"
+    },
     "node_modules/loader-runner": {
       "version": "4.3.0",
       "resolved": "https://repo.huaweicloud.com/repository/npm/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -984,6 +1000,11 @@
     }
   },
   "dependencies": {
+    "@dcloudio/uni-quickapp-webview": {
+      "version": "2.0.2-4080420251103001",
+      "resolved": "https://registry.npmmirror.com/@dcloudio/uni-quickapp-webview/-/uni-quickapp-webview-2.0.2-4080420251103001.tgz",
+      "integrity": "sha512-dxDDk/37OoUZ6PmXhXS/9C8Y5tYRalU6FIXT5OlPf1co2VuLF0OrdqAmINJDWs1dBQgN7e6Hw+bkeK9+4SzLxQ=="
+    },
     "@jridgewell/gen-mapping": {
       "version": "0.3.5",
       "resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
@@ -1456,6 +1477,11 @@
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
+    "jweixin-module": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",
+      "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
+    },
     "loader-runner": {
       "version": "4.3.0",
       "resolved": "https://repo.huaweicloud.com/repository/npm/loader-runner/-/loader-runner-4.3.0.tgz",
diff --git a/package.json b/package.json
index d7d3305..dbca309 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
     "terser-webpack-plugin": "^5.3.10"
   },
   "dependencies": {
+    "@dcloudio/uni-quickapp-webview": "^2.0.2-4080420251103001",
     "jweixin-module": "^1.6.0"
   }
 }