update: 会员分组

src/view/manualTag/manual-tag-value-edit-info.vue

@@ -102,10 +102,15 @@
                           </div>
                         </div>
                         <span slot="reference">
-                          <span class="table-member__img inline-block middle border-box m-r-8">
-                            <img :src="scope.row.thirdImgUrl ? scope.row.thirdImgUrl : require('../../assets/group/member_img.png')" />
-                          </span>
-                          <span>{{ scope.row.memberName }}</span>
+                          <div class="flex">
+                            <span class="table-member__img inline-block middle border-box m-r-10">
+                              <img :src="scope.row.thirdImgUrl ? scope.row.thirdImgUrl : require('../../assets/group/member_img.png')" />
+                            </span>
+                            <div class="inline-block">
+                              <span>{{ scope.row.memberName }}<span class="tips" v-if="scope.row.nickName"> ({{ scope.row.nickName }})</span></span>
+                              <p>{{ scope.row.phoneNumber }}</p>
+                            </div>
+                          </div>
                         </span>
                       </el-popover>
                     </div>
@@ -199,12 +204,12 @@
                   <div :index="$index">{{ row.memberTagRelationTime ? dateformat(new Date(row.memberTagRelationTime), 'yyyy-MM-dd hh:mm:ss') : '--'  }}</div>
                 </template>
               </el-table-column>
-              <el-table-column v-if="$getButtonLimit($buttonCode.memberTagRecordObserve)" label-class-name="table-header__handle" fixed="right" min-width="150">
+              <el-table-column label-class-name="table-header__handle" fixed="right" min-width="150">
                 <template slot="header">
                   <span>操作</span>
                   <i class="el-icon-setting setting" @click="showDefined"></i>
                 </template>
-                <template slot-scope="scope">
+                <template slot-scope="scope" v-if="$getButtonLimit($buttonCode.memberTagRecordObserve)">
                   <a
                     rel="nofollow noopener noreferrer"
                     target="_blank"
@@ -254,7 +259,7 @@
       projectName="member-tag"
     ></vue-gic-export-excel>
     <!--表格字段导出-->
-    <dm-table-filed :visible.sync="tableFiledVisible" projectName="member-tag" pageName="memberTag" :max="20" :defaultDisabled="['memberName']" @submit="onSubmiTableFiled" />
+    <dm-table-filed :visible.sync="tableFiledVisible" projectName="member-tag" pageName="memberTag" :max="20" :defaultDisabled="['memberName']" :checkedFields="checkFields" @submit="onSubmiTableFiled" />
   </div>
 </template>
 <script>
@@ -319,7 +324,7 @@ export default {
       baseUrl: '',
       tagSearch: '',
       tableFiledVisible: false,
-      checkedFields: []
+      checkFields: ['cardNo','gradeName','crateCardDateStringFormat','lastCostTimeFormat','costTimes','avgCost','birthdayMDFormat','pointsCurrent','costAll','mainStoreName','openStoreName']
     };
   },
   computed: {
@@ -462,6 +467,7 @@ export default {
         .then(res => {
           that.total = res.data.result.page.totalCount;
           that.tagDetailList = res.data.result.page.result;
+          console.log(that.tagDetailList);
           if (list) {
             list.forEach(function(ele, index) {
               if (ele.code==='name') {
@@ -784,9 +790,9 @@ export default {
 .table-member__img {
   width: 40px;
   height: 40px;
-  // line-height: 40px;
   text-align: center;
-  // background: #F3F6F9;
+  border-radius: 50%;
+  overflow: hidden;
   img {
     display: inline-block;
     width: 100%;
@@ -802,4 +808,13 @@ export default {
 /deep/ .table-header__handle {
   padding-right: 0 !important;
 }
+.flex {
+  display: flex;
+  align-items: center;
+  font-size: 14px;
+  color: #303133;
+  .tips {
+    color: #909399;
+  }
+}
 </style>

src/view/memberGroup/memberGroupList.vue

@@ -366,11 +366,9 @@
               tooltip-effect="dark"
               style="width: 99%"
               @selection-change="handleSelectionChange">
-              <el-table-column label="分层名称" prop="groupName" min-width="200">
+              <el-table-column label="分层名称" prop="groupName" min-width="130">
                 <template slot-scope="scope">
-                  <el-tooltip class="item" effect="dark" :content="scope.row.groupName | aliasTips" placement="top-start">
-                    <span>{{ scope.row.groupName }}</span>
-                  </el-tooltip>
+                  <span>{{ scope.row.groupName }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="最近更新时间" prop="latestUpdateTime" min-width="100">
@@ -409,6 +407,11 @@
                   <el-switch :active-value="1" :inactive-value="0" v-model="scope.row.appStatus" active-color="#2F54EB" @change="switchAppStatus(scope.row.appStatus, scope.row)"> </el-switch>
                 </template>
               </el-table-column>
+              <el-table-column label="分组描述" min-width="200">
+                <template slot-scope="{ row }">
+                  {{ row.groupName | aliasTips }}
+                </template>
+              </el-table-column>
               <!-- <el-table-column label="操作" width="100" fixed="right" v-if='$getButtonLimit($buttonCode.memberTagGroupLevelDetail)'>
                 <template slot-scope="scope">
                   <router-link

src/view/memberGroup/pyramid-group-table.vue

@@ -12,6 +12,15 @@
         </template>
         <template #default="{ row }">
           {{ row.gradeName || '--' }}
+          ({{ row.gradeName == '核心' ? 1 : row.gradeName == '普通' ? 6 : 3 }})
+          <el-tooltip placement="top">
+            <template #content>
+              <p class="m-b-5">消费周期 =  (最近消费日期 - 首次消费日期 + 1) / 365；</p>
+              <p class="m-b-5">年平均消费次数 = 消费周期 / 有效消费次数；</p>
+              <p>年平均消费金额 = 累计消费金额 / 消费周期；</p>
+            </template>
+            <i v-if="row.gradeName == '核心'" class="iconfont icon-QuestionCircleOutlined" />
+          </el-tooltip>
         </template>
       </el-table-column>
       <el-table-column v-for="(v, i) in tableHeader" :key="i" :prop="v.prop" :min-width="v.minWidth" :label="v.label" :formatter="v.formatter" :fixed="v.fixed">
@@ -154,7 +163,7 @@ export default {
     align-items: center;
     margin-top: 16px;
     & > span {
-      margin-left: 16px;
+      margin-left: 10px;
       margin-right: 56px;
       font-size: 14px;
     }

static/css/public.css

@@ -352,6 +352,9 @@ input:focus {
 .m-r-20 {
   margin-right: 20px;
 }
+.m-b-5 {
+  margin-bottom: 5px;
+}
 .m-b-20 {
   margin-bottom: 20px;
 }