Skip to content

M
memberTag-web
Commit 77541adb by 无尘
Options

style: 样式优化

parent 446b43d3
Showing with 57 additions and 21 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/app.f43c7866b98564f5df54281fe358e3b2.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.c69b4a6de0f8d3782293.js></script><script type=text/javascript src=./static/js/vendor.fc37a390f2e85c6e1e79.js></script><script type=text/javascript src=./static/js/app.d13955f3f2071e977289.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>GIC-会员标签</title><link href=./static/css/app.893b6fe733034358d010d6b21864434b.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.8dfc6311c4d571d7bb63.js></script><script type=text/javascript src=./static/js/vendor.fc37a390f2e85c6e1e79.js></script><script type=text/javascript src=./static/js/app.7fe33ba569497a320b2a.js></script></body></html>
\ No newline at end of file
dist/static/js/0.6f3320247ee0a78e45ba.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/0.6f3320247ee0a78e45ba.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/0.f1d8c36ff5e40c4f5451.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.f1d8c36ff5e40c4f5451.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.8f36e6163f1ba596a2ef.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.997de4dd6e927c0460cd.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.c69b4a6de0f8d3782293.js → dist/static/js/manifest.8dfc6311c4d571d7bb63.js
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,f){for(var o,d,i,u=0,b=[];u<r.length;u++)d=r[u],t[d]&&b.push(t[d][0]),t[d]=0;for(o in a)Object.prototype.hasOwnProperty.call(a,o)&&(e[o]=a[o]);for(n&&n(r,a,f);b.length;)b.shift()();if(f)for(u=0;u<f.length;u++)i=c(c.s=f[u]);return i};var r={},t={28: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],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,c.nc&&f.setAttribute("nonce",c.nc),f.src=c.p+"static/js/"+e+"."+{0:"6f3320247ee0a78e45ba",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"e7a05e0e57aa607dc4f6",6:"6589b4c1bb12f24b467b",7:"6b21f62c32a89ab4f409",8:"997de4dd6e927c0460cd",9:"d716008e2f93b67301d2",10:"c71c26ffe9e929740644",11:"e85b90356083e5b3e250",12:"efe5e750726bc1eaf8fb",13:"e7b569feaf8d0ff93da9",14:"c4695f2a34ee0c60de49",15:"28dc596367e11cc70e83",16:"b3d1d6d3132089954cfe",17:"42f1de0487f2ca350c96",18:"1e5e4eacf2a34fe1cec4",19:"70b9aa6da12a3f19d4ad",20:"1ba50523b27339ca740c",21:"74e7d098970089288d5a",22:"73fdff74fd8628bfc9d7",23:"f810525966fe12d399a5",24:"0a6ad54825d8896004c4",27:"02b5e0be03d9340bd130"}[e]+".js";var o=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(o);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return f.onerror=f.onload=d,a.appendChild(f),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="./",c.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.c69b4a6de0f8d3782293.js.map
\ No newline at end of file
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,f,a){for(var o,d,i,u=0,b=[];u<r.length;u++)d=r[u],t[d]&&b.push(t[d][0]),t[d]=0;for(o in f)Object.prototype.hasOwnProperty.call(f,o)&&(e[o]=f[o]);for(n&&n(r,f,a);b.length;)b.shift()();if(a)for(u=0;u<a.length;u++)i=c(c.s=a[u]);return i};var r={},t={28: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 f=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,c.nc&&a.setAttribute("nonce",c.nc),a.src=c.p+"static/js/"+e+"."+{0:"f1d8c36ff5e40c4f5451",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"e7a05e0e57aa607dc4f6",6:"6589b4c1bb12f24b467b",7:"8f36e6163f1ba596a2ef",8:"55ea3846b0a0cacdd46d",9:"d716008e2f93b67301d2",10:"c71c26ffe9e929740644",11:"e85b90356083e5b3e250",12:"efe5e750726bc1eaf8fb",13:"e7b569feaf8d0ff93da9",14:"c4695f2a34ee0c60de49",15:"28dc596367e11cc70e83",16:"b3d1d6d3132089954cfe",17:"42f1de0487f2ca350c96",18:"1e5e4eacf2a34fe1cec4",19:"70b9aa6da12a3f19d4ad",20:"1ba50523b27339ca740c",21:"74e7d098970089288d5a",22:"73fdff74fd8628bfc9d7",23:"f810525966fe12d399a5",24:"0a6ad54825d8896004c4",27:"02b5e0be03d9340bd130"}[e]+".js";var o=setTimeout(d,12e4);function d(){a.onerror=a.onload=null,clearTimeout(o);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=d,f.appendChild(a),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="./",c.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.8dfc6311c4d571d7bb63.js.map
\ No newline at end of file
src/components/tagShortDetail.vue
......@@ -134,7 +134,7 @@
</div>
<div class="m-t-20">
<label class="inline-block w-98"></label>
<el-radio v-model="parent.timeChecked" label="1"> 当{{ parent.timeRadio==1?'天':parent.timeRadio==2?'月':'年' }}</el-radio>
<el-radio v-model="parent.timeChecked" label="1" @change="currentDayChange($event,parent)"> 当{{ parent.timeRadio==1?'天':parent.timeRadio==2?'月':'年' }}</el-radio>
<!-- <el-checkbox v-model="parent.timeChecked"><label class="inline-block middle">当{{parent.timeRadio==1?'天':parent.timeRadio==2?'月':'年'}}</label></el-checkbox> -->
</div>
<div class="m-t-20">
......@@ -145,7 +145,7 @@
<el-option label="最近" value="1"></el-option>
<el-option label="之后" value="2"></el-option>
</el-select>
<el-input v-model="parent.timeInput" placeholder="请输入" class="w-90" @blur="(value) => toEditDateInput(value,parent.timeRadio,parent)"></el-input>
<el-input v-model="parent.timeInput" placeholder="请输入" class="w-90" @blur="(value) => toEditDateInput(value,parent.timeRadio,parent)" :disabled="parent.timeChecked==1? true : false"></el-input>
<template v-if="parent.timeRadio==1">
<label class="inline-block middle label-unit m-l-8">天</label>
<label class="inline-block middle label-tip">正整数，最大365</label>
......@@ -423,7 +423,7 @@
</div>
<div class="m-t-20">
<label class="inline-block w-98"></label>
<el-radio v-model="parent.timeChecked" label="1"> 当{{ parent.timeRadio==1?'天':'月' }}</el-radio>
<el-radio v-model="parent.timeChecked" label="1" @change="currentDayChange($event,parent)"> 当{{ parent.timeRadio==1?'天':'月' }}</el-radio>
<!-- <el-checkbox v-model="parent.timeChecked"><label class="inline-block middle">当 {{parent.timeRadio==1?'天':'月'}}</label></el-checkbox> -->
</div>
<div class="m-t-20">
......@@ -434,7 +434,7 @@
<el-option label="最近" value="1"></el-option>
<el-option label="之后" value="2"></el-option>
</el-select>
<el-input v-model="parent.timeInput" placeholder="请输入" class="w-90" @blur="(value) => toEditDateInput(value,parent.timeRadio,parent)"></el-input>
<el-input v-model="parent.timeInput" placeholder="请输入" class="w-90" @blur="(value) => toEditDateInput(value,parent.timeRadio,parent)" :disabled="parent.timeChecked==1? true : false"></el-input>
<template v-if="parent.timeRadio==1">
<label class="inline-block middle label-unit m-l-8">天</label>
<label class="inline-block middle label-tip">正整数，最大365</label>
......@@ -498,7 +498,7 @@
</div>
<div class="m-t-20">
<label class="inline-block w-98"></label>
<el-radio v-model="parent.timeChecked" label="1"> 当{{ parent.timeRadio==1?'天':parent.timeRadio==2?'月':'年' }}</el-radio>
<el-radio v-model="parent.timeChecked" label="1" @change="currentDayChange($event,parent)"> 当{{ parent.timeRadio==1?'天':parent.timeRadio==2?'月':'年' }}</el-radio>
<!-- <el-checkbox v-model="parent.timeChecked"><label class="inline-block middle">当{{parent.timeRadio==1?'天':parent.timeRadio==2?'月':'年'}}</label></el-checkbox> -->
</div>
<div class="m-t-20">
......@@ -509,7 +509,7 @@
<el-option label="最近" value="1"></el-option>
<el-option label="之后" value="2"></el-option>
</el-select>
<el-input v-model="parent.timeInput" placeholder="请输入" class="w-90" @blur="(value) => toEditDateInput(value,parent.timeRadio,parent)"></el-input>
<el-input v-model="parent.timeInput" placeholder="请输入" class="w-90" @blur="(value) => toEditDateInput(value,parent.timeRadio,parent)" :disabled="parent.timeChecked==1? true : false"></el-input>
<template v-if="parent.timeRadio==1">
<label class="inline-block middle label-unit m-l-8">天</label>
<label class="inline-block middle label-tip">正整数，最大365</label>
......@@ -563,7 +563,7 @@
</div>
<div class="m-t-20">
<label class="inline-block w-98"></label>
<el-radio v-model="parent.timeChecked" label="1"> 当{{ parent.timeRadio==1?'天':parent.timeRadio==2?'月':'年' }}</el-radio>
<el-radio v-model="parent.timeChecked" label="1" @change="currentDayChange($event,parent)"> 当{{ parent.timeRadio==1?'天':parent.timeRadio==2?'月':'年' }}</el-radio>
<!-- <el-checkbox v-model="parent.timeChecked"><label class="inline-block middle">当{{parent.timeRadio==1?'天':parent.timeRadio==2?'月':'年'}}</label></el-checkbox> -->
</div>
<div class="m-t-20">
......@@ -573,7 +573,7 @@
<el-select v-model="parent.timeSelect" placeholder="请选择" class="w-86 m-l-8">
<el-option label="最近" value="1"></el-option>
</el-select>
<el-input v-model="parent.timeInput" placeholder="请输入" class="w-90" @blur="(value) => toEditDateInput(value,parent.timeRadio,parent)"></el-input>
<el-input v-model="parent.timeInput" placeholder="请输入" class="w-90" @blur="(value) => toEditDateInput(value,parent.timeRadio,parent)" :disabled="parent.timeChecked==1? true : false"></el-input>
<template v-if="parent.timeRadio==1">
<label class="inline-block middle label-unit m-l-8">天</label>
<label class="inline-block middle label-tip">正整数，最大365</label>
......@@ -1159,6 +1159,7 @@
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].dateRangeValue.join(',');
that.templateData[0].timeInput = ''
if (code === 'tag019') {
tagValue.val[0].data.value = that.templateData[0].dateRangeValue.join(',').replace(/-/g,'').replace(/:/g,'').replace(/\s+/g,'')
}
......@@ -1177,6 +1178,7 @@
}
tagValue.val[0].data.value = "1";
that.postTemplateData.selectedVal.push('当天');
that.templateData[0].timeInput = ''
}
// 最近/之后
if (that.templateData[0].timeChecked == 2) {
......@@ -1214,6 +1216,7 @@
}
tagValue.val[0].data.value = "1";
that.postTemplateData.selectedVal.push('当月');
that.templateData[0].timeInput = ''
}
// 最近/之后
if (that.templateData[0].timeChecked == 2) {
......@@ -1250,6 +1253,7 @@
}
tagValue.val[0].data.value = "1";
that.postTemplateData.selectedVal.push('当年');
that.templateData[0].timeInput = ''
}
// 最近/之后
if (that.templateData[0].timeChecked == 2) {
......@@ -1293,6 +1297,7 @@
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].monthDayRange.join(',')
that.templateData[0].timeInput = ''
that.postTemplateData.selectedVal.push(`${that.templateData[0].monthDayRange[0]} 至 ${that.templateData[0].monthDayRange[1]}`)
}
if (code === 'tag015' && that.templateData.length === 1 && that.templateData[0].radio == 2){
......@@ -1307,6 +1312,7 @@
}
tagValue.val[0].data.value = "1";
that.postTemplateData.selectedVal.push('当天');
that.templateData[0].timeInput = ''
}
// 最近/之后
if (that.templateData[0].timeChecked == 2) {
......@@ -1343,6 +1349,7 @@
}
tagValue.val[0].data.value = "1";
that.postTemplateData.selectedVal.push('当月');
that.templateData[0].timeInput = ''
}
// 最近/之后
if (that.templateData[0].timeChecked == 2) {
......@@ -1693,6 +1700,17 @@
},
/**
* 天/月/年 当天改变
*/
currentDayChange(e,parent) {
const that = this
console.log(e)
if (e) {
parent.timeInput = '';
}
},
/**
* 天/月/年输入
*/
toEditDateInput(e,radio,parent) {
......
src/view/myTag/myTagDetail.vue
......@@ -68,7 +68,7 @@
</div>
<div class="m-t-20">
<label class="inline-block w-98"></label>
<el-radio v-model="parent.timeChecked" label="1"> 当{{ parent.timeRadio==1?'天':parent.timeRadio==2?'月':'年' }}</el-radio>
<el-radio v-model="parent.timeChecked" label="1" @change="currentDayChange($event,parent)"> 当{{ parent.timeRadio==1?'天':parent.timeRadio==2?'月':'年' }}</el-radio>
<!-- <el-checkbox v-model="parent.timeChecked"><label class="inline-block middle">当{{parent.timeRadio==1?'天':parent.timeRadio==2?'月':'年'}}</label></el-checkbox> -->
</div>
<div class="m-t-20">
......@@ -79,7 +79,7 @@
<el-option label="最近" value="1"></el-option>
<el-option label="之后" value="2"></el-option>
</el-select>
<el-input v-model="parent.timeInput" placeholder="请输入" class="w-90" @blur="(value) => toEditDateInput(value,parent.timeRadio,parent)"></el-input>
<el-input v-model="parent.timeInput" placeholder="请输入" class="w-90" @blur="(value) => toEditDateInput(value,parent.timeRadio,parent)" :disabled="parent.timeChecked==1? true : false"></el-input>
<template v-if="parent.timeRadio==1">
<label class="inline-block middle label-unit m-l-8">天</label>
<label class="inline-block middle label-tip">正整数，最大365</label>
......@@ -355,7 +355,7 @@
</div>
<div class="m-t-20">
<label class="inline-block w-98"></label>
<el-radio v-model="parent.timeChecked" label="1"> 当{{ parent.timeRadio==1?'天':'月' }}</el-radio>
<el-radio v-model="parent.timeChecked" label="1" @change="currentDayChange($event,parent)"> 当{{ parent.timeRadio==1?'天':'月' }}</el-radio>
<!-- <el-checkbox v-model="parent.timeChecked"><label class="inline-block middle">当 {{parent.timeRadio==1?'天':'月'}}</label></el-checkbox> -->
</div>
<div class="m-t-20">
......@@ -366,7 +366,7 @@
<el-option label="最近" value="1"></el-option>
<el-option label="之后" value="2"></el-option>
</el-select>
<el-input v-model="parent.timeInput" placeholder="请输入" class="w-90" @blur="(value) => toEditDateInput(value,parent.timeRadio,parent)"></el-input>
<el-input v-model="parent.timeInput" placeholder="请输入" class="w-90" @blur="(value) => toEditDateInput(value,parent.timeRadio,parent)" :disabled="parent.timeChecked==1? true : false"></el-input>
<template v-if="parent.timeRadio==1">
<label class="inline-block middle label-unit m-l-8">天</label>
<label class="inline-block middle label-tip">正整数，最大365</label>
......@@ -428,7 +428,7 @@
</div>
<div class="m-t-20">
<label class="inline-block w-98"></label>
<el-radio v-model="parent.timeChecked" label="1"> 当{{ parent.timeRadio==1?'天':parent.timeRadio==2?'月':'年' }}</el-radio>
<el-radio v-model="parent.timeChecked" label="1" @change="currentDayChange($event,parent)"> 当{{ parent.timeRadio==1?'天':parent.timeRadio==2?'月':'年' }}</el-radio>
<!-- <el-checkbox v-model="parent.timeChecked"><label class="inline-block middle">当{{parent.timeRadio==1?'天':parent.timeRadio==2?'月':'年'}}</label></el-checkbox> -->
</div>
<div class="m-t-20">
......@@ -439,7 +439,7 @@
<el-option label="最近" value="1"></el-option>
<el-option label="之后" value="2"></el-option>
</el-select>
<el-input v-model="parent.timeInput" placeholder="请输入" class="w-90" @blur="(value) => toEditDateInput(value,parent.timeRadio,parent)"></el-input>
<el-input v-model="parent.timeInput" placeholder="请输入" class="w-90" @blur="(value) => toEditDateInput(value,parent.timeRadio,parent)" :disabled="parent.timeChecked==1? true : false"></el-input>
<template v-if="parent.timeRadio==1">
<label class="inline-block middle label-unit m-l-8">天</label>
<label class="inline-block middle label-tip">正整数，最大365</label>
......@@ -491,7 +491,7 @@
</div>
<div class="m-t-20">
<label class="inline-block w-98"></label>
<el-radio v-model="parent.timeChecked" label="1"> 当{{ parent.timeRadio==1?'天':parent.timeRadio==2?'月':'年' }}</el-radio>
<el-radio v-model="parent.timeChecked" label="1" @change="currentDayChange($event,parent)"> 当{{ parent.timeRadio==1?'天':parent.timeRadio==2?'月':'年' }}</el-radio>
<!-- <el-checkbox v-model="parent.timeChecked"><label class="inline-block middle">当{{parent.timeRadio==1?'天':parent.timeRadio==2?'月':'年'}}</label></el-checkbox> -->
</div>
<div class="m-t-20">
......@@ -501,7 +501,7 @@
<el-select v-model="parent.timeSelect" placeholder="请选择" class="w-86 m-l-8">
<el-option label="最近" value="1"></el-option>
</el-select>
<el-input v-model="parent.timeInput" placeholder="请输入" class="w-90" @blur="(value) => toEditDateInput(value,parent.timeRadio,parent)"></el-input>
<el-input v-model="parent.timeInput" placeholder="请输入" class="w-90" @blur="(value) => toEditDateInput(value,parent.timeRadio,parent)" :disabled="parent.timeChecked==1? true : false"></el-input>
<template v-if="parent.timeRadio==1">
<label class="inline-block middle label-unit m-l-8">天</label>
<label class="inline-block middle label-tip">正整数，最大365</label>
......@@ -1113,6 +1113,8 @@ import qs from 'qs';
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].dateRangeValue.join(',');
that.templateData[0].timeInput = '';
if (code === 'tag019') {
tagValue.val[0].data.value = that.templateData[0].dateRangeValue.join(',').replace(/-/g,'').replace(/:/g,'').replace(/\s+/g,'')
}
......@@ -1131,6 +1133,7 @@ import qs from 'qs';
}
tagValue.val[0].data.value = "1";
that.postTemplateData.selectedVal.push('当天');
that.templateData[0].timeInput = ''
}
// 最近/之后
if (that.templateData[0].timeChecked == 2) {
......@@ -1168,6 +1171,7 @@ import qs from 'qs';
}
tagValue.val[0].data.value = "1";
that.postTemplateData.selectedVal.push('当月');
that.templateData[0].timeInput = '';
}
// 最近/之后
if (that.templateData[0].timeChecked == 2) {
......@@ -1204,6 +1208,7 @@ import qs from 'qs';
}
tagValue.val[0].data.value = "1";
that.postTemplateData.selectedVal.push('当年');
that.templateData[0].timeInput = '';
}
// 最近/之后
if (that.templateData[0].timeChecked == 2) {
......@@ -1261,6 +1266,7 @@ import qs from 'qs';
}
tagValue.val[0].data.value = "1";
that.postTemplateData.selectedVal.push('当天');
that.templateData[0].timeInput = '';
}
// 最近/之后
if (that.templateData[0].timeChecked == 2) {
......@@ -1297,6 +1303,7 @@ import qs from 'qs';
}
tagValue.val[0].data.value = "1";
that.postTemplateData.selectedVal.push('当月');
that.templateData[0].timeInput = '';
}
// 最近/之后
if (that.templateData[0].timeChecked == 2) {
......@@ -1625,6 +1632,17 @@ import qs from 'qs';
},
/**
* 天/月/年 当天改变
*/
currentDayChange(e,parent) {
const that = this
console.log(e)
if (e) {
parent.timeInput = '';
}
},
/**
* 天/月/年输入
*/
toEditDateInput(e,radio,parent) {
......
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