From b356dca701ddbafbcf17ef8e1f9035fef31d60e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Wed, 28 Aug 2024 15:06:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                             |  2 +-
 .env.production                              |  2 +-
 .env.staging                                 |  2 +-
 src/components/Business/SmUser/UserInput.vue |  1 +
 src/components/ImageUpload/index.vue         | 14 +++++
 src/views/dashboard/component/TodoList.vue   | 10 +++-
 src/views/login.vue                          |  2 +-
 src/views/register.vue                       |  2 +-
 src/views/ss/ad/index.vue                    |  4 +-
 src/views/ss/shareCode/index.vue             | 34 ++++++++++--
 src/views/ss/userVerify/index.vue            |  4 ++
 src/views/system/device/detail.vue           | 54 +++++++++++---------
 src/views/system/device/index.vue            |  2 +-
 src/views/system/model/index.vue             | 30 +++++------
 src/views/system/recharge/detail.vue         |  6 ++-
 src/views/system/smUser/detail.vue           | 54 +++++++++++---------
 src/views/system/smUser/index.vue            | 12 ++---
 src/views/userLogin.vue                      |  2 +-
 vue.config.js                                |  2 +-
 19 files changed, 152 insertions(+), 87 deletions(-)

diff --git a/.env.development b/.env.development
index cd50909..4c5fef8 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 扫码床垫-开发
+VUE_APP_TITLE = 创亿康-开发
 
 # 开发环境配置
 ENV = 'development'
diff --git a/.env.production b/.env.production
index 508632c..cce54e9 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 扫码床垫管理系统
+VUE_APP_TITLE = 创亿康管理系统
 
 # 生产环境配置
 ENV = 'production'
diff --git a/.env.staging b/.env.staging
index 3eca93d..a44e4ae 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 扫码床垫管理系统
+VUE_APP_TITLE = 创亿康管理系统
 
 NODE_ENV = production
 
