update: ui

src/components/relatePop.vue

@@ -21,9 +21,9 @@
     <el-table :data="tableDate" @row-click="onRowClick" v-loading="loading">
       <el-table-column width="35">
         <template slot-scope="{row}">
-          <el-radio v-model="tableRadio" :label="row.integralMallProRuleId">
-            <i />
-          </el-radio>
+          <div class="label">
+            <el-radio v-model="tableRadio" :label="row.integralMallProRuleId" />
+          </div>
         </template>
       </el-table-column>
       <el-table-column property="ruleTitle" label="上架规则名称">
@@ -47,13 +47,11 @@
           </p>
           <div v-else>
             <el-tooltip
-              class="tips-content"
-              popper-class="store-tips"
               effect="dark"
               placement="top-start"
               v-if="(row.showBack&&row.showBack.length>20)"
             >
-              <div slot="content" style="line-height:18px">
+              <div slot="content" style="line-height:18px; max-width:500px;">
                 {{ row.showBack }}
               </div>
               <div>{{ row.showBack.slice(0,20)+'...' }}</div>
@@ -178,6 +176,10 @@ export default {
 };
 </script>
 
-<style>
-
+<style lang="scss" scoped>
+.label{
+ /deep/ .el-radio__label{
+    display: none;
+  }
+}
 </style>

src/views/goods/ruleList/info.vue

@@ -47,15 +47,18 @@
             />
           </el-form-item>
           <el-form-item label="适用人群" prop="memberType">
-            <el-radio v-model="ruleForm.memberType" :label="1">
-              全部会员
-            </el-radio>
-            <el-radio v-model="ruleForm.memberType" :label="4">
-              门店筛选
-            </el-radio>
-            <el-radio v-model="ruleForm.memberType" :label="3">
-              会员筛选
-            </el-radio>
+            <span class="tips">【会员筛选】类型的上架规则最多支持20条,目前已创建 <span style="color:#1890ff">{{ memberTypeTotal }}</span> 条</span>
+            <div>
+              <el-radio v-model="ruleForm.memberType" :label="1">
+                全部会员
+              </el-radio>
+              <el-radio v-model="ruleForm.memberType" :label="4">
+                门店筛选
+              </el-radio>
+              <el-radio v-model="ruleForm.memberType" :label="3" :disabled="memberTypeTotal>=20">
+                会员筛选
+              </el-radio>
+            </div>
           </el-form-item>
           <el-form-item v-show="ruleForm.memberType === 4">
             <vue-gic-store-new
@@ -67,7 +70,6 @@
             />
           </el-form-item>
           <el-form-item v-show="ruleForm.memberType === 3">
-            <span class="tips">【会员筛选】类型的上架规则最多支持20条 {{ `${memberTypeTotal}/20` }}</span>
             <vue-gic-people
               v-bind="storeParams"
               :projectName="projectName"