From 25c89fed0caa18821fb68cdc94d60b3f29c22e44 Mon Sep 17 00:00:00 2001
From: wanghousheng <wanghousheng@123.com>
Date: Thu, 1 Aug 2024 23:26:05 +0800
Subject: [PATCH] 1

---
 src/components/Table/UserItem/UserItem.vue    |  6 ++--
 src/config/router.config.js                   |  8 ++---
 src/views/apps/dealer/order/Index.vue         | 23 +++++++-------
 src/views/apps/dealer/setting/Index.vue       | 30 ++++++++++---------
 src/views/apps/dealer/user/Index.vue          | 10 +++----
 .../apps/dealer/user/modules/EditForm.vue     |  4 +--
 6 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/src/components/Table/UserItem/UserItem.vue b/src/components/Table/UserItem/UserItem.vue
index c77ae93..55f0202 100644
--- a/src/components/Table/UserItem/UserItem.vue
+++ b/src/components/Table/UserItem/UserItem.vue
@@ -14,9 +14,9 @@
     <div class="in-right flex flex-dir-column flex-x-center">
       <p class="user-name oneline-hide"> 名 称：{{ user.nick_name }}</p>
       <p class="user-name oneline-hide">手机号：{{ user.mobile }}</p>
-       <p class="user-name oneline-hide">归属地：{{ JSON.parse(user.homelocation).prov }} {{  JSON.parse(user.homelocation).city }}</p>
-      
-        <p class="user-platform">
+      <!-- <p class="user-name oneline-hide">归属地：{{ JSON.parse(user.homelocation).prov }} {{ JSON.parse(user.homelocation).city }}</p> -->
+
+      <p class="user-platform">
         <platform-icon :name="user.platform" :showTips="true" />
       </p>
     </div>
