Browse Source

Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev

From-wh 2 years ago
parent
commit
9da7b47975
100 changed files with 215 additions and 76 deletions
  1. 2 1
      crmeb/app/Request.php
  2. 2 1
      crmeb/app/api/controller/v1/PublicController.php
  3. 35 0
      crmeb/app/api/controller/v1/order/StoreOrderController.php
  4. 1 1
      crmeb/app/api/route/v1.php
  5. 1 1
      crmeb/app/jobs/AutoCommentJob.php
  6. 1 1
      crmeb/app/model/other/Express.php
  7. 70 0
      crmeb/app/outapi/controller/User.php
  8. 3 1
      crmeb/app/outapi/route/route.php
  9. 1 1
      crmeb/app/services/message/notice/SmsService.php
  10. 6 4
      crmeb/app/services/order/StoreOrderDeliveryServices.php
  11. 9 0
      crmeb/app/services/order/StoreOrderServices.php
  12. 2 0
      crmeb/app/services/pc/HomeServices.php
  13. 1 1
      crmeb/app/services/product/product/CopyTaobaoServices.php
  14. 1 1
      crmeb/app/services/shipping/ExpressServices.php
  15. 22 0
      crmeb/app/services/user/OutUserServices.php
  16. 1 1
      crmeb/app/services/wechat/WechatUserServices.php
  17. 2 1
      crmeb/crmeb/services/copyproduct/CopyProduct.php
  18. 2 3
      crmeb/crmeb/services/copyproduct/storage/Copy.php
  19. 5 9
      crmeb/crmeb/services/express/storage/Express.php
  20. 2 4
      crmeb/crmeb/services/sms/storage/Yihaotong.php
  21. 1 1
      crmeb/public/admin/css.worker.js
  22. 1 1
      crmeb/public/admin/editor.worker.js
  23. 1 1
      crmeb/public/admin/html.worker.js
  24. 1 1
      crmeb/public/admin/index.html
  25. 1 1
      crmeb/public/admin/json.worker.js
  26. 2 2
      crmeb/public/admin/system_static/css/app.86b87606.css
  27. 1 0
      crmeb/public/admin/system_static/css/chunk-00c04daa.a0dbb7ad.css
  28. 0 1
      crmeb/public/admin/system_static/css/chunk-01096d07.ed499a06.css
  29. 0 1
      crmeb/public/admin/system_static/css/chunk-019ecb56.af84e76f.css
  30. 1 0
      crmeb/public/admin/system_static/css/chunk-01e6d3d8.754868cc.css
  31. 0 1
      crmeb/public/admin/system_static/css/chunk-01fe4922.00a0a15f.css
  32. 0 1
      crmeb/public/admin/system_static/css/chunk-0206364c.e960d769.css
  33. 1 0
      crmeb/public/admin/system_static/css/chunk-02519d53.8972d110.css
  34. 0 1
      crmeb/public/admin/system_static/css/chunk-03e7133c.421a7c77.css
  35. 0 1
      crmeb/public/admin/system_static/css/chunk-04674c34.7749efa3.css
  36. 1 0
      crmeb/public/admin/system_static/css/chunk-04a3ff7b.2ad6e055.css
  37. 1 0
      crmeb/public/admin/system_static/css/chunk-05106bdc.b893c4af.css
  38. 1 0
      crmeb/public/admin/system_static/css/chunk-05920e65.e2d75467.css
  39. 0 1
      crmeb/public/admin/system_static/css/chunk-05cbf24e.c429dc00.css
  40. 1 0
      crmeb/public/admin/system_static/css/chunk-05ea5920.30dce022.css
  41. 0 1
      crmeb/public/admin/system_static/css/chunk-06425c0e.61b14e04.css
  42. 1 0
      crmeb/public/admin/system_static/css/chunk-06ebf9ce.3a9dc686.css
  43. 0 1
      crmeb/public/admin/system_static/css/chunk-06f7b54e.6674366d.css
  44. 1 0
      crmeb/public/admin/system_static/css/chunk-079229da.f3a1ec95.css
  45. 0 1
      crmeb/public/admin/system_static/css/chunk-07b5ff65.1b08dbb6.css
  46. 1 1
      crmeb/public/admin/system_static/css/chunk-12f282dc.3606733e.css
  47. 0 1
      crmeb/public/admin/system_static/css/chunk-086db276.f46eed4f.css
  48. 0 1
      crmeb/public/admin/system_static/css/chunk-093c89cc.0a7b4a84.css
  49. 1 0
      crmeb/public/admin/system_static/css/chunk-09440efa.cdfda7ba.css
  50. 1 0
      crmeb/public/admin/system_static/css/chunk-099175c5.89f04a35.css
  51. 1 0
      crmeb/public/admin/system_static/css/chunk-0aa2b787.adede869.css
  52. 0 1
      crmeb/public/admin/system_static/css/chunk-0b2d157a.5f3aee83.css
  53. 1 0
      crmeb/public/admin/system_static/css/chunk-0bf0da8f.c8241b72.css
  54. 0 1
      crmeb/public/admin/system_static/css/chunk-0c9c680c.1287012e.css
  55. 0 1
      crmeb/public/admin/system_static/css/chunk-0ca76063.b9a345b5.css
  56. 0 1
      crmeb/public/admin/system_static/css/chunk-0d7d8855.52d95e02.css
  57. 0 1
      crmeb/public/admin/system_static/css/chunk-0d965040.c76f98e6.css
  58. 1 1
      crmeb/public/admin/system_static/css/chunk-0e57060d.36765c6b.css
  59. 0 1
      crmeb/public/admin/system_static/css/chunk-0ee931b8.ea29e84b.css
  60. 0 1
      crmeb/public/admin/system_static/css/chunk-0f053020.d1425a68.css
  61. 1 1
      crmeb/public/admin/system_static/css/chunk-19022f92.da084d64.css
  62. 0 1
      crmeb/public/admin/system_static/css/chunk-114e83d5.6cfd1dd1.css
  63. 1 0
      crmeb/public/admin/system_static/css/chunk-120c0092.ec23e6f9.css
  64. 0 1
      crmeb/public/admin/system_static/css/chunk-122363b0.77475f5f.css
  65. 1 0
      crmeb/public/admin/system_static/css/chunk-1311a96c.d5cad0ec.css
  66. 0 1
      crmeb/public/admin/system_static/css/chunk-1430bc46.7eef744e.css
  67. 1 0
      crmeb/public/admin/system_static/css/chunk-14dc10d0.5765ce40.css
  68. 0 1
      crmeb/public/admin/system_static/css/chunk-14dd4022.34f7db24.css
  69. 1 0
      crmeb/public/admin/system_static/css/chunk-14edecb8.2bdc7b96.css
  70. 1 0
      crmeb/public/admin/system_static/css/chunk-14f640e8.852819b6.css
  71. 1 0
      crmeb/public/admin/system_static/css/chunk-150a8868.d466a55c.css
  72. 1 0
      crmeb/public/admin/system_static/css/chunk-154fe203.8f0f4543.css
  73. 1 0
      crmeb/public/admin/system_static/css/chunk-1575bc82.fd5ce423.css
  74. 0 1
      crmeb/public/admin/system_static/css/chunk-157b4f48.fb9470f3.css
  75. 0 1
      crmeb/public/admin/system_static/css/chunk-15a639cc.31d891be.css
  76. 1 0
      crmeb/public/admin/system_static/css/chunk-16664176.b283ab92.css
  77. 0 1
      crmeb/public/admin/system_static/css/chunk-17a4dcd4.a2a430b1.css
  78. 1 0
      crmeb/public/admin/system_static/css/chunk-17da9750.439ce86b.css
  79. 0 1
      crmeb/public/admin/system_static/css/chunk-182c3b12.965a26d4.css
  80. 0 1
      crmeb/public/admin/system_static/css/chunk-192b85c8.b1d7015d.css
  81. 1 0
      crmeb/public/admin/system_static/css/chunk-1968e73c.36772641.css
  82. 1 0
      crmeb/public/admin/system_static/css/chunk-196cd792.6cf24d5c.css
  83. 1 0
      crmeb/public/admin/system_static/css/chunk-19bbb8d5.eff42d42.css
  84. 1 0
      crmeb/public/admin/system_static/css/chunk-1a563559.bf555b4b.css
  85. 0 1
      crmeb/public/admin/system_static/css/chunk-1ab5c2f9.f2d5cc45.css
  86. 1 0
      crmeb/public/admin/system_static/css/chunk-1ac44521.7e4ea005.css
  87. 0 1
      crmeb/public/admin/system_static/css/chunk-1bc71a8c.77993446.css
  88. 1 0
      crmeb/public/admin/system_static/css/chunk-1c19d602.1a9e0147.css
  89. 1 0
      crmeb/public/admin/system_static/css/chunk-1c512198.b8417b9f.css
  90. 1 1
      crmeb/public/admin/system_static/css/chunk-694d6d78.c2ec330a.css
  91. 0 1
      crmeb/public/admin/system_static/css/chunk-1cb94d23.421a7c77.css
  92. 1 0
      crmeb/public/admin/system_static/css/chunk-1cc2c273.27071fe8.css
  93. 1 0
      crmeb/public/admin/system_static/css/chunk-1cf27680.754868cc.css
  94. 1 0
      crmeb/public/admin/system_static/css/chunk-1d76b228.d28378bf.css
  95. 1 0
      crmeb/public/admin/system_static/css/chunk-1d99af8b.dbadc4b0.css
  96. 1 0
      crmeb/public/admin/system_static/css/chunk-1db96cd5.754868cc.css
  97. 0 1
      crmeb/public/admin/system_static/css/chunk-1dedce59.2a89d4d5.css
  98. 0 1
      crmeb/public/admin/system_static/css/chunk-1ef2b5e4.421a7c77.css
  99. 0 1
      crmeb/public/admin/system_static/css/chunk-1f894614.c0a99313.css
  100. 0 0
      crmeb/public/admin/system_static/css/chunk-1f960c6f.344c4d72.css

