更新前端文件

crmeb/.env

@@ -1 +0,0 @@
-APP_DEBUG = true

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai

[DATABASE]
TYPE = mysql
HOSTNAME = 
HOSTPORT = 
USERNAME = 
PASSWORD = 
DATABASE = 
PREFIX = 
CHARSET = utf8
DEBUG = true

[LANG]
default_lang = zh-cn

[REDIS]
REDIS_HOSTNAME = 
PORT = 
REDIS_PASSWORD = 
SELECT = 

[QUEUE]
QUEUE_NAME = 

crmeb/app/adminapi/controller/Common.php

@@ -383,12 +383,5 @@ class Common extends AuthController
         return app('json')->success(sort_list_tier($data));
     }
 
-    /**
-     * 获取workerman请求域名
-     * @return mixed
-     */
-    public function getWorkerManUrl()
-    {
-        return app('json')->success(getWorkerManUrl());
-    }
+
 }

crmeb/app/adminapi/controller/PublicController.php

@@ -35,4 +35,13 @@ class PublicController
         }
         return Response::create()->code(500);
     }
+
+    /**
+     * 获取workerman请求域名
+     * @return mixed
+     */
+    public function getWorkerManUrl()
+    {
+        return app('json')->success(getWorkerManUrl());
+    }
 }

crmeb/app/adminapi/controller/v1/application/routine/RoutineTemplate.php

@@ -295,6 +295,7 @@ class RoutineTemplate extends AuthController
             //拷贝源文件
             /** @var FileService $fileService */
             $fileService = app(FileService::class);
+//            $path = $is_live == 0 ? 'view/mp_view' : 'view/mp_view_live';
             $fileService->copyDir(public_path() . 'view/mp_view', public_path() . 'view/download');
             //替换appid和名称
             $this->updateConfigJson(sys_config('routine_appId'), $name != '' ? $name : sys_config('routine_name'));
@@ -326,7 +327,7 @@ class RoutineTemplate extends AuthController
     }
 
     /**
-     * 判断是否开启直播
+     * 判断是否开启直播(弃用)
      * @param int $iszhibo
      */
     public function updateAppJson()

crmeb/app/adminapi/controller/v1/setting/SystemGroupData.php

@@ -327,4 +327,30 @@ class SystemGroupData extends AuthController
         $this->services->saveAllData($params['data'], $params['config_name']);
         return app('json')->success('添加数据成功!');
     }
+
+
+    /**
+     * 获取用户协议内容
+     * @return mixed
+     */
+    public function getUserAgreement()
+    {
+        /** @var CacheServices $cache */
+        $cache = app()->make(CacheServices::class);
+        $content = $cache->getDbCache('user_agreement', '');
+        return $this->success(compact('content'));
+    }
+
+    /**
+     * 设置用户协议内容
+     * @return mixed
+     */
+    public function setUserAgreement()
+    {
+        $content = $this->request->post('content');
+        /** @var CacheServices $cache */
+        $cache = app()->make(CacheServices::class);
+        $cache->setDbCache('user_agreement', $content);
+        return $this->success('设置成功');
+    }
 }

crmeb/app/adminapi/route/common.php

