Skip to content

M
marketing
Commit 840babd1 by chenxin
Options

fix: 隐藏h5链接；klfl referid

parent 026555c6
Showing with 13 additions and 13 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.64842699b2ce586cc0a19bc59d109a94.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.35.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.10.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.16.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.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.42.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.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.02.js></script><script type=text/javascript src=/marketing/static/js/manifest.a75841e6f6123efcd72c.js></script><script type=text/javascript src=/marketing/static/js/vendor.cbb380c2053ab598e892.js></script><script type=text/javascript src=/marketing/static/js/main.5175384b277b5fe3450d.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.c43c7b1ed8bc50b24d75f6987c91c7ce.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.35.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.10.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.16.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.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.42.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.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.02.js></script><script type=text/javascript src=/marketing/static/js/manifest.385c788f027f20c87a78.js></script><script type=text/javascript src=/marketing/static/js/vendor.cbb380c2053ab598e892.js></script><script type=text/javascript src=/marketing/static/js/main.5175384b277b5fe3450d.js></script></body></html>
\ No newline at end of file
dist/static/js/game.b4efa586e88e02d44b88.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/game.b5671ec15b3984b48f5f.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.385c788f027f20c87a78.js 0 → 100644
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(t,c,a){for(var i,f,u,d=0,s=[];d<t.length;d++)f=t[d],n[f]&&s.push(n[f][0]),n[f]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(r&&r(t,c,a);s.length;)s.shift()();if(a)for(d=0;d<a.length;d++)u=o(o.s=a[d]);return u};var t={},n={13:0};function o(r){if(t[r])return t[r].exports;var n=t[r]={i:r,l:!1,exports:{}};return e[r].call(n.exports,n,n.exports,o),n.l=!0,n.exports}o.e=function(e){var r=n[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var t=new Promise(function(t,o){r=n[e]=[t,o]});r[2]=t;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"message",4:"ewash",5:"evaluation",6:"ecm",7:"activity",8:"recharge",9:"msg",10:"calllog"}[e]||e)+"."+{0:"065def6f73956a4ea969",1:"b5671ec15b3984b48f5f",2:"c287f3dba66f64618009",3:"3e8593d41cf8ca4b96ec",4:"9e42654bdc43f38a3646",5:"dae31f13dcb87d6e487e",6:"250fb41b210e256c7d75",7:"d84777d528b9196017cc",8:"983ea8707decbcaf3c7f",9:"0d2b5d488c714e66ec93",10:"2e28c020a9f9c0e96471"}[e]+".js";var i=setTimeout(f,12e4);function f(){a.onerror=a.onload=null,clearTimeout(i);var r=n[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return a.onerror=a.onload=f,c.appendChild(a),t},o.m=e,o.c=t,o.d=function(e,r,t){o.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},o.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(r,"a",r),r},o.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},o.p="/marketing/",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/manifest.a75841e6f6123efcd72c.js deleted 100644 → 0
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(t,a,c){for(var i,f,u,d=0,s=[];d<t.length;d++)f=t[d],n[f]&&s.push(n[f][0]),n[f]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(r&&r(t,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[d]);return u};var t={},n={13:0};function o(r){if(t[r])return t[r].exports;var n=t[r]={i:r,l:!1,exports:{}};return e[r].call(n.exports,n,n.exports,o),n.l=!0,n.exports}o.e=function(e){var r=n[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var t=new Promise(function(t,o){r=n[e]=[t,o]});r[2]=t;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"message",4:"ewash",5:"evaluation",6:"ecm",7:"activity",8:"recharge",9:"msg",10:"calllog"}[e]||e)+"."+{0:"065def6f73956a4ea969",1:"b4efa586e88e02d44b88",2:"fbdf621f12b73d1a30c1",3:"3e8593d41cf8ca4b96ec",4:"9e42654bdc43f38a3646",5:"dae31f13dcb87d6e487e",6:"2a376349a9124262ea7e",7:"d84777d528b9196017cc",8:"983ea8707decbcaf3c7f",9:"0d2b5d488c714e66ec93",10:"2e28c020a9f9c0e96471"}[e]+".js";var i=setTimeout(f,12e4);function f(){c.onerror=c.onload=null,clearTimeout(i);var r=n[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return c.onerror=c.onload=f,a.appendChild(c),t},o.m=e,o.c=t,o.d=function(e,r,t){o.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},o.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(r,"a",r),r},o.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},o.p="/marketing/",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/wx-text/index.vue
......@@ -4,8 +4,8 @@
<div v-html="textarea" @keyup="textInput(textarea, $event)" ref="myTextarea" contenteditable="true" @blur="getTextValue"></div>
</div>
<div class="wx-text__opt clearfix">
<a @click="addLink" class="iconfont icon-lianjie" title="添加链接"></a>
<a @click="removeLink" class="iconfont icon-duankailianjie" title="取消链接"></a>
<!-- <a @click="addLink" class="iconfont icon-lianjie" title="添加链接"></a>
<a @click="removeLink" class="iconfont icon-duankailianjie" title="取消链接"></a> -->
<el-popover placement="top" trigger="hover" width="680" v-if="isSupportVar">
<p>1.支持插入会员信息变量，如下表所示，{数字}为可插入变量，注意变量值长度，以免超过300字文本上限。</p>
<p>2.支持插入H5链接；支持插入小程序链接。</p>
......
src/views/game/dzp/form.vue
......@@ -301,7 +301,7 @@ export default {
let count = 0;
if (current.prizeType == 1) {
// 积分
count = backupCurrent.prizeType != 1 ? current.prizeCount : current.prizeCount - backupCurrent.prizeCount;
count = backupCurrent.prizeType != 1 || backupCurrent.integral != current.integral ? current.prizeCount : current.prizeCount - backupCurrent.prizeCount;
}
if (current.prizeType == 2) {
if (!current.prizeCardId) {
......
src/views/game/ggk/form.vue
......@@ -277,7 +277,7 @@ export default {
// 差值，如果奖品类型或是卡券改变直接给目标值，否则给差值 count >0增加库存，<0减少库存
if (current.prizeType == 1) {
// 积分
count = backupCurrent.prizeType != 1 ? current.prizeCount : current.prizeCount - backupCurrent.prizeCount;
count = backupCurrent.prizeType != 1 || backupCurrent.integral != current.integral ? current.prizeCount : current.prizeCount - backupCurrent.prizeCount;
}
if (current.prizeType == 2) {
if (!current.prizeCardId) {
......
src/views/game/klfl/form.vue
......@@ -396,7 +396,7 @@ export default {
// 1：积分，2：卡券，3：礼品
if (current.prizeReferType == 1) {
// 积分
count = backupCurrent.prizeReferType != 1 ? current.prizeCount : current.prizeCount - backupCurrent.prizeCount;
count = backupCurrent.prizeReferType != 1 || backupCurrent.integral != current.integral ? current.prizeCount : current.prizeCount - backupCurrent.prizeCount;
}
if (current.prizeReferType == 2) {
if (!current.card.coupCardId) {
......@@ -410,7 +410,6 @@ export default {
// 礼品
giftChange = !(current.proGift.mainPic.code == backupCurrent.proGift.mainPic.code && current.proGift.giftName == backupCurrent.proGift.giftName); // 名称和图片都没变
count = backupCurrent.prizeReferType != 3 || giftChange ? current.prizeCount : current.prizeCount - backupCurrent.prizeCount;
console.log(giftChange);
}
}
}
......@@ -436,8 +435,7 @@ export default {
params.giftName = current.proGift.giftName;
params.giftUrl = current.proGift.mainPic.imgUrl;
params.fieldCode = current.proGift.mainPic.mainPicFieldCode;
params.referId = giftChange ? '' : current.proGift.proGiftId; // 礼品改变 不传referId
// console.log(giftChange, current.proGift);
params.referId = giftChange ? '' : current.prizeReferId; // 礼品改变 不传referId
}
if (current.prizeId) {
......@@ -925,7 +923,9 @@ export default {
this.$tips({ message: prize_error_msg, type: 'error' });
return;
}
params.gameCodePrizeList = gameCodePrizeList;
if (this.isAdd) {
params.gameCodePrizeList = gameCodePrizeList;
}
const postParam = {
reqData: JSON.stringify(params),
attendCondition: JSON.stringify(attendCondition),
......
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