Skip to content

M
memberTag-web
Commit 77965118 by liuchenxi
Options

Merge branch 'dev' of http://git.gicdev.com/memberTag/memberTag-web into dev 

# Conflicts:
#	dist/index.html
#	dist/static/js/0.42c4e45c33c6fb22968e.js
#	dist/static/js/0.60c086b42783931baea7.js
#	dist/static/js/0.a9b02ce36e992d310699.js
#	dist/static/js/3.582bff479d79f733f4ff.js
#	dist/static/js/manifest.596b0771d5716262b397.js
parents f6ec3963 da662802
Showing with 11 additions and 10 deletions
dist/index.html
......@@ -3,4 +3,4 @@
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
document.write('<script src="//'+ host + src +'"><\/script>')
})()</script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.a5cbbcee1ab6b7d8db68.js></script><script type=text/javascript src=./static/js/vendor.437a11b55dd38965a161.js></script><script type=text/javascript src=./static/js/app.d7a1066f96d10b3363eb.js></script></body></html>
\ No newline at end of file
})()</script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.a0cbcd9d22b759efc26b.js></script><script type=text/javascript src=./static/js/vendor.437a11b55dd38965a161.js></script><script type=text/javascript src=./static/js/app.d7a1066f96d10b3363eb.js></script></body></html>
\ No newline at end of file
dist/static/js/0.a9b02ce36e992d310699.js → dist/static/js/0.1548185686d853bbabcf.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.a5cbbcee1ab6b7d8db68.js → dist/static/js/manifest.a0cbcd9d22b759efc26b.js
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var b,d,o,i=0,u=[];i<c.length;i++)d=c[i],f[d]&&u.push(f[d][0]),f[d]=0;for(b in r)Object.prototype.hasOwnProperty.call(r,b)&&(e[b]=r[b]);for(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)o=n(n.s=t[i]);return o};var c={},f={45: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:"a9b02ce36e992d310699",1:"a5b1143fb090193afa6f",2:"9d98113b216cbcf53a2d",3:"d7b0901bfc369f499fc3",4:"d4e3374bc1ee426ca4f5",5:"81f56a0ae4b5dd01f791",6:"e3a28e24af1ec314a414",7:"cbfb1c1422fe6c812024",8:"891bbc4365b8362d5195",9:"7cc1b38988e254182ad8",10:"1cbc7e505ef918253196",11:"cfa61640d1a3d8d26b48",12:"627b84a8deefd3515526",13:"b1c66603efca1c3d5203",14:"f47556c110ffa3b79476",15:"66b858758de795a518e7",16:"214006afa9e3797a19f2",17:"e58186116f6395e91ba5",18:"a9a02491ce9179330fb7",19:"0a8152038db862b921a1",20:"571d5cc9a72e3be56ae7",21:"e8e43180f375b2c4d576",22:"cc7e43a2ae755ddbe6ef",23:"be4c36f917ab76d89c9b",24:"cc91519e3ae3fc4ce4d7",25:"41bef842ecf428d6e38a",26:"2997b01bd67ae24fbddb",27:"b6fce1a56e79f22cd89a",28:"d1a6a55041b933d89b84",29:"04fe874a6682f3f430a1",30:"0c139dc6a07c1592ec93",31:"36f07ba4af45385db792",32:"6cb39db35ea2b6ae26c0",33:"5886ebe968e418c588d8",34:"a84e50a47992b803758b",35:"adb472df1a778248332e",36:"5732c76e32894de02570",37:"1235370e5f74f65f2d45",38:"b71e1f4f3b700ad59435",39:"12a7afbe7c4070896c8b",40:"781d7828660c56b1f9c4",41:"548c2d0480d5836205a3",42:"22bb97fdb8af2923fd97"}[e]+".js";var b=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(b);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=d,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}}([]);
\ No newline at end of file
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var b,d,o,i=0,u=[];i<c.length;i++)d=c[i],f[d]&&u.push(f[d][0]),f[d]=0;for(b in r)Object.prototype.hasOwnProperty.call(r,b)&&(e[b]=r[b]);for(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)o=n(n.s=t[i]);return o};var c={},f={45: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:"1548185686d853bbabcf",1:"a5b1143fb090193afa6f",2:"9d98113b216cbcf53a2d",3:"d7b0901bfc369f499fc3",4:"d4e3374bc1ee426ca4f5",5:"81f56a0ae4b5dd01f791",6:"e3a28e24af1ec314a414",7:"cbfb1c1422fe6c812024",8:"891bbc4365b8362d5195",9:"7cc1b38988e254182ad8",10:"1cbc7e505ef918253196",11:"cfa61640d1a3d8d26b48",12:"627b84a8deefd3515526",13:"b1c66603efca1c3d5203",14:"f47556c110ffa3b79476",15:"66b858758de795a518e7",16:"214006afa9e3797a19f2",17:"e58186116f6395e91ba5",18:"a9a02491ce9179330fb7",19:"0a8152038db862b921a1",20:"571d5cc9a72e3be56ae7",21:"e8e43180f375b2c4d576",22:"cc7e43a2ae755ddbe6ef",23:"be4c36f917ab76d89c9b",24:"cc91519e3ae3fc4ce4d7",25:"41bef842ecf428d6e38a",26:"2997b01bd67ae24fbddb",27:"b6fce1a56e79f22cd89a",28:"d1a6a55041b933d89b84",29:"04fe874a6682f3f430a1",30:"0c139dc6a07c1592ec93",31:"36f07ba4af45385db792",32:"6cb39db35ea2b6ae26c0",33:"5886ebe968e418c588d8",34:"a84e50a47992b803758b",35:"adb472df1a778248332e",36:"5732c76e32894de02570",37:"1235370e5f74f65f2d45",38:"b71e1f4f3b700ad59435",39:"12a7afbe7c4070896c8b",40:"781d7828660c56b1f9c4",41:"548c2d0480d5836205a3",42:"22bb97fdb8af2923fd97"}[e]+".js";var b=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(b);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=d,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}}([]);
\ No newline at end of file
src/components/tagDetail/mixin/index.js
......@@ -573,17 +573,18 @@ export default {
tagValue.val[0].data.value = that.templateData[0].dateRangeValue.join(',');
that.templateData[0].timeInput = '';
if (code === 'tag019' || code === 'tag020' || code === 'tag015') {
if (code === 'tag020') {
// 兼容后端，先使用硬编码
if (that.tagData.tagId == 'f75b8053fe744b2a9a366886bc40612a') {
tagValue.val[0].data.value = that.templateData[0].dateRangeValue.map(el => {
return el.split(' ')[0];
}).join(',').replace(/-/g, '')
console.log(tagValue.val[0].data.value);
} else {
tagValue.val[0].data.value = that.templateData[0].dateRangeValue
.join(',')
.replace(/-/g, '')
.replace(/:/g, '')
.replace(/\s+/g, '');
tagValue.val[0].data.value = that.templateData[0].dateRangeValue
.join(',')
.replace(/-/g, '')
.replace(/:/g, '')
.replace(/\s+/g, '');
}
}
that.postTemplateData.selectedVal.push(that.templateData[0].dateRangeValue[0].split(' ')[0] + '至' + that.templateData[0].dateRangeValue[1].split(' ')[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