update: dist

src/components/relatePop.vue

@@ -2,15 +2,17 @@
   <el-dialog title="上架规则" :visible.sync="dialogTableVisible" width="850px">
     <div class="search-wrap">
       <div class="table-page-search-wrapper">
-        <el-input
-          v-model="relateForm.ruleTitle"
-          placeholder="请输入上架规则名称"
-          prefix-icon="el-icon-search"
-          clearable
-          class="w-260"
-          @keyup.enter.native="getSearchList"
-          @clear="getSearchList"
-        />
+        <el-form @submit.native.prevent>
+          <el-input
+            v-model="relateForm.ruleTitle"
+            placeholder="请输入上架规则名称"
+            prefix-icon="el-icon-search"
+            clearable
+            class="w-260"
+            @keyup.enter.native="getSearchList"
+            @clear="getSearchList"
+          />
+        </el-form>
       </div>
       <div class="tips" style="font-size:14px">
         没有适用规则？<el-button type="text" size="small" @click="$router.push('/addRule')">
@@ -43,7 +45,7 @@
       <el-table-column label="可见条件">
         <template slot-scope="{row}">
           <p v-if="row.memberType==1">
-            全部会员
+            全部顾客
           </p>
           <div v-else>
             <el-tooltip

src/components/visible.vue

@@ -38,7 +38,8 @@
             <span>商品展示规则升级说明</span>
           </div>
           <div class="content">
-            为了实现更多的积分商城商品“千人千面”的场景，您可点击右侧“升级到新规则”按钮，按照新的更丰富的模式，重新配置此商品在小程序的可见规则！（“升级到新规则”后，您需选择一种“上架规则”才可成功保存此商品，才会生效）<br>
+            为了实现更多的积分商城商品“千人千面”的场景，您可点击右侧“升级到新规则”按钮，按照新的更丰富的模式，重新配置此商品在小程序的可见规则！<br>
+            (“升级到新规则”后，您需选择一种“上架规则”才可成功保存此商品，才会生效)<br>
           </div>
         </div>
         <div class="button" @click="update">
@@ -289,7 +290,7 @@ font-size: 14px;
     padding: 10px;
     font-size:12px;
     margin: 0 0 16px 16px;
