增加加盟商

admin/src/router/index.js

@@ -200,7 +200,7 @@ export const asyncRoutes = [
     meta: {
       title: 'QA管理',
       icon: 'el-icon-question',
-      roles: ['order_index', 'editor']
+      roles: ['order_index', 'editor', 'franchisee']
     },
     children: [
       {
@@ -209,7 +209,7 @@ export const asyncRoutes = [
         name: 'problem',
         meta: {
           title: 'QA常见问题',
-          roles: ['order_pub', 'editor']
+          roles: ['order_pub', 'editor', 'franchisee']
         }
       },
       {
@@ -299,7 +299,7 @@ export const asyncRoutes = [
     meta: {
       title: '日志记录',
       icon: 'nested',
-      roles: ['follow_index', 'log_index', 'editor']
+      roles: ['follow_index', 'log_index', 'editor', 'franchisee']
     },
     children: [
       {
@@ -308,7 +308,7 @@ export const asyncRoutes = [
         name: 'Follow',
         meta: {
           title: '跟进记录',
-          roles: ['follow_index', 'editor']
+          roles: ['follow_index', 'editor', 'franchisee']
         }
       },
       {
@@ -331,7 +331,7 @@ export const asyncRoutes = [
     meta: {
       title: '公告管理',
       icon: 'el-icon-s-promotion',
-      roles: ['follow_index', 'log_index', 'editor']
+      roles: ['admin']
     },
     children: [
       {
@@ -340,7 +340,7 @@ export const asyncRoutes = [
         name: 'list',
         meta: {
           title: '公告列表',
-          roles: ['follow_index', 'editor']
+          roles: ['admin']
         }
       }
     ]

admin/src/views/admin/index.vue

@@ -109,6 +109,21 @@
             >
           </el-switch>
         </el-form-item>
+        <el-form-item label="是否加盟商">
+          <el-switch
+            v-model="item.is_franchisee"
+            active-text="加盟商"
+            :active-value="1"
+            inactive-text=""
+            :inactive-value="0"
+            >
+          </el-switch>
+        </el-form-item>
+
+        <el-form-item label="产品ID">
+          <el-input v-model="item.product_ids" type="textarea" />
+          <el-label style="color: red;font-size: 11px;">多个用英文逗号隔开，例如: 384731,2328</el-label>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="onSave(item)">保 存</el-button>

admin/vue.config.js

@@ -38,7 +38,8 @@ module.exports = {
     },
     proxy: {
       '/dev-api': { // 接口地址 以 api开头的都走下面的配置
-        target: 'https://www.szjinao.cn', // 代理目标地址为后端服务器地址 127.0.0.1 192.168.1.2
+        // target: 'https://www.szjinao.cn', // 代理目标地址为后端服务器地址 127.0.0.1 192.168.1.2
+        target: 'http://0.0.0.0:8787', // 代理目标地址为后端服务器地址 127.0.0.1 192.168.1.2
         ws: true, // 是否支持 websocket 请求 支持
         changeOrigin: true, // 是否启用跨域
         pathRewrite: {

service/app/admin/controller/AdminController.php

@@ -62,6 +62,8 @@ class AdminController extends base
         $password = $request->post('password');
         $is_order = $request->post('is_order',0);
         $is_anchor = $request->post('is_anchor',0);
+        $is_franchisee = $request->post('is_franchisee',0);
+        $product_ids = $request->post('product_ids','');
 
         if($id) {
             $item = (new Admins())->find($id);
@@ -99,6 +101,8 @@ class AdminController extends base
         $item->mobile = $mobile;
         $item->is_order = $is_order;
         $item->is_anchor = $is_anchor;
+        $item->is_franchisee = $is_franchisee;
+        $item->product_ids = $product_ids;
         $back = $item->save();
         if($back) 
             return $this->success($item->hidden(['password','remember_token']));

service/app/admin/controller/FollowController.php

@@ -4,6 +4,7 @@ namespace app\admin\controller;
 use app\model\Admins;
 use app\model\Follows;
 use app\model\Orders;
+use support\Log;
 use support\Request;
 
 class FollowController extends base
@@ -14,6 +15,11 @@ class FollowController extends base
         $self = $request->get('self');
         $times = $request->get('times');
 
+        $adminInfo = Admins::where('id', $request->admin->id)->find();
+        if ($adminInfo->is_franchisee) {
+            return $this->franchiseeList($request, $adminInfo);
+        }
+
         $query = Follows::with(['admin','orders'])->order('id', 'desc');
 
         if($request->admin->is_super == 0 || $self) {
@@ -38,4 +44,40 @@ class FollowController extends base
 
         return $this->success($list->append(['status_name']));
     }
+
+    public function franchiseeList($request, $adminInfo)
+    {
+        $admin = $request->get('admin');
+        $sn = $request->get('sn');
+        $times = $request->get('times');
+
+        $thirdProductId = explode(',', $adminInfo->product_ids);
+        if (count($thirdProductId) <= 0) {
+            return $this->success([]);
+        }
+
+        $query = Follows::with(['admin','orders'])
+            ->join('orders', 'orders.id = follows.order_id')
+            ->order('follows.id', 'desc')
+            ->field('follows.*')
+            ->whereIn('product_id', $thirdProductId);
+
+        if(!empty($admin)) {
+            $admin_id = Admins::where('username', $admin)->value('id');
+            $query->where('follows.admin_id', $admin_id ?? 0);
+        }
+
+        if(!empty($sn)) {
+            $order_id = Orders::where('sn', $sn)->value('id');
+            $query->where('follows.order_id', $order_id ?? 0);
+        }
+
+        if(!empty($times) && count($times)) {
+            $query->whereBetween('follows.create_time', [strtotime($times[0]),strtotime($times[1])]);
+        }
+
+        $list = $query->paginate($request->get('limit', 30));
+
+        return $this->success($list->append(['status_name']));
+    }
 }

service/app/admin/controller/IndexController.php

@@ -219,11 +219,19 @@ class IndexController extends base
 
     public function Info(Request $request)
     {
-
         $info = Admins::where('id', $request->admin->id)->find();
 
+        $roles = ['editor'];
+        if ($info->is_super) {
+            $roles = ['admin'];
+        }
+
+        if ($info->is_franchisee) {
+            $roles = ['franchisee'];
+        }
+
         return $this->success([
-            'roles' => [$info->is_super ? 'admin' : 'editor'],
+            'roles' => $roles,
             'avatar' => $info->avatar ?? '/avatar.webp',
             'name' => $info->name,
             'is_anchor' => $info->is_anchor ? 1 : 0,