Skip to content

C
clique-web
Commit ad51e1c4 by KyleAlex
Options

策略新建编辑bug

parent 88b3864e
Showing with 52 additions and 20 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/main.bd6017c8cc7ccc38a677be2fab7339ca.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><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/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.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/group-people.2.0.08.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-group.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/export.1.0.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.46.js></script><script type=text/javascript src=./static/js/manifest.f0e70ca89c2216e3bb22.js></script><script type=text/javascript src=./static/js/vendor.191098631718b64db4bc.js></script><script type=text/javascript src=./static/js/main.a04cf86fbaa413440700.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/main.e1ee96be29f7b433fe0df5667d33fb39.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><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/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.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/group-people.2.0.08.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-group.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/export.1.0.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.46.js></script><script type=text/javascript src=./static/js/manifest.126c14277d1fcb1dda38.js></script><script type=text/javascript src=./static/js/vendor.191098631718b64db4bc.js></script><script type=text/javascript src=./static/js/main.c11d202ba7f161f1465d.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/11.aa7133706f4f747ee31d.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/11.aa7133706f4f747ee31d.js → dist/static/js/11.efa5a065edef0e1095ef.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/11.efa5a065edef0e1095ef.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/12.cd51cd35e605e5887e41.js → dist/static/js/12.782e3ccde456e4d86c99.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/12.782e3ccde456e4d86c99.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/12.cd51cd35e605e5887e41.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.60212823a3a011081267.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.d672c3062211e3707efb.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.60212823a3a011081267.js → dist/static/js/8.18becac48c601e2bef2d.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/8.18becac48c601e2bef2d.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/8.d1ceb615a27b1aa50fc3.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.f0e70ca89c2216e3bb22.js → dist/static/js/manifest.126c14277d1fcb1dda38.js
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var d,o,b,i=0,u=[];i<c.length;i++)o=c[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var c={},f={44:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"2f33ab3e109a5841fc0f",1:"385e557f391e558f5b52",2:"4400b301e978f2178b70",3:"603ec5bcb8045fafa6c6",4:"1bd29243a0bf46215fc8",5:"76008f7c4ac7738a7fb6",6:"7238e563404dfb6e4a4e",7:"60212823a3a011081267",8:"d1ceb615a27b1aa50fc3",9:"03455c3a87702c5d8dbf",10:"d247618a584f7b4a9734",11:"aa7133706f4f747ee31d",12:"cd51cd35e605e5887e41",13:"30922a748c42d0069cc5",14:"9e4d2a6299696198fa6f",15:"f746c3d84fe215b0e8d8",16:"476faf210bab30163969",17:"d0b53f24a900366d2933",18:"345771d2f681dbc8940e",19:"bfc0a3c36a966ff0ec49",20:"301bfd1b9e4d6225b51b",21:"57dd7adf4aaa3a5a68ac",22:"452c39e097b94701947e",23:"188fb3bfadba88630f8a",24:"8d3ccc3d6684a9a37e3a",25:"597dc8acb4c5a084ef35",26:"3ca55a78dcdee5b0816d",27:"a72adbc49522e5ec7bab",28:"3d668c97a2c8f654037b",29:"e91d985a85837913a1de",30:"8b7f5e3a4bf531bc2dae",31:"51afc94c5bc16376c2f7",32:"e49c4e56704cc4798815",33:"875776191c5435e59905",34:"3fa688c4f4ab66c5c2f7",35:"4cf8227630d734bf50d6",36:"131f888c7703f2eacb53",37:"9a4bf737d809200a1480",38:"8d049d09f371dd8c3f10",39:"06217df77f10a0aee881",40:"6f905491d4588f8e08fd",41:"a97999411877ea1626da"}[e]+".js";var d=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(d);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=o,r.appendChild(t),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]); !function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var d,o,b,i=0,u=[];i<c.length;i++)o=c[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var c={},f={44:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"2f33ab3e109a5841fc0f",1:"385e557f391e558f5b52",2:"4400b301e978f2178b70",3:"603ec5bcb8045fafa6c6",4:"1bd29243a0bf46215fc8",5:"76008f7c4ac7738a7fb6",6:"7238e563404dfb6e4a4e",7:"d672c3062211e3707efb",8:"18becac48c601e2bef2d",9:"03455c3a87702c5d8dbf",10:"d247618a584f7b4a9734",11:"efa5a065edef0e1095ef",12:"782e3ccde456e4d86c99",13:"30922a748c42d0069cc5",14:"9e4d2a6299696198fa6f",15:"f746c3d84fe215b0e8d8",16:"476faf210bab30163969",17:"d0b53f24a900366d2933",18:"345771d2f681dbc8940e",19:"bfc0a3c36a966ff0ec49",20:"301bfd1b9e4d6225b51b",21:"57dd7adf4aaa3a5a68ac",22:"452c39e097b94701947e",23:"188fb3bfadba88630f8a",24:"8d3ccc3d6684a9a37e3a",25:"597dc8acb4c5a084ef35",26:"3ca55a78dcdee5b0816d",27:"a72adbc49522e5ec7bab",28:"3d668c97a2c8f654037b",29:"e91d985a85837913a1de",30:"8b7f5e3a4bf531bc2dae",31:"51afc94c5bc16376c2f7",32:"e49c4e56704cc4798815",33:"875776191c5435e59905",34:"3fa688c4f4ab66c5c2f7",35:"4cf8227630d734bf50d6",36:"131f888c7703f2eacb53",37:"9a4bf737d809200a1480",38:"8d049d09f371dd8c3f10",39:"06217df77f10a0aee881",40:"6f905491d4588f8e08fd",41:"a97999411877ea1626da"}[e]+".js";var d=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(d);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=o,r.appendChild(t),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.f0e70ca89c2216e3bb22.js.map //# sourceMappingURL=manifest.126c14277d1fcb1dda38.js.map
\ No newline at end of file \ No newline at end of file
src/view/companyGroup/membershipSystem/addPointSystem.vue
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm:ss" value-format="timestamp"
:default-time="['00:00:00', '23:59:59']"> :default-time="['00:00:00', '23:59:59']">
</el-date-picker> </el-date-picker>
</el-radio> </el-radio>
...@@ -452,8 +452,8 @@ export default { ...@@ -452,8 +452,8 @@ export default {
} }
], ],
perpetualDate: [ perpetualDate: [
new Date(timeStramp.year, timeStramp.month, timeStramp.day, 0, 0), new Date(timeStramp.year, timeStramp.month, timeStramp.day, 0, 0).getTime(),
new Date(timeStramp.year, timeStramp.month, timeStramp.day, 23, 59) new Date(timeStramp.year, timeStramp.month, timeStramp.day, 23, 59).getTime()
] ]
}, },
cateOptions: [ cateOptions: [
...@@ -652,14 +652,16 @@ export default { ...@@ -652,14 +652,16 @@ export default {
// endValidTime 有效时间结束（毫秒时间戳） // endValidTime 有效时间结束（毫秒时间戳）
} else { } else {
// 时间区间 // 时间区间
if (data.perpetualDate[0].indexOf('Z') > -1) { // if (data.perpetualDate[0].indexOf('Z') > -1) {
// 说明第一次没有动过 // // 说明第一次没有动过
data.startValidTime = new Date(this.transUTCTime(data.perpetualDate[0]) + ' 00:00').getTime(); // data.startValidTime = new Date(this.transUTCTime(data.perpetualDate[0]) + ' 00:00').getTime();
data.endValidTime = new Date(this.transUTCTime(data.perpetualDate[1]) + ' 23:59').getTime(); // data.endValidTime = new Date(this.transUTCTime(data.perpetualDate[1]) + ' 23:59').getTime();
} else { // } else {
data.startValidTime = new Date(data.perpetualDate[0].slice(0, -3)).getTime(); // data.startValidTime = new Date(data.perpetualDate[0].slice(0, -3)).getTime();
data.endValidTime = new Date(data.perpetualDate[1].slice(0, -3)).getTime(); // data.endValidTime = new Date(data.perpetualDate[1].slice(0, -3)).getTime();
} // }
data.startValidTime = data.perpetualDate[0];
data.endValidTime = data.perpetualDate[1];
} }
delete data.perpetualDate; delete data.perpetualDate;
that.saveForm(data); that.saveForm(data);
......
src/view/companyGroup/membershipSystem/editPointSystem.vue
...@@ -343,7 +343,7 @@ ...@@ -343,7 +343,7 @@
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm:ss" value-format="timestamp"
:default-time="['00:00:00', '23:59:59']" :default-time="['00:00:00', '23:59:59']"
></el-date-picker> ></el-date-picker>
</el-radio> </el-radio>
...@@ -403,6 +403,12 @@ import { postRequest, postJson } from '@/api/api'; ...@@ -403,6 +403,12 @@ import { postRequest, postJson } from '@/api/api';
import strLength from '@/common/js/strlen'; import strLength from '@/common/js/strlen';
import { log } from '@/utils/index.js'; import { log } from '@/utils/index.js';
const timeStramp = {
year: new Date().getFullYear(),
month: new Date().getMonth(),
day: new Date().getDate()
};
export default { export default {
name: 'editPointSytem', name: 'editPointSytem',
data() { data() {
...@@ -567,7 +573,11 @@ export default { ...@@ -567,7 +573,11 @@ export default {
integralUseStatus: 0, // 积分抵现开启 1是0否 integralUseStatus: 0, // 积分抵现开启 1是0否
integralUse: null, // 积分抵现 {fee:5,integral:5} integralUse: null, // 积分抵现 {fee:5,integral:5}
perpetualFlag: 1, perpetualFlag: 1,
channelList: [] channelList: [],
perpetualDate: [
new Date(timeStramp.year, timeStramp.month, timeStramp.day, 0, 0),
new Date(timeStramp.year, timeStramp.month, timeStramp.day, 23, 59)
]
}, },
cateOptions: [ cateOptions: [
{ {
...@@ -766,6 +776,26 @@ export default { ...@@ -766,6 +776,26 @@ export default {
data.integralGet.fee = parseInt(data.integralGet.fee * 10); data.integralGet.fee = parseInt(data.integralGet.fee * 10);
data.integralGet.integral = parseInt(data.integralGet.integral * 10); data.integralGet.integral = parseInt(data.integralGet.integral * 10);
data.integralGet = JSON.stringify(data.integralGet); data.integralGet = JSON.stringify(data.integralGet);
// 3.0_特殊策略新增有效期配置
if (data.perpetualFlag === 1) {
// 永久
// perpetualFlag 是否永久 0 非永久 1永久'
// startValidTime 有效期时间开始(毫秒时间戳)
// endValidTime 有效时间结束（毫秒时间戳）
} else {
// 时间区间
// if (data.perpetualDate[0].indexOf('Z') > -1) {
// // 说明第一次没有动过
// data.startValidTime = new Date(this.transUTCTime(data.perpetualDate[0]) + ' 00:00').getTime();
// data.endValidTime = new Date(this.transUTCTime(data.perpetualDate[1]) + ' 23:59').getTime();
// } else {
// data.startValidTime = new Date(data.perpetualDate[0].slice(0, -3)).getTime();
// data.endValidTime = new Date(data.perpetualDate[1].slice(0, -3)).getTime();
// }
data.startValidTime = data.perpetualDate[0];
data.endValidTime = data.perpetualDate[1];
}
delete data.perpetualDate;
that.saveForm(data); that.saveForm(data);
} }
}); });
...@@ -1051,8 +1081,8 @@ export default { ...@@ -1051,8 +1081,8 @@ export default {
that.ruleForm = that.formatData(item); that.ruleForm = that.formatData(item);
that.$set(that.ruleForm, 'perpetualDate', []); that.$set(that.ruleForm, 'perpetualDate', []);
that.ruleForm.perpetualDate[1] = new Date(this.ruleForm.endValidTime); that.ruleForm.perpetualDate[1] = this.ruleForm.endValidTime;
that.ruleForm.perpetualDate[0] = new Date(this.ruleForm.startValidTime); that.ruleForm.perpetualDate[0] = this.ruleForm.startValidTime;
// 字数控制 // 字数控制
......
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