Skip to content

M
marketing
Commit a1f20b7e by chenxin
Options

Merge branch 'bugfix' into 'master' 

Bugfix

See merge request !129
parents 4951c798 0dcb2b4c
Showing with 18 additions and 15 deletions
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/fonts/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//web-1251519181.file.myqcloud.com/components/element.2.12.0.css><link href=/marketing/static/css/main.ed2f21385a6c46f56cf1fb21378fa6fe.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/element.2.12.0.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.40.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.19.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.2.24.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.24.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.65.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.43.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.16.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.2.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/activity-select.1.0.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.24f4cb64e9bf17ebbc43.js></script><script type=text/javascript src=/marketing/static/js/vendor.fef1c3d3b3b586faaee2.js></script><script type=text/javascript src=/marketing/static/js/main.a38bc9dd2a1132342ec3.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/fonts/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//web-1251519181.file.myqcloud.com/components/element.2.12.0.css><link href=/marketing/static/css/main.4ac8f876bde3a5a7e84bd3a525dc8a2b.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/element.2.12.0.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.40.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.19.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.2.24.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.24.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.65.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.43.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.16.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.2.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.92fc8f484f2cad95b3e3.js></script><script type=text/javascript src=/marketing/static/js/vendor.fef1c3d3b3b586faaee2.js></script><script type=text/javascript src=/marketing/static/js/main.a38bc9dd2a1132342ec3.js></script></body></html>
\ No newline at end of file
dist/static/js/manifest.24f4cb64e9bf17ebbc43.js → dist/static/js/manifest.92fc8f484f2cad95b3e3.js
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,c,o){for(var i,f,u,d=0,s=[];d<n.length;d++)f=n[d],t[f]&&s.push(t[f][0]),t[f]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(r&&r(n,c,o);s.length;)s.shift()();if(o)for(d=0;d<o.length;d++)u=a(a.s=o[d]);return u};var n={},t={15:0};function a(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var r=t[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var n=new Promise(function(n,a){r=t[e]=[n,a]});r[2]=n;var c=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,a.nc&&o.setAttribute("nonce",a.nc),o.src=a.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"message",4:"ewash",5:"scan",6:"ecm",7:"evaluation",8:"activity",9:"cdKey",10:"recharge",11:"msg",12:"calllog"}[e]||e)+"."+{0:"3b2867243074f86a5e9c",1:"13dab37beda20959629e",2:"2bc295c93adcee55a98f",3:"0378b23ea9e2767987cf",4:"ac5092d9b2d7d1a3b93a",5:"d11e9bae507a16a50ac8",6:"1d5dae587ab925184cc9",7:"99e49bc49f2439ac7253",8:"35efeb2ae926b54b4341",9:"1bc2336dbaf1112fbdc8",10:"e5cd16e4f5e1229ea313",11:"00a6edc9657c9e4c34fa",12:"f1c9fa1ccd0d36ae0602"}[e]+".js";var i=setTimeout(f,12e4);function f(){o.onerror=o.onload=null,clearTimeout(i);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=f,c.appendChild(o),n},a.m=e,a.c=n,a.d=function(e,r,n){a.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="/marketing/",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,c,o){for(var i,u,f,d=0,s=[];d<n.length;d++)u=n[d],t[u]&&s.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(r&&r(n,c,o);s.length;)s.shift()();if(o)for(d=0;d<o.length;d++)f=a(a.s=o[d]);return f};var n={},t={15:0};function a(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var r=t[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var n=new Promise(function(n,a){r=t[e]=[n,a]});r[2]=n;var c=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,a.nc&&o.setAttribute("nonce",a.nc),o.src=a.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"message",4:"ewash",5:"scan",6:"ecm",7:"evaluation",8:"activity",9:"cdKey",10:"recharge",11:"msg",12:"calllog"}[e]||e)+"."+{0:"3789648a73781a240407",1:"13dab37beda20959629e",2:"2bc295c93adcee55a98f",3:"0378b23ea9e2767987cf",4:"ac5092d9b2d7d1a3b93a",5:"d11e9bae507a16a50ac8",6:"1d5dae587ab925184cc9",7:"99e49bc49f2439ac7253",8:"35efeb2ae926b54b4341",9:"1bc2336dbaf1112fbdc8",10:"e5cd16e4f5e1229ea313",11:"00a6edc9657c9e4c34fa",12:"f1c9fa1ccd0d36ae0602"}[e]+".js";var i=setTimeout(u,12e4);function u(){o.onerror=o.onload=null,clearTimeout(i);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=u,c.appendChild(o),n},a.m=e,a.c=n,a.d=function(e,r,n){a.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="/marketing/",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
index.html
......@@ -37,6 +37,6 @@
<script src="//web-1251519181.file.myqcloud.com/components/selector.1.2.20.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js"></script><!-- 分页器 -->
<!-- <script src="//web-1251519181.file.myqcloud.com/components/track.1.0.4.js"></script> -->
<script src="//web-1251519181.file.myqcloud.com/components/activity-select.1.0.1.js"></script><!-- 数据对话 -->
<script src="//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.1.js"></script><!-- 数据对话 -->
</body>
</html>
src/views/card/form.js
......@@ -518,8 +518,12 @@ export default {
this.form.cardExplain = card.cardExplain || '';
this.form.useDescript = card.useDescript || '';
// this.form.coverDescript = card.coverDescript || '';
this.form.manualGetFlag = card.manualGetFlag || 0;
console.log(card);
this.form.manualGetFlag = card.manualGetFlag;
// 20210107
if (this.isAdd || this.isCopy) {
this.form.manualGetFlag = 1; // 永远设置为手动领取
}
if (!this.isCopy) {
// 非复制才赋值有效期，跳转链接
this.form.cardEffectiveMode = card.cardEffectiveMode;
......@@ -827,9 +831,6 @@ export default {
// 卡券模板投放期限 putEffectiveMode（0：固定日期，1：长期）
const { cardEffectiveMode, putEffectiveMode, sendDateTime } = this.form;
card.putEffectiveMode = cardEffectiveMode == 0 || (cardEffectiveMode == 1 && putEffectiveMode == 0) ? 0 : 1;
console.log("=======");
console.log(card.putEffectiveMode);
console.log("=======");
if (card.putEffectiveMode == 0 ) {
// 固定日期
card.putBeginDate = formatDateTimeByType(sendDateTime[0], 'yyyy-MM-dd');
......@@ -871,9 +872,10 @@ export default {
}
}
// 门店展架
// params.shelfIds = JSON.stringify(this.form.shelfIds);
// 20210107
if (this.isAdd || this.isCopy) {
card.manualGetFlag = 1; // 永远设置为手动领取
}
params.card = JSON.stringify(card);
console.log(card);
this.submitLoading = true;
......
src/views/card/form.vue
......@@ -252,7 +252,8 @@
</div>
</el-form-item>
<el-form-item label="手动领取">
<!-- 20210107 关闭手动领取功能 只有关闭的历史数据显示该按钮 新增/历史数据是关闭的不显示 -->
<el-form-item label="手动领取" v-if="(isEdit || isInfo) && form.manualGetFlag == 0">
<el-switch :disabled="isEdit || isInfo" :active-value="1" :inactive-value="0" v-model="form.manualGetFlag"></el-switch>
<span class="gray fz13">* 用户是否需要手动点击来领取卡券</span>
</el-form-item>
......
src/views/card/group-send.vue
......@@ -276,6 +276,7 @@ export default {
let res = await getCardPutonDetail({ putonId: this.isAdd ? '' : this.$route.params.id });
this.loading = false;
if (res.errorCode === 0) {
this.form.templateUseEnable = res.result.templateUseEnable;
if (!isResetTemplate && !this.isAdd) {
const form = res.result.puton;
this.creatorId = form.creatorId;
......@@ -288,7 +289,6 @@ export default {
this.form.cardId = form.cardId;
this.form.putOnTime = form.putOnTime;
this.form.cardName = res.result.card.cardName;
/** '0-不通知 1-微信对话框 2-模板消息' **/
this.form.noticeType = form.noticeType || 0;
this.form.noticeType = this.form.noticeType == 1 ? 0 : this.form.noticeType; // 历史数据为1的处理为不通知
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment