From 6d7c1384ce19c2ead0726e8714d8199b8f6c1da0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Thu, 29 Feb 2024 21:44:22 +0800
Subject: [PATCH] 1

---
 pages/payment/get_payment.vue       |   6 +-
 pages/payment/settlement.vue        | 250 ++-----------------
 pages/users/order_confirm/index.vue | 373 +++++++++++++++-------------
 3 files changed, 216 insertions(+), 413 deletions(-)

diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue
index 35d0457..e3b9421 100644
--- a/pages/payment/get_payment.vue
+++ b/pages/payment/get_payment.vue
@@ -3,8 +3,8 @@
 		<view style="height: var(--status-bar-height);"></view>
 
 		<view class="v-navbar">
-			<u-navbar title="面对面收款" @rightClick="rightClick" :autoBack="true" :fixed="false" bgColor="transparent"
-				leftIconColor="#fff" :titleStyle="{color:'#fff',fontWeight:'bold',fontSize:'32rpx'}">
+			<u-navbar title="面对面收款" :autoBack="true" :fixed="false" bgColor="transparent" leftIconColor="#fff"
+				:titleStyle="{color:'#fff',fontWeight:'bold',fontSize:'32rpx'}">
 			</u-navbar>
 		</view>
 
@@ -25,7 +25,7 @@
 			<view class="v-con-input">
 				<u--input type="number" maxlength="5" fontSize="23" v-model="cartForm.total_amount" placeholder="请输入金额"
 					border="none" placeholderStyle="color:#999;font-size:30rpx">
-					<u--text size="23" color="#303133" text="￥" slot="prefix" margin="0 3px 0 0" type="tips"></u--text>
+					<u-text size="23" color="#303133" text="￥" slot="prefix" margin="0 3px 0 0" type="tips"></u-text>
 					</u-input>
 				</u--input>
 			</view>
diff --git a/pages/payment/settlement.vue b/pages/payment/settlement.vue
index 1c04d95..ca0df83 100644
--- a/pages/payment/settlement.vue
+++ b/pages/payment/settlement.vue
@@ -1,7 +1,7 @@
 <template>
 	<view :style="viewColor">
+		<view style="height: var(--status-bar-height);"></view>
 		<view class='order-submission'>
-
 			<!-- 商品信息 -->
 			<view class="storeinfo-wrapper">
 				<view class="store-item">
@@ -172,7 +172,9 @@
 	import {
 		orderPay
 	} from "@/api/payment.js";
