update: dist

0161bba8 · crushh · 0e27ca7b · 4b8aff65 · 0161bba8 · 0161bba8
Commit 0161bba8 authored Mar 03, 2022 by crushh
10 changed files
--- a/dist/css/main.c2f1098f136f71d78f3b.css
+++ b/dist/css/main.c2f1098f136f71d78f3b.css
--- a/dist/index.html
+++ b/dist/index.html
-<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="./static/css/iconfont.css"><link rel="stylesheet" href="./static/css/common.css"><link rel="shortcut icon" type="image/x-icon" href="./static/img/favicon.ico"><title>积分商城</title><script defer="defer" src="/integral-mall/js/main.015dad2cbbafb92eb905.js"></script><link href="/integral-mall/css/main.c2f1098f136f71d78f3b.css" rel="stylesheet"></head><body><div id="app"></div><script>(function() {
+<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="./static/css/iconfont.css"><link rel="stylesheet" href="./static/css/common.css"><link rel="shortcut icon" type="image/x-icon" href="./static/img/favicon.ico"><title>积分商城</title><script defer="defer" src="/integral-mall/js/main.78c56783d596158dac25.js"></script><link href="/integral-mall/css/main.7337081df2ea9cf851b0.css" rel="stylesheet"></head><body><div id="app"></div><script>(function() {
      var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
      var host = window.location.host;
      host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;

--- a/dist/js/main.015dad2cbbafb92eb905.js
+++ b/dist/js/main.015dad2cbbafb92eb905.js
--- a/dist/js/main.015dad2cbbafb92eb905.js.LICENSE.txt
+++ b/dist/js/main.015dad2cbbafb92eb905.js.LICENSE.txt
--- a/package-lock.json
+++ b/package-lock.json
--- a/src/components/ruleDetail.vue
+++ b/src/components/ruleDetail.vue
@@ -13,12 +13,10 @@
        show-word-limit
        placeholder="请输入上架规则名称"
        v-model="ruleForm.ruleTitle"
-        clearable
-        @clear="ruleForm.ruleTitle=''"
        style="width:340px"
      />
    </el-form-item>
-    <el-form-item label="上架规则名称备注" prop="ruleExplanation">
+    <el-form-item label="上架规则说明" prop="ruleExplanation">
      <el-input
        maxlength="50"
        show-word-limit

--- a/src/components/visible.vue
+++ b/src/components/visible.vue
@@ -11,7 +11,7 @@
    <el-form-item label="上架规则" prop="ruleTitle" v-if="isNew">
      <span class="ruleTitle" v-show="giftForm.ruleTitle">{{ giftForm.ruleTitle }}</span>
      <el-button small type="text" @click="openRelating">
-        {{ giftForm.ruleTitle?'修改':'选择' }}上架规则
+        {{ giftForm.ruleTitle?'修改':'关联' }}上架规则
      </el-button>
    </el-form-item>
    <!-- 老数据兼容 -->

--- a/src/views/goods/coupon/coupon.vue
+++ b/src/views/goods/coupon/coupon.vue
@@ -333,6 +333,8 @@
                  <el-button
                    type="text"
                    @click="goAdd(scope.row,'couponCopy')"
+                    :limit-code="$buttonCode.couponCopy"
+                    v-if="$getButtonLimit($buttonCode.couponCopy)"
                  >
                    复制
                  </el-button>

--- a/src/views/goods/gift/gift.vue
+++ b/src/views/goods/gift/gift.vue
@@ -364,6 +364,8 @@
                  </el-button>
                  <el-button
                    type="text"
+                    :limit-code="$buttonCode.giftCopy"
+                    v-if="$getButtonLimit($buttonCode.giftCopy)"
                    @click="goAdd(scope.row,'giftCopy')"
                  >
                    复制

--- a/src/views/goods/ruleList/ruleList.vue
+++ b/src/views/goods/ruleList/ruleList.vue
@@ -33,9 +33,12 @@
              class="w-140"
              @change="getList"
            >
-              <el-option label="全部顾客" :value="1" />
-              <el-option label="人群筛选" :value="3" />
-              <el-option label="门店筛选" :value="4" />
+              <el-option
+                v-for="item in selectOption"
+                :label="item.label"
+                :value="item.value"
+                :key="item.label"
+              />
            </el-select>
            <el-checkbox
              v-model="form.showSelfFlag"
@@ -394,6 +397,19 @@ export default {
      defaultImg: '../../../../static/img/pic_default.png',
    };
  },
+  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 != '人群筛选');
+      }
+      return option;
+    },
+  },
  mounted () {
    this.getList();
  },