Skip to content

H
haoban-3
Commit 74f7fa67 by 无尘
Options

fix: 修改策略

parent 97a3d1a2
Showing with 31 additions and 15 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.5b0aae65b3cf6d8762428158431cf978.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.4d645799fbf4339b74d2.js></script><script type=text/javascript src=./static/js/vendor.694f8850ed5112713591.js></script><script type=text/javascript src=./static/js/app.2fb794802593d2f171a8.js></script></body></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.c4eec398dfb0a3e21bfad525d9bfa986.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.11b16b50a4f81c69b1dd.js></script><script type=text/javascript src=./static/js/vendor.694f8850ed5112713591.js></script><script type=text/javascript src=./static/js/app.2fb794802593d2f171a8.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/css/app.5b0aae65b3cf6d8762428158431cf978.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.c4eec398dfb0a3e21bfad525d9bfa986.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.4d645799fbf4339b74d2.js → dist/static/js/manifest.11b16b50a4f81c69b1dd.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:"a82a0b7945e1b3a1d374",4:"252779c1e666ec398a87",5:"bf21cfa1832c94ed8d4c",6:"b559d7c450cafcef2cc6",7:"e0c1956cf72584a9caaf",8:"cb03e8494e272a9faa1b",9:"f7c875c7689ffc18fc21",10:"f64bf1b4c969dc8e4324",11:"234de60fe9d347a9b246",12:"6a466fe76c10c7e9b04b",13:"2b65cdb3d875eca1b6fd",14:"2c29119d13dc5fff8f2b",15:"b646de33eca64e94b02c",16:"5e81daf3550937d71920",17:"a315ec3bb42a1a5f0ab3",18:"aac9552544b8aaf4d59f",19:"5c01b5259828e3c1889f",20:"0f96177cb5fd1bb77419",21:"d3de2ecd37f4d39cc396",22:"961cd55348752b933219",23:"651b185e2044c2807304",24:"2eda35461eaa66a95420",25:"7549e1d07154cb68ad21",26:"4a9b3d64a1064ee4d046",27:"66bd69de59b8deab4ddb",28:"110ab7e5f64abacf9778",29:"cebf604cf1225f47e634",30:"7c1e52b5c0d36e8632c1",31:"23b563051fe459d90853",32:"4de4968d6e57140dee2d",33:"4d3acec09b21e4bb12c9",34:"335593327f59f50ba24f",35:"7dc15ac53ff6451b1ce4",36:"016ee9d9e7ef1ff8c15b",37:"5250bd90920b928718d6",38:"d34b5cfa10bdec3aff24",39:"78a93cc4665d1c8493b2",40:"1e635f263206df0ac797",41:"9b2686ccf000bbd81f9e",42:"e09526366f36f7a15a4c",43:"9b418f83353fc3a7742c",44:"5ace94d525caa6bceb8e",45:"ff02eb876d0090ecf8fd",46:"9b118ff00e438fb60b55",47:"ee289bf28d0b62cdbd74",48:"1919c6abf5a0a18c7860",49:"c11e4ff91e3e45a0e01a",50:"adf06e778b3bb59a4314",51:"10da031ace08e3b2f0ec",52:"3d733ded8368c35c7db7",53:"464efb5dbd1f1a75c07d",54:"4c49723130a02a35341c",55:"a59eb69795468eaccdab",56:"44a19541b1d9d5510256",57:"bb35aa59b73ea983662f",58:"f4362bcb70641f953b1a",59:"35cc1a5bf8e67c4f3717",60:"26251b1473ea21594e14",61:"546eb6f21413100b354f",62:"79bc422b829d3efa5158",63:"cce43b49af145ee143b0",64:"c32170be4e3a5886e248",65:"37df5a0fbbf0fca93437",66:"e609fee1fe2f65d80693",67:"e9727b8a22c821b587a0",68:"33235a28bed976a3e05e",69:"b7a1dbc4c26f669ccf29"}[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}}([]); !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:"a82a0b7945e1b3a1d374",4:"252779c1e666ec398a87",5:"bf21cfa1832c94ed8d4c",6:"b559d7c450cafcef2cc6",7:"e0c1956cf72584a9caaf",8:"cb03e8494e272a9faa1b",9:"f7c875c7689ffc18fc21",10:"f64bf1b4c969dc8e4324",11:"234de60fe9d347a9b246",12:"b56cb73d003e9cdf5959",13:"2b65cdb3d875eca1b6fd",14:"2c29119d13dc5fff8f2b",15:"b646de33eca64e94b02c",16:"5e81daf3550937d71920",17:"a315ec3bb42a1a5f0ab3",18:"aac9552544b8aaf4d59f",19:"5c01b5259828e3c1889f",20:"0f96177cb5fd1bb77419",21:"d3de2ecd37f4d39cc396",22:"961cd55348752b933219",23:"651b185e2044c2807304",24:"2eda35461eaa66a95420",25:"7549e1d07154cb68ad21",26:"4a9b3d64a1064ee4d046",27:"66bd69de59b8deab4ddb",28:"110ab7e5f64abacf9778",29:"cebf604cf1225f47e634",30:"7c1e52b5c0d36e8632c1",31:"23b563051fe459d90853",32:"4de4968d6e57140dee2d",33:"4d3acec09b21e4bb12c9",34:"335593327f59f50ba24f",35:"7dc15ac53ff6451b1ce4",36:"016ee9d9e7ef1ff8c15b",37:"5250bd90920b928718d6",38:"d34b5cfa10bdec3aff24",39:"78a93cc4665d1c8493b2",40:"1e635f263206df0ac797",41:"9b2686ccf000bbd81f9e",42:"e09526366f36f7a15a4c",43:"9b418f83353fc3a7742c",44:"5ace94d525caa6bceb8e",45:"ff02eb876d0090ecf8fd",46:"9b118ff00e438fb60b55",47:"ee289bf28d0b62cdbd74",48:"1919c6abf5a0a18c7860",49:"c11e4ff91e3e45a0e01a",50:"adf06e778b3bb59a4314",51:"10da031ace08e3b2f0ec",52:"3d733ded8368c35c7db7",53:"464efb5dbd1f1a75c07d",54:"4c49723130a02a35341c",55:"a59eb69795468eaccdab",56:"44a19541b1d9d5510256",57:"bb35aa59b73ea983662f",58:"f4362bcb70641f953b1a",59:"35cc1a5bf8e67c4f3717",60:"26251b1473ea21594e14",61:"546eb6f21413100b354f",62:"79bc422b829d3efa5158",63:"cce43b49af145ee143b0",64:"c32170be4e3a5886e248",65:"37df5a0fbbf0fca93437",66:"e609fee1fe2f65d80693",67:"e9727b8a22c821b587a0",68:"33235a28bed976a3e05e",69:"b7a1dbc4c26f669ccf29"}[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 \ No newline at end of file
src/views/apps/protectCard/newCardStrategy.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2020-04-13 15:27:46 * @Date: 2020-04-13 15:27:46
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-04-23 14:05:00 * @LastEditTime: 2020-04-23 14:27:57
--> -->
<template> <template>
...@@ -32,17 +32,17 @@ ...@@ -32,17 +32,17 @@
<span v-if="scope.row.cardType == 1">折扣券</span> <span v-if="scope.row.cardType == 1">折扣券</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="有效期" width="495"> <el-table-column prop="" label="有效期" width="505">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select class="w-100" v-model="scope.row.dataType" placeholder=""> <el-select class="w-100" v-model="scope.row.dataType" placeholder="">
<el-option label="固定日期" value="0"></el-option> <el-option label="固定日期" value="0"></el-option>
<el-option label="发送后" value="1"></el-option> </el-select <el-option label="发送后" value="1"></el-option> </el-select
><el-date-picker v-if="scope.row.dataType == 0" class="m-l-10 m-r-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" 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" 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.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" 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" 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>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="发送总数" width="350"> <el-table-column prop="" label="发送总数" width="350">
<template slot-scope="scope"> <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 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.dateDayNum" controls-position="right" :min="1" :max="999999999"></el-input-number>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="操作" show-overflow-tooltip> <el-table-column prop="" label="操作" show-overflow-tooltip>
...@@ -80,9 +80,9 @@ ...@@ -80,9 +80,9 @@
</label> </label>
<div class="el-form-item__content" style="margin-left: 120px;"> <div class="el-form-item__content" style="margin-left: 120px;">
<el-radio v-model="formData.executeType" label="0">每月循环</el-radio><el-radio v-model="formData.executeType" label="1">多月循环</el-radio> <el-radio v-model="formData.executeType" label="0">每月循环</el-radio><el-radio v-model="formData.executeType" label="1">多月循环</el-radio>
<div v-if="formData.executeType == 0" class="m-t-10"><span class="font-14 color-606266 p-r-10">每月</span><el-input-number v-model="formData.monthNum" controls-position="right" :min="1" :max="9999"></el-input-number><span class="font-14 color-303133 p-l-10"> 次</span></div> <div v-if="formData.executeType == 0" class="m-t-10 month-recyle"><span class="font-14 color-606266 p-r-10">每月</span><el-input-number class="w-100" v-model="formData.monthNum" controls-position="right" :min="1" :max="9999"></el-input-number><span class="font-14 color-303133 p-l-10"> 次</span></div>
<div v-if="formData.executeType == 1" class="m-t-10"> <div v-if="formData.executeType == 1" class="m-t-10 month-recyle">
<span class="font-14 color-606266 p-r-10">第</span><el-select multiple collapse-tags v-model="formData.multMonth" placeholder="请选择"> <el-option v-for="item in monthOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select><el-input-number class="m-l-10" style="vertical-align:middle;" v-model="formData.multMonthNum" controls-position="right" :min="1" :max="9999"></el-input-number> <span class="font-14 color-606266 p-r-10">第</span><el-select class="w-100" multiple collapse-tags v-model="formData.multMonth" placeholder="请选择"> <el-option v-for="item in monthOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select><el-input-number class="m-l-10 w-100" style="vertical-align:middle;" v-model="formData.multMonthNum" controls-position="right" :min="1" :max="9999"></el-input-number>
</div> </div>
</div> </div>
</div> </div>
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
</label> </label>
<div class="el-form-item__content" style="margin-left: 120px;"> <div class="el-form-item__content" style="margin-left: 120px;">
<el-radio v-model="formData.vaildDateType" label="0">长期有效</el-radio><el-radio v-model="formData.vaildDateType" label="1">固定期限</el-radio> <el-radio v-model="formData.vaildDateType" label="0">长期有效</el-radio><el-radio v-model="formData.vaildDateType" label="1">固定期限</el-radio>
<div v-if="formData.vaildDateType == 1"> <div v-if="formData.vaildDateType == 1" class="date-valid">
<el-date-picker class="m-l-10 m-r-10" prefix-icon="el-icon-time" :picker-options="pickerOptions" v-model="formData.validDateRange" :editable="false" :value-format="'yyyy-MM-dd HH:mm:ss'" :default-time="['00:00:00', '23:59:59']" type="datetimerange" align="right" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker> <el-date-picker class="m-l-10 m-r-10" prefix-icon="el-icon-time" :picker-options="pickerOptions" v-model="formData.validDateRange" :editable="false" :value-format="'yyyy-MM-dd HH:mm:ss'" :default-time="['00:00:00', '23:59:59']" type="datetimerange" align="right" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
</div> </div>
</div> </div>
...@@ -203,7 +203,7 @@ export default { ...@@ -203,7 +203,7 @@ export default {
sendRange: [{ validator: validateRange, trigger: 'change' }], sendRange: [{ validator: validateRange, trigger: 'change' }],
sendType: [{ validator: validateSendType, trigger: 'change' }], sendType: [{ validator: validateSendType, trigger: 'change' }],
// receiveType: [{ validator: validateReceiveType, trigger: 'change' }], // receiveType: [{ validator: validateReceiveType, trigger: 'change' }],
eachSendTimes: [{ required: true, message: '请输入券发放张数', trigger: 'blur' }] cardStrategyName: [{ required: true, message: '请输入卡券策略名称', trigger: 'blur' }]
}, },
cardSelectShow: false, cardSelectShow: false,
choiceDateCopy: [], choiceDateCopy: [],
...@@ -563,6 +563,22 @@ export default { ...@@ -563,6 +563,22 @@ export default {
.new-card-body { .new-card-body {
padding: 30px; padding: 30px;
} }
.position-select {
width: 370px;
margin-top: 10px;
padding: 15px 20px;
min-height: 94px;
background: rgba(245, 247, 250, 1);
}
.month-recyle {
width: 370px;
background: rgba(245, 247, 250, 1);
padding: 20px;
}
.date-valid {
background: rgba(245, 247, 250, 1);
padding: 20px;
}
.w-240 { .w-240 {
width: 240px; width: 240px;
} }
...@@ -624,8 +640,8 @@ export default { ...@@ -624,8 +640,8 @@ export default {
} }
.button-new-tag { .button-new-tag {
margin-left: 10px; margin-left: 10px;
height: 32px; height: 22px;
line-height: 30px; line-height: 20px;
padding-top: 0; padding-top: 0;
padding-bottom: 0; padding-bottom: 0;
} }
......
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