-import { Toast } from '../../libs/uniApi';
+	import {
+		Toast
+	} from '../../libs/uniApi';
 
 	export default {
 		components: {
@@ -407,29 +409,6 @@ import { Toast } from '../../libs/uniApi';
 		},
 
 		methods: {
-			/*预售协议*/
-			getPresellAgree: function() {
-				this.showProtocol = true
-				this.agrementTtile = '预售协议'
-				presellAgreement().then(res => {
-					this.protocol = res.data.sys_product_presell_agree;
-				})
-			},
-			changeIsAgree: function(e) {
-				this.isAgree = !this.isAgree;
-			},
-			changeIntegral: function(e) {
-				this.use_integral = !this.use_integral;
-				this.getConfirm(this.addressId);
-			},
-			showPresellAgree() {
-				this.getPresellAgree()
-			},
-
-			showCoupon() {
-				this.getCouponAgreement();
-			},
-
 			// 图片预览
 			// 获得相册 idx
 			getPhotoClickIdx(e) {
@@ -468,125 +447,6 @@ import { Toast } from '../../libs/uniApi';
 				// this.$scope.selectComponent('#address-window').getAddressList();
 			},
 
-
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e;
-			},
-
-
-
-
-
-			ChangCouponsClone: function() {
-				this.$set(this.coupon, 'status', false);
-			},
-			changeTextareaStatus: function() {
-				for (let i = 0, len = this.coupon.list.length; i < len; i++) {
-					this.coupon.list[i].use_title = '';
-					this.coupon.list[i].is_use = 0;
-				}
-				this.textareaStatus = true;
-				this.status = 0;
-				this.$set(this.coupon, 'list', this.coupon.list);
-			},
-
-
-
-			/**
-			 * 获取当前订单详细信息
-			 *
-			 */
-			getConfirm: function(address_id) {
-				let that = this;
-				uni.showLoading({
-					title: '',
-					mask: true
-				});
-				getOrderConfirm({
-					cart_id: that.cartId.split(","),
-					address_id: address_id,
-					takes: that.take,
-					consumption_id: this.consumption_id,
-					use_coupon: that.subCoupon,
-					use_integral: that.use_integral,
-					product_type: that.product_type,
-					source: that.source
-				}).then(res => {
-					// 默认选中
-					that.product_type = res.data.order_type
-					that.is_take = false;
-					that.platformConsumption = res.data.platformConsumption;
-					res.data.order.forEach(el => {
-						if (el.order.isTake == 1) that.is_take = true
-						el.isTake = 0
-						that.subCoupon[el.mer_id] = []
-						el.coupon.forEach(coupon => {
-							if (coupon.checked) {
-								that.subCoupon[el.mer_id].push(coupon.coupon_user_id)
-							}
-						})
-					})
-					that.subCoupon['0'] = []
-					if (res.data.platformCoupon?.length > 0) {
-						res.data.platformCoupon.forEach(el => {
-							if (el.checked) {
-								that.subCoupon[el.mer_id] = []
-								that.subCoupon[el.mer_id].push(el.coupon_user_id)
-							}
-						})
-					} else res.data.platformCoupon = [];
-					that.consumption_money = res.data.consumption_money;
-					that.$set(that.coupon, "coupon", that.plantCoupon ? res.data.platformCoupon : res.data
-						.order[that.couponIndex].coupon);
-					that.$set(that, "store_coupon_number", res.data.order[that.couponIndex].order.useCouponIds
-						.length);
-					that.$set(that, "coupon_amount", parseFloat(res.data.order[that.couponIndex].order
-						.coupon_price) + parseFloat(res.data.total_platform_coupon_price));
-					that.$set(that, "store_coupon_amount", parseFloat(res.data.order[that.couponIndex].order
-						.coupon_price));
-					that.$set(that, "plant_coupon_amount", parseFloat(res.data.total_platform_coupon_price));
-					that.$set(that, 'couponData', res.data);
-					that.$set(that, 'cartInfo', res.data.order);
-					that.$set(that, 'total_platform_coupon_price', res.data.total_platform_coupon_price);
-					that.$set(that, 'enabledPlatformCoupon', res.data.enabledPlatformCoupon);
-					that.$set(that, 'platformCoupon', res.data.platformCoupon);
-					that.$set(that, 'order_type', res.data.order_type);
-					that.$set(that, 'coupon_price', res.data.order_coupon_price);
-					that.$set(that, 'integral_count', res.data.order_total_integral);
-					that.$set(that, 'integral_price', res.data.order_total_integral_price);
-					that.$set(that, 'open_integral', res.data.openIntegral);
-					that.$set(that, 'use_integral', res.data.useIntegral);
-					that.$set(that, 'order_extend', (that.order_extend && that.order_extend.length > 0) ? that
-						.order_extend : res.data.order_extend);
-					that.totalPrice = res.data.order_price
-					that.orderStatus = res.data.status
-					that.proPrice = res.data.total_price
-					that.order_type = res.data.order_type
-					that.order_model = res.data.order_model
-					that.order_key = res.data.key
-
-
-					uni.getStorage({
-						key: "invoice_Data",
-						success: function(res) {
-							that.addInvoice = res.data;
-							if (res.data) {
-								that.getInvoiceDatas(res.data)
-							}
-						}
-					})
-					uni.hideLoading();
-				}).catch(err => {
-					return this.$util.Tips({
-						title: err
-					}, {
-						tab: 3,
-						url: 1
-					});
-				});
-			},
-
 			payItem: function(e) {
 				let that = this;
 				let active = e;
@@ -633,37 +493,19 @@ import { Toast } from '../../libs/uniApi';
 				that.animated = false;
 			},
 
-			onAddress: function() {
-				let that = this;
-				if (that.addressInfo.real_name) {
-					that.textareaStatus = false;
-					that.address.address = true;
-					// that.pagesUrl = '/pages/users/user_address/index?cartId=' + this.cartId + '&pinkId=' + this
-					// 	.pinkId + '&couponId=' + this.couponId;
-					that.pagesUrl = '/pages/users/user_address_list/index'
-				} else {
-					// uni.navigateTo({
-					// 	url: `/pages/users/user_address/index?cartId=${this.cartId}`,
-					// });
-					uni.navigateTo({
-						url: `pages/users/user_address_list/index`,
-					});
-				}
-			},
-
 			payment: function(data) {
 				let that = this;
 				createOrder(data).then(res => {
 
 					let status = res.data.status,
 						orderId = res.data.result.order_id,
-						callback_key = res.data.result.pay_key,
+						// callback_key = res.data.result.pay_key,
 						jsConfig = res.data.result.config,
 						// 暂不跳转
 						goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message +
-						'&product_type=' + that.product_type + '&source=' + that.source,
+						'&product_type=' + that.payForm.product_type + '&source=' + that.payForm.source,
 						goPagesOrder = '/pages/order_details/stay?order_id=' + orderId +
-						'&credit_buy=1&product_type=' + that.product_type;
+						'&credit_buy=1&product_type=' + that.payForm.product_type;
 
 					that.orderPay = true;
 					uni.hideLoading();
@@ -690,10 +532,6 @@ import { Toast } from '../../libs/uniApi';
 							break;
 						case 'alipay':
 						case "alipayQr":
-							// uni.navigateTo({
-							//   url: '/pages/order_pay_back/index?keyCode=' + callback_key + '&url=' +
-							//     jsConfig
-							// })
 							return;
 							break;
 							// #ifndef MP
@@ -889,51 +727,13 @@ import { Toast } from '../../libs/uniApi';
 							});
 					}
 				}).catch(err => {
-					uni.hideLoading();
 					return that.$util.Tips({
 						title: err
 					});
+					uni.hideLoading();
 				});
 			},
