diff --git a/crmeb/app/api/controller/v1/order/OtherOrderController.php b/crmeb/app/api/controller/v1/order/OtherOrderController.php
index 92b65bc94..a6b460891 100644
--- a/crmeb/app/api/controller/v1/order/OtherOrderController.php
+++ b/crmeb/app/api/controller/v1/order/OtherOrderController.php
@@ -157,8 +157,8 @@ class OtherOrderController
      */
     public function pay_type(Request $request)
     {
-        $payType['ali_pay_status'] = sys_config('ali_pay_status', 0) != 0;
-        $payType['pay_weixin_open'] = sys_config('pay_weixin_open', 0) != 0;
+        $payType['ali_pay_status'] = sys_config('ali_pay_status', '0') != '0';
+        $payType['pay_weixin_open'] = sys_config('pay_weixin_open', '0') != '0';
         $payType['site_name'] = sys_config('site_name');
         $payType['now_money'] = $request->user('now_money');
         $payType['offline_pay_status'] = true;
diff --git a/crmeb/app/api/controller/v1/order/StoreOrderController.php b/crmeb/app/api/controller/v1/order/StoreOrderController.php
index a63c2acfc..6776603ad 100644
--- a/crmeb/app/api/controller/v1/order/StoreOrderController.php
+++ b/crmeb/app/api/controller/v1/order/StoreOrderController.php
@@ -484,7 +484,7 @@ class StoreOrderController
     }
 
     /**
-     * 支付宝单独支付
+     * TODO 支付宝单独支付 弃用
      * @param OrderPayServices $payServices
      * @param OtherOrderServices $services
      * @param string $key
@@ -494,11 +494,11 @@ class StoreOrderController
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function aliPay(OrderPayServices $payServices, OtherOrderServices $services, string $key, string $quitUrl)
-    {
-        $payInfo = $this->services->aliPayOrder($payServices, $services, $key, $quitUrl);
-        return app('json')->success(['pay_content' => $payInfo]);
-    }
+//    public function aliPay(OrderPayServices $payServices, OtherOrderServices $services, string $key, string $quitUrl)
+//    {
+//        $payInfo = $this->services->aliPayOrder($payServices, $services, $key, $quitUrl);
+//        return app('json')->success(['pay_content' => $payInfo]);
+//    }
 
     /**
      * 订单列表
diff --git a/crmeb/app/api/controller/v1/user/UserRechargeController.php b/crmeb/app/api/controller/v1/user/UserRechargeController.php
index e4d35d9ea..57302764d 100644
--- a/crmeb/app/api/controller/v1/user/UserRechargeController.php
+++ b/crmeb/app/api/controller/v1/user/UserRechargeController.php
@@ -61,7 +61,7 @@ class UserRechargeController
     }
 
     /**
-     * 小程序充值
+     * TODO 小程序充值 弃用
      * @param Request $request
      * @return mixed
      */
@@ -82,7 +82,7 @@ class UserRechargeController
     }
 
     /**
-     * 公众号充值
+     * TODO 公众号充值 弃用
      * @param Request $request
      * @return mixed
      */
diff --git a/crmeb/app/api/route/v1.php b/crmeb/app/api/route/v1.php
index 127cedd2c..569fef1f8 100644
--- a/crmeb/app/api/route/v1.php
+++ b/crmeb/app/api/route/v1.php
@@ -42,8 +42,8 @@ Route::group(function () {
     Route::post('register/reset', 'v1.LoginController/reset')->name('registerReset');
     // 绑定手机号(静默授权 还未有用户信息)
     Route::post('binding', 'v1.LoginController/binding_phone')->name('bindingPhone');
-    // 支付宝复制链接支付
-    Route::get('ali_pay', 'v1.order.StoreOrderController/aliPay')->name('aliPay');
+    // 支付宝复制链接支付 弃用
+//    Route::get('ali_pay', 'v1.order.StoreOrderController/aliPay')->name('aliPay');
     //查询版权
     Route::get('copyright', 'v1.PublicController/copyright')->option(['real_name' => '申请版权']);
 
diff --git a/crmeb/app/services/pay/OrderPayServices.php b/crmeb/app/services/pay/OrderPayServices.php
index 458ee43de..e8bc1b903 100644
--- a/crmeb/app/services/pay/OrderPayServices.php
+++ b/crmeb/app/services/pay/OrderPayServices.php
@@ -159,7 +159,7 @@ class OrderPayServices
         }
 
         //发起支付
-        $jsConfig = $this->payServices->payV2($payType, $orderInfo['order_id'], $orderInfo['pay_price'], $successAction, $body, $options);
+        $jsConfig = $this->payServices->pay($payType, $orderInfo['order_id'], $orderInfo['pay_price'], $successAction, $body, $options);
 
         //发起支付后处理返回参数
         $payInfo = $this->afterPay($orderInfo, $jsConfig, $payType);
diff --git a/crmeb/app/services/pay/PayServices.php b/crmeb/app/services/pay/PayServices.php
index eb26b594e..e896d63be 100644
--- a/crmeb/app/services/pay/PayServices.php
+++ b/crmeb/app/services/pay/PayServices.php
@@ -105,7 +105,7 @@ class PayServices
      * @param string $body
      * @return array|string
      */
-    public function payV2(string $payType, string $orderId, string $price, string $successAction, string $body, array $options = [])
+    public function pay(string $payType, string $orderId, string $price, string $successAction, string $body, array $options = [])
     {
         try {
 
@@ -139,7 +139,7 @@ class PayServices
     }
 
     /**
-     * 发起支付
+     * TODO 发起支付 弃用
      * @param string $payType
      * @param string $openid
      * @param string $orderId
@@ -148,46 +148,46 @@ class PayServices
      * @param string $body
      * @return array|string
      */
-    public function pay(string $payType, string $openid, string $orderId, string $price, string $successAction, string $body, bool $isCode = false)
-    {
-        try {
-
-            //这些全都是微信支付
-            if (in_array($payType, ['routine', 'weixinh5', 'weixin', 'pc', 'store'])) {
-                $payType = 'wechat_pay';
-                //判断是否使用v3
-                if (sys_config('pay_wechat_type') == 1) {
-                    $payType = 'v3_wechat_pay';
-                }
-            }
-
-            if ($payType == 'alipay') {
-                $payType = 'ali_pay';
-            }
-
-
-            $options = [];
-            if (self::ALLIN_PAY === $payType) {
-                $options['returl'] = $this->getOption('returl');
-                if ($options['returl']) {
-                    $options['returl'] = str_replace('http://', 'https://', $options['returl']);
-                }
-                $options['is_wechat'] = $this->getOption('is_wechat', false);
-                $options['appid'] = sys_config('routine_appId');
-                $payType = 'allin_pay';
-            }
-
-            /** @var Pay $pay */
-            $pay = app()->make(Pay::class, [$payType]);
-
-
-            return $pay->create($orderId, $price, $successAction, $body, '', ['openid' => $openid, 'isCode' => $isCode, 'pay_new_weixin_open' => (bool)sys_config('pay_new_weixin_open')] + $options);
-
-        } catch (\Exception $e) {
-            if (strpos($e->getMessage(), 'api unauthorized rid') !== false) {
-                throw new ApiException('请在微信支付配置中将小程序商户号选择改为商户号绑定');
-            }
-            throw new ApiException($e->getMessage());
-        }
-    }
+//    public function pay(string $payType, string $openid, string $orderId, string $price, string $successAction, string $body, bool $isCode = false)
+//    {
+//        try {
+//
+//            //这些全都是微信支付
+//            if (in_array($payType, ['routine', 'weixinh5', 'weixin', 'pc', 'store'])) {
+//                $payType = 'wechat_pay';
+//                //判断是否使用v3
+//                if (sys_config('pay_wechat_type') == 1) {
+//                    $payType = 'v3_wechat_pay';
+//                }
+//            }
+//
+//            if ($payType == 'alipay') {
+//                $payType = 'ali_pay';
+//            }
+//
+//
+//            $options = [];
+//            if (self::ALLIN_PAY === $payType) {
+//                $options['returl'] = $this->getOption('returl');
+//                if ($options['returl']) {
+//                    $options['returl'] = str_replace('http://', 'https://', $options['returl']);
+//                }
+//                $options['is_wechat'] = $this->getOption('is_wechat', false);
+//                $options['appid'] = sys_config('routine_appId');
+//                $payType = 'allin_pay';
+//            }
+//
+//            /** @var Pay $pay */
+//            $pay = app()->make(Pay::class, [$payType]);
+//
+//
+//            return $pay->create($orderId, $price, $successAction, $body, '', ['openid' => $openid, 'isCode' => $isCode, 'pay_new_weixin_open' => (bool)sys_config('pay_new_weixin_open')] + $options);
+//
+//        } catch (\Exception $e) {
+//            if (strpos($e->getMessage(), 'api unauthorized rid') !== false) {
+//                throw new ApiException('请在微信支付配置中将小程序商户号选择改为商户号绑定');
+//            }
+//            throw new ApiException($e->getMessage());
+//        }
+//    }
 }
diff --git a/crmeb/app/services/pay/RechargeServices.php b/crmeb/app/services/pay/RechargeServices.php
index b625d8ed3..7285f8534 100644
--- a/crmeb/app/services/pay/RechargeServices.php
+++ b/crmeb/app/services/pay/RechargeServices.php
@@ -86,7 +86,7 @@ class RechargeServices
             $openid = '';
         }
 
-        $res = $this->pay->pay($recharge['recharge_type'], $openid, $recharge['order_id'], $recharge['price'], 'user_recharge', '用户充值');
+        $res = $this->pay->pay($recharge['recharge_type'], $recharge['order_id'], $recharge['price'], 'user_recharge', '用户充值', ['openid' => $openid]);
 
         if ($payType == PayServices::WEIXIN_PAY) {
             if (request()->isH5()) {
@@ -100,7 +100,7 @@ class RechargeServices
             $payStstus = 'allinpay_pay';
         }
 
-        return ['jsConfig' => $res, 'order_id' => $recharge['order_id'], 'pay_type' => strtoupper($payStstus)];
+        return ['jsConfig' => $res, 'pay_key' => md5($recharge['order_id']), 'order_id' => $recharge['order_id'], 'pay_type' => strtoupper($payStstus)];
     }
 
 }
diff --git a/template/admin/src/pages/product/productAdd/index.vue b/template/admin/src/pages/product/productAdd/index.vue
index c7c4baedb..9c7b14351 100644
--- a/template/admin/src/pages/product/productAdd/index.vue
+++ b/template/admin/src/pages/product/productAdd/index.vue
@@ -2137,6 +2137,7 @@ export default {
     },
     end() {
       this.moveIndex = '';
+      this.generate(1)
     },
     // 单独设置会员设置
     checkAllGroupChange(data) {
diff --git a/template/uni-app/components/numberScroll.vue b/template/uni-app/components/numberScroll.vue
index 9a7fc8819..2ace75d54 100644
--- a/template/uni-app/components/numberScroll.vue
+++ b/template/uni-app/components/numberScroll.vue
@@ -78,7 +78,6 @@
 			let arr = new Array(num.toString().length);
 			arr.fill(0);
 			this.indexArr = arr;
-			console.log(this.indexArr)
 		},
 		watch: {
 			num: function(val, oldVal) {
@@ -99,7 +98,6 @@
 					this.indexArr = arr;
 				}
 				this.numChange(val);
-				console.log(this.indexArr)
 			}
 		},
 		mounted() {
@@ -129,7 +127,6 @@
 						}
 					}
 					this.indexArr = copyIndexArr;
-					console.log(this.indexArr)
 				})
 			}
 		}
diff --git a/template/uni-app/components/shareRedPackets/index.vue b/template/uni-app/components/shareRedPackets/index.vue
index 8de1f9135..986f60bc6 100644
--- a/template/uni-app/components/shareRedPackets/index.vue
+++ b/template/uni-app/components/shareRedPackets/index.vue
@@ -140,7 +140,12 @@
 	.sharing-packets .sharing-con .text .shareBut {
 		font-size: 22rpx;
 		color: #fff;
+		// #ifdef H5
 		margin-top: 14rpx;
+		// #endif
+		// #ifndef H5
+		margin-top: 26rpx;
+		// #endif
 		height: 50rpx;
 		line-height: 50rpx;
 	}
