样式优化

src/components/tagLib.vue

@@ -349,7 +349,7 @@
         selectTag(id) {
           const that = this;
           if (that.tagCategory == 'myTagList') {return false;}
-          that.libRadio = id;
+          that.libRadio = that.libRadio == id ? '' : id;
         },
 
         /**

src/components/tagShortDetail.vue

@@ -48,7 +48,7 @@
       :before-close="closeTagShortDialog">
       <div slot="title" class="dialog-title">
         <div class="checkboxOption-wrap__head__title inline-block top">{{ tagData.tagName }}
-          <span class="realtime-span border-box inline-block middle">{{ tagData.isActive == 1? '实时' : '非实时' }}</span>
+          <span class="realtime-span">{{ tagData.isActive == 1? '实时' : '非实时' }}</span>
         </div>
       </div>
       <div class="tags-content">
@@ -2555,15 +2555,14 @@
 }
 
 .realtime-span {
-  margin-left: 6px;
-  height: 24px;
-  line-height: 24px;
-  padding: 0px 10px;
-  font-size: 11px;
+  margin-left: 4px;
+  padding: 3px 4px;
+  font-size: 12px;
   color: #fff;
-  border-radius: 5px;
+  border-radius: 4px;
   background: #1890ff;
-  font-weight: normal;
+  line-height: 32px;
+  vertical-align: top;
 }
 
 .label-tip {

src/components/tagTemporary.vue

@@ -303,7 +303,8 @@
           const that = this
           if (!!that.selectTag.length) {
             sessionStorage.setItem('selectTempTag',JSON.stringify(that.selectTag))
-            that.changeRoute('/memberGroupEdit')
+            // that.changeRoute('/memberGroupEdit')
+            window.open(`${window.origin}/member-tag/#/memberGroupEdit`);
           }else {
             that.$message.error({
               duration: 1000,

src/view/manualTag/manualTagEdit.vue

@@ -168,12 +168,20 @@
               </el-table-column>
               <el-table-column  label=" " width="220px"  class-name="no-right-border">
                 <template slot-scope="scope"  >
-                  <el-checkbox v-model="scope.row.optType">清空已有标签会员</el-checkbox>
-                  <el-tooltip class="item" effect="light" content="" placement="top">
-                    <div slot="content">勾选此选项则清空之前有此标签会员身上的标签，以本次导入会员为准；<br/>否则本次导入和之前已有数据去重添加。
+                  <el-checkbox v-model="scope.row.optType">清空标签历史标记会员</el-checkbox>
+                  <!-- <el-tooltip class="item" effect="light" content="" placement="top">
+                    <div slot="content">勾选此选项之后，此前被本标签标记的会员将移除此标签，此标签标记会员以本次导入为准。
                     </div>
                     <i class="el-icon-question"></i>
-                  </el-tooltip>
+                  </el-tooltip> -->
+                  <el-popover
+                    placement="top-end"
+                    width="200"
+                    trigger="hover">
+                    <span>勾选后，此前被该标签标记的会员将移除此标签，此标签标记会员以本次导入为准。</span>
+                    <!-- <a slot="reference" class="pointer" :href="'#/memberGroupDetail?memberTagGroupId='+scope.row.memberTagGroupId">{{ scope.row.groupName }}</a> -->
+                    <i slot="reference" class="el-icon-question"></i>
+                  </el-popover>
                 </template>
               </el-table-column>
               <el-table-column  label=" " width="100px">

src/view/memberGroup/memberGroupDetail.vue

@@ -588,8 +588,8 @@
     font-weight: bold;
   }
   .real-time {
-    padding: 3px 5px;
-    border-radius: 10px;
+    padding: 3px 4px;
+    border-radius: 4px;
     color: #fff;
     background: #1890ff;
   }

src/view/memberGroup/memberGroupEdit.vue

@@ -221,13 +221,18 @@
             return [
               {
                 name: '首页',
-                path: ''
+                path: `${window.origin}/report/#/memberSummary`,
+                relocation: true
               },
               {
                 name: '会员标签',
                 path: ''
               },
               {
+                name: '会员分组',
+                path: '/memberGroupList'
+              },
+              {
                 name: memberTagGroupId ? '会员分组编辑' : '新增会员分组',
                 path: ''
               }

src/view/memberGroup/memberGroupList.vue

@@ -46,15 +46,17 @@
             style="width: 100%">
             <el-table-column
               label="分组名称"
-              width="150px"
-              show-overflow-tooltip>
+              width="150px">
               <template slot-scope="scope">
                 <el-popover
                   placement="top-start"
                   width="200"
                   trigger="hover">
-                  <span>{{ scope.row.describle }}</span>
-                  <a slot="reference" class="pointer" :href="'#/memberGroupDetail?memberTagGroupId='+scope.row.memberTagGroupId">{{ scope.row.groupName }}</a>
+                  <div>
+                    <p>名称：{{ scope.row.groupName }}</p>
+                    <p>描述：{{ scope.row.describle }}</p>
+                  </div>
+                  <a slot="reference" class="pointer a-href" :href="'#/memberGroupDetail?memberTagGroupId='+scope.row.memberTagGroupId">{{ scope.row.groupName }}</a>
                 </el-popover>
               </template>
             </el-table-column>
@@ -144,15 +146,16 @@
             <el-table-column
               label="操作">
               <template slot-scope="scope">
-                <el-button type="text" size="small" class="p-r-20" v-if="scope.row.effectiveStatus == 1" @click="toInvalid(scope.row)">失效</el-button>
-                <router-link :to="{path:'/memberGroupDetail',query:{memberTagGroupId:scope.row.memberTagGroupId}}" class="edit-btn el-button--text p-r-20">详情</router-link>
+                <el-button type="text" size="small" class="p-r-12" v-if="scope.row.effectiveStatus == 1" @click="toInvalid(scope.row)">失效</el-button>
+                <router-link :to="{path:'/memberGroupDetail',query:{memberTagGroupId:scope.row.memberTagGroupId}}" class="edit-btn el-button--text p-r-12">详情</router-link>
 
-                <router-link :to="{path:'/memberGroupEdit',query:{memberTagGroupId:scope.row.memberTagGroupId}}" class="edit-btn el-button--text p-r-20">编辑</router-link>
+                <router-link :to="{path:'/memberGroupEdit',query:{memberTagGroupId:scope.row.memberTagGroupId}}" class="edit-btn el-button--text p-r-12">编辑</router-link>
                 <el-button type="text" size="small" class="p-r-12" @click="toDelTag(scope.row, scope.$index)">删除</el-button>
                 <el-popover
-                  placement="top-start"
+                  placement="top"
+                  width="50"
                   trigger="hover">
-                  <span>刷新覆盖人数</span>
+                  刷新覆盖人数
                   <el-button slot="reference" type="text" size="small" @click="refreshGroup(scope.row)">刷新</el-button>
                 </el-popover>
               </template>
@@ -534,4 +537,5 @@
     }
 </script>
 <style lang="scss">
+
 </style>

static/css/public.css

@@ -133,7 +133,12 @@ a {
   text-decoration: none;
   -webkit-backface-visibility: hidden;
 }
-
+a.a-href {
+  color: #606266;
+}
+a.a-href:hover {
+  color: #1890ff;
+}
 li {
   list-style: none;
 }
@@ -1245,10 +1250,10 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
 }
 
 .checkboxOption-wrap__head .realtime-span {
-  padding: 2px 5px;
+  padding: 3px 4px;
   font-size: 11px;
   color: #fff;
-  border-radius: 13px;
+  border-radius: 4px;
   background: #1890ff;
 }