feat(member): 移除经销商相关展示内容

public/index.html

@@ -11,7 +11,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-  <link rel="icon" href="<%= BASE_URL %>fave.png">
+  <link rel="icon" href="<%= BASE_URL %>logo.png">
   <title>
     <%= webpackConfig.name %>
   </title>

src/api/member.js

@@ -6,17 +6,17 @@
  */
 import request from '@/utils/request'
 
-//查询会员信息
+// 查询会员信息
 
 export function getMemberList(params) {
-    return request({
+  return request({
-      url: '/member/manager/member/query-member',
+    url: '/member/manager/member/query-member',
-      method: 'get',
+    method: 'get',
-      params
+    params
-    })
+  })
-  }
+}
 
-//查询真实信息
+// 查询真实信息
 export function memberRealInfo(params) {
   return request({
     url: '/member/manager/member/member-real-info',
@@ -27,49 +27,48 @@ export function memberRealInfo(params) {
 
 // 查询表头名称字段
 export function gettheTableValue(params) {
-    return request({
+  return request({
-        url: '/member/manager/member/query-theLable',
+    url: '/member/manager/member/query-theLable',
-        method: 'get',
+    method: 'get',
-        params
+    params
-    })
+  })
 }
 
-
 // 查询隶属体系下拉选
 export function getvertexValue(params) {
-    return request({
+  return request({
-        url: '/system/manage/vertex/find-all',
+    url: '/system/manage/vertex/find-all',
-        method: 'get',
+    method: 'get',
-        params
+    params
-    })
+  })
 }
 
-//隶属团队下拉选
+// 隶属团队下拉选
 export function getmemberTeamList(params) {
-    return request({
+  return request({
-        url: '/member/manage/member-team/listNoPage',
+    url: '/member/manage/member-team/listNoPage',
-        method: 'get',
+    method: 'get',
-        params
+    params
-    })
+  })
 }
-//收益状态
+// 收益状态
 export function incomeStatusList(params) {
-    return request({
+  return request({
-        url: '/system/pub/enums/incomeStatus',
+    url: '/system/pub/enums/incomeStatus',
-        method: 'get',
+    method: 'get',
-        params
+    params
-    })
+  })
 }
-//服务协议
+// 服务协议
 export function serviceStatus(params) {
-    return request({
+  return request({
-        url: '/system/pub/enums/service-status',
+    url: '/system/pub/enums/service-status',
-        method: 'get',
+    method: 'get',
-        params
+    params
-    })
+  })
 }
 
-//获取数据类型
+// 获取数据类型
 export function getDataType(params) {
   return request({
     url: '/system/pub/enums/data-type',
@@ -78,7 +77,6 @@ export function getDataType(params) {
   })
 }
 
-
 // 奖金结算
 export function settleBonus(params) {
   return request({
@@ -121,144 +119,134 @@ export function withdrawalBonus(params) {
   })
 }
 
-//代理等级下拉选
+// 代理等级下拉选
 export function getAgentGrade(params) {
-    return request({
+  return request({
-        url: '/system/pub/enums/agent-grade',
+    url: '/system/pub/enums/agent-grade',
-        method: 'get',
+    method: 'get',
-        params
+    params
-    })
+  })
 }
 
-//账户状态下拉选
+// 账户状态下拉选
 export function getaccountStatus(params) {
-    return request({
+  return request({
-        url: '/system/pub/enums/account-status',
+    url: '/system/pub/enums/account-status',
-        method: 'get',
+    method: 'get',
-        params
+    params
-    })
+  })
 }
 
-//钱包状态下拉选
+// 钱包状态下拉选
 export function getsalletStatus(params) {
-    return request({
+  return request({
-        url: '/system/pub/enums/account-member-account',
+    url: '/system/pub/enums/account-member-account',
-        method: 'get',
+    method: 'get',
-        params
+    params
-    })
+  })
 }
 
-//认证枚举下拉选
+// 认证枚举下拉选
 export function getattestation(params) {
-    return request({
+  return request({
-        url: '/system/pub/enums/get-yes-no-attestation',
+    url: '/system/pub/enums/get-yes-no-attestation',
-        method: 'get',
+    method: 'get',
-        params
+    params
-    })
+  })
 }
 
-//营业执照 是否上传
+// 营业执照 是否上传
 export function getYesnouploadsList(params) {
-    return request({
+  return request({
-        url: '/system/pub/enums/get-yes-no-uploads',
+    url: '/system/pub/enums/get-yes-no-uploads',
-        method: 'get',
+    method: 'get',
-        params
+    params
-    })
+  })
 }
 
-//经销商 是否是经销商
+// 订单状态
-export function getDealerYesno(params) {
-    return request({
-        url: '/system/pub/enums/dealer-yes-no',
-        method: 'get',
-        params
-    })
-}
-
-//订单状态
 export function getorderStatus(params) {
-    return request({
+  return request({
-        url: '/system/pub/enums/get-order-source',
+    url: '/system/pub/enums/get-order-source',
-        method: 'get',
+    method: 'get',
-        params
+    params
-    })
+  })
 }
 
-//抗衰能量仓
+// 抗衰能量仓
 export function getSiloList(data) {
-    return request({
+  return request({
-        url: '/member/manage/silo/list',
+    url: '/member/manage/silo/list',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 
-//删除能量仓
+// 删除能量仓
 export function deleteSilo(data) {
-    return request({
+  return request({
-        url: '/member/manage/silo/delete',
+    url: '/member/manage/silo/delete',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 
-//能量仓查询单条
+// 能量仓查询单条
 export function getSiloDetail(data) {
-    return request({
+  return request({
-        url: '/member/manage/silo/detail',
+    url: '/member/manage/silo/detail',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 
-
+// 新增能量仓
-//新增能量仓
 export function saveSilo(data) {
-    return request({
+  return request({
-        url: '/member/manage/silo/save',
+    url: '/member/manage/silo/save',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 
-//达标状态
+// 达标状态
 export function getReachState(params) {
-    return request({
+  return request({
-        url: '/system/pub/enums/get-reach-state',
+    url: '/system/pub/enums/get-reach-state',
-        method: 'get',
+    method: 'get',
-        params
+    params
-    })
+  })
 }
-//免密登录
+// 免密登录
 export function passwordFree(params) {
-    return request({
+  return request({
-        url: '/member/manager/member/password-free',
+    url: '/member/manager/member/password-free',
-        method: 'get',
+    method: 'get',
-        params
+    params
-    })
+  })
 }
-//乐享免密登录
+// 乐享免密登录
 export function passwordFreeLen(params) {
-    return request({
+  return request({
-        url: '/member/manager/member/password-free-len',
+    url: '/member/manager/member/password-free-len',
-        method: 'get',
+    method: 'get',
-        params
+    params
-    })
+  })
 }
-//会员有效状态
+// 会员有效状态
 export function getExpirestatus(params) {
-    return request({
+  return request({
-        url: '/system/pub/enums/get-expirestatus',
+    url: '/system/pub/enums/get-expirestatus',
-        method: 'get',
+    method: 'get',
-        params
+    params
-    })
+  })
 }
-//会员奖衔查询列表
+// 会员奖衔查询列表
 export function member_awards(params) {
-    return request({
+  return request({
-        url: 'member/manager/member/member_awards_query',
+    url: 'member/manager/member/member_awards_query',
-        method: 'get',
+    method: 'get',
-        params
+    params
-    })
+  })
 }
 

src/views/information/member/index.vue

@@ -294,55 +294,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="4">
-                <el-form-item label="经销商" prop="isDealer">
-                  <el-select
-                    v-model="queryParams.isDealer"
-                    clearable
-                    :placeholder="'请选择'"
-                  >
-                    <el-option
-                      v-for="item in tattestation"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <!-- <el-col :span="4">
-                <el-form-item :label="'超级工作室'" prop="superStudio ">
-                  <el-select
-                    v-model="queryParams.superStudio"
-                    clearable
-                    :placeholder="'请选择'"
-                  >
-                    <el-option
-                      v-for="item in tattestation"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col> -->
 
-              <!-- <el-col :span="4">
-                <el-form-item :label="'创客空间'" prop="isMakerSpace">
-                  <el-select
-                    v-model="queryParams.isMakerSpace"
-                    clearable
-                    :placeholder="'请选择'"
-                  >
-                    <el-option
-                      v-for="item in tattestation"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col> -->
               <el-col :span="4">
                 <el-form-item :label="'服务中心编号'" prop="centerMemberCode">
                   <el-input
@@ -645,27 +597,7 @@
             :label="'荣誉奖衔'"
             width="180"
           />
-          <!-- <el-table-column
+
-            v-if="allTxt.pkMaxAwardsVal"
-            align="center"
-            prop="pkMaxAwardsVal"
-            :label="'荣誉奖衔'"
-            width="180"
-          /> -->
-          <!-- <el-table-column
-            v-if="allTxt.histroyAwardsName"
-            align="center"
-            prop="histroyAwardsName"
-            :label="'历史荣誉'"
-            width="180"
-          /> -->
-          <!-- <el-table-column
-            v-if="allTxt.agentGradeVal"
-            align="center"
-            prop="agentGradeVal"
-            :label="'代理等级'"
-            width="180"
-          /> -->
           <el-table-column
             v-if="allTxt.orderSourceVal"
             align="center"
@@ -688,20 +620,7 @@
             :label="'服务中心姓名'"
             width="180"
           />
-          <!-- <el-table-column
+
-            v-if="menuList[15].checked == true && allTxt.lecturerLevelVal"
-            align="center"
-            prop="lecturerLevelVal"
-            :label="'讲师等级'"
-            width="180"
-          /> -->
-          <!-- <el-table-column
-            v-if="allTxt.systemLevelVal"
-            align="center"
-            prop="systemLevelVal"
-            :label="'系统级别'"
-            width="180"
-          /> -->
           <el-table-column
             v-if="menuList[7].checked == true && allTxt.pkRegisterGradeVal"
             align="center"
@@ -784,26 +703,9 @@
             label="服务协议"
             width="180"
           />
+
           <el-table-column
-            v-if="menuList[16].checked == true && allTxt.isDealerVal"
+            v-if="menuList[16].checked == true && allTxt.superStudioVal"
-            align="center"
-            prop="isDealerVal"
-            :label="'经销商'"
-            width="180"
-          >
-            <template slot-scope="scope">
-              <span
-                v-if="scope.row.isDealer == 0"
-                style="color: #009b58"
-              >已认证</span>
-              <span
-                v-if="scope.row.isDealer == 1"
-                style="color: #c8161d"
-              >未认证</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            v-if="menuList[17].checked == true && allTxt.superStudioVal"
             align="center"
             prop="superStudioVal"
             :label="'超级工作室'"
@@ -820,40 +722,16 @@
               >未认证</span>
             </template>
           </el-table-column>
-          <!-- <el-table-column
+
-            v-if="menuList[18].checked == true && allTxt.isMakerSpaceVal"
-            align="center"
-            prop="isMakerSpaceVal"
-            :label="'创客空间'"
-            width="180"
-          >
-            <template slot-scope="scope">
-              <span
-                v-if="scope.row.isMakerSpace == 0"
-                style="color: #009b58"
-              >已认证</span>
-              <span
-                v-if="scope.row.isMakerSpace == 1"
-                style="color: #c8161d"
-              >未认证</span>
-            </template>
-          </el-table-column> -->
-          <!-- <el-table-column
-            v-if="allTxt.storeTypeVal"
-            align="center"
-            prop="storeTypeVal"
-            label="体验中心"
-            width="180"
-          /> -->
           <el-table-column
-            v-if="menuList[19].checked == true && allTxt.accountStatusVal"
+            v-if="menuList[17].checked == true && allTxt.accountStatusVal"
             align="center"
             prop="accountStatusVal"
             :label="'账户状态'"
             width="180"
           />
           <el-table-column
-            v-if="menuList[20].checked == true && allTxt.memberAccountVal"
+            v-if="menuList[18].checked == true && allTxt.memberAccountVal"
             align="center"
             prop="memberAccountVal"
             :label="'钱包状态'"
@@ -921,32 +799,7 @@
             :label="'会员类型'"
             width="180"
           />
-          <!-- <el-table-column
+
-            align="center"
-            prop="isMakerGiftVal"
-            label="创客合伙人"
-            width="180"
-          /> -->
-          <!-- <el-table-column
-            align="center"
-            prop="systemType"
-            :label="$t('系统类型')"
-          >
-            <template v-for="item in systemTypes" slot-scope="scope">
-              <div
-                v-if="scope.row.systemType == item.value"
-                :key="item.value"
-              >
-                {{ item.label }}
-              </div>
-            </template>
-          </el-table-column> -->
-          <!-- <el-table-column
-            align="center"
-            prop="makerGiftTime"
-            label="创客合伙人时间"
-            width="180"
-          /> -->
           <el-table-column
             align="center"
             prop="time"
@@ -1040,8 +893,7 @@ import {
   getattestation,
   getYesnouploadsList,
   getorderStatus,
-  getAgentGrade,
+
-  getDealerYesno,
   passwordFree,
   passwordFreeLen,
   incomeStatusList,
@@ -1163,24 +1015,13 @@ export default {
           checked: true,
           prop: ''
         },
-        {
-          id: 16,
-          text: '经销商',
-          checked: true,
-          prop: ''
-        },
         {
           id: 17,
           text: '超级工作室',
           checked: true,
           prop: 'superStudioVal'
         },
-        {
+
-          id: 18,
-          text: '创客空间',
-          checked: true,
-          prop: 'isMakerSpaceVal'
-        },
         {
           id: 19,
           text: '账户状态',
@@ -1309,8 +1150,6 @@ export default {
     this.getattestation()
     this.getYesnouploadsList()
     this.getorderStatus()
-    // this.getAgentGrade()
-    this.getDealerYesno()
     this.incomeStatusList()
     this.serviceStatus()
     // 初始化表头
@@ -1415,18 +1254,6 @@ export default {
         })
       }
     },
-    // 经销商
-    getDealerYesno() {
-      getDealerYesno().then((res) => {
-        this.dealerList = res.data
-      })
-    },
-    // 代理等级
-    getAgentGrade() {
-      getAgentGrade().then((res) => {
-        this.agentGradeList = res.data
-      })
-    },
     // 查询会员信息
     getMemberList() {
       this.loading = true