diff --git a/template/uni-app/pages/activity/goods_seckill/index.vue b/template/uni-app/pages/activity/goods_seckill/index.vue
index 32e117786..55fe22129 100644
--- a/template/uni-app/pages/activity/goods_seckill/index.vue
+++ b/template/uni-app/pages/activity/goods_seckill/index.vue
@@ -254,6 +254,7 @@
 	.flash-sale .timeLsit .item.on .state {
 		width: 120rpx;
 		height: 30rpx;
+		line-height: 30rpx;
 		border-radius: 15rpx;
 		background: var(--view-theme);
 		color: #fff;
diff --git a/template/uni-app/pages/annex/vip_paid/index.vue b/template/uni-app/pages/annex/vip_paid/index.vue
index 29de79881..e4280079f 100644
--- a/template/uni-app/pages/annex/vip_paid/index.vue
+++ b/template/uni-app/pages/annex/vip_paid/index.vue
@@ -469,7 +469,7 @@
 						this.groomList();
 						uni.hideLoading();
 						uni.showToast({
-							title: this.$t(`成功开启0元试用`),
+							title: this.$t(`成功开启试用`),
 						});
 					}
 				}).catch(err => {
@@ -488,7 +488,7 @@
 						this.groomList();
 						uni.hideLoading();
 						uni.showToast({
-							title: this.$t(`成功开启0元试用`),
+							title: this.$t(`成功开启试用`),
 						});
 					}
 				}).catch(err => {
diff --git a/template/uni-app/pages/goods/cashier/index.vue b/template/uni-app/pages/goods/cashier/index.vue
index a0d3c9685..269870de7 100644
--- a/template/uni-app/pages/goods/cashier/index.vue
+++ b/template/uni-app/pages/goods/cashier/index.vue
@@ -1,740 +1,753 @@
-<template>
-	<view class="page" v-if="payPrice">
-		<view class="pay-price">
-			<view class="price">
-				<text class="unit">{{$t(`￥`)}}</text>
-				<numberScroll :num='payPrice' color="#E93323" width='30' height='50' fontSize='50'></numberScroll>
-			</view>
-			<view class="count-down">
-				{{$t(`支付剩余时间`)}}：
-				<countDown :is-day="false" :tip-text="' '" :day-text="' '" :hour-text="' : '" :minute-text="' : '"
-					:second-text="' '" :datatime="invalidTime"></countDown>
-			</view>
-		</view>
-		<view class="payment">
-			<view class="title">
-				{{$t(`支付方式`)}}
-			</view>
-			<view class="item acea-row row-between-wrapper" v-for="(item,index) in cartArr" :key="index"
-				v-show='item.payStatus' @click="payType(item.number || 0, item.value, index)">
-				<view class="left acea-row row-between-wrapper">
-					<view class="iconfont" :class="item.icon"></view>
-					<view class="text">
-						<view class="name">{{item.name}}</view>
-						<view class="info" v-if="item.value == 'yue'">
-							{{item.title}} <span class="money">{{$t(`￥`)}}{{ item.number }}</span>
-						</view>
-						<view class="info" v-else>{{item.title}}</view>
-					</view>
-				</view>
-				<view class="iconfont" :class="active==index?'icon-xuanzhong11 font-num':'icon-weixuan'"></view>
-			</view>
-		</view>
-		<view class="button acea-row row-center-wrapper" @click='goPay(number, paytype)'>{{$t(`确认支付`)}}
-		</view>
-		<view v-show="false" v-html="formContent"></view>
-	</view>
-</template>
-
-<script>
-	import countDown from '@/components/countDown';
-	import numberScroll from '@/components/numberScroll.vue'
-	import {
-		getCashierOrder,
-		orderPay
-	} from '@/api/order.js';
-	export default {
-		components: {
-			countDown,
-			numberScroll
-		},
-		data() {
-			return {
-				checked: false,
-				datatime: 1676344056,
-				//支付方式
-				cartArr: [{
-						"name": this.$t(`微信支付`),
-						"icon": "icon-weixin2",
-						value: 'weixin',
-						title: this.$t(`使用微信快捷支付`),
-						payStatus: 1,
-					},
-					{
-						"name": this.$t(`支付宝支付`),
-						"icon": "icon-zhifubao",
-						value: 'alipay',
-						title: this.$t(`使用支付宝支付`),
-						payStatus: 1,
-					},
-					{
-						"name": this.$t(`余额支付`),
-						"icon": "icon-yuezhifu",
-						value: 'yue',
-						title: this.$t(`可用余额`),
-						payStatus: 1,
-					},
-					{
-						"name": this.$t(`线下支付`),
-						"icon": "icon-yuezhifu1",
-						value: 'offline',
-						title: this.$t(`使用线下付款`),
-						payStatus: 2,
-					}, {
-						"name": this.$t(`好友代付`),
-						"icon": "icon-haoyoudaizhifu",
-						value: 'friend',
-						title: this.$t(`找微信好友支付`),
-						payStatus: 1,
-					}
-				],
-				orderId: 0,
-				fromType: '',
-				active: 0,
-				payPrice: 0,
-				invalidTime: 0,
-				initIn: false,
-				jumpData: {
-					orderId: '',
-					msg: ''
-				},
-				formContent: ''
-			}
-		},
-		watch: {
-			cartArr: {
-				handler(newV, oldValue) {
-					let newPayList = [];
-					newV.forEach((item, index) => {
-						if (item.payStatus) {
-							item.index = index;
-							newPayList.push(item)
-						}
-					});
-					this.active = newPayList[0].index;
-					this.paytype = newPayList[0].value;
-					this.number = newPayList[0].number || 0;
-				},
-				immediate: true,
-				deep: true
-			}
-		},
-		onLoad(options) {
-			if (options.order_id) this.orderId = options.order_id
-			if (options.from_type) this.fromType = options.from_type
-			this.getCashierOrder()
-		},
-		onShow() {
-			let options = wx.getEnterOptionsSync();
-			console.log(options)
-			if (options.scene == '1038' && options.referrerInfo.appId == 'wxef277996acc166c3' && this.initIn) {
-				// 代表从收银台小程序返回
-				let extraData = options.referrerInfo.extraData;
-				this.initIn = false
-				if (!extraData) {
-					// "当前通过物理按键返回，未接收到返参，建议自行查询交易结果";
-					this.$util.Tips({
-						title: this.$t(`取消支付`)
-					}, {
-						tab: 5,
-						url: `/pages/goods/order_pay_status/index?order_id=${this.orderId}&msg=${this.$t(`取消支付`)}&type=3&totalPrice=${this.payPrice}&status=2`
-					});
-				} else {
-					if (extraData.code == 'success') {
-						this.$util.Tips({
-							title: this.$t(`支付成功`),
-							icon: 'success'
-						}, {
-							tab: 5,
-							url: `/pages/goods/order_pay_status/index?order_id=${this.orderId}&msg=${this.jumpData.msg}&type=3&totalPrice=${this.payPrice}`
-						});
-					} else if (extraData.code == 'cancel') {
-						// "支付已取消";
-						this.$util.Tips({
-							title: this.$t(`取消支付`)
-						}, {
-							tab: 5,
-							url: `/pages/goods/order_pay_status/index?order_id=${this.orderId}&msg=${this.$t(`取消支付`)}&type=3&totalPrice=${this.payPrice}&status=2`
-						});
-					} else {
-						// "支付失败：" + extraData.errmsg;
-						uni.reLaunch({
-							url: `/pages/goods/order_pay_status/index?order_id=${this.orderId}&msg=${this.$t(`支付失败`)}&totalPrice=${this.payPrice}`
-						})
-					}
-				}
-			}
-		},
-		methods: {
-			getCashierOrder() {
-				uni.showLoading({
-					title: this.$t(`创建订单中`)
-				});
-				getCashierOrder(this.orderId, this.fromType).then(res => {
-					console.log(res)
-					this.payPrice = res.data.pay_price
-					this.invalidTime = res.data.invalid_time
-					//微信支付是否开启
-					this.cartArr[0].payStatus = res.data.wechat_pay_status || 0
-					//支付宝是否开启
-					this.cartArr[1].payStatus = res.data.ali_pay_status || 0;
-					//#ifdef MP
-					this.cartArr[1].payStatus = false;
-					//#endif
-					//余额支付是否开启
-					// that.cartArr[2].title = '可用余额:' + res.data.userInfo.now_money;
-					this.cartArr[2].number = res.data.now_money;
-					this.cartArr[2].payStatus = res.data.yue_pay_status
-					if (res.data.offline_pay_status) {
-						this.cartArr[3].payStatus = 1
-					} else {
-						this.cartArr[3].payStatus = 0
-					}
-					//好友代付是否开启
-					this.cartArr[4].payStatus = res.data.friend_pay_status || 0;
-					uni.hideLoading();
-				}).catch(err => {
-					uni.hideLoading();
-					return this.$util.Tips({
-						title: err
-					})
-				})
-			},
-			payType(number, paytype, index) {
-				this.active = index;
-				this.paytype = paytype;
-				this.number = number;
-			},
-			formpost(url, postData) {
-				let tempform = document.createElement("form");
-				tempform.action = url;
-				tempform.method = "post";
-				tempform.target = "_self";
-				tempform.style.display = "none";
-				for (let x in postData) {
-					let opt = document.createElement("input");
-					opt.name = x;
-					opt.value = postData[x];
-					tempform.appendChild(opt);
-				}
-				document.body.appendChild(tempform);
-				this.$nextTick(e => {
-					tempform.submit();
-				})
-			},
-			goPay: function(number, paytype) {
-				console.log(paytype)
-				let that = this;
-				if (!that.orderId) return that.$util.Tips({
-					title: that.$t(`请选择要支付的订单`)
-				});
-				if (paytype == 'yue' && parseFloat(number) < parseFloat(that.payPrice)) return that.$util.Tips({
-					title: that.$t(`余额不足`)
-				});
-				uni.showLoading({
-					title: that.$t(`支付中`)
-				});
-				if (paytype == 'friend' && that.orderId) {
-					return uni.navigateTo({
-						url: '/pages/users/payment_on_behalf/index?order_id=' + that.orderId + '&spread=' +
-							this.$store.state.app.uid,
-						success: res => {},
-						fail: () => {},
-						complete: () => {}
-					});
-				}
-				orderPay({
-					uni: that.orderId,
-					paytype: paytype,
-					type: that.friendPay ? 1 : 0,
-					// #ifdef MP 
-					'from': 'routine',
-					// #endif
-					// #ifdef H5
-					'from': this.$wechat.isWeixin() ? 'weixin' : 'weixinh5',
-					// #endif
-					// #ifdef H5
-					quitUrl: location.port ? location.protocol + '//' + location.hostname + ':' + location
-						.port +
-						'/pages/goods/order_details/index?order_id=' + this.orderId : location.protocol +
-						'//' + location.hostname +
-						'/pages/goods/order_details/index?order_id=' + this.orderId
-					// #endif
-					// #ifdef APP-PLUS
-					quitUrl: '/pages/goods/order_details/index?order_id=' + this.orderId
-					// #endif
-				}).then(res => {
-					let status = res.data.status,
-						orderId = res.data.result.orderId,
-						jsConfig = res.data.result.jsConfig,
-						goPages = '/pages/goods/order_pay_status/index?order_id=' + this.orderId + '&msg=' +
-						res
-						.msg +
-						'&type=3' + '&totalPrice=' + this.payPrice,
-						friendPay = '/pages/users/payment_on_behalf/index?order_id=' + this.orderId +
-						'&spread=' +
-						this
-						.$store.state.app.uid
-
-					switch (status) {
-						case 'ORDER_EXIST':
-						case 'EXTEND_ORDER':
-							uni.hideLoading();
-							return that.$util.Tips({
-								title: res.msg
-							}, {
-								tab: 5,
-								url: goPages
-							});
-						case 'ALLINPAY_PAY':
-							uni.hideLoading();
-							// #ifdef MP
-							this.initIn = true
-							wx.openEmbeddedMiniProgram({
-								appId: 'wxef277996acc166c3',
-								extraData: {
-									cusid: jsConfig.cusid,
-									appid: jsConfig.appid,
-									version: jsConfig.version,
-									trxamt: jsConfig.trxamt,
-									reqsn: jsConfig.reqsn,
-									notify_url: jsConfig.notify_url,
-									body: jsConfig.body,
-									remark: jsConfig.remark,
-									validtime: jsConfig.validtime,
-									randomstr: jsConfig.randomstr,
-									paytype: jsConfig.paytype,
-									sign: jsConfig.sign,
-									signtype: jsConfig.signtype
-								}
-							})
-							this.jumpData = {
-								orderId: res.data.result.orderId,
-								msg: res.msg,
-							}
-							// #endif
-							// #ifdef APP-PLUS
-							plus.runtime.openURL(jsConfig.payinfo);
-							setTimeout(e => {
-								uni.reLaunch({
-									url: goPages
-								})
-							}, 1000)
-							// #endif
-							// #ifdef H5
-							this.formpost(res.data.result.pay_url, jsConfig)
-							// #endif
-							break;
-						case 'PAY_ERROR':
-							uni.hideLoading();
-							return that.$util.Tips({
-								title: res.msg
-							}, {
-								tab: 5,
-								url: goPages
-							});
-							break;
-						case 'SUCCESS':
-							uni.hideLoading();
-							console.log('shiwo ')
-							return that.$util.Tips({
-								title: res.msg,
-								icon: 'success'
-							}, {
-								tab: 4,
-								url: goPages
-							});
-							return that.$util.Tips({
-								title: res.msg,
-								icon: 'success'
-							}, {
-								tab: 4,
-								url: data.payType == 'friend' ? friendPay : goPages
-							});
-							break;
-						case 'WECHAT_PAY':
-							that.toPay = true;
-							// #ifdef MP
-							/* that.toPay = true; */
-							let mp_pay_name = ''
-							if (uni.requestOrderPayment) {
-								mp_pay_name = 'requestOrderPayment'
-							} else {
-								mp_pay_name = 'requestPayment'
-							}
-							uni[mp_pay_name]({
-								timeStamp: jsConfig.timestamp,
-								nonceStr: jsConfig.nonceStr,
-								package: jsConfig.package,
-								signType: jsConfig.signType,
-								paySign: jsConfig.paySign,
-								success: function(res) {
-									uni.hideLoading();
-									if (that.BargainId || that.combinationId || that.pinkId ||
-										that
-										.seckillId || that.discountId)
-										return that.$util.Tips({
-											title: that.$t(`支付成功`),
-											icon: 'success'
-										}, {
-											tab: 4,
-											url: goPages
-										});
-									return that.$util.Tips({
-										title: that.$t(`支付成功`),
-										icon: 'success'
-									}, {
-										tab: 5,
-										url: goPages
-									});
-								},
-								fail: function(e) {
-									uni.hideLoading();
-									return that.$util.Tips({
-										title: that.$t(`取消支付`)
-									}, {
-										tab: 5,
-										url: goPages + '&status=2'
-									});
-								},
-								complete: function(e) {
-									uni.hideLoading();
-									//关闭当前页面跳转至订单状态
-									if (res.errMsg == 'requestPayment:cancel' || e.errMsg ==
-										'requestOrderPayment:cancel') return that.$util
-										.Tips({
-											title: that.$t(`取消支付`)
-										}, {
-											tab: 5,
-											url: goPages + '&status=2'
-										});
-								},
-							})
-							// #endif
-							// #ifdef H5
-							this.$wechat.pay(res.data.result.jsConfig).then(res => {
-								return that.$util.Tips({
-									title: that.$t(`支付成功`),
-									icon: 'success'
-								}, {
-									tab: 5,
-									url: goPages
-								});
-							}).catch(res => {
-								if (!this.$wechat.isWeixin()) {
-									uni.redirectTo({
-										url: goPages + '&msg=' + that.$t(`支付失败`) +
-											'&status=2'
-										// '&msg=支付失败&status=2'
-									})
-								}
-								if (res.errMsg == 'chooseWXPay:cancel') return that.$util.Tips({
-									title: that.$t(`取消支付`)
-								}, {
-									tab: 5,
-									url: goPages + '&status=2'
-								});
-							})
-							// #endif
-							// #ifdef APP-PLUS
-							uni.requestPayment({
-								provider: 'wxpay',
-								orderInfo: jsConfig,
-								success: (e) => {
-									let url = goPages;
-									uni.showToast({
-										title: that.$t(`支付成功`)
-									})
-									setTimeout(res => {
-										uni.redirectTo({
-											url: url
-										})
-									}, 2000)
-								},
-								fail: (e) => {
-									let url = '/pages/goods/order_pay_status/index?order_id=' +
-										orderId +
-										'&msg=' + that.$t(`支付失败`);
-									uni.showModal({
-										content: that.$t(`支付失败`),
-										showCancel: false,
-										success: function(res) {
-											if (res.confirm) {
-												uni.redirectTo({
-													url: url
-												})
-											} else if (res.cancel) {}
-										}
-									})
-								},
-								complete: () => {
-									uni.hideLoading();
-								},
-							});
-							// #endif
-							break;
-						case 'PAY_DEFICIENCY':
-							uni.hideLoading();
-							//余额不足
-							return that.$util.Tips({
-								title: res.msg
-							}, {
-								tab: 5,
-								url: goPages + '&status=1'
-							});
-							break;
-
-						case "WECHAT_H5_PAY":
-							uni.hideLoading();
-							that.$util.Tips({
-								title: that.$t(`订单创建成功`)
-							}, {
-								tab: 4,
-								url: goPages + '&status=0'
-							});
-							setTimeout(() => {
-								location.href = res.data.result.jsConfig.mweb_url;
-							}, 2000);
-							break;
-
-						case 'ALIPAY_PAY':
-							//#ifdef H5
-							if (this.from === 'weixin') {
-								uni.redirectTo({
-									url: `/pages/users/alipay_invoke/index?id=${orderId}&pay_key=${res.data.result.pay_key}`
-								});
-							} else {
-								uni.hideLoading();
-								that.formContent = res.data.result.jsConfig;
-								that.$nextTick(() => {
-									document.getElementById('alipaysubmit').submit();
-								})
-							}
-							//#endif
-							// #ifdef MP
-							uni.navigateTo({
-								url: `/pages/users/alipay_invoke/index?id=${orderId}&link=${jsConfig.qrCode}`
-							});
-							// #endif
-							// #ifdef APP-PLUS
-							uni.requestPayment({
-								provider: 'alipay',
-								orderInfo: jsConfig,
-								success: (e) => {
-									uni.showToast({
-										title: that.$t(`支付成功`)
-									})
-									let url = '/pages/goods/order_pay_status/index?order_id=' +
-										orderId +
-										'&msg=' + that.$t(`支付成功`);
-									setTimeout(res => {
-										uni.redirectTo({
-											url: url
-										})
-									}, 2000)
-
-								},
-								fail: (e) => {
-									let url = '/pages/goods/order_pay_status/index?order_id=' +
-										orderId +
-										'&msg=' + that.$t(`支付失败`);
-									uni.showModal({
-										content: that.$t(`支付失败`),
-										showCancel: false,
-										success: function(res) {
-											if (res.confirm) {
-												uni.redirectTo({
-													url: url
-												})
-											} else if (res.cancel) {}
-										}
-									})
-								},
-								complete: () => {
-									uni.hideLoading();
-								},
-							});
-							// #endif
-							break;
-					}
-
-				}).catch(err => {
-					uni.hideLoading();
-					return that.$util.Tips({
-						title: err
-					}, () => {
-						that.$emit('onChangeFun', {
-							action: 'pay_fail'
-						});
-					});
-				})
-			}
-		}
-
-	}
-</script>
-
-<style lang="scss" scoped>
-	.page {
-		.pay-price {
-			display: flex;
-			justify-content: center;
-			flex-direction: column;
-			align-items: center;
-			padding: 50rpx 0 40rpx 0;
-
-			.price {
-				color: #E93323;
-				margin-bottom: 20rpx;
-				display: flex;
-				align-items: flex-end;
-
-				.unit {
-					font-size: 34rpx;
-					font-weight: 500;
-					line-height: 41rpx;
-				}
-
-				.num {
-					font-size: 50rpx;
-					font-weight: 600;
-				}
-			}
-
-			.count-down {
-				display: flex;
-				align-items: center;
-				background-color: #fff;
-				padding: 8rpx 28rpx;
-				border-radius: 40rpx;
-				font-size: 24rpx;
-				color: #E93323;
-
-				.time {
-					margin-top: 0 !important;
-				}
-
-				/deep/.red {
-					margin: 0 !important;
-				}
-			}
-		}
-
-		.payment {
-			width: 690rpx;
-			border-radius: 14rpx 14rpx;
-			background-color: #fff;
-			z-index: 999;
-			margin: 0 30rpx;
-
-			.title {
-				color: #666666;
-				font-size: 26rpx;
-				padding: 30rpx 0 0 30rpx;
-			}
-
-			.payMoney {
-				font-size: 28rpx;
-				color: #333333;
-				text-align: center;
-				margin-top: 50rpx;
-
-				.font-color {
-					margin-left: 10rpx;
-
-					.money {
-						font-size: 40rpx;
-					}
-				}
-			}
-
-
-		}
-
-		.payment.on {
-			transform: translate3d(0, 0, 0);
-		}
-
-		.icon-xuanzhong11 {
-			color: #E93323 !important;
-		}
-
-		.payment .item {
-			border-bottom: 1rpx solid #eee;
-			height: 130rpx;
-			margin-left: 30rpx;
-			padding-right: 30rpx;
-		}
-
-		.payment .item:last-child {
-			border-bottom: none;
-		}
-
-		.payment .item .left {
-			flex: 1;
-		}
-
-		.payment .item .left .text {
-			flex: 1;
-		}
-
-		.payment .item .left .text .name {
-			font-size: 30rpx;
-			color: #333;
-		}
-
-		.payment .item .left .text .info {
-			font-size: 22rpx;
-			color: #999;
-		}
-
-		.payment .item .left .text .info .money {
-			color: #ff9900;
-		}
-
-		.payment .item .left .iconfont {
-			font-size: 50rpx;
-			color: #09bb07;
-			margin-right: 28rpx;
-		}
-
-		.payment .item .left .iconfont.icon-zhifubao {
-			color: #00aaea;
-		}
-
-		.payment .item .left .iconfont.icon-yuezhifu {
-			color: #ff9900;
-		}
-
-		.payment .item .left .iconfont.icon-yuezhifu1 {
-			color: #eb6623;
-		}
-
-		.payment .item .left .iconfont.icon-tonglianzhifu1 {
-			color: #305fd8;
-		}
-
-		.payment .item .iconfont {
-			font-size: 40rpx;
-			color: #ccc;
-		}
-
-		.icon-haoyoudaizhifu {
-			color: #F34C3E !important;
-		}
-
-		.button {
-			position: fixed;
-			left: 30rpx;
-			bottom: 30rpx;
-			width: 690rpx;
-			height: 90rpx;
-			border-radius: 45rpx;
-			color: #FFFFFF;
-			background-color: #E93323;
-			bottom: calc(30rpx + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-			bottom: calc(30rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-		}
-
-	}
+<template>
+	<view class="page" v-if="payPrice">
+		<view class="pay-price">
+			<view class="price">
+				<text class="unit">{{$t(`￥`)}}</text>
+				<numberScroll :num='payPrice' color="#E93323" width='30' height='50' fontSize='50'></numberScroll>
+			</view>
+			<view class="count-down">
+				{{$t(`支付剩余时间`)}}：
+				<countDown :is-day="false" :tip-text="' '" :day-text="' '" :hour-text="' : '" :minute-text="' : '"
+					:second-text="' '" :datatime="invalidTime"></countDown>
+			</view>
+		</view>
+		<view class="payment">
+			<view class="title">
+				{{$t(`支付方式`)}}
+			</view>
+			<view class="item acea-row row-between-wrapper" v-for="(item,index) in cartArr" :key="index"
+				v-show='item.payStatus' @click="payType(item.number || 0, item.value, index)">
+				<view class="left acea-row row-between-wrapper">
+					<view class="iconfont" :class="item.icon"></view>
+					<view class="text">
+						<view class="name">{{item.name}}</view>
+						<view class="info" v-if="item.value == 'yue'">
+							{{item.title}} <span class="money">{{$t(`￥`)}}{{ item.number }}</span>
+						</view>
+						<view class="info" v-else>{{item.title}}</view>
+					</view>
+				</view>
+				<view class="iconfont" :class="active==index?'icon-xuanzhong11 font-num':'icon-weixuan'"></view>
+			</view>
+		</view>
+		<view class="btn">
+			<view class="button acea-row row-center-wrapper" @click='goPay(number, paytype)'>{{$t(`确认支付`)}}</view>
+			<view class="wait-pay" @click="waitPay">暂不支付</view>
+		</view>
+		<view v-show="false" v-html="formContent"></view>
+	</view>
+	</view>
+</template>
+
+<script>
+	import countDown from '@/components/countDown';
+	import numberScroll from '@/components/numberScroll.vue'
+	import {
+		getCashierOrder,
+		orderPay
+	} from '@/api/order.js';
+	export default {
+		components: {
+			countDown,
+			numberScroll
+		},
+		data() {
+			return {
+				checked: false,
+				datatime: 1676344056,
+				//支付方式
+				cartArr: [{
+						"name": this.$t(`微信支付`),
+						"icon": "icon-weixin2",
+						value: 'weixin',
+						title: this.$t(`使用微信快捷支付`),
+						payStatus: 1,
+					},
+					{
+						"name": this.$t(`支付宝支付`),
+						"icon": "icon-zhifubao",
+						value: 'alipay',
+						title: this.$t(`使用支付宝支付`),
+						payStatus: 1,
+					},
+					{
+						"name": this.$t(`余额支付`),
+						"icon": "icon-yuezhifu",
+						value: 'yue',
+						title: this.$t(`可用余额`),
+						payStatus: 1,
+					},
+					{
+						"name": this.$t(`线下支付`),
+						"icon": "icon-yuezhifu1",
+						value: 'offline',
+						title: this.$t(`使用线下付款`),
+						payStatus: 2,
+					}, {
+						"name": this.$t(`好友代付`),
+						"icon": "icon-haoyoudaizhifu",
+						value: 'friend',
+						title: this.$t(`找微信好友支付`),
+						payStatus: 1,
+					}
+				],
+				orderId: 0,
+				fromType: '',
+				active: 0,
+				payPrice: 0,
+				invalidTime: 0,
+				initIn: false,
+				jumpData: {
+					orderId: '',
+					msg: ''
+				},
+				formContent: ''
+			}
+		},
+		watch: {
+			cartArr: {
+				handler(newV, oldValue) {
+					let newPayList = [];
+					newV.forEach((item, index) => {
+						if (item.payStatus) {
+							item.index = index;
+							newPayList.push(item)
+						}
+					});
+					this.active = newPayList[0].index;
+					this.paytype = newPayList[0].value;
+					this.number = newPayList[0].number || 0;
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+		onLoad(options) {
+			if (options.order_id) this.orderId = options.order_id
+			if (options.from_type) this.fromType = options.from_type
+			this.getCashierOrder()
+		},
+		onShow() {
+			let options = wx.getEnterOptionsSync();
+			console.log(options)
+			if (options.scene == '1038' && options.referrerInfo.appId == 'wxef277996acc166c3' && this.initIn) {
+				// 代表从收银台小程序返回
+				let extraData = options.referrerInfo.extraData;
+				this.initIn = false
+				if (!extraData) {
+					// "当前通过物理按键返回，未接收到返参，建议自行查询交易结果";
+					this.$util.Tips({
+						title: this.$t(`取消支付`)
+					}, {
+						tab: 5,
+						url: `/pages/goods/order_pay_status/index?order_id=${this.orderId}&msg=${this.$t(`取消支付`)}&type=3&totalPrice=${this.payPrice}&status=2`
+					});
+				} else {
+					if (extraData.code == 'success') {
+						this.$util.Tips({
+							title: this.$t(`支付成功`),
+							icon: 'success'
+						}, {
+							tab: 5,
+							url: `/pages/goods/order_pay_status/index?order_id=${this.orderId}&msg=${this.jumpData.msg}&type=3&totalPrice=${this.payPrice}`
+						});
+					} else if (extraData.code == 'cancel') {
+						// "支付已取消";
+						this.$util.Tips({
+							title: this.$t(`取消支付`)
+						}, {
+							tab: 5,
+							url: `/pages/goods/order_pay_status/index?order_id=${this.orderId}&msg=${this.$t(`取消支付`)}&type=3&totalPrice=${this.payPrice}&status=2`
+						});
+					} else {
+						// "支付失败：" + extraData.errmsg;
+						uni.reLaunch({
+							url: `/pages/goods/order_pay_status/index?order_id=${this.orderId}&msg=${this.$t(`支付失败`)}&totalPrice=${this.payPrice}`
+						})
+					}
+				}
+			}
+		},
+		methods: {
+			getCashierOrder() {
+				uni.showLoading({
+					title: this.$t(`创建订单中`)
+				});
+				getCashierOrder(this.orderId, this.fromType).then(res => {
+					console.log(res)
+					this.payPrice = res.data.pay_price
+					this.invalidTime = res.data.invalid_time
+					//微信支付是否开启
+					this.cartArr[0].payStatus = res.data.wechat_pay_status || 0
+					//支付宝是否开启
+					this.cartArr[1].payStatus = res.data.ali_pay_status || 0;
+					//#ifdef MP
+					this.cartArr[1].payStatus = false;
+					//#endif
+					//余额支付是否开启
+					// that.cartArr[2].title = '可用余额:' + res.data.userInfo.now_money;
+					this.cartArr[2].number = res.data.now_money;
+					this.cartArr[2].payStatus = res.data.yue_pay_status
+					if (res.data.offline_pay_status) {
+						this.cartArr[3].payStatus = 1
+					} else {
+						this.cartArr[3].payStatus = 0
+					}
+					//好友代付是否开启
+					this.cartArr[4].payStatus = res.data.friend_pay_status || 0;
+					uni.hideLoading();
+				}).catch(err => {
+					uni.hideLoading();
+					return this.$util.Tips({
+						title: err
+					})
+				})
+			},
+			payType(number, paytype, index) {
+				this.active = index;
+				this.paytype = paytype;
+				this.number = number;
+			},
+			formpost(url, postData) {
+				let tempform = document.createElement("form");
+				tempform.action = url;
+				tempform.method = "post";
+				tempform.target = "_self";
+				tempform.style.display = "none";
+				for (let x in postData) {
+					let opt = document.createElement("input");
+					opt.name = x;
+					opt.value = postData[x];
+					tempform.appendChild(opt);
+				}
+				document.body.appendChild(tempform);
+				this.$nextTick(e => {
+					tempform.submit();
+				})
+			},
+			waitPay() {
+				uni.reLaunch({
+					url: '/pages/goods/order_pay_status/index?order_id=' + this.orderId + '&msg=取消支付&type=3' +
+						'&status=2&totalPrice=' + this.payPrice
+				})
+			},
+			goPay(number, paytype) {
+				let that = this;
+				if (!that.orderId) return that.$util.Tips({
+					title: that.$t(`请选择要支付的订单`)
+				});
+				if (paytype == 'yue' && parseFloat(number) < parseFloat(that.payPrice)) return that.$util.Tips({
+					title: that.$t(`余额不足`)
+				});
+				uni.showLoading({
+					title: that.$t(`支付中`)
+				});
+				if (paytype == 'friend' && that.orderId) {
+					return uni.navigateTo({
+						url: '/pages/users/payment_on_behalf/index?order_id=' + that.orderId + '&spread=' +
+							this.$store.state.app.uid,
+						success: res => {},
+						fail: () => {},
+						complete: () => {}
+					});
+				}
+				orderPay({
+					uni: that.orderId,
+					paytype: paytype,
+					type: that.friendPay ? 1 : 0,
+					// #ifdef H5
+					quitUrl: location.port ? location.protocol + '//' + location.hostname + ':' + location
+						.port +
+						'/pages/goods/order_details/index?order_id=' + this.orderId : location.protocol +
+						'//' + location.hostname +
+						'/pages/goods/order_details/index?order_id=' + this.orderId
+					// #endif
+					// #ifdef APP-PLUS
+					quitUrl: '/pages/goods/order_details/index?order_id=' + this.orderId
+					// #endif
+				}).then(res => {
+					let status = res.data.status,
+						orderId = res.data.result.orderId,
+						jsConfig = res.data.result.jsConfig,
+						goPages = '/pages/goods/order_pay_status/index?order_id=' + this.orderId + '&msg=' +
+						res
+						.msg +
+						'&type=3' + '&totalPrice=' + this.payPrice,
+						friendPay = '/pages/users/payment_on_behalf/index?order_id=' + this.orderId +
+						'&spread=' +
+						this
+						.$store.state.app.uid
+
+					switch (status) {
+						case 'ORDER_EXIST':
+						case 'EXTEND_ORDER':
+							uni.hideLoading();
+							return that.$util.Tips({
+								title: res.msg
+							}, {
+								tab: 5,
+								url: goPages
+							});
+						case 'ALLINPAY_PAY':
+							uni.hideLoading();
+							// #ifdef MP
+							this.initIn = true
+							wx.openEmbeddedMiniProgram({
+								appId: 'wxef277996acc166c3',
+								extraData: {
+									cusid: jsConfig.cusid,
+									appid: jsConfig.appid,
+									version: jsConfig.version,
+									trxamt: jsConfig.trxamt,
+									reqsn: jsConfig.reqsn,
+									notify_url: jsConfig.notify_url,
+									body: jsConfig.body,
+									remark: jsConfig.remark,
+									validtime: jsConfig.validtime,
+									randomstr: jsConfig.randomstr,
+									paytype: jsConfig.paytype,
+									sign: jsConfig.sign,
+									signtype: jsConfig.signtype
+								}
+							})
+							this.jumpData = {
+								orderId: res.data.result.orderId,
+								msg: res.msg,
+							}
+							// #endif
+							// #ifdef APP-PLUS
+							plus.runtime.openURL(jsConfig.payinfo);
+							setTimeout(e => {
+								uni.reLaunch({
+									url: goPages
+								})
+							}, 1000)
+							// #endif
+							// #ifdef H5
+							this.formpost(res.data.result.pay_url, jsConfig)
+							// #endif
+							break;
+						case 'PAY_ERROR':
+							uni.hideLoading();
+							return that.$util.Tips({
+								title: res.msg
+							}, {
+								tab: 5,
+								url: goPages
+							});
+							break;
+						case 'SUCCESS':
+							uni.hideLoading();
+							if (paytype !== 'friend') {
+								return that.$util.Tips({
+									title: res.msg,
+									icon: 'success'
+								}, {
+									tab: 4,
+									url: goPages
+								});
+							} else {
+								return that.$util.Tips({
+									title: res.msg,
+									icon: 'success'
+								}, {
+									tab: 4,
+									url: friendPay
+								});
+							}
+
+
+							break;
+						case 'WECHAT_PAY':
+							that.toPay = true;
+							// #ifdef MP
+							/* that.toPay = true; */
+							let mp_pay_name = ''
+							if (uni.requestOrderPayment) {
+								mp_pay_name = 'requestOrderPayment'
+							} else {
+								mp_pay_name = 'requestPayment'
+							}
+							uni[mp_pay_name]({
+								timeStamp: jsConfig.timestamp,
+								nonceStr: jsConfig.nonceStr,
+								package: jsConfig.package,
+								signType: jsConfig.signType,
+								paySign: jsConfig.paySign,
+								success: function(res) {
+									uni.hideLoading();
+									if (that.BargainId || that.combinationId || that.pinkId ||
+										that
+										.seckillId || that.discountId)
+										return that.$util.Tips({
+											title: that.$t(`支付成功`),
+											icon: 'success'
+										}, {
+											tab: 4,
+											url: goPages
+										});
+									return that.$util.Tips({
+										title: that.$t(`支付成功`),
+										icon: 'success'
+									}, {
+										tab: 5,
+										url: goPages
+									});
+								},
+								fail: function(e) {
+									uni.hideLoading();
+									return that.$util.Tips({
+										title: that.$t(`取消支付`)
+									}, {
+										tab: 5,
+										url: goPages + '&status=2'
+									});
+								},
+								complete: function(e) {
+									uni.hideLoading();
+									//关闭当前页面跳转至订单状态
+									if (res.errMsg == 'requestPayment:cancel' || e.errMsg ==
+										'requestOrderPayment:cancel') return that.$util
+										.Tips({
+											title: that.$t(`取消支付`)
+										}, {
+											tab: 5,
+											url: goPages + '&status=2'
+										});
+								},
+							})
+							// #endif
+							// #ifdef H5
+							this.$wechat.pay(res.data.result.jsConfig).then(res => {
+								return that.$util.Tips({
+									title: that.$t(`支付成功`),
+									icon: 'success'
+								}, {
+									tab: 5,
+									url: goPages
+								});
+							}).catch(res => {
+								if (!this.$wechat.isWeixin()) {
+									uni.redirectTo({
+										url: goPages + '&msg=' + that.$t(`支付失败`) +
+											'&status=2'
+										// '&msg=支付失败&status=2'
+									})
+								}
+								if (res.errMsg == 'chooseWXPay:cancel') return that.$util.Tips({
+									title: that.$t(`取消支付`)
+								}, {
+									tab: 5,
+									url: goPages + '&status=2'
+								});
+							})
+							// #endif
+							// #ifdef APP-PLUS
+							uni.requestPayment({
+								provider: 'wxpay',
+								orderInfo: jsConfig,
+								success: (e) => {
+									let url = goPages;
+									uni.showToast({
+										title: that.$t(`支付成功`)
+									})
+									setTimeout(res => {
+										uni.redirectTo({
+											url: url
+										})
+									}, 2000)
+								},
+								fail: (e) => {
+									let url = '/pages/goods/order_pay_status/index?order_id=' +
+										orderId +
+										'&msg=' + that.$t(`支付失败`);
+									uni.showModal({
+										content: that.$t(`支付失败`),
+										showCancel: false,
+										success: function(res) {
+											if (res.confirm) {
+												uni.redirectTo({
+													url: url
+												})
+											} else if (res.cancel) {}
+										}
+									})
+								},
+								complete: () => {
+									uni.hideLoading();
+								},
+							});
+							// #endif
+							break;
+						case 'PAY_DEFICIENCY':
+							uni.hideLoading();
+							//余额不足
+							return that.$util.Tips({
+								title: res.msg
+							}, {
+								tab: 5,
+								url: goPages + '&status=1'
+							});
+							break;
+
+						case "WECHAT_H5_PAY":
+							uni.hideLoading();
+							that.$util.Tips({
+								title: that.$t(`订单创建成功`)
+							}, {
+								tab: 4,
+								url: goPages + '&status=0'
+							});
+							setTimeout(() => {
+								location.href = res.data.result.jsConfig.mweb_url;
+							}, 2000);
+							break;
+
+						case 'ALIPAY_PAY':
+							//#ifdef H5
+							uni.hideLoading();
+							that.formContent = res.data.result.jsConfig;
+							that.$nextTick(() => {
+								document.getElementById('alipaysubmit').submit();
+							})
+							//#endif
+							// #ifdef MP
+							uni.navigateTo({
+								url: `/pages/users/alipay_invoke/index?id=${orderId}&link=${jsConfig.qrCode}`
+							});
+							// #endif
+							// #ifdef APP-PLUS
+							uni.requestPayment({
+								provider: 'alipay',
+								orderInfo: jsConfig,
+								success: (e) => {
+									uni.showToast({
+										title: that.$t(`支付成功`)
+									})
+									let url = '/pages/goods/order_pay_status/index?order_id=' +
+										orderId +
+										'&msg=' + that.$t(`支付成功`);
+									setTimeout(res => {
+										uni.redirectTo({
+											url: url
+										})
+									}, 2000)
+
+								},
+								fail: (e) => {
+									let url = '/pages/goods/order_pay_status/index?order_id=' +
+										orderId +
+										'&msg=' + that.$t(`支付失败`);
+									uni.showModal({
+										content: that.$t(`支付失败`),
+										showCancel: false,
+										success: function(res) {
+											if (res.confirm) {
+												uni.redirectTo({
+													url: url
+												})
+											} else if (res.cancel) {}
+										}
+									})
+								},
+								complete: () => {
+									uni.hideLoading();
+								},
+							});
+							// #endif
+							break;
+					}
+
+				}).catch(err => {
+					uni.hideLoading();
+					return that.$util.Tips({
+						title: err
+					}, () => {
+						that.$emit('onChangeFun', {
+							action: 'pay_fail'
+						});
+					});
+				})
+			}
+		}
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		.pay-price {
+			display: flex;
+			justify-content: center;
+			flex-direction: column;
+			align-items: center;
+			padding: 50rpx 0 40rpx 0;
+
+			.price {
+				color: #E93323;
+				margin-bottom: 20rpx;
+				display: flex;
+				align-items: flex-end;
+
+				.unit {
+					font-size: 34rpx;
+					font-weight: 500;
+					line-height: 41rpx;
+				}
+
+				.num {
+					font-size: 50rpx;
+					font-weight: 600;
+				}
+			}
+
+			.count-down {
+				display: flex;
+				align-items: center;
+				background-color: #fff;
+				padding: 8rpx 28rpx;
+				border-radius: 40rpx;
+				font-size: 24rpx;
+				color: #E93323;
+
+				.time {
+					margin-top: 0 !important;
+				}
+
+				/deep/.red {
+					margin: 0 !important;
+				}
+			}
+		}
+
+		.payment {
+			width: 690rpx;
+			border-radius: 14rpx 14rpx;
+			background-color: #fff;
+			z-index: 999;
+			margin: 0 30rpx;
+
+			.title {
+				color: #666666;
+				font-size: 26rpx;
+				padding: 30rpx 0 0 30rpx;
+			}
+
+			.payMoney {
+				font-size: 28rpx;
+				color: #333333;
+				text-align: center;
+				margin-top: 50rpx;
+
+				.font-color {
+					margin-left: 10rpx;
+
+					.money {
+						font-size: 40rpx;
+					}
+				}
+			}
+
+
+		}
+
+		.payment.on {
+			transform: translate3d(0, 0, 0);
+		}
+
+		.icon-xuanzhong11 {
+			color: #E93323 !important;
+		}
+
+		.payment .item {
+			border-bottom: 1rpx solid #eee;
+			height: 130rpx;
+			margin-left: 30rpx;
+			padding-right: 30rpx;
+		}
+
+		.payment .item:last-child {
+			border-bottom: none;
+		}
+
+		.payment .item .left {
+			flex: 1;
+		}
+
+		.payment .item .left .text {
+			flex: 1;
+		}
+
+		.payment .item .left .text .name {
+			font-size: 30rpx;
+			color: #333;
+		}
+
+		.payment .item .left .text .info {
+			font-size: 22rpx;
+			color: #999;
+		}
+
+		.payment .item .left .text .info .money {
+			color: #ff9900;
+		}
+
+		.payment .item .left .iconfont {
+			font-size: 50rpx;
+			color: #09bb07;
+			margin-right: 28rpx;
+		}
+
+		.payment .item .left .iconfont.icon-zhifubao {
+			color: #00aaea;
+		}
+
+		.payment .item .left .iconfont.icon-yuezhifu {
+			color: #ff9900;
+		}
+
+		.payment .item .left .iconfont.icon-yuezhifu1 {
+			color: #eb6623;
+		}
+
+		.payment .item .left .iconfont.icon-tonglianzhifu1 {
+			color: #305fd8;
+		}
+
+		.payment .item .iconfont {
+			font-size: 40rpx;
+			color: #ccc;
+		}
+
+		.icon-haoyoudaizhifu {
+			color: #F34C3E !important;
+		}
+
+		.btn {
+			position: fixed;
+			left: 30rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			bottom: 30rpx;
+			bottom: calc(30rpx + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+			bottom: calc(30rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+		}
+
+		.wait-pay {
+			color: #aaa;
+			font-size: 24rpx;
+			padding-top: 20rpx;
+		}
+
+		.button {
+			width: 690rpx;
+			height: 90rpx;
+			border-radius: 45rpx;
+			color: #FFFFFF;
+			background-color: #E93323;
+
+		}
+
+	}
 </style>
diff --git a/template/uni-app/pages/goods/order_confirm/index.vue b/template/uni-app/pages/goods/order_confirm/index.vue
index fcf82b161..dfcc56490 100644
--- a/template/uni-app/pages/goods/order_confirm/index.vue
+++ b/template/uni-app/pages/goods/order_confirm/index.vue
@@ -1363,7 +1363,6 @@
 					addressId: that.addressId,
 					formId: '',
 					couponId: that.couponId,
-					payType: that.payType,
 					useIntegral: that.useIntegral,
 					bargainId: that.BargainId,
 					combinationId: that.combinationId,
@@ -1615,8 +1614,8 @@
 
 		.mark {
 			background-color: #f9f9f9;
-			width: 345px;
-			height: 70px;
+			// width: 345px;
+			min-height: 70px;
 			border-radius: 1px;
 			margin-top: 15px;
 			padding: 12px 14px;
@@ -1627,7 +1626,7 @@
 
 		.mark-msg {
 			color: #333;
-			font-size: 32rpx;
+			font-size: 28rpx;
 		}
 	}
 
@@ -1670,11 +1669,12 @@
 
 	.order-submission .wrapper .item textarea {
 		background-color: #f9f9f9;
-		width: 690rpx;
-		height: 140rpx;
+		width: 100%;
+		height: 135rpx;
 		border-radius: 3rpx;
 		margin-top: 30rpx;
-		padding: 25rpx 28rpx;
+		padding: 25rpx 28rpx;
+		font-size: 28rpx;
 		box-sizing: border-box;
 	}
 
diff --git a/template/uni-app/pages/users/user_coupon/index.vue b/template/uni-app/pages/users/user_coupon/index.vue
index f14b960ad..a3af39894 100644
--- a/template/uni-app/pages/users/user_coupon/index.vue
+++ b/template/uni-app/pages/users/user_coupon/index.vue
@@ -4,7 +4,8 @@
 			<view class="item acea-row row-center-wrapper" :class="{ on: navOn === 1 }" @click="onNav(1)">{{$t(`未使用`)}}
 			</view>
 			<view class="item acea-row row-center-wrapper" :class="{ on: navOn === 2 }" @click="onNav(2)">
-				{{$t(`已使用/过期`)}}</view>
+				{{$t(`已使用/过期`)}}
+			</view>
 		</view>
 		<view class='coupon-list' v-if="couponsList.length">
 			<view class='item acea-row row-center-wrapper' v-for='(item,index) in couponsList' :key="index"
@@ -13,7 +14,8 @@
 					<view class='money' :class='item._type == 0 ? "moneyGray" : ""'>
 						<view>{{$t(`￥`)}}<text class='num'>{{item.coupon_price}}</text></view>
 						<view class="pic-num" v-if="item.use_min_price > 0">
-							{{$t(`满`)}}{{item.use_min_price}}{{$t(`元可用`)}}</view>
+							{{$t(`满`)}}{{item.use_min_price}}{{$t(`元可用`)}}
+						</view>
 						<view class="pic-num" v-else>{{$t(`无门槛券`)}}</view>
 					</view>
 				</view>
@@ -122,6 +124,7 @@
 				this.getUseCoupons();
 			},
 			useCoupon(item) {
+				if (this.navOn == 2) return
 				let url = '';
 				if (item.category_id == 0 && item.product_id == '') {
 					url = '/pages/goods/goods_list/index?title=默认'
@@ -204,7 +207,7 @@
 
 	.coupon-list .item .text .condition .name {
 		font-size: 24rpx;
-		font-weight: 500;
+		font-weight: 500;
 		line-height: 28rpx;
 		/* display: flex;
 		align-items: center; */
@@ -218,6 +221,7 @@
 		display: inline-block;
 		vertical-align: middle;
 	}
+
 	.condition .line-title {
 		/* width: 70rpx; */
 		height: 36rpx !important;
diff --git a/template/uni-app/pages/users/user_payment/index.vue b/template/uni-app/pages/users/user_payment/index.vue
index 779979922..e6438a971 100644
--- a/template/uni-app/pages/users/user_payment/index.vue
+++ b/template/uni-app/pages/users/user_payment/index.vue
@@ -1,718 +1,713 @@
-<template>
-	<view>
-		<form :style="colorStyle">
-			<view class="payment-top acea-row row-column row-center-wrapper">
-				<span class="name">{{$t(`我的余额`)}}</span>
-				<view class="pic">
-					<span class="pic-font"><span class="num"> {{$t(`￥`)}}</span>{{ userinfo.now_money || 0 }}</span>
-				</view>
-			</view>
-			<view class="payment">
-				<view class="nav acea-row row-around row-middle">
-					<view class="item" :class="active==index?'on':''" v-for="(item,index) in navRecharge" :key="index"
-						@click="navRecharges(index)">{{$t(item)}}</view>
-				</view>
-				<view class='tip picList' v-if='!active'>
-					<view class="pic-box pic-box-color acea-row row-center-wrapper row-column"
-						:class="activePic == index ? 'pic-box-color-active' : ''" v-for="(item, index) in picList"
-						:key="index" @click="picCharge(index, item)" v-if="item.price">
-						<view class="pic-number-pic">
-							{{ item.price }}<span class="pic-number"> {{$t(`元`)}}</span>
-						</view>
-						<view class="pic-number">{{$t(`赠送`)}}：{{ item.give_money }} {{$t(`元`)}} </view>
-					</view>
-					<view class="pic-box pic-box-color acea-row row-center-wrapper"
-						:class="activePic == picList.length ? 'pic-box-color-active' : ''"
-						@click="picCharge(picList.length)">
-						<input type="number" :placeholder="$t(`其他`)" v-model="money"
-							class="pic-box-money pic-number-pic"
-							:class="activePic == picList.length ? 'pic-box-color-active' : ''" />
-					</view>
-					<view class="tips-box">
-						<view class="tips mt-30">{{$t(`注意事项`)}}：</view>
-						<view class="tips-samll" v-for="item in rechargeAttention" :key="item">
-							{{ $t(item) }}
-						</view>
-					</view>
-
-				</view>
-				<view class="tip" v-else>
-					<view class='input'><text>{{$t(`￥`)}}</text><input v-model="number" placeholder="0.00" type='number' placeholder-class='placeholder' name="number"></input></view>
-					<view class="tips-title">
-						<view style="font-weight: bold; font-size: 26rpx;">{{$t(`提示`)}}：</view>
-						<view style="margin-top: 10rpx;">{{$t(`当前可转入佣金为`)}} <text
-								class='font-color'>{{$t(`￥`)}}{{userinfo.commissionCount || 0}}</text>{{$t(`冻结佣金为`)}}<text
-								class='font-color'>{{$t(`￥`)}}{{userinfo.broken_commission}}</text></view>
-					</view>
-					<view class="tips-box">
-						<view class="tips mt-30">{{$t(`注意事项`)}}：</view>
-						<view class="tips-samll" v-for="item in rechargeAttention" :key="item">
-							{{ $t(item) }}
-						</view>
-					</view>
-				</view>
-				<button class='but bg-color' @click="submitSub"> {{active ? $t(`立即转入`): $t(`立即充值`) }}</button>
-			</view>
-		</form>
-		<payment :payMode="payMode" :pay_close="pay_close" :is-call="true" @onChangeFun="onChangeFun"
-			:totalPrice="numberPic"></payment>
-			<view v-show="false" v-html="formContent"></view>
-		<!-- #ifdef MP -->
-		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
-		<!-- #endif -->
-		<!-- #ifndef MP -->
-		<home></home>
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-	import {
-		getUserInfo,
-		recharge,
-		getRechargeApi
-	} from '@/api/user.js';
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	import {
-		mapGetters
-	} from "vuex";
-	// #ifdef MP
-	import authorize from '@/components/Authorize';
-	// #endif
-	import home from '@/components/home';
-	import colors from "@/mixins/color";
-	import payment from '@/components/payment';
-	export default {
-		components: {
-			payment,
-			// #ifdef MP
-			authorize,
-			// #endif
-			home
-		},
-		mixins: [colors],
-		data() {
-			let that = this;
-			return {
-				now_money: 0,
-				navRecharge: [this.$t(`账户充值`), this.$t(`佣金转入`)],
-				active: 0,
-				number: '',
-				formContent:'',
-				userinfo: {},
-				placeholder: "0.00",
-				from: '',
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-				picList: [],
-				activePic: 0,
-				money: "",
-				numberPic: '',
-				rechar_id: 0,
-				rechargeAttention: [],
-				pay_close: false,
-				payMode: [{
-						name: this.$t(`微信支付`),
-						icon: 'icon-weixinzhifu',
-						value: 'weixin',
-						title: this.$t(`微信支付`),
-						payStatus: true
-					},
-					// #ifdef H5 ||APP-PLUS
-					{
-						name: this.$t(`支付宝支付`),
-						icon: 'icon-zhifubao',
-						value: 'alipay',
-						title: this.$t(`支付宝支付`),
-						payStatus: true
-					},
-					// #endif
-				],
-				totalPrice: 0
-			};
-		},
-		computed: mapGetters(['isLogin']),
-		watch: {
-			isLogin: {
-				handler: function(newV, oldV) {
-					if (newV) {
-						this.getUserInfo();
-						this.getRecharge();
-					}
-				},
-				deep: true
-			}
-		},
-		onLoad(options) {
-			// #ifdef H5
-			this.from = this.$wechat.isWeixin() ? "weixin" : "weixinh5"
-			// #endif
-			if (this.isLogin) {
-				this.getUserInfo();
-				this.getRecharge();
-			} else {
-				toLogin();
-			}
-		},
-		methods: {
-
-			/**
-			 * 选择金额
-			 */
-			picCharge(idx, item) {
-				this.activePic = idx;
-				if (item === undefined) {
-					this.rechar_id = 0;
-					this.numberPic = "";
-				} else {
-					this.money = "";
-					this.rechar_id = item.id;
-					this.numberPic = item.price;
-				}
-			},
-
-			/**
-			 * 充值额度选择
-			 */
-			getRecharge() {
-				getRechargeApi()
-					.then(res => {
-						this.picList = res.data.recharge_quota;
-						if (this.picList[0]) {
-							this.rechar_id = this.picList[0].id;
-							this.numberPic = this.picList[0].price;
-						}
-						this.rechargeAttention = res.data.recharge_attention || [];
-					})
-					.catch(res => {
-						this.$util.Tips({
-							title: res
-						})
-					});
-			},
-
-
-			onLoadFun: function() {
-				this.getUserInfo();
-				this.getRecharge();
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			navRecharges: function(index) {
-				this.active = index;
-			},
-			/**
-			 * 获取用户信息
-			 */
-			getUserInfo: function() {
-				let that = this;
-				getUserInfo().then(res => {
-					that.$set(that, 'userinfo', res.data);
-				})
-			},
-			onChangeFun: function(e) {
-				let opt = e;
-				let action = opt.action || null;
-				let value = opt.value != undefined ? opt.value : null;
-				this.pay_close = false
-				action && this[action] && this[action](value);
-			},
-			payCheck(type) {
-				let that = this
-				uni.showLoading({
-					title: that.$t(`正在支付`),
-				})
-				recharge({
-					price: that.rechar_id == 0 ? that.money : that.numberPic,
-					from: type,
-					rechar_id: that.rechar_id,
-					type: 0
-				}).then(res => {
-					let status = res.data.status,
-						orderId = res.data.result.orderId,
-						jsConfig = res.data.result.jsConfig
-					switch (status) {
-						case 'ORDER_EXIST':
-						case 'EXTEND_ORDER':
-							uni.hideLoading();
-							return that.$util.Tips({
-								title: res.msg
-							});
-							break;
-						case 'ALLINPAY_PAY':
-							uni.hideLoading();
-							// #ifdef MP
-							this.initIn = true
-							wx.openEmbeddedMiniProgram({
-								appId: 'wxef277996acc166c3',
-								extraData: {
-									cusid: jsConfig.cusid,
-									appid: jsConfig.appid,
-									version: jsConfig.version,
-									trxamt: jsConfig.trxamt,
-									reqsn: jsConfig.reqsn,
-									notify_url: jsConfig.notify_url,
-									body: jsConfig.body,
-									remark: jsConfig.remark,
-									validtime: jsConfig.validtime,
-									randomstr: jsConfig.randomstr,
-									paytype: jsConfig.paytype,
-									sign: jsConfig.sign,
-									signtype: jsConfig.signtype
-								}
-							})
-							this.jumpData = {
-								orderId: res.data.result.orderId,
-								msg: res.msg,
-							}
-							// #endif
-							// #ifdef APP-PLUS
-							plus.runtime.openURL(jsConfig.payinfo);
-							// #endif
-							// #ifdef H5
-							this.formpost(res.data.result.pay_url, jsConfig)
-							// #endif
-							break;
-						case 'PAY_ERROR':
-							uni.hideLoading();
-							return that.$util.Tips({
-								title: res.msg
-							});
-							break;
-						case 'SUCCESS':
-							uni.hideLoading();
-							return that.$util.Tips({
-								title: that.$t(`支付成功`),
-								icon: 'success'
-							}, {
-								tab: 5,
-								url: '/pages/users/user_money/index'
-							});
-							break;
-						case 'WECHAT_PAY':
-							that.toPay = true;
-							// #ifdef MP
-							/* that.toPay = true; */
-							let mp_pay_name = ''
-							if (uni.requestOrderPayment) {
-								mp_pay_name = 'requestOrderPayment'
-							} else {
-								mp_pay_name = 'requestPayment'
-							}
-							uni[mp_pay_name]({
-								timeStamp: jsConfig.timestamp,
-								nonceStr: jsConfig.nonceStr,
-								package: jsConfig.package,
-								signType: jsConfig.signType,
-								paySign: jsConfig.paySign,
-								success: function(res) {
-									uni.hideLoading();
-									that.$set(that, 'userinfo.now_money', that.$util.$h.Add(this
-										.number, that.userinfo
-										.now_money));
-									return that.$util.Tips({
-										title: that.$t(`支付成功`),
-										icon: 'success'
-									}, {
-										tab: 5,
-										url: '/pages/users/user_money/index'
-									});
-								},
-								fail: function(e) {
-									uni.hideLoading();
-									return that.$util.Tips({
-										title: that.$t(`支付失败`)
-									});
-								},
-								complete: function(e) {
-									uni.hideLoading();
-									//关闭当前页面跳转至订单状态
-									if (res.errMsg == 'requestPayment:cancel' || e.errMsg ==
-										'requestOrderPayment:cancel') return that.$util
-										.Tips({
-											title: that.$t(`取消支付`)
-										});
-								},
-							})
-							// #endif
-							// #ifdef H5
-							this.$wechat.pay(res.data.result.jsConfig).then(res => {
-								that.$set(that, 'userinfo.now_money', that.$util.$h.Add(this
-									.number, that.userinfo
-									.now_money));
-								return that.$util.Tips({
-									title: that.$t(`支付成功`),
-									icon: 'success'
-								}, {
-									tab: 5,
-									url: '/pages/users/user_money/index'
-								});
-							}).catch(res => {
-								if (!this.$wechat.isWeixin()) {
-									return that.$util.Tips({
-										title: that.$t(`支付失败`)
-									});
-								}
-								if (res.errMsg == 'chooseWXPay:cancel') return that.$util.Tips({
-									title: that.$t(`取消支付`)
-								});
-							})
-							// #endif
-							// #ifdef APP-PLUS
-							uni.requestPayment({
-								provider: 'wxpay',
-								orderInfo: jsConfig,
-								success: (e) => {
-									that.$set(that, 'userinfo.now_money', that.$util.$h.Add(this
-										.number,
-										that.userinfo
-										.now_money));
-									return that.$util.Tips({
-										title: that.$t(`支付成功`),
-										icon: 'success'
-									}, {
-										tab: 5,
-										url: '/pages/users/user_money/index'
-									});
-								},
-								fail: (e) => {
-									return that.$util.Tips({
-										title: that.$t(`支付失败`)
-									});
-								},
-								complete: () => {
-									uni.hideLoading();
-								},
-							});
-							// #endif
-							break;
-						case 'PAY_DEFICIENCY':
-							uni.hideLoading();
-							//余额不足
-							return that.$util.Tips({
-								title: res.msg
-							}, {
-								tab: 5,
-								url: goPages + '&status=1'
-							});
-							break;
-
-						case "WECHAT_H5_PAY":
-							uni.hideLoading();
-							that.$util.Tips({
-								title: that.$t(`订单创建成功`)
-							});
-							setTimeout(() => {
-								location.href = res.data.result.jsConfig.mweb_url;
-							}, 2000);
-							break;
-
-						case 'ALIPAY_PAY':
-							//#ifdef H5
-							if (this.from === 'weixin') {
-								uni.redirectTo({
-									url: `/pages/users/alipay_invoke/index?id=${orderId}&pay_key=${res.data.result.pay_key}`
-								});
-							} else {
-								uni.hideLoading();
-								that.formContent = res.data.result.jsConfig;
-								that.$nextTick(() => {
-									document.getElementById('alipaysubmit').submit();
-								})
-							}
-							//#endif
-							// #ifdef MP
-							uni.navigateTo({
-								url: `/pages/users/alipay_invoke/index?id=${orderId}&link=${jsConfig.qrCode}`
-							});
-							// #endif
-							// #ifdef APP-PLUS
-							uni.requestPayment({
-								provider: 'alipay',
-								orderInfo: jsConfig,
-								success: (e) => {
-									that.$set(that, 'userinfo.now_money', that.$util.$h.Add(this
-										.number,
-										that.userinfo
-										.now_money));
-									return that.$util.Tips({
-										title: that.$t(`支付成功`),
-										icon: 'success'
-									}, {
-										tab: 5,
-										url: '/pages/users/user_money/index'
-									});
-
-								},
-								fail: (e) => {
-									return that.$util.Tips({
-										title: that.$t(`支付失败`)
-									});
-								},
-								complete: () => {
-									uni.hideLoading();
-								},
-							});
-							// #endif
-							break;
-					}
-				}).catch(err => {
-					uni.hideLoading();
-					return that.$util.Tips({
-						title: err
-					})
-				})
-			},
-			formpost(url, postData) {
-				let tempform = document.createElement("form");
-				tempform.action = url;
-				tempform.method = "post";
-				tempform.target = "_self";
-				tempform.style.display = "none";
-				for (let x in postData) {
-					let opt = document.createElement("input");
-					opt.name = x;
-					opt.value = postData[x];
-					tempform.appendChild(opt);
-				}
-				document.body.appendChild(tempform);
-				this.$nextTick(e => {
-					tempform.submit();
-				})
-			},
-			pay() {
-				this.pay_close = true;
-			},
-			/*
-			 * 用户充值
-			 */
-			submitSub() {
-				let that = this
-				let value = this.number;
-				// 转入余额
-				if (that.active) {
-					if (parseFloat(value) < 0 || parseFloat(value) == NaN || value == undefined || value == "") {
-						return that.$util.Tips({
-							title: that.$t(`请输入金额`)
-						});
-					}
-					uni.showModal({
-						title: that.$t(`转入余额`),
-						content: that.$t(`转入余额后无法再次转出，确认是否转入余额`),
-						success(res) {
-							if (res.confirm) {
-								recharge({
-										price: parseFloat(value),
-										type: 1
-									})
-									.then(res => {
-										// that.$set(that, 'userinfo.now_money', that.$util.$h.Add(value, that.userinfo.now_money))
-										return that.$util.Tips({
-											title: that.$t(`转入成功`),
-											icon: 'success'
-										}, {
-											tab: 5,
-											url: '/pages/users/user_money/index'
-										});
-									}).catch(err => {
-										return that.$util.Tips({
-											title: err
-										})
-									});
-							} else if (res.cancel) {
-								return that.$util.Tips({
-									title: that.$t(`已取消`)
-								});
-							}
-						},
-					})
-				} else {
-					this.pay()
-				}
-			}
-		},
-	}
-</script>
-
-<style lang="scss" scoped>
-	page {
-		width: 100%;
-		height: 100%;
-		background-color: #fff;
-	}
-
-	.bgcolor {
-		background-color: var(--view-theme)
-	}
-
-	.payment {
-		position: relative;
-		top: -60rpx;
-		width: 100%;
-		background-color: #fff;
-		border-radius: 10rpx;
-		padding-top: 25rpx;
-		border-top-right-radius: 39rpx;
-		border-top-left-radius: 39rpx;
-	}
-
-	.payment .nav {
-		height: 75rpx;
-		line-height: 75rpx;
-		padding: 0 100rpx;
-	}
-
-	.payment .nav .item {
-		font-size: 30rpx;
-		color: #333;
-	}
-
-	.payment .nav .item.on {
-		font-weight: bold;
-		border-bottom: 4rpx solid var(--view-theme);
-	}
-
-	.payment .input {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		border-bottom: 1px dashed #dddddd;
-		margin: 60rpx auto 0 auto;
-		padding-bottom: 20rpx;
-		font-size: 56rpx;
-		color: #333333;
-		flex-wrap: nowrap;
-
-	}
-
-	.payment .input text {
-		padding-left: 106rpx;
-	}
-
-	.payment .input input {
-		padding-right: 106rpx;
-		width: 300rpx;
-		height: 94rpx;
-		text-align: center;
-		font-size: 70rpx;
-	}
-
-	.payment .placeholder {
-		color: #d0d0d0;
-		height: 100%;
-		line-height: 94rpx;
-	}
-
-	.payment .tip {
-		font-size: 26rpx;
-		color: #888888;
-		padding: 0 30rpx;
-		margin-top: 25rpx;
-	}
-
-	.payment .but {
-		color: #fff;
-		font-size: 30rpx;
-		width: 700rpx;
-		height: 86rpx;
-		border-radius: 50rpx;
-		margin: 46rpx auto 0 auto;
-		line-height: 86rpx;
-	}
-
-	.payment-top {
-		width: 100%;
-		height: 350rpx;
-		background-color: var(--view-theme);
-
-		.name {
-			font-size: 26rpx;
-			color: rgba(255, 255, 255, 0.8);
-			margin-top: -38rpx;
-			margin-bottom: 30rpx;
-		}
-
-		.pic {
-			font-size: 32rpx;
-			color: #fff;
-
-			.num {
-				font-size: 56rpx;
-			}
-		}
-
-		.pic-font {
-			font-size: 78rpx;
-			color: #fff;
-		}
-	}
-
-	.picList {
-		display: flex;
-		flex-wrap: wrap;
-		margin: 30rpx 0;
-
-		.pic-box {
-			width: 32%;
-			height: auto;
-			border-radius: 20rpx;
-			margin-top: 21rpx;
-			padding: 20rpx 0;
-			margin-right: 12rpx;
-
-			&:nth-child(3n) {
-				margin-right: 0;
-			}
-		}
-
-		.pic-box-color {
-			background-color: #f4f4f4;
-			color: #656565;
-		}
-
-		.pic-number {
-			font-size: 22rpx;
-		}
-
-		.pic-number-pic {
-			font-size: 38rpx;
-			margin-right: 10rpx;
-			text-align: center;
-		}
-
-		.pic-box-color-active {
-			background-color: var(--view-theme) !important;
-			color: #fff !important;
-		}
-	}
-
-	.tips-box {
-		.tips {
-			font-size: 28rpx;
-			color: #333333;
-			font-weight: 800;
-			margin-bottom: 14rpx;
-			margin-top: 20rpx;
-		}
-
-		.tips-samll {
-			font-size: 24rpx;
-			color: #333333;
-			margin-bottom: 14rpx;
-		}
-
-		.tip-box {
-			margin-top: 30rpx;
-		}
-	}
-
-	.tips-title {
-		margin-top: 20rpx;
-		font-size: 24rpx;
-		color: #333;
-	}
+<template>
+	<view>
+		<form :style="colorStyle">
+			<view class="payment-top acea-row row-column row-center-wrapper">
+				<span class="name">{{$t(`我的余额`)}}</span>
+				<view class="pic">
+					<span class="pic-font"><span class="num"> {{$t(`￥`)}}</span>{{ userinfo.now_money || 0 }}</span>
+				</view>
+			</view>
+			<view class="payment">
+				<view class="nav acea-row row-around row-middle">
+					<view class="item" :class="active==index?'on':''" v-for="(item,index) in navRecharge" :key="index"
+						@click="navRecharges(index)">{{$t(item)}}</view>
+				</view>
+				<view class='tip picList' v-if='!active'>
+					<view class="pic-box pic-box-color acea-row row-center-wrapper row-column"
+						:class="activePic == index ? 'pic-box-color-active' : ''" v-for="(item, index) in picList"
+						:key="index" @click="picCharge(index, item)" v-if="item.price">
+						<view class="pic-number-pic">
+							{{ item.price }}<span class="pic-number"> {{$t(`元`)}}</span>
+						</view>
+						<view class="pic-number">{{$t(`赠送`)}}：{{ item.give_money }} {{$t(`元`)}} </view>
+					</view>
+					<view class="pic-box pic-box-color acea-row row-center-wrapper"
+						:class="activePic == picList.length ? 'pic-box-color-active' : ''"
+						@click="picCharge(picList.length)">
+						<input type="number" :placeholder="$t(`其他`)" v-model="money"
+							class="pic-box-money pic-number-pic"
+							:class="activePic == picList.length ? 'pic-box-color-active' : ''" />
+					</view>
+					<view class="tips-box">
+						<view class="tips mt-30">{{$t(`注意事项`)}}：</view>
+						<view class="tips-samll" v-for="item in rechargeAttention" :key="item">
+							{{ $t(item) }}
+						</view>
+					</view>
+
+				</view>
+				<view class="tip" v-else>
+					<view class='input'><text>{{$t(`￥`)}}</text><input v-model="number" placeholder="0.00" type='number'
+							placeholder-class='placeholder' name="number"></input></view>
+					<view class="tips-title">
+						<view style="font-weight: bold; font-size: 26rpx;">{{$t(`提示`)}}：</view>
+						<view style="margin-top: 10rpx;">{{$t(`当前可转入佣金为`)}} <text
+								class='font-color'>{{$t(`￥`)}}{{userinfo.commissionCount || 0}}</text>{{$t(`冻结佣金为`)}}<text
+								class='font-color'>{{$t(`￥`)}}{{userinfo.broken_commission}}</text></view>
+					</view>
+					<view class="tips-box">
+						<view class="tips mt-30">{{$t(`注意事项`)}}：</view>
+						<view class="tips-samll" v-for="item in rechargeAttention" :key="item">
+							{{ $t(item) }}
+						</view>
+					</view>
+				</view>
+				<button class='but bg-color' @click="submitSub"> {{active ? $t(`立即转入`): $t(`立即充值`) }}</button>
+			</view>
+		</form>
+		<payment :payMode="payMode" :pay_close="pay_close" :is-call="true" @onChangeFun="onChangeFun"
+			:totalPrice="numberPic"></payment>
+		<view v-show="false" v-html="formContent"></view>
+		<!-- #ifdef MP -->
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
+		<!-- #endif -->
+		<!-- #ifndef MP -->
+		<home></home>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import {
+		getUserInfo,
+		recharge,
+		getRechargeApi
+	} from '@/api/user.js';
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	import {
+		mapGetters
+	} from "vuex";
+	// #ifdef MP
+	import authorize from '@/components/Authorize';
+	// #endif
+	import home from '@/components/home';
+	import colors from "@/mixins/color";
+	import payment from '@/components/payment';
+	export default {
+		components: {
+			payment,
+			// #ifdef MP
+			authorize,
+			// #endif
+			home
+		},
+		mixins: [colors],
+		data() {
+			let that = this;
+			return {
+				now_money: 0,
+				navRecharge: [this.$t(`账户充值`), this.$t(`佣金转入`)],
+				active: 0,
+				number: '',
+				formContent: '',
+				userinfo: {},
+				placeholder: "0.00",
+				from: '',
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				picList: [],
+				activePic: 0,
+				money: "",
+				numberPic: '',
+				rechar_id: 0,
+				rechargeAttention: [],
+				pay_close: false,
+				payMode: [{
+						name: this.$t(`微信支付`),
+						icon: 'icon-weixinzhifu',
+						value: 'weixin',
+						title: this.$t(`微信支付`),
+						payStatus: true
+					},
+					// #ifdef H5 ||APP-PLUS
+					{
+						name: this.$t(`支付宝支付`),
+						icon: 'icon-zhifubao',
+						value: 'alipay',
+						title: this.$t(`支付宝支付`),
+						payStatus: true
+					},
+					// #endif
+				],
+				totalPrice: 0
+			};
+		},
+		computed: mapGetters(['isLogin']),
+		watch: {
+			isLogin: {
+				handler: function(newV, oldV) {
+					if (newV) {
+						this.getUserInfo();
+						this.getRecharge();
+					}
+				},
+				deep: true
+			}
+		},
+		onLoad(options) {
+			// #ifdef H5
+			this.from = this.$wechat.isWeixin() ? "weixin" : "weixinh5"
+			// #endif
+			if (this.isLogin) {
+				this.getUserInfo();
+				this.getRecharge();
+			} else {
+				toLogin();
+			}
+		},
+		methods: {
+
+			/**
+			 * 选择金额
+			 */
+			picCharge(idx, item) {
+				this.activePic = idx;
+				if (item === undefined) {
+					this.rechar_id = 0;
+					this.numberPic = "";
+				} else {
+					this.money = "";
+					this.rechar_id = item.id;
+					this.numberPic = item.price;
+				}
+			},
+
+			/**
+			 * 充值额度选择
+			 */
+			getRecharge() {
+				getRechargeApi()
+					.then(res => {
+						this.picList = res.data.recharge_quota;
+						if (this.picList[0]) {
+							this.rechar_id = this.picList[0].id;
+							this.numberPic = this.picList[0].price;
+						}
+						this.rechargeAttention = res.data.recharge_attention || [];
+					})
+					.catch(res => {
+						this.$util.Tips({
+							title: res
+						})
+					});
+			},
+
+
+			onLoadFun: function() {
+				this.getUserInfo();
+				this.getRecharge();
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e
+			},
+			navRecharges: function(index) {
+				this.active = index;
+			},
+			/**
+			 * 获取用户信息
+			 */
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					that.$set(that, 'userinfo', res.data);
+				})
+			},
+			onChangeFun: function(e) {
+				let opt = e;
+				let action = opt.action || null;
+				let value = opt.value != undefined ? opt.value : null;
+				this.pay_close = false
+				action && this[action] && this[action](value);
+			},
+			payCheck(type) {
+				let that = this
+				uni.showLoading({
+					title: that.$t(`正在支付`),
+				})
+				recharge({
+					price: that.rechar_id == 0 ? that.money : that.numberPic,
+					from: type,
+					rechar_id: that.rechar_id,
+					type: 0
+				}).then(res => {
+					let status = res.data.status,
+						orderId = res.data.result.orderId,
+						jsConfig = res.data.result.jsConfig
+					switch (status) {
+						case 'ORDER_EXIST':
+						case 'EXTEND_ORDER':
+							uni.hideLoading();
+							return that.$util.Tips({
+								title: res.msg
+							});
+							break;
+						case 'ALLINPAY_PAY':
+							uni.hideLoading();
+							// #ifdef MP
+							this.initIn = true
+							wx.openEmbeddedMiniProgram({
+								appId: 'wxef277996acc166c3',
+								extraData: {
+									cusid: jsConfig.cusid,
+									appid: jsConfig.appid,
+									version: jsConfig.version,
+									trxamt: jsConfig.trxamt,
+									reqsn: jsConfig.reqsn,
+									notify_url: jsConfig.notify_url,
+									body: jsConfig.body,
+									remark: jsConfig.remark,
+									validtime: jsConfig.validtime,
+									randomstr: jsConfig.randomstr,
+									paytype: jsConfig.paytype,
+									sign: jsConfig.sign,
+									signtype: jsConfig.signtype
+								}
+							})
+							this.jumpData = {
+								orderId: res.data.result.orderId,
+								msg: res.msg,
+							}
+							// #endif
+							// #ifdef APP-PLUS
+							plus.runtime.openURL(jsConfig.payinfo);
+							// #endif
+							// #ifdef H5
+							this.formpost(res.data.result.pay_url, jsConfig)
+							// #endif
+							break;
+						case 'PAY_ERROR':
+							uni.hideLoading();
+							return that.$util.Tips({
+								title: res.msg
+							});
+							break;
+						case 'SUCCESS':
+							uni.hideLoading();
+							return that.$util.Tips({
+								title: that.$t(`支付成功`),
+								icon: 'success'
+							}, {
+								tab: 5,
+								url: '/pages/users/user_money/index'
+							});
+							break;
+						case 'WECHAT_PAY':
+							that.toPay = true;
+							// #ifdef MP
+							/* that.toPay = true; */
+							let mp_pay_name = ''
+							if (uni.requestOrderPayment) {
+								mp_pay_name = 'requestOrderPayment'
+							} else {
+								mp_pay_name = 'requestPayment'
+							}
+							uni[mp_pay_name]({
+								timeStamp: jsConfig.timestamp,
+								nonceStr: jsConfig.nonceStr,
+								package: jsConfig.package,
+								signType: jsConfig.signType,
+								paySign: jsConfig.paySign,
+								success: function(res) {
+									uni.hideLoading();
+									that.$set(that, 'userinfo.now_money', that.$util.$h.Add(this
+										.number, that.userinfo
+										.now_money));
+									return that.$util.Tips({
+										title: that.$t(`支付成功`),
+										icon: 'success'
+									}, {
+										tab: 5,
+										url: '/pages/users/user_money/index'
+									});
+								},
+								fail: function(e) {
+									uni.hideLoading();
+									return that.$util.Tips({
+										title: that.$t(`支付失败`)
+									});
+								},
+								complete: function(e) {
+									uni.hideLoading();
+									//关闭当前页面跳转至订单状态
+									if (res.errMsg == 'requestPayment:cancel' || e.errMsg ==
+										'requestOrderPayment:cancel') return that.$util
+										.Tips({
+											title: that.$t(`取消支付`)
+										});
+								},
+							})
+							// #endif
+							// #ifdef H5
+							this.$wechat.pay(res.data.result.jsConfig).then(res => {
+								that.$set(that, 'userinfo.now_money', that.$util.$h.Add(this
+									.number, that.userinfo
+									.now_money));
+								return that.$util.Tips({
+									title: that.$t(`支付成功`),
+									icon: 'success'
+								}, {
+									tab: 5,
+									url: '/pages/users/user_money/index'
+								});
+							}).catch(res => {
+								if (!this.$wechat.isWeixin()) {
+									return that.$util.Tips({
+										title: that.$t(`支付失败`)
+									});
+								}
+								if (res.errMsg == 'chooseWXPay:cancel') return that.$util.Tips({
+									title: that.$t(`取消支付`)
+								});
+							})
+							// #endif
+							// #ifdef APP-PLUS
+							uni.requestPayment({
+								provider: 'wxpay',
+								orderInfo: jsConfig,
+								success: (e) => {
+									that.$set(that, 'userinfo.now_money', that.$util.$h.Add(this
+										.number,
+										that.userinfo
+										.now_money));
+									return that.$util.Tips({
+										title: that.$t(`支付成功`),
+										icon: 'success'
+									}, {
+										tab: 5,
+										url: '/pages/users/user_money/index'
+									});
+								},
+								fail: (e) => {
+									return that.$util.Tips({
+										title: that.$t(`支付失败`)
+									});
+								},
+								complete: () => {
+									uni.hideLoading();
+								},
+							});
+							// #endif
+							break;
+						case 'PAY_DEFICIENCY':
+							uni.hideLoading();
+							//余额不足
+							return that.$util.Tips({
+								title: res.msg
+							}, {
+								tab: 5,
+								url: goPages + '&status=1'
+							});
+							break;
+
+						case "WECHAT_H5_PAY":
+							uni.hideLoading();
+							that.$util.Tips({
+								title: that.$t(`订单创建成功`)
+							});
+							setTimeout(() => {
+								location.href = res.data.result.jsConfig.mweb_url;
+							}, 2000);
+							break;
+
+						case 'ALIPAY_PAY':
+							//#ifdef H5
+							uni.hideLoading();
+							that.formContent = res.data.result.jsConfig;
+							that.$nextTick(() => {
+								document.getElementById('alipaysubmit').submit();
+							})
+							//#endif
+							// #ifdef MP
+							uni.navigateTo({
+								url: `/pages/users/alipay_invoke/index?id=${orderId}&link=${jsConfig.qrCode}`
+							});
+							// #endif
+							// #ifdef APP-PLUS
+							uni.requestPayment({
+								provider: 'alipay',
+								orderInfo: jsConfig,
+								success: (e) => {
+									that.$set(that, 'userinfo.now_money', that.$util.$h.Add(this
+										.number,
+										that.userinfo
+										.now_money));
+									return that.$util.Tips({
+										title: that.$t(`支付成功`),
+										icon: 'success'
+									}, {
+										tab: 5,
+										url: '/pages/users/user_money/index'
+									});
+
+								},
+								fail: (e) => {
+									return that.$util.Tips({
+										title: that.$t(`支付失败`)
+									});
+								},
+								complete: () => {
+									uni.hideLoading();
+								},
+							});
+							// #endif
+							break;
+					}
+				}).catch(err => {
+					uni.hideLoading();
+					return that.$util.Tips({
+						title: err
+					})
+				})
+			},
+			formpost(url, postData) {
+				let tempform = document.createElement("form");
+				tempform.action = url;
+				tempform.method = "post";
+				tempform.target = "_self";
+				tempform.style.display = "none";
+				for (let x in postData) {
+					let opt = document.createElement("input");
+					opt.name = x;
+					opt.value = postData[x];
+					tempform.appendChild(opt);
+				}
+				document.body.appendChild(tempform);
+				this.$nextTick(e => {
+					tempform.submit();
+				})
+			},
+			pay() {
+				this.pay_close = true;
+			},
+			/*
+			 * 用户充值
+			 */
+			submitSub() {
+				let that = this
+				let value = this.number;
+				// 转入余额
+				if (that.active) {
+					if (parseFloat(value) < 0 || parseFloat(value) == NaN || value == undefined || value == "") {
+						return that.$util.Tips({
+							title: that.$t(`请输入金额`)
+						});
+					}
+					uni.showModal({
+						title: that.$t(`转入余额`),
+						content: that.$t(`转入余额后无法再次转出，确认是否转入余额`),
+						success(res) {
+							if (res.confirm) {
+								recharge({
+										price: parseFloat(value),
+										type: 1
+									})
+									.then(res => {
+										// that.$set(that, 'userinfo.now_money', that.$util.$h.Add(value, that.userinfo.now_money))
+										return that.$util.Tips({
+											title: that.$t(`转入成功`),
+											icon: 'success'
+										}, {
+											tab: 5,
+											url: '/pages/users/user_money/index'
+										});
+									}).catch(err => {
+										return that.$util.Tips({
+											title: err
+										})
+									});
+							} else if (res.cancel) {
+								return that.$util.Tips({
+									title: that.$t(`已取消`)
+								});
+							}
+						},
+					})
+				} else {
+					this.pay()
+				}
+			}
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.bgcolor {
+		background-color: var(--view-theme)
+	}
+
+	.payment {
+		position: relative;
+		top: -60rpx;
+		width: 100%;
+		background-color: #fff;
+		border-radius: 10rpx;
+		padding-top: 25rpx;
+		border-top-right-radius: 39rpx;
+		border-top-left-radius: 39rpx;
+	}
+
+	.payment .nav {
+		height: 75rpx;
+		line-height: 75rpx;
+		padding: 0 100rpx;
+	}
+
+	.payment .nav .item {
+		font-size: 30rpx;
+		color: #333;
+	}
+
+	.payment .nav .item.on {
+		font-weight: bold;
+		border-bottom: 4rpx solid var(--view-theme);
+	}
+
+	.payment .input {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-bottom: 1px dashed #dddddd;
+		margin: 60rpx auto 0 auto;
+		padding-bottom: 20rpx;
+		font-size: 56rpx;
+		color: #333333;
+		flex-wrap: nowrap;
+
+	}
+
+	.payment .input text {
+		padding-left: 106rpx;
+	}
+
+	.payment .input input {
+		padding-right: 106rpx;
+		width: 300rpx;
+		height: 94rpx;
+		text-align: center;
+		font-size: 70rpx;
+	}
+
+	.payment .placeholder {
+		color: #d0d0d0;
+		height: 100%;
+		line-height: 94rpx;
+	}
+
+	.payment .tip {
+		font-size: 26rpx;
+		color: #888888;
+		padding: 0 30rpx;
+		margin-top: 25rpx;
+	}
+
+	.payment .but {
+		color: #fff;
+		font-size: 30rpx;
+		width: 700rpx;
+		height: 86rpx;
+		border-radius: 50rpx;
+		margin: 46rpx auto 0 auto;
+		line-height: 86rpx;
+	}
+
+	.payment-top {
+		width: 100%;
+		height: 350rpx;
+		background-color: var(--view-theme);
+
+		.name {
+			font-size: 26rpx;
+			color: rgba(255, 255, 255, 0.8);
+			margin-top: -38rpx;
+			margin-bottom: 30rpx;
+		}
+
+		.pic {
+			font-size: 32rpx;
+			color: #fff;
+
+			.num {
+				font-size: 56rpx;
+			}
+		}
+
+		.pic-font {
+			font-size: 78rpx;
+			color: #fff;
+		}
+	}
+
+	.picList {
+		display: flex;
+		flex-wrap: wrap;
+		margin: 30rpx 0;
+
+		.pic-box {
+			width: 32%;
+			height: auto;
+			border-radius: 20rpx;
+			margin-top: 21rpx;
+			padding: 20rpx 0;
+			margin-right: 12rpx;
+
+			&:nth-child(3n) {
+				margin-right: 0;
+			}
+		}
+
+		.pic-box-color {
+			background-color: #f4f4f4;
+			color: #656565;
+		}
+
+		.pic-number {
+			font-size: 22rpx;
+		}
+
+		.pic-number-pic {
+			font-size: 38rpx;
+			margin-right: 10rpx;
+			text-align: center;
+		}
+
+		.pic-box-color-active {
+			background-color: var(--view-theme) !important;
+			color: #fff !important;
+		}
+	}
+
+	.tips-box {
+		.tips {
+			font-size: 28rpx;
+			color: #333333;
+			font-weight: 800;
+			margin-bottom: 14rpx;
+			margin-top: 20rpx;
+		}
+
+		.tips-samll {
+			font-size: 24rpx;
+			color: #333333;
+			margin-bottom: 14rpx;
+		}
+
+		.tip-box {
+			margin-top: 30rpx;
+		}
+	}
+
+	.tips-title {
+		margin-top: 20rpx;
+		font-size: 24rpx;
+		color: #333;
+	}
 </style>
diff --git a/template/uni-app/pages/users/user_spread_user/index.vue b/template/uni-app/pages/users/user_spread_user/index.vue
index 4bc2f28f5..ab114f5f0 100644
--- a/template/uni-app/pages/users/user_spread_user/index.vue
+++ b/template/uni-app/pages/users/user_spread_user/index.vue
@@ -7,8 +7,8 @@
 					<view>
 						<view class="user-msg">
 							<image class="avatar" :src="userInfo.avatar" mode=""></image>
-							<view class="nickname">{{userInfo.nickname}}</view>
-							<view v-if="userInfo.is_agent_level" class="level" @click="jumbPath">
+							<view class="nickname line1">{{userInfo.nickname}}</view>
+							<view v-if="userInfo.is_agent_level" class="level line1" @click="jumbPath">
 								<text>{{userInfo.agent_level_name?$t(userInfo.agent_level_name):$t(`分销等级`)}}</text>
 								<text v-if="userInfo.is_agent_level" class='iconfont icon-xiangyou'></text>
 							</view>
@@ -270,7 +270,8 @@
 
 			.nickname {
 				font-size: 32rpx;
-				margin: 10rpx 0;
+				margin: 10rpx 0;
+				max-width: 8rem;
 			}
 
 			.level {
@@ -281,7 +282,7 @@
 				transform: scale(0.9);
 				display: flex;
 				align-items: center;
-
+				max-width: 10rem;
 				.icon-xiangyou {
 					transform: scale(0.7);
 					font-size: 28rpx;