-    width: 880px;
+    width: 950px;
     justify-content: space-between;
     .title {
         line-height: 18px;

src/views/activities/flashSale/detail.vue

@@ -77,7 +77,7 @@
               :disabled="isEdit"
               :label="1"
             >
-              全部会员
+              全部顾客
             </el-radio>
             <el-radio
               style="margin-right:0px"
@@ -93,7 +93,7 @@
               :disabled="isEdit"
               :label="3"
             >
-              会员筛选
+              人群筛选
             </el-radio>
           </el-form-item>
           <el-form-item v-if="flashSaleForm.memberSearchType === 2">

src/views/goods/coupon/coupon.vue

@@ -311,16 +311,16 @@
               min-width="110px"
             >
               <template slot-scope="{row}">
-                <p v-if="row.ruleTitle&&row.ruleTitle.length<=5">
+                <p v-if="row.ruleTitle&&row.ruleTitle.length<=10">
                   {{ row.ruleTitle }}
                 </p>
                 <el-tooltip
-                  v-if=" row.ruleTitle&& row.ruleTitle.length>5"
+                  v-if=" row.ruleTitle&& row.ruleTitle.length>10"
                   :content="row.ruleTitle"
                   effect="dark"
                   placement="top-start"
                 >
-                  <p>{{ row.ruleTitle.slice(0,5)+'...' }}</p>
+                  <p>{{ row.ruleTitle.slice(0,10)+'...' }}</p>
                 </el-tooltip>
                 <p v-if="!row.ruleTitle">
                   - -

src/views/goods/coupon/info.vue

@@ -347,7 +347,7 @@
                 </el-button>
               </el-popover>
             </el-form-item>
-            <!-- <el-form-item label="会员筛选">
+            <!-- <el-form-item label="人群筛选">
               <div style="margin-right:24px;">
                 <vue-gic-people :projectName="projectName" :useId="useId" :hasSearchData="hasSearchData" :sceneValue="sceneValue" ref="peopleFilter" :isAdd="operateType" @findFilter="findFilter" @getBackData="getBackData" @editHide="editHide" @editShow="editShow" @hideBtn="hideBtn"> </vue-gic-people>
                 <div class="gic-people--button" v-show="toggleTag">
@@ -1003,7 +1003,7 @@ export default {
           this.currentStock = res.data.result.virtualStock;
           this.couponForm.detailDescription = res.data.result.detailDescription; // 图文详情
           // if (res.data.result.searchParams) {
-          //   this.searchParams = res.data.result.searchParams; //会员筛选
+          //   this.searchParams = res.data.result.searchParams; //人群筛选
           // } else {
           //   this.searchParams = {};
           // }

src/views/goods/gift/gift.vue

@@ -335,16 +335,16 @@
               min-width="110px"
             >
               <template slot-scope="{row}">
-                <p v-if="row.ruleTitle&&row.ruleTitle.length<=5">
+                <p v-if="row.ruleTitle&&row.ruleTitle.length<=10">
                   {{ row.ruleTitle }}
                 </p>
                 <el-tooltip
-                  v-if="row.ruleTitle&& row.ruleTitle.length>5"
+                  v-if="row.ruleTitle&& row.ruleTitle.length>10"
                   :content="row.ruleTitle"
                   effect="dark"
                   placement="top-start"
                 >
-                  <p>{{ row.ruleTitle.slice(0,5)+'...' }}</p>
+                  <p>{{ row.ruleTitle.slice(0,10)+'...' }}</p>
                 </el-tooltip>
                 <p v-if="!row.ruleTitle">
                   - -

src/views/goods/gift/info.vue

@@ -383,7 +383,7 @@
                 </el-button>
               </el-popover>
             </el-form-item>
-            <!-- <el-form-item label="会员筛选">
+            <!-- <el-form-item label="人群筛选">
               <div style="margin-right:24px;">
                 <vue-gic-people :projectName="projectName" :useId="useId" :hasSearchData="hasSearchData" :sceneValue="sceneValue" ref="peopleFilter" :isAdd="operateType" @findFilter="findFilter" @getBackData="getBackData" @editHide="editHide" @editShow="editShow" @hideBtn="hideBtn"> </vue-gic-people>
                 <div class="gic-people--button" v-show="toggleTag">
@@ -1469,7 +1469,7 @@ export default {
             }
           });
           // if (res.data.result.searchParams) {
-          //   this.searchParams = res.data.result.searchParams; //会员筛选
+          //   this.searchParams = res.data.result.searchParams; //人群筛选
           // } else {
           //   this.searchParams = {};
           // }

src/views/goods/ruleList/info.vue

@@ -111,7 +111,7 @@ export default {
       breadcrumbTitle: '新建上架规则',
       fixedWidth: document.documentElement.clientWidth - 200,
       ruleForm: {
-        memberType: 1, // 1：全部会员 3 会员筛选 4 门店筛选
+        memberType: 1, // 1：全部顾客 3 人群筛选 4 门店筛选
       },
       rules: {
         ruleTitle: [

src/views/goods/ruleList/ruleList.vue

@@ -33,8 +33,8 @@
               class="w-140"
               @change="getList"
             >
-              <el-option label="全部会员" :value="1" />
-              <el-option label="会员筛选" :value="3" />
+              <el-option label="全部顾客" :value="1" />
+              <el-option label="人群筛选" :value="3" />
               <el-option label="门店筛选" :value="4" />
             </el-select>
             <el-checkbox
@@ -349,10 +349,10 @@ export default {
       let str = '';
       switch (val) {
         case 1:
-          str = '全部会员';
+          str = '全部顾客';
           break;
         case 3:
-          str = '会员筛选';
+          str = '人群筛选';
           break;
         case 4:
           str = '门店筛选';