Skip to content

M
marketing
Commit 9388186f by chenxin
Options

Merge branch 'release' into 'master' 

Release

See merge request !137
parents 992dd6ed c5eeb5b0
Showing with 31 additions and 21 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.5bd95db5af20667130eea0bfe3a0eceb.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.45.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.27.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.29.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.70.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.05.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/track.1.0.4.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.3a608dfe54c084d96807.js></script><script type=text/javascript src=/marketing/static/js/vendor.fef1c3d3b3b586faaee2.js></script><script type=text/javascript src=/marketing/static/js/main.42b83750b6050a394ad3.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.f678d87e384011ccefcb59ca5b247816.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.45.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.28.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.06.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/track.1.0.4.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.87c6714c74b0f26564de.js></script><script type=text/javascript src=/marketing/static/js/vendor.fef1c3d3b3b586faaee2.js></script><script type=text/javascript src=/marketing/static/js/main.42b83750b6050a394ad3.js></script></body></html>
\ No newline at end of file
dist/static/js/manifest.3a608dfe54c084d96807.js → dist/static/js/manifest.87c6714c74b0f26564de.js
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,o,a){for(var f,i,u,d=0,s=[];d<n.length;d++)i=n[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(r&&r(n,o,a);s.length;)s.shift()();if(a)for(d=0;d<a.length;d++)u=c(c.s=a[d]);return u};var n={},t={15:0};function c(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,c),t.l=!0,t.exports}c.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,c){r=t[e]=[n,c]});r[2]=n;var o=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,c.nc&&a.setAttribute("nonce",c.nc),a.src=c.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:"78829e99b750d3835f0e",1:"4e36dc6b55e0fd2d3c84",2:"5dc639c3066c5b1b26cf",3:"6413b55f63391becb1ba",4:"c8a5e5c668cdc258c3c4",5:"c5259ccf38eb5ea9a2cf",6:"62446153be80861e5faf",7:"45f7d7f2d664f384f7d1",8:"35efeb2ae926b54b4341",9:"acd1803f49e3f7121560",10:"e5cd16e4f5e1229ea313",11:"00a6edc9657c9e4c34fa",12:"f1c9fa1ccd0d36ae0602"}[e]+".js";var f=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(f);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=i,o.appendChild(a),n},c.m=e,c.c=n,c.d=function(e,r,n){c.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},c.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(r,"a",r),r},c.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},c.p="/marketing/",c.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,o,a){for(var f,i,u,d=0,s=[];d<n.length;d++)i=n[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(r&&r(n,o,a);s.length;)s.shift()();if(a)for(d=0;d<a.length;d++)u=c(c.s=a[d]);return u};var n={},t={15:0};function c(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,c),t.l=!0,t.exports}c.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,c){r=t[e]=[n,c]});r[2]=n;var o=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,c.nc&&a.setAttribute("nonce",c.nc),a.src=c.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:"d4144db8125d37139448",1:"4e36dc6b55e0fd2d3c84",2:"5dc639c3066c5b1b26cf",3:"6413b55f63391becb1ba",4:"c8a5e5c668cdc258c3c4",5:"c5259ccf38eb5ea9a2cf",6:"62446153be80861e5faf",7:"45f7d7f2d664f384f7d1",8:"35efeb2ae926b54b4341",9:"acd1803f49e3f7121560",10:"e5cd16e4f5e1229ea313",11:"00a6edc9657c9e4c34fa",12:"f1c9fa1ccd0d36ae0602"}[e]+".js";var f=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(f);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=i,o.appendChild(a),n},c.m=e,c.c=n,c.d=function(e,r,n){c.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},c.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(r,"a",r),r},c.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},c.p="/marketing/",c.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
index.html
......@@ -26,10 +26,10 @@
<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.27.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-card.2.0.29.js"></script><!-- 门店选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.70.js"></script><!-- 新版门店选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.05.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/member-group.2.2.28.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-card.2.0.30.js"></script><!-- 门店选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js"></script><!-- 新版门店选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.06.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>
......
src/views/card/form.js
......@@ -44,7 +44,7 @@ const initForm = {
// code: ''
// },
// coverDescript: '',
useDescript: '',
useDescript: '不可与其他卡券叠加使用，详询门店',
// shelfIds: [],
verificationType: 0,
cardDenomination: 0,
......@@ -60,10 +60,10 @@ const initForm = {
giveFlag: 0, // 开启转赠 1开启
giveContent: '',
giveImage: '',
giveImageField: '',
bannerImage: '',
bannerImageField: '',
giveImage: 'https://pic01-10001430.image.myqcloud.com/14945691-7e2a-4ea4-8158-e5fa207c6163',
giveImageField: '14945691-7e2a-4ea4-8158-e5fa207c6163',
bannerImage: 'https://pic01-10001430.image.myqcloud.com/25c09a54-253d-40e0-9dad-1da6e497930b',
bannerImageField: '25c09a54-253d-40e0-9dad-1da6e497930b',
useJumpFlag: 0, // (0: 不跳转, 1: 跳转)
bannerJumpUrl: {},
giveRule: '1.卡券新老用户同享。\n2.用户使用卡券下单，订单取消后，卡券将自动失效'
......@@ -136,7 +136,7 @@ export default {
form: JSON.parse(JSON.stringify(initForm)),
sale_limit: JSON.parse(JSON.stringify(sale_limit)),
goods: JSON.parse(JSON.stringify(goods)),
only: false,
only: true, // 默认优惠共享 true
cardLimitRadio: 1,
rules: {
cardApplyChannel: { required: true, type: 'array', message: '请选择卡券渠道', trigger: 'change' },
......@@ -235,12 +235,12 @@ export default {
giveImg1: {
// 转赠对话框图片
code: '',
imgUrl: ''
imgUrl: 'https://pic01-10001430.image.myqcloud.com/ff8a156f-6c21-467f-a127-db88dece7592'
},
giveImg2: {
// 转赠页面首图
code: '',
imgUrl: ''
imgUrl: 'https://pic01-10001430.image.myqcloud.com/726b8690-feed-4328-bc86-b51d4ef01e0e'
}
};
},
......@@ -380,6 +380,9 @@ export default {
}
},
methods: {
changeOnly(val) {
this.form.useDescript = val ? '不可与其他卡券叠加使用，详询门店' : '可与部分卡券叠加使用，详询门店';
},
// changeDateTime
setSendDateTime(dateTime) {
if (dateTime && dateTime[0]) {
......@@ -549,7 +552,7 @@ export default {
this.goods.flag = true;
}
this.only = !!useCondition.only || false;
this.only = Boolean(useCondition.only);
this.form.proNoList = useCondition.proNo ? [{ name: useCondition.proNo, id: useCondition.proNo }] : [];
}
......
src/views/card/form.vue
......@@ -180,9 +180,16 @@
</div>
<span class="fz12 gray ml5">* 仅支持第三方api接口核销卡券时使用</span>
</div> -->
<div>
<el-checkbox v-model="only" :disabled="isEdit || isInfo">不与其它优惠共享</el-checkbox>
<span class="fz12 gray ml5">* 无实际业务，仅用于ERP或第三方接口回传</span>
<div class="mb10">
<!-- <el-checkbox v-model="only" :disabled="isEdit || isInfo">不与其它优惠共享</el-checkbox>
<span class="fz12 gray ml5">* 无实际业务，仅用于ERP或第三方接口回传</span> -->
<span style="position:relative">与其它优惠共享<b style="font-style:normal;font-size:12px;position:absolute;bottom:-28px;display:block;width: 150px;right: 0;" class="gray">（卡券叠加、门店活动等）</b></span>
<el-switch v-model="only" :disabled="isEdit || isInfo" :active-value="false" :inactive-value="true" class="ml5" @change="changeOnly"></el-switch>
<ul class="fz12 gray ml5" style="width: 350ox;display:inline-block;vertical-align: top;">
<li>用于ERP或第三方的卡券适用判定</li>
<li>开启后可与其它卡券叠加或在门店活动中使用（需要单独对接）</li>
<li>修改后请注意调整卡券使用说明</li>
</ul>
</div>
</el-form-item>
<el-form-item prop="cardLimit" label="领券限制">
......@@ -291,7 +298,7 @@
<dm-upload-avatar :model.sync="giveImg1" url="/api-plug/upload-img" :unused="isEdit || isInfo" width="105" height="105" label="上传图片" tips="图片建议尺寸： 320*240px 的jpg/png图片，大小不超过1MB。" :limit="{ type: true, maxSize: 1 }"></dm-upload-avatar>
</el-form-item>
<el-form-item label="转赠页面首图" prop="bannerImage">
<dm-upload-avatar :model.sync="giveImg2" url="/api-plug/upload-img" :unused="isEdit || isInfo" width="105" height="105" label="上传图片" tips="图片建议尺寸： 640*210px 的jpg/png图片，大小不超过1MB。" :limit="{ type: true, maxSize: 1 }"></dm-upload-avatar>
<dm-upload-avatar :model.sync="giveImg2" url="/api-plug/upload-img" :unused="isEdit || isInfo" width="320" height="105" label="上传图片" tips="图片建议尺寸： 640*210px 的jpg/png图片，大小不超过1MB。" :limit="{ type: true, maxSize: 1 }"></dm-upload-avatar>
</el-form-item>
<el-form-item label="首图链接设置" prop="bannerJumpUrl">
<div style="display:flex;">
......
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