@@ -39,8 +39,6 @@ Route::group(function () {
     Route::get('menusList', 'Common/menusList')->option(['real_name' => '搜索菜单列表']);
     //获取logo
     Route::get('logo', 'Common/getLogo')->option(['real_name' => '获取logo']);
-    //获取客服数据
-    Route::get('get_workerman_url', 'Common/getWorkerManUrl')->option(['real_name' => '获取客服数据']);
 })->middleware([
     \app\http\middleware\AllowOriginMiddleware::class,
     \app\adminapi\middleware\AdminAuthTokenMiddleware::class,

crmeb/app/adminapi/route/route.php

@@ -25,7 +25,8 @@ Route::group(function () {
     Route::get('download', 'PublicController/download')->option(['real_name' => '下载文件']);
     //验证码
     Route::get('captcha_pro', 'Login/captcha')->name('')->option(['real_name' => '获取验证码']);
-
+    //获取客服数据
+    Route::get('get_workerman_url', 'PublicController/getWorkerManUrl')->option(['real_name' => '获取客服数据']);
 
     Route::get('index', 'Test/index')->option(['real_name' => '测试地址']);
 

crmeb/app/adminapi/route/setting.php

@@ -131,6 +131,10 @@ Route::group('setting', function () {
     Route::get('seckill_data/header', 'v1.setting.SystemGroupData/header')->option(['real_name' => '秒杀数据字段']);
     //秒杀数据状态
     Route::put('seckill_data/set_status/:id/:status', 'v1.setting.SystemGroupData/set_status')->option(['real_name' => '秒杀数据状态']);
+    //获取隐私协议
+    Route::get('get_user_agreement', 'v1.setting.SystemGroupData/getUserAgreement')->option(['real_name' => '获取隐私协议']);
+    //设置隐私协议
+    Route::post('set_user_agreement', 'v1.setting.SystemGroupData/setUserAgreement')->option(['real_name' => '设置隐私协议']);
 
     //系统通知
     //系统通知列表

crmeb/app/api/controller/v1/PublicController.php

@@ -15,6 +15,7 @@ use app\services\activity\StorePinkServices;
 use app\services\diy\DiyServices;
 use app\services\message\service\StoreServiceServices;
 use app\services\order\DeliveryServiceServices;
+use app\services\other\CacheServices;
 use app\services\product\product\StoreCategoryServices;
 use app\services\product\product\StoreProductServices;
 use app\services\shipping\ExpressServices;
@@ -509,4 +510,16 @@ class PublicController
     {
         return app('json')->success(sys_config('open_adv',''));
     }
+
+    /**
+     * 获取用户协议内容
+     * @return mixed
+     */
+    public function getUserAgreement()
+    {
+        /** @var CacheServices $cache */
+        $cache = app()->make(CacheServices::class);
+        $content = $cache->getDbCache('user_agreement', '');
+        return app('json')->success(compact('content'));
+    }
 }

crmeb/app/api/route/v1.php

@@ -313,7 +313,9 @@ Route::group(function () {
     //长链接设置
     Route::get('get_workerman_url', 'v1.PublicController/getWorkerManUrl')->name('getWorkerManUrl');
     //首页开屏广告
-    Route::get('get_open_adv', 'v1.PublicController/getOpenAdv')->name('getOpenAdv');
+    Route::get('get_open_adv','v1.PublicController/getOpenAdv')->name('getOpenAdv');
+    //获取用户协议
+    Route::get('user_agreement', 'v1.PublicController/getUserAgreement')->name('getUserAgreement');
 })->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\api\middleware\StationOpenMiddleware::class)->middleware(\app\api\middleware\AuthTokenMiddleware::class, false);
 
 Route::miss(function () {

crmeb/app/common.php

@@ -27,7 +27,7 @@ if (!function_exists('getWorkerManUrl')) {
         $ws = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'wss://' : 'ws://';
         $host = $_SERVER['HTTP_HOST'];
         $data['admin'] = $ws . $host . '/notice';
-        $data['channel'] = $ws . $host . '/msg';
+        $data['chat'] = $ws . $host . '/msg';
         return $data;
     }
 }
@@ -808,7 +808,7 @@ if (!function_exists('get_image_thumb')) {
      */
     function get_image_thumb($filePath, string $type = 'all', bool $is_remote_down = false)
     {
-        if (!$filePath || !is_string($filePath)) return $filePath;
+        if (!$filePath || !is_string($filePath) || strpos($filePath, '?') !== false) return $filePath;
         try {
             $upload = UploadService::getOssInit($filePath, $is_remote_down);
             $data = $upload->thumb('', $type);

crmeb/app/services/message/service/StoreServiceServices.php

@@ -106,7 +106,7 @@ class StoreServiceServices extends BaseServices
             $field[] = $this->builder->input('true_password', '确认密码')->type('password')->col(24)->required();
         }
         $field[] = $this->builder->switches('status', '客服状态', (int)($formData['status'] ?? 1))->appendControl(1, [
-            $this->builder->switches('customer', '手机订单管理', $formData['customer'] ?? 0)->falseValue(0)->trueValue(1)->openStr('打开')->closeStr('关闭')->size('large'),
+//            $this->builder->switches('customer', '手机订单管理', $formData['customer'] ?? 0)->falseValue(0)->trueValue(1)->openStr('打开')->closeStr('关闭')->size('large'),
             $this->builder->switches('notify', '订单通知', $formData['notify'] ?? 0)->falseValue(0)->trueValue(1)->openStr('打开')->closeStr('关闭')->size('large'),
         ])->falseValue(0)->trueValue(1)->openStr('开启')->closeStr('关闭')->size('large');
         return $field;

crmeb/app/services/order/StoreOrderDeliveryServices.php

@@ -516,4 +516,24 @@ class StoreOrderDeliveryServices extends BaseServices
         });
         return true;
     }
+
+    /**
+     * 返回订单商品总重量
+     * @param int $id
+     * @return int|string
+     */
+    public function getOrderSumWeight(int $id, $default = false)
+    {
+        /** @var StoreOrderCartInfoServices $services */
+        $services = app()->make(StoreOrderCartInfoServices::class);
+        $orderGoodInfo = $services->getOrderCartInfo((int)$id);
+        $weight = 0;
+        foreach ($orderGoodInfo as $cartInfo) {
+            $cart = $cartInfo['cart_info'] ?? [];
+            if ($cart) {
+                $weight = bcadd((string)$weight, (string)bcmul((string)$cart['cart_num'] ?? '0', (string)$cart['productInfo']['attrInfo']['weight'] ?? '0', 4), 2);
+            }
+        }
+        return $weight ? $weight : ($default === false ? 0 : $default);
+    }
 }

crmeb/app/services/order/StoreOrderRefundServices.php

@@ -205,9 +205,9 @@ class StoreOrderRefundServices extends BaseServices
         $res = true;
         //回退优惠卷
         if ($order['coupon_id'] && $order['coupon_price']) {
-            /** @var StoreCouponUserServices $couponUserServices */
-            $couponUserServices = app()->make(StoreCouponUserServices::class);
-            $res = $res && $couponUserServices->recoverCoupon((int)$order['coupon_id']);
+            /** @var StoreCouponUserServices $coumonUserServices */
+            $coumonUserServices = app()->make(StoreCouponUserServices::class);
+            $res = $res && $coumonUserServices->recoverCoupon((int)$order['coupon_id']);
         }
 
         //回退积分

crmeb/app/services/order/StoreOrderServices.php

@@ -1542,6 +1542,7 @@ HTML;
         $data['store_self_mention'] = (int)sys_config('store_self_mention') ?? 0;//门店自提是否开启
         if (isset($validCartInfo[0]['productInfo']['is_virtual']) && $validCartInfo[0]['productInfo']['is_virtual']) {
             $data['virtual_type'] = 1;
+            $data['deduction'] = true;
         } else {
             $data['virtual_type'] = 0;
         }

crmeb/app/services/system/store/SystemStoreStaffServices.php

@@ -21,10 +21,7 @@ use crmeb\services\FormBuilder;
  * 门店店员
  * Class SystemStoreStaffServices
  * @package app\services\system\store
- * @method count(array $where = []) 获取指定条件下的count
- * @method update($id, array $data, ?string $key = null) 修改数据
- * @method save(array $data) 保存数据
- * @method delete(int $id, ?string $key = null) 删除数据
+ * @mixin SystemStoreStaffDao
  */
 class SystemStoreStaffServices extends BaseServices
 {
@@ -47,7 +44,10 @@ class SystemStoreStaffServices extends BaseServices
     /**
      * 判断是否是有权限核销的店员
      * @param $uid
-     * @return int
+     * @return bool
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
      */
     public function verifyStatus($uid)
     {

crmeb/crmeb/services/upload/storage/Local.php

@@ -139,7 +139,7 @@ class Local extends BaseUpload
         $this->fileInfo->realName = $fileHandle->getOriginalName();
         $this->fileInfo->fileName = $this->fileInfo->uploadInfo->getFilename();
         $this->fileInfo->filePath = $this->defaultPath . '/' . str_replace('\\', '/', $fileName);
-        if ($this->checkImage('.' . $this->fileInfo->filePath)) {
+        if ($this->checkImage(public_path() . $this->fileInfo->filePath) && $this->authThumb) {
             try {
                 $this->thumb($this->fileInfo->filePath);
             } catch (\Throwable $e) {
@@ -170,7 +170,7 @@ class Local extends BaseUpload
         $this->fileInfo->realName = $key;
         $this->fileInfo->fileName = $key;
         $this->fileInfo->filePath = $this->defaultPath . '/' . $this->path . '/' . $key;
-        if ($this->checkImage('.' . $this->fileInfo->filePath) && $this->authThumb) {
+        if ($this->checkImage(public_path() . $this->fileInfo->filePath) && $this->authThumb) {
             try {
                 $this->thumb($this->fileInfo->filePath);
             } catch (\Throwable $e) {
@@ -316,11 +316,11 @@ class Local extends BaseUpload
             [$path, $ext] = $this->getFileName($filePath);
             $waterPath = $path . '_water_image.' . $ext;
         }
-        $savePath = '.' . $waterPath;
+        $savePath = public_path() . $waterPath;
         try {
             if (!file_exists($savePath)) {
                 $Image = Image::open(app()->getRootPath() . 'public' . $filePath);
-                $Image->water($watermark_image, $waterConfig['watermark_position'] ?: 1, $waterConfig['watermark_opacity'])->save(root_path() . 'public' . $savePath);
+                $Image->water($watermark_image, $waterConfig['watermark_position'] ?: 1, $waterConfig['watermark_opacity'])->save($savePath);
             }
         } catch (\Throwable $e) {
             throw new ValidateException($e->getMessage());
@@ -347,7 +347,7 @@ class Local extends BaseUpload
             [$path, $ext] = $this->getFileName($filePath);
             $waterPath = $path . '_water_text.' . $ext;
         }
-        $savePath = '.' . $waterPath;
+        $savePath = public_path() . $waterPath;
         try {
             if (!file_exists($savePath)) {
                 $Image = Image::open(app()->getRootPath() . 'public' . $filePath);
@@ -358,7 +358,7 @@ class Local extends BaseUpload
                 if (strlen($waterConfig['watermark_text_color']) > 7) {
                     $waterConfig['watermark_text_color'] = substr($waterConfig['watermark_text_color'], 0, 7);
                 }
-                $Image->text($waterConfig['watermark_text'], $waterConfig['watermark_text_font'], $waterConfig['watermark_text_size'], $waterConfig['watermark_text_color'], $waterConfig['watermark_position'], [$waterConfig['watermark_x'], $waterConfig['watermark_y'], $waterConfig['watermark_text_angle']])->save(root_path() . 'public' . $savePath);
+                $Image->text($waterConfig['watermark_text'], $waterConfig['watermark_text_font'], $waterConfig['watermark_text_size'], $waterConfig['watermark_text_color'], $waterConfig['watermark_position'], [$waterConfig['watermark_x'], $waterConfig['watermark_y'], $waterConfig['watermark_text_angle']])->save($savePath);
             }
         } catch (\Throwable $e) {
             throw new ValidateException($e->getMessage() . $e->getLine());

crmeb/public/admin/css/chunk-7f18352f.733d5a52.css

@@ -0,0 +1 @@
+.tabBox_img[data-v-460202b1]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-460202b1]{width:100%;height:100%}.modelBox .ivu-table-header[data-v-460202b1],.modelBox[data-v-460202b1]{width:100%!important}.trees-coadd[data-v-460202b1]{width:100%;height:385px}.trees-coadd .scollhide[data-v-460202b1]{width:100%;height:100%;overflow-x:hidden;overflow-y:scroll}.scollhide[data-v-460202b1]::-webkit-scrollbar{display:none}