+ 2 - 1
crmeb/app/Request.php

@@ -33,7 +33,8 @@ class Request extends \think\Request
      * 不过滤变量名
      * 不过滤变量名
      * @var array
      * @var array
      */
      */
-    protected $except = ['menu_path', 'api_url', 'unique_auth', 'description', 'custom_form', 'content', 'tableField'];
+    protected $except = ['menu_path', 'api_url', 'unique_auth',
+        'description', 'custom_form', 'content', 'tableField'];
 
 
     /**
     /**
      * 获取请求的数据
      * 获取请求的数据

+ 2 - 1
crmeb/app/api/controller/v1/PublicController.php

@@ -643,7 +643,8 @@ class PublicController
      */
      */
     public function getVersion()
     public function getVersion()
     {
     {
-        return app('json')->success(['version' => get_crmeb_version()]);
+        $version = parse_ini_file(app()->getRootPath() . '.version');
+        return app('json')->success(['version' => $version['version'], 'version_code' => $version['version_code']]);
     }
     }
 
 
     /**
     /**

+ 35 - 0
crmeb/app/api/controller/v1/order/StoreOrderController.php

@@ -44,6 +44,7 @@ use app\services\product\product\StoreProductReplyServices;
 use app\services\shipping\ShippingTemplatesServices;
 use app\services\shipping\ShippingTemplatesServices;
 use crmeb\services\CacheService;
 use crmeb\services\CacheService;
 use think\facade\Cache;
 use think\facade\Cache;
+use think\facade\Log;
 
 
 /**
 /**
  * 订单控制器
  * 订单控制器
@@ -826,6 +827,7 @@ class StoreOrderController
                 $update = [
                 $update = [
                     'label' => $data['data']['label'] ?? '',
                     'label' => $data['data']['label'] ?? '',
                 ];
                 ];
+                //韵达会异步推送单号
                 if (isset($data['kuaidinum'])) {
                 if (isset($data['kuaidinum'])) {
                     $update['delivery_id'] = $data['kuaidinum'];
                     $update['delivery_id'] = $data['kuaidinum'];
                 }
                 }
@@ -854,6 +856,39 @@ class StoreOrderController
                         ]);
                         ]);
                     });
                     });
                 }
                 }
+                break;
+            case 'order_cancel'://取消寄件
+                if (isset($data['data']['task_id'])) {
+                    $orderInfo = $this->services->get(['kuaidi_task_id' => $data['data']['task_id']]);
+                    if (!$orderInfo) {
+                        return app('json')->fail('订单不存在');
+                    }
+                    if ($orderInfo->is_stock_up && $orderInfo->status == 0) {
+                        app()->make(StoreOrderStatusServices::class)->save([
+                            'oid' => $orderInfo->id,
+                            'change_time' => time(),
+                            'change_type' => 'delivery_goods_cancel',
+                            'change_message' => '已取消发货,取消原因:用户手动取消'
+                        ]);
+
+                        $orderInfo->status = 0;
+                        $orderInfo->is_stock_up = 0;
+                        $orderInfo->kuaidi_task_id = '';
+                        $orderInfo->kuaidi_order_id = '';
+                        $orderInfo->express_dump = '';
+                        $orderInfo->kuaidi_label = '';
+                        $orderInfo->delivery_id = '';
+                        $orderInfo->delivery_code = '';
+                        $orderInfo->delivery_name = '';
+                        $orderInfo->delivery_type = '';
+                        $orderInfo->save();
+                    } else {
+                        Log::error('商家寄件自动回调,订单状态不正确:', [
+                            'kuaidi_task_id' => $data['data']['task_id']
+                        ]);
+                    }
+                }
+
                 break;
                 break;
         }
         }
 
 

+ 1 - 1
crmeb/app/api/route/v1.php

@@ -21,7 +21,7 @@ Route::group(function () {
     Route::any('order_call_back', 'v1.order.StoreOrderController/callBack')->option(['real_name' => '商家寄件回调']);//商家寄件回调
     Route::any('order_call_back', 'v1.order.StoreOrderController/callBack')->option(['real_name' => '商家寄件回调']);//商家寄件回调
     Route::get('get_script', 'v1.PublicController/getScript')->option(['real_name' => '获取统计代码']);//获取统计代码
     Route::get('get_script', 'v1.PublicController/getScript')->option(['real_name' => '获取统计代码']);//获取统计代码
     Route::get('version', 'v1.PublicController/getVersion')->option(['real_name' => '获取代码版本号']);
     Route::get('version', 'v1.PublicController/getVersion')->option(['real_name' => '获取代码版本号']);
-})->option(['mark' => 'serve', 'mark_name' => '服务接口']);
+})->middleware(\app\http\middleware\AllowOriginMiddleware::class)->option(['mark' => 'serve', 'mark_name' => '服务接口']);
 
 
 Route::group(function () {
 Route::group(function () {
     //apple快捷登陆
     //apple快捷登陆

+ 1 - 1
crmeb/app/jobs/AutoCommentJob.php

@@ -38,7 +38,7 @@ class AutoCommentJob extends BaseJobs
                 'uid' => $item['uid'],
                 'uid' => $item['uid'],
                 'oid' => $item['oid'],
                 'oid' => $item['oid'],
                 'unique' => $item['unique'],
                 'unique' => $item['unique'],
-                'product_id' => $item['product_id'],
+                'product_id' => json_decode($item['cart_info'],true)['product_id'],
                 'reply_type' => 'product',
                 'reply_type' => 'product',
                 'nickname' => $userInfos[$item['uid']]['nickname'],
                 'nickname' => $userInfos[$item['uid']]['nickname'],
                 'avatar' => $userInfos[$item['uid']]['avatar'],
                 'avatar' => $userInfos[$item['uid']]['avatar'],

+ 1 - 1
crmeb/app/model/other/Express.php

@@ -72,7 +72,7 @@ class Express extends BaseModel
 
 
     public function searchCodeAttr($query, $value)
     public function searchCodeAttr($query, $value)
     {
     {
-        if ($value === '') {
+        if ($value !== '') {
             $query->where('code', $value);
             $query->where('code', $value);
         }
         }
     }
     }

+ 70 - 0
crmeb/app/outapi/controller/User.php

@@ -97,6 +97,10 @@ class User extends AuthController
      * 赠送相关
      * 赠送相关
      * @param int $uid
      * @param int $uid
      * @return mixed
      * @return mixed
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
      */
      */
     public function give($uid)
     public function give($uid)
     {
     {
@@ -114,4 +118,70 @@ class User extends AuthController
         }
         }
         return app('json')->success(100010);
         return app('json')->success(100010);
     }
     }
