卡券门店限制

f1f35329 · zhangmeng · 40476653 · f1f35329 · f1f35329 · 40476653
Commit f1f35329 authored Nov 09, 2018 by zhangmeng
10 changed files
--- 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="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.07f4349bc048b4fedad4d28ca125adfa.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.e13e067b86567c233928.js></script><script type=text/javascript src=/marketing/static/js/app.33886a42a82429b474b4.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.aec921e5e054286fc38b1c2e853c9648.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.787ad27b46bfcbf5e833.js></script><script type=text/javascript src=/marketing/static/js/app.dc2cb05089b622891b9a.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.07f4349bc048b4fedad4d28ca125adfa.css
+++ b/dist/static/css/app.07f4349bc048b4fedad4d28ca125adfa.css
--- a/dist/static/js/app.33886a42a82429b474b4.js
+++ b/dist/static/js/app.33886a42a82429b474b4.js
--- a/dist/static/js/app.dc2cb05089b622891b9a.js
+++ b/dist/static/js/app.dc2cb05089b622891b9a.js
--- a/dist/static/js/vendor.787ad27b46bfcbf5e833.js
+++ b/dist/static/js/vendor.787ad27b46bfcbf5e833.js
--- a/dist/static/js/vendor.e13e067b86567c233928.js
+++ b/dist/static/js/vendor.e13e067b86567c233928.js
--- a/src/views/card/cardInfo.js
+++ b/src/views/card/cardInfo.js
@@ -149,6 +149,7 @@ export default {
          this.startDayOptions = Object.keys(dicMap).map(key => ({label:dicMap[key].dictName=='0'?'当天':'第'+dicMap[key].dictName+'天',value:parseInt(dicMap[key].dictName)}))
          if(res.result.card) {
            const card = res.result.card;
+            this.form.storeMode = card.storeMode || 0;
            this.form.coupCardId = this.isCopy?'':card.coupCardId;
            this.form.cardType = card.cardType;
            this.form.cardName = card.cardName || '';
@@ -331,7 +332,7 @@ export default {
      });
    },
    //卡券营销--卡券库--保存卡券
-    saveUpdateCard () {
+    async saveUpdateCard () {
      let card = {}, params = {}
      card.coupCardId = this.form.coupCardId;
      card.cardType = this.form.cardType;
@@ -465,14 +466,22 @@ export default {
      card.checkSource = 0;
      card.applicableMode = 0;
      card.storeProMode = 0;
-
      card.storeMode = this.form.storeMode;
      card.storeWidgetKey = this.uuid;

+      // 这里判断部分门店是否为空
+      if (card.storeMode) {
+        let length = await this.$refs.storeCard.getRightList();
+        console.log(length)
+        if (!length) {
+          this.$tips({type:'warning',message:'部分门店不能为空'});
+          return;
+        }
+      }
+      // 门店展架
      params.shelfIds = JSON.stringify(this.form.shelfIds);
      params.card = JSON.stringify(card);

-
      saveUpdateCard(params).then(res => {
        console.log(res)
        if (res.errorCode === 0) {

--- a/src/views/ecm/list.vue
+++ b/src/views/ecm/list.vue
@@ -156,7 +156,7 @@ export default {
      },
      async sceneSettingList() {
        let res = await sceneSettingList();
-        this.sceneSettingIdOptions = res.result;
+        this.sceneSettingIdOptions = res.result || [];
        this.sceneSettingIdOptions.unshift({sceneName:'所有营销场景',sceneSettingId:''})
      }
    }

--- a/src/views/message/record.vue
+++ b/src/views/message/record.vue
@@ -147,7 +147,7 @@ export default {
      },
      async sceneSettingList() {
        let res = await sceneSettingList();
-        this.sceneSettingIdOptions = res.result;
+        this.sceneSettingIdOptions = res.result || [];
        this.sceneSettingIdOptions.unshift({sceneSettingId:-1,sceneName:"所有营销场景"});
      },
      filterStatus(val) {

--- a/src/views/wechat/record.vue
+++ b/src/views/wechat/record.vue
@@ -2,7 +2,7 @@
 * @Author: zhangmeng
 * @Date: 2018-08-14 15:45:36
 * @Last Modified by: zhangmeng
- * @Last Modified time: 2018-10-24 20:57:29
+ * @Last Modified time: 2018-11-09 18:37:14
 */
 <template>
 <section class="dm-wrap">
@@ -152,7 +152,7 @@ export default {
      },
      async sceneSettingList() {
          let res = await sceneSettingList();
-          this.sceneSettingIdOptions = res.result;
+          this.sceneSettingIdOptions = res.result || [];
          this.sceneSettingIdOptions.unshift({sceneName:'所有营销场景',sceneSettingId:''})
      },
      //发送记录操作--查看数据