-			isEmojiCharacter: function(substring) {
-				if (substring) {
-					for (var i = 0; i < substring.length; i++) {
-						var hs = substring.charCodeAt(i);
-						if (0xd800 <= hs && hs <= 0xdbff) {
-							if (substring.length > 1) {
-								var ls = substring.charCodeAt(i + 1);
-								var uc = ((hs - 0xd800) * 0x400) + (ls - 0xdc00) + 0x10000;
-								if (0x1d000 <= uc && uc <= 0x1f77f) {
-									return true;
-								}
-							}
-						} else if (substring.length > 1) {
-							var ls = substring.charCodeAt(i + 1);
-							if (ls == 0x20e3) {
-								return true;
-							}
-						} else {
-							if (0x2100 <= hs && hs <= 0x27ff) {
-								return true;
-							} else if (0x2B05 <= hs && hs <= 0x2b07) {
-								return true;
-							} else if (0x2934 <= hs && hs <= 0x2935) {
-								return true;
-							} else if (0x3297 <= hs && hs <= 0x3299) {
-								return true;
-							} else if (hs == 0xa9 || hs == 0xae || hs == 0x303d || hs == 0x3030 ||
-								hs == 0x2b55 || hs == 0x2b1c || hs == 0x2b1b ||
-								hs == 0x2b50) {
-								return true;
-							}
-						}
-					}
-				}
-			},
-			bindDateChange(e) {
-				let that = this
-				that.$set(that.order_extend[that.virtualIndex], 'value', e.detail.value);
-			},
+
 			getTime(index) {
 				this.virtualIndex = index;
 			},
@@ -955,32 +755,18 @@ import { Toast } from '../../libs/uniApi';
 					Toast(res.message)
 				}).catch((e) => {
 					uni.hideLoading();
-          Toast(e.message)
+					Toast(e.message)
 				})
 
+				// #ifdef MP
+				openPaySubscribe().then(() => {
+					that.payment(this.payForm);
+				});
+				// #endif
 
-
-
-
-				// this.cartInfo.map(el => {
-				// 	if (el.isTake == 1 || el.order.isTake) {
-				// 		data.takes.push(el.mer_id)
-				// 	}
-				// })
-				// if (data.payType == 'balance' && parseFloat(that.userInfo.now_money) < parseFloat(that.totalPrice))
-				// 	return that.$util
-				// 		.Tips({
-				// 			title: '余额不足！'
-				// 		});
-				// data.consumption_id = this.consumption_id;
-				// // #ifdef MP
-				// openPaySubscribe().then(() => {
-				// 	that.payment(data);
-				// });
-				// // #endif
-				// // #ifndef MP
-				// that.payment(data);
-				// // #endif
+				// #ifndef MP
+				that.payment(this.payForm);
+				// #endif
 			},
 
 			// 继续支付
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 3df05e2..d977c84 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -8,10 +8,11 @@
 							<text class='phone'>{{addressInfo.phone}}</text>
 						</view>
 						<view>
