update: 标签

src/components/Trash.vue

@@ -18,7 +18,7 @@
       </ul>
       <span slot="footer">
         <el-button @click="dialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="doClean" :disabled="delTime > 0 || !trashList.length">{{ delTime > 0 ? getDelTime() : '删除' }}</el-button>
+        <el-button type="primary" @click="doClean" :disabled="!trashList.length">{{ delTime > 0 ? getDelTime() : '删除' }}</el-button>
       </span>
     </el-dialog>
   </div>
@@ -79,7 +79,7 @@ export default {
       return `倒计时: ${h}h:${m}min:${s}s`;
     },
     doClean() {
-      if (this.delTime) return;
+      if (this.delTime > 0) return this.$message.error('当前有正在删除的标签/标签值，删除完成后才能再次操作删除任务');
       cleanTrashList().then(res => {
         const { errorCode, message } = res;
         if (errorCode != 1) return this.$message.error(message);

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

@@ -46,7 +46,7 @@
                 v-for="item in selectedFields" :key="item.code"
                 :fixed="item.code == 'name' ? true : false"
                 :label="item.name"
-                min-width="200">
+                 :min-width="item.code == 'name' ? 260 : 200">
                 <template slot-scope="scope">
                   <!-- 基本信息 -->
                   <template v-if="item.code == 'name'">
@@ -115,49 +115,33 @@
                       </el-popover>
                     </div>
                   </template>
-                  <!-- 手机号 -->
-                  <template v-if="item.code === 'phoneNumber'">
-                    <span>{{scope.row.phoneNumber}}</span>
-                  </template>
-                  <!-- 年龄 -->
-                  <template v-if="item.code == 'age'">
-                    {{ scope.row.age }}
-                  </template>
                   <!-- 会员等级 -->
                   <template v-if="item.code == 'grade'">
                     {{ scope.row.gradeName }}
                   </template>
-                  <!-- 会员卡号 -->
-                  <template v-if="item.code == 'cardNo'">
-                    {{ scope.row.cardNo }}
-                  </template>
-                   <!-- 服务门店 -->
-                  <template v-if="item.code == 'mainStoreName'">
-                    {{ scope.row.mainStoreName }}
-                  </template>
-                   <!-- 开卡门店 -->
-                  <template v-if="item.code == 'createCardStoreName'">
-                    {{ scope.row.openStoreName }}
+                  <!-- 状态 -->
+                  <template v-if="item.code == 'status'">
+                    <span
+                      :title="scope.row.wxStatus == 0 ? '未使用小程序' : scope.row.wxStatus == 1 ? '已使用小程序' : ''"
+                      class="channelicon"
+                      :class="scope.row.wxStatus == 0 ? 'xcxicongray' : scope.row.wxStatus == 1 ? 'xcxicon' : ''"
+                    ></span>
+                    <span
+                      :title="scope.row.status == 0 ? '取消关注公众号' : scope.row.status == 1 ? '已关注公众号' : '未关注公众号'"
+                      class="channelicon"
+                      :class="scope.row.status == 0 ? 'gzhiconcanclegray' : scope.row.status == 1 ? 'gzhicon' : 'gzhicongray'"
+                    ></span>
                   </template>
-                  <!-- 生日 -->
-                  <template v-if="item.code == 'birthday'">
-                    {{ scope.row.birthdayMD }}
+                  <!-- 关联渠道 -->
+                  <template v-if="item.code == 'channel'">
+                    <span class="channelicon" :class="scope.row.channelTaobao == 0 ? 'taobaoicongray' : scope.row.channelTaobao == 1 ? 'taobaoicon' : ''"></span>
+                    <span class="channelicon" :class="scope.row.channelJd == 0 ? 'jdicongray' : scope.row.channelJd == 1 ? 'jdicon' : ''"></span>
+                    <span class="channelicon" :class="scope.row.channelWei == 0 ? 'vipicongray' : scope.row.channelWei == 1 ? 'vipicon' : ''"></span>
                   </template>
-                   <!-- 累计积分 -->
-                  <template v-if="item.code == 'pointsAll'">
-                    {{ scope.row.pointsAll }}
-                  </template>
-                  <!-- 积分余额 -->
-                  <template v-if="item.code == 'pointsCurrent'">
-                    {{ scope.row.pointsCurrent }}
-                  </template>
-                   <!-- 连带率 -->
-                  <template v-if="item.code == 'avgNumber'">
-                    {{ scope.row.avgNumber }}
-                  </template>
-                  <!-- 平均折扣 -->
-                  <template v-if="item.code == 'discountRate'">
-                    {{ scope.row.discountRate }}
+                  <!-- 开卡时间 -->
+                  <template v-if="item.code == 'crateCardDateString'">
+                    <div>{{ scope.row.crateCardDateString | formatTimeYMD }}</div>
+                    <div>{{ scope.row.crateCardDateString | formatTimeHMS }}</div>
                   </template>
                   <!-- 新增时间 -->
                   <template v-if="item.code == 'createTime'">
@@ -169,33 +153,101 @@
                     <div>{{ scope.row.attentionTime | formatTimeYMD }}</div>
                     <div>{{ scope.row.attentionTime | formatTimeHMS }}</div>
                   </template>
+                  <!-- 消费总额 -->
+                  <template v-if="item.code == 'costAll'">
+                    <span>
+                      {{ scope.row.costFee }}
+                    </span>
+                  </template>
                   <!-- 消费次数 -->
                   <template v-if="item.code == 'costTimes'">
                     <div>{{ scope.row.costTimes }}</div>
                   </template>
+                  <!-- 最近消费时间 -->
+                  <template v-if="item.code == 'lastCostTime'">
+                    <div>{{ scope.row.lastCostTime | formatTimeYMD }}</div>
+                  </template>
                   <!-- 客单件 -->
                   <template v-if="item.code == 'avgCost'">
                     {{ scope.row.avgCost }}
                   </template>
-                  <!-- 消费总额 -->
-                  <template v-if="item.code == 'costAll'">
-                    <span>{{ scope.row.costFee }}</span>
+                  <!-- 连带率 -->
+                  <template v-if="item.code == 'avgNumber'">
+                    {{ scope.row.avgNumber }}
                   </template>
-                  <!-- 消费总额（实付） -->
-                  <template v-if="item.code === 'costFeePaid'">
-                    <span>{{scope.row.costFeePaid}}</span>
+                  <!-- 消费品类 -->
+                  <template v-if="item.code == 'costCategory'">
+                    {{ scope.row.costCategory }}
+                  </template>
+                  <!-- 平均折扣 -->
+                  <template v-if="item.code == 'discountRate'">
+                    {{ scope.row.discountRate }}
+                  </template>
+                  <!-- 取关时间 -->
+                  <template v-if="item.code == 'cancelAttentionTime'">
+                    <div>{{ scope.row.cancelAttentionTime | formatTimeYMD }}</div>
+                    <div>{{ scope.row.cancelAttentionTime | formatTimeHMS }}</div>
+                  </template>
+                  <!-- 年龄 -->
+                  <template v-if="item.code == 'age'">
+                    {{ scope.row.age }}
+                  </template>
+                  <!-- 生日 -->
+                  <template v-if="item.code == 'birthday'">
+                    {{ scope.row.birthdayMD }}
+                  </template>
+                  <!-- 储值总额 -->
+                  <template v-if="item.code == 'storedValueAll'">
+                    {{ scope.row.storedValueAll }}
+                  </template>
+                  <!-- 储值余额 -->
+                  <template v-if="item.code == 'storedValueCurrent'">
+                    {{ scope.row.storedValueCurrent }}
+                  </template>
+                  <!-- 累计积分 -->
+                  <template v-if="item.code == 'pointsAll'">
+                    {{ scope.row.pointsAll }}
+                  </template>
+                  <!-- 积分余额 -->
+                  <template v-if="item.code == 'pointsCurrent'">
+                    {{ scope.row.pointsCurrent }}
+                  </template>
+                  <!-- 主门店 -->
+                  <template v-if="item.code == 'mainStoreName'">
+                    {{ scope.row.mainStoreName }}
+                  </template>
+                  <!-- 开卡门店 -->
+                  <template v-if="item.code == 'createCardStoreName'">
+                    {{ scope.row.openStoreName }}
+                  </template>
+                  <!-- 会员卡号 -->
+                  <template v-if="item.code == 'cardNo'">
+                    {{ scope.row.cardNo }}
+                  </template>
+                  <!-- 会员状态 -->
+                  <template v-if="item.code == 'frozenStatus'">
+                    <span class="dm-status--success" v-if="scope.row.frozenStatus == 0">正常</span>
+                    <span class="dm-status--warning" v-if="scope.row.frozenStatus == 1">冻结</span>
                   </template>
                   <!-- 最近消费 -->
                   <template v-if="item.code == 'lastCost'">
                     {{ scope.row.lastCost }}
                   </template>
+                  <!-- 最高单笔（应收） -->
+                  <template v-if="item.code === 'highCost'">
+                    <span>{{scope.row.highCost}}</span>
+                  </template>
+                  <!-- 消费总额（实付） -->
+                  <template v-if="item.code === 'costFeePaid'">
+                    <span>{{scope.row.costFeePaid}}</span>
+                  </template>
                   <!-- 最近消费（实付） -->
                   <template v-if="item.code === 'lastCostPaid'">
                     <span>{{scope.row.lastCostPaid}}</span>
                   </template>
-                  <!-- 最近消费时间 -->
-                  <template v-if="item.code == 'lastCostTime'">
-                    <div>{{ scope.row.lastCostTime | formatTimeYMD }}</div>
+                  <!-- 最高单笔（实付） -->
+                  <template v-if="item.code === 'highCostPaid'">
+                    <span>{{scope.row.highCostPaid}}</span>
                   </template>
                 </template>
               </el-table-column>
@@ -433,7 +485,7 @@ export default {
      */
     saveFieldsList(fields) {
       const para = {
-        pageName: 'memberTagItemSign',
+        pageName: 'notMember,wxOpenCarMember,posMember',
         fields
       };
       return this.axios.post(`${this.baseUrl}/api-member/update-fields?requestProject=memberTag`, para);
@@ -562,7 +614,7 @@ export default {
     getFieldsList() {
       const that = this;
       const para = {
-        pageName: 'memberTagItemSign'
+        pageName: 'notMember,wxOpenCarMember,posMember'
       };
       that.selectedUserDefined = [];
       that.selectedFields = [];

src/view/manualTag/manualTagEdit.vue

@@ -67,7 +67,7 @@ const validateTagValue = (rule, value, cb) => {
 const validateTagSort = (rule, value, cb) => {
   const res = /^[0-9]+$/;
   if (!res.test(value) || value > 100000 || value < 1) {
-    cb(new Error('仅支持输入1-1-100000之间的整数'))
+    cb(new Error('仅支持输入1-100000之间的整数'))
   }
   cb();
 }

src/view/platformTag/member-tag.vue

@@ -19,7 +19,7 @@
 
           <div class="tag-all">
             <p class="tag-name">
-              <span class="sub-title"><dm-sub-title :text="showSearchResult ? `【${tagName}】搜索结果` : tagName"/></span>
+              <span class="sub-title"></span>
               <el-button
                 type="primary"
                 class="add-newtag"
@@ -40,7 +40,7 @@
                 class="add-newtag"
                 placeholder="请输入标签名称"
                 prefix-icon="el-icon-search"
-                style="width: 260px"
+                style="width: 260px;float: left"
                 v-model="memberTag"
                 @keyup.native.enter="searchMemberList"
                 @clear="allTagList"
@@ -757,6 +757,7 @@ export default {
     },
     // 点击活动标签、手工标签
     handleClick() {
+      this.params.pageNum = 1;
       this.memberTag = '';
       const { activeTag, tagList, allTagList, handleFristTag } = this;
       if (activeTag === 'system') {
@@ -939,6 +940,7 @@ export default {
       padding-bottom: 40px;
       overflow-y: auto;
       .tag-name {
+        overflow: hidden;
         line-height: 34px;
         padding: 20px;
         font-size: 16px;
@@ -951,7 +953,6 @@ export default {
       }
       .add-newtag {
         float: right;
-        margin-bottom: 10px;
         margin-left: 15px;
       }
     }

src/view/platformTag/tag-container-active.vue

@@ -179,6 +179,7 @@ export default {
   cursor: pointer;
   color: #303133;
   transition: all .3s;
+  color: #2f54eb;
   &:hover {
     transform: scale(1.25);
   }

src/view/platformTag/tag-container-system.vue

@@ -124,6 +124,7 @@ export default {
   cursor: pointer;
   color: #303133;
   transition: all 0.3s;
+  color: #2f54eb;
   &:hover {
     transform: scale(1.25);
   }
@@ -143,11 +144,9 @@ export default {
   line-height: 22px;
   font-size: 12px;
   &.keep-active {
-    background: #dee3fc;
     color: #2f54eb;
   }
   &.no-active {
-    background: #feecda;
     color: #fa8c16;
   }
 }

src/view/platformTag/tag-container.vue

@@ -236,6 +236,7 @@ export default {
   font-size: 16px;
   cursor: pointer;
   transition: all .3s;
+  color: #2f54eb;
   &:hover {
     transform: scale(1.25);
   }