Merge branch 'feature/hl-2月迭代' into master

dist/js/main.d38300efeb2e12741ac4.js.LICENSE.txt

+/*!
+ * @overview es6-promise - a tiny implementation of Promises/A+.
+ * @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
+ * @license   Licensed under MIT license
+ *            See https://raw.githubusercontent.com/stefanpenner/es6-promise/master/LICENSE
+ * @version   v4.2.6+9869a4bc
+ */
+
+/*!
+ * clipboard.js v2.0.1
+ * https://zenorocha.github.io/clipboard.js
+ * 
+ * Licensed MIT © Zeno Rocha
+ */
+
+/*!
+ * vue-treeselect v0.0.35 | (c) 2017-2018 Riophae Lee
+ * Released under the MIT License.
+ * https://vue-treeselect.js.org/
+ */
+
+/**!
+ * Sortable 1.10.2
+ * @author	RubaXa   <trash@rubaxa.org>
+ * @author	owenm    <owen23355@gmail.com>
+ * @license MIT
+ */

src/components/ruleDetail.vue

@@ -28,9 +28,9 @@
     <el-form-item label="适用人群" prop="memberType">
       <span v-if="$store.state.product.ruleMemberFilterClose==0" class="tips">【人群筛选器】类型的上架规则最多支持20条,目前已创建 <span style="color:#1890ff">{{ memberTypeTotal }}</span> 条</span>
       <div>
-        <el-radio v-model="ruleForm.memberType" :label="1" v-if="$store.state.product.ruleMemberFilterClose==0">
+        <!-- <el-radio v-model="ruleForm.memberType" :label="1" v-if="$store.state.product.ruleMemberFilterClose==0">
           全部客户
-        </el-radio>
+        </el-radio> -->
         <el-radio v-model="ruleForm.memberType" :label="4">
           门店筛选
         </el-radio>
@@ -43,13 +43,13 @@
           人群筛选器
         </el-radio>
       </div>
-      <span class="tips">{{ tipsContent[ruleForm.memberType] }}</span>
     </el-form-item>
     <el-form-item v-show="ruleForm.memberType === 4">
       <vue-gic-store-new
         :isAdd="isAdd || !uuid"
         :uuid.sync="uuid"
         ref="storeGroup"
+        :creatorId="ruleForm.creatorId"
         @store-change="storeChange"
       />
     </el-form-item>
@@ -97,7 +97,8 @@ export default {
     return {
       fixedWidth: document.documentElement.clientWidth - 200,
       ruleForm: {
-        memberType: this.$store.state.product.ruleMemberFilterClose == 0 ? 1 : 4, // 1：全部客户 3 人群筛选 4 门店筛选
+        memberType: 4, //  3 人群筛选 4 门店筛选
+        creatorId: '',
       },
       rules: {
         ruleTitle: [
@@ -119,11 +120,6 @@ export default {
       btnLoading: false,
       uuid: '',
       memberTypeTotal: 0,
-      tipsContent: {
-        1: '商户下的所有客户都可见，请谨慎选择',
-        4: '按照客户的门店归属来控制是否可见',
-        3: '从商户所有客户中按照条件筛选来控制是否可见',
-      },
     };
   },
   computed: {
@@ -173,6 +169,9 @@ export default {
           } else if (this.ruleForm.memberType == 4) { // 门店筛选器回显
             this.uuid = JSON.parse(this.ruleForm.filterJson).storeWidgetId;
           }
+          if (this.isCopy) {
+            this.ruleForm.creatorId = localStorage.getItem('useId');
+          }
         }
       }).finally(() => {
         this.loading = false;

src/components/visible.vue

@@ -96,7 +96,7 @@
           兑换状态下显示
         </el-radio>
       </el-radio-group>
-      <div v-if="giftForm.proShowStatus == 1 && !isNew" style="margin-left:20px;">
+      <div v-if="giftForm.proShowStatus == 1" style="margin-left:20px;">
         <el-checkbox v-model="giftForm.isNewGuestVisible" :true-label="1" :false-label="0">
           非会员可见
         </el-checkbox>

src/views/goods/ruleList/ruleList.vue

@@ -138,15 +138,23 @@
               >
                 编辑
               </el-button>
-              <el-button
+              <!-- <el-button
                 type="text"
                 @click="$router.push('/copyRule/' + row.integralMallProRuleId)"
                 v-if="$getButtonLimit($buttonCode.ruleListCopy)"
                 :limit-code="$buttonCode.ruleListCopy"
               >
                 复制
+              </el-button> -->
+              <el-button
+                type="text"
+                @click="delRelating(row)"
+                v-if="$getButtonLimit($buttonCode.ruleListDel)"
+                :limit-code="$buttonCode.ruleListDel"
+              >
+                删除
               </el-button>
-              <el-dropdown
+              <!-- <el-dropdown
                 v-if="$getButtonLimit($buttonCode.ruleListDel)"
                 style="margin-left:20px;"
                 placement="bottom-start"
@@ -162,15 +170,8 @@
                     删除
                   </el-dropdown-item>
                 </el-dropdown-menu>
-                <!-- <el-button
-                  type="text"
-                  @click="delRelating(row)"
-                  v-if="$getButtonLimit($buttonCode.ruleListDel)"
-                  :limit-code="$buttonCode.ruleListDel"
-                >
-                  删除
-                </el-button> -->
-              </el-dropdown>
+
+              </el-dropdown> -->
             </template>
           </el-table-column>
         </el-table>
@@ -350,9 +351,6 @@ export default {
     filterMemberType (val) {
       let str = '';
       switch (val) {
-        case 1:
-          str = '全部客户';
-          break;
         case 3:
           str = '人群筛选';
           break;
@@ -400,12 +398,11 @@ export default {
   computed: {
     selectOption () {
       let option = [
-        { label: '全部客户', value: 1 },
         { label: '人群筛选', value: 3 },
         { label: '门店筛选', value: 4 },
       ];
       if (this.$store.state.product.ruleMemberFilterClose == 1) {
-        option = option.filter(item => item.label != '人群筛选' && item.label != '全部客户');
+        option = option.filter(item => item.label != '人群筛选');
       }
       return option;
     },
@@ -422,7 +419,6 @@ export default {
     getList () {
       this.loading = true;
       request.get('/api-integral-mall/page-rule', { params: this.form }).then(res => {
-        console.log(res);
         this.tableDate = res.data.result.result || [];
         this.totalCount = res.data.result.totalCount;
       }).finally(_ => {