-						
+
 							<text class='default t-color'
 								v-if="addressInfo.is_default">[默认]</text>{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.street || ''}}
-						 <text v-if='addressInfo.brigade'>{{typeof(addressInfo.brigade)=='string'?addressInfo.brigade:addressInfo.brigade.name }}{{addressInfo.detail}}</text>
+							<text
+								v-if='addressInfo.brigade'>{{typeof(addressInfo.brigade)=='string'?addressInfo.brigade:addressInfo.brigade.name }}{{addressInfo.detail}}</text>
 						</view>
 					</view>
 					<navigator v-else :url="'/pages/users/user_address/index?cartId='+cartId" hover-class="none"
@@ -36,12 +37,14 @@
 						<view v-if="goods.product_type == 2">
 							<view class="product-item">
 								<view class="img-box">
-									<image :src="(goods.productPresellAttr&&goods.productPresellAttr.image) || (goods.product&&goods.product.image)"></image>
+									<image
+										:src="(goods.productPresellAttr&&goods.productPresellAttr.image) || (goods.product&&goods.product.image)">
+									</image>
 								</view>
 								<view class="content event_content">
 									<view class="name line1">
-                    <!-- <text class="event_name event_bg">预售</text> -->
-                    {{goods.productPresell.store_name}}
+										<!-- <text class="event_name event_bg">预售</text> -->
+										{{goods.productPresell.store_name}}
 									</view>
 									<view class="label" style="width: 70%;">{{goods.productAttr.sku}}</view>
 									<view class="price" v-if="goods.productPresellAttr">
@@ -122,7 +125,7 @@
 						<view class="boxs">
 							<view class='item acea-row row-between-wrapper'>
 								<view>配送方式</view>
-								
+
 								<view
 									v-if="item.delivery_way.length == 2 && (item.order.allow_delivery && item.order.allow_take)"
 									class='discount' @tap="openShowBox(item,index)">
@@ -172,7 +175,7 @@
 								<text class='iconfont icon-jiantou'></text>
 							</view>
 						</view>
-						
+
 						<view v-if="order_type === 2 && item.list[0].productPresell.presell_type ==2"
 							class="item acea-row row-between-wrapper"
 							style="border-top: 1px solid #f5f5f5; border-bottom: 1px solid #f5f5f5;">
@@ -378,26 +381,26 @@
 						<view class='discount'>暂无优惠券</view>
 					</block>
 				</view> -->
-        <view class='item acea-row row-between-wrapper'>
-        	<view>补贴抵扣<!-- <text @tap="showCoupon" class="iconfont icon-wenhao1"></text> --></view>
-        	<block v-if="platformConsumption.length > 0">
-        		<view class='discount money red_packet' @tap='couponTap3()'>
-        			<text v-if="consumption_id">-￥{{consumption_money||'0.00'}}</text>
-        			<text v-else>有补贴补贴未选</text>
-        			<text class='iconfont icon-jiantou'></text>
-        		</view>
-        	</block>
-        	<block v-else>
-        		<view class='discount'>暂无可用补贴</view>
-        	</block>
-        </view>
+				<view class='item acea-row row-between-wrapper'>
+					<view>补贴抵扣<!-- <text @tap="showCoupon" class="iconfont icon-wenhao1"></text> --></view>
+					<block v-if="platformConsumption.length > 0">
+						<view class='discount money red_packet' @tap='couponTap3()'>
+							<text v-if="consumption_id">-￥{{consumption_money||'0.00'}}</text>
+							<text v-else>有补贴补贴未选</text>
+							<text class='iconfont icon-jiantou'></text>
+						</view>
+					</block>
+					<block v-else>
+						<view class='discount'>暂无可用补贴</view>
+					</block>
+				</view>
 				<view class='item acea-row row-between-wrapper' v-if="priceGroup.storePostage > 0">
 					<view>运费：</view>
 					<view class='money'>+￥{{priceGroup.storePostage}}</view>
 				</view>
 			</view>
 			<view style='height:140rpx;'></view>
