From d36f2a24f375793fa97f8e57790916757cea25af Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Sat, 18 Feb 2023 12:06:21 +0800
Subject: [PATCH 01/16] =?UTF-8?q?improve:=20=E7=A7=AF=E5=88=86=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=9B=B4=E5=A4=9A=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/marketing/storeIntegralOrder/components/tableList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/admin/src/pages/marketing/storeIntegralOrder/components/tableList.vue b/template/admin/src/pages/marketing/storeIntegralOrder/components/tableList.vue
index 2c20c35eb..5a99a1315 100644
--- a/template/admin/src/pages/marketing/storeIntegralOrder/components/tableList.vue
+++ b/template/admin/src/pages/marketing/storeIntegralOrder/components/tableList.vue
@@ -36,7 +36,7 @@
         <a @click="delivery(row)" v-if="row.status === 2">配送信息</a>
         <Divider type="vertical" v-if="row.status === 1 || row.status === 2" />
         <template>
-          <Dropdown @on-click="changeMenu(row, $event)">
+          <Dropdown @on-click="changeMenu(row, $event)" :transfer="true">
             <a href="javascript:void(0)">
               更多
               <Icon type="ios-arrow-down"></Icon>

From 5f34c22d085e24be8a980c43151c83c419454d5f Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Sat, 18 Feb 2023 12:06:48 +0800
Subject: [PATCH 02/16] =?UTF-8?q?improve:=20=E5=88=86=E7=B1=BBdiy=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=BC=A0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/uni-app/pages/goods_cate/goods_cate.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/template/uni-app/pages/goods_cate/goods_cate.vue b/template/uni-app/pages/goods_cate/goods_cate.vue
index d6628cd12..57a008a49 100644
--- a/template/uni-app/pages/goods_cate/goods_cate.vue
+++ b/template/uni-app/pages/goods_cate/goods_cate.vue
@@ -66,6 +66,7 @@
 					this.category = status
 					this.status = res.data.status
 					this.$nextTick(e => {
+						this.$refs.classOne.is_diy = this.is_diy
 						if (this.status == 2 || this.status == 3) {
 							uni.hideTabBar();
 						} else if (this.status == 1) {

From c7525cd3976d827340551c7e454516fd73805965 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Sat, 18 Feb 2023 12:07:03 +0800
Subject: [PATCH 03/16] =?UTF-8?q?style:=20=E6=B4=BB=E5=8A=A8=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/uni-app/pages/goods_details/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/template/uni-app/pages/goods_details/index.vue b/template/uni-app/pages/goods_details/index.vue
index 1ca72ba48..59d517abf 100644
--- a/template/uni-app/pages/goods_details/index.vue
+++ b/template/uni-app/pages/goods_details/index.vue
@@ -123,7 +123,7 @@
 							</view>
 							<view class="coupon acea-row row-between-wrapper" v-if="activity.length">
 								<view class="line1 acea-row">
-									<text>{{$t(`活动`)}}：</text>
+									<text class="coupon-title">{{$t(`活动`)}}：</text>
 									<view v-for="(item, index) in activity" :key="index" @click="goActivity(item)">
 										<view v-if="item.type === '1'" :class="
                         index == 0
@@ -2171,7 +2171,9 @@
 		background-color: rgba(0, 0, 0, 0.6);
 		z-index: 9;
 	}
-
+	.wrapper .coupon-title{
+		line-height: 44rpx;
+	}
 	.pro-wrapper .iconn {
 		background-image: url("data:image/png;base64,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");
 		width: 100rpx;

From a05ccb61244c4d0ab802a336d06d0d2145d91362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Sat, 18 Feb 2023 14:09:23 +0800
Subject: [PATCH 04/16] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=80=92=E5=8F=99=E6=8E=92=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/dao/activity/integral/StoreIntegralOrderStatusDao.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crmeb/app/dao/activity/integral/StoreIntegralOrderStatusDao.php b/crmeb/app/dao/activity/integral/StoreIntegralOrderStatusDao.php
index e2ff43131..6eb390921 100644
--- a/crmeb/app/dao/activity/integral/StoreIntegralOrderStatusDao.php
+++ b/crmeb/app/dao/activity/integral/StoreIntegralOrderStatusDao.php
@@ -43,7 +43,7 @@ class StoreIntegralOrderStatusDao extends BaseDao
      */
     public function getStatusList(array $where, int $page, int $limit)
     {
-        return $this->search($where)->page($page, $limit)->select()->toArray();
+        return $this->search($where)->page($page, $limit)->order('change_time desc')->select()->toArray();
     }
 
 }

From a1e95884c8d97c7d70883958639cc0c58fd49cbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Sat, 18 Feb 2023 14:09:59 +0800
Subject: [PATCH 05/16] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=87=AA=E5=B8=A6?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=A2=9E=E5=8A=A0=E5=9F=9F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/agent/AgentLevelServices.php | 3 +++
 crmeb/app/services/user/UserServices.php        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/crmeb/app/services/agent/AgentLevelServices.php b/crmeb/app/services/agent/AgentLevelServices.php
index afa3569c2..498d79c1f 100644
--- a/crmeb/app/services/agent/AgentLevelServices.php
+++ b/crmeb/app/services/agent/AgentLevelServices.php
@@ -90,6 +90,9 @@ class AgentLevelServices extends BaseServices
         $this->checkUserLevelFinish($uid);
 
         $list = $this->dao->getList(['is_del' => 0, 'status' => 1]);
+        foreach ($list as &$item) {
+            $item['image'] = set_file_url($item['image']);
+        }
         $agent_level = $user['agent_level'] ?? 0;
         //没等级默认最低等级
         if (!$agent_level) {
diff --git a/crmeb/app/services/user/UserServices.php b/crmeb/app/services/user/UserServices.php
index 34c9e5944..728951607 100644
--- a/crmeb/app/services/user/UserServices.php
+++ b/crmeb/app/services/user/UserServices.php
@@ -1461,7 +1461,7 @@ class UserServices extends BaseServices
             $user['vip'] = (bool)$userLevel;
             if ($user['vip']) {
                 $user['vip_id'] = $userLevel['id'] ?? 0;
-                $user['vip_icon'] = $userLevel['icon'] ?? '';
+                $user['vip_icon'] = set_file_url($userLevel['icon']) ?? '';
                 $user['vip_name'] = $userLevel['name'] ?? '';
             }
         }

From 3a12ad7b6102f4dc9b94b15a24ed33ffc6e9a5e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Sat, 18 Feb 2023 14:10:22 +0800
Subject: [PATCH 06/16] =?UTF-8?q?=E5=95=86=E5=93=81=E9=80=80=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/order/StoreOrderRefundServices.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/crmeb/app/services/order/StoreOrderRefundServices.php b/crmeb/app/services/order/StoreOrderRefundServices.php
index 9e646ea2b..b7d7f0246 100644
--- a/crmeb/app/services/order/StoreOrderRefundServices.php
+++ b/crmeb/app/services/order/StoreOrderRefundServices.php
@@ -430,17 +430,23 @@ class StoreOrderRefundServices extends BaseServices
      */
     public function integralAndCouponBack($order)
     {
+        /** @var StoreOrderStatusServices $statusService */
+        $statusService = app()->make(StoreOrderStatusServices::class);
         $res = true;
         //回退优惠卷 拆分子订单不退优惠券
         if (!$order['pid'] && $order['coupon_id'] && $order['coupon_price']) {
             /** @var StoreCouponUserServices $coumonUserServices */
             $coumonUserServices = app()->make(StoreCouponUserServices::class);
             $res = $res && $coumonUserServices->recoverCoupon((int)$order['coupon_id']);
+            $statusService->save([
+                'oid' => $order['id'],
+                'change_type' => 'coupon_back',
+                'change_message' => '商品退优惠券',
+                'change_time' => time()
+            ]);
         }
         //回退积分
         $order = $this->regressionIntegral($order);
-        /** @var StoreOrderStatusServices $statusService */
-        $statusService = app()->make(StoreOrderStatusServices::class);
         $statusService->save([
             'oid' => $order['id'],
             'change_type' => 'integral_back',

From 2e0326b5d925bb5c8a84131f1fe7f8766de8d69c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Sat, 18 Feb 2023 14:10:54 +0800
Subject: [PATCH 07/16] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/order/StoreOrderTakeServices.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/crmeb/app/services/order/StoreOrderTakeServices.php b/crmeb/app/services/order/StoreOrderTakeServices.php
index 39eff14de..72694e597 100644
--- a/crmeb/app/services/order/StoreOrderTakeServices.php
+++ b/crmeb/app/services/order/StoreOrderTakeServices.php
@@ -65,15 +65,7 @@ class StoreOrderTakeServices extends BaseServices
             throw new ApiException(410266);
         }
         $order->status = 2;
-        /** @var StoreOrderStatusServices $statusService */
-        $statusService = app()->make(StoreOrderStatusServices::class);
-        $res = $order->save() && $statusService->save([
-                'oid' => $order['id'],
-                'change_type' => 'user_take_delivery',
-                'change_message' => '用户已收货',
-                'change_time' => time()
-            ]);
-        $res = $res && $this->storeProductOrderUserTakeDelivery($order);
+        $res = $order->save() && $this->storeProductOrderUserTakeDelivery($order);
         if (!$res) {
             throw new ApiException(410205);
         }

From aff05dc85cce7a9f560d54f5f7b5068433a5bcb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Sat, 18 Feb 2023 14:11:43 +0800
Subject: [PATCH 08/16] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=97=B6=E5=80=99=E9=80=89=E6=8B=A9=E8=BF=90?=
 =?UTF-8?q?=E8=B4=B9=E8=AE=BE=E7=BD=AE=E4=B8=8D=E4=BF=AE=E6=94=B9=E7=89=B9?=
 =?UTF-8?q?=E6=AE=8A=E7=B1=BB=E5=9E=8B=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/product/StoreProductServices.php     | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/crmeb/app/services/product/product/StoreProductServices.php b/crmeb/app/services/product/product/StoreProductServices.php
index e37745d78..1ea506ab0 100644
--- a/crmeb/app/services/product/product/StoreProductServices.php
+++ b/crmeb/app/services/product/product/StoreProductServices.php
@@ -2017,13 +2017,15 @@ class StoreProductServices extends BaseServices
                 break;
             case 2:
                 foreach ($ids as $product_id) {
-                    $batchData[] = [
-                        'id' => $product_id,
-                        'logistics' => implode(',', $data['logistics']),
-                        'freight' => $data['freight'],
-                        'postage' => $data['freight'] == 2 ? $data['postage'] : 0,
-                        'temp_id' => $data['freight'] == 3 ? $data['temp_id'] : 0
-                    ];
+                    if ($this->dao->value(['id' => $product_id], 'virtual_type') == 0) {
+                        $batchData[] = [
+                            'id' => $product_id,
+                            'logistics' => implode(',', $data['logistics']),
+                            'freight' => $data['freight'],
+                            'postage' => $data['freight'] == 2 ? $data['postage'] : 0,
+                            'temp_id' => $data['freight'] == 3 ? $data['temp_id'] : 0
+                        ];
+                    }
                 }
                 if (count($batchData)) $this->dao->saveAll($batchData);
                 break;

From c0dddf30071fb9dc6d429dba33322eafe7d2b0aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Sat, 18 Feb 2023 14:12:10 +0800
Subject: [PATCH 09/16] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E9=94=99=E8=AF=AF=EF=BC=8C=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/setting/membershipLevel/index.vue | 4 ++--
 template/uni-app/pages/goods/admin_order_detail/index.vue  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/template/admin/src/pages/setting/membershipLevel/index.vue b/template/admin/src/pages/setting/membershipLevel/index.vue
index db9721f2f..26fc98d88 100644
--- a/template/admin/src/pages/setting/membershipLevel/index.vue
+++ b/template/admin/src/pages/setting/membershipLevel/index.vue
@@ -78,8 +78,8 @@
           <div class="search">
             <div>
               <span>是否显示：</span>
-              <Select v-model="taskData.status" style="width: 200px">
-                <Option value="">全部</Option>
+              <Select v-model="taskData.status" style="width: 200px" clearable>
+                <!-- <Option :value="''">全部</Option> -->
                 <Option :value="1">显示</Option>
                 <Option :value="0">不显示</Option>
               </Select>
diff --git a/template/uni-app/pages/goods/admin_order_detail/index.vue b/template/uni-app/pages/goods/admin_order_detail/index.vue
index ebe94947f..8d7e81962 100644
--- a/template/uni-app/pages/goods/admin_order_detail/index.vue
+++ b/template/uni-app/pages/goods/admin_order_detail/index.vue
@@ -107,7 +107,7 @@
 				<view class='conter'>{{$t(`￥`)}}{{orderInfo.pay_postage}}</view>
 			</view>
 			<view class="actualPay acea-row row-right">
-				{{$t(`real_payment`)}}：<span class="money">{{$t(`￥`)}}{{ orderInfo.pay_price }}</span>
+				{{$t(`实际支付`)}}：<span class="money">{{$t(`￥`)}}{{ orderInfo.pay_price }}</span>
 			</view>
 		</view>
 		<view class="wrapper" v-if="

From 44f420f88532afe6e528705f22535fbc45976821 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Sat, 18 Feb 2023 16:28:10 +0800
Subject: [PATCH 10/16] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=9A=82?=
 =?UTF-8?q?=E4=B8=8D=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uni-app/pages/goods/cashier/index.vue     | 1497 +++++++++--------
 1 file changed, 758 insertions(+), 739 deletions(-)

diff --git a/template/uni-app/pages/goods/cashier/index.vue b/template/uni-app/pages/goods/cashier/index.vue
index a0d3c9685..0266a6c55 100644
--- a/template/uni-app/pages/goods/cashier/index.vue
+++ b/template/uni-app/pages/goods/cashier/index.vue
@@ -1,740 +1,759 @@
-<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
+							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;
+		}
+
+		.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>

From f39dc96313e457f92df924c37ed70cbdd40ff820 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Sat, 18 Feb 2023 16:28:54 +0800
Subject: [PATCH 11/16] =?UTF-8?q?improve:=20=E8=A7=84=E6=A0=BC=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/product/productAdd/index.vue | 1 +
 1 file changed, 1 insertion(+)

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) {

From 2c07999a9a8220c3fe0df45777f4812db637a85e Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Sat, 18 Feb 2023 16:29:07 +0800
Subject: [PATCH 12/16] =?UTF-8?q?style:=20=E5=88=86=E4=BA=AB=E6=96=87?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/uni-app/components/shareRedPackets/index.vue | 5 +++++
 1 file changed, 5 insertions(+)

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;
 	}

From e60f17553db692ce2af92c2da9e878a28469a6d0 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Sat, 18 Feb 2023 16:29:34 +0800
Subject: [PATCH 13/16] =?UTF-8?q?style:=20=E7=A7=92=E6=9D=80=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/uni-app/pages/activity/goods_seckill/index.vue | 1 +
 1 file changed, 1 insertion(+)

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;

From c3d6c24d1735e0b12d9208ea476b2e3f8c49f712 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Sat, 18 Feb 2023 16:29:59 +0800
Subject: [PATCH 14/16] =?UTF-8?q?improve:=20=E5=A4=B1=E6=95=88=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/uni-app/pages/users/user_coupon/index.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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;

From 6b4ee7829c144cb6bf3a317aa5b5bfa749b2c1be Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Sat, 18 Feb 2023 16:45:36 +0800
Subject: [PATCH 15/16] =?UTF-8?q?improve:=20=E8=AE=A2=E5=8D=95=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/uni-app/pages/goods/order_confirm/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/template/uni-app/pages/goods/order_confirm/index.vue b/template/uni-app/pages/goods/order_confirm/index.vue
index fcf82b161..81e7841f4 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,

From f09a5f21de46cc6e6344ce61441b258df6e0dbc9 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Sat, 18 Feb 2023 16:45:56 +0800
Subject: [PATCH 16/16] =?UTF-8?q?improve:=20=E7=94=A8=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/uni-app/pages/users/user_spread_user/index.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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;