diff --git a/src/components/Business/SmUser/UserInput.vue b/src/components/Business/SmUser/UserInput.vue
index d2d4ff4..37164a4 100644
--- a/src/components/Business/SmUser/UserInput.vue
+++ b/src/components/Business/SmUser/UserInput.vue
@@ -161,6 +161,7 @@ export default {
     doLoad(ids) {
       listSmUserByIds(ids).then(res => {
         this.selected = res.data;
+        this.$emit('load', this.selected)
       })
     },
     // 修改值
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index b34f852..addaf90 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -25,6 +25,7 @@
       请上传
       <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
       <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
+      <template v-if="filePx"> 建议像素为 <b style="color: #f56c6c">{{ filePx }}</b></template>
       的文件
     </div>
 
@@ -53,6 +54,11 @@ export default {
       type: Number,
       default: 5,
     },
+    // 像素大小
+    filePx: {
+      type: String,
+      default: null,
+    },
     // 大小限制(MB)
     fileSize: {
        type: Number,
@@ -67,6 +73,14 @@ export default {
     isShowTip: {
       type: Boolean,
       default: true
+    },
+    width: {
+      type: String,
+      default: null,
+    },
+    height: {
+      type: String,
+      default: null,
     }
   },
   data() {
diff --git a/src/views/dashboard/component/TodoList.vue b/src/views/dashboard/component/TodoList.vue
index 2619c0a..e08a4db 100644
--- a/src/views/dashboard/component/TodoList.vue
+++ b/src/views/dashboard/component/TodoList.vue
@@ -1,5 +1,12 @@
 <template>
   <div class="todo-list" v-loading="loading">
+    <div class="todo-item" @click="$router.push('/smUser/userVerify?status=1')">
+      <div class="label"><svg-icon icon-class="user"/> 用户审核</div>
+      <div class="value">
+        <count-to :start-val="0" :end-val="data.userVerifyCount" :duration="3000"/>
+      </div>
+      <div class="unit">条</div>
+    </div>
     <div class="todo-item" @click="$router.push('/mch/mchApply?status=0')">
       <div class="label"><svg-icon icon-class="apply"/> 商家合作申请</div>
       <div class="value">
@@ -55,7 +62,8 @@ export default {
         mchApplyCount: 0,
         storeApplyCount: 0,
         abnormalCount: 0,
-        arrearsDeviceCount: 0
+        arrearsDeviceCount: 0,
+        userVerifyCount: 0
       }
     }
   },
diff --git a/src/views/login.vue b/src/views/login.vue
index 58e9562..bc90478 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">扫码床垫后台管理系统</h3>
+      <h3 class="title">创亿康后台管理系统</h3>
 
       <el-form-item prop="username">
         <el-input
diff --git a/src/views/register.vue b/src/views/register.vue
index d1c5a68..4df0736 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">扫码床垫后台管理系统</h3>
+      <h3 class="title">创亿康后台管理系统</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
diff --git a/src/views/ss/ad/index.vue b/src/views/ss/ad/index.vue
index 66ea4a5..282d3ca 100644
--- a/src/views/ss/ad/index.vue
+++ b/src/views/ss/ad/index.vue
@@ -115,10 +115,10 @@
     />
 
     <!-- 添加或修改广告对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="广告图片" prop="picture">
-          <image-upload v-model="form.picture" :limit="1"/>
+          <image-upload v-model="form.picture" :limit="1" file-px="680 * 218 px"/>
         </el-form-item>
         <el-form-item label="广告类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择广告类型" style="width: 100%">
diff --git a/src/views/ss/shareCode/index.vue b/src/views/ss/shareCode/index.vue
index 730f884..06a28d9 100644
--- a/src/views/ss/shareCode/index.vue
+++ b/src/views/ss/shareCode/index.vue
@@ -98,7 +98,7 @@
               <dict-tag :options="dict.type.user_type" :value="d.row[column.key]"/>
             </template>
             <template v-else-if="column.key === 'userId'">
-              <user-link :id="d.row.userId" :name="d.row.userMobile"/>
+              <user-link :id="d.row.userId" :name="`${d.row.userName}（${d.row.userMobile}）`"/>
             </template>
             <template v-else-if="column.key === 'qrcode'">
               <el-popover
@@ -115,6 +115,9 @@
             <template v-else-if="column.key === 'point'">
               {{d.row[column.key] | money | defaultValue}} %
             </template>
+            <template v-else-if="column.key === 'surplusPoint'">
+              {{d.row.userPoint - d.row.point | money | defaultValue}} %
+            </template>
             <template v-else>
               {{d.row[column.key]}}
             </template>
@@ -156,6 +159,7 @@
           <user-input
             v-model="form.userId"
             @change="onChangeCreator"
+            @load="onLoadCreator"
             :query="{types: [SmUserType.SALE, SmUserType.BIZ]}"
             show-type
           />
@@ -172,7 +176,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="投资人" prop="investorId" v-if="form.userType === SmUserType.BUSINESS_PLACE">
-          <user-input v-model="form.investorId" placeholder="请选择推广经营场所绑定的投资人" :query="{type: SmUserType.INVESTOR}" show-type/>
+          <user-input v-model="form.investorId" placeholder="请选择推广经营场所绑定的投资人" :before-open="beforeOpenInvestor" :query="investorQuery" show-type/>
         </el-form-item>
         <el-form-item label="分成比例" prop="point">
           <el-input-number v-model="form.point" placeholder="请输入分成比例" controls-position="right" :min="0" :max="100" :precision="2" style="width: calc(100% - 1.5em)"/> %
@@ -221,6 +225,13 @@ export default {
         }
         return true;
       }
+    },
+    // 投资人查询条件
+    investorQuery() {
+      return {
+        type: SmUserType.INVESTOR,
+        referenceId: this.form.userId
+      }
     }
   },
   components: { QrCode, UserLink, UserInput },
