From 3ef09698c81d19303bcf932d8176c88840aefe98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Mon, 15 Jul 2024 14:27:49 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90=E7=A8=8B=E5=BA=8F=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E3=80=91=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adminapi/controller/UpgradeController.php |  4 ++--
 .../adminapi/controller/v1/agent/Division.php | 12 ++++++-----
 .../controller/v1/marketing/StoreBargain.php  |  9 +++++++-
 .../v1/marketing/StoreCombination.php         |  6 ++++++
 .../controller/v1/marketing/StoreSeckill.php  |  6 ++++++
 .../controller/v1/order/StoreOrderInvoice.php |  2 +-
 .../v1/order/StoreOrderController.php         |  2 +-
 crmeb/app/model/order/StoreOrder.php          |  5 +++++
 .../model/product/product/StoreCategory.php   |  2 +-
 .../model/product/product/StoreProduct.php    |  2 +-
 .../activity/bargain/StoreBargainServices.php | 16 ++++++++++----
 .../combination/StoreCombinationServices.php  | 16 ++++++++++----
 .../activity/seckill/StoreSeckillServices.php | 12 ++++++++---
 .../order/StoreOrderDeliveryServices.php      |  2 +-
 .../order/StoreOrderInvoiceServices.php       |  2 +-
 .../app/services/order/StoreOrderServices.php | 11 +++++++++-
 .../services/order/StoreOrderTakeServices.php |  2 +-
 .../services/other/export/ExportServices.php  |  2 +-
 .../system/config/SystemConfigServices.php    | 21 +++++++++++++++++++
 .../app/services/user/UserExtractServices.php |  1 +
 20 files changed, 107 insertions(+), 28 deletions(-)

diff --git a/crmeb/app/adminapi/controller/UpgradeController.php b/crmeb/app/adminapi/controller/UpgradeController.php
index 1d4eea624..101e141e8 100644
--- a/crmeb/app/adminapi/controller/UpgradeController.php
+++ b/crmeb/app/adminapi/controller/UpgradeController.php
@@ -734,8 +734,8 @@ class UpgradeController
      */
     public function upData()
     {
-        $data['new_version'] = 'CRMEB-BZ-BETA v5.4.0';
-        $data['new_code'] = '540';
+        $data['new_version'] = 'CRMEB-BZ v5.4.0';
+        $data['new_code'] = '540.1';
         $data['update_sql'] = [
             [
                 'code' => '540',
diff --git a/crmeb/app/adminapi/controller/v1/agent/Division.php b/crmeb/app/adminapi/controller/v1/agent/Division.php
index 59a1fdda1..6ef00f73a 100644
--- a/crmeb/app/adminapi/controller/v1/agent/Division.php
+++ b/crmeb/app/adminapi/controller/v1/agent/Division.php
@@ -141,11 +141,13 @@ class Division extends AuthController
         if ((int)$data['uid'] == 0) $data['uid'] = $data['image']['uid'];
         $userInfo = $userServices->getUserInfo($data['uid'], 'is_division,is_agent,is_staff');
         if (!$userInfo) throw new AdminException(100100);
-        if ($userInfo['is_division']) throw new AdminException('此用户是事业部，请勿添加为代理商');
-        if ($userInfo['is_agent']) throw new AdminException('此用户是代理商，无法重复添加');
-        if ($userInfo['is_staff']) throw new AdminException('此用户是下级员工，无法添加为代理商');
-        $divisionUserInfo = $userServices->count(['uid' => (int)$data['division_id'], 'is_division' => 1, 'division_id' => $data['division_id']]);
-        if (!$divisionUserInfo) throw new AdminException(100100);
+        if ($data['edit'] == 0) {
+            if ($userInfo['is_division']) throw new AdminException('此用户是事业部，请勿添加为代理商');
+            if ($userInfo['is_agent']) throw new AdminException('此用户是代理商，无法重复添加');
+            if ($userInfo['is_staff']) throw new AdminException('此用户是下级员工，无法添加为代理商');
+            $divisionUserInfo = $userServices->count(['uid' => (int)$data['division_id'], 'is_division' => 1, 'division_id' => $data['division_id']]);
+            if (!$divisionUserInfo) throw new AdminException(100100);
+        }
         $this->services->divisionAgentSave($data);
         return app('json')->success(100000);
     }
diff --git a/crmeb/app/adminapi/controller/v1/marketing/StoreBargain.php b/crmeb/app/adminapi/controller/v1/marketing/StoreBargain.php
index 3a4a6f239..219e2c031 100644
--- a/crmeb/app/adminapi/controller/v1/marketing/StoreBargain.php
+++ b/crmeb/app/adminapi/controller/v1/marketing/StoreBargain.php
@@ -153,7 +153,14 @@ class StoreBargain extends AuthController
     {
         /** @var StoreBargainUserServices $bargainUserService */
         $bargainUserService = app()->make(StoreBargainUserServices::class);
-        $bargainUserService->userBargainStatusFail($id, false);
+        if ($status == 0) {
+            $bargainUserService->userBargainStatusFail($id, false);
+        } else {
+            $info = $this->services->get($id);
+            if ($info['stop_time'] < time()) {
+                return app('json')->fail('活动已结束，无法继续上架');
+            }
+        }
         $this->services->update($id, ['status' => $status]);
         return app('json')->success(100001);
     }
diff --git a/crmeb/app/adminapi/controller/v1/marketing/StoreCombination.php b/crmeb/app/adminapi/controller/v1/marketing/StoreCombination.php
index 242026e63..5abb0e2c1 100644
--- a/crmeb/app/adminapi/controller/v1/marketing/StoreCombination.php
+++ b/crmeb/app/adminapi/controller/v1/marketing/StoreCombination.php
@@ -161,6 +161,12 @@ class StoreCombination extends AuthController
      */
     public function set_status($id, $status)
     {
+        if ($status == 1) {
+            $info = $this->services->get($id);
+            if ($info['stop_time'] < time()) {
+                return app('json')->fail('活动已结束，无法继续上架');
+            }
+        }
         $this->services->update($id, ['is_show' => $status]);
         return app('json')->success($status == 0 ? 100014 : 100015);
     }
diff --git a/crmeb/app/adminapi/controller/v1/marketing/StoreSeckill.php b/crmeb/app/adminapi/controller/v1/marketing/StoreSeckill.php
index a8f463e8c..0b7ac261c 100644
--- a/crmeb/app/adminapi/controller/v1/marketing/StoreSeckill.php
+++ b/crmeb/app/adminapi/controller/v1/marketing/StoreSeckill.php
@@ -120,6 +120,12 @@ class StoreSeckill extends AuthController
      */
     public function set_status($id, $status)
     {
+        if ($status == 1) {
+            $info = $this->services->get($id);
+            if ($info['stop_time'] < time()) {
+                return app('json')->fail('活动已结束，无法继续上架');
+            }
+        }
         $this->services->update($id, ['status' => $status]);
         return app('json')->success(100014);
     }
diff --git a/crmeb/app/adminapi/controller/v1/order/StoreOrderInvoice.php b/crmeb/app/adminapi/controller/v1/order/StoreOrderInvoice.php
index 8885b8784..f893fb86d 100644
--- a/crmeb/app/adminapi/controller/v1/order/StoreOrderInvoice.php
+++ b/crmeb/app/adminapi/controller/v1/order/StoreOrderInvoice.php
@@ -193,7 +193,7 @@ class StoreOrderInvoice extends AuthController
             $data['invoice_type'] = 82;
             $data['is_enterprise'] = 0;
         } else {
-            $data['invoice_type'] = 81;
+            $data['invoice_type'] = $info['type'] == 1 ? 82 : 81;
             $data['tax_id'] = $info['duty_number'];
             $data['is_enterprise'] = 1;
         }
diff --git a/crmeb/app/api/controller/v1/order/StoreOrderController.php b/crmeb/app/api/controller/v1/order/StoreOrderController.php
index 042a6a5d3..bded23dc2 100644
--- a/crmeb/app/api/controller/v1/order/StoreOrderController.php
+++ b/crmeb/app/api/controller/v1/order/StoreOrderController.php
@@ -267,7 +267,7 @@ class StoreOrderController
             //创建订单jspay支付
             /** @var StoreOrderSuccessServices $success */
             $success = app()->make(StoreOrderSuccessServices::class);
-            $payPriceStatus = $success->zeroYuanPayment($orderInfo, $uid, $paytype);
+            $payPriceStatus = $success->zeroYuanPayment($orderInfo, $uid);
             if ($payPriceStatus)//0元支付成功
                 return app('json')->status('success', '支付成功', ['order_id' => $orderInfo['order_id'], 'key' => $orderInfo['unique']]);
             else
diff --git a/crmeb/app/model/order/StoreOrder.php b/crmeb/app/model/order/StoreOrder.php
index 2e1d6fef1..3d015e554 100644
--- a/crmeb/app/model/order/StoreOrder.php
+++ b/crmeb/app/model/order/StoreOrder.php
@@ -634,4 +634,9 @@ class StoreOrder extends BaseModel
     {
         $query->where('agent_brokerage', '>', $value);
     }
+
+    public function searchVirtualTypeAttr($query, $value)
+    {
+        if ($value !== '') $query->where('virtual_type', $value);
+    }
 }
diff --git a/crmeb/app/model/product/product/StoreCategory.php b/crmeb/app/model/product/product/StoreCategory.php
index b8d4a767c..82ad93cc4 100644
--- a/crmeb/app/model/product/product/StoreCategory.php
+++ b/crmeb/app/model/product/product/StoreCategory.php
@@ -96,6 +96,6 @@ class StoreCategory extends BaseModel
      */
     public function searchIdAttr($query, $value, $data)
     {
-        if ($value) $query->whereIn('id', $value);
+        if ($value) $query->whereIn('id', is_array($value) ? $value : (string)$value);
     }
 }
diff --git a/crmeb/app/model/product/product/StoreProduct.php b/crmeb/app/model/product/product/StoreProduct.php
index f8803e582..8180fbd94 100644
--- a/crmeb/app/model/product/product/StoreProduct.php
+++ b/crmeb/app/model/product/product/StoreProduct.php
@@ -311,7 +311,7 @@ class StoreProduct extends BaseModel
                 $query->where(['is_show' => 0, 'is_del' => 0]);
                 break;
             case 3:
-                $query->where(['is_del' => 0]);
+                $query->where(['is_del' => 0, 'vip_product' => 0]);
                 break;
             case 4:
                 $query->where(['is_del' => 0])->where(function ($query) {
diff --git a/crmeb/app/services/activity/bargain/StoreBargainServices.php b/crmeb/app/services/activity/bargain/StoreBargainServices.php
index 2e5e9642e..a087a8d2a 100644
--- a/crmeb/app/services/activity/bargain/StoreBargainServices.php
+++ b/crmeb/app/services/activity/bargain/StoreBargainServices.php
@@ -100,20 +100,28 @@ class StoreBargainServices extends BaseServices
         /** @var StoreBargainUserHelpServices $storeBargainUserHelpServices */
         $storeBargainUserHelpServices = app()->make(StoreBargainUserHelpServices::class);
         $countHelpAll = $storeBargainUserHelpServices->getHelpAllCount([['bargain_id', 'in', $ids]]);
+        $stopIds = [];
         foreach ($list as &$item) {
             $item['count_people_all'] = $countAll[$item['id']] ?? 0;//参与人数
             $item['count_people_help'] = $countHelpAll[$item['id']] ?? 0;//帮忙砍价人数
             $item['count_people_success'] = $countSuccess[$item['id']] ?? 0;//砍价成功人数
             $item['stop_status'] = $item['stop_time'] < time() ? 1 : 0;
             if ($item['status']) {
-                if ($item['start_time'] > time())
+                if ($item['start_time'] > time()) {
                     $item['start_name'] = '未开始';
-                else if ($item['stop_time'] < time())
+                } else if ($item['stop_time'] < time()) {
                     $item['start_name'] = '已结束';
-                else if ($item['stop_time'] > time() && $item['start_time'] < time()) {
+                    $item['status'] = 0;
+                    $stopIds[] = $item['id'];
+                } else if ($item['stop_time'] > time() && $item['start_time'] < time()) {
                     $item['start_name'] = '进行中';
                 }
-            } else $item['start_name'] = '已结束';
+            } else {
+                $item['start_name'] = '已结束';
+            }
+        }
+        if ($stopIds) {
+            $this->dao->batchUpdate($stopIds, ['status' => 0]);
         }
         return compact('list', 'count');
     }
diff --git a/crmeb/app/services/activity/combination/StoreCombinationServices.php b/crmeb/app/services/activity/combination/StoreCombinationServices.php
index 23f054866..4260e6529 100644
--- a/crmeb/app/services/activity/combination/StoreCombinationServices.php
+++ b/crmeb/app/services/activity/combination/StoreCombinationServices.php
@@ -136,20 +136,28 @@ class StoreCombinationServices extends BaseServices
         $countAll = $storePinkServices->getPinkCount([]);
         $countTeam = $storePinkServices->getPinkCount(['k_id' => 0, 'status' => 2]);
         $countPeople = $storePinkServices->getPinkCount(['k_id' => 0]);
+        $stopIds = [];
         foreach ($list as &$item) {
             $item['count_people'] = $countPeople[$item['id']] ?? 0;//拼团数量
             $item['count_people_all'] = $countAll[$item['id']] ?? 0;//参与人数
             $item['count_people_pink'] = $countTeam[$item['id']] ?? 0;//成团数量
             $item['stop_status'] = $item['stop_time'] < time() ? 1 : 0;
             if ($item['is_show']) {
-                if ($item['start_time'] > time())
+                if ($item['start_time'] > time()) {
                     $item['start_name'] = '未开始';
-                else if ($item['stop_time'] < time())
+                } else if ($item['stop_time'] < time()) {
                     $item['start_name'] = '已结束';
-                else if ($item['stop_time'] > time() && $item['start_time'] < time()) {
+                    $item['is_show'] = 0;
+                    $stopIds[] = $item['id'];
+                } else if ($item['stop_time'] > time() && $item['start_time'] < time()) {
                     $item['start_name'] = '进行中';
                 }
-            } else $item['start_name'] = '已结束';
+            } else {
+                $item['start_name'] = '已结束';
+            }
+        }
+        if ($stopIds) {
+            $this->dao->batchUpdate($stopIds, ['is_show' => 0]);
         }
         return compact('list', 'count');
     }
diff --git a/crmeb/app/services/activity/seckill/StoreSeckillServices.php b/crmeb/app/services/activity/seckill/StoreSeckillServices.php
index c77674112..bbcb33757 100644
--- a/crmeb/app/services/activity/seckill/StoreSeckillServices.php
+++ b/crmeb/app/services/activity/seckill/StoreSeckillServices.php
@@ -206,14 +206,17 @@ class StoreSeckillServices extends BaseServices
         [$page, $limit] = $this->getPageValue();
         $list = $this->dao->getList($where, $page, $limit);
         $count = $this->dao->count($where + ['is_del' => 0]);
+        $stopIds = [];
         foreach ($list as &$item) {
             $item['store_name'] = $item['title'];
             if ($item['status']) {
-                if ($item['start_time'] > time())
+                if ($item['start_time'] > time()) {
                     $item['start_name'] = '未开始';
-                else if (bcadd($item['stop_time'], '86400') < time())
+                } else if (bcadd($item['stop_time'], '86400') < time()) {
                     $item['start_name'] = '已结束';
-                else if (bcadd($item['stop_time'], '86400') > time() && $item['start_time'] < time()) {
+                    $item['status'] = 0;
+                    $stopIds[] = $item['id'];
+                } else if (bcadd($item['stop_time'], '86400') > time() && $item['start_time'] < time()) {
                     $item['start_name'] = '进行中';
                 }
             } else $item['start_name'] = '已结束';
@@ -221,6 +224,9 @@ class StoreSeckillServices extends BaseServices
             $item['_stop_time'] = $end_time;
             $item['stop_status'] = $item['stop_time'] + 86400 < time() ? 1 : 0;
         }
+        if ($stopIds) {
+            $this->dao->batchUpdate($stopIds, ['status' => 0]);
+        }
         return compact('list', 'count');
     }
 
diff --git a/crmeb/app/services/order/StoreOrderDeliveryServices.php b/crmeb/app/services/order/StoreOrderDeliveryServices.php
index 033f76f67..71283f9b5 100644
--- a/crmeb/app/services/order/StoreOrderDeliveryServices.php
+++ b/crmeb/app/services/order/StoreOrderDeliveryServices.php
@@ -626,7 +626,7 @@ class StoreOrderDeliveryServices extends BaseServices
             }
             $orderInfo->delivery_id = $data['delivery_id'];
         }
-        if ($data['express_record_type'] != 3) {
+        if (true) {
             $data['status'] = 1;
             $orderInfo->delivery_type = $data['delivery_type'];
             $orderInfo->delivery_name = $data['delivery_name'];
diff --git a/crmeb/app/services/order/StoreOrderInvoiceServices.php b/crmeb/app/services/order/StoreOrderInvoiceServices.php
index 440bd8c31..1528af48b 100644
--- a/crmeb/app/services/order/StoreOrderInvoiceServices.php
+++ b/crmeb/app/services/order/StoreOrderInvoiceServices.php
@@ -271,7 +271,7 @@ class StoreOrderInvoiceServices extends BaseServices
             $data['tax_id'] = '';
             $data['is_enterprise'] = 0;
         } else {
-            $data['invoice_type'] = 81;
+            $data['invoice_type'] = $info['type'] == 1 ? 82 : 81;
             $data['tax_id'] = $info['duty_number'];
             $data['is_enterprise'] = 1;
         }
diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php
index d2f8206cf..cbf9a2ec6 100644
--- a/crmeb/app/services/order/StoreOrderServices.php
+++ b/crmeb/app/services/order/StoreOrderServices.php
@@ -796,6 +796,15 @@ HTML;
             if ($order['two_brokerage'] > 0) {
                 $data['two_brokerage'] = bcmul((string)$order['two_brokerage'], $percent, 2);
             }
+            if ($order['staff_brokerage'] > 0) {
+                $data['staff_brokerage'] = bcmul((string)$order['staff_brokerage'], $percent, 2);
+            }
+            if ($order['agent_brokerage'] > 0) {
+                $data['agent_brokerage'] = bcmul((string)$order['agent_brokerage'], $percent, 2);
+            }
+            if ($order['division_brokerage'] > 0) {
+                $data['division_brokerage'] = bcmul((string)$order['division_brokerage'], $percent, 2);
+            }
         }
         /** @var StoreOrderStatusServices $services */
         $services = app()->make(StoreOrderStatusServices::class);
