Wesmiler 拾光销售 更新

addons/admin/src/views/system/user/market.vue

@@ -2,7 +2,7 @@
   <div class="ele-body">
     <el-card shadow="never">
       <!-- 搜索表单 -->
-      <el-form :model="table.where" label-width="77px" class="ele-form-search"
+      <el-form :model="table.where" label-width="100px" class="ele-form-search"
                @keyup.enter.native="$refs.table.reload()" @submit.native.prevent>
         <el-row :gutter="15">
           <el-col :md="6" :sm="12">
@@ -34,23 +34,35 @@
       <!-- 数据表格 -->
       <ele-data-table ref="table" :config="table" :choose.sync="choose" height="calc(100vh - 315px)" highlight-current-row>
         <template slot-scope="{index}">
-          <el-table-column type="selection" width="45" align="center" fixed="left"/>
-          <el-table-column type="index" :index="index" label="编号" width="60" align="center" fixed="left" show-overflow-tooltip/>
-          <el-table-column prop="username" label="用户账号" sortable="custom" show-overflow-tooltip min-width="110"/>
-          <el-table-column prop="realname" label="用户姓名" sortable="custom" show-overflow-tooltip min-width="110"/>
-          <el-table-column label="头像" min-width="60" align="center">
+          <el-table-column type="selection" width="45" align="center"/>
+<!--          <el-table-column type="index" :index="index" label="编号" width="60" align="center" fixed="left" show-overflow-tooltip/>-->
+          <el-table-column prop="username" label="推广员账号"  show-overflow-tooltip min-width="110"/>
+          <el-table-column prop="realname" label="推广员姓名"  show-overflow-tooltip min-width="110"/>
+          <el-table-column prop="mobile" label="手机号"  show-overflow-tooltip min-width="110"/>
+          <el-table-column prop="gender_name" label="性别"  show-overflow-tooltip min-width="80"/>
+          <el-table-column label="总录入资源" show-overflow-tooltip min-width="150">
             <template slot-scope="{row}">
-              <el-avatar shape="square" :size="25" :src="row.avatar"/>
+              <span >{{row.counts.total||0}}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="gender_name" label="性别" sortable="custom" show-overflow-tooltip min-width="80"/>
-          <el-table-column prop="mobile" label="手机号" sortable="custom" show-overflow-tooltip min-width="110"/>
-          <el-table-column label="角色" show-overflow-tooltip min-width="200">
+          <el-table-column label="本月录入资源" sortable="custom" show-overflow-tooltip min-width="150">
             <template slot-scope="{row}">
-              <el-tag v-for="item in row.roles" :key="item.id" type="primary" size="mini">{{
-                  item.name
-                }}
-              </el-tag>
+              <span >{{row.counts.month||0}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="上月录入资源" sortable="custom" show-overflow-tooltip min-width="150">
+            <template slot-scope="{row}">
+              <span >{{row.counts.last_month||0}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="今日录入资源" sortable="custom" show-overflow-tooltip min-width="150">
+            <template slot-scope="{row}">
+              <span >{{row.counts.day||0}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="昨日录入资源" sortable="custom" show-overflow-tooltip min-width="150">
+            <template slot-scope="{row}">
+              <span >{{row.counts.last_day||0}}</span>
             </template>
           </el-table-column>
           <el-table-column prop="status" label="状态" width="75px" sortable="custom" :resizable="false">
@@ -59,12 +71,12 @@
             </template>
           </el-table-column>
           <el-table-column label="创建时间" sortable="custom" show-overflow-tooltip min-width="160">
-            <template slot-scope="{row}">{{ row.create_time | toDateString }}</template>
+            <template slot-scope="{row}">{{ row.create_time_text }}</template>
           </el-table-column>
           <el-table-column label="操作" width="220px" align="center" :resizable="false" fixed="right">
             <template slot-scope="{row}">
               <el-link @click="edit(row)" icon="el-icon-edit" type="primary" :underline="false" v-if="permission.includes('sys:user:edit')">修改</el-link>
-              <el-popconfirm title="确定要删除此用户吗？" @confirm="remove(row)" class="ele-action">
+              <el-popconfirm title="确定要删除此推广员吗？" @confirm="remove(row)" class="ele-action">
                 <el-link slot="reference" icon="el-icon-delete" type="danger" :underline="false" v-if="permission.includes('sys:user:delete')">删除</el-link>
               </el-popconfirm>
               <el-popconfirm title="确定要重置密码吗？" @confirm="resetPwd(row)" class="ele-action">
@@ -76,7 +88,7 @@
       </ele-data-table>
     </el-card>
     <!-- 编辑弹窗 -->
-    <el-dialog :title="editForm.id?'修改用户':'添加用户'" :visible.sync="showEdit" width="700px"
+    <el-dialog :title="editForm.id?'修改推广员':'添加推广员'" :visible.sync="showEdit" width="700px"
                @closed="editForm={}" :destroy-on-close="true" custom-class="ele-dialog-form" :lock-scroll="false">
       <el-form :model="editForm" ref="editForm" :rules="editRules" label-width="100px">
         <el-form-item label="用户头像：">

app/Services/Common/MenuService.php

@@ -219,8 +219,8 @@ class MenuService extends BaseService
         $list = [];
         if ($userId == 1) {
             // 管理员拥有全部权限
-            $list = $this->model->getChilds(0);
-//            $list = $this->getPermissionMenu($userId, 0);
+//            $list = $this->model->getChilds(0);
+            $list = $this->getPermissionMenu($userId, 0);
         } else {
             // 其他角色
             $list = $this->getPermissionMenu($userId, 0);