+
+    /**
+     * 获取用户详情
+     * @param $uid
+     * @return \think\Response
+     * @author 吴汐
+     * @email 442384644@qq.com
+     * @date 2023/06/20
+     */
+    public function info($uid)
+    {
+        if (!$uid) return app('json')->fail(100100);
+        return app('json')->success($this->services->userInfo($uid));
+    }
+
+    /**
+     * 赠送余额
+     * @param int $uid
+     * @return mixed
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function giveBalance($uid)
+    {
+        $data = $this->request->postMore([
+            ['money_status', 0],
+            ['money', 0],
+            ['integration_status', 0],
+            ['integration', 0],
+            ['days', 0],
+            ['coupon', 0]
+        ]);
+        if (!$uid) return app('json')->fail(100100);
+        if (!$this->services->otherGive((int)$uid, $data)) {
+            return app('json')->fail(100005);
+        }
+        return app('json')->success(100010);
+    }
+
+    /**
+     * 赠送积分
+     * @param int $uid
+     * @return mixed
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function givePoint($uid)
+    {
+        $data = $this->request->postMore([
+            ['money_status', 0],
+            ['money', 0],
+            ['integration_status', 0],
+            ['integration', 0],
+            ['days', 0],
+            ['coupon', 0]
+        ]);
+        if (!$uid) return app('json')->fail(100100);
+        if (!$this->services->otherGive((int)$uid, $data)) {
+            return app('json')->fail(100005);
+        }
+        return app('json')->success(100010);
+    }
 }
 }

+ 3 - 1
crmeb/app/outapi/route/route.php

@@ -83,9 +83,11 @@ Route::group(function () {
 
 
             //用户
             //用户
             Route::get('user/list', 'User/lst')->option(['real_name' => '用户列表']);
             Route::get('user/list', 'User/lst')->option(['real_name' => '用户列表']);
+            Route::get('user/info/:uid', 'User/info')->option(['real_name' => '用户详情']);
             Route::post('user', 'User/save')->option(['real_name' => '新增用户']);
             Route::post('user', 'User/save')->option(['real_name' => '新增用户']);
             Route::put('user/:uid', 'User/update')->option(['real_name' => '修改用户']);
             Route::put('user/:uid', 'User/update')->option(['real_name' => '修改用户']);
-            Route::put('user/give/:uid', 'User/give')->option(['real_name' => '赠送积分/金额']);
+            Route::put('user/give_balance/:uid', 'User/giveBalance')->option(['real_name' => '赠送余额']);
+            Route::put('user/give_point/:uid', 'User/givePoint')->option(['real_name' => '赠送积分']);
         })->option(['mark' => 'user', 'mark_name' => '用户']);
         })->option(['mark' => 'user', 'mark_name' => '用户']);
 
 
     })->middleware(AuthTokenMiddleware::class);
     })->middleware(AuthTokenMiddleware::class);

+ 1 - 1
crmeb/app/services/message/notice/SmsService.php

@@ -111,7 +111,7 @@ class SmsService extends NoticeService
             }
             }
             $smsMake = $services->sms($type);
             $smsMake = $services->sms($type);
             //发送短信
             //发送短信
-            $res = $smsMake->send($phone, $templateId, $data, sys_config('yihaotong_sms_appid', ''));
+            $res = $smsMake->send($phone, $templateId, $data);
             if ($res === false) {
             if ($res === false) {
                 throw new ApiException($smsMake->getError());
                 throw new ApiException($smsMake->getError());
             }
             }

+ 6 - 4
crmeb/app/services/order/StoreOrderDeliveryServices.php

@@ -527,7 +527,7 @@ class StoreOrderDeliveryServices extends BaseServices
             if (!sys_config('config_export_open', 0)) {
             if (!sys_config('config_export_open', 0)) {
                 throw new AdminException(400528);
                 throw new AdminException(400528);
             }
             }
-            $dump = $expressService->express()->dump($expData, sys_config('yihaotong_face_appid', ''));
+            $dump = $expressService->express()->dump($expData);
             $orderInfo->delivery_id = $dump['kuaidinum'];
             $orderInfo->delivery_id = $dump['kuaidinum'];
             $data['express_dump'] = json_encode([
             $data['express_dump'] = json_encode([
                 'com' => $expData['com'],
                 'com' => $expData['com'],
@@ -576,7 +576,7 @@ class StoreOrderDeliveryServices extends BaseServices
 //            if (!sys_config('config_shippment_open', 0)) {
 //            if (!sys_config('config_shippment_open', 0)) {
 //                throw new AdminException('商家寄件未开启无法寄件');
 //                throw new AdminException('商家寄件未开启无法寄件');
 //            }
 //            }
-            $dump = $expressService->express()->shippmentCreateOrder($expData, sys_config('yihaotong_send_appid', ''));
+            $dump = $expressService->express()->shippmentCreateOrder($expData);
             Log::error('商家寄件返回数据:' . json_encode($dump));
             Log::error('商家寄件返回数据:' . json_encode($dump));
             $orderInfo->delivery_id = $dump['kuaidinum'] ?? '';
             $orderInfo->delivery_id = $dump['kuaidinum'] ?? '';
             $data['express_dump'] = json_encode([
             $data['express_dump'] = json_encode([
@@ -589,8 +589,8 @@ class StoreOrderDeliveryServices extends BaseServices
             ]);
             ]);
             $data['delivery_id'] = $dump['kuaidinum'] ?? '';
             $data['delivery_id'] = $dump['kuaidinum'] ?? '';
             $data['kuaidi_label'] = $dump['label'] ?? '';
             $data['kuaidi_label'] = $dump['label'] ?? '';
-            $data['kuaidi_task_id'] = $dump['taskId'] ?? '';
-            $data['kuaidi_order_id'] = $dump['orderId'] ?? '';
+            $data['kuaidi_task_id'] = $dump['task_id'] ?? '';
+            $data['kuaidi_order_id'] = $dump['order_id'] ?? '';
         } else {
         } else {
             if (!$data['delivery_id']) {
             if (!$data['delivery_id']) {
                 throw new AdminException(400531);
                 throw new AdminException(400531);
@@ -622,6 +622,8 @@ class StoreOrderDeliveryServices extends BaseServices
                 'is_stock_up' => 1,
                 'is_stock_up' => 1,
                 'delivery_type' => $data['delivery_type'],
                 'delivery_type' => $data['delivery_type'],
                 'delivery_name' => $data['delivery_name'],
                 'delivery_name' => $data['delivery_name'],
+                'delivery_code' => $data['delivery_code'],
+                'delivery_id' => $data['delivery_id'],
                 'kuaidi_label' => $data['kuaidi_label'],
                 'kuaidi_label' => $data['kuaidi_label'],
                 'kuaidi_task_id' => $data['kuaidi_task_id'],
                 'kuaidi_task_id' => $data['kuaidi_task_id'],
                 'kuaidi_order_id' => $data['kuaidi_order_id'],
                 'kuaidi_order_id' => $data['kuaidi_order_id'],

+ 9 - 0
crmeb/app/services/order/StoreOrderServices.php

@@ -2706,6 +2706,15 @@ HTML;
             ]);
             ]);
 
 
             $orderInfo->status = 0;
             $orderInfo->status = 0;
+            $orderInfo->is_stock_up = 0;
+            $orderInfo->kuaidi_task_id = '';
+            $orderInfo->kuaidi_order_id = '';
+            $orderInfo->express_dump = '';
+            $orderInfo->kuaidi_label = '';
+            $orderInfo->delivery_id = '';
+            $orderInfo->delivery_code = '';
+            $orderInfo->delivery_name = '';
+            $orderInfo->delivery_type = '';
             $orderInfo->save();
             $orderInfo->save();
         });
         });
 
 

+ 2 - 0
crmeb/app/services/pc/HomeServices.php

@@ -12,6 +12,7 @@ declare (strict_types=1);
 
 
 namespace app\services\pc;
 namespace app\services\pc;
 
 
+use app\services\activity\coupon\StoreCouponIssueServices;
 use app\services\BaseServices;
 use app\services\BaseServices;
 use app\services\product\product\StoreCategoryServices;
 use app\services\product\product\StoreCategoryServices;
 use app\services\product\product\StoreProductServices;
 use app\services\product\product\StoreProductServices;
@@ -42,6 +43,7 @@ class HomeServices extends BaseServices
                 } else {
                 } else {
                     $item['star'] = '3.0';
                     $item['star'] = '3.0';
                 }
                 }
+                $item['checkCoupon'] = app()->make(StoreCouponIssueServices::class)->checkProductCoupon($item['id']);
             }
             }
             $info['productList'] = get_thumb_water($productList, 'big');
             $info['productList'] = get_thumb_water($productList, 'big');
         }
         }

+ 1 - 1
crmeb/app/services/product/product/CopyTaobaoServices.php

@@ -55,7 +55,7 @@ class CopyTaobaoServices extends BaseServices
             case 1://平台
             case 1://平台
                 /** @var ServeServices $services */
                 /** @var ServeServices $services */
                 $services = app()->make(ServeServices::class);
                 $services = app()->make(ServeServices::class);
