Merge branch 'feature/11月迭代' into dev

src/router/index.js

@@ -278,27 +278,27 @@ export const constantRouterMap = [{
                 component: _import('apps/customerApp', 'index'),
                 children: [{
                         path: '/memberShowSet',
-                        name: '会员展示设置',
+                        name: '客户展示设置',
                         component: _import('apps/customerApp', 'memberShowSet')
                     },
                     {
                         path: '/memberGroupSet',
-                        name: '会员分组设置',
+                        name: '客户分组设置',
                         component: _import('apps/customerApp', 'memberGroupSet')
                     },
                     {
                         path: '/memberSearchSet',
-                        name: '会员搜索设置',
+                        name: '客户搜索设置',
                         component: _import('apps/customerApp', 'memberSearchSet')
                     },
                     {
                         path: '/memberDetailSet',
-                        name: '会员详情设置',
+                        name: '客户详情设置',
                         component: _import('apps/customerApp', 'memberDetailSet')
                     },
                     {
                         path: '/memberTagSet',
-                        name: '会员标签设置',
+                        name: '客户标签设置',
                         component: _import('apps/customerApp', 'memberTagSet')
                     },
                     {

src/views/apps/customerApp/index.vue

@@ -67,33 +67,33 @@ export default {
       tabListData: [
         {
           tabId: '1',
-          tabName: '会员基础设置',
+          tabName: '客户基础设置',
           icon: 'iconjichushezhi',
           onlyIconActive: false,
           children: [
             {
               tabId: '11',
-              tabName: '会员展示设置',
+              tabName: '客户展示设置',
               icon: ''
             },
             {
               tabId: '12',
-              tabName: '会员分组设置',
+              tabName: '客户分组设置',
               icon: ''
             },
             {
               tabId: '13',
-              tabName: '会员搜索设置',
+              tabName: '客户搜索设置',
               icon: ''
             },
             {
               tabId: '14',
-              tabName: '会员详情设置',
+              tabName: '客户详情设置',
               icon: ''
             }
             // {
             //   tabId: '15',
-            //   tabName: '会员标签设置',
+            //   tabName: '客户标签设置',
             //   icon: ''
             // }
           ]
@@ -105,12 +105,12 @@ export default {
         }
       ],
       navName: {
-        1: '会员基础设置',
-        11: '会员展示设置',
-        12: '会员分组设置',
-        13: '会员搜索设置',
-        14: '会员详情设置',
-        15: '会员标签设置',
+        1: '客户基础设置',
+        11: '客户展示设置',
+        12: '客户分组设置',
+        13: '客户搜索设置',
+        14: '客户详情设置',
+        15: '客户标签设置',
         151: '同步记录',
         2: '我的客户列表'
       },
@@ -140,28 +140,28 @@ export default {
       let list = [
         {
           tabId: '1',
-          tabName: '会员基础设置',
+          tabName: '客户基础设置',
           icon: 'iconjichushezhi',
           onlyIconActive: false,
           children: [
             {
               tabId: '11',
-              tabName: '会员展示设置',
+              tabName: '客户展示设置',
               icon: ''
             },
             {
               tabId: '12',
-              tabName: '会员分组设置',
+              tabName: '客户分组设置',
               icon: ''
             },
             {
               tabId: '13',
-              tabName: '会员搜索设置',
+              tabName: '客户搜索设置',
               icon: ''
             },
             {
               tabId: '14',
-              tabName: '会员详情设置',
+              tabName: '客户详情设置',
               icon: ''
             }
             // {

src/views/apps/customerApp/memberShowSet.vue

@@ -15,16 +15,16 @@
   <div class="app-detail-wrap">
     <div class="app-detail-pane border-box p-20">
       <div class="m-b-20">
-        <el-checkbox class="w-195" v-model="myCustomData.mainStoreFlag">展示服务门店会员</el-checkbox>
-        <div class="font-14 color-909399 set-tip-item">注：保存勾选项后，门店导购和店长可查看本门店作为服务门店名下会员</div>
+        <el-checkbox class="w-195" v-model="myCustomData.mainStoreFlag">展示服务门店客户</el-checkbox>
+        <div class="font-14 color-909399 set-tip-item">注：保存勾选项后，门店导购和店长可查看本门店作为服务门店名下客户</div>
       </div>
       <div class="m-b-20">
-        <el-checkbox class="w-195" v-model="myCustomData.minorStoreFlag">展示协管门店会员</el-checkbox>
-        <div class="font-14 color-909399 set-tip-item">注：保存勾选项后，门店导购和店长可查看本门店作为协管门店名下会员</div>
+        <el-checkbox class="w-195" v-model="myCustomData.minorStoreFlag">展示协管门店客户</el-checkbox>
+        <div class="font-14 color-909399 set-tip-item">注：保存勾选项后，门店导购和店长可查看本门店作为协管门店名下客户</div>
       </div>
       <div class="m-b-20">
-        <el-checkbox class="w-195" v-model="myCustomData.openCardStoreFlag">展示开卡门店会员</el-checkbox>
-        <div class="font-14 color-909399 set-tip-item">注：保存勾选项后，门店导购和店长可查看本门店作为开卡门店名下会员</div>
+        <el-checkbox class="w-195" v-model="myCustomData.openCardStoreFlag">展示开卡门店客户</el-checkbox>
+        <div class="font-14 color-909399 set-tip-item">注：保存勾选项后，门店导购和店长可查看本门店作为开卡门店名下客户</div>
       </div>
       <div class="m-b-20">
         <el-checkbox class="w-195" v-model="myCustomData.showFreezeFlag">展示冻结会员</el-checkbox>
@@ -35,8 +35,8 @@
         <div class="font-14 color-909399 set-tip-item">注：保存勾选项后，门店导购和店长可查看本门店微信会员（不含未开卡会员）及POS会员，不勾选将展示微信会员（即微信总量，含未开卡会员）及POS会员</div>
       </div>
       <div class="m-b-20">
-        <el-checkbox class="w-195" v-model="myCustomData.clerkSeeOtherFlag">允许导购查看其他导购会员</el-checkbox>
-        <div class="font-14 color-909399 set-tip-item">注：保存勾选项后，门店导购可查看本门店其他导购名下会员</div>
+        <el-checkbox class="w-195" v-model="myCustomData.clerkSeeOtherFlag">允许导购查看其他导购客户</el-checkbox>
+        <div class="font-14 color-909399 set-tip-item">注：保存勾选项后，门店导购可查看本门店其他导购名下客户</div>
       </div>
       <div class="m-b-20">
         <el-checkbox class="w-195" v-model="myCustomData.faceOpenFlag">展示人脸识别模块</el-checkbox>
@@ -47,10 +47,10 @@
         <div class="font-14 color-909399 set-tip-item">注：保存勾选项后，店长可以选择离职的导购名下的好友会员，选择离职继承</div>
       </div>
       <div class="m-b-20">
-        <el-tooltip class="item" effect="dark" content="注：开启后，可选择导购在 &lt; 我的客户 &gt; 中是否通过以下方式联系会员" placement="top-start"> <span style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;" class="font-14 color-606266 m-r-20">导购联系会员方式：</span></el-tooltip>
+        <el-tooltip class="item" effect="dark" content="注：开启后，可选择导购在 &lt; 我的客户 &gt; 中是否通过以下方式联系客户" placement="top-start"> <span style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;" class="font-14 color-606266 m-r-20">导购联系客户方式：</span></el-tooltip>
         <el-checkbox v-model="myCustomData.allowGuideMobile" @change="changeContact">电话</el-checkbox>
         <el-checkbox v-model="myCustomData.allowGuideMessage" @change="changeContact">短信</el-checkbox>
-        <el-checkbox v-model="myCustomData.allowGuideOnlineChat" @change="changeContact">添加会员/发消息</el-checkbox>
+        <el-checkbox v-model="myCustomData.allowGuideOnlineChat" @change="changeContact">添加客户/发消息</el-checkbox>
       </div>
       <div class="m-t-46">
         <el-button type="primary" :loading="loading" @click="submit('showFlag')" :disabled="$store.state.wxEnterpriseType">保 存</el-button>