Skip to content

M
marketing
Commit a52d5659 by huaying
Options

Merge branch 'master' into feature/8月-奥莱定制

parents 697f43d3 3d98d5d1
Showing with 476 additions and 44 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></title><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//at.alicdn.com/t/font_688955_2dxzdzrb3a7.css><script src=//at.alicdn.com/t/font_688955_2dxzdzrb3a7.js></script><link rel=stylesheet href=//at.alicdn.com/t/c/font_3380872_b9qubgdi1ic.css><link src=//at.alicdn.com/t/font_2859043_udehp133w1.css><script src=//at.alicdn.com/t/font_2859043_udehp133w1.js></script><link rel=stylesheet href=//at.alicdn.com/t/font_2996579_dv9vctk5vdt.css><script src=//at.alicdn.com/t/font_2996579_dv9vctk5vdt.js></script><link href=/marketing/static/css/main.5653237ff7a722b06e06f2571bb47f16.css rel=stylesheet></head><body><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
<!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></title><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//at.alicdn.com/t/font_688955_2dxzdzrb3a7.css><script src=//at.alicdn.com/t/font_688955_2dxzdzrb3a7.js></script><link rel=stylesheet href=//at.alicdn.com/t/c/font_3380872_b9qubgdi1ic.css><link src=//at.alicdn.com/t/font_2859043_udehp133w1.css><script src=//at.alicdn.com/t/font_2859043_udehp133w1.js></script><link rel=stylesheet href=//at.alicdn.com/t/font_2996579_dv9vctk5vdt.css><script src=//at.alicdn.com/t/font_2996579_dv9vctk5vdt.js></script><link href=/marketing/static/css/main.d71c2df8acf2b8c992246ba3b3e4b7b8.css rel=stylesheet></head><body><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'www.gicdev.com' : host;
document.write('<script src="//' + host + src + '"><\/script>');
})();</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/upload-file.1.0.10.js></script><script type=text/javascript src=/marketing/static/js/manifest.48365d63ec3989114046.js></script><script type=text/javascript src=/marketing/static/js/vendor.e0ebad0c4fec1c8f90bf.js></script><script type=text/javascript src=/marketing/static/js/main.853bac7c5aa25c5ba330.js></script></body></html>
\ No newline at end of file
})();</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/upload-file.1.0.10.js></script><script type=text/javascript src=/marketing/static/js/manifest.21fe43e4fe6c50450b14.js></script><script type=text/javascript src=/marketing/static/js/vendor.e0ebad0c4fec1c8f90bf.js></script><script type=text/javascript src=/marketing/static/js/main.bfb4cd2653c4863f8ed3.js></script></body></html>
\ No newline at end of file
dist/static/js/game.44997340a26f1bb9598e.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.f484f2af1428bc68929e.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.48365d63ec3989114046.js → dist/static/js/manifest.21fe43e4fe6c50450b14.js
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,o){for(var f,d,b,i=0,u=[];i<r.length;i++)d=r[i],t[d]&&u.push(t[d][0]),t[d]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=c(c.s=o[i]);return b};var r={},t={25:0};function c(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,c),t.l=!0,t.exports}c.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,c){n=t[e]=[r,c]});n[2]=r;var a=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,c.nc&&o.setAttribute("nonce",c.nc),o.src=c.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"ecm",4:"message",5:"ewash",6:"scan",7:"recharge",8:"activity",9:"signIn",10:"evaluation",11:"cdKey",12:"popup",13:"msg",15:"calllog"}[e]||e)+"."+{0:"4dfada83fbc79659c638",1:"44997340a26f1bb9598e",2:"78a893a3285592901952",3:"763c5b056cf0a48875b2",4:"a11ede89dfa4f6dd621b",5:"feb0ffd2cfb795f0d746",6:"952dd795058a8320af99",7:"fed72fe4c42bb8d8d839",8:"442031faa4ebb0041149",9:"d26bee1b38e9066d3bb4",10:"0756ab734cd7ddc9e1b3",11:"36bc033917d312cfde67",12:"6a8939e0f905f5d7ace1",13:"200e6bfe2fb2f86c8231",14:"bbf5c3d415a5621fbc43",15:"7e607494d8968aef74ab",16:"3b17d743d502b83d338f",17:"3fcc0f820b45cd11895c",18:"65f42a7dbc2b1236e85b",19:"b8285d77cccf8c2e77b3",20:"4b7d606aea3710914c5d",21:"3b70c426e7cb5384d238",22:"67ff09408b92aef14903"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=d,a.appendChild(o),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="/marketing/",c.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,o){for(var f,d,b,i=0,u=[];i<r.length;i++)d=r[i],t[d]&&u.push(t[d][0]),t[d]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=c(c.s=o[i]);return b};var r={},t={25:0};function c(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,c),t.l=!0,t.exports}c.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,c){n=t[e]=[r,c]});n[2]=r;var a=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,c.nc&&o.setAttribute("nonce",c.nc),o.src=c.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"ecm",4:"message",5:"ewash",6:"scan",7:"recharge",8:"activity",9:"signIn",10:"evaluation",11:"cdKey",12:"popup",13:"msg",15:"calllog"}[e]||e)+"."+{0:"57ea6549bcbb56502317",1:"f484f2af1428bc68929e",2:"78a893a3285592901952",3:"763c5b056cf0a48875b2",4:"a11ede89dfa4f6dd621b",5:"feb0ffd2cfb795f0d746",6:"952dd795058a8320af99",7:"fed72fe4c42bb8d8d839",8:"442031faa4ebb0041149",9:"d26bee1b38e9066d3bb4",10:"0756ab734cd7ddc9e1b3",11:"36bc033917d312cfde67",12:"6a8939e0f905f5d7ace1",13:"200e6bfe2fb2f86c8231",14:"bbf5c3d415a5621fbc43",15:"7e607494d8968aef74ab",16:"3b17d743d502b83d338f",17:"3fcc0f820b45cd11895c",18:"65f42a7dbc2b1236e85b",19:"b8285d77cccf8c2e77b3",20:"4b7d606aea3710914c5d",21:"3b70c426e7cb5384d238",22:"67ff09408b92aef14903"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=d,a.appendChild(o),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="/marketing/",c.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/directives/index.js
import clipboard from './clipboard';
import upload from './upload';
import imglibupload from './img-lib.js';
import loadmore from './loadMore';
export default {
clipboard,
upload,
imglibupload
imglibupload,
loadmore
};
src/directives/loadMore.js 0 → 100644
/**
* v-loadmore el-select加载更多
*/
// import Vue from 'vue';
export default {
bind(el, binding, vnode, oldVnode) {
const SELECTDOWN_DOM = el.querySelector('.el-select-dropdown .el-select-dropdown__wrap');
SELECTDOWN_DOM.addEventListener('scroll', function() {
const CONDITION = Math.floor(this.scrollHeight - this.scrollTop) <= this.clientHeight;
if (CONDITION) {
binding.value();
}
});
}
};
src/views/card/form.js
......@@ -180,6 +180,11 @@ export default {
gicCouponType: '', // gic定义的卡券类型(0:普通卡券, 1:e待洗, 2:好办卡券, 3:微盟外部券, 4:通用外部券
creatorId: '',
uuid: '',
currentPage: 1,
pageSize: 50,
wmPid: '',
idx: '',
totalPage: 0,
canEdit: false,
loading: false,
submitLoading: false,
......@@ -299,6 +304,19 @@ export default {
statusText: ''
};
},
// directives: {
// loadmore: {
// inserted(el, binding) {
// const SELECTDOWN_DOM = el.querySelector('.el-select-dropdown .el-select-dropdown__wrap');
// SELECTDOWN_DOM.addEventListener('scroll', function() {
// const CONDITION = this.scrollHeight - this.scrollTop <= this.clientHeight;
// if (CONDITION) {
// binding.value();
// }
// });
// }
// }
// },
watch: {
'form.giveFlag'(val) {
if (val) {
......@@ -1545,19 +1563,57 @@ export default {
handleShopChange(wmPid, idx) {
this.weimobDemoCodeList[idx].cardList = [];
this.weimobDemoCodeList[idx].card = '';
this.weimobDemoCodeList[idx].loading = true;
listEntepriseWeimobCoupon({ wmPid })
.then(res => {
this.weimobDemoCodeList[idx].cardList = res.result || [];
this.weimobDemoCodeList[idx].loading = false;
if (this.weimobDemoCodeList[idx].cardList.length === 0) {
this.$message({ message: '该店铺没有对应微盟券号', type: 'warning' });
}
})
.catch(() => {
this.weimobDemoCodeList[idx].loading = false;
});
this.currentPage=1;
this.wmPid=wmPid;
this.idx=idx;
this.weimobDemoCodeList[this.idx].loading = true;
this.listEntepriseWeimobCoupon();
},
listEntepriseWeimobCoupon(val){
let params={
wmPid:this.wmPid,pageSize:this.pageSize, currentPage:this.currentPage
}
if(val){
params.search=val;
}
console.log(params)
listEntepriseWeimobCoupon(params)
.then(res => {
const {result,totalPage,currentPage} = res.result;
this.totalPage=totalPage;
this.currentPage=currentPage;
if(val){this.currentPage=totalPage}
this.weimobDemoCodeList[this.idx].cardList =this.weimobDemoCodeList[this.idx].cardList.concat(result || []) ;
this.weimobDemoCodeList[this.idx].loading = false;
if (this.weimobDemoCodeList[this.idx].cardList.length === 0) {
this.$message({ message: '该店铺没有对应微盟券号', type: 'warning' });
}
})
.finally(() => {
this.weimobDemoCodeList[this.idx].loading = false;
});
},
remoteMethod(val){
console.log(val)
this.currentPage=1;
this.weimobDemoCodeList[this.idx].cardList = [];
this.weimobDemoCodeList[this.idx].loading = true;
this.listEntepriseWeimobCoupon(val);
},
handleClear(){
this.currentPage=1;
this.weimobDemoCodeList[this.idx].cardList = [];
this.weimobDemoCodeList[this.idx].loading = true;
this.listEntepriseWeimobCoupon();
},
getMore(){
if(this.currentPage<this.totalPage ){
this.currentPage++
this.listEntepriseWeimobCoupon();
}
},
// ---------微盟店铺结束--------
// ------微盟适用商品开始-------
// 获取第一层数据
......
src/views/card/form.vue
......@@ -56,7 +56,7 @@
<el-select class="w200" :disabled="saveItem.save || isEdit || isInfo" v-model="saveItem.pid" filterable placeholder="请选择店铺" clearable @change="handleShopChange($event, idx)">
<el-option :disabled="wmShopIds.includes(item.wmPid)" v-for="item in weimobShopList" :key="item.wmPid" :label="item.wmPidName" :value="item.wmPid"></el-option>
</el-select>
<el-select :disabled="!saveItem.pid || saveItem.save || isEdit || isInfo" :loading="saveItem.loading" class="w200" v-model="saveItem.card" filterable placeholder="请选择微盟卡券" clearable>
<el-select v-loadmore="getMore" :disabled="!saveItem.pid || saveItem.save || isEdit || isInfo" :loading="saveItem.loading" class="w200" v-model="saveItem.card" remote filterable placeholder="请选择微盟卡券" :remote-method="remoteMethod" @clear="handleClear" clearable>
<el-option v-for="item in saveItem.cardList" :key="item.cardTemplateId" :label="item.name" :value="item.cardTemplateId"></el-option>
</el-select>
<template v-if="isAdd || isCopy">
......
src/views/game/cmh/base-config.vue
......@@ -86,7 +86,7 @@
<div class="adsImg" v-show="baseForm.adsFlag">
<el-form-item prop="adsImageUrl" :rules="rules.adsImageUrl" label-width="0">
<dm-upload-avatar class="upload-avatar" width="375" height="75" :limit="{ type: false, maxSize: 1 }" fileType="img" :model.sync="adsImageUrl" label="上传图片" tips="" @backImg="handleAdsChange" :unused="isInfo"></dm-upload-avatar>
<div class="tips">图片建议尺寸{{ baseForm.adsImageUrlSize0 }}或等比图片，格式 jpg/jpeg/png/gif，大小{{ baseForm.adsImageUrlSize1 }} M以内。</div>
<div class="tips">图片建议尺寸750*150px或等比图片，格式 jpg/jpeg/png/gif，大小1 M以内。</div>
</el-form-item>
<el-form-item label="小程序跳转路径" prop="link" label-width="110px" :rules="rules.link">
<div class="wxapp mr16" v-if="selectLink.linkData.name">
......@@ -147,6 +147,7 @@ export default {
adsFlag: 0,
bulletFlag: 0,
backMusicUrlObj: ''
// addMomentsCard: false
},
gameExt: {},
adsImageUrl: { imgUrl: '', code: '' },
......@@ -238,7 +239,7 @@ export default {
this.$message.info('原游戏模板已失效,已重置默认模板');
}
let obj = {};
let arr = ['noticeImageUrl', 'shareCard', 'shareReport', 'prizeStyleJson', 'backImageUrl'];
let arr = ['noticeImageUrl', 'shareCard', 'shareReport', 'momentsCard', 'prizeStyleJson', 'backImageUrl'];
let keys = Object.keys(gameExt);
currentTemp.gameTemplateMaterialList.forEach(item => {
......@@ -246,6 +247,9 @@ export default {
this.backMusicOptions.push(item);
} else if (!keys.includes(item.materialKey)) {
obj[item.materialKey] = item;
// if (item.materialKey == 'momentsCard') {
// this.baseForm.addMomentsCard = true;
// }
}
});
if (initTemp) {
......@@ -372,6 +376,7 @@ export default {
}
}
});
console.log(this.baseForm);
},
handleListen() {
this.isPlay = !this.isPlay;
......
src/views/game/cmh/form.vue
......@@ -18,7 +18,7 @@
{{ el }}
</el-menu-item>
</el-menu>
<div style="margin: 0 20px 0 13px;">
<div style="margin:0px 20px 80px 13px;">
<div class="nav">
<span class="gameTitle">{{ gameName }}</span>
<img src="../../../assets/img/Navbar.png" class="braImg" alt="" />
......@@ -109,15 +109,15 @@ export default {
},
computed: {
computedImg() {
if (!['1', '2', '3', '5'].includes(this.templateId)) {
if (!['1', '2', '3', '5', '7'].includes(this.templateId)) {
return '';
}
const bcImg = {
1: require(`@/assets/img/template${this.templateId}/mould_rule_page.png`),
2: require(`@/assets/img/template${this.templateId}/mould_prize_page.png`),
3: require(`@/assets/img/template${this.templateId}/mould_success_page.png`),
4: require(`@/assets/img/template${this.templateId}/mould_fail_page.png`),
5: require(`@/assets/img/template${this.templateId}/mould_share_page.png`)
1: `https://pic01-10001430.cos.ap-shanghai.myqcloud.com/game/template${this.templateId}/mould_rule_page.png`,
2: `https://pic01-10001430.cos.ap-shanghai.myqcloud.com/game/template${this.templateId}/mould_prize_page.png`,
3: `https://pic01-10001430.cos.ap-shanghai.myqcloud.com/game/template${this.templateId}/mould_success_page.png`,
4: `https://pic01-10001430.cos.ap-shanghai.myqcloud.com/game/template${this.templateId}/mould_fail_page.png`,
5: `https://pic01-10001430.cos.ap-shanghai.myqcloud.com/game/template${this.templateId}/mould_share_page.png`
};
return bcImg[this.menuActive];
}
......@@ -224,7 +224,7 @@ export default {
});
},
handleBaseConfigChange(data) {
const { backMusicFlag, adsFlag, backImageUrl, noticeImageUrl, adsImageUrl, bulletImageUrl, bulletFlag, gameName, templateId, shareCard, shareReport, gameTime, shareCardSize0, shareCardSize1, shareReportSize1, shareReportSize0 } = data;
const { backMusicFlag, adsFlag, backImageUrl, noticeImageUrl, adsImageUrl, bulletImageUrl, bulletFlag, gameName, templateId, shareCard, momentsCard, shareReport, gameTime, shareCardSize0, shareCardSize1, shareReportSize1, shareReportSize0, momentsCardSize0, momentsCardSize1 } = data;
this.previewData = { backMusicFlag, backImageUrl, noticeImageUrl, adsImageUrl, bulletImageUrl, bulletFlag, adsFlag };
this.previewData.boxImg = data.prizeStyleJson[0].imageNoSelectUrl;
this.previewData = Object.assign({}, this.previewData);
......@@ -236,7 +236,11 @@ export default {
shareCardSize0,
shareCardSize1,
shareReportSize1,
shareReportSize0
shareReportSize0,
momentsCard,
momentsCardSize0,
momentsCardSize1
// addMomentsCard
};
this.gameTime = gameTime;
},
......@@ -322,6 +326,7 @@ export default {
gameRuleConditionList.forEach(item => {
if (item.conditionType == 1) {
gameExt.shareCard.materialValue = item.conditionJson.shareCard;
gameExt.momentsCard.materialValue = item.conditionJson.momentsCard;
gameExt.shareReport.materialValue = item.conditionJson.shareReport;
gameRuleInfo.shareRuleDesc = item.conditionJson.shareTitle;
}
......
src/views/game/cmh/gameTemplate.vue
......@@ -7,7 +7,7 @@
<div class="right-btn rule" :style="rightBtn[templateId]">游戏规则</div>
<div class="right-btn award" :style="rightBtn[templateId]">我的奖品</div>
<div class="music-icon iconfont icon-yinfu" :style="rightBtn[templateId]" v-show="backMusicFlag"></div>
<div class="integral" v-if="ruleData[0].type == 0">{{ ruleData[0].val }}积分/次</div>
<div class="integral" v-if="ruleData[0].type == 0 && templateId != 7">{{ ruleData[0].val }}积分/次</div>
<div class="swiper-item" v-if="bulletFlag == 1" :style="bulletTop[templateId]">
<img :src="bulletImageUrl" />
<span>恭喜 张* 获得 100元优惠券</span>
......@@ -82,6 +82,44 @@ const template3Box = [
width: '120px'
}
];
const template7Box = [
{
left: '24%',
top: '192px',
height: '100px',
width: '100px'
},
{
left: '50%',
top: '243px',
height: '100px',
width: '100px'
},
{
left: '77%',
top: '192px',
height: '100px',
width: '100px'
},
{
left: '24%',
top: '330px',
height: '100px',
width: '100px'
},
{
left: '50%',
top: '376px',
height: '100px',
width: '100px'
},
{
left: '77%',
top: '330px',
height: '100px',
width: '100px'
}
];
// const leftVal = 0;
const template1Box = [
{
......@@ -260,6 +298,7 @@ export default {
template2Box,
template3Box,
template5Box,
template7Box,
backImageUrl: '',
noticeImageUrl: '',
boxImg: '',
......@@ -302,11 +341,12 @@ export default {
watch: {
templateId(val) {
if (!val) return;
if (['1', '2', '3', '5'].includes(val)) {
if (['1', '2', '3', '5', '7'].includes(val)) {
this.boxList = this['template' + val + 'Box'];
} else {
this.boxList = this.template1Box;
}
console.log(this.boxList);
console.log('template' + val + 'Box');
},
......@@ -345,7 +385,6 @@ img {
left: 0;
width: 100%;
height: 723px;
max-height: 100%;
overflow: hidden;
}
.bg-image {
......
src/views/game/cmh/index.vue
......@@ -93,7 +93,6 @@ import { api as viewerApi } from 'v-viewer';
import { cmhPage, stopGame, pageStatistics } from '@/service/api/gameApi.js';
import links from '../common/links';
import { formatDateTimeByType } from '@/utils/index.js';
import img from '@/assets/img/template1/mould_share_page.png';
export default {
components: {
......@@ -104,7 +103,7 @@ export default {
formatDateTimeByType,
linkShow: false,
linksObj: {},
img,
img: 'https://pic01-10001430.cos.ap-shanghai.myqcloud.com/game/template1/mould_share_page.png',
listParams: {
gameName: '',
status: '',
......
src/views/game/cmh/info.vue
......@@ -167,6 +167,7 @@
<div class="shareTitle">邀请分享样式</div>
<p>小程序卡片标题: {{ item.conditionJson.shareTitle }}</p>
<p class="flex">小程序卡片图片: <img :src="item.conditionJson.shareCard" alt="游戏背景" style="width: 100px;height: 75px;margin-left: 10px;" /></p>
<p class="flex" v-if="item.conditionJson.momentsCard">分享朋友圈: <img :src="item.conditionJson.momentsCard" alt="游戏背景" style="width: 100px;height: 178px;margin-left: 39px;" /></p>
<p class="flex">分享海报: <img :src="item.conditionJson.shareReport" alt="游戏背景" style="width: 100px;height: 178px;margin-left: 53px;" /></p>
</div>
</div>
......
src/views/game/cmh/rule-config.vue
......@@ -103,6 +103,16 @@
<div class="tips mt6">图片建议尺寸{{ shareCardSize0 }}，格式 jpg/jpeg/png，大小 {{ shareCardSize1 }} M以内。</div>
</el-form-item>
<el-form-item label="分享朋友圈" label-width="122px">
<div class="flex">
<img :src="item.conditionJson.momentsCard" alt="游戏背景" style="width: 100px;height: 178px;" />
<el-upload class="avatar-uploader" action="123" :show-file-list="false" :disabled="isDisabled" :before-upload="file => beforeAvatarUpload(file, 'momentsCard', momentsCardSize1)">
<el-button type="text" class="ml16" :disabled="isDisabled">替换图片</el-button>
</el-upload>
</div>
<div class="tips mt6">图片建议尺寸{{ momentsCardSize0 }}，格式 jpg/jpeg/png，大小 {{ momentsCardSize1 }} M以内。</div>
</el-form-item>
<el-form-item label="分享海报" label-width="122px">
<div class="flex">
<img :src="item.conditionJson.shareReport" alt="游戏背景" style="width: 100px;height: 178px;" />
......@@ -120,10 +130,10 @@
</div>
</el-form-item>
<el-form-item label="每人最多可玩次数" prop="playTimes" :rules="rules.playTimes"> <el-input v-model.number="ruleForm.playTimes" class="w140" placeholder="上限1000" :disabled="isDisabled" />次游戏次数 </el-form-item>
<el-form-item label="分享" prop="shareFlag">
<!-- <el-form-item label="分享" prop="shareFlag">
<el-switch v-model="ruleForm.shareFlag" :active-value="1" :inactive-value="0" />
<div class="tips mt6">关闭后用户无法分享小程序</div>
</el-form-item>
</el-form-item> -->
<linktools :linkVisible.sync="show" :remove="[5, 35]" :linkData="ruleForm.gameRuleConditionList[1].conditionJson.mpUrlView" :can-save="true" @linkSelect="onSaveLink" />
<dm-form-bottom class="footer">
<el-button @click="prevStep">上一步</el-button>
......@@ -180,7 +190,7 @@ export default {
memberType: 0,
memberDesc: '',
playConditionFlag: 1,
shareFlag: 0,
shareFlag: 1,
playTimes: '',
filterJsonView: '',
shareImageUrl: '',
......@@ -215,6 +225,7 @@ export default {
subscribeMsg: '恭喜你已完成助力',
shareTitle: '我正在参加幸运大盲盒，邀请你一起参加！',
shareCard: '',
momentsCard: '',
shareReport: ''
}
}
......@@ -237,8 +248,12 @@ export default {
boolVal: true,
shareCardSize0: '',
shareCardSize1: 1,
momentsCardSize0: '',
momentsCardSize1: 1,
shareReportSize1: 1,
shareReportSize0: ''
shareReportSize0: '',
addMomentsCard: false,
momentsCard: ''
};
},
props: {
......@@ -260,15 +275,19 @@ export default {
},
watch: {
shareImgData(val) {
console.log(val.shareCard);
const { shareCard, shareReport, shareCardSize0, shareCardSize1, shareReportSize1, shareReportSize0 } = val;
const { shareCard, shareReport, shareCardSize0, shareCardSize1, shareReportSize1, shareReportSize0, momentsCard, momentsCardSize0, momentsCardSize1 } = val;
this.ruleForm.gameRuleConditionList[2].conditionJson.shareCard = shareCard;
this.ruleForm.gameRuleConditionList[2].conditionJson.momentsCard = momentsCard;
this.ruleForm.gameRuleConditionList[2].conditionJson.shareReport = shareReport;
this.ruleForm.shareImageUrl = shareCard;
this.shareCardSize0 = shareCardSize0;
this.shareCardSize1 = shareCardSize1;
this.momentsCardSize0 = momentsCardSize0;
this.momentsCardSize1 = momentsCardSize1;
this.shareReportSize1 = shareReportSize1;
this.shareReportSize0 = shareReportSize0;
// this.addMomentsCard = addMomentsCard;
// this.momentsCard = momentsCard;
this.ruleForm.gameRuleConditionList = this.ruleForm.gameRuleConditionList.splice(0);
},
echoData(val) {
......@@ -285,6 +304,9 @@ export default {
item.conditionId = obj[item.type].conditionId;
}
});
// if (this.addMomentsCard) {
// this.ruleForm.gameRuleConditionList[2].conditionJson.momentsCard = this.momentsCard;
// }
}
if (this.isEdit) {
if (memberType == 1) {
......@@ -378,6 +400,8 @@ export default {
if (key == 'shareCard') {
this.ruleForm.gameRuleConditionList[2].conditionJson.shareCard = data.result.qcloudImageUrl;
this.ruleForm.shareImageUrl = data.result.qcloudImageUrl;
} else if (key == 'momentsCard') {
this.ruleForm.gameRuleConditionList[2].conditionJson.momentsCard = data.result.qcloudImageUrl;
} else {
this.ruleForm.gameRuleConditionList[2].conditionJson.shareReport = data.result.qcloudImageUrl;
}
......
src/views/game/klfl/form.vue
......@@ -117,9 +117,9 @@
<i class="el-icon-sort-down cursor" :class="scope.$index === tableList.length - 1 ? 'cursor-nodrop gray' : 'cursor blue'" @click="sortGame(scope.row.gamePrizeStrategyId, 3, scope.$index === tableList.length - 1)"></i>
</template>
</el-table-column>
<el-table-column label="操作" align="left" width="120">
<el-table-column label="操作" align="left" width="180">
<template slot-scope="scope">
<el-button type="text" @click="editStrategy(scope.row.gamePrizeStrategyId)">编辑</el-button>
<el-button type="text" @click="editStrategy(scope.row.gamePrizeStrategyId)">编辑与数据</el-button>
<dm-delete @confirm="delItem(scope.row)" tips="是否删除该策略?">
<el-button type="text">删除</el-button>
</dm-delete>
......
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