修改TAPD的bug

src/components/tag/tag-config-options.vue

@@ -26,7 +26,7 @@
         </div>
       </template>
 
-      <!-- 2.数字范围 -->
+      <!-- 2.数字范围区间等等 -->
       <template v-if="parent.templateCode == 'com001'">
         <div class="m-b-20" :key="'tag2' + pindex">
           <el-select v-model="parent.symbol" placeholder="请选择" style="width: 100px">

src/components/tagDetail/mixin/index.js

@@ -843,8 +843,20 @@ export default {
             // tagValue.val[0].data.compute = k.symbol;
             tagValue.val[0].data.compute = k.symbol == '区间' ? 'between' : k.symbol;
             if (k.symbol != '区间') {
+              if (!k.num) {
+                this.$message.warning({
+                  message: '请完善区间值！'
+                });
+                return false;
+              }
               tagValue.val[0].data.value = k.num;
             } else {
+              if (!k.numRange[0] || !k.numRange[1]) {
+                this.$message.warning({
+                  message: '请完善区间值！'
+                });
+                return false;
+              }
               tagValue.val[0].data.value = `${k.numRange[0]},${k.numRange[1]}`;
             }
             let computeSymbol = tagValue.val[0].data.compute == 'between' ? '区间' : tagValue.val[0].data.compute;

src/view/memberGroup/group-list.vue

+<template>
+  <div class="group-list">
+    <div class="member-group">
+      <i class="icon-list el-icon-caret-top icon-transform" :class="expendClass" @click="handleExpend"></i>
+      我的会员分组
+      <i class="el-icon-plus icon-right icon-list" @click="addGroupDialog = true"></i>
+    </div>
+
+    <el-collapseTransition>
+      <ul class="lists" v-show="expendTxt == '展开'">
+        <li v-for="(list, i) in lists" :key="i" class="member-list" :class="{ 'active-li': i == currentIndex }" @click="handleChangeIndex(i, list)">
+          <span v-show="!list.edit">{{ list.classifyName }}</span>
+          <el-input style="width: 100px;" size="mini" v-show="list.edit" v-model="list.classifyName" @keyup.native.enter="modifyName(list)" />
+          <div class="oper-area" v-if="list.classifyName !== '未分类'">
+            <i class="icon-list icon-list-oper" :class="[list.edit ? 'el-icon-check' : 'el-icon-edit']" @click.stop="editGroupName(list)"></i>
+            <i class="icon-list el-icon-circle-close icon-list-oper" @click="deleteGroupName(list)"></i>
+          </div>
+        </li>
+      </ul>
+    </el-collapseTransition>
+
+    <!-- <div class="recommend-list" :class="{ 'recommend-active': active }" @click="getRecommendList">
+      推荐会员分组
+    </div> -->
+
+    <el-dialog :title="title" :visible.sync="addGroupDialog" width="320px" top="30vh" :close-on-click-modal="false">
+      <div>
+        分组名称：
+        <el-input style="width: 200px;" placeholder="请输入分组名称" v-model="groupName" :maxlength="8" clearable></el-input>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="addGroupDialog = false">取 消</el-button>
+        <el-button type="primary" @click="handleGroupDialog">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Vue from 'vue';
+import { CollapseTransition } from 'element-ui';
+import { memberGroupList, memberGroupModify, memberGroupDelete } from '@/request/api';
+
+Vue.component(CollapseTransition.name, CollapseTransition);
+
+export default {
+  name: 'group-list',
+
+  data() {
+    return {
+      lists: [],
+      addGroupDialog: false,
+      expendTxt: '展开',
+      groupName: '',
+      title: '新增分组名称',
+      currentIndex: -1,
+      active: false
+    };
+  },
+
+  computed: {
+    expendClass() {
+      if (this.expendTxt != '展开') {
+        return 'is-caret';
+      } else {
+        return '';
+      }
+    }
+  },
+
+  methods: {
+    // 如果编辑二级会员分组分类 但是没有编辑有切换到其他的分类
+    handleNoEditClassifyName() {
+      this.lists = this.lists.map(el => ({
+        ...el,
+        edit: false
+      }));
+    },
+    handleChangeIndex(i, list) {
+      let editFlag = this.lists.some(el => el.edit);
+      console.log(editFlag);
+      if (editFlag) {
+        this.handleNoEditClassifyName();
+      }
+      this.active = false;
+      this.currentIndex = i;
+      // 第二级的分组数据
+      this.$emit('second-list', list);
+    },
+    /**
+     * 修改和删除分组
+     */
+    editGroupName(list) {
+      if (list.edit) {
+        this.modifyName(list);
+      } else {
+        if (!this.operatorName(list)) {
+          return;
+        }
+        list.edit = true;
+      }
+    },
+    // 删除
+    deleteGroupName(list) {
+      if (!this.operatorName(list)) {
+        return;
+      }
+      this.$confirm('是否删除分组名称？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          // 删除操作
+          this.excludeName(list);
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          });
+        });
+    },
+    excludeName(list) {
+      const param = {
+        requestProject: 'gic-member-tag-web',
+        memberTagGroupClassifyId: list.memberTagGroupClassifyId
+      };
+      memberGroupDelete(param).then(res => {
+        if (res.errorCode == 1) {
+          this.getMemberGroupList();
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          });
+        }
+      });
+    },
+    // 修改分组名称
+    modifyName(list) {
+      if (!list.classifyName) {
+        this.$message({
+          message: `分组名称不能为空！`,
+          type: 'warning',
+          duration: 2000
+        });
+        return;
+      }
+      const param = {
+        requestProject: 'gic-member-tag-web',
+        classifyName: list.classifyName,
+        memberTagGroupClassifyId: list.memberTagGroupClassifyId
+      };
+      memberGroupModify(param).then(res => {
+        if (res.errorCode == 1) {
+          list.edit = false;
+          this.getMemberGroupList();
+          this.$message({
+            type: 'success',
+            message: '修改成功',
+            duration: 2000
+          });
+
+        }
+      });
+    },
+
+    operatorName(list) {
+      if (list.memberTagGroupClassifyId == '0') {
+        this.$message({
+          message: `${list.classifyName}的不能操作`,
+          type: 'warning',
+          duration: 2000
+        });
+        return false;
+      }
+      return true;
+    },
+
+    /**
+     * 新增会员分组分类
+     */
+    handleGroupDialog() {
+      if (!this.groupName) {
+        this.$message({
+          type: 'warning',
+          message: '分组名称不能为空'
+        });
+        return;
+      }
+      const param = {
+        requestProject: 'gic-member-tag-web',
+        classifyName: this.groupName
+      };
+      memberGroupModify(param).then(res => {
+        if (res.errorCode == 1) {
+          this.getMemberGroupList();
+          this.groupName = '';
+          this.addGroupDialog = false;
+          this.$message({
+            type: 'success',
+            message: '添加成功'
+          });
+        }
+      });
+    },
+    /**
+     * 会员分组分类
+     */
+    getMemberGroupList() {
+      memberGroupList({
+        requestProject: 'gic-member-tag-web'
+      }).then(res => {
+        if (res.errorCode === 1) {
+          this.lists = res.result.map(el => ({
+            ...el,
+            edit: false
+          }));
+        }
+      });
+    },
+    // 收起
+    handleExpend() {
+      this.expendTxt = this.expendTxt === '展开' ? '收起' : '展开';
+    },
+    // getRecommendList() {
+    //   let editFlag = this.lists.some(el => el.edit);
+    //   if (editFlag) {
+    //     this.handleNoEditClassifyName();
+    //   }
+    //   this.active = true;
+    //   this.currentIndex = -1;
+    //   this.$emit('getRecommend');
+    // }
+  },
+
+  beforeMount() {
+    this.getMemberGroupList();
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.group-list {
+  padding-top: 20px;
+  .recommend-list {
+    margin-top: 10px;
+    padding-left: 37px;
+    line-height: 30px;
+    font-size: 14px;
+    font-weight: bold;
+    color: #303133;
+    cursor: pointer;
+  }
+  .recommend-active {
+    color: #1890ff;
+  }
+}
+.member-group {
+  padding: 5px 10px 20px 20px;
+  font-size: 14px;
+  color: #303133;
+  font-weight: bold;
+  cursor: pointer;
+  &:hover {
+    color: #1890ff;
+  }
+  .icon-right {
+    float: right;
+  }
+  .icon-list {
+    color: #909399;
+    &:hover {
+      color: #303133;
+    }
+  }
+}
+.icon-list {
+  color: #909399;
+  &:hover {
+    color: #303133;
+  }
+}
+.member-list {
+  height: 32px;
+  line-height: 32px;
+  padding-left: 37px;
+  font-size: 14px;
+  color: #606266;
+  cursor: pointer;
+  &:hover {
+    color: #1890ff;
+    .oper-area {
+      display: inline;
+    }
+  }
+  .oper-area {
+    display: none;
+    float: right;
+    margin-right: 10px;
+  }
+}
+.active-li {
+  background-color: #f6f8fd;
+  color: #1890ff;
+}
+.icon-list-oper {
+  color: #c0c4cc;
+  margin: 0 3px;
+}
+.icon-transform {
+  transition: transform 0.3s;
+  transform: rotate(180deg);
+  &.is-caret {
+    transform: rotate(0deg);
+  }
+}
+</style>

src/view/platformTag/second-tag.vue

@@ -83,6 +83,11 @@ export default {
     list: {
       immediate: true,
       handler(newval) {
+        let noClassIndex  = newval.children.findIndex(el => el.name == '未分类');
+        if (noClassIndex > -1) {
+          let noClassData = newval.children.splice(noClassIndex, 1);
+          newval.children.unshift(noClassData[0]);
+        }
         this.tagList = newval;
       }
     }
@@ -255,6 +260,7 @@ export default {
 .second {
   position: relative;
   line-height: 26px;
+  min-height: 26px;
   padding-left: 24px;
   padding-top: 3px;
   padding-bottom: 2px;