-                $resultData = $services->copy('copy')->goods($url, [], sys_config('yihaotong_copy_appid', ''));
+                $resultData = $services->copy('copy')->goods($url);
                 if (isset($resultData['description_image']) && is_string($resultData['description_image'])) {
                 if (isset($resultData['description_image']) && is_string($resultData['description_image'])) {
                     $resultData['description_image'] = json_decode($resultData['description_image'], true);
                     $resultData['description_image'] = json_decode($resultData['description_image'], true);
                 }
                 }

+ 1 - 1
crmeb/app/services/shipping/ExpressServices.php

@@ -203,7 +203,7 @@ class ExpressServices extends BaseServices
                 case 1:
                 case 1:
                     /** @var ServeServices $services */
                     /** @var ServeServices $services */
                     $services = app()->make(ServeServices::class);
                     $services = app()->make(ServeServices::class);
-                    $result = $services->express()->query($expressNum, $com, $phone, sys_config('yihaotong_express_appid', ''));
+                    $result = $services->express()->query($expressNum, $com, $phone);
                     if (isset($result['ischeck']) && $result['ischeck'] == 1) {
                     if (isset($result['ischeck']) && $result['ischeck'] == 1) {
                         $cacheTime = 0;
                         $cacheTime = 0;
                     } else {
                     } else {

+ 22 - 0
crmeb/app/services/user/OutUserServices.php

@@ -82,11 +82,29 @@ class OutUserServices extends BaseServices
         return compact('list', 'count');
         return compact('list', 'count');
     }
     }
 
 