@@ -2582,7 +2591,7 @@ HTML;
         }
         // 判断是否开启小程序订单管理
         $orderData['order_shipping_open'] = false;
-        if (sys_config('order_shipping_open', 0) && $order['is_channel'] == 1 && $order['pay_type'] == 'weixin' && MiniOrderService::isManaged()) {
+        if (sys_config('order_shipping_open', 0) && $order['pay_price'] > 0 && $order['is_channel'] == 1 && $order['pay_type'] == 'weixin' && MiniOrderService::isManaged()) {
             // 判断是否存在子未收货子订单
             if ($order['pid'] > 0) {
                 if ($this->checkSubOrderNotTake((int)$order['pid'], (int)$order['id'])) {
diff --git a/crmeb/app/services/order/StoreOrderTakeServices.php b/crmeb/app/services/order/StoreOrderTakeServices.php
index 490ce3bce..be8337b35 100644
--- a/crmeb/app/services/order/StoreOrderTakeServices.php
+++ b/crmeb/app/services/order/StoreOrderTakeServices.php
@@ -572,7 +572,7 @@ class StoreOrderTakeServices extends BaseServices
         //自定义事件-佣金到账
         event('CustomEventListener', ['order_brokerage', [
             'uid' => $spread_uid,
-            'order_id' => $orderInfo['order_id'],
+            'order_id' => $orderInfo['order_id'] ?? '',
             'phone' => $spreadPhone,
             'brokeragePrice' => $brokeragePrice,
             'goodsName' => $goodsName,
diff --git a/crmeb/app/services/other/export/ExportServices.php b/crmeb/app/services/other/export/ExportServices.php
index 7145d4d00..d2c759620 100644
--- a/crmeb/app/services/other/export/ExportServices.php
+++ b/crmeb/app/services/other/export/ExportServices.php
@@ -218,7 +218,7 @@ class ExportServices extends BaseServices
         $export = $fileKey = [];
         /** @var StoreOrderServices $orderServices */
         $orderServices = app()->make(StoreOrderServices::class);
-        $data = $orderServices->getOrderList(['status' => 1, 'shipping_type' => 1])['data'];
+        $data = $orderServices->getOrderList(['status' => 1, 'shipping_type' => 1, 'virtual_type' => 0])['data'];
         if (!empty($data)) {
             $i = 0;
             foreach ($data as $item) {
diff --git a/crmeb/app/services/system/config/SystemConfigServices.php b/crmeb/app/services/system/config/SystemConfigServices.php
index 183d8df7e..d69deacd2 100644
--- a/crmeb/app/services/system/config/SystemConfigServices.php
+++ b/crmeb/app/services/system/config/SystemConfigServices.php
@@ -782,6 +782,27 @@ class SystemConfigServices extends BaseServices
                             }
                             $i++;
                         }
+                    } else {
+                        $sonData = $this->dao->getColumn(['level' => 1, 'link_id' => $data['id']], 'menu_name,link_value');
+                        if ($sonData) {
+                            $sonValue = [];
+                            foreach ($sonData as $sv) {
+                                $sonValue[$sv['link_value']][] = $sv['menu_name'];
+                            }
+                            $i = 0;
+                            foreach ($sonValue as $pk => $pv) {
+                                $label = $data['menu_name'];
+                                if ($i == 1) $label = $data['menu_name'] . '@';
+                                if ($i == 2) $label = $data['menu_name'] . '#';
+                                if (!isset($relateRule[$label])) {
+                                    $relateRule[$label]['show_value'] = (int)$pk;
+                                }
+                                foreach ($pv as $pvv) {
+                                    $relateRule[$label]['son_type'][$pvv] = '';
+                                }
+                                $i++;
+                            }
+                        }
                     }
                     if (isset($relateRule[$key])) {
                         $role = $relateRule[$key];
diff --git a/crmeb/app/services/user/UserExtractServices.php b/crmeb/app/services/user/UserExtractServices.php
index 311f6e347..f141934f8 100644
--- a/crmeb/app/services/user/UserExtractServices.php
+++ b/crmeb/app/services/user/UserExtractServices.php
@@ -96,6 +96,7 @@ class UserExtractServices extends BaseServices
         $list = $this->dao->getExtractList($where, $field, $page, $limit);
         foreach ($list as &$item) {
             $item['nickname'] = $item['user']['nickname'] ?? '';
+            $item['receive_price'] = bcsub((string)$item['extract_price'], (string)$item['extract_fee'], 2);
         }
         $count = $this->dao->count($where);
         return compact('list', 'count');

From ddb7e29034a99145c2a99d588c6b422b849f8e7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Mon, 15 Jul 2024 14:30:23 +0800
Subject: [PATCH 2/5] =?UTF-8?q?Revert=20"=E3=80=90=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E3=80=91=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3ef09698c81d19303bcf932d8176c88840aefe98.
---
 .../adminapi/controller/UpgradeController.php |  4 ++--
 .../adminapi/controller/v1/agent/Division.php | 12 +++++------
 .../controller/v1/marketing/StoreBargain.php  |  9 +-------
 .../v1/marketing/StoreCombination.php         |  6 ------
 .../controller/v1/marketing/StoreSeckill.php  |  6 ------
 .../controller/v1/order/StoreOrderInvoice.php |  2 +-
 .../v1/order/StoreOrderController.php         |  2 +-
 crmeb/app/model/order/StoreOrder.php          |  5 -----
 .../model/product/product/StoreCategory.php   |  2 +-
 .../model/product/product/StoreProduct.php    |  2 +-
 .../activity/bargain/StoreBargainServices.php | 16 ++++----------
 .../combination/StoreCombinationServices.php  | 16 ++++----------
 .../activity/seckill/StoreSeckillServices.php | 12 +++--------
 .../order/StoreOrderDeliveryServices.php      |  2 +-
 .../order/StoreOrderInvoiceServices.php       |  2 +-
 .../app/services/order/StoreOrderServices.php | 11 +---------
 .../services/order/StoreOrderTakeServices.php |  2 +-
 .../services/other/export/ExportServices.php  |  2 +-
 .../system/config/SystemConfigServices.php    | 21 -------------------
 .../app/services/user/UserExtractServices.php |  1 -
 20 files changed, 28 insertions(+), 107 deletions(-)

diff --git a/crmeb/app/adminapi/controller/UpgradeController.php b/crmeb/app/adminapi/controller/UpgradeController.php
index 101e141e8..1d4eea624 100644
--- a/crmeb/app/adminapi/controller/UpgradeController.php
+++ b/crmeb/app/adminapi/controller/UpgradeController.php
@@ -734,8 +734,8 @@ class UpgradeController
      */
     public function upData()
     {
-        $data['new_version'] = 'CRMEB-BZ v5.4.0';
-        $data['new_code'] = '540.1';
+        $data['new_version'] = 'CRMEB-BZ-BETA v5.4.0';
+        $data['new_code'] = '540';
         $data['update_sql'] = [
             [
                 'code' => '540',
diff --git a/crmeb/app/adminapi/controller/v1/agent/Division.php b/crmeb/app/adminapi/controller/v1/agent/Division.php
index 6ef00f73a..59a1fdda1 100644
--- a/crmeb/app/adminapi/controller/v1/agent/Division.php
+++ b/crmeb/app/adminapi/controller/v1/agent/Division.php
@@ -141,13 +141,11 @@ class Division extends AuthController
         if ((int)$data['uid'] == 0) $data['uid'] = $data['image']['uid'];
         $userInfo = $userServices->getUserInfo($data['uid'], 'is_division,is_agent,is_staff');
         if (!$userInfo) throw new AdminException(100100);
-        if ($data['edit'] == 0) {
-            if ($userInfo['is_division']) throw new AdminException('此用户是事业部，请勿添加为代理商');
-            if ($userInfo['is_agent']) throw new AdminException('此用户是代理商，无法重复添加');
-            if ($userInfo['is_staff']) throw new AdminException('此用户是下级员工，无法添加为代理商');
-            $divisionUserInfo = $userServices->count(['uid' => (int)$data['division_id'], 'is_division' => 1, 'division_id' => $data['division_id']]);
-            if (!$divisionUserInfo) throw new AdminException(100100);
-        }
+        if ($userInfo['is_division']) throw new AdminException('此用户是事业部，请勿添加为代理商');
+        if ($userInfo['is_agent']) throw new AdminException('此用户是代理商，无法重复添加');
+        if ($userInfo['is_staff']) throw new AdminException('此用户是下级员工，无法添加为代理商');
+        $divisionUserInfo = $userServices->count(['uid' => (int)$data['division_id'], 'is_division' => 1, 'division_id' => $data['division_id']]);
+        if (!$divisionUserInfo) throw new AdminException(100100);
         $this->services->divisionAgentSave($data);
         return app('json')->success(100000);
     }
diff --git a/crmeb/app/adminapi/controller/v1/marketing/StoreBargain.php b/crmeb/app/adminapi/controller/v1/marketing/StoreBargain.php
index 219e2c031..3a4a6f239 100644
--- a/crmeb/app/adminapi/controller/v1/marketing/StoreBargain.php
+++ b/crmeb/app/adminapi/controller/v1/marketing/StoreBargain.php
@@ -153,14 +153,7 @@ class StoreBargain extends AuthController
     {
         /** @var StoreBargainUserServices $bargainUserService */
         $bargainUserService = app()->make(StoreBargainUserServices::class);
-        if ($status == 0) {
-            $bargainUserService->userBargainStatusFail($id, false);
-        } else {
-            $info = $this->services->get($id);
-            if ($info['stop_time'] < time()) {
-                return app('json')->fail('活动已结束，无法继续上架');
-            }
-        }
+        $bargainUserService->userBargainStatusFail($id, false);
         $this->services->update($id, ['status' => $status]);
         return app('json')->success(100001);
     }
diff --git a/crmeb/app/adminapi/controller/v1/marketing/StoreCombination.php b/crmeb/app/adminapi/controller/v1/marketing/StoreCombination.php
index 5abb0e2c1..242026e63 100644
--- a/crmeb/app/adminapi/controller/v1/marketing/StoreCombination.php
+++ b/crmeb/app/adminapi/controller/v1/marketing/StoreCombination.php
@@ -161,12 +161,6 @@ class StoreCombination extends AuthController
      */
     public function set_status($id, $status)
     {
-        if ($status == 1) {
-            $info = $this->services->get($id);
-            if ($info['stop_time'] < time()) {
-                return app('json')->fail('活动已结束，无法继续上架');
-            }
-        }
         $this->services->update($id, ['is_show' => $status]);
         return app('json')->success($status == 0 ? 100014 : 100015);
     }
diff --git a/crmeb/app/adminapi/controller/v1/marketing/StoreSeckill.php b/crmeb/app/adminapi/controller/v1/marketing/StoreSeckill.php
index 0b7ac261c..a8f463e8c 100644
--- a/crmeb/app/adminapi/controller/v1/marketing/StoreSeckill.php
+++ b/crmeb/app/adminapi/controller/v1/marketing/StoreSeckill.php
@@ -120,12 +120,6 @@ class StoreSeckill extends AuthController
      */
     public function set_status($id, $status)
     {
-        if ($status == 1) {
-            $info = $this->services->get($id);
-            if ($info['stop_time'] < time()) {
-                return app('json')->fail('活动已结束，无法继续上架');
-            }
-        }
         $this->services->update($id, ['status' => $status]);
         return app('json')->success(100014);
     }
diff --git a/crmeb/app/adminapi/controller/v1/order/StoreOrderInvoice.php b/crmeb/app/adminapi/controller/v1/order/StoreOrderInvoice.php
index f893fb86d..8885b8784 100644
--- a/crmeb/app/adminapi/controller/v1/order/StoreOrderInvoice.php
+++ b/crmeb/app/adminapi/controller/v1/order/StoreOrderInvoice.php
@@ -193,7 +193,7 @@ class StoreOrderInvoice extends AuthController
             $data['invoice_type'] = 82;
             $data['is_enterprise'] = 0;
         } else {
-            $data['invoice_type'] = $info['type'] == 1 ? 82 : 81;
+            $data['invoice_type'] = 81;
             $data['tax_id'] = $info['duty_number'];
             $data['is_enterprise'] = 1;
         }
diff --git a/crmeb/app/api/controller/v1/order/StoreOrderController.php b/crmeb/app/api/controller/v1/order/StoreOrderController.php
index bded23dc2..042a6a5d3 100644
--- a/crmeb/app/api/controller/v1/order/StoreOrderController.php
+++ b/crmeb/app/api/controller/v1/order/StoreOrderController.php
@@ -267,7 +267,7 @@ class StoreOrderController
             //创建订单jspay支付
             /** @var StoreOrderSuccessServices $success */
             $success = app()->make(StoreOrderSuccessServices::class);
-            $payPriceStatus = $success->zeroYuanPayment($orderInfo, $uid);
+            $payPriceStatus = $success->zeroYuanPayment($orderInfo, $uid, $paytype);
             if ($payPriceStatus)//0元支付成功
                 return app('json')->status('success', '支付成功', ['order_id' => $orderInfo['order_id'], 'key' => $orderInfo['unique']]);
             else
diff --git a/crmeb/app/model/order/StoreOrder.php b/crmeb/app/model/order/StoreOrder.php
index 3d015e554..2e1d6fef1 100644
--- a/crmeb/app/model/order/StoreOrder.php
+++ b/crmeb/app/model/order/StoreOrder.php
@@ -634,9 +634,4 @@ class StoreOrder extends BaseModel
     {
         $query->where('agent_brokerage', '>', $value);
     }
-
-    public function searchVirtualTypeAttr($query, $value)
-    {
-        if ($value !== '') $query->where('virtual_type', $value);
-    }
 }
diff --git a/crmeb/app/model/product/product/StoreCategory.php b/crmeb/app/model/product/product/StoreCategory.php
index 82ad93cc4..b8d4a767c 100644
--- a/crmeb/app/model/product/product/StoreCategory.php
+++ b/crmeb/app/model/product/product/StoreCategory.php
@@ -96,6 +96,6 @@ class StoreCategory extends BaseModel
      */
     public function searchIdAttr($query, $value, $data)
     {
-        if ($value) $query->whereIn('id', is_array($value) ? $value : (string)$value);
+        if ($value) $query->whereIn('id', $value);
     }
 }
diff --git a/crmeb/app/model/product/product/StoreProduct.php b/crmeb/app/model/product/product/StoreProduct.php
index 8180fbd94..f8803e582 100644
--- a/crmeb/app/model/product/product/StoreProduct.php
+++ b/crmeb/app/model/product/product/StoreProduct.php
@@ -311,7 +311,7 @@ class StoreProduct extends BaseModel
                 $query->where(['is_show' => 0, 'is_del' => 0]);
                 break;
             case 3:
-                $query->where(['is_del' => 0, 'vip_product' => 0]);
+                $query->where(['is_del' => 0]);
                 break;
             case 4:
                 $query->where(['is_del' => 0])->where(function ($query) {
diff --git a/crmeb/app/services/activity/bargain/StoreBargainServices.php b/crmeb/app/services/activity/bargain/StoreBargainServices.php
index a087a8d2a..2e5e9642e 100644
--- a/crmeb/app/services/activity/bargain/StoreBargainServices.php
+++ b/crmeb/app/services/activity/bargain/StoreBargainServices.php
@@ -100,28 +100,20 @@ class StoreBargainServices extends BaseServices
         /** @var StoreBargainUserHelpServices $storeBargainUserHelpServices */
         $storeBargainUserHelpServices = app()->make(StoreBargainUserHelpServices::class);
         $countHelpAll = $storeBargainUserHelpServices->getHelpAllCount([['bargain_id', 'in', $ids]]);
-        $stopIds = [];
         foreach ($list as &$item) {
             $item['count_people_all'] = $countAll[$item['id']] ?? 0;//参与人数
             $item['count_people_help'] = $countHelpAll[$item['id']] ?? 0;//帮忙砍价人数
             $item['count_people_success'] = $countSuccess[$item['id']] ?? 0;//砍价成功人数
             $item['stop_status'] = $item['stop_time'] < time() ? 1 : 0;
             if ($item['status']) {
-                if ($item['start_time'] > time()) {
+                if ($item['start_time'] > time())
                     $item['start_name'] = '未开始';
-                } else if ($item['stop_time'] < time()) {
+                else if ($item['stop_time'] < time())
                     $item['start_name'] = '已结束';
-                    $item['status'] = 0;
-                    $stopIds[] = $item['id'];
-                } else if ($item['stop_time'] > time() && $item['start_time'] < time()) {
+                else if ($item['stop_time'] > time() && $item['start_time'] < time()) {
                     $item['start_name'] = '进行中';
                 }
-            } else {
-                $item['start_name'] = '已结束';
-            }
-        }
-        if ($stopIds) {
-            $this->dao->batchUpdate($stopIds, ['status' => 0]);
+            } else $item['start_name'] = '已结束';
         }
         return compact('list', 'count');
     }
diff --git a/crmeb/app/services/activity/combination/StoreCombinationServices.php b/crmeb/app/services/activity/combination/StoreCombinationServices.php
index 4260e6529..23f054866 100644
--- a/crmeb/app/services/activity/combination/StoreCombinationServices.php
+++ b/crmeb/app/services/activity/combination/StoreCombinationServices.php
@@ -136,28 +136,20 @@ class StoreCombinationServices extends BaseServices
         $countAll = $storePinkServices->getPinkCount([]);
         $countTeam = $storePinkServices->getPinkCount(['k_id' => 0, 'status' => 2]);
         $countPeople = $storePinkServices->getPinkCount(['k_id' => 0]);
-        $stopIds = [];
         foreach ($list as &$item) {
             $item['count_people'] = $countPeople[$item['id']] ?? 0;//拼团数量
             $item['count_people_all'] = $countAll[$item['id']] ?? 0;//参与人数
             $item['count_people_pink'] = $countTeam[$item['id']] ?? 0;//成团数量
             $item['stop_status'] = $item['stop_time'] < time() ? 1 : 0;
             if ($item['is_show']) {
-                if ($item['start_time'] > time()) {
+                if ($item['start_time'] > time())
                     $item['start_name'] = '未开始';
-                } else if ($item['stop_time'] < time()) {
+                else if ($item['stop_time'] < time())
                     $item['start_name'] = '已结束';
-                    $item['is_show'] = 0;
-                    $stopIds[] = $item['id'];
-                } else if ($item['stop_time'] > time() && $item['start_time'] < time()) {
+                else if ($item['stop_time'] > time() && $item['start_time'] < time()) {
                     $item['start_name'] = '进行中';
                 }
-            } else {
-                $item['start_name'] = '已结束';
-            }
-        }
-        if ($stopIds) {
-            $this->dao->batchUpdate($stopIds, ['is_show' => 0]);
+            } else $item['start_name'] = '已结束';
         }
         return compact('list', 'count');
     }
diff --git a/crmeb/app/services/activity/seckill/StoreSeckillServices.php b/crmeb/app/services/activity/seckill/StoreSeckillServices.php
index bbcb33757..c77674112 100644
--- a/crmeb/app/services/activity/seckill/StoreSeckillServices.php
+++ b/crmeb/app/services/activity/seckill/StoreSeckillServices.php
@@ -206,17 +206,14 @@ class StoreSeckillServices extends BaseServices
         [$page, $limit] = $this->getPageValue();
         $list = $this->dao->getList($where, $page, $limit);
         $count = $this->dao->count($where + ['is_del' => 0]);
-        $stopIds = [];
         foreach ($list as &$item) {
             $item['store_name'] = $item['title'];
             if ($item['status']) {
-                if ($item['start_time'] > time()) {
+                if ($item['start_time'] > time())
                     $item['start_name'] = '未开始';
-                } else if (bcadd($item['stop_time'], '86400') < time()) {
+                else if (bcadd($item['stop_time'], '86400') < time())
                     $item['start_name'] = '已结束';
-                    $item['status'] = 0;
-                    $stopIds[] = $item['id'];
-                } else if (bcadd($item['stop_time'], '86400') > time() && $item['start_time'] < time()) {
+                else if (bcadd($item['stop_time'], '86400') > time() && $item['start_time'] < time()) {
                     $item['start_name'] = '进行中';
                 }
             } else $item['start_name'] = '已结束';
@@ -224,9 +221,6 @@ class StoreSeckillServices extends BaseServices
             $item['_stop_time'] = $end_time;
             $item['stop_status'] = $item['stop_time'] + 86400 < time() ? 1 : 0;
         }
-        if ($stopIds) {
-            $this->dao->batchUpdate($stopIds, ['status' => 0]);
-        }
         return compact('list', 'count');
     }
 
diff --git a/crmeb/app/services/order/StoreOrderDeliveryServices.php b/crmeb/app/services/order/StoreOrderDeliveryServices.php
index 71283f9b5..033f76f67 100644
--- a/crmeb/app/services/order/StoreOrderDeliveryServices.php
+++ b/crmeb/app/services/order/StoreOrderDeliveryServices.php
@@ -626,7 +626,7 @@ class StoreOrderDeliveryServices extends BaseServices
             }
             $orderInfo->delivery_id = $data['delivery_id'];
         }
-        if (true) {
+        if ($data['express_record_type'] != 3) {
             $data['status'] = 1;
             $orderInfo->delivery_type = $data['delivery_type'];
             $orderInfo->delivery_name = $data['delivery_name'];
diff --git a/crmeb/app/services/order/StoreOrderInvoiceServices.php b/crmeb/app/services/order/StoreOrderInvoiceServices.php
index 1528af48b..440bd8c31 100644
--- a/crmeb/app/services/order/StoreOrderInvoiceServices.php
+++ b/crmeb/app/services/order/StoreOrderInvoiceServices.php
@@ -271,7 +271,7 @@ class StoreOrderInvoiceServices extends BaseServices
             $data['tax_id'] = '';
             $data['is_enterprise'] = 0;
         } else {
-            $data['invoice_type'] = $info['type'] == 1 ? 82 : 81;
+            $data['invoice_type'] = 81;
             $data['tax_id'] = $info['duty_number'];
             $data['is_enterprise'] = 1;
         }
diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php
index cbf9a2ec6..d2f8206cf 100644
--- a/crmeb/app/services/order/StoreOrderServices.php
+++ b/crmeb/app/services/order/StoreOrderServices.php
@@ -796,15 +796,6 @@ HTML;
             if ($order['two_brokerage'] > 0) {
                 $data['two_brokerage'] = bcmul((string)$order['two_brokerage'], $percent, 2);
             }
-            if ($order['staff_brokerage'] > 0) {
-                $data['staff_brokerage'] = bcmul((string)$order['staff_brokerage'], $percent, 2);
-            }
-            if ($order['agent_brokerage'] > 0) {
-                $data['agent_brokerage'] = bcmul((string)$order['agent_brokerage'], $percent, 2);
-            }
-            if ($order['division_brokerage'] > 0) {
-                $data['division_brokerage'] = bcmul((string)$order['division_brokerage'], $percent, 2);
-            }
         }
         /** @var StoreOrderStatusServices $services */
         $services = app()->make(StoreOrderStatusServices::class);
@@ -2591,7 +2582,7 @@ HTML;
         }
         // 判断是否开启小程序订单管理
         $orderData['order_shipping_open'] = false;
-        if (sys_config('order_shipping_open', 0) && $order['pay_price'] > 0 && $order['is_channel'] == 1 && $order['pay_type'] == 'weixin' && MiniOrderService::isManaged()) {
+        if (sys_config('order_shipping_open', 0) && $order['is_channel'] == 1 && $order['pay_type'] == 'weixin' && MiniOrderService::isManaged()) {
             // 判断是否存在子未收货子订单
             if ($order['pid'] > 0) {
                 if ($this->checkSubOrderNotTake((int)$order['pid'], (int)$order['id'])) {
diff --git a/crmeb/app/services/order/StoreOrderTakeServices.php b/crmeb/app/services/order/StoreOrderTakeServices.php
index be8337b35..490ce3bce 100644
--- a/crmeb/app/services/order/StoreOrderTakeServices.php
+++ b/crmeb/app/services/order/StoreOrderTakeServices.php
@@ -572,7 +572,7 @@ class StoreOrderTakeServices extends BaseServices
         //自定义事件-佣金到账
         event('CustomEventListener', ['order_brokerage', [
             'uid' => $spread_uid,
-            'order_id' => $orderInfo['order_id'] ?? '',
+            'order_id' => $orderInfo['order_id'],
             'phone' => $spreadPhone,
             'brokeragePrice' => $brokeragePrice,
             'goodsName' => $goodsName,
diff --git a/crmeb/app/services/other/export/ExportServices.php b/crmeb/app/services/other/export/ExportServices.php
index d2c759620..7145d4d00 100644
--- a/crmeb/app/services/other/export/ExportServices.php
+++ b/crmeb/app/services/other/export/ExportServices.php
@@ -218,7 +218,7 @@ class ExportServices extends BaseServices
         $export = $fileKey = [];
         /** @var StoreOrderServices $orderServices */
         $orderServices = app()->make(StoreOrderServices::class);
-        $data = $orderServices->getOrderList(['status' => 1, 'shipping_type' => 1, 'virtual_type' => 0])['data'];
+        $data = $orderServices->getOrderList(['status' => 1, 'shipping_type' => 1])['data'];
         if (!empty($data)) {
             $i = 0;
             foreach ($data as $item) {
diff --git a/crmeb/app/services/system/config/SystemConfigServices.php b/crmeb/app/services/system/config/SystemConfigServices.php
index d69deacd2..183d8df7e 100644
--- a/crmeb/app/services/system/config/SystemConfigServices.php
+++ b/crmeb/app/services/system/config/SystemConfigServices.php
@@ -782,27 +782,6 @@ class SystemConfigServices extends BaseServices
                             }
                             $i++;
                         }
-                    } else {
-                        $sonData = $this->dao->getColumn(['level' => 1, 'link_id' => $data['id']], 'menu_name,link_value');
-                        if ($sonData) {
-                            $sonValue = [];
-                            foreach ($sonData as $sv) {
-                                $sonValue[$sv['link_value']][] = $sv['menu_name'];
-                            }
-                            $i = 0;
-                            foreach ($sonValue as $pk => $pv) {
-                                $label = $data['menu_name'];
-                                if ($i == 1) $label = $data['menu_name'] . '@';
-                                if ($i == 2) $label = $data['menu_name'] . '#';
-                                if (!isset($relateRule[$label])) {
-                                    $relateRule[$label]['show_value'] = (int)$pk;
-                                }
-                                foreach ($pv as $pvv) {
-                                    $relateRule[$label]['son_type'][$pvv] = '';
-                                }
-                                $i++;
-                            }
-                        }
                     }
                     if (isset($relateRule[$key])) {
                         $role = $relateRule[$key];
diff --git a/crmeb/app/services/user/UserExtractServices.php b/crmeb/app/services/user/UserExtractServices.php
index f141934f8..311f6e347 100644
--- a/crmeb/app/services/user/UserExtractServices.php
+++ b/crmeb/app/services/user/UserExtractServices.php
@@ -96,7 +96,6 @@ class UserExtractServices extends BaseServices
         $list = $this->dao->getExtractList($where, $field, $page, $limit);
         foreach ($list as &$item) {
             $item['nickname'] = $item['user']['nickname'] ?? '';
-            $item['receive_price'] = bcsub((string)$item['extract_price'], (string)$item['extract_fee'], 2);
         }
         $count = $this->dao->count($where);
         return compact('list', 'count');

From 35e9a80d9f4e2a8b3a6ebf4141e336dd06adf2ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Mon, 15 Jul 2024 14:32:40 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90=E7=A8=8B=E5=BA=8F=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E3=80=91=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adminapi/controller/UpgradeController.php |  4 ++--
 .../adminapi/controller/v1/agent/Division.php | 12 ++++++-----
 .../controller/v1/marketing/StoreBargain.php  |  9 +++++++-
 .../v1/marketing/StoreCombination.php         |  6 ++++++
 .../controller/v1/marketing/StoreSeckill.php  |  6 ++++++
 .../controller/v1/order/StoreOrderInvoice.php |  2 +-
 .../v1/order/StoreOrderController.php         |  2 +-
 crmeb/app/model/order/StoreOrder.php          |  5 +++++
 .../model/product/product/StoreCategory.php   |  2 +-
 .../model/product/product/StoreProduct.php    |  2 +-
 .../activity/bargain/StoreBargainServices.php | 16 ++++++++++----
 .../combination/StoreCombinationServices.php  | 16 ++++++++++----
 .../activity/seckill/StoreSeckillServices.php | 12 ++++++++---
 .../order/StoreOrderDeliveryServices.php      |  2 +-
 .../order/StoreOrderInvoiceServices.php       |  2 +-
 .../app/services/order/StoreOrderServices.php | 11 +++++++++-
 .../services/order/StoreOrderTakeServices.php |  2 +-
 .../services/other/export/ExportServices.php  |  2 +-
 .../system/config/SystemConfigServices.php    | 21 +++++++++++++++++++
 .../app/services/user/UserExtractServices.php |  1 +
 20 files changed, 107 insertions(+), 28 deletions(-)

diff --git a/crmeb/app/adminapi/controller/UpgradeController.php b/crmeb/app/adminapi/controller/UpgradeController.php
index 1d4eea624..101e141e8 100644
--- a/crmeb/app/adminapi/controller/UpgradeController.php
+++ b/crmeb/app/adminapi/controller/UpgradeController.php
@@ -734,8 +734,8 @@ class UpgradeController
      */
     public function upData()
     {
-        $data['new_version'] = 'CRMEB-BZ-BETA v5.4.0';
-        $data['new_code'] = '540';
+        $data['new_version'] = 'CRMEB-BZ v5.4.0';
+        $data['new_code'] = '540.1';
         $data['update_sql'] = [
             [
                 'code' => '540',
diff --git a/crmeb/app/adminapi/controller/v1/agent/Division.php b/crmeb/app/adminapi/controller/v1/agent/Division.php
index 59a1fdda1..6ef00f73a 100644
--- a/crmeb/app/adminapi/controller/v1/agent/Division.php
+++ b/crmeb/app/adminapi/controller/v1/agent/Division.php
@@ -141,11 +141,13 @@ class Division extends AuthController
         if ((int)$data['uid'] == 0) $data['uid'] = $data['image']['uid'];
         $userInfo = $userServices->getUserInfo($data['uid'], 'is_division,is_agent,is_staff');
         if (!$userInfo) throw new AdminException(100100);
-        if ($userInfo['is_division']) throw new AdminException('此用户是事业部，请勿添加为代理商');
-        if ($userInfo['is_agent']) throw new AdminException('此用户是代理商，无法重复添加');
-        if ($userInfo['is_staff']) throw new AdminException('此用户是下级员工，无法添加为代理商');
-        $divisionUserInfo = $userServices->count(['uid' => (int)$data['division_id'], 'is_division' => 1, 'division_id' => $data['division_id']]);
-        if (!$divisionUserInfo) throw new AdminException(100100);
+        if ($data['edit'] == 0) {
+            if ($userInfo['is_division']) throw new AdminException('此用户是事业部，请勿添加为代理商');
+            if ($userInfo['is_agent']) throw new AdminException('此用户是代理商，无法重复添加');
+            if ($userInfo['is_staff']) throw new AdminException('此用户是下级员工，无法添加为代理商');
+            $divisionUserInfo = $userServices->count(['uid' => (int)$data['division_id'], 'is_division' => 1, 'division_id' => $data['division_id']]);
+            if (!$divisionUserInfo) throw new AdminException(100100);
+        }
         $this->services->divisionAgentSave($data);
         return app('json')->success(100000);
     }
diff --git a/crmeb/app/adminapi/controller/v1/marketing/StoreBargain.php b/crmeb/app/adminapi/controller/v1/marketing/StoreBargain.php
index 3a4a6f239..219e2c031 100644
--- a/crmeb/app/adminapi/controller/v1/marketing/StoreBargain.php
+++ b/crmeb/app/adminapi/controller/v1/marketing/StoreBargain.php
@@ -153,7 +153,14 @@ class StoreBargain extends AuthController
     {
         /** @var StoreBargainUserServices $bargainUserService */
         $bargainUserService = app()->make(StoreBargainUserServices::class);
-        $bargainUserService->userBargainStatusFail($id, false);
+        if ($status == 0) {
+            $bargainUserService->userBargainStatusFail($id, false);
+        } else {
+            $info = $this->services->get($id);
+            if ($info['stop_time'] < time()) {
+                return app('json')->fail('活动已结束，无法继续上架');
+            }
+        }
         $this->services->update($id, ['status' => $status]);
         return app('json')->success(100001);
     }
diff --git a/crmeb/app/adminapi/controller/v1/marketing/StoreCombination.php b/crmeb/app/adminapi/controller/v1/marketing/StoreCombination.php
index 242026e63..5abb0e2c1 100644
--- a/crmeb/app/adminapi/controller/v1/marketing/StoreCombination.php
+++ b/crmeb/app/adminapi/controller/v1/marketing/StoreCombination.php
@@ -161,6 +161,12 @@ class StoreCombination extends AuthController
      */
     public function set_status($id, $status)
     {
+        if ($status == 1) {
+            $info = $this->services->get($id);
+            if ($info['stop_time'] < time()) {
+                return app('json')->fail('活动已结束，无法继续上架');
+            }
+        }
         $this->services->update($id, ['is_show' => $status]);
         return app('json')->success($status == 0 ? 100014 : 100015);
     }
diff --git a/crmeb/app/adminapi/controller/v1/marketing/StoreSeckill.php b/crmeb/app/adminapi/controller/v1/marketing/StoreSeckill.php
index a8f463e8c..0b7ac261c 100644
--- a/crmeb/app/adminapi/controller/v1/marketing/StoreSeckill.php
+++ b/crmeb/app/adminapi/controller/v1/marketing/StoreSeckill.php
@@ -120,6 +120,12 @@ class StoreSeckill extends AuthController
      */
     public function set_status($id, $status)
     {
+        if ($status == 1) {
+            $info = $this->services->get($id);
+            if ($info['stop_time'] < time()) {
+                return app('json')->fail('活动已结束，无法继续上架');
+            }
+        }
         $this->services->update($id, ['status' => $status]);
         return app('json')->success(100014);
     }
diff --git a/crmeb/app/adminapi/controller/v1/order/StoreOrderInvoice.php b/crmeb/app/adminapi/controller/v1/order/StoreOrderInvoice.php
index 8885b8784..f893fb86d 100644
--- a/crmeb/app/adminapi/controller/v1/order/StoreOrderInvoice.php
+++ b/crmeb/app/adminapi/controller/v1/order/StoreOrderInvoice.php
@@ -193,7 +193,7 @@ class StoreOrderInvoice extends AuthController
             $data['invoice_type'] = 82;
             $data['is_enterprise'] = 0;
         } else {
-            $data['invoice_type'] = 81;
+            $data['invoice_type'] = $info['type'] == 1 ? 82 : 81;
             $data['tax_id'] = $info['duty_number'];
             $data['is_enterprise'] = 1;
         }
diff --git a/crmeb/app/api/controller/v1/order/StoreOrderController.php b/crmeb/app/api/controller/v1/order/StoreOrderController.php
index 042a6a5d3..bded23dc2 100644
--- a/crmeb/app/api/controller/v1/order/StoreOrderController.php
+++ b/crmeb/app/api/controller/v1/order/StoreOrderController.php
@@ -267,7 +267,7 @@ class StoreOrderController
             //创建订单jspay支付
             /** @var StoreOrderSuccessServices $success */
             $success = app()->make(StoreOrderSuccessServices::class);
-            $payPriceStatus = $success->zeroYuanPayment($orderInfo, $uid, $paytype);
+            $payPriceStatus = $success->zeroYuanPayment($orderInfo, $uid);
             if ($payPriceStatus)//0元支付成功
                 return app('json')->status('success', '支付成功', ['order_id' => $orderInfo['order_id'], 'key' => $orderInfo['unique']]);
             else
diff --git a/crmeb/app/model/order/StoreOrder.php b/crmeb/app/model/order/StoreOrder.php
index 2e1d6fef1..3d015e554 100644
--- a/crmeb/app/model/order/StoreOrder.php
+++ b/crmeb/app/model/order/StoreOrder.php
@@ -634,4 +634,9 @@ class StoreOrder extends BaseModel
     {
         $query->where('agent_brokerage', '>', $value);
     }
+
+    public function searchVirtualTypeAttr($query, $value)
+    {
+        if ($value !== '') $query->where('virtual_type', $value);
+    }
 }
diff --git a/crmeb/app/model/product/product/StoreCategory.php b/crmeb/app/model/product/product/StoreCategory.php
index b8d4a767c..82ad93cc4 100644
--- a/crmeb/app/model/product/product/StoreCategory.php
+++ b/crmeb/app/model/product/product/StoreCategory.php
@@ -96,6 +96,6 @@ class StoreCategory extends BaseModel
      */
     public function searchIdAttr($query, $value, $data)
     {
-        if ($value) $query->whereIn('id', $value);
+        if ($value) $query->whereIn('id', is_array($value) ? $value : (string)$value);
     }
 }
diff --git a/crmeb/app/model/product/product/StoreProduct.php b/crmeb/app/model/product/product/StoreProduct.php
index f8803e582..8180fbd94 100644
--- a/crmeb/app/model/product/product/StoreProduct.php
+++ b/crmeb/app/model/product/product/StoreProduct.php
@@ -311,7 +311,7 @@ class StoreProduct extends BaseModel
                 $query->where(['is_show' => 0, 'is_del' => 0]);
                 break;
             case 3:
-                $query->where(['is_del' => 0]);
+                $query->where(['is_del' => 0, 'vip_product' => 0]);
                 break;
             case 4:
                 $query->where(['is_del' => 0])->where(function ($query) {
diff --git a/crmeb/app/services/activity/bargain/StoreBargainServices.php b/crmeb/app/services/activity/bargain/StoreBargainServices.php
index 2e5e9642e..a087a8d2a 100644
--- a/crmeb/app/services/activity/bargain/StoreBargainServices.php
+++ b/crmeb/app/services/activity/bargain/StoreBargainServices.php
@@ -100,20 +100,28 @@ class StoreBargainServices extends BaseServices
         /** @var StoreBargainUserHelpServices $storeBargainUserHelpServices */
         $storeBargainUserHelpServices = app()->make(StoreBargainUserHelpServices::class);
         $countHelpAll = $storeBargainUserHelpServices->getHelpAllCount([['bargain_id', 'in', $ids]]);
+        $stopIds = [];
         foreach ($list as &$item) {
             $item['count_people_all'] = $countAll[$item['id']] ?? 0;//参与人数
             $item['count_people_help'] = $countHelpAll[$item['id']] ?? 0;//帮忙砍价人数
             $item['count_people_success'] = $countSuccess[$item['id']] ?? 0;//砍价成功人数
             $item['stop_status'] = $item['stop_time'] < time() ? 1 : 0;
             if ($item['status']) {
-                if ($item['start_time'] > time())
+                if ($item['start_time'] > time()) {
                     $item['start_name'] = '未开始';
-                else if ($item['stop_time'] < time())
+                } else if ($item['stop_time'] < time()) {
                     $item['start_name'] = '已结束';
-                else if ($item['stop_time'] > time() && $item['start_time'] < time()) {
+                    $item['status'] = 0;
+                    $stopIds[] = $item['id'];
+                } else if ($item['stop_time'] > time() && $item['start_time'] < time()) {
                     $item['start_name'] = '进行中';
                 }
-            } else $item['start_name'] = '已结束';
+            } else {
+                $item['start_name'] = '已结束';
+            }
+        }
+        if ($stopIds) {
+            $this->dao->batchUpdate($stopIds, ['status' => 0]);
         }
         return compact('list', 'count');
     }
diff --git a/crmeb/app/services/activity/combination/StoreCombinationServices.php b/crmeb/app/services/activity/combination/StoreCombinationServices.php
index 23f054866..4260e6529 100644
--- a/crmeb/app/services/activity/combination/StoreCombinationServices.php
+++ b/crmeb/app/services/activity/combination/StoreCombinationServices.php
@@ -136,20 +136,28 @@ class StoreCombinationServices extends BaseServices
         $countAll = $storePinkServices->getPinkCount([]);
         $countTeam = $storePinkServices->getPinkCount(['k_id' => 0, 'status' => 2]);
         $countPeople = $storePinkServices->getPinkCount(['k_id' => 0]);
+        $stopIds = [];
         foreach ($list as &$item) {
             $item['count_people'] = $countPeople[$item['id']] ?? 0;//拼团数量
             $item['count_people_all'] = $countAll[$item['id']] ?? 0;//参与人数
             $item['count_people_pink'] = $countTeam[$item['id']] ?? 0;//成团数量
             $item['stop_status'] = $item['stop_time'] < time() ? 1 : 0;
             if ($item['is_show']) {
-                if ($item['start_time'] > time())
+                if ($item['start_time'] > time()) {
                     $item['start_name'] = '未开始';
-                else if ($item['stop_time'] < time())
+                } else if ($item['stop_time'] < time()) {
                     $item['start_name'] = '已结束';
-                else if ($item['stop_time'] > time() && $item['start_time'] < time()) {
+                    $item['is_show'] = 0;
+                    $stopIds[] = $item['id'];
+                } else if ($item['stop_time'] > time() && $item['start_time'] < time()) {
                     $item['start_name'] = '进行中';
                 }
-            } else $item['start_name'] = '已结束';
+            } else {
+                $item['start_name'] = '已结束';
+            }
+        }
+        if ($stopIds) {
+            $this->dao->batchUpdate($stopIds, ['is_show' => 0]);
         }
         return compact('list', 'count');
     }
diff --git a/crmeb/app/services/activity/seckill/StoreSeckillServices.php b/crmeb/app/services/activity/seckill/StoreSeckillServices.php
index c77674112..bbcb33757 100644
--- a/crmeb/app/services/activity/seckill/StoreSeckillServices.php
+++ b/crmeb/app/services/activity/seckill/StoreSeckillServices.php
@@ -206,14 +206,17 @@ class StoreSeckillServices extends BaseServices
         [$page, $limit] = $this->getPageValue();
         $list = $this->dao->getList($where, $page, $limit);
         $count = $this->dao->count($where + ['is_del' => 0]);
+        $stopIds = [];
         foreach ($list as &$item) {
             $item['store_name'] = $item['title'];
             if ($item['status']) {
-                if ($item['start_time'] > time())
+                if ($item['start_time'] > time()) {
                     $item['start_name'] = '未开始';
-                else if (bcadd($item['stop_time'], '86400') < time())
+                } else if (bcadd($item['stop_time'], '86400') < time()) {
                     $item['start_name'] = '已结束';
-                else if (bcadd($item['stop_time'], '86400') > time() && $item['start_time'] < time()) {
+                    $item['status'] = 0;
+                    $stopIds[] = $item['id'];
+                } else if (bcadd($item['stop_time'], '86400') > time() && $item['start_time'] < time()) {
                     $item['start_name'] = '进行中';
                 }
             } else $item['start_name'] = '已结束';
@@ -221,6 +224,9 @@ class StoreSeckillServices extends BaseServices
             $item['_stop_time'] = $end_time;
             $item['stop_status'] = $item['stop_time'] + 86400 < time() ? 1 : 0;
         }
+        if ($stopIds) {
+            $this->dao->batchUpdate($stopIds, ['status' => 0]);
+        }
         return compact('list', 'count');
     }
 
diff --git a/crmeb/app/services/order/StoreOrderDeliveryServices.php b/crmeb/app/services/order/StoreOrderDeliveryServices.php
index 033f76f67..71283f9b5 100644
--- a/crmeb/app/services/order/StoreOrderDeliveryServices.php
+++ b/crmeb/app/services/order/StoreOrderDeliveryServices.php
@@ -626,7 +626,7 @@ class StoreOrderDeliveryServices extends BaseServices
             }
             $orderInfo->delivery_id = $data['delivery_id'];
         }
-        if ($data['express_record_type'] != 3) {
+        if (true) {
             $data['status'] = 1;
             $orderInfo->delivery_type = $data['delivery_type'];
             $orderInfo->delivery_name = $data['delivery_name'];
diff --git a/crmeb/app/services/order/StoreOrderInvoiceServices.php b/crmeb/app/services/order/StoreOrderInvoiceServices.php
index 440bd8c31..1528af48b 100644
--- a/crmeb/app/services/order/StoreOrderInvoiceServices.php
+++ b/crmeb/app/services/order/StoreOrderInvoiceServices.php
@@ -271,7 +271,7 @@ class StoreOrderInvoiceServices extends BaseServices
             $data['tax_id'] = '';
             $data['is_enterprise'] = 0;
         } else {
-            $data['invoice_type'] = 81;
+            $data['invoice_type'] = $info['type'] == 1 ? 82 : 81;
             $data['tax_id'] = $info['duty_number'];
             $data['is_enterprise'] = 1;
         }
diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php
index d2f8206cf..cbf9a2ec6 100644
--- a/crmeb/app/services/order/StoreOrderServices.php
+++ b/crmeb/app/services/order/StoreOrderServices.php
@@ -796,6 +796,15 @@ HTML;
             if ($order['two_brokerage'] > 0) {
                 $data['two_brokerage'] = bcmul((string)$order['two_brokerage'], $percent, 2);
             }
+            if ($order['staff_brokerage'] > 0) {
+                $data['staff_brokerage'] = bcmul((string)$order['staff_brokerage'], $percent, 2);
+            }
+            if ($order['agent_brokerage'] > 0) {
+                $data['agent_brokerage'] = bcmul((string)$order['agent_brokerage'], $percent, 2);
+            }
+            if ($order['division_brokerage'] > 0) {
+                $data['division_brokerage'] = bcmul((string)$order['division_brokerage'], $percent, 2);
+            }
         }
         /** @var StoreOrderStatusServices $services */
         $services = app()->make(StoreOrderStatusServices::class);
@@ -2582,7 +2591,7 @@ HTML;
         }
         // 判断是否开启小程序订单管理
         $orderData['order_shipping_open'] = false;
-        if (sys_config('order_shipping_open', 0) && $order['is_channel'] == 1 && $order['pay_type'] == 'weixin' && MiniOrderService::isManaged()) {
+        if (sys_config('order_shipping_open', 0) && $order['pay_price'] > 0 && $order['is_channel'] == 1 && $order['pay_type'] == 'weixin' && MiniOrderService::isManaged()) {
             // 判断是否存在子未收货子订单
             if ($order['pid'] > 0) {
                 if ($this->checkSubOrderNotTake((int)$order['pid'], (int)$order['id'])) {
diff --git a/crmeb/app/services/order/StoreOrderTakeServices.php b/crmeb/app/services/order/StoreOrderTakeServices.php
index 490ce3bce..be8337b35 100644
--- a/crmeb/app/services/order/StoreOrderTakeServices.php
+++ b/crmeb/app/services/order/StoreOrderTakeServices.php
@@ -572,7 +572,7 @@ class StoreOrderTakeServices extends BaseServices
         //自定义事件-佣金到账
         event('CustomEventListener', ['order_brokerage', [
             'uid' => $spread_uid,
-            'order_id' => $orderInfo['order_id'],
+            'order_id' => $orderInfo['order_id'] ?? '',
             'phone' => $spreadPhone,
             'brokeragePrice' => $brokeragePrice,
             'goodsName' => $goodsName,
diff --git a/crmeb/app/services/other/export/ExportServices.php b/crmeb/app/services/other/export/ExportServices.php
index 7145d4d00..d2c759620 100644
--- a/crmeb/app/services/other/export/ExportServices.php
+++ b/crmeb/app/services/other/export/ExportServices.php
@@ -218,7 +218,7 @@ class ExportServices extends BaseServices
         $export = $fileKey = [];
         /** @var StoreOrderServices $orderServices */
         $orderServices = app()->make(StoreOrderServices::class);
-        $data = $orderServices->getOrderList(['status' => 1, 'shipping_type' => 1])['data'];
+        $data = $orderServices->getOrderList(['status' => 1, 'shipping_type' => 1, 'virtual_type' => 0])['data'];
         if (!empty($data)) {
             $i = 0;
             foreach ($data as $item) {
diff --git a/crmeb/app/services/system/config/SystemConfigServices.php b/crmeb/app/services/system/config/SystemConfigServices.php
index 183d8df7e..d69deacd2 100644
--- a/crmeb/app/services/system/config/SystemConfigServices.php
+++ b/crmeb/app/services/system/config/SystemConfigServices.php
@@ -782,6 +782,27 @@ class SystemConfigServices extends BaseServices
                             }
                             $i++;
                         }
+                    } else {
+                        $sonData = $this->dao->getColumn(['level' => 1, 'link_id' => $data['id']], 'menu_name,link_value');
+                        if ($sonData) {
+                            $sonValue = [];
+                            foreach ($sonData as $sv) {
+                                $sonValue[$sv['link_value']][] = $sv['menu_name'];
+                            }
+                            $i = 0;
+                            foreach ($sonValue as $pk => $pv) {
+                                $label = $data['menu_name'];
+                                if ($i == 1) $label = $data['menu_name'] . '@';
+                                if ($i == 2) $label = $data['menu_name'] . '#';
+                                if (!isset($relateRule[$label])) {
+                                    $relateRule[$label]['show_value'] = (int)$pk;
+                                }
+                                foreach ($pv as $pvv) {
+                                    $relateRule[$label]['son_type'][$pvv] = '';
+                                }
+                                $i++;
+                            }
+                        }
                     }
                     if (isset($relateRule[$key])) {
                         $role = $relateRule[$key];
diff --git a/crmeb/app/services/user/UserExtractServices.php b/crmeb/app/services/user/UserExtractServices.php
index 311f6e347..f141934f8 100644
--- a/crmeb/app/services/user/UserExtractServices.php
+++ b/crmeb/app/services/user/UserExtractServices.php
@@ -96,6 +96,7 @@ class UserExtractServices extends BaseServices
         $list = $this->dao->getExtractList($where, $field, $page, $limit);
         foreach ($list as &$item) {
             $item['nickname'] = $item['user']['nickname'] ?? '';
+            $item['receive_price'] = bcsub((string)$item['extract_price'], (string)$item['extract_fee'], 2);
         }
         $count = $this->dao->count($where);
         return compact('list', 'count');

From 16b8cdcb7c304f18188f9c1d1d8c167b5f3cea43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Mon, 15 Jul 2024 14:33:12 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E7=A8=8B=E5=BA=8F=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E3=80=91=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 7ee8cb093..9b7841e13 100644
--- a/README.md
+++ b/README.md
@@ -144,10 +144,6 @@ So~~想要用CRMEB开源商城系统做公益项目的朋友，可以来免费
 ![输入图片说明](readme/pic/gongyi1.jpg)
 ![输入图片说明](readme/pic/gongyi2.jpg)
 
----
-###  💎 捐赠
-赠人玫瑰，手留余香！CRMEB诚挚地邀请大家积极参与捐赠，我们会将捐赠获得的费用，悉数用于支持公益项目，让善意无限传递下去！
-在此深表感谢~
 ---
 [![输入图片说明](readme/pic/多商户.jpg)](https://www.crmeb.com/index/merchant)
 ---

From d0ce7c66a03af8db9d1eda578db784bb369eeafc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Mon, 15 Jul 2024 14:37:28 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E6=A8=A1=E7=89=88=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E3=80=91=E6=9B=B4=E6=96=B0=E6=A8=A1=E7=89=88=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/public/image/logo-small.png    |  Bin 0 -> 7650 bytes
 template/admin/public/index.html              |    1 +
 template/admin/public/manifest.json           |   13 +
 .../admin/src/assets/iconfont/iconfont.css    |   18 +-
 template/admin/src/components/from/from.vue   |    2 +-
 .../mobilePageDiy/home_goods_list.vue         |    2 +-
 .../components/mobilePageDiy/home_hotspot.vue |    2 +-
 .../components/mobilePageDiy/picture_cube.vue |    2 +-
 .../src/pages/finance/userExtract/index.vue   |   12 +
 .../pages/marketing/storeBargain/create.vue   |    2 +-
 .../pages/marketing/storeBargain/index.vue    |    2 +-
 .../marketing/storeCombination/create.vue     |    2 +-
 .../marketing/storeCombination/index.vue      |    2 +-
 .../pages/marketing/storeSeckill/create.vue   |    2 +-
 .../pages/marketing/storeSeckill/index.vue    |    1 +
 .../src/pages/product/productAdd/index.vue    |    2 +-
 .../src/pages/product/productList/index.vue   |    2 +-
 .../admin/src/pages/setting/devise/list.vue   |    6 +-
 .../src/pages/system/codeGeneration/list.vue  |    2 +-
 template/uni-app/App.vue                      |   24 +-
 template/uni-app/manifest.json                |    4 +-
 .../goods_combination_details/index.vue       |    6 +-
 .../goods_combination_status/index.vue        |    4 +-
 .../activity/goods_seckill_details/index.vue  |    7 +-
 .../uni-app/pages/annex/vip_paid/index.vue    |    2 -
 .../pages/goods/order_details/index.vue       |    2 +-
 .../pages/index/diy/components/menus.vue      |  489 +++---
 .../points_mall/integral_goods_details.vue    |    5 -
 .../pages/users/user_invoice_form/index.vue   | 1321 +++++++++--------
 29 files changed, 990 insertions(+), 949 deletions(-)
 create mode 100644 template/admin/public/image/logo-small.png
 create mode 100644 template/admin/public/manifest.json

diff --git a/template/admin/public/image/logo-small.png b/template/admin/public/image/logo-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..77744f46515936d9da1415688b7bf5f46d1ef315
GIT binary patch
literal 7650
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

literal 0
HcmV?d00001

diff --git a/template/admin/public/index.html b/template/admin/public/index.html
index fd68038d2..840688dd4 100644
--- a/template/admin/public/index.html
+++ b/template/admin/public/index.html
@@ -5,6 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=no">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="manifest" href="./manifest.json">
     <title></title>
   </head>
   <body>
diff --git a/template/admin/public/manifest.json b/template/admin/public/manifest.json
new file mode 100644
index 000000000..f65c0c3e4
--- /dev/null
+++ b/template/admin/public/manifest.json
@@ -0,0 +1,13 @@
+{
+    "name":"CRMEB",
+    "display":"standalone",
+    "start_url":".",
+    "id": "index.html",
+    "background_color": "#999",
+    "theme_color":"#292d3e",
+    "icons":[{
+        "src":"./image/logo-small.png",
+        "sizes":"144x144",
+        "type":"image/png"
+    }]
+}
\ No newline at end of file
diff --git a/template/admin/src/assets/iconfont/iconfont.css b/template/admin/src/assets/iconfont/iconfont.css
index a1ba4ef14..a96c3b2d8 100644
--- a/template/admin/src/assets/iconfont/iconfont.css
+++ b/template/admin/src/assets/iconfont/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 1945396 */
-  src: url('//at.alicdn.com/t/c/font_1945396_6gitgc05gen.woff2?t=1712912127437') format('woff2'),
-       url('//at.alicdn.com/t/c/font_1945396_6gitgc05gen.woff?t=1712912127437') format('woff'),
-       url('//at.alicdn.com/t/c/font_1945396_6gitgc05gen.ttf?t=1712912127437') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_1945396_qp61r9cscmj.woff2?t=1719814295530') format('woff2'),
+       url('//at.alicdn.com/t/c/font_1945396_qp61r9cscmj.woff?t=1719814295530') format('woff'),
+       url('//at.alicdn.com/t/c/font_1945396_qp61r9cscmj.ttf?t=1719814295530') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.iconrequ1:before {
+  content: "\e830";
+}
+
+.iconrequ:before {
+  content: "\e82f";
+}
+
+.iconicon_Like_2:before {
+  content: "\e7e1";
+}
+
 .iconic_mall:before {
   content: "\e797";
 }
diff --git a/template/admin/src/components/from/from.vue b/template/admin/src/components/from/from.vue
index 85b46c384..bda0e3ea8 100644
--- a/template/admin/src/components/from/from.vue
+++ b/template/admin/src/components/from/from.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="FromData">
-    <el-dialog :visible.sync="modals" :title="FromData.title" :z-index="1" width="720px" @closed="cancel">
+    <el-dialog :visible.sync="modals" :title="FromData.title" width="720px" @closed="cancel">
       <template>
         <div class="radio acea-row row-middle" v-if="FromData.action === '/marketing/coupon/save.html'">
           <div class="name ivu-form-item-content">优惠券类型</div>
diff --git a/template/admin/src/components/mobilePageDiy/home_goods_list.vue b/template/admin/src/components/mobilePageDiy/home_goods_list.vue
index 0eec621df..fc21c39fe 100644
--- a/template/admin/src/components/mobilePageDiy/home_goods_list.vue
+++ b/template/admin/src/components/mobilePageDiy/home_goods_list.vue
@@ -225,7 +225,7 @@ export default {
   name: 'home_goods_list',
   cname: '商品列表',
   configName: 'c_home_goods_list',
-  icon: 'iconcuxiaoliebiao1',
+  icon: 'iconshangpinliebiao1',
   type: 0, // 0 基础组件 1 营销组件 2工具组件
   defaultName: 'goodList', // 外面匹配名称
   props: {
diff --git a/template/admin/src/components/mobilePageDiy/home_hotspot.vue b/template/admin/src/components/mobilePageDiy/home_hotspot.vue
index fca17081e..cc43ddb54 100644
--- a/template/admin/src/components/mobilePageDiy/home_hotspot.vue
+++ b/template/admin/src/components/mobilePageDiy/home_hotspot.vue
@@ -37,7 +37,7 @@ export default {
   name: 'home_hotspot',
   cname: '热区',
   configName: 'c_hotspot',
-  icon: 'icontupianguanggao1',
+  icon: 'iconrequ1',
   type: 0, // 0 基础组件 1 营销组件 2工具组件
   defaultName: 'hotspot', // 外面匹配名称
   props: {
diff --git a/template/admin/src/components/mobilePageDiy/picture_cube.vue b/template/admin/src/components/mobilePageDiy/picture_cube.vue
index 2631b8fab..faecf7dce 100644
--- a/template/admin/src/components/mobilePageDiy/picture_cube.vue
+++ b/template/admin/src/components/mobilePageDiy/picture_cube.vue
@@ -80,7 +80,7 @@ export default {
   name: 'picture_cube',
   cname: '图片魔方',
   configName: 'c_picture_cube',
-  icon: 'iconcuxiaoliebiao1',
+  icon: 'iconshangpinfenlei1',
   type: 0, // 0 基础组件 1 营销组件 2工具组件
   defaultName: 'pictureCube', // 外面匹配名称
   props: {
diff --git a/template/admin/src/pages/finance/userExtract/index.vue b/template/admin/src/pages/finance/userExtract/index.vue
index 047737db4..3c61a36d4 100644
--- a/template/admin/src/pages/finance/userExtract/index.vue
+++ b/template/admin/src/pages/finance/userExtract/index.vue
@@ -101,6 +101,11 @@
             <div>{{ scope.row.extract_fee }}</div>
           </template>
         </el-table-column>
+        <el-table-column label="到账金额" min-width="100">
+          <template slot-scope="scope">
+            <div class="f-price">{{ scope.row.receive_price }}</div>
+          </template>
+        </el-table-column>
         <el-table-column label="提现方式" min-width="130">
           <template slot-scope="scope">
             <div class="type" v-if="scope.row.extract_type === 'bank'">
@@ -436,4 +441,11 @@ export default {
     img
         width 100%
         height 100%
+.z-price {
+  color: red;
+}
+
+.f-price {
+  color: green;
+}
 </style>
diff --git a/template/admin/src/pages/marketing/storeBargain/create.vue b/template/admin/src/pages/marketing/storeBargain/create.vue
index bbeb7855c..978e6a0b7 100644
--- a/template/admin/src/pages/marketing/storeBargain/create.vue
+++ b/template/admin/src/pages/marketing/storeBargain/create.vue
@@ -114,7 +114,7 @@
                 <el-form-item label="物流方式：" prop="logistics">
                   <el-checkbox-group v-model="formValidate.logistics">
                     <el-checkbox label="1">快递</el-checkbox>
-                    <el-checkbox label="2">到店核销</el-checkbox>
+                    <el-checkbox label="2">到店</el-checkbox>
                   </el-checkbox-group>
                 </el-form-item>
               </el-col>
diff --git a/template/admin/src/pages/marketing/storeBargain/index.vue b/template/admin/src/pages/marketing/storeBargain/index.vue
index c0cfe0de2..ad981e7dd 100644
--- a/template/admin/src/pages/marketing/storeBargain/index.vue
+++ b/template/admin/src/pages/marketing/storeBargain/index.vue
@@ -122,7 +122,6 @@
               :inactive-value="0"
               v-model="scope.row.status"
               :value="scope.row.status"
-              :disabled="scope.row.stop_status ? true : false"
               @change="onchangeIsShow(scope.row)"
               size="large"
             >
@@ -377,6 +376,7 @@ export default {
         })
         .catch((res) => {
           this.$message.error(res.msg);
+          row.status = !row.status
         });
     },
   },
diff --git a/template/admin/src/pages/marketing/storeCombination/create.vue b/template/admin/src/pages/marketing/storeCombination/create.vue
index d1fe79013..f85a74373 100644
--- a/template/admin/src/pages/marketing/storeCombination/create.vue
+++ b/template/admin/src/pages/marketing/storeCombination/create.vue
@@ -119,7 +119,7 @@
                 <el-form-item label="物流方式：" prop="logistics">
                   <el-checkbox-group v-model="formValidate.logistics">
                     <el-checkbox label="1">快递</el-checkbox>
-                    <el-checkbox label="2">到店核销</el-checkbox>
+                    <el-checkbox label="2">到店</el-checkbox>
                   </el-checkbox-group>
                 </el-form-item>
               </el-col>
diff --git a/template/admin/src/pages/marketing/storeCombination/index.vue b/template/admin/src/pages/marketing/storeCombination/index.vue
index d49fee5ab..58e101418 100644
--- a/template/admin/src/pages/marketing/storeCombination/index.vue
+++ b/template/admin/src/pages/marketing/storeCombination/index.vue
@@ -123,7 +123,6 @@
               :inactive-value="0"
               v-model="scope.row.is_show"
               :value="scope.row.is_show"
-              :disabled="scope.row.stop_status ? true : false"
               @change="onchangeIsShow(scope.row)"
               size="large"
               active-text="上架"
@@ -310,6 +309,7 @@ export default {
         })
         .catch((res) => {
           this.$message.error(res.msg);
+          row.is_show = !row.is_show
         });
     },
   },
diff --git a/template/admin/src/pages/marketing/storeSeckill/create.vue b/template/admin/src/pages/marketing/storeSeckill/create.vue
index 58a8fae39..32a2568c0 100644
--- a/template/admin/src/pages/marketing/storeSeckill/create.vue
+++ b/template/admin/src/pages/marketing/storeSeckill/create.vue
@@ -66,7 +66,7 @@
                 <el-form-item label="物流方式：" prop="logistics">
                   <el-checkbox-group v-model="formValidate.logistics">
                     <el-checkbox label="1">快递</el-checkbox>
-                    <el-checkbox label="2">到店核销</el-checkbox>
+                    <el-checkbox label="2">到店</el-checkbox>
                   </el-checkbox-group>
                 </el-form-item>
               </el-col>
diff --git a/template/admin/src/pages/marketing/storeSeckill/index.vue b/template/admin/src/pages/marketing/storeSeckill/index.vue
index 606bb2c65..0ed5a1b27 100644
--- a/template/admin/src/pages/marketing/storeSeckill/index.vue
+++ b/template/admin/src/pages/marketing/storeSeckill/index.vue
@@ -359,6 +359,7 @@ export default {
         })
         .catch((res) => {
           this.$message.error(res.msg);
+          row.status = !row.status
         });
     },
   },
diff --git a/template/admin/src/pages/product/productAdd/index.vue b/template/admin/src/pages/product/productAdd/index.vue
index 0b530e46c..f6caf2247 100644
--- a/template/admin/src/pages/product/productAdd/index.vue
+++ b/template/admin/src/pages/product/productAdd/index.vue
@@ -707,7 +707,7 @@
             <el-form-item label="物流方式：" prop="logistics">
               <el-checkbox-group v-model="formValidate.logistics" @change="logisticsBtn">
                 <el-checkbox label="1">快递</el-checkbox>
-                <el-checkbox label="2">到店核销</el-checkbox>
+                <el-checkbox label="2">到店</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
           </el-col>
diff --git a/template/admin/src/pages/product/productList/index.vue b/template/admin/src/pages/product/productList/index.vue
index a073a3c8b..bb2f16eab 100644
--- a/template/admin/src/pages/product/productList/index.vue
+++ b/template/admin/src/pages/product/productList/index.vue
@@ -221,7 +221,7 @@
             <el-form-item label="物流方式：" prop="logistics">
               <el-checkbox-group v-model="batchFormData.logistics" @change="logisticsBtn">
                 <el-checkbox label="1">快递</el-checkbox>
-                <el-checkbox label="2">到店核销</el-checkbox>
+                <el-checkbox label="2">到店</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
             <el-form-item label="运费设置：">
diff --git a/template/admin/src/pages/setting/devise/list.vue b/template/admin/src/pages/setting/devise/list.vue
index 2a8d11e04..e23660556 100644
--- a/template/admin/src/pages/setting/devise/list.vue
+++ b/template/admin/src/pages/setting/devise/list.vue
@@ -10,7 +10,7 @@
       </div>
     </div>
     <el-card class="h100" :bordered="false" shadow="never" v-if="cardShow == 0">
-      <div class="acea-row">
+      <div class="acea-row no-warp">
         <div class="iframe-col">
           <iframe class="iframe-box" :src="iframeUrl" frameborder="0" ref="iframe"></iframe>
           <div class="mask"></div>
@@ -447,6 +447,9 @@ export default {
   background-color: #fff;
   padding-bottom: 50px;
 }
+.no-warp{
+  flex-wrap: nowrap !important;
+}
 ::v-deep .el-card__body{
   padding: 40px;
 }
@@ -456,6 +459,7 @@ export default {
 
 .iframe-col {
   width: 375px;
+  min-width: 375px;
   height: 650px;
   margin-right: 30px;
   position: relative;
diff --git a/template/admin/src/pages/system/codeGeneration/list.vue b/template/admin/src/pages/system/codeGeneration/list.vue
index 66892b4d1..5126fd740 100644
--- a/template/admin/src/pages/system/codeGeneration/list.vue
+++ b/template/admin/src/pages/system/codeGeneration/list.vue
@@ -618,7 +618,7 @@ export default {
   .save {
     position: absolute;
     left: 50%;
-    bottom: -30px;
+    bottom: -10px;
     z-index: 99;
   }
 }
diff --git a/template/uni-app/App.vue b/template/uni-app/App.vue
index 5b4f6b55e..7e998b404 100644
--- a/template/uni-app/App.vue
+++ b/template/uni-app/App.vue
@@ -258,18 +258,18 @@ export default {
 			uni.setStorageSync('copyRight', res.data);
 		});
 		// #ifdef MP
-		getSystemVersion().then((res) => {
-			if (res.data.version_code != SYSTEM_VERSION) {
-				uni.showModal({
-					title: '警告',
-					content: '前后端版本不一致！',
-					success: function (res) {
-						if (res.confirm) {
-						}
-					}
-				});
-			}
-		});
+		// getSystemVersion().then((res) => {
+		// 	if (res.data.version_code != SYSTEM_VERSION) {
+		// 		uni.showModal({
+		// 			title: '警告',
+		// 			content: '前后端版本不一致！',
+		// 			success: function (res) {
+		// 				if (res.confirm) {
+		// 				}
+		// 			}
+		// 		});
+		// 	}
+		// });
 		// #endif
 	},
 	// #ifdef H5
diff --git a/template/uni-app/manifest.json b/template/uni-app/manifest.json
index 28c367fef..8b3e5db5d 100644
--- a/template/uni-app/manifest.json
+++ b/template/uni-app/manifest.json
@@ -2,8 +2,8 @@
     "name" : "CRMEB标准版",
     "appid" : "__UNI__A3F1ED4",
     "description" : "CRMEB标准版",
-    "versionName" : "5.3.0",
-    "versionCode" : 530,
+    "versionName" : "5.4.0",
+    "versionCode" : 540,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/template/uni-app/pages/activity/goods_combination_details/index.vue b/template/uni-app/pages/activity/goods_combination_details/index.vue
index bad49d3b2..8d237bd64 100644
--- a/template/uni-app/pages/activity/goods_combination_details/index.vue
+++ b/template/uni-app/pages/activity/goods_combination_details/index.vue
@@ -484,7 +484,6 @@
 			// #endif
 			if (options.hasOwnProperty('id')) {
 				this.id = options.id
-				// app.globalData.openPages = '/pages/activity/goods_combination_details/index?id=' + this.id + '&spid=' + this.userInfo.uid;
 				if (this.isLogin) {
 					this.combinationDetail();
 				} else {
@@ -858,9 +857,6 @@
 			// 授权后回调
 			onLoadFun: function(e) {
 				this.userInfo = e
-				app.globalData.openPages = '/pages/activity/goods_combination_details/index?id=' + this.id + '&spid=' +
-					e.uid;
-				// this.downloadFilePromotionCode();
 				this.combinationDetail();
 			},
 			selecAttr: function() {
@@ -1261,7 +1257,7 @@
 		onShareAppMessage() {
 			return {
 				title: this.storeInfo.title,
-				path: app.globalData.openPages,
+				path: '/pages/activity/goods_combination_details/index?id=' + this.id + '&spid=' + this.$store.state.app.uid,
 				imageUrl: this.storeInfo.image
 			};
 		}
diff --git a/template/uni-app/pages/activity/goods_combination_status/index.vue b/template/uni-app/pages/activity/goods_combination_status/index.vue
index 929a45336..2526ca390 100644
--- a/template/uni-app/pages/activity/goods_combination_status/index.vue
+++ b/template/uni-app/pages/activity/goods_combination_status/index.vue
@@ -235,7 +235,6 @@
 				handler: function(newV, oldV) {
 					if (newV) {
 						this.userInfo = newV;
-						app.globalData.openPages = '/pages/activity/goods_combination_status/index?id=' + this.pinkId;
 					}
 				},
 				deep: true
@@ -269,7 +268,7 @@
 			let that = this;
 			return {
 				title: that.$t(`您的好友`) + that.userInfo.nickname + this.$t(`邀请您参团`) + that.storeCombination.title,
-				path: app.globalData.openPages,
+				path: '/pages/activity/goods_combination_status/index?id=' + that.pinkId,
 				imageUrl: that.storeCombination.image
 			};
 		},
@@ -319,7 +318,6 @@
 			// 授权后回调
 			onLoadFun: function(e) {
 				this.userInfo = e;
-				app.globalData.openPages = '/pages/activity/goods_combination_status/index?id=' + this.pinkId;
 				this.getCombinationPink();
 			},
 			/**
diff --git a/template/uni-app/pages/activity/goods_seckill_details/index.vue b/template/uni-app/pages/activity/goods_seckill_details/index.vue
index 993a3c091..5d01ef544 100644
--- a/template/uni-app/pages/activity/goods_seckill_details/index.vue
+++ b/template/uni-app/pages/activity/goods_seckill_details/index.vue
@@ -605,11 +605,6 @@
 					setTimeout(() => {
 						that.infoScroll();
 					}, 500);
-
-					app.globalData.openPages = '/pages/activity/goods_seckill_details/index?id=' + that.id +
-						'&spid=' + that.storeInfo.uid;
-					// wxParse.wxParse('description', 'html', that.data.storeInfo.description || '', that, 0);
-					// wxh.time(that.data.time, that);
 				}).catch(err => {
 					that.$util.Tips({
 						title: err
@@ -1141,7 +1136,7 @@
 		onShareAppMessage() {
 			return {
 				title: this.storeInfo.title,
-				path: app.globalData.openPages,
+				path: '/pages/activity/goods_seckill_details/index?id=' + this.id + '&spid=' + this.$store.state.app.uid,
 				imageUrl: this.storeInfo.image
 			};
 		}
diff --git a/template/uni-app/pages/annex/vip_paid/index.vue b/template/uni-app/pages/annex/vip_paid/index.vue
index 8336e05ae..42a238454 100644
--- a/template/uni-app/pages/annex/vip_paid/index.vue
+++ b/template/uni-app/pages/annex/vip_paid/index.vue
@@ -178,7 +178,6 @@
 						title: this.$t(`微信支付`),
 						payStatus: true
 					},
-					// #ifdef H5 ||APP-PLUS
 					{
 						name: this.$t(`支付宝支付`),
 						icon: 'icon-zhifubao',
@@ -186,7 +185,6 @@
 						title: this.$t(`支付宝支付`),
 						payStatus: true
 					},
-					// #endif
 					{
 						name: this.$t(`余额支付`),
 						icon: 'icon-qiandai',
diff --git a/template/uni-app/pages/goods/order_details/index.vue b/template/uni-app/pages/goods/order_details/index.vue
index 7351c8868..ddfd2239f 100644
--- a/template/uni-app/pages/goods/order_details/index.vue
+++ b/template/uni-app/pages/goods/order_details/index.vue
@@ -1136,7 +1136,7 @@ export default {
 		confirmOrder(orderId) {
 			let that = this;
 			// #ifdef MP
-			if (wx.openBusinessView && this.orderInfo.order_shipping_open && this.orderInfo.trade_no) {
+			if (wx.openBusinessView && this.orderInfo.order_shipping_open && this.orderInfo.trade_no && this.orderInfo.uid == this.orderInfo.pay_uid) {
 				uni.showLoading({
 					title: this.$t(`加载中`)
 				});
diff --git a/template/uni-app/pages/index/diy/components/menus.vue b/template/uni-app/pages/index/diy/components/menus.vue
index 8b69b2bf3..52d61b4e5 100644
--- a/template/uni-app/pages/index/diy/components/menus.vue
+++ b/template/uni-app/pages/index/diy/components/menus.vue
@@ -1,241 +1,250 @@
-<template>
-	<view v-show="!isSortType && menus.length" :class="bgStyle?'borderRadius15':''"
-		:style="{background:bgColor,margin:'0 '+prConfig*2+'rpx',marginTop:mbConfig*2+'rpx'}">
-		<view v-if="isMany">
-			<view class="swiper">
-				<swiper :interval="interval" :duration="duration" :style="'height:'+(navHigh*2+17)+'rpx;'"
-					@change='bannerfun'>
-					<block>
-						<swiper-item v-for="(item,indexw) in menuList" :key="indexw">
-							<view class="nav acea-row" :id="'nav' + indexw">
-								<view :style="'color:' + titleColor" class="item"
-									:class="number===1?'four':number===2?'five':''" v-for="(itemn,indexn) in item.list"
-									:key="indexn" @click="menusTap(itemn.info[1].value)">
-									<view class="pictrue skeleton-radius" :class="menuStyle?'':'on'">
-										<image :src="itemn.img" mode="aspectFill"></image>
-									</view>
-									<view class="menu-txt">{{ $t(itemn.info[0].value) }}</view>
-								</view>
-							</view>
-						</swiper-item>
-					</block>
-				</swiper>
-			</view>
-			<view class="dot acea-row row-center-wrapper" v-if="docConfig<2">
-				<view class="dot-item" :class="{ 'line_dot-item': docConfig === 0,'': docConfig === 1}"
-					:style="active==index?'background:'+ dotColor:''" v-for="(item,index) in menuList"></view>
-			</view>
-		</view>
-		<view class="nav oneNav" v-else>
-			<scroll-view scroll-x="true" style="white-space: nowrap; display: flex" show-scrollbar="false">
-				<block v-for="(item, index) in menus" :key="index">
-					<view class="item" :style="'color:' + titleColor" @click="menusTap(item.info[1].value)">
-						<view class="pictrue skeleton-radius" :class="menuStyle?'':'on'">
-							<image :src="item.img" mode="aspectFill"></image>
-						</view>
-						<view class="menu-txt">{{ $t(item.info[0].value) }}</view>
-					</view>
-				</block>
-			</scroll-view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'menus',
-		props: {
-			dataConfig: {
-				type: Object,
-				default: () => {}
-			},
-			isSortType: {
-				type: String | Number,
-				default: 0
-			}
-		},
-		data() {
-			return {
-				interval: 3000,
-				duration: 500,
-				menus: this.dataConfig.menuConfig.list || [],
-				titleColor: this.dataConfig.titleColor.color[0].item,
-				mbConfig: this.dataConfig.mbConfig.val,
-				rowsNum: this.dataConfig.rowsNum.type,
-				number: this.dataConfig.number.type,
-				isMany: this.dataConfig.tabConfig.tabVal,
-				menuStyle: this.dataConfig.menuStyle.type,
-				docConfig: this.dataConfig.pointerStyle.type,
-				dotColor: this.dataConfig.pointerColor.color[0].item,
-				bgColor: this.dataConfig.bgColor.color[0].item,
-				bgStyle: this.dataConfig.bgStyle.type,
-				prConfig: this.dataConfig.prConfig.val,
-				navHigh: 0,
-				menuList: [],
-				active: 0
-			};
-		},
-		created() {},
-		mounted() {
-			if (this.rowsNum === 0) {
-				if (this.number === 0) {
-					this.pageNum(6)
-				} else if (this.number === 1) {
-					this.pageNum(8)
-				} else {
-					this.pageNum(10)
-				}
-			} else if (this.rowsNum === 1) {
-				if (this.number === 0) {
-					this.pageNum(9)
-				} else if (this.number === 1) {
-					this.pageNum(12)
-				} else {
-					this.pageNum(15)
-				}
-			} else {
-				if (this.number === 0) {
-					this.pageNum(12)
-				} else if (this.number === 1) {
-					this.pageNum(16)
-				} else {
-					this.pageNum(20)
-				}
-			}
-			this.$nextTick(() => {
-				if (this.menuList.length && this.isMany) {
-					let that = this
-					// #ifdef H5
-					that.menuHeight()
-					// #endif
-					// #ifndef H5
-					setTimeout(() => {
-						that.menuHeight()
-					}, 100)
-					// #endif
-				}
-			})
-		},
-		methods: {
-			bannerfun(e) {
-				this.active = e.detail.current;
-			},
-			menuHeight() {
-				let that = this;
-				const query = uni.createSelectorQuery().in(this);
-				query.select('#nav0').boundingClientRect(data => {
-					that.navHigh = data.height;
-				}).exec();
-			},
-			pageNum(num) {
-				let count = Math.ceil(this.menus.length / num);
-				let goodArray = new Array();
-				for (let i = 0; i < count; i++) {
-					let list = this.menus.slice(i * num, i * num + num);
-					if (list.length)
-						goodArray.push({
-							list: list
-						});
-				}
-				this.$set(this, 'menuList', goodArray);
-			},
-			menusTap(url) {
-				this.$util.JumpPath(url);
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	.dot {
-		width: 100%;
-		padding-bottom: 20rpx;
-
-		.instruct {
-			width: 50rpx;
-			height: 36rpx;
-			line-height: 36rpx;
-			background-color: rgba(0, 0, 0, 0.8);
-			color: #fff;
-			border-radius: 16rpx;
-			font-size: 24rpx;
-			text-align: center;
-		}
-
-		.dot-item {
-			width: 10rpx;
-			height: 10rpx;
-			background: rgba(0, 0, 0, .4);
-			border-radius: 50%;
-			margin: 0 4px;
-
-			&.line_dot-item {
-				width: 20rpx;
-				height: 5rpx;
-				border-radius: 3rpx;
-			}
-		}
-	}
-
-	.nav {
-		&.oneNav {
-			padding-bottom: 25rpx;
-		}
-
-		.item {
-			margin-top: 30rpx;
-			width: 160rpx;
-			text-align: center;
-			font-size: 24rpx;
-			display: inline-block;
-
-			.pictrue {
-				width: 90rpx;
-				height: 90rpx;
-				margin: 0 auto;
-
-				image {
-					width: 100%;
-					height: 100%;
-					border-radius: 50%;
-				}
-
-				&.on {
-					image {
-						border-radius: 0;
-					}
-				}
-			}
-
-			.menu-txt {
-				margin-top: 15rpx;
-			}
-		}
-	}
-
-	.swiper {
-		z-index: 20;
-		position: relative;
-		overflow: hidden;
-
-		.nav {
-			.item {
-				width: 33.3333%;
-
-				&.four {
-					width: 25%;
-				}
-
-				&.five {
-					width: 20%;
-				}
-			}
-		}
-
-		swiper,
-		.swiper-item {
-			width: 100%;
-			display: block;
-		}
-	}
+<template>
+	<view
+		v-show="!isSortType && menus.length"
+		:class="bgStyle ? 'borderRadius15' : ''"
+		:style="{ background: bgColor, margin: '0 ' + prConfig * 2 + 'rpx', marginTop: mbConfig * 2 + 'rpx' }"
+	>
+		<view v-if="isMany">
+			<view class="swiper">
+				<swiper :interval="interval" :duration="duration" :style="'height:' + navHigh + 'px;'" @change="bannerfun">
+					<swiper-item v-for="(item, indexw) in menuList" :key="indexw">
+						<view class="nav acea-row" :id="'nav' + indexw">
+							<view
+								:style="'color:' + titleColor"
+								class="item"
+								:class="number === 1 ? 'four' : number === 2 ? 'five' : ''"
+								v-for="(itemn, indexn) in item.list"
+								:key="indexn"
+								@click="menusTap(itemn.info[1].value)"
+							>
+								<view class="pictrue skeleton-radius" :class="menuStyle ? '' : 'on'">
+									<image :src="itemn.img" mode="aspectFill"></image>
+								</view>
+								<view class="menu-txt">{{ $t(itemn.info[0].value) }}</view>
+							</view>
+						</view>
+					</swiper-item>
+				</swiper>
+			</view>
+			<view class="dot acea-row row-center-wrapper" v-if="docConfig < 2">
+				<view
+					class="dot-item"
+					:class="{ 'line_dot-item': docConfig === 0, '': docConfig === 1 }"
+					:style="active == index ? 'background:' + dotColor : ''"
+					v-for="(item, index) in menuList"
+				></view>
+			</view>
+		</view>
+		<view class="nav oneNav" v-else>
+			<scroll-view scroll-x="true" style="white-space: nowrap; display: flex" show-scrollbar="false">
+				<block v-for="(item, index) in menus" :key="index">
+					<view class="item" :style="'color:' + titleColor" @click="menusTap(item.info[1].value)">
+						<view class="pictrue skeleton-radius" :class="menuStyle ? '' : 'on'">
+							<image :src="item.img" mode="aspectFill"></image>
+						</view>
+						<view class="menu-txt">{{ $t(item.info[0].value) }}</view>
+					</view>
+				</block>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'menus',
+	props: {
+		dataConfig: {
+			type: Object,
+			default: () => {}
+		},
+		isSortType: {
+			type: String | Number,
+			default: 0
+		}
+	},
+	data() {
+		return {
+			interval: 3000,
+			duration: 500,
+			menus: this.dataConfig.menuConfig.list || [],
+			titleColor: this.dataConfig.titleColor.color[0].item,
+			mbConfig: this.dataConfig.mbConfig.val,
+			rowsNum: this.dataConfig.rowsNum.type,
+			number: this.dataConfig.number.type,
+			isMany: this.dataConfig.tabConfig.tabVal,
+			menuStyle: this.dataConfig.menuStyle.type,
+			docConfig: this.dataConfig.pointerStyle.type,
+			dotColor: this.dataConfig.pointerColor.color[0].item,
+			bgColor: this.dataConfig.bgColor.color[0].item,
+			bgStyle: this.dataConfig.bgStyle.type,
+			prConfig: this.dataConfig.prConfig.val,
+			navHigh: 0,
+			menuList: [],
+			active: 0
+		};
+	},
+	created() {},
+	mounted() {
+		if (this.rowsNum === 0) {
+			if (this.number === 0) {
+				this.pageNum(6);
+			} else if (this.number === 1) {
+				this.pageNum(8);
+			} else {
+				this.pageNum(10);
+			}
+		} else if (this.rowsNum === 1) {
+			if (this.number === 0) {
+				this.pageNum(9);
+			} else if (this.number === 1) {
+				this.pageNum(12);
+			} else {
+				this.pageNum(15);
+			}
+		} else {
+			if (this.number === 0) {
+				this.pageNum(12);
+			} else if (this.number === 1) {
+				this.pageNum(16);
+			} else {
+				this.pageNum(20);
+			}
+		}
+		this.$nextTick(() => {
+			if (this.menuList.length && this.isMany) {
+				let that = this;
+
+				setTimeout(() => {
+					that.menuHeight();
+				}, 100);
+			}
+		});
+	},
+	methods: {
+		bannerfun(e) {
+			this.active = e.detail.current;
+		},
+		menuHeight() {
+			let that = this;
+			const query = uni.createSelectorQuery().in(this);
+			query
+				.select('#nav0')
+				.boundingClientRect((data) => {
+					console.log(data.height);
+					that.navHigh = data.height;
+				})
+				.exec();
+		},
+		pageNum(num) {
+			let count = Math.ceil(this.menus.length / num);
+			let goodArray = new Array();
+			for (let i = 0; i < count; i++) {
+				let list = this.menus.slice(i * num, i * num + num);
+				if (list.length)
+					goodArray.push({
+						list: list
+					});
+			}
+			this.$set(this, 'menuList', goodArray);
+		},
+		menusTap(url) {
+			this.$util.JumpPath(url);
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.dot {
+	width: 100%;
+	padding-bottom: 20rpx;
+
+	.instruct {
+		width: 50rpx;
+		height: 36rpx;
+		line-height: 36rpx;
+		background-color: rgba(0, 0, 0, 0.8);
+		color: #fff;
+		border-radius: 16rpx;
+		font-size: 24rpx;
+		text-align: center;
+	}
+
+	.dot-item {
+		width: 10rpx;
+		height: 10rpx;
+		background: rgba(0, 0, 0, 0.4);
+		border-radius: 50%;
+		margin: 0 4px;
+
+		&.line_dot-item {
+			width: 20rpx;
+			height: 5rpx;
+			border-radius: 3rpx;
+		}
+	}
+}
+
+.nav {
+	&.oneNav {
+		padding-bottom: 25rpx;
+	}
+
+	.item {
+		margin-top: 30rpx;
+		width: 160rpx;
+		text-align: center;
+		font-size: 24rpx;
+		display: inline-block;
+
+		.pictrue {
+			width: 90rpx;
+			height: 90rpx;
+			margin: 0 auto;
+
+			image {
+				width: 100%;
+				height: 100%;
+				border-radius: 50%;
+			}
+
+			&.on {
+				image {
+					border-radius: 0;
+				}
+			}
+		}
+
+		.menu-txt {
+			margin-top: 15rpx;
+		}
+	}
+}
+
+.swiper {
+	z-index: 20;
+	position: relative;
+	overflow: hidden;
+	padding-bottom: 30rpx;
+	.nav {
+		.item {
+			width: 33.3333%;
+
+			&.four {
+				width: 25%;
+			}
+
+			&.five {
+				width: 20%;
+			}
+		}
+	}
+
+	swiper,
+	.swiper-item {
+		width: 100%;
+		display: block;
+	}
+}
 </style>
diff --git a/template/uni-app/pages/points_mall/integral_goods_details.vue b/template/uni-app/pages/points_mall/integral_goods_details.vue
index caec7bf84..664ccb7a6 100644
--- a/template/uni-app/pages/points_mall/integral_goods_details.vue
+++ b/template/uni-app/pages/points_mall/integral_goods_details.vue
@@ -417,11 +417,6 @@
 					that.storeImage = that.storeInfo.image
 					// #endif
 					that.DefaultSelect();
-					app.globalData.openPages = '/pages/activity/goods_seckill_details/index?id=' + that.id +
-						'&time=' + that.time +
-						'&status=' + that.status + '&scene=' + that.storeInfo.uid;
-					// wxParse.wxParse('description', 'html', that.data.storeInfo.description || '', that, 0);
-					// wxh.time(that.data.time, that);
 				}).catch(err => {
 					that.$util.Tips({
 						title: err
diff --git a/template/uni-app/pages/users/user_invoice_form/index.vue b/template/uni-app/pages/users/user_invoice_form/index.vue
index 987ea95a6..39efb504d 100644
--- a/template/uni-app/pages/users/user_invoice_form/index.vue
+++ b/template/uni-app/pages/users/user_invoice_form/index.vue
@@ -1,657 +1,664 @@
-<template>
-	<view :style="colorStyle">
-		<form @submit="formSubmit">
-			<view class="panel">
-				<view class="acea-row row-middle">
-					<view>{{$t(`抬头类型`)}}</view>
-					<radio-group name="header_type" @change="changeTitleType">
-						<label>
-							<radio class="disabled" value="1" :checked="header_type === '1'" /><text>{{$t(`个人`)}}</text>
-						</label>
-						<label>
-							<radio value="2" :checked="header_type === '2'" /><text>{{$t(`企业`)}}</text>
-						</label>
-					</radio-group>
-				</view>
-				<!-- <view class="acea-row row-middle">
-					<view>{{$t(`发票类型`)}}</view>
-					<input name="type" :value="type === '2' && header_type === '2' ? $t(`增值税电子专用发票`) : $t(`增值税电子普通发票`)"
-						disabled @click="callType" />
-					<text class="iconfont icon-xiangyou"></text>
-				</view> -->
-				<view class="acea-row row-middle">
-					<view>{{$t(`发票抬头`)}}</view>
-					<input name="name" :value="name"
-						:placeholder="header_type === '1' ? $t(`需要开具发票的姓名`) : $t(`需要开具发票的企业名称`)" />
-				</view>
-				<view v-show="header_type === '2'" class="acea-row row-middle">
-					<view>{{$t(`税号`)}}</view>
-					<input name="duty_number" :value="duty_number" :placeholder="$t(`纳税人识别号`)" />
-				</view>
-				<view class="acea-row row-middle">
-					<view>{{$t(`手机号`)}}</view>
-					<input name="drawer_phone" :value="drawer_phone" :placeholder="$t(`您的手机号`)" />
-				</view>
-				<view class="acea-row row-middle">
-					<view>{{$t(`邮箱`)}}</view>
-					<input name="email" :value="email" :placeholder="$t(`您的联系邮箱`)" />
-				</view>
-			</view>
-			<view v-show="type === '2'" class="panel">
-				<view class="acea-row row-middle">
-					<view>{{$t(`开户银行`)}}</view>
-					<input name="bank" :value="bank" :placeholder="$t(`您的开户银行`)" />
-				</view>
-				<view class="acea-row row-middle">
-					<view>{{$t(`银行账号`)}}</view>
-					<input name="card_number" :value="card_number" :placeholder="$t(`您的银行账号`)" />
-				</view>
-				<view class="acea-row row-middle">
-					<view>{{$t(`企业地址`)}}</view>
-					<input name="address" :value="address" :placeholder="$t(`您所在的企业地址`)" />
-				</view>
-				<view class="acea-row row-middle">
-					<view>{{$t(`企业电话`)}}</view>
-					<input name="tell" :value="tell" :placeholder="$t(`您的企业电话`)" />
-				</view>
-			</view>
-			<checkbox-group class="acea-row row-middle panel" name="is_default">
-				<label>
-					<checkbox :checked="is_default.length !== 0" /><text>{{$t(`设置为默认抬头`)}}</text>
-				</label>
-			</checkbox-group>
-			<view class="button-section">
-				<button class="button" form-type="submit">{{$t(`保存`)}}</button>
-				<navigator class="navigator" :url="backUrl" hover-class="none">{{$t(`取消`)}}</navigator>
-			</view>
-		</form>
-		<view :class="{ mask: popupType }"></view>
-		<view class="popup" :class="{ on: popupType }">
-			<view class="title">{{$t(`发票类型选择`)}}<text class="iconfont icon-guanbi" @click="closeType"></text></view>
-			<scroll-view scroll-y="true">
-				<radio-group name="invoice-type" @change="changeType">
-					<template v-for="item in invoiceTypeList">
-						<label v-if="item.value === '1' || item.value === '2' && specialInvoice" :key="item.type"
-							class="acea-row row-middle">
-							<view class="text">
-								<view>{{ $t(item.name) }}</view>
-								<view class="info">{{ $t(item.info) }}</view>
-							</view>
-							<radio :value="item.value" :checked="item.value === type" />
-						</label>
-					</template>
-				</radio-group>
-			</scroll-view>
-		</view>
-		<!-- #ifndef MP -->
-		<home></home>
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-	import home from '@/components/home';
-	import {
-		invoiceSave,
-		invoiceDetail
-	} from '@/api/user.js';
-	import colors from '@/mixins/color.js';
-	export default {
-		components: {
-			home
-		},
-		mixins: [colors],
-		data() {
-			return {
-				invoiceTypeList: [{
-						name: this.$t(`增值税电子普通发票`),
-						value: '1',
-						info: this.$t(`纸质发票开出后将以邮寄形式交付`)
-					},
-					{
-						name: this.$t(`增值税电子专用发票`),
-						value: '2',
-						info: this.$t(`纸质发票开出后将以邮寄形式交付`)
-					}
-				],
-				id: '', // 修改时为必须参数
-				header_type: '1', // 抬头类型1: 个人2： 企业
-				type: '1', // 发票类型1：普通2：专用
-				drawer_phone: '', // 开票人手机号
-				name: '', // 名称（发票抬头）
-				duty_number: '', // 税号（个人为非必需，企业是必需参数）
-				tell: '', // 公司注册电话
-				address: '', // 注册地址
-				bank: '', // 开户行
-				card_number: '', // 银行卡号
-				is_default: [], // 是否默认
-				email: '', // 邮箱
-				popupType: false,
-				typeName: '',
-				urlQuery: '',
-				from: '',
-				specialInvoice: true,
-				order_id: ''
-			};
-		},
-		computed: {
-			backUrl() {
-				switch (this.from) {
-					case 'order_confirm':
-						return `/pages/goods/order_confirm/index${this.urlQuery}`;
-						break;
-					default:
-						return '/pages/users/user_invoice_list/index?from=invoice_form';
-						break;
-
-				}
-			}
-		},
-		onHide() {
-			this.from = ''
-		},
-		onLoad(options) {
-			if (options.id) uni.setNavigationBarTitle({
-				title: '编辑发票'
-			})
-			for (let key in options) {
-				switch (key) {
-					case 'couponTitle':
-					case 'new':
-					case 'cartId':
-					case 'pinkId':
-					case 'couponId':
-					case 'addressId':
-						this.urlQuery += `${this.urlQuery ? '&' : '?'}${key}=${options[key]}`;
-						break;
-					case 'from':
-						this.from = options[key];
-						break;
-					case 'header_type':
-						this.header_type = options[key];
-						break;
-					case 'id':
-						this.id = options[key];
-						this.getInvoiceDetail();
-						break;
-					case 'specialInvoice':
-						if (options[key] === 'false') {
-							this.specialInvoice = false;
-						}
-						break;
-				}
-			}
-			if (options.order_id)
-				this.order_id = options.order_id
-			const invoiceItem = this.invoiceTypeList.find(item => item.value === this.type);
-			this.typeName = invoiceItem.name;
-		},
-		methods: {
-			// 获取发票数据
-			getInvoiceDetail() {
-				uni.showLoading({
-					title: this.$t(`加载中`)
-				});
-				invoiceDetail(this.id).then(res => {
-					uni.hideLoading();
-					this.header_type = res.data.header_type.toString();
-					this.type = res.data.type.toString();
-					const invoiceItem = this.invoiceTypeList.find(item => item.value === this.type);
-					this.typeName = invoiceItem.name;
-					this.name = res.data.name;
-					this.drawer_phone = res.data.drawer_phone;
-					this.email = res.data.email;
-					this.duty_number = res.data.duty_number;
-					this.bank = res.data.bank;
-					this.card_number = res.data.card_number;
-					this.address = res.data.address;
-					this.tell = res.data.tell;
-					this.is_default = res.data.is_default ? [''] : [];
-				}).catch(err => {
-					uni.showToast({
-						title: err,
-						icon: 'none'
-					});
-				});
-			},
-			// 保存
-			formSubmit(e) {
-				let that = this;
-				const formData = e.detail.value;
-				formData.type = this.type;
-				if (formData.header_type === '1') {
-					if (!formData.name) {
-						return uni.showToast({
-							title: that.$t(`请输入需要开具发票的姓名`),
-							icon: 'none'
-						});
-					}
-					if (!formData.drawer_phone) {
-						return uni.showToast({
-							title: that.$t(`请输入您的手机号`),
-							icon: 'none'
-						});
-					}
-					if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(formData.drawer_phone)) {
-						return uni.showToast({
-							title: that.$t(`请正确输入您的手机号`),
-							icon: 'none'
-						});
-					}
-					if (!formData.email) {
-						return uni.showToast({
-							title: that.$t(`请输入您的联系邮箱`),
-							icon: 'none'
-						});
-					}
-					if (!/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(formData.email)) {
-						return uni.showToast({
-							title: that.$t(`请正确输入您的联系邮箱`),
-							icon: 'none'
-						});
-					}
-				}
-				if (formData.header_type === '2') {
-					if (formData.type === '1') {
-						if (!formData.name) {
-							return uni.showToast({
-								title: that.$t(`请输入需要开具发票的企业名称`),
-								icon: 'none'
-							});
-						}
-						if (!formData.duty_number) {
-							return uni.showToast({
-								title: that.$t(`请输入纳税人识别号`),
-								icon: 'none'
-							});
-						}
-						if (!/[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}/.test(formData.duty_number)) {
-							return uni.showToast({
-								title: that.$t(`请正确输入纳税人识别号`),
-								icon: 'none'
-							});
-						}
-						if (!formData.drawer_phone) {
-							return uni.showToast({
-								title: that.$t(`请输入您的手机号`),
-								icon: 'none'
-							});
-						}
-						if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(formData.drawer_phone)) {
-							return uni.showToast({
-								title: that.$t(`请正确输入您的手机号`),
-								icon: 'none'
-							});
-						}
-						if (!formData.email) {
-							return uni.showToast({
-								title: that.$t(`请输入您的联系邮箱`),
-								icon: 'none'
-							});
-						}
-						if (!/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(formData.email)) {
-							return uni.showToast({
-								title: that.$t(`请正确输入您的联系邮箱`),
-								icon: 'none'
-							});
-						}
-					}
-					if (formData.type === '2') {
-						if (!formData.name) {
-							return uni.showToast({
-								title: that.$t(`请输入需要开具发票的企业名称`),
-								icon: 'none'
-							});
-						}
-						if (!formData.duty_number) {
-							return uni.showToast({
-								title: that.$t(`请输入纳税人识别号`),
-								icon: 'none'
-							});
-						}
-						if (!/[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}/.test(formData.duty_number)) {
-							return uni.showToast({
-								title: that.$t(`请正确输入纳税人识别号`),
-								icon: 'none'
-							});
-						}
-						if (!formData.drawer_phone) {
-							return uni.showToast({
-								title: that.$t(`请输入您的手机号`),
-								icon: 'none'
-							});
-						}
-						if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(formData.drawer_phone)) {
-							return uni.showToast({
-								title: that.$t(`请正确输入您的手机号`),
-								icon: 'none'
-							});
-						}
-						if (!formData.email) {
-							return uni.showToast({
-								title: that.$t(`请输入您的联系邮箱`),
-								icon: 'none'
-							});
-						}
-						if (!/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(formData.email)) {
-							return uni.showToast({
-								title: that.$t(`请正确输入您的联系邮箱`),
-								icon: 'none'
-							});
-						}
-						if (!formData.bank) {
-							return uni.showToast({
-								title: that.$t(`请输入您的开户银行`),
-								icon: 'none'
-							});
-						}
-						if (!formData.card_number) {
-							return uni.showToast({
-								title: that.$t(`请输入您的银行账号`),
-								icon: 'none'
-							});
-						}
-						if (!/^\d{16}|\d{19}$/.test(formData.card_number)) {
-							return uni.showToast({
-								title: that.$t(`请正确输入您的银行账号`),
-								icon: 'none'
-							});
-						}
-						if (!formData.address) {
-							return uni.showToast({
-								title: that.$t(`请输入您所在的企业地址`),
-								icon: 'none'
-							});
-						}
-						if (!formData.tell) {
-							return uni.showToast({
-								title: that.$t(`请输入您的企业电话`),
-								icon: 'none'
-							});
-						}
-					}
-				}
-				formData.is_default = formData.is_default.length;
-				formData.id = this.id;
-
-				uni.showLoading({
-					title: that.$t(`保存中`)
-				});
-				invoiceSave(formData).then(res => {
-					uni.showToast({
-						title: res.msg,
-						icon: 'success',
-					});
-					setTimeout(e => {
-						switch (that.from) {
-							case 'order_confirm':
-								if (that.id) {
-									uni.navigateTo({
-										url: `/pages/goods/order_confirm/index${that.urlQuery}&invoice_id=${that.id}&invoice_type=${formData.type}&header_type=${this.header_type}`
-									})
-								} else {
-									uni.navigateTo({
-										url: `/pages/goods/order_confirm/index${that.urlQuery}&invoice_id=${res.data.id}&invoice_type=${formData.type}&header_type=${this.header_type}`
-									})
-								}
-								break;
-							case 'order_details':
-								if (that.id) {
-									uni.navigateTo({
-										url: `/pages/goods/order_details/index?order_id=${that.order_id}&invoice_id=${that.id}&header_type=${this.header_type}`
-									})
-								} else {
-									uni.navigateTo({
-										url: `/pages/goods/order_details/index?order_id=${that.order_id}&invoice_id=${res.data.id}&header_type=${this.header_type}`
-									})
-								}
-								break;
-							default:
-								uni.navigateTo({
-									url: '/pages/users/user_invoice_list/index?from=invoice_form'
-								});
-								break;
-						}
-					}, 1000)
-				}).catch(err => {
-					uni.showToast({
-						title: err,
-						icon: 'none'
-					});
-				});
-			},
-			// 调起发票类型弹窗
-			callType() {
-				if (this.header_type == 2) {
-					this.popupType = true;
-				} else {
-					uni.showToast({
-						title: this.$t(`个人仅支持普通发票`),
-						icon: 'none'
-					});
-				}
-			},
-			// 选择发票类型
-			changeType(e) {
-				const type = e.detail.value,
-					invoiceItem = this.invoiceTypeList.find(item => item.value === type);
-				if (type === '2' && this.header_type === '1') {
-					this.header_type = '2';
-				}
-				this.typeName = invoiceItem.name;
-				this.type = type;
-				this.popupType = false;
-			},
-			// 关闭发票弹窗
-			closeType() {
-				this.popupType = false;
-			},
-			// 选择抬头类型
-			changeTitleType(e) {
-				this.header_type = e.detail.value;
-				this.type = '1';
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	/deep/.disabled .uni-radio-input {
-		background-color: #F8F8F8;
-	}
-
-	form {
-		font-size: 28rpx;
-		color: #282828;
-	}
-
-	form input,
-	form radio-group {
-		flex: 1;
-		margin-left: 30rpx;
-		text-align: right;
-	}
-
-	form input {
-		font-size: 26rpx;
-	}
-
-	form label {
-		margin-right: 50rpx;
-	}
-
-	form radio {
-		margin-right: 8rpx;
-	}
-
-	form checkbox-group {
-		height: 90rpx;
-	}
-
-	form checkbox {
-		margin-right: 20rpx;
-	}
-
-	.panel {
-		padding-right: 30rpx;
-		padding-left: 30rpx;
-		background-color: #FFFFFF;
-	}
-
-	.panel~.panel {
-		margin-top: 14rpx;
-	}
-
-	.panel .acea-row {
-		height: 90rpx;
-	}
-
-	.panel .acea-row~.acea-row {
-		border-top: 1rpx solid #EEEEEE;
-	}
-
-	.input-placeholder {
-		font-size: 26rpx;
-		color: #BBBBBB;
-	}
-
-	.icon-xiangyou {
-		margin-left: 25rpx;
-		font-size: 26rpx;
-		color: #BFBFBF;
-		margin-top: 2rpx;
-	}
-
-	.popup {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		z-index: 99;
-		width: 100%;
-		padding-bottom: 100rpx;
-		border-top-left-radius: 16rpx;
-		border-top-right-radius: 16rpx;
-		background-color: #F5F5F5;
-		overflow: hidden;
-		transform: translateY(100%);
-		transition: 0.3s;
-	}
-
-	.popup.on {
-		transform: translateY(0);
-	}
-
-	.popup .title {
-		position: relative;
-		height: 137rpx;
-		font-size: 32rpx;
-		line-height: 137rpx;
-		text-align: center;
-	}
-
-	.popup scroll-view {
-		height: 466rpx;
-		padding-right: 30rpx;
-		padding-left: 30rpx;
-		box-sizing: border-box;
-	}
-
-	.popup label {
-		padding: 35rpx 30rpx;
-		border-radius: 16rpx;
-		margin-bottom: 20rpx;
-		background-color: #FFFFFF;
-	}
-
-	.popup .text {
-		flex: 1;
-		min-width: 0;
-		font-size: 28rpx;
-		color: #282828;
-	}
-
-	.popup .info {
-		margin-top: 10rpx;
-		font-size: 22rpx;
-		color: #909090;
-	}
-
-	.popup .icon-guanbi {
-		position: absolute;
-		top: 50%;
-		right: 30rpx;
-		z-index: 2;
-		transform: translateY(-50%);
-		font-size: 30rpx;
-		color: #707070;
-		cursor: pointer;
-	}
-
-	.popup .text .acea-row {
-		display: inline-flex;
-		max-width: 100%;
-	}
-
-	.popup .name {
-		flex: 1;
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		font-size: 30rpx;
-	}
-
-	.popup .label {
-		width: 56rpx;
-		height: 28rpx;
-		border: 1rpx solid #E93323;
-		margin-left: 18rpx;
-		font-size: 20rpx;
-		line-height: 26rpx;
-		text-align: center;
-		color: #E93323;
-	}
-
-	.popup .type {
-		width: 124rpx;
-		height: 42rpx;
-		margin-top: 14rpx;
-		background-color: #FCF0E0;
-		font-size: 24rpx;
-		line-height: 42rpx;
-		text-align: center;
-		color: #D67300;
-	}
-
-	.popup .type.special {
-		background-color: #FDE9E7;
-		color: #E93323;
-	}
-
-	.button-section {
-		/* position: fixed;
-		bottom: 0;
-		left: 0;
-		width: 100%; */
-		padding: 58rpx 30rpx;
-	}
-
-	.button-section .button {
-		height: 86rpx;
-		border-radius: 43rpx;
-		background-color: var(--view-theme);
-		font-size: 30rpx;
-		line-height: 86rpx;
-		color: #FFFFFF;
-	}
-
-	.button-section .navigator {
-		height: 86rpx;
-		border: 1rpx solid var(--view-theme);
-		border-radius: 43rpx;
-		margin-top: 26rpx;
-		font-size: 30rpx;
-		line-height: 86rpx;
-		text-align: center;
-		color: var(--view-theme);
-	}
-</style>
+<template>
+	<view :style="colorStyle">
+		<form @submit="formSubmit">
+			<view class="panel">
+				<view class="acea-row row-middle">
+					<view>{{$t(`抬头类型`)}}</view>
+					<radio-group name="header_type" @change="changeTitleType">
+						<label>
+							<radio class="disabled" value="1" :checked="header_type === '1'" /><text>{{$t(`个人`)}}</text>
+						</label>
+						<label>
+							<radio value="2" :checked="header_type === '2'" /><text>{{$t(`企业`)}}</text>
+						</label>
+					</radio-group>
+				</view>
+				<view class="acea-row row-middle" v-if="basicConfigData.special_invoice_status === '1' && header_type === '2'">
+					<view>{{$t(`发票类型`)}}</view>
+					<text class="w-fill" @click="callType">
+						<text>{{ type === '2' ? $t(`增值税电子专用发票`) : $t(`增值税电子普通发票`) }} </text>
+						<text class="iconfont icon-xiangyou"></text>
+					</text>
+
+				</view>
+				<view class="acea-row row-middle">
+					<view>{{$t(`发票抬头`)}}</view>
+					<input name="name" :value="name" :placeholder="header_type === '1' ? $t(`需要开具发票的姓名`) : $t(`需要开具发票的企业名称`)" />
+				</view>
+				<view v-show="header_type === '2'" class="acea-row row-middle">
+					<view>{{$t(`税号`)}}</view>
+					<input name="duty_number" :value="duty_number" :placeholder="$t(`纳税人识别号`)" />
+				</view>
+				<view class="acea-row row-middle">
+					<view>{{$t(`手机号`)}}</view>
+					<input name="drawer_phone" :value="drawer_phone" :placeholder="$t(`您的手机号`)" />
+				</view>
+				<view class="acea-row row-middle">
+					<view>{{$t(`邮箱`)}}</view>
+					<input name="email" :value="email" :placeholder="$t(`您的联系邮箱`)" />
+				</view>
+			</view>
+			<view v-show="type === '2'" class="panel">
+				<view class="acea-row row-middle">
+					<view>{{$t(`开户银行`)}}</view>
+					<input name="bank" :value="bank" :placeholder="$t(`您的开户银行`)" />
+				</view>
+				<view class="acea-row row-middle">
+					<view>{{$t(`银行账号`)}}</view>
+					<input name="card_number" :value="card_number" :placeholder="$t(`您的银行账号`)" />
+				</view>
+				<view class="acea-row row-middle">
+					<view>{{$t(`企业地址`)}}</view>
+					<input name="address" :value="address" :placeholder="$t(`您所在的企业地址`)" />
+				</view>
+				<view class="acea-row row-middle">
+					<view>{{$t(`企业电话`)}}</view>
+					<input name="tell" :value="tell" :placeholder="$t(`您的企业电话`)" />
+				</view>
+			</view>
+			<checkbox-group class="acea-row row-middle panel" name="is_default">
+				<label>
+					<checkbox :checked="is_default.length !== 0" /><text>{{$t(`设置为默认抬头`)}}</text>
+				</label>
+			</checkbox-group>
+			<view class="button-section">
+				<button class="button" form-type="submit">{{$t(`保存`)}}</button>
+				<navigator class="navigator" :url="backUrl" hover-class="none">{{$t(`取消`)}}</navigator>
+			</view>
+		</form>
+		<view :class="{ mask: popupType }"></view>
+		<view class="popup" :class="{ on: popupType }">
+			<view class="title">{{$t(`发票类型选择`)}}<text class="iconfont icon-guanbi" @click="closeType"></text></view>
+			<scroll-view scroll-y="true">
+				<radio-group name="invoice-type" @change="changeType">
+					<template v-for="item in invoiceTypeList">
+						<label v-if="item.value === '1' || item.value === '2' && specialInvoice" :key="item.type"
+							class="acea-row row-middle">
+							<view class="text">
+								<view>{{ $t(item.name) }}</view>
+								<view class="info">{{ $t(item.info) }}</view>
+							</view>
+							<radio :value="item.value" :checked="item.value === type" />
+						</label>
+					</template>
+				</radio-group>
+			</scroll-view>
+		</view>
+		<!-- #ifndef MP -->
+		<home></home>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import home from '@/components/home';
+	import {
+		invoiceSave,
+		invoiceDetail
+	} from '@/api/user.js';
+	import colors from '@/mixins/color.js';
+	export default {
+		components: {
+			home
+		},
+		mixins: [colors],
+		data() {
+			return {
+				invoiceTypeList: [{
+						name: this.$t(`增值税电子普通发票`),
+						value: '1',
+						info: this.$t(`纸质发票开出后将以邮寄形式交付`)
+					},
+					{
+						name: this.$t(`增值税电子专用发票`),
+						value: '2',
+						info: this.$t(`纸质发票开出后将以邮寄形式交付`)
+					}
+				],
+				id: '', // 修改时为必须参数
+				header_type: '1', // 抬头类型1: 个人2： 企业
+				type: '1', // 发票类型1：普通2：专用
+				drawer_phone: '', // 开票人手机号
+				name: '', // 名称（发票抬头）
+				duty_number: '', // 税号（个人为非必需，企业是必需参数）
+				tell: '', // 公司注册电话
+				address: '', // 注册地址
+				bank: '', // 开户行
+				card_number: '', // 银行卡号
+				is_default: [], // 是否默认
+				email: '', // 邮箱
+				popupType: false,
+				typeName: '',
+				urlQuery: '',
+				from: '',
+				specialInvoice: true,
+				order_id: '',
+				basicConfigData: uni.getStorageSync('BASIC_CONFIG') || ''
+			};
+		},
+		computed: {
+			backUrl() {
+				switch (this.from) {
+					case 'order_confirm':
+						return `/pages/goods/order_confirm/index${this.urlQuery}`;
+						break;
+					default:
+						return '/pages/users/user_invoice_list/index?from=invoice_form';
+						break;
+				}
+			}
+		},
+		onHide() {
+			this.from = ''
+		},
+		onLoad(options) {
+
+			if (options.id) uni.setNavigationBarTitle({
+				title: '编辑发票'
+			})
+			for (let key in options) {
+				switch (key) {
+					case 'couponTitle':
+					case 'new':
+					case 'cartId':
+					case 'pinkId':
+					case 'couponId':
+					case 'addressId':
+						this.urlQuery += `${this.urlQuery ? '&' : '?'}${key}=${options[key]}`;
+						break;
+					case 'from':
+						this.from = options[key];
+						break;
+					case 'header_type':
+						this.header_type = options[key];
+						break;
+					case 'id':
+						this.id = options[key];
+						this.getInvoiceDetail();
+						break;
+					case 'specialInvoice':
+						if (options[key] === 'false') {
+							this.specialInvoice = false;
+						}
+						break;
+				}
+			}
+			if (options.order_id)
+				this.order_id = options.order_id
+			const invoiceItem = this.invoiceTypeList.find(item => item.value === this.type);
+			this.typeName = invoiceItem.name;
+		},
+		methods: {
+			// 获取发票数据
+			getInvoiceDetail() {
+				uni.showLoading({
+					title: this.$t(`加载中`)
+				});
+				invoiceDetail(this.id).then(res => {
+					uni.hideLoading();
+					this.header_type = res.data.header_type.toString();
+					this.type = res.data.type.toString();
+					const invoiceItem = this.invoiceTypeList.find(item => item.value === this.type);
+					this.typeName = invoiceItem.name;
+					this.name = res.data.name;
+					this.drawer_phone = res.data.drawer_phone;
+					this.email = res.data.email;
+					this.duty_number = res.data.duty_number;
+					this.bank = res.data.bank;
+					this.card_number = res.data.card_number;
+					this.address = res.data.address;
+					this.tell = res.data.tell;
+					this.is_default = res.data.is_default ? [''] : [];
+				}).catch(err => {
+					uni.showToast({
+						title: err,
+						icon: 'none'
+					});
+				});
+			},
+			// 保存
+			formSubmit(e) {
+				let that = this;
+				const formData = e.detail.value;
+				formData.type = this.type;
+				if (formData.header_type === '1') {
+					if (!formData.name) {
+						return uni.showToast({
+							title: that.$t(`请输入需要开具发票的姓名`),
+							icon: 'none'
+						});
+					}
+					if (!formData.drawer_phone) {
+						return uni.showToast({
+							title: that.$t(`请输入您的手机号`),
+							icon: 'none'
+						});
+					}
+					if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(formData.drawer_phone)) {
+						return uni.showToast({
+							title: that.$t(`请正确输入您的手机号`),
+							icon: 'none'
+						});
+					}
+					if (!formData.email) {
+						return uni.showToast({
+							title: that.$t(`请输入您的联系邮箱`),
+							icon: 'none'
+						});
+					}
+					if (!/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(formData.email)) {
+						return uni.showToast({
+							title: that.$t(`请正确输入您的联系邮箱`),
+							icon: 'none'
+						});
+					}
+				}
+				if (formData.header_type === '2') {
+					if (formData.type === '1') {
+						if (!formData.name) {
+							return uni.showToast({
+								title: that.$t(`请输入需要开具发票的企业名称`),
+								icon: 'none'
+							});
+						}
+						if (!formData.duty_number) {
+							return uni.showToast({
+								title: that.$t(`请输入纳税人识别号`),
+								icon: 'none'
+							});
+						}
+						if (!/[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}/.test(formData.duty_number)) {
+							return uni.showToast({
+								title: that.$t(`请正确输入纳税人识别号`),
+								icon: 'none'
+							});
+						}
+						if (!formData.drawer_phone) {
+							return uni.showToast({
+								title: that.$t(`请输入您的手机号`),
+								icon: 'none'
+							});
+						}
+						if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(formData.drawer_phone)) {
+							return uni.showToast({
+								title: that.$t(`请正确输入您的手机号`),
+								icon: 'none'
+							});
+						}
+						if (!formData.email) {
+							return uni.showToast({
+								title: that.$t(`请输入您的联系邮箱`),
+								icon: 'none'
+							});
+						}
+						if (!/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(formData.email)) {
+							return uni.showToast({
+								title: that.$t(`请正确输入您的联系邮箱`),
+								icon: 'none'
+							});
+						}
+					}
+					if (formData.type === '2') {
+						if (!formData.name) {
+							return uni.showToast({
+								title: that.$t(`请输入需要开具发票的企业名称`),
+								icon: 'none'
+							});
+						}
+						if (!formData.duty_number) {
+							return uni.showToast({
+								title: that.$t(`请输入纳税人识别号`),
+								icon: 'none'
+							});
+						}
+						if (!/[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}/.test(formData.duty_number)) {
+							return uni.showToast({
+								title: that.$t(`请正确输入纳税人识别号`),
+								icon: 'none'
+							});
+						}
+						if (!formData.drawer_phone) {
+							return uni.showToast({
+								title: that.$t(`请输入您的手机号`),
+								icon: 'none'
+							});
+						}
+						if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(formData.drawer_phone)) {
+							return uni.showToast({
+								title: that.$t(`请正确输入您的手机号`),
+								icon: 'none'
+							});
+						}
+						if (!formData.email) {
+							return uni.showToast({
+								title: that.$t(`请输入您的联系邮箱`),
+								icon: 'none'
+							});
+						}
+						if (!/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(formData.email)) {
+							return uni.showToast({
+								title: that.$t(`请正确输入您的联系邮箱`),
+								icon: 'none'
+							});
+						}
+						if (!formData.bank) {
+							return uni.showToast({
+								title: that.$t(`请输入您的开户银行`),
+								icon: 'none'
+							});
+						}
+						if (!formData.card_number) {
+							return uni.showToast({
+								title: that.$t(`请输入您的银行账号`),
+								icon: 'none'
+							});
+						}
+						if (!/^\d{16}|\d{19}$/.test(formData.card_number)) {
+							return uni.showToast({
+								title: that.$t(`请正确输入您的银行账号`),
+								icon: 'none'
+							});
+						}
+						if (!formData.address) {
+							return uni.showToast({
+								title: that.$t(`请输入您所在的企业地址`),
+								icon: 'none'
+							});
+						}
+						if (!formData.tell) {
+							return uni.showToast({
+								title: that.$t(`请输入您的企业电话`),
+								icon: 'none'
+							});
+						}
+					}
+				}
+				formData.is_default = formData.is_default.length;
+				formData.id = this.id;
+
+				uni.showLoading({
+					title: that.$t(`保存中`)
+				});
+				invoiceSave(formData).then(res => {
+					uni.showToast({
+						title: res.msg,
+						icon: 'success',
+					});
+					setTimeout(e => {
+						switch (that.from) {
+							case 'order_confirm':
+								if (that.id) {
+									uni.navigateTo({
+										url: `/pages/goods/order_confirm/index${that.urlQuery}&invoice_id=${that.id}&invoice_type=${formData.type}&header_type=${this.header_type}`
+									})
+								} else {
+									uni.navigateTo({
+										url: `/pages/goods/order_confirm/index${that.urlQuery}&invoice_id=${res.data.id}&invoice_type=${formData.type}&header_type=${this.header_type}`
+									})
+								}
+								break;
+							case 'order_details':
+								if (that.id) {
+									uni.navigateTo({
+										url: `/pages/goods/order_details/index?order_id=${that.order_id}&invoice_id=${that.id}&header_type=${this.header_type}`
+									})
+								} else {
+									uni.navigateTo({
+										url: `/pages/goods/order_details/index?order_id=${that.order_id}&invoice_id=${res.data.id}&header_type=${this.header_type}`
+									})
+								}
+								break;
+							default:
+								uni.navigateTo({
+									url: '/pages/users/user_invoice_list/index?from=invoice_form'
+								});
+								break;
+						}
+					}, 1000)
+				}).catch(err => {
+					uni.showToast({
+						title: err,
+						icon: 'none'
+					});
+				});
+			},
+			// 调起发票类型弹窗
+			callType() {
+				if (this.header_type == 2) {
+					this.popupType = true;
+				} else {
+					uni.showToast({
+						title: this.$t(`个人仅支持普通发票`),
+						icon: 'none'
+					});
+				}
+			},
+			// 选择发票类型
+			changeType(e) {
+				const type = e.detail.value,
+					invoiceItem = this.invoiceTypeList.find(item => item.value === type);
+				if (type === '2' && this.header_type === '1') {
+					this.header_type = '2';
+				}
+				this.typeName = invoiceItem.name;
+				this.type = type;
+				this.popupType = false;
+			},
+			// 关闭发票弹窗
+			closeType() {
+				this.popupType = false;
+			},
+			// 选择抬头类型
+			changeTitleType(e) {
+				this.header_type = e.detail.value;
+				this.type = '1';
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	/deep/.disabled .uni-radio-input {
+		background-color: #F8F8F8;
+	}
+
+	form {
+		font-size: 28rpx;
+		color: #282828;
+	}
+
+	form input,
+	form radio-group {
+		flex: 1;
+		margin-left: 30rpx;
+		text-align: right;
+	}
+
+	form input {
+		font-size: 26rpx;
+	}
+
+	form label {
+		margin-right: 50rpx;
+	}
+
+	form radio {
+		margin-right: 8rpx;
+	}
+
+	form checkbox-group {
+		height: 90rpx;
+	}
+
+	form checkbox {
+		margin-right: 20rpx;
+	}
+
+	.panel {
+		padding-right: 30rpx;
+		padding-left: 30rpx;
+		background-color: #FFFFFF;
+
+		.w-fill {
+			margin-left: auto;
+			font-size: 26rpx;
+		}
+	}
+
+	.panel~.panel {
+		margin-top: 14rpx;
+	}
+
+	.panel .acea-row {
+		height: 90rpx;
+	}
+
+	.panel .acea-row~.acea-row {
+		border-top: 1rpx solid #EEEEEE;
+	}
+
+	.input-placeholder {
+		font-size: 26rpx;
+		color: #BBBBBB;
+	}
+
+	.icon-xiangyou {
+		margin-left: 5rpx;
+		font-size: 26rpx;
+		color: #BFBFBF;
+		margin-top: 2rpx;
+	}
+
+	.popup {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		z-index: 99;
+		width: 100%;
+		padding-bottom: 100rpx;
+		border-top-left-radius: 16rpx;
+		border-top-right-radius: 16rpx;
+		background-color: #F5F5F5;
+		overflow: hidden;
+		transform: translateY(100%);
+		transition: 0.3s;
+	}
+
+	.popup.on {
+		transform: translateY(0);
+	}
+
+	.popup .title {
+		position: relative;
+		height: 137rpx;
+		font-size: 32rpx;
+		line-height: 137rpx;
+		text-align: center;
+	}
+
+	.popup scroll-view {
+		height: 466rpx;
+		padding-right: 30rpx;
+		padding-left: 30rpx;
+		box-sizing: border-box;
+	}
+
+	.popup label {
+		padding: 35rpx 30rpx;
+		border-radius: 16rpx;
+		margin-bottom: 20rpx;
+		background-color: #FFFFFF;
+	}
+
+	.popup .text {
+		flex: 1;
+		min-width: 0;
+		font-size: 28rpx;
+		color: #282828;
+	}
+
+	.popup .info {
+		margin-top: 10rpx;
+		font-size: 22rpx;
+		color: #909090;
+	}
+
+	.popup .icon-guanbi {
+		position: absolute;
+		top: 50%;
+		right: 30rpx;
+		z-index: 2;
+		transform: translateY(-50%);
+		font-size: 30rpx;
+		color: #707070;
+		cursor: pointer;
+	}
+
+	.popup .text .acea-row {
+		display: inline-flex;
+		max-width: 100%;
+	}
+
+	.popup .name {
+		flex: 1;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		font-size: 30rpx;
+	}
+
+	.popup .label {
+		width: 56rpx;
+		height: 28rpx;
+		border: 1rpx solid #E93323;
+		margin-left: 18rpx;
+		font-size: 20rpx;
+		line-height: 26rpx;
+		text-align: center;
+		color: #E93323;
+	}
+
+	.popup .type {
+		width: 124rpx;
+		height: 42rpx;
+		margin-top: 14rpx;
+		background-color: #FCF0E0;
+		font-size: 24rpx;
+		line-height: 42rpx;
+		text-align: center;
+		color: #D67300;
+	}
+
+	.popup .type.special {
+		background-color: #FDE9E7;
+		color: #E93323;
+	}
+
+	.button-section {
+		/* position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%; */
+		padding: 58rpx 30rpx;
+	}
+
+	.button-section .button {
+		height: 86rpx;
+		border-radius: 43rpx;
+		background-color: var(--view-theme);
+		font-size: 30rpx;
+		line-height: 86rpx;
+		color: #FFFFFF;
+	}
+
+	.button-section .navigator {
+		height: 86rpx;
+		border: 1rpx solid var(--view-theme);
+		border-radius: 43rpx;
+		margin-top: 26rpx;
+		font-size: 30rpx;
+		line-height: 86rpx;
+		text-align: center;
+		color: var(--view-theme);
+	}
+</style>
\ No newline at end of file