diff --git a/src/config/router.config.js b/src/config/router.config.js
index b5f01a1..89ea1cf 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -883,7 +883,7 @@ export const asyncRouterMap = [
             path: '/apps/dealer',
             component: RouteView,
             redirect: '/apps/dealer/apply',
-            meta: { title: '分销中心', keepAlive: false, permission: ['/apps/dealer'] },
+            meta: { title: '服务商管理', keepAlive: false, permission: ['/apps/dealer'] },
             moduleKey: 'apps-dealer',
             isHideChildren: true,
             children: [
@@ -895,12 +895,12 @@ export const asyncRouterMap = [
               {
                 path: '/apps/dealer/user',
                 component: () => import(/* webpackChunkName: "dealer" */ '@/views/apps/dealer/user/Index'),
-                meta: { title: '分销商用户', keepAlive: false, permission: ['/apps/dealer/user'] }
+                meta: { title: '服务商用户', keepAlive: false, permission: ['/apps/dealer/user'] }
               },
               {
                 path: '/apps/dealer/order',
                 component: () => import(/* webpackChunkName: "dealer" */ '@/views/apps/dealer/order/Index'),
-                meta: { title: '分销订单', keepAlive: false, permission: ['/apps/dealer/order'] }
+                meta: { title: '服务商订单', keepAlive: false, permission: ['/apps/dealer/order'] }
               },
               {
                 path: '/apps/dealer/withdraw',
@@ -915,7 +915,7 @@ export const asyncRouterMap = [
               {
                 path: '/apps/dealer/setting',
                 component: () => import(/* webpackChunkName: "dealer" */ '@/views/apps/dealer/setting/Index'),
-                meta: { title: '分销设置', keepAlive: false, permission: ['/apps/dealer/setting'] }
+                meta: { title: '服务商设置', keepAlive: false, permission: ['/apps/dealer/setting'] }
               }
             ]
           },
diff --git a/src/views/apps/dealer/order/Index.vue b/src/views/apps/dealer/order/Index.vue
index 0379abd..939b39e 100644
--- a/src/views/apps/dealer/order/Index.vue
+++ b/src/views/apps/dealer/order/Index.vue
@@ -141,7 +141,7 @@
                       <div class="order-dealer clearfix">
                         <div v-if="item.dealer_first" class="dealer-item">
                           <p>
-                            <span class="am-text-right">一级分销商：</span>
+                            <span class="am-text-right">一级服务商：</span>
                             <span>{{ item.dealer_first.user.nick_name }} (ID: {{ item.first_user_id }})</span>
                           </p>
                           <p>
@@ -151,7 +151,7 @@
                         </div>
                         <div v-if="item.dealer_second" class="dealer-item">
                           <p>
-                            <span class="am-text-right">二级分销商：</span>
+                            <span class="am-text-right">二级服务商：</span>
                             <span>{{ item.dealer_second.user.nick_name }} (ID: {{ item.second_user_id }})</span>
                           </p>
                           <p>
@@ -161,7 +161,7 @@
                         </div>
                         <div v-if="item.dealer_third" class="dealer-item">
                           <p>
-                            <span class="am-text-right">三级分销商：</span>
+                            <span class="am-text-right">三级服务商：</span>
                             <span>{{ item.dealer_third.user.nick_name }} (ID: {{ item.third_user_id }})</span>
                           </p>
                           <p>
@@ -202,7 +202,7 @@
 
 <script>
 import { Empty } from 'ant-design-vue'
-import { inArray, assignment } from '@/utils/util'
+import { assignment } from '@/utils/util'
 import { GoodsItem, UserItem } from '@/components/Table'
 import {
   DeliveryStatusEnum,
@@ -264,7 +264,7 @@ const columns = [
 // 搜索关键词类型枚举
 const SearchTypeEnum = [
   { name: '订单号', value: 10 },
-  { name: '分销商ID', value: 20 },
+  { name: '服务商ID', value: 20 },
   { name: '会员ID', value: 30 }
 ]
 
@@ -272,7 +272,7 @@ export default {
   name: 'Index',
   components: {
     GoodsItem,
-    UserItem,
+    UserItem
   },
   data () {
     return {
@@ -287,10 +287,10 @@ export default {
       // 当前页码
       page: 1,
       pageSize: 15,
-      pageSizeOptions: ['15', '30', '50', '100','200','300','400','500'],
+      pageSizeOptions: ['15', '30', '50', '100', '200', '300', '400', '500'],
       showTotal: (total) => `共 ${total} 条记录`, // 显示总数
       // 列表数据
-      orderList: { data: [], total: 0}
+      orderList: { data: [], total: 0 }
     }
   },
   beforeCreate () {
@@ -334,10 +334,11 @@ export default {
     getList () {
       const { queryParam, page } = this
       this.isLoading = true
-      return Api.list({ ...queryParam, page,pageSize:this.pageSize })
+      return Api.list({ ...queryParam, page, pageSize: this.pageSize })
         .then(response => {
           this.orderList = response.data.list
         })
+        // eslint-disable-next-line no-return-assign
         .finally(() => this.isLoading = false)
     },
 
@@ -383,11 +384,11 @@ export default {
       this.pageSize = size
       this.handleRefresh()
     },
-    handleSizeChange(current, size){
+    handleSizeChange(current, size) {
       this.page = current
       this.pageSize = size
       this.handleRefresh()
-    },
+    }
 
   }
 }
diff --git a/src/views/apps/dealer/setting/Index.vue b/src/views/apps/dealer/setting/Index.vue
index a8218de..73e8532 100644
--- a/src/views/apps/dealer/setting/Index.vue
+++ b/src/views/apps/dealer/setting/Index.vue
@@ -11,36 +11,36 @@
       >
         <a-tabs :activeKey="tabKey" :tabBarStyle="{ marginBottom: '30px' }" @change="handleTabs">
           <a-tab-pane :key="0" tab="基础设置"></a-tab-pane>
-          <a-tab-pane :key="1" tab="分销商条件"></a-tab-pane>
+          <!-- <a-tab-pane :key="1" tab="分销商条件"></a-tab-pane> -->
           <a-tab-pane :key="2" tab="佣金设置"></a-tab-pane>
           <a-tab-pane :key="3" tab="结算"></a-tab-pane>
-          <a-tab-pane :key="4" tab="自定义文字"></a-tab-pane>
+          <!-- <a-tab-pane :key="4" tab="自定义文字"></a-tab-pane>
           <a-tab-pane :key="5" tab="申请协议"></a-tab-pane>
-          <a-tab-pane :key="6" tab="页面背景图"></a-tab-pane>
+          <a-tab-pane :key="6" tab="页面背景图"></a-tab-pane> -->
         </a-tabs>
         <div class="tabs-content">
           <!-- 基本信息 -->
           <div class="tab-pane" v-show="tabKey == 0">
-            <a-form-model-item label="是否开启分销功能" required>
+            <a-form-model-item label="是否开启服务商分销功能" required>
               <a-radio-group v-model="setting.basic.is_open">
                 <a-radio :value="1">开启</a-radio>
                 <a-radio :value="0">关闭</a-radio>
               </a-radio-group>
             </a-form-model-item>
-            <a-form-model-item label="分销层级" required>
+            <a-form-model-item label="服务商分销层级" required>
               <a-radio-group v-model="setting.basic.level">
                 <a-radio :value="1">一级</a-radio>
                 <a-radio :value="2">二级</a-radio>
                 <a-radio :value="3">三级</a-radio>
               </a-radio-group>
             </a-form-model-item>
-            <a-form-model-item label="分销商内购" required>
+            <a-form-model-item label="服务商内购" required>
               <a-radio-group v-model="setting.basic.self_buy">
                 <a-radio :value="1">开启</a-radio>
                 <a-radio :value="0">关闭</a-radio>
               </a-radio-group>
               <div class="form-item-help">
-                <small>注：分销商自己购买商品，获得一级佣金，上级获得二级佣金</small>
+                <small>注：服务商自己购买商品，获得一级佣金，上级获得二级佣金</small>
               </div>
             </a-form-model-item>
           </div>
@@ -78,9 +78,9 @@
                 :max="100"
                 :precision="0"
               />
-              <span class="ml-10">%</span>
+              <span class="ml-10">‰</span>
               <div class="form-item-help">
-                <small>注：佣金比例范围 0% - 100%</small>
+                <small>注：佣金比例范围 0‰ - 1000‰</small>
               </div>
             </a-form-model-item>
             <a-form-model-item label="二级佣金比例 " required>
@@ -90,9 +90,9 @@
                 :max="100"
                 :precision="0"
               />
-              <span class="ml-10">%</span>
+              <span class="ml-10">‰</span>
               <div class="form-item-help">
-                <small>注：佣金比例范围 0% - 100%</small>
+                <small>注：佣金比例范围 0‰ - 1000‰</small>
               </div>
             </a-form-model-item>
             <a-form-model-item label="三级佣金比例 " required>
@@ -102,9 +102,9 @@
                 :max="100"
                 :precision="0"
               />
-              <span class="ml-10">%</span>
+              <span class="ml-10">‰</span>
               <div class="form-item-help">
-                <small>注：佣金比例范围 0% - 100%</small>
+                <small>注：佣金比例范围 0‰ - 1000‰</small>
               </div>
             </a-form-model-item>
           </div>
@@ -372,7 +372,7 @@ export default {
       // 当前记录详情
       setting: {},
       // 购买指定商品的列表
-      becomeBuyGoodsList: [],
+      becomeBuyGoodsList: []
     }
   },
   // 初始化数据
@@ -424,6 +424,7 @@ export default {
           // 显示成功
           this.$message.success(result.message, 1.5)
         })
+        // eslint-disable-next-line no-return-assign
         .finally(() => this.confirmLoading = false)
     },
 
@@ -432,6 +433,7 @@ export default {
       this.isLoading = true
       Api.update({ form: values })
         .then(result => this.$message.success(result.message, 1.5))
+        // eslint-disable-next-line no-return-assign
         .finally(() => this.isLoading = false)
     }
 
diff --git a/src/views/apps/dealer/user/Index.vue b/src/views/apps/dealer/user/Index.vue
index 5feab19..629d375 100644
--- a/src/views/apps/dealer/user/Index.vue
+++ b/src/views/apps/dealer/user/Index.vue
@@ -60,7 +60,7 @@
           <a-menu slot="overlay" @click="handleMenuClick($event, item)">
             <a-menu-item v-if="$auth('/apps/dealer/order')" key="1">分销订单</a-menu-item>
             <a-menu-item v-if="$auth('/apps/dealer/withdraw')" key="2">提现明细</a-menu-item>
-            <a-menu-item v-action:poster key="3">海报二维码</a-menu-item>
+            <!-- <a-menu-item v-action:poster key="3">海报二维码</a-menu-item> -->
             <a-menu-item v-action:delete key="4">删除</a-menu-item>
           </a-menu>
           <a>
@@ -105,10 +105,10 @@ export default {
           title: '用户ID',
           dataIndex: 'user_id'
         },
-        {
-          title: '身份',
-          dataIndex: 'type_text'
-        },
+        // {
+        //   title: '身份',
+        //   dataIndex: 'type_text'
+        // },
         {
           title: '会员信息',
           dataIndex: 'user',
diff --git a/src/views/apps/dealer/user/modules/EditForm.vue b/src/views/apps/dealer/user/modules/EditForm.vue
index 2b43a33..98331f6 100644
--- a/src/views/apps/dealer/user/modules/EditForm.vue
+++ b/src/views/apps/dealer/user/modules/EditForm.vue
@@ -10,7 +10,7 @@
   >
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
-        <a-form-item label="分销商姓名" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <a-form-item label="服务商姓名" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input v-decorator="['real_name', { rules: [{ required: true }] }]" />
         </a-form-item>
         <a-form-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -37,7 +37,7 @@ export default {
   data() {
     return {
       // 对话框标题
-      title: '编辑分销商',
+      title: '编辑服务商',
       // 标签布局属性
       labelCol: { span: 7 },
       // 输入框布局属性