@@ -234,9 +245,10 @@ export default {
         {key: 'codeId', visible: true, label: '推广码ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
         {key: 'codeNo', visible: true, label: '推广码编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'qrcode', visible: true, label: '二维码', minWidth: null, sortable: false, overflow: false, align: 'center', width: "80"},
-        {key: 'userId', visible: true, label: '创建人', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'userId', visible: true, label: '创建人', minWidth: null, sortable: true, overflow: false, align: 'center', width: "300"},
         {key: 'userType', visible: true, label: '推广角色', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'point', visible: true, label: '分成比例', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'surplusPoint', visible: true, label: '剩余比例', minWidth: null, sortable: false, overflow: false, align: 'center', width: null},
         {key: 'investorId', visible: false, label: '投资人', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'expireTime', visible: true, label: '过期时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null},
         // {key: 'status', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
@@ -304,11 +316,27 @@ export default {
   },
   methods: {
     getShareCodeWxUrl,
+    beforeOpenInvestor() {
+      if (this.form.userId == null) {
+        this.$message.warning("请先选择创建人");
+        return false;
+      }
+      return true;
+    },
+    onLoadCreator(list) {
+      if (list != null && list.length > 0) {
+        this.creatorUserType = list[0].type;
+      }
+    },
     onChangeCreator(user) {
       this.creatorUserType = user.type;
       if (this.disabledUserType(this.form.userType)) {
         this.form.userType = null;
       }
+      if (this.form.investorId != null) {
+        this.form.investorId = null;
+        this.$message.info("由于更换了创建人，请重新选择投资人")
+      }
     },
     /** 当排序按钮被点击时触发 **/
     onSortChange(column) {
diff --git a/src/views/ss/userVerify/index.vue b/src/views/ss/userVerify/index.vue
index d752f61..38bec34 100644
--- a/src/views/ss/userVerify/index.vue
+++ b/src/views/ss/userVerify/index.vue
@@ -278,6 +278,10 @@ export default {
     };
   },
   created() {
+    this.queryParams = {
+      ...this.queryParams,
+      ...this.$route.query
+    }
     this.getList();
   },
   methods: {
diff --git a/src/views/system/device/detail.vue b/src/views/system/device/detail.vue
index b179e21..d24f85c 100644
--- a/src/views/system/device/detail.vue
+++ b/src/views/system/device/detail.vue
@@ -60,13 +60,16 @@
               <el-descriptions-item label="型号功能" :span="2">
                 <dict-tag :options="dict.type.sm_model_tag" :value="deviceData.modelTags" size="mini"/>
               </el-descriptions-item>
-              <el-descriptions-item label="WIFI">{{deviceData.wifi | defaultValue}}</el-descriptions-item>
+<!--              <el-descriptions-item label="WIFI">{{deviceData.wifi | defaultValue}}</el-descriptions-item>-->
               <el-descriptions-item label="剩余时长">{{surplusTimeDesc(surplusTime).text}}</el-descriptions-item>
               <el-descriptions-item label="设备剩余时长" :span="2">
                 {{surplusTimeDesc(deviceData.remainTime).text}}
-                <span class="remark-text">最近更新时间：{{deviceData.lastPullTime}}</span>
+                <span class="remark-text">最近更新时间：{{deviceData.lastPullTime | defaultValue}}</span>
               </el-descriptions-item>
               <el-descriptions-item label="备注">{{deviceData.remark | defaultValue}}</el-descriptions-item>
+              <el-descriptions-item label="尺寸">{{deviceData.size | defaultValue}}</el-descriptions-item>
+              <el-descriptions-item label="面料">{{deviceData.fabric | defaultValue}}</el-descriptions-item>
+              <el-descriptions-item label="填充物">{{deviceData.fill | defaultValue}}</el-descriptions-item>
             </el-descriptions>
           </el-card>
 
@@ -74,22 +77,22 @@
             <el-row type="flex">
               <el-statistic title="代理商">
                 <template #formatter>
-                  <user-link :name="deviceData.agentName" :id="deviceData.agentId" class="statistic-link"/>
+                  <user-link :name="deviceData.agentName" :id="deviceData.agentId" />
                 </template>
               </el-statistic>
               <el-statistic title="业务员">
                 <template #formatter>
-                  <user-link :name="deviceData.bizManName" :id="deviceData.bizManId" class="statistic-link"/>
+                  <user-link :name="deviceData.bizManName" :id="deviceData.bizManId"/>
                 </template>
               </el-statistic>
               <el-statistic title="投资人">
                 <template #formatter>
-                  <user-link :name="deviceData.userName" :id="deviceData.userId" class="statistic-link"/>
+                  <user-link :name="deviceData.userName" :id="deviceData.userId"/>
                 </template>
               </el-statistic>
               <el-statistic title="经营场所">
                 <template #formatter>
-                  <store-link :name="deviceData.storeName" :id="deviceData.storeId" class="statistic-link"/>
+                  <store-link :name="deviceData.storeName" :id="deviceData.storeId"/>
                 </template>
               </el-statistic>
               <el-statistic title="房间号">
@@ -97,41 +100,37 @@
                   {{deviceData.room | defaultValue}}
                 </template>
               </el-statistic>
-              <el-statistic title="订单总数" :value="deviceData.orderCount" :precision="2" suffix="单"/>
+              <el-statistic title="订单总数" :value="deviceData.orderCount" :precision="0" suffix="单"/>
               <el-statistic title="订单金额" :value="deviceData.orderAmount" :precision="2" suffix="元"/>
             </el-row>
           </el-card>
         </el-col>
         <el-col :span="6">
           <el-card class="box-card" header="分成详情">
-            <line-field v-for="item of deviceData.bonusList" :label="item.arrivalName">
-              <template #label>
-                <div style="display: flex">
-                  <dict-tag :options="dict.type.bonus_arrival_type" :value="item.arrivalType" size="mini"/>
-                  <div style="margin-left: 0.5em">{{item.arrivalName}}</div>
-                </div>
-              </template>
-              {{item.point | money | defaultValue}} %
-            </line-field>
+            <div style="height: 228px;overflow: auto;">
+              <el-result v-if="isEmpty(deviceData.bonusList)" sub-title="暂无分成信息"/>
+              <line-field v-for="item of deviceData.bonusList" :label="item.arrivalName">
+                <template #label>
+                  <div style="display: flex">
+                    <dict-tag :options="dict.type.bonus_arrival_type" :value="item.arrivalType" size="mini"/>
+                    <div style="margin-left: 0.5em">{{item.arrivalName}}</div>
+                  </div>
+                </template>
+                {{item.point | money | defaultValue}} %
+              </line-field>
+            </div>
           </el-card>
         </el-col>
       </el-row>
 
-
       <el-card class="box-card">
         <el-tabs>
-          <el-tab-pane label="订单列表" :lazy="true">
+          <el-tab-pane label="订单列表" :lazy="true" v-if="checkPermi(['system:bill:list'])">
             <recharge v-if="deviceData.deviceId != null" :query="{deviceId: deviceData.deviceId}" :view="views.device"/>
           </el-tab-pane>
-          <el-tab-pane label="时长变化记录" :lazy="true">
+          <el-tab-pane label="时长变化记录" :lazy="true" v-if="checkPermi(['ss:time:list'])">
             <record-time :query="{deviceId: deviceData.deviceId}" view="device"/>
           </el-tab-pane>
-<!--          <el-tab-pane label="抄表记录" :lazy="true">-->
-<!--            <reading-record :device-id="deviceData.deviceId"/>-->
-<!--          </el-tab-pane>-->
-<!--          <el-tab-pane label="绑定记录" :lazy="true">-->
-<!--            <bind-record :device-id="deviceData.deviceId"/>-->
-<!--          </el-tab-pane>-->
         </el-tabs>
       </el-card>
     </div>
@@ -174,6 +173,9 @@ import { $serviceType, $view } from '@/utils/mixins'
 import LineField from '@/components/LineField/index.vue'
 import RechargeList from '@/views/ss/store/components/rechargeList.vue'
 import Recharge from '@/views/system/recharge/index.vue'
+import { isEmpty } from '@/utils'
+import hasPermi from '@/directive/permission/hasPermi'
+import { checkPermi } from '@/utils/permission'
 
 export default {
   name: 'Device/:deviceId',
@@ -231,6 +233,8 @@ export default {
     clearInterval(this.timer);
   },
   methods: {
+    checkPermi,
+    isEmpty,
     handleUnbind() {
       this.$confirm('是否强制解绑该设备？', '警告', {
         confirmButtonText: '确定',
diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue
index a4be2fb..6f097de 100644
--- a/src/views/system/device/index.vue
+++ b/src/views/system/device/index.vue
@@ -194,7 +194,7 @@
             type="text"
             icon="el-icon-view"
             @click="handleSee(scope.row)"
-            v-hasPermi="['system:device:detail']"
+            v-hasPermi="['system:device:query']"
           >详情</el-button>
           <el-button
             size="mini"
diff --git a/src/views/system/model/index.vue b/src/views/system/model/index.vue
index b4a2b66..e1f362d 100644
--- a/src/views/system/model/index.vue
+++ b/src/views/system/model/index.vue
@@ -128,21 +128,21 @@
           <form-col :span="span * 2"  label="备注" prop="remark">
             <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
           </form-col>
-          <form-col :span="span * 2"  label="默认服务费" prop="serviceRate" label-width="7em">
-            <el-input v-model="form.serviceRate" placeholder="请输入服务费">
-              <template #prepend>
-                <el-select v-model="form.serviceType" placeholder="请选择服务费收取方式" style="width: 10em">
-                  <el-option
-                    v-for="dict in dict.type.service_type"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  />
-                </el-select>
-              </template>
-              <template #append>{{serviceUnit(form.serviceType)}}</template>
-            </el-input>
-          </form-col>
+<!--          <form-col :span="span * 2"  label="默认服务费" prop="serviceRate" label-width="7em">-->
+<!--            <el-input v-model="form.serviceRate" placeholder="请输入服务费">-->
+<!--              <template #prepend>-->
+<!--                <el-select v-model="form.serviceType" placeholder="请选择服务费收取方式" style="width: 10em">-->
+<!--                  <el-option-->
+<!--                    v-for="dict in dict.type.service_type"-->
+<!--                    :key="dict.value"-->
+<!--                    :label="dict.label"-->
+<!--                    :value="dict.value"-->
+<!--                  />-->
+<!--                </el-select>-->
+<!--              </template>-->
+<!--              <template #append>{{serviceUnit(form.serviceType)}}</template>-->
+<!--            </el-input>-->
+<!--          </form-col>-->
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
diff --git a/src/views/system/recharge/detail.vue b/src/views/system/recharge/detail.vue
index 63a36e7..a3de677 100644
--- a/src/views/system/recharge/detail.vue
+++ b/src/views/system/recharge/detail.vue
@@ -68,10 +68,10 @@
 
     <el-card class="box-card">
       <el-tabs>
-        <el-tab-pane label="支付信息" lazy>
+        <el-tab-pane label="支付信息" lazy v-if="checkPermi(['ss:payBill:list'])">
           <pay-bill v-if="detail.billId != null" :query="{bstId: detail.billId}" :view="views.recharge"/>
         </el-tab-pane>
-        <el-tab-pane label="分成信息" lazy>
+        <el-tab-pane label="分成信息" lazy v-if="checkPermi(['ss:bonus:list'])">
           <bonus :query="{billId: detail.billId}" :view="views.recharge"/>
         </el-tab-pane>
       </el-tabs>
@@ -89,6 +89,7 @@ import { SuitFeeType, views } from '@/utils/constants'
 import PayBill from '@/views/ss/payBill/index.vue'
 import StoreLink from '@/components/Business/Store/StoreLink.vue'
 import Bonus from '@/views/ss/bonus/index.vue'
+import { checkPermi } from '@/utils/permission'
 
 export default {
   name: 'RechargeDetail',
@@ -122,6 +123,7 @@ export default {
     this.getDetail();
   },
   methods: {
+    checkPermi,
     getDetail() {
       getBill(this.id).then(res => {
         this.detail = res.data;
diff --git a/src/views/system/smUser/detail.vue b/src/views/system/smUser/detail.vue
index 09f60da..da8a371 100644
--- a/src/views/system/smUser/detail.vue
+++ b/src/views/system/smUser/detail.vue
@@ -21,26 +21,31 @@
                   <el-descriptions-item label="实名认证">
                     <el-tag :type="userData.isReal ? 'success' : 'danger'" size="mini">{{userData.isReal ? '已实名' : '未实名'}}</el-tag>
                   </el-descriptions-item>
+                  <el-descriptions-item label="推广人">
+                    <user-link :id="userData.referenceId" :name="userData.referenceName"/>
+                  </el-descriptions-item>
                   <el-descriptions-item label="直属代理">
                     <user-link :id="userData.agentId" :name="userData.agentName"/>
                   </el-descriptions-item>
-                  <el-descriptions-item label="经营场所数" v-if="userData.type === SmUserType.BUSINESS_PLACE">
-                    {{userData.storeCount | defaultValue}} 家
+                  <el-descriptions-item label="运营商">
+                    {{userData.deptName | defaultValue}}
                   </el-descriptions-item>
+<!--                  <el-descriptions-item label="微信OpenId" :span="3">{{userData.wxOpenId | defaultValue}}</el-descriptions-item>-->
                   <el-descriptions-item label="分成比例" v-if="[SmUserType.BUSINESS_PLACE, SmUserType.NORMAL].includes(userData.type)">
                     {{userData.point | money | defaultValue}} %
                   </el-descriptions-item>
-                  <el-descriptions-item label="设备数">{{userData.deviceCount | defaultValue}} 台</el-descriptions-item>
-                  <el-descriptions-item label="代理数">{{userData.investorCount | defaultValue}} 人</el-descriptions-item>
+                  <el-descriptions-item label="代理数">{{userData.agentCount | defaultValue}} 人</el-descriptions-item>
+                  <el-descriptions-item label="业务员数">{{userData.bizManCount | defaultValue}} 人</el-descriptions-item>
+                  <el-descriptions-item label="投资人数">{{userData.investorCount | defaultValue}} 人</el-descriptions-item>
                   <el-descriptions-item label="经营场所数">{{userData.storeCount | defaultValue}} 家</el-descriptions-item>
+                  <el-descriptions-item label="设备数">{{userData.deviceCount | defaultValue}} 台</el-descriptions-item>
                   <el-descriptions-item label="账户余额">{{userData.balance | money | defaultValue}} 元</el-descriptions-item>
                   <el-descriptions-item label="总收入">{{userData.totalIncome | money | defaultValue}} 元</el-descriptions-item>
                   <el-descriptions-item label="总充值">{{userData.rechargeAmount | money | defaultValue}} 元</el-descriptions-item>
                   <el-descriptions-item label="总提现">{{userData.withDrawlAmount | money | defaultValue}} 元</el-descriptions-item>
-                  <el-descriptions-item label="真实姓名">{{userData.realName | defaultValue}}</el-descriptions-item>
-                  <el-descriptions-item label="身份证">{{userData.realIdCard | defaultValue}}</el-descriptions-item>
-                  <el-descriptions-item label="实名手机" >{{userData.realPhone | defaultValue}}</el-descriptions-item>
-                  <el-descriptions-item label="微信OpenId" :span="3">{{userData.wxOpenId | defaultValue}}</el-descriptions-item>
+<!--                  <el-descriptions-item label="真实姓名">{{userData.realName | defaultValue}}</el-descriptions-item>-->
+<!--                  <el-descriptions-item label="身份证">{{userData.realIdCard | defaultValue}}</el-descriptions-item>-->
+<!--                  <el-descriptions-item label="实名手机" >{{userData.realPhone | defaultValue}}</el-descriptions-item>-->
                 </el-descriptions>
               </div>
             </div>
@@ -56,56 +61,53 @@
       <el-card class="box-card">
         <el-tabs>
           <template v-if="userData.type === SmUserType.SALE">
-            <el-tab-pane label="代理商列表" lazy>
+            <el-tab-pane label="代理商列表" lazy v-if="checkPermi(['system:smUser:agentList'])">
               <sm-user :query="{referenceId: userData.userId, type: SmUserType.SALE}"/>
             </el-tab-pane>
-            <el-tab-pane label="业务员列表" lazy >
+            <el-tab-pane label="业务员列表" lazy v-if="checkPermi(['system:smUser:bizList'])">
               <sm-user :query="{referenceId: userData.userId, type: SmUserType.BIZ}"/>
             </el-tab-pane>
-            <el-tab-pane label="投资人列表" lazy >
+            <el-tab-pane label="投资人列表" lazy v-if="checkPermi(['system:smUser:investorList'])">
               <sm-user :query="{agentId: userData.userId, type: SmUserType.INVESTOR}"/>
             </el-tab-pane>
-            <el-tab-pane label="合作场所" lazy >
+            <el-tab-pane label="合作场所" lazy v-if="checkPermi(['ss:storeInvestor:list'])">
               <store-investor :query="{investorAgentId: userData.userId}"/>
             </el-tab-pane>
-            <el-tab-pane label="设备列表" lazy>
+            <el-tab-pane label="设备列表" lazy v-if="checkPermi(['system:device:list'])">
               <device v-if="userData.userId != null" :query="{agentId: this.userData.userId}"/>
             </el-tab-pane>
           </template>
           <template v-if="userData.type === SmUserType.BIZ">
-            <el-tab-pane label="业务员列表" lazy >
+            <el-tab-pane label="业务员列表" lazy v-if="checkPermi(['system:smUser:bizList'])">
               <sm-user :query="{referenceId: userData.userId, type: SmUserType.BIZ}"/>
             </el-tab-pane>
-            <el-tab-pane label="投资人列表" lazy >
+            <el-tab-pane label="投资人列表" lazy v-if="checkPermi(['system:smUser:investorList'])">
               <sm-user :query="{referenceId: userData.userId, type: SmUserType.INVESTOR}"/>
             </el-tab-pane>
-            <el-tab-pane label="合作场所" lazy >
+            <el-tab-pane label="合作场所" lazy v-if="checkPermi(['ss:storeInvestor:list'])">
               <store-investor :query="{bizId: userData.userId}" :view="views.user"/>
             </el-tab-pane>
-            <el-tab-pane label="设备列表" lazy>
+            <el-tab-pane label="设备列表" lazy v-if="checkPermi(['system:device:list'])">
               <device v-if="userData.userId != null" :query="{investorReferenceId: this.userData.userId}"/>
             </el-tab-pane>
           </template>
           <template v-if="userData.type === SmUserType.INVESTOR">
-            <el-tab-pane label="设备列表" lazy>
+            <el-tab-pane label="设备列表" lazy v-if="checkPermi(['system:device:list'])">
               <user-device :user-id="userData.userId"/>
             </el-tab-pane>
-            <el-tab-pane label="合作场所" lazy>
+            <el-tab-pane label="合作场所" lazy v-if="checkPermi(['ss:storeInvestor:list'])">
               <store-investor :query="{investorId: userData.userId}" :view="views.user"/>
             </el-tab-pane>
           </template>
           <template v-if="userData.type === SmUserType.BUSINESS_PLACE">
-            <el-tab-pane label="经营场所" lazy>
+            <el-tab-pane label="经营场所" lazy v-if="checkPermi(['ss:store:list'])">
               <store :query="{userId: userData.userId}" :view="views.user"/>
             </el-tab-pane>
           </template>
-          <el-tab-pane label="余额变化记录" lazy>
+          <el-tab-pane label="财务记录" lazy v-if="checkPermi(['ss:recordBalance:list'])">
             <record-balance v-if="userData.userId != null" :query="{userId: userData.userId, subjectType: RecordBalanceSubjectType.USER}" :view="views.user"/>
           </el-tab-pane>
-          <el-tab-pane label="经营场所列表" lazy v-if="userData.type === SmUserType.BUSINESS_PLACE">
-            <store :query="{userId: userData.userId}" :view="views.user"/>
-          </el-tab-pane>
-          <el-tab-pane label="收款账户" lazy>
+          <el-tab-pane label="收款账户" lazy v-if="checkPermi(['ss:account:list'])">
             <account v-if="userData.userId != null"  :query="{userId: userData.userId}" :view="views.user"/>
           </el-tab-pane>
 <!--          <el-tab-pane label="用户秘钥" lazy>-->
@@ -136,6 +138,7 @@ import StoreInvestor from '@/views/ss/storeInvestor/index.vue'
 import SmUser from '@/views/system/smUser/index.vue'
 import User from '@/views/system/user/index.vue'
 import UserLink from '@/components/Business/SmUser/UserLink.vue'
+import { checkPermi } from '@/utils/permission'
 
 export default {
   name: 'User/:userId',
@@ -165,6 +168,7 @@ export default {
     this.initData();
   },
   methods: {
+    checkPermi,
     initData() {
       this.loading = true;
       getSmUser(this.$route.params.userId).then(response => {
diff --git a/src/views/system/smUser/index.vue b/src/views/system/smUser/index.vue
index b22f2ed..85c18c0 100644
--- a/src/views/system/smUser/index.vue
+++ b/src/views/system/smUser/index.vue
@@ -17,18 +17,18 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="推广人" prop="referenceMobile">
+      <el-form-item label="推广人" prop="referenceName">
         <el-input
-          v-model="queryParams.referenceMobile"
-          placeholder="请输入推广人手机号"
+          v-model="queryParams.referenceName"
+          placeholder="请输入推广人名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="微信openId" prop="wxOpenId" label-width="7em">
+      <el-form-item label="直属代理" prop="agentName">
         <el-input
-          v-model="queryParams.wxOpenId"
-          placeholder="请输入微信openId"
+          v-model="queryParams.agentName"
+          placeholder="请输入直属代理名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
diff --git a/src/views/userLogin.vue b/src/views/userLogin.vue
index ffb9284..0f57bfe 100644
--- a/src/views/userLogin.vue
+++ b/src/views/userLogin.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">扫码床垫商户中心</h3>
+      <h3 class="title">创亿康商户中心</h3>
 
       <el-form-item prop="username">
         <el-input
diff --git a/vue.config.js b/vue.config.js
index 7b05d9a..38969d6 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '扫码床垫管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '创亿康管理系统' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 3301 // 端口