+    /**
+     * 获取用户详情
+     * @param $uid
+     * @return mixed
+     * @author 吴汐
+     * @email 442384644@qq.com
+     * @date 2023/06/20
+     */
+    public function userInfo($uid)
+    {
+        $fields = ['uid', 'real_name', 'mark', 'nickname', 'avatar', 'phone', 'now_money', 'brokerage_price', 'integral', 'exp', 'sign_num', 'user_type', 'status', 'level',
+            'agent_level', 'spread_open', 'spread_uid', 'spread_time', 'user_type', 'is_promoter', 'pay_count', 'is_ever_level', 'is_money_level', 'overdue_time', 'add_time'];
+        return app()->make(UserServices::class)->get($uid, $fields);
+    }
+
     /**
     /**
      * 添加/修改用户
      * 添加/修改用户
      * @param int $uid
      * @param int $uid
      * @param array $data
      * @param array $data
      * @return int
      * @return int
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
      */
      */
     public function saveUser(int $uid, array $data): int
     public function saveUser(int $uid, array $data): int
     {
     {
@@ -151,6 +169,10 @@ class OutUserServices extends BaseServices
      * @param int $id
      * @param int $id
      * @param array $data
      * @param array $data
      * @return bool
      * @return bool
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
      */
      */
     public function otherGive(int $id, array $data): bool
     public function otherGive(int $id, array $data): bool
     {
     {

+ 1 - 1
crmeb/app/services/wechat/WechatUserServices.php

@@ -85,7 +85,7 @@ class WechatUserServices extends BaseServices
      */
      */
     public function openidToUid($openid, string $openidType = 'openid')
     public function openidToUid($openid, string $openidType = 'openid')
     {
     {
-        $uid = $this->dao->value([[$openidType, '=', $openid], ['user_type', '<>', 'h5']], 'uid');
+        $uid = $this->dao->value([$openidType => $openid, 'is_del' => 0], 'uid');
         if (!$uid)
         if (!$uid)
             throw new AdminException(400710);
             throw new AdminException(400710);
         return $uid;
         return $uid;

+ 2 - 1
crmeb/crmeb/services/copyproduct/CopyProduct.php

@@ -20,7 +20,8 @@ use think\Container;
 /**
 /**
  * Class Product
  * Class Product
  * @package crmeb\services\copyproduct
  * @package crmeb\services\copyproduct
- * @mixin \crmeb\services\copyproduct\CopyProduct
+ * @mixin \crmeb\services\copyproduct\storage\Copy
+ * @mixin \crmeb\services\copyproduct\storage\Copy99api
  */
  */
 class CopyProduct extends BaseManager
 class CopyProduct extends BaseManager
 {
 {

+ 2 - 3
crmeb/crmeb/services/copyproduct/storage/Copy.php

@@ -52,11 +52,10 @@ class Copy extends BaseCopyProduct
      * @param string $yihaotongCopyAppid
      * @param string $yihaotongCopyAppid
      * @return mixed
      * @return mixed
      */
      */
-    public function goods(string $url, array $options = [], string $yihaotongCopyAppid = '')
+    public function goods(string $url, array $options = [])
     {
     {
         $param['url'] = $url;
         $param['url'] = $url;
-        $header = $yihaotongCopyAppid != '' ? ['AppId:' . $yihaotongCopyAppid] : [];
-        return $this->accessToken->httpRequest(self::PRODUCT_GOODS, $param, 'post', true, $header);
+        return $this->accessToken->httpRequest(self::PRODUCT_GOODS, $param, 'post');
     }
     }
 
 
 
 

+ 5 - 9
crmeb/crmeb/services/express/storage/Express.php

@@ -98,7 +98,7 @@ class Express extends BaseExpress
      * @email 136327134@qq.com
      * @email 136327134@qq.com
      * @date 2023/5/15
      * @date 2023/5/15
      */
      */
-    public function shippmentCreateOrder(array $data, string $yihaotongSendAppid = '')
+    public function shippmentCreateOrder(array $data)
     {
     {
         $siid = sys_config('config_export_siid');
         $siid = sys_config('config_export_siid');
         $param = [
         $param = [
@@ -119,8 +119,7 @@ class Express extends BaseExpress
             'pickup_start_time' => $data['pickup_start_time'],
             'pickup_start_time' => $data['pickup_start_time'],
             'pickup_end_time' => $data['pickup_end_time'],
             'pickup_end_time' => $data['pickup_end_time'],
         ];
         ];
-        $header = $yihaotongSendAppid != '' ? ['AppId:' . $yihaotongSendAppid] : [];
-        return $this->accessToken->httpRequest(self::SHIPMENT_CREATE_ORDER, $param, 'post', true, $header);
+        return $this->accessToken->httpRequest(self::SHIPMENT_CREATE_ORDER, $param, 'post');
     }
     }
 
 
     /**
     /**
@@ -248,7 +247,7 @@ class Express extends BaseExpress
      * @return 物流状态:status 0在途,1揽收,2疑难,3签收,4退签,5派件,6退回,7转单,10待清关,11清关中,12已清关,13清关异常,14收件人拒签
      * @return 物流状态:status 0在途,1揽收,2疑难,3签收,4退签,5派件,6退回,7转单,10待清关,11清关中,12已清关,13清关异常,14收件人拒签
      * @return 物流详情 content
      * @return 物流详情 content
      */
      */
-    public function query(string $num, string $com = '', $phone = '', $yihaotongExpressAppid = '')
+    public function query(string $num, string $com = '', $phone = '')
     {
     {
         $param = [
         $param = [
             'com' => $com,
             'com' => $com,
@@ -258,20 +257,18 @@ class Express extends BaseExpress
         if ($com === null) {
         if ($com === null) {
             unset($param['com']);
             unset($param['com']);
         }
         }
-        $header = $yihaotongExpressAppid != '' ? ['AppId:' . $yihaotongExpressAppid] : [];
-        return $this->accessToken->httpRequest(self::EXPRESS_QUERY, $param, 'post', true, $header);
+        return $this->accessToken->httpRequest(self::EXPRESS_QUERY, $param, 'post');
     }
     }
 
 
     /**
     /**
      * 电子面单打印
      * 电子面单打印
      * @param array $data 必需参数: com(快递公司编码)、to_name(寄件人)、to_tel(寄件人电话)、to_addr(寄件人详细地址)、from_name(收件人)、from_tel(收件人电话)、from_addr(收件人地址)、temp_id(电子面单模板ID)、siid(云打印机编号)、count(商品数量)
      * @param array $data 必需参数: com(快递公司编码)、to_name(寄件人)、to_tel(寄件人电话)、to_addr(寄件人详细地址)、from_name(收件人)、from_tel(收件人电话)、from_addr(收件人地址)、temp_id(电子面单模板ID)、siid(云打印机编号)、count(商品数量)
-     * @param string $yihaotongFaceAppid
      * @return bool|mixed
      * @return bool|mixed
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
      */
      */
-    public function dump($data, $yihaotongFaceAppid = '')
+    public function dump($data)
     {
     {
         $param = $data;
         $param = $data;
         $param['com'] = $data['com'] ?? '';
         $param['com'] = $data['com'] ?? '';
@@ -315,7 +312,6 @@ class Express extends BaseExpress
         if (!sys_config('config_export_siid')) {
         if (!sys_config('config_export_siid')) {
             $header = ['version:v1.1'];
             $header = ['version:v1.1'];
         }
         }
-        $header = array_merge($header, $yihaotongFaceAppid != '' ? ['AppId:' . $yihaotongFaceAppid] : []);
         return $this->accessToken->httpRequest(self::EXPRESS_DUMP, $param, 'POST', true, $header);
         return $this->accessToken->httpRequest(self::EXPRESS_DUMP, $param, 'POST', true, $header);
     }
     }
 
 

+ 2 - 4
crmeb/crmeb/services/sms/storage/Yihaotong.php

@@ -199,10 +199,9 @@ class Yihaotong extends BaseSms
      * @param string $phone
      * @param string $phone
      * @param string $templateId
      * @param string $templateId
      * @param array $data
      * @param array $data
-     * @param string $yihaotongSmsAppid
      * @return bool|string
      * @return bool|string
      */
      */
-    public function send(string $phone, string $templateId, array $data = [], string $yihaotongSmsAppid = '')
+    public function send(string $phone, string $templateId, array $data = [])
     {
     {
         if (!$phone) {
         if (!$phone) {
             throw new AdminException(400719);
             throw new AdminException(400719);
@@ -216,8 +215,7 @@ class Yihaotong extends BaseSms
             throw new AdminException(400720);
             throw new AdminException(400720);
         }
         }
         $param['param'] = json_encode($data);
         $param['param'] = json_encode($data);
-        $header = $yihaotongSmsAppid != '' ? ['AppId:' . $yihaotongSmsAppid] : [];
-        return $this->accessToken->httpRequest(self::SMS_SEND, $param, 'post', true, $header);
+        return $this->accessToken->httpRequest(self::SMS_SEND, $param, 'post');
     }
     }
 
 
     /**
     /**

File diff suppressed because it is too large
+ 1 - 1
crmeb/public/admin/css.worker.js


File diff suppressed because it is too large
+ 1 - 1
crmeb/public/admin/editor.worker.js


File diff suppressed because it is too large
+ 1 - 1
crmeb/public/admin/html.worker.js


File diff suppressed because it is too large
+ 1 - 1
crmeb/public/admin/index.html


File diff suppressed because it is too large
+ 1 - 1
crmeb/public/admin/json.worker.js


File diff suppressed because it is too large
+ 2 - 2
crmeb/public/admin/system_static/css/app.86b87606.css


+ 1 - 0
crmeb/public/admin/system_static/css/chunk-00c04daa.a0dbb7ad.css

@@ -0,0 +1 @@
+.iview-video-style[data-v-24b17de0]{width:40%;height:180px;border-radius:10px;background-color:#707070;margin-top:10px;position:relative;overflow:hidden}.iview-video-style .iconv[data-v-24b17de0]{color:#fff;line-height:180px;width:50px;height:50px;display:inherit;font-size:26px;position:absolute;top:-74px;left:50%;margin-left:-25px}.iview-video-style .mark[data-v-24b17de0]{position:absolute;width:100%;height:30px;top:0;background-color:rgba(0,0,0,.5);text-align:center}

File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-01096d07.ed499a06.css


File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-019ecb56.af84e76f.css


+ 1 - 0
crmeb/public/admin/system_static/css/chunk-01e6d3d8.754868cc.css

@@ -0,0 +1 @@
+.v-transfer-dom[data-v-306b6d59] .ivu-modal-content-drag{z-index:2!important}.radio[data-v-306b6d59]{margin-bottom:14px}.radio[data-v-306b6d59] .name{width:125px;text-align:right;padding-right:12px}

File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-01fe4922.00a0a15f.css


File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-0206364c.e960d769.css


File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/system_static/css/chunk-02519d53.8972d110.css


+ 0 - 1
crmeb/public/admin/system_static/css/chunk-03e7133c.421a7c77.css

@@ -1 +0,0 @@
-.v-transfer-dom[data-v-5cc97a38] .ivu-modal-content-drag{z-index:2!important}.radio[data-v-5cc97a38]{margin-bottom:14px}.radio[data-v-5cc97a38] .name{width:125px;text-align:right;padding-right:12px}

File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-04674c34.7749efa3.css


File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/system_static/css/chunk-04a3ff7b.2ad6e055.css


File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/system_static/css/chunk-05106bdc.b893c4af.css


+ 1 - 0
crmeb/public/admin/system_static/css/chunk-05920e65.e2d75467.css

@@ -0,0 +1 @@
+.box[data-v-34f427be]{width:100%;height:100%;background:#fff}[data-v-34f427be] .ivu-card-body{min-height:700px}[data-v-34f427be] .conter .pictrueList{max-width:100%}

+ 0 - 1
crmeb/public/admin/system_static/css/chunk-05cbf24e.c429dc00.css

@@ -1 +0,0 @@
-.treeSel[data-v-5f459790] .ivu-select-dropdown-list{padding:0 10px!important;-webkit-box-sizing:border-box;box-sizing:border-box}.tabBox_img[data-v-5f459790]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-5f459790]{width:100%;height:100%}

+ 1 - 0
crmeb/public/admin/system_static/css/chunk-05ea5920.30dce022.css

@@ -0,0 +1 @@
+.tabBox_img[data-v-5d928576]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-5d928576]{width:100%;height:100%}

File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-06425c0e.61b14e04.css


File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/system_static/css/chunk-06ebf9ce.3a9dc686.css


File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-06f7b54e.6674366d.css


File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/system_static/css/chunk-079229da.f3a1ec95.css


+ 0 - 1
crmeb/public/admin/system_static/css/chunk-07b5ff65.1b08dbb6.css

@@ -1 +0,0 @@
-.list[data-v-23ea9663]{height:80%;min-height:500px}.pictrue[data-v-23ea9663]{width:100%;max-width:300px;height:360px}.right[data-v-23ea9663]{padding-right:75px}.left[data-v-23ea9663]{padding-left:75px}.num[data-v-23ea9663]{margin-bottom:24px;color:#515a6e;font-weight:600;font-size:72px;line-height:72px}.desc[data-v-23ea9663]{margin-bottom:16px;color:#808695;font-size:20px;line-height:28px}

+ 1 - 1
crmeb/public/admin/system_static/css/chunk-12f282dc.3606733e.css

@@ -1 +1 @@
-.rulesBox[data-v-75a46b5e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-wrap:wrap;flex-wrap:wrap}.attrFrom[data-v-75a46b5e] .ivu-form-item{margin-bottom:0!important}
+.rulesBox[data-v-20b8b7b0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-wrap:wrap;flex-wrap:wrap}.attrFrom[data-v-20b8b7b0] .ivu-form-item{margin-bottom:0!important}

File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-086db276.f46eed4f.css


File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-093c89cc.0a7b4a84.css


File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/system_static/css/chunk-09440efa.cdfda7ba.css


File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/system_static/css/chunk-099175c5.89f04a35.css


File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/system_static/css/chunk-0aa2b787.adede869.css


+ 0 - 1
crmeb/public/admin/system_static/css/chunk-0b2d157a.5f3aee83.css

@@ -1 +0,0 @@
-.btn_box[data-v-1326f0c7] .ivu-form-item-content{margin-left:0!important}

File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/system_static/css/chunk-0bf0da8f.c8241b72.css


File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-0c9c680c.1287012e.css


File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-0ca76063.b9a345b5.css


File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-0d7d8855.52d95e02.css


File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-0d965040.c76f98e6.css


File diff suppressed because it is too large
+ 1 - 1
crmeb/public/admin/system_static/css/chunk-0e57060d.36765c6b.css


File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-0ee931b8.ea29e84b.css


File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-0f053020.d1425a68.css


+ 1 - 1
crmeb/public/admin/system_static/css/chunk-19022f92.da084d64.css

@@ -1 +1 @@
-[data-v-168693ae] .center{text-align:center;margin-right:0!important;margin-left:5px}.cat-name[data-v-301e3422]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;height:50px;border-bottom:1px solid var(--prev-border-color-lighter);font-weight:500;font-size:15px}
+[data-v-224f3c22] .center{text-align:center;margin-right:0!important;margin-left:5px}.cat-name[data-v-0ae36062]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;height:50px;border-bottom:1px solid var(--prev-border-color-lighter);font-weight:500;font-size:15px}

+ 0 - 1
crmeb/public/admin/system_static/css/chunk-114e83d5.6cfd1dd1.css

@@ -1 +0,0 @@
-.ivu-tabs[data-v-12a38ed8]{margin-bottom:18px}.fromBox[data-v-12a38ed8]{min-height:calc(100vh - 200px);margin-top:0!important}.article-manager[data-v-12a38ed8] .ivu-form-item{margin-bottom:20px!important}

File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/system_static/css/chunk-120c0092.ec23e6f9.css


File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-122363b0.77475f5f.css


+ 1 - 0
crmeb/public/admin/system_static/css/chunk-1311a96c.d5cad0ec.css

@@ -0,0 +1 @@
+.tabBox_img[data-v-eb5e897c]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-eb5e897c]{width:100%;height:100%}

File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-1430bc46.7eef744e.css


+ 1 - 0
crmeb/public/admin/system_static/css/chunk-14dc10d0.5765ce40.css

@@ -0,0 +1 @@
+.cur[data-v-1248d368]{cursor:pointer}.goupBox[data-v-1248d368] .ivu-form-item-content{margin-left:43px!important}

+ 0 - 1
crmeb/public/admin/system_static/css/chunk-14dd4022.34f7db24.css

@@ -1 +0,0 @@
-[data-v-86e25c90] .ivu-form-item-content{line-height:unset!important}

+ 1 - 0
crmeb/public/admin/system_static/css/chunk-14edecb8.2bdc7b96.css

@@ -0,0 +1 @@
+.box[data-v-7e31ed24]{width:100%;background:#fff}

File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/system_static/css/chunk-14f640e8.852819b6.css


File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/system_static/css/chunk-150a8868.d466a55c.css


File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/system_static/css/chunk-154fe203.8f0f4543.css


File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/system_static/css/chunk-1575bc82.fd5ce423.css


File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-157b4f48.fb9470f3.css


File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-15a639cc.31d891be.css


File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/system_static/css/chunk-16664176.b283ab92.css


File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-17a4dcd4.a2a430b1.css


+ 1 - 0
crmeb/public/admin/system_static/css/chunk-17da9750.439ce86b.css

@@ -0,0 +1 @@
+.clear_tit[data-v-5fc58072]{margin-top:150px}

File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-182c3b12.965a26d4.css


File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-192b85c8.b1d7015d.css


File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/system_static/css/chunk-1968e73c.36772641.css


+ 1 - 0
crmeb/public/admin/system_static/css/chunk-196cd792.6cf24d5c.css

@@ -0,0 +1 @@
+.v-transfer-dom[data-v-306b6d59] .ivu-modal-content-drag{z-index:2!important}.radio[data-v-306b6d59]{margin-bottom:14px}.radio[data-v-306b6d59] .name{width:125px;text-align:right;padding-right:12px}.tabBox_img[data-v-24564c74]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-24564c74]{width:100%;height:100%}

File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/system_static/css/chunk-19bbb8d5.eff42d42.css


File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/system_static/css/chunk-1a563559.bf555b4b.css


+ 0 - 1
crmeb/public/admin/system_static/css/chunk-1ab5c2f9.f2d5cc45.css

@@ -1 +0,0 @@
-.v-transfer-dom[data-v-5cc97a38] .ivu-modal-content-drag{z-index:2!important}.radio[data-v-5cc97a38]{margin-bottom:14px}.radio[data-v-5cc97a38] .name{width:125px;text-align:right;padding-right:12px}.tabBox_img[data-v-5a72ecbc]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-5a72ecbc]{width:100%;height:100%}

+ 1 - 0
crmeb/public/admin/system_static/css/chunk-1ac44521.7e4ea005.css

@@ -0,0 +1 @@
+.reset[data-v-1e9b85f2]{margin-left:10px}.form-content[data-v-1e9b85f2]{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.form-content[data-v-1e9b85f2],.input-button[data-v-1e9b85f2]{display:-webkit-box;display:-ms-flexbox;display:flex}w .trip[data-v-1e9b85f2]{color:#aaa;line-height:20px}.setting-style[data-v-1e9b85f2] .ivu-form-item{margin-bottom:14px}

File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/system_static/css/chunk-1bc71a8c.77993446.css


+ 1 - 0
crmeb/public/admin/system_static/css/chunk-1c19d602.1a9e0147.css

@@ -0,0 +1 @@
+.QRpic[data-v-d7776416]{width:180px;height:180px}.QRpic img[data-v-d7776416]{width:100%;height:100%}

File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/system_static/css/chunk-1c512198.b8417b9f.css


File diff suppressed because it is too large
+ 1 - 1
crmeb/public/admin/system_static/css/chunk-694d6d78.c2ec330a.css


+ 0 - 1
crmeb/public/admin/system_static/css/chunk-1cb94d23.421a7c77.css

@@ -1 +0,0 @@
-.v-transfer-dom[data-v-5cc97a38] .ivu-modal-content-drag{z-index:2!important}.radio[data-v-5cc97a38]{margin-bottom:14px}.radio[data-v-5cc97a38] .name{width:125px;text-align:right;padding-right:12px}

File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/system_static/css/chunk-1cc2c273.27071fe8.css


+ 1 - 0
crmeb/public/admin/system_static/css/chunk-1cf27680.754868cc.css

@@ -0,0 +1 @@
+.v-transfer-dom[data-v-306b6d59] .ivu-modal-content-drag{z-index:2!important}.radio[data-v-306b6d59]{margin-bottom:14px}.radio[data-v-306b6d59] .name{width:125px;text-align:right;padding-right:12px}

File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/system_static/css/chunk-1d76b228.d28378bf.css


File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/system_static/css/chunk-1d99af8b.dbadc4b0.css


+ 1 - 0
crmeb/public/admin/system_static/css/chunk-1db96cd5.754868cc.css

@@ -0,0 +1 @@
+.v-transfer-dom[data-v-306b6d59] .ivu-modal-content-drag{z-index:2!important}.radio[data-v-306b6d59]{margin-bottom:14px}.radio[data-v-306b6d59] .name{width:125px;text-align:right;padding-right:12px}

+ 0 - 1
crmeb/public/admin/system_static/css/chunk-1dedce59.2a89d4d5.css

@@ -1 +0,0 @@
-.v-transfer-dom[data-v-5cc97a38] .ivu-modal-content-drag{z-index:2!important}.radio[data-v-5cc97a38]{margin-bottom:14px}.radio[data-v-5cc97a38] .name{width:125px;text-align:right;padding-right:12px}.tabBox_img[data-v-20c62498]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-20c62498]{width:100%;height:100%}

+ 0 - 1
crmeb/public/admin/system_static/css/chunk-1ef2b5e4.421a7c77.css

@@ -1 +0,0 @@
-.v-transfer-dom[data-v-5cc97a38] .ivu-modal-content-drag{z-index:2!important}.radio[data-v-5cc97a38]{margin-bottom:14px}.radio[data-v-5cc97a38] .name{width:125px;text-align:right;padding-right:12px}

+ 0 - 1
crmeb/public/admin/system_static/css/chunk-1f894614.c0a99313.css

@@ -1 +0,0 @@
-.tabBox_img[data-v-160a2f5e]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-160a2f5e]{width:100%;height:100%}

+ 0 - 0
crmeb/public/admin/system_static/css/chunk-1f960c6f.344c4d72.css


Some files were not shown because too many files changed in this diff