update: ui

279bba8b · crushh · 688d448e · 279bba8b · 279bba8b · 279bba8b
Commit 279bba8b authored Mar 03, 2022 by crushh
6 changed files
--- a/index.html
+++ b/index.html
@@ -9,14 +9,6 @@
  <link rel="stylesheet" type="text/css" href="./static/css/common.css">
  <link rel="shortcut icon" type="image/x-icon" href="./static/img/favicon.ico">
  <title>积分商城</title>
-  <!-- GrowingIO Analytics code version 2.1 -->
-  <!-- Copyright 2015-2018 GrowingIO, Inc. More info available at http://www.growingio.com -->
-  <!-- <script type='text/javascript'>
-      !function(e,t,n,g,i){e[i]=e[i]||function(){(e[i].q=e[i].q||[]).push(arguments)},n=t.createElement("script"),tag=t.getElementsByTagName("script")[0],n.async=1,n.src=('https:'==document.location.protocol?'https://':'http://')+g,tag.parentNode.insertBefore(n,tag)}(window,document,"script","assets.giocdn.com/2.1/gio.js","gio");
-        gio('init','8be12240a3749eab', {});
-      gio('send');
-      </script> -->
-  <!-- End GrowingIO Analytics code version: 2.1 -->
 </head>

 <body>

--- a/src/components/relatePop.vue
+++ b/src/components/relatePop.vue
@@ -186,6 +186,7 @@ export default {
        pageSize: 5,
        currentPage: 1,
      };
+      this.activeName = 'list';
      this.updateDialog = !this.updateDialog;
      this.dialogTableVisible = false;
      this.btnLoading = false;

--- a/src/components/ruleDetail.vue
+++ b/src/components/ruleDetail.vue
@@ -55,7 +55,7 @@
      />
    </el-form-item>
    <vue-gic-people
-      v-show="ruleForm.memberType === 3"
+      v-show="ruleForm.memberType === 3&&$store.state.product.ruleMemberFilterClose==0"
      v-bind="storeParams"
      :projectName="projectName"
      :triggerReset="true"
@@ -96,7 +96,6 @@ export default {
      callback(new Error('请填写'));
    };
    return {
-      breadcrumbTitle: '新建上架规则',
      fixedWidth: document.documentElement.clientWidth - 200,
      ruleForm: {
        memberType: 1, // 1：全部顾客 3 人群筛选 4 门店筛选
@@ -134,12 +133,6 @@ export default {
      this.getDatail(this.$route.params.id);
    }
    this.memberTypeNum();
-    const obj = {
-      edit: '编辑上架规则',
-      add: '新建上架规则',
-      copy: '复制上架规则',
-    };
-    this.breadcrumbTitle = obj[this.$route.meta.type];
  },
  methods: {
    /** 门店筛选器 */

--- 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?'修改':'选择' }}上架规则
      </el-button>
    </el-form-item>
    <!-- 老数据兼容 -->
@@ -136,6 +136,7 @@ export default {
        },
        uuid: '',
      }, // 表单的值
+      isAdd: this.$route.meta.type === 'add',
      groupIdDisableList: [],
      pickerOptions: {
        disabledDate (time) {

--- a/src/views/goods/ruleList/info.vue
+++ b/src/views/goods/ruleList/info.vue
@@ -30,6 +30,19 @@ export default {
  components: {
    ruleInfo,
  },
+  data () {
+    return {
+      breadcrumbTitle: '新建上架规则',
+    };
+  },
+  mounted () {
+    const obj = {
+      edit: '编辑上架规则',
+      add: '新建上架规则',
+      copy: '复制上架规则',
+    };
+    this.breadcrumbTitle = obj[this.$route.meta.type];
+  },
 };
 </script>


--- a/src/views/goods/ruleList/ruleList.vue
+++ b/src/views/goods/ruleList/ruleList.vue
@@ -38,7 +38,6 @@
              <el-option label="门店筛选" :value="4" />
            </el-select>
            <el-checkbox
-              style="margin-left:10px;"
              v-model="form.showSelfFlag"
              label="仅看本人"
              border