Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

crmeb/app/api/common.php

@@ -9,35 +9,3 @@
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
 
-/**
- *  设置浏览信息
- * @param $uid
- * @param int $product_id
- * @param int $cate
- * @param string $type
- * @param string $content
- * @param int $min
- */
-function set_view($uid, $product_id = 0, $cate = 0, $type = '', $content = '', $min = 20)
-{
-    //TODO 待优化
-    $Db = new \app\models\store\StoreVisit;
-    $view = $Db->where('uid', $uid)->where('product_id', $product_id)->field('count,add_time,id')->find();
-    if ($view && $type != 'search') {
-        $time = time();
-        if (($view['add_time'] + $min) < $time) {
-            $Db->where(['id' => $view['id']])->update(['count' => $view['count'] + 1, 'add_time' => time()]);
-        }
-    } else {
-        $cate = explode(',', $cate)[0];
-        $Db->insert([
-            'add_time' => time(),
-            'count' => 1,
-            'product_id' => $product_id,
-            'cate_id' => $cate,
-            'type' => $type,
-            'uid' => $uid,
-            'content' => $content
-        ]);
-    }
-}

crmeb/app/api/event.php

@@ -17,8 +17,6 @@ return [
         'HttpEnd'  => [],
         'LogLevel' => [],
         'LogWrite' => [],
-        'UserLogin'=>[
-//             \crmeb\listeners\user\UserLogin::class
-        ]
+        'UserLogin'=> []
     ]
 ];

template/uni-app/pages/admin/statistics/index.vue

@@ -49,7 +49,7 @@
 		</div>
 		<div class="chart">
 			<div class="chart-title">
-				{{$t(`单位`)}}（{{where.type == 1?$t(`元.`):$t(`分.`)}}）
+				{{$t(`单位`)}}（{{where.type == 1?$t(`元.`):$t(`份`)}}）
 			</div>
 			<canvas canvas-id="canvasLineA" id="canvasLineA" class="charts" disable-scroll=true @touchstart="touchLineA"
 			 @touchmove="moveLineA" @touchend="touchEndLineA">