Skip to content

H
haoban-3
Commit 9d011ffa by 无尘
Options

fix: 修改内购券

parent 63cb94e9
Showing with 66 additions and 33 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.28.css><link href=./static/css/app.7577daa745b57d22b3e6e1c8c28f2556.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/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/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.7a6d1a8aad4afc782eda.js></script><script type=text/javascript src=./static/js/vendor.694f8850ed5112713591.js></script><script type=text/javascript src=./static/js/app.a7abb23fc61f0cc3a091.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.28.css><link href=./static/css/app.8d5eea4531ffb2bfb072f66a5eb4cf6d.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/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/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.e13ba4a33fa4800c34b7.js></script><script type=text/javascript src=./static/js/vendor.694f8850ed5112713591.js></script><script type=text/javascript src=./static/js/app.9b900691a6c57a0a3e69.js></script></body></html>
\ No newline at end of file
dist/static/js/manifest.7a6d1a8aad4afc782eda.js → dist/static/js/manifest.e13ba4a33fa4800c34b7.js
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,d,n){for(var r,t,o,i=0,u=[];i<f.length;i++)t=f[i],a[t]&&u.push(a[t][0]),a[t]=0;for(r in d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(c&&c(f,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var f={},a={72:0};function b(c){if(f[c])return f[c].exports;var a=f[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,b),a.l=!0,a.exports}b.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,b){c=a[e]=[f,b]});c[2]=f;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+e+"."+{0:"db7fcfd49071bf8a7e4e",1:"06c4e42e62c1f75191f0",2:"3527d92b4250c040f53c",3:"fec7a03a688935ae1aac",4:"4d6eb4dc78c3746875f7",5:"bf21cfa1832c94ed8d4c",6:"8eb26935705e144eb957",7:"39efeedf5efe1bf98706",8:"05250ce5783b0ea1412e",9:"f7c875c7689ffc18fc21",10:"281523c91e7ee89296cb",11:"59c87174f09911b8256b",12:"e8cd784bf481f550c766",13:"2b65cdb3d875eca1b6fd",14:"2c29119d13dc5fff8f2b",15:"b646de33eca64e94b02c",16:"5e81daf3550937d71920",17:"719f213b21f95fa54418",18:"31d8270b74259075ac18",19:"7a53269ddf9f15768789",20:"f4ca923a45be4e175087",21:"3b62dd9c716d4bbba918",22:"f8e0114834358a5de162",23:"587c2e5a1989c5e482ea",24:"58c7c6c2d8897eb7c474",25:"9e5733792c18c643ff3a",26:"dba4d3332f3dbc9d7649",27:"8c00b479947588ae7b2c",28:"110ab7e5f64abacf9778",29:"cebf604cf1225f47e634",30:"00da5d6c69db35a7d4aa",31:"cf36baf02e3e24a5f053",32:"4de4968d6e57140dee2d",33:"4d3acec09b21e4bb12c9",34:"9c430f40b3a0c2122fd9",35:"9d2f169ffce85f2b33c0",36:"cf397756c40d6f8c1420",37:"f43da4e4e894a104b34e",38:"5f4ce05b4c8050e7ac44",39:"63dc54f1a6b7a04b4d41",40:"92d0d94299d327d1de34",41:"0a200f6a27af7dcb8907",42:"9baf4946c3c38a84ce67",43:"9c52586cacdafc0ecb35",44:"8e39581128d0ad7da761",45:"e8f51a76ae55e4471a7b",46:"6b1c3a3f67f361adcdfc",47:"ee289bf28d0b62cdbd74",48:"c3f2c22b2043b0927337",49:"cc5f227c95037a1381f0",50:"d9b73b19718c243b05b5",51:"10da031ace08e3b2f0ec",52:"3d733ded8368c35c7db7",53:"464efb5dbd1f1a75c07d",54:"4c49723130a02a35341c",55:"a59eb69795468eaccdab",56:"44a19541b1d9d5510256",57:"bb35aa59b73ea983662f",58:"f4362bcb70641f953b1a",59:"dbf7ad29a68c1cbb9816",60:"1909362f66171978f945",61:"c8bf83503933dbb0d3a7",62:"c150bd9c93df08960929",63:"ab752ec3ccf9371f123b",64:"3b820a9237f2357ff5ae",65:"078a80e8e8e9c5b192cc",66:"d83b81ba889c535b2569",67:"5fb5009212972df8959b",68:"83851f59efe48e8d85fd",69:"a85af8948bfc87b0850f"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),f},b.m=e,b.c=f,b.d=function(e,c,f){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="./",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,b,n){for(var r,t,o,i=0,u=[];i<f.length;i++)t=f[i],a[t]&&u.push(a[t][0]),a[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(f,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var f={},a={72:0};function d(c){if(f[c])return f[c].exports;var a=f[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,d),a.l=!0,a.exports}d.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,d){c=a[e]=[f,d]});c[2]=f;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+e+"."+{0:"db7fcfd49071bf8a7e4e",1:"06c4e42e62c1f75191f0",2:"3527d92b4250c040f53c",3:"fec7a03a688935ae1aac",4:"4d6eb4dc78c3746875f7",5:"bf21cfa1832c94ed8d4c",6:"8eb26935705e144eb957",7:"1daec0494993424f9a1d",8:"5d9f49cf981443ec5c73",9:"f7c875c7689ffc18fc21",10:"281523c91e7ee89296cb",11:"59c87174f09911b8256b",12:"e8cd784bf481f550c766",13:"2b65cdb3d875eca1b6fd",14:"2c29119d13dc5fff8f2b",15:"b646de33eca64e94b02c",16:"5e81daf3550937d71920",17:"719f213b21f95fa54418",18:"31d8270b74259075ac18",19:"7a53269ddf9f15768789",20:"f4ca923a45be4e175087",21:"3b62dd9c716d4bbba918",22:"f8e0114834358a5de162",23:"587c2e5a1989c5e482ea",24:"58c7c6c2d8897eb7c474",25:"9e5733792c18c643ff3a",26:"dba4d3332f3dbc9d7649",27:"8c00b479947588ae7b2c",28:"110ab7e5f64abacf9778",29:"cebf604cf1225f47e634",30:"00da5d6c69db35a7d4aa",31:"cf36baf02e3e24a5f053",32:"4de4968d6e57140dee2d",33:"4d3acec09b21e4bb12c9",34:"9c430f40b3a0c2122fd9",35:"9d2f169ffce85f2b33c0",36:"cf397756c40d6f8c1420",37:"f43da4e4e894a104b34e",38:"5f4ce05b4c8050e7ac44",39:"63dc54f1a6b7a04b4d41",40:"92d0d94299d327d1de34",41:"0a200f6a27af7dcb8907",42:"9baf4946c3c38a84ce67",43:"9c52586cacdafc0ecb35",44:"8e39581128d0ad7da761",45:"e8f51a76ae55e4471a7b",46:"6b1c3a3f67f361adcdfc",47:"ee289bf28d0b62cdbd74",48:"c3f2c22b2043b0927337",49:"cc5f227c95037a1381f0",50:"d9b73b19718c243b05b5",51:"10da031ace08e3b2f0ec",52:"3d733ded8368c35c7db7",53:"464efb5dbd1f1a75c07d",54:"4c49723130a02a35341c",55:"a59eb69795468eaccdab",56:"44a19541b1d9d5510256",57:"bb35aa59b73ea983662f",58:"f4362bcb70641f953b1a",59:"dbf7ad29a68c1cbb9816",60:"1909362f66171978f945",61:"c8bf83503933dbb0d3a7",62:"c150bd9c93df08960929",63:"ab752ec3ccf9371f123b",64:"3b820a9237f2357ff5ae",65:"078a80e8e8e9c5b192cc",66:"d83b81ba889c535b2569",67:"5fb5009212972df8959b",68:"83851f59efe48e8d85fd",69:"a85af8948bfc87b0850f"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),f},d.m=e,d.c=f,d.d=function(e,c,f){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/views/apps/protectCard/newCardPut.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-04-13 15:27:46
* @LastEditors: 无尘
* @LastEditTime: 2020-04-26 11:14:36
* @LastEditTime: 2020-04-26 11:47:59
-->
<template>
......@@ -140,12 +140,10 @@ export default {
// {
// templateName: '',
// cardType: '0',
// dataType: '0',
// dateRange: [],
// dateDay: '',
// dateDayNum: '50000',
// limitType: '0',
// limitCount: ''
// effectiveType: '0',
// dateRange: [],
// sendNumberDay: '',
// sendLimit: '50000',
// }
],
sendRange: '0',
......@@ -158,7 +156,8 @@ export default {
},
rules: {
// receiveType: [{ validator: validateReceiveType, trigger: 'change' }],
cardCombineName: [{ required: true, message: '请输入卡券组合名称', trigger: 'blur' }]
cardCombineName: [{ required: true, message: '请输入卡券组合名称', trigger: 'blur' }],
cardTemplateJson: [{ type: 'array', required: true, message: '请至少选择一个卡券模板', trigger: 'change' }]
},
cardSelectShow: false,
choiceDateCopy: [],
......@@ -255,12 +254,10 @@ export default {
returnData(data) {
const that = this;
data.forEach(ele => {
ele.dataType = '0';
ele.effectiveType = '0';
ele.dateRange = [];
ele.dateDay = '';
ele.dateDayNum = '50000';
ele.limitType = '0';
ele.limitCount = '';
ele.sendNumberDay = '0';
ele.sendLimit = '50000';
});
that.formData.cardTemplateJson = JSON.parse(JSON.stringify(data));
that.cardTempShow = false;
......@@ -373,6 +370,25 @@ export default {
*/
submitForm: _debounce(function(formName, flag) {
const that = this;
if (!that.formData.cardTemplateJson) {
return false;
}
let tag = true;
that.formData.cardTemplateJson.forEach(ele => {
if (!ele.dateRange) {
ele.dateRange = [];
tag = false;
}
ele.startTimeString = !!ele.dateRange ? ele.dateRange[0] : '';
ele.endTimeString = !!ele.dateRange ? ele.dateRange[1] : '';
});
if (!tag) {
that.$message.error({
duration: 1000,
message: '请先选择模板有效期'
});
return false;
}
that.$refs[formName].validate(valid => {
if (valid) {
that.postSaveCard(flag);
......
src/views/apps/protectCard/newCardStrategy.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-04-13 15:27:46
* @LastEditors: 无尘
* @LastEditTime: 2020-04-26 11:05:00
* @LastEditTime: 2020-04-26 11:48:19
-->
<template>
......@@ -34,15 +34,16 @@
</el-table-column>
<el-table-column prop="" label="有效期" width="505">
<template slot-scope="scope">
<el-select class="w-100" v-model="scope.row.dataType" placeholder="">
<el-select class="w-100" v-model="scope.row.effectiveType" placeholder="">
<el-option label="固定日期" value="0"></el-option>
<el-option label="发送后" value="1"></el-option> </el-select
><el-date-picker v-if="scope.row.dataType == 0" class="m-l-10 w-300 vertical-middle" prefix-icon="el-icon-time" :picker-options="pickerOptions" v-model="scope.row.dateRange" @change="changeDate" :editable="false" :value-format="'yyyy-MM-dd'" type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"> </el-date-picker> <el-select class="w-100 m-l-10" v-if="scope.row.dataType == 1" v-model="scope.row.dateDay" placeholder="请选择"> <el-option v-for="item in dateOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select><span class="font-14 color-606266 p-l-10" v-if="scope.row.dataType == 1">有效，有效天数</span><el-input-number class="w-100 m-l-10" v-if="scope.row.dataType == 1" v-model="scope.row.dateDayNum" controls-position="right" :min="1" :max="366"></el-input-number><span class="font-14 color-606266 p-l-10" v-if="scope.row.dataType == 1">天</span>
><el-date-picker v-if="scope.row.effectiveType == 0" class="m-l-10 w-300 vertical-middle" prefix-icon="el-icon-time" :picker-options="pickerOptions" v-model="scope.row.dateRange" @change="changeDate" :editable="false" :value-format="'yyyy-MM-dd'" type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"> </el-date-picker> <el-select class="w-100 m-l-10" v-if="scope.row.effectiveType == 1" v-model="scope.row.sendNumberDay" placeholder="请选择"> <el-option v-for="item in dateOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select><span class="font-14 color-606266 p-l-10" v-if="scope.row.effectiveType == 1">有效，有效天数</span><el-input-number class="w-100 m-l-10" v-if="scope.row.effectiveType == 1" v-model="scope.row.effectiveDay" controls-position="right" :min="1" :max="366"></el-input-number><span class="font-14 color-606266 p-l-10" v-if="scope.row.effectiveType == 1">天</span>
</template>
</el-table-column>
<el-table-column prop="" label="发送总数" width="350">
<template slot-scope="scope">
<el-select class="w-100" v-model="scope.row.limitType" placeholder=""> <el-option label="限制总数" value="0"></el-option> </el-select><el-input-number class="w-100 m-l-10 vertical-middle" v-model="scope.row.dateDayNum" controls-position="right" :min="1" :max="999999999"></el-input-number>
<!-- <el-select class="w-100" v-model="scope.row.limitType" placeholder=""> <el-option label="限制总数" value="0"></el-option> </el-select> -->
<el-input-number class="w-100 m-l-10 vertical-middle" v-model="scope.row.sendLimit" controls-position="right" :min="1" :max="999999999"></el-input-number>
</template>
</el-table-column>
<el-table-column prop="" label="操作" show-overflow-tooltip>
......@@ -181,12 +182,10 @@ export default {
/* {
templateName: '',
cardType: '0',
dataType: '0',
effectiveType: '0',
dateRange: [],
dateDay: '',
dateDayNum: '50000',
limitType: '0',
limitCount: ''
sendNumberDay: '',
sendLimit: '50000',
} */
],
sendRange: '0',
......@@ -206,7 +205,8 @@ export default {
rules: {
policyId: [{ required: true, message: '请选择卡券', trigger: 'change' }],
// receiveType: [{ validator: validateReceiveType, trigger: 'change' }],
policyName: [{ required: true, message: '请输入卡券策略名称', trigger: 'blur' }]
policyName: [{ required: true, message: '请输入卡券策略名称', trigger: 'blur' }],
cardTemplateJson: [{ type: 'array', required: true, message: '请至少选择一个卡券模板', trigger: 'change' }]
},
cardSelectShow: false,
choiceDateCopy: [],
......@@ -303,12 +303,10 @@ export default {
returnData(data) {
const that = this;
data.forEach(ele => {
ele.dataType = '0';
ele.effectiveType = '0';
ele.dateRange = [];
ele.dateDay = '';
ele.dateDayNum = '50000';
ele.limitType = '0';
ele.limitCount = '';
ele.sendNumberDay = '0';
ele.sendLimit = '50000';
});
that.formData.cardTemplateJson = JSON.parse(JSON.stringify(data));
that.cardTempShow = false;
......@@ -424,6 +422,25 @@ export default {
if (!that.formData.validDateRange) {
that.formData.validDateRange = [];
}
if (!that.formData.cardTemplateJson) {
return false;
}
let tag = true;
that.formData.cardTemplateJson.forEach(ele => {
if (!ele.dateRange) {
ele.dateRange = [];
tag = false;
}
ele.startTimeString = !!ele.dateRange ? ele.dateRange[0] : '';
ele.endTimeString = !!ele.dateRange ? ele.dateRange[1] : '';
});
if (!tag) {
that.$message.error({
duration: 1000,
message: '请先选择模板有效期'
});
return false;
}
that.$refs[formName].validate(valid => {
if (valid) {
that.postSaveCard(flag);
......@@ -515,7 +532,7 @@ export default {
sendRange: resData.result.sendRange,
positionFlag: resData.result.positionFlag == 1 ? true : false,
noPosition: resData.result.positionNames.includes('-1') || resData.result.positionNames.includes(-1) ? true : false,
positionNames: resData.result.positionNames ? resData.result.positionNames.join(',') : [],
positionNames: resData.result.positionNames ? resData.result.positionNames.split(',') : [],
departmentJson: resData.result.departmentJson || [], // 部门数据
sendMonthType: resData.result.sendMonthType,
sendTimes: resData.result.sendTimes,
......
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