-			
+
 			<view class='footer acea-row row-between-wrapper'>
 				<view class="footer_count">
 					<view>
@@ -435,21 +438,23 @@
 		<!--优惠明细弹窗-->
 		<discountDetails :isShowDiscount="isShowDiscount" @close="closeDiscount" :couponData="couponData">
 		</discountDetails>
-    <uni-popup ref="tipsRef">
-      <view class="tips_popup">
-        <image class="r_c_gb" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/9b08120240131172018671.png"></image>
-        <view class="ref_content">
-          <view class="r_c_title">优惠提示</view>
-          <view class="r_c_text">当前订单金额已大于100元</view>
-          <view class="r_c_text">建议参与惠农供销活动进行购买，下单满100元即可获得补贴</view>
-          <view class="r_c_btn">
-            <button class="r_c_btn1" @click="closeAndSubOrder">继续支付</button>
-            <button class="r_c_btn2" @click="gotoCloud">前往活动</button>
-          </view>
-        </view>
-        <image class="r_c_close" @click.stop="closeTipsRef" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d39b4202401311747186525.png"></image>
-      </view>
-    </uni-popup>
+		<uni-popup ref="tipsRef">
+			<view class="tips_popup">
+				<image class="r_c_gb" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/9b08120240131172018671.png">
+				</image>
+				<view class="ref_content">
+					<view class="r_c_title">优惠提示</view>
+					<view class="r_c_text">当前订单金额已大于100元</view>
+					<view class="r_c_text">建议参与惠农供销活动进行购买，下单满100元即可获得补贴</view>
+					<view class="r_c_btn">
+						<button class="r_c_btn1" @click="closeAndSubOrder">继续支付</button>
+						<button class="r_c_btn2" @click="gotoCloud">前往活动</button>
+					</view>
+				</view>
+				<image class="r_c_close" @click.stop="closeTipsRef"
+					src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d39b4202401311747186525.png"></image>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 <script>
@@ -532,7 +537,7 @@
 				// 备注
 				msgObj: {},
 				textareaStatus: true,
-        platformConsumption: [],
+				platformConsumption: [],
 				deliveryName: '快递配送',
 				//支付方式
 				cartArr: [{
@@ -688,20 +693,20 @@
 				is_take: '',
 				domain: HTTP_REQUEST_URL,
 				product_type: '',
-        source: null,
+				source: null,
 				interest_rate: '', //利率
 				settle_cycle: '', // 周期
 				type_id: '', //店铺类型
-        consumption_id: '', //补贴id
-        consumption_money: '', //补贴抵扣金额
+				consumption_id: '', //补贴id
+				consumption_money: '', //补贴抵扣金额
 			};
 		},
 		computed: {
 			...mapGetters(['isLogin', 'viewColor']),
 			...configMap(['hide_mer_status', 'alipay_open', 'yue_pay_status']),
-      red_price(){ // 计算补贴抵扣了多少钱
-        return (this.proPrice - this.totalPrice).toFixed(2);
-      }
+			red_price() { // 计算补贴抵扣了多少钱
+				return (this.proPrice - this.totalPrice).toFixed(2);
+			}
 		},
 		watch: {
 			alipay_open(n) {
@@ -717,7 +722,7 @@
 			this.type_id = options.type_id
 			this.product_type = options.product_type
 			this.seckillId = options.seckillId
-      if(options.source) this.source = options.source;
+			if (options.source) this.source = options.source;
 			// #ifdef H5
 			this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5'
 			// #endif
@@ -1065,16 +1070,16 @@
 					cart_id: that.cartId.split(","),
 					address_id: address_id,
 					takes: that.take,
-          consumption_id: this.consumption_id,
+					consumption_id: this.consumption_id,
 					use_coupon: that.subCoupon,
 					use_integral: that.use_integral,
-          product_type: that.product_type,
-          source: that.source
+					product_type: that.product_type,
+					source: that.source
 				}).then(res => {
 					// 默认选中
-					that.product_type=res.data.order_type
+					that.product_type = res.data.order_type
 					that.is_take = false;
-          that.platformConsumption = res.data.platformConsumption;
+					that.platformConsumption = res.data.platformConsumption;
 					res.data.order.forEach(el => {
 						if (el.order.isTake == 1) that.is_take = true
 						el.isTake = 0
@@ -1093,8 +1098,8 @@
 								that.subCoupon[el.mer_id].push(el.coupon_user_id)
 							}
 						})
-					}else res.data.platformCoupon = [];
-          that.consumption_money = res.data.consumption_money;
+					} else res.data.platformCoupon = [];
+					that.consumption_money = res.data.consumption_money;
 					that.$set(that.coupon, "coupon", that.plantCoupon ? res.data.platformCoupon : res.data
 						.order[that.couponIndex].coupon);
 					that.$set(that, "store_coupon_number", res.data.order[that.couponIndex].order.useCouponIds
@@ -1127,7 +1132,7 @@
 					that.order_key = res.data.key
 					that.cartArr[4].title =
 						`结算周期：${res.data.order[0].settle_cycle}天 日利率：${res.data.order[0].interest_rate}%`
-				
+
 					if (res.data.order[0].credit_buy == 1 && this.type_id == 12) {
 						this.cartArr[4].payStatus = 1
 					} else {
@@ -1162,7 +1167,7 @@
 				if (that.addressId) {
 					getAddressDetail(that.addressId).then(res => {
 						res.data.is_default = parseInt(res.data.is_default);
-						
+
 						that.addressInfo = res.data || {};
 						that.addressId = res.data.address_id || 0;
 						that.address.addressId = res.data.address_id || 0;
@@ -1170,12 +1175,12 @@
 							real_name: res.data.real_name,
 							phone: res.data.phone
 						}
-				
+
 						this.$nextTick(() => {
 							this.getConfirm(that.addressId);
 						})
 					})
-					
+
 				} else {
 					getAddressList().then(res => {
 						that.addressInfo = res.data.list.length > 0 ? res.data.list[0] : {};
@@ -1196,7 +1201,7 @@
 				let that = this;
 				let active = e;
 				that.active = active;
- 				// console.log(this.active);
+				// console.log(this.active);
 				that.animated = true;
 				that.payType = that.cartArr[active].value;
 				if (that.payType == 'weixin') {
@@ -1221,17 +1226,17 @@
 				this.$set(this, "coupon_number", this.subCoupon['0'].length);
 				this.$set(this, "coupon_amount", this.plant_coupon_amount);
 			},
-      couponTap3: function(item, index) {
-      	uni.navigateTo({
-      	  url: '/pages/redpacket/redpacket',
-          success:(res)=> {
-            res.eventChannel.emit('changeRedPacketInfo', this.platformConsumption)
-            uni.$once('changeRedPacket', (data)=>{
-              this.consumption_id = data;
-            })
-          }
-      	})
-      },
+			couponTap3: function(item, index) {
+				uni.navigateTo({
+					url: '/pages/redpacket/redpacket',
+					success: (res) => {
+						res.eventChannel.emit('changeRedPacketInfo', this.platformConsumption)
+						uni.$once('changeRedPacket', (data) => {
+							this.consumption_id = data;
+						})
+					}
+				})
+			},
 			car: function() {
 				let that = this;
 				that.animated = false;
@@ -1243,14 +1248,14 @@
 					that.address.address = true;
 					// that.pagesUrl = '/pages/users/user_address/index?cartId=' + this.cartId + '&pinkId=' + this
 					// 	.pinkId + '&couponId=' + this.couponId;
-          that.pagesUrl = '/pages/users/user_address_list/index'
+					that.pagesUrl = '/pages/users/user_address_list/index'
 				} else {
 					// uni.navigateTo({
 					// 	url: `/pages/users/user_address/index?cartId=${this.cartId}`,
 					// });
-          uni.navigateTo({
-          	url: `pages/users/user_address_list/index`,
-          });
+					uni.navigateTo({
+						url: `pages/users/user_address_list/index`,
+					});
 				}
 			},
 			/**
@@ -1349,7 +1354,8 @@
 								success: (e) => {
 									// 暂不跳转
 									let url = '/pages/order_pay_status/index?order_id=' + orderId +
-										'&msg=支付成功' + '&product_type=' + that.product_type + '&source=' + that.source;
+										'&msg=支付成功' + '&product_type=' + that.product_type +
+										'&source=' + that.source;
 
 									return that.$util.Tips({
 										title: '支付成功',
@@ -1360,10 +1366,11 @@
 									});
 								},
 								fail: (e) => {
-										console.log(e,'111111111')
+									console.log(e, '111111111')
 									// 暂不跳转
 									let url = '/pages/order_pay_status/index?order_id=' + orderId +
-										'&msg=取消支付' + '&product_type=' + that.product_type + '&source=' + that.source;
+										'&msg=取消支付' + '&product_type=' + that.product_type +
+										'&source=' + that.source;
 									return that.$util.Tips({
 										title: '取消支付',
 									}, {
@@ -1372,7 +1379,7 @@
 									});
 								},
 								complete: (res) => {
-								uni.hideLoading();
+									uni.hideLoading();
 									// 暂不跳转
 									// let url = '/pages/order_pay_status/index?order_id=' + orderId +
 									// 	'&msg=取消支付' + '&product_type=' + that.product_type + '&source=' + that.source;
@@ -1412,7 +1419,8 @@
 								fail: function(e) {
 									// 暂不跳转
 									let pages = '/pages/order_pay_status/index?order_id=' +
-										orderId + '&msg=取消支付' + '&product_type=' + that.product_type + '&source=' + that.source;
+										orderId + '&msg=取消支付' + '&product_type=' + that
+										.product_type + '&source=' + that.source;
 									return that.$util.Tips({
 										title: '取消支付'
 									}, {
@@ -1492,7 +1500,8 @@
 						default:
 							// 暂不跳转
 							let pages = '/pages/order_pay_status/index?order_id=' +
-								orderId + '&msg=取消支付' + '&product_type=' + that.product_type + '&source=' + that.source
+								orderId + '&msg=取消支付' + '&product_type=' + that.product_type + '&source=' +
+								that.source
 
 							return that.$util.Tips({
 								title: '取消支付'
@@ -1672,11 +1681,10 @@
 					}
 				})
 				if (data.payType == 'balance' && parseFloat(that.userInfo.now_money) < parseFloat(that.totalPrice))
-					return that.$util
-						.Tips({
-							title: '余额不足！'
-						});
-        data.consumption_id = this.consumption_id;
+					return that.$util.Tips({
+						title: '余额不足！'
+					});
+				data.consumption_id = this.consumption_id;
 
 				// 先货后款暂不可用
 				// if (this.payType == 'creditBuy') {
@@ -1725,8 +1733,7 @@
 						title: this.deliveryName,
 						check: true
 					}]
-				} 
-        else if (!item.allow_delivery && item.allow_take) {
+				} else if (!item.allow_delivery && item.allow_take) {
 					this.radioList = [{
 						title: '到店核销',
 						check: false
@@ -1781,35 +1788,35 @@
 				}
 				//#endif
 			},
-      // 关闭弹窗
-      closeTipsRef(){
-        this.$refs.tipsRef.close();
-      },
-      // 打开弹窗
-      openTipsRef(){
-        // 不是云仓商品且价格大于100元时提示
-        // if(this.source!=103&&this.source!=105&&this.totalPrice>=100) this.$refs.tipsRef.open();
-        // else this.SubOrder();
-        this.SubOrder();
-      },
-      // 继续支付
-      closeAndSubOrder(){
-        this.closeTipsRef();
-        this.$nextTick(()=>{
-          this.SubOrder();
-        })
-      },
-      // 前往活动
-      gotoCloud(){
-        this.closeTipsRef();
-        let street_id = this.$store.state.storage.address.street_id;
-        let townName = this.$store.state.storage.address.townName;
-        let lat = this.$store.state.storage.location.lat;
-        let long = this.$store.state.storage.location.long;
-        uni.navigateTo({
-          url: `/pages/nongKe/cloud_entrepot/indexh?street_id=${street_id}&townName=${townName}&source=103&location=${lat},${long}`
-        })
-      }
+			// 关闭弹窗
+			closeTipsRef() {
+				this.$refs.tipsRef.close();
+			},
+			// 打开弹窗
+			openTipsRef() {
+				// 不是云仓商品且价格大于100元时提示
+				// if(this.source!=103&&this.source!=105&&this.totalPrice>=100) this.$refs.tipsRef.open();
+				// else this.SubOrder();
+				this.SubOrder();
+			},
+			// 继续支付
+			closeAndSubOrder() {
+				this.closeTipsRef();
+				this.$nextTick(() => {
+					this.SubOrder();
+				})
+			},
+			// 前往活动
+			gotoCloud() {
+				this.closeTipsRef();
+				let street_id = this.$store.state.storage.address.street_id;
+				let townName = this.$store.state.storage.address.townName;
+				let lat = this.$store.state.storage.location.lat;
+				let long = this.$store.state.storage.location.long;
+				uni.navigateTo({
+					url: `/pages/nongKe/cloud_entrepot/indexh?street_id=${street_id}&townName=${townName}&source=103&location=${lat},${long}`
+				})
+			}
 		}
 	}
 </script>
@@ -2663,69 +2670,79 @@
 		height: 756rpx;
 		overflow-y: scroll;
 	}
-  .red_packet{
-    color: #ff5c2d !important;
-    background-color: rgba(#ff5c2d, 0.3);
-    border-radius: 60rpx;
-    padding: 5rpx 10rpx;
-    padding-left: 20rpx;
-    font-size: 25rpx;
-  }
-  .tips_popup{
-    width: 600rpx;
-    height: 450rpx;
-    position: relative;
-    .r_c_gb{
-      width: 100%;
-      height: 420rpx;
-      margin-top: 30rpx;
-    }
-    .ref_content{
-      position: absolute;
-      left: 0;
-      top: 0;
-      height: 100%;
-      width: 100%;
-      box-sizing: border-box;
-      padding: 120rpx 30rpx 30rpx 30rpx;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-      color: #2E2E2E;
-      font-size: 28rpx;
-      .r_c_title{
-        font-weight: blod;
-      }
-      .r_c_text{
-        font-size: 26rpx;
-      }
-      .r_c_btn{
-        display: flex;
-        justify-content: space-around;
-        .r_c_btn1{
-          background-color: transparent;
-          border: 5rpx solid #FF874C;
-          color: #FF874C;
-          font-size: 28rpx;
-          padding: 5rpx 28rpx;
-          border-radius: 60rpx;
-        }
-        .r_c_btn2{
-          background-color: #FF874C;
-          border: 5rpx solid #FF874C;
-          color: #fff;
-          font-size: 28rpx;
-          padding: 5rpx 28rpx;
-          border-radius: 60rpx;
-        }
-      }
-    }
-    .r_c_close{
-      position: absolute;
-      top: 0;
-      right: 0;
-      height: 60rpx;
-      width: 60rpx;
-    }
-  }
+
+	.red_packet {
+		color: #ff5c2d !important;
+		background-color: rgba(#ff5c2d, 0.3);
+		border-radius: 60rpx;
+		padding: 5rpx 10rpx;
+		padding-left: 20rpx;
+		font-size: 25rpx;
+	}
+
+	.tips_popup {
+		width: 600rpx;
+		height: 450rpx;
+		position: relative;
+
+		.r_c_gb {
+			width: 100%;
+			height: 420rpx;
+			margin-top: 30rpx;
+		}
+
+		.ref_content {
+			position: absolute;
+			left: 0;
+			top: 0;
+			height: 100%;
+			width: 100%;
+			box-sizing: border-box;
+			padding: 120rpx 30rpx 30rpx 30rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			color: #2E2E2E;
+			font-size: 28rpx;
+
+			.r_c_title {
+				font-weight: blod;
+			}
+
+			.r_c_text {
+				font-size: 26rpx;
+			}
+
+			.r_c_btn {
+				display: flex;
+				justify-content: space-around;
+
+				.r_c_btn1 {
+					background-color: transparent;
+					border: 5rpx solid #FF874C;
+					color: #FF874C;
+					font-size: 28rpx;
+					padding: 5rpx 28rpx;
+					border-radius: 60rpx;
+				}
+
+				.r_c_btn2 {
+					background-color: #FF874C;
+					border: 5rpx solid #FF874C;
+					color: #fff;
+					font-size: 28rpx;
+					padding: 5rpx 28rpx;
+					border-radius: 60rpx;
+				}
+			}
+		}
+
+		.r_c_close {
+			position: absolute;
+			top: 0;
+			right: 0;
+			height: 60rpx;
+			width: 60rpx;
+		}
+	}
 </style>
\ No newline at end of file