Skip to content

H
haoban-3
Commit 59d48f3a by caoyanzhi
Options

Merge branch 'feature/ui调整' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/css/app.2d7d14a601ce26fdc1e7b84a3135ca40.css
parents 6ec2d050 9b0638a8
Showing with 98 additions and 40 deletions
dist/index.html
<<<<<<< HEAD
<!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.69.css><link rel="shortcut icon" href=./favicon.ico><link href=./static/css/app.2d7d14a601ce26fdc1e7b84a3135ca40.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script>(function() {
=======
<<<<<<< HEAD
<!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.69.css><link rel="shortcut icon" href=./favicon.ico><link href=./static/css/app.bb0618f0f312f474f7be36d0a4692e3e.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script>(function() {
=======
<!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.69.css><link rel="shortcut icon" href=./favicon.ico><link href=./static/css/app.31919e20448841e1122c1752f7d50201.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script>(function() {
>>>>>>> master
>>>>>>> feature/ui调整
var src = '/component/static/import-component.js?timestrap='+ new Date().getTime();
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/pagination.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/common.1.0.3.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-data.1.0.11.js></script><script type=text/javascript src=./static/js/manifest.8365f9d74cb734000d9d.js></script><script type=text/javascript src=./static/js/vendor.06dddcebe00088992b67.js></script><script type=text/javascript src=./static/js/app.fa9e39869753ccd0f576.js></script></body></html>
\ No newline at end of file
<<<<<<< HEAD
})()</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/common.1.0.3.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-data.1.0.11.js></script><script type=text/javascript src=./static/js/manifest.8365f9d74cb734000d9d.js></script><script type=text/javascript src=./static/js/vendor.06dddcebe00088992b67.js></script><script type=text/javascript src=./static/js/app.fa9e39869753ccd0f576.js></script></body></html>
=======
<<<<<<< HEAD
})()</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/common.1.0.3.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-data.1.0.11.js></script><script type=text/javascript src=./static/js/manifest.4148146053428faa20ee.js></script><script type=text/javascript src=./static/js/vendor.06dddcebe00088992b67.js></script><script type=text/javascript src=./static/js/app.fa9e39869753ccd0f576.js></script></body></html>
=======
})()</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/common.1.0.3.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-data.1.0.11.js></script><script type=text/javascript src=./static/js/manifest.96dbdf9a756f0d1bffea.js></script><script type=text/javascript src=./static/js/vendor.06dddcebe00088992b67.js></script><script type=text/javascript src=./static/js/app.c8e762b08a81fbf5ada7.js></script></body></html>
>>>>>>> master
>>>>>>> feature/ui调整
dist/static/css/app.2d7d14a601ce26fdc1e7b84a3135ca40.css
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.31919e20448841e1122c1752f7d50201.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.96dbdf9a756f0d1bffea.js 0 → 100644
!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={100: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:"101b4c05181ee9a8c51f",1:"80ec7107adf684998411",2:"8ba175a78e79f26b3844",3:"00d4df818d4681d0473a",4:"44c9f836b554256b37bc",5:"32e8765bf4e840ad4eb6",6:"6b7479e9a03291c03b4f",7:"d30382e9c49b87068873",8:"a620d3643ce311c5e657",9:"fc369b3655331187f8ca",10:"51508b59ad693f591b04",11:"be5eee5e00c096a90936",12:"d27fce486098d2f011ec",13:"baab4a17bc8dbc86b144",14:"34b7414d5c6842dcd713",15:"28fbcd62173fe42e5e94",16:"25826ca15fb1347bb7a8",17:"fcc67eed2082b7438106",18:"27405a64f4d5d8cdd880",19:"b2b0a38dd21a2dc61d2d",20:"84f5701ad4001e9618c8",21:"23ffd0d46789367f101c",22:"b78eccebc9ba85f39ccf",23:"ca251b7e87315435a911",24:"9b6c0ece181d5be053df",25:"53270642e9a6c0439812",26:"98090da394d2fcd7acbd",27:"b7471e7b7eb30abc3034",28:"bb65ad848fffd7ecfc24",29:"e1122bb287ca963098cf",30:"1a2c3d34bc94fd71a05b",31:"0aee8021373e1f3ccde5",32:"21525729585fc8d2e630",33:"0b6b927963269f9037d4",34:"0ef52d51a93d842168b5",35:"fa3d765c7c6326203e6e",36:"49089d4a8c107c795f53",37:"0e02949e809d3716e48b",38:"cf6466abfb8c2f8fd5d3",39:"cf37cb7b062f3b2048aa",40:"1bb2adbc9110e3fb7d36",41:"ec35a487ff5a3d46f5b5",42:"d8cd09ccfcf0f481f846",43:"f7328443e03087a27ce8",44:"a95ec2eda8d3892e8afc",45:"05c2eb611d4bc3f55216",46:"18e93bf5eb992fd93bce",47:"68de6aae2a6b36c82942",48:"c4b0a71fb054acd9f967",49:"8724e88106c017fc7211",50:"bc0f61aed53904bd6ecc",51:"d11e3ed95aaf0b42299c",52:"7e2460e6eb686c63f790",53:"73eb08b150774b97127d",54:"38f3f406f6ba5206e12f",55:"f8df3b8bba6bf5727c39",56:"1bdcc2e21c9e835d7157",57:"44bf0b8144956f4e8ff3",58:"c36b966a6ad6f09d0a62",59:"c28752d0234c9c700c8e",60:"f47a2c69bdd03ca143c6",61:"53f113f29db81561850e",62:"e0acd353801c964887f4",63:"24e68f18def56fff6028",64:"73a434a6c4f7ea697f1a",65:"de7844a4f4245d5de8f7",66:"10880f49f7a4b69458b2",67:"6d0babb479aaac3ec64a",68:"2d41b4f555111cb332d3",69:"927cc6261b733e4642b2",70:"39942f20a1e4813777f9",71:"30525d3db11da1766b5e",72:"6ecaafb4bcdf06ac310d",73:"0d5f0e677479535a1535",74:"fc704c592f3e9bf698c1",75:"87f022392f8e84df3704",76:"d2ca99025f566c98e19c",77:"bdc518dcddee0deab7f2",78:"8ed7ae9ddb04323fa0b9",79:"766c7ba8fae704945a30",80:"ffb4d21011fd99430e20",81:"175526175e2f6744081a",82:"0028cea16a99946ffd4c",83:"d160e45d663105bd2d06",84:"dc6820b3cfc128b399cf",85:"1a0f1b1da12d5c487d25",86:"6c9807a26107be4898ba",87:"9f1af55bb7bde32f9a46",88:"9068dd36ffb4e9606749",89:"0c8825a95fa739332497",90:"ee9b05b9ad7abdb1d799",91:"eab915a49965841f478b",92:"5680cc42a7ea6fdc810a",93:"fd9ff03a2dba3a3fda25",94:"73caa3cdd8e44ba62f92",95:"dc32d70e4a6871a2896c",96:"9e786c2c26186f5a16b8",97:"bb4f298b513de09f9055"}[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
index.html
......@@ -13,7 +13,7 @@
<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.69.css" />
<!-- <link rel="stylesheet" type="text/css" href="//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.69.css" /> -->
</head>
......@@ -26,11 +26,10 @@
var src = '/component/static/import-component.js?timestrap='+ new Date().getTime();
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/pagination.1.0.10.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/common.1.0.3.js"></script>
<!-- <script src="//web-1251519181.file.myqcloud.com/components/common.1.0.3.js"></script> -->
<script src="//web-1251519181.file.myqcloud.com/components/export-data.1.0.11.js"></script>
</body>
......
src/main.js
......@@ -22,7 +22,7 @@ import '../static/css/index.less';
// import 'element-ui/lib/theme-chalk/index.css';
import '../static/font/iconfont.css';
import '../static/font//iconfont.js'
import '../theme/index.css';
// import '../theme/index.css';
import '../static/css/dialog.css';
import filters from './filters/index.js';
......
src/views/apps/customerApp/myCustomerList.vue
......@@ -42,7 +42,7 @@
<el-table-column width="25">
<template #header>
<el-dropdown style="line-height: 10px; padding: 0; margin-left: -15px; transform: translateY(4px); -webkit-transform: translateY(4px);" placement="bottom-start">
<span class="el-dropdown-link"><i class="iconfont icongengduo"></i> </span>
<span class="el-dropdown-link"><i class="iconfont icongengduo"> </i> </span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item> <el-checkbox v-model="selectRadio" :true-label="0" :false-label="2" @change="handleCommand">选择当页</el-checkbox></el-dropdown-item>
<el-dropdown-item> <el-checkbox v-model="selectRadio" :true-label="1" :false-label="2" @change="handleCommand">选择全部</el-checkbox></el-dropdown-item>
......
src/views/apps/quota/monthTask.vue
......@@ -16,7 +16,7 @@
<el-option v-for="item in storeStatusOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
</el-select> -->
<gic-select-group :brandId="brandId" class="m-l-10" :width="213" :selectData="conditionObj.storeGroupIds" @checkGroupIds="checkGroupIds"> </gic-select-group>
<el-date-picker style="width:310px" class="m-l-10" v-model="conditionObj.dateRange" @change="changeDate" :editable="false" :value-format="'yyyy-MM'" type="monthrange" align="right" unlink-panels range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"> </el-date-picker>
<el-date-picker style="width:310px; vertical-align: middle;" class="m-l-10" v-model="conditionObj.dateRange" @change="changeDate" :editable="false" :value-format="'yyyy-MM'" type="monthrange" align="right" unlink-panels range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"> </el-date-picker>
</div>
<div class="table-condition-right">
<el-button type="primary" :loading="loadingBtn" @click="exportExcel">导出</el-button>
......
static/css/public.css
......@@ -1340,3 +1340,77 @@ button.el-button--danger.is-plain {
.mult-line-select .line-20 {
line-height: 20px;
}
/**
*表格多选项禁用
*/
.cell-disabled{
pointer-events: none;
opacity: 0.8;
font-size: 0;
}
.font-size-zero{
font-size: 0;
}
.damolish .cell-disabled .el-checkbox.is-checked .el-checkbox__input:not(.is-disabled) .el-checkbox__inner{
background-color: #F7F8FA;
border-color:#C4C6CF;
}
.damolish .cell-disabled .el-checkbox .el-checkbox__input .el-checkbox__inner::after{
border-color:#C0C4CC;
}
@keyframes checkboxClick{
0% {
box-shadow: 0 0 0 3px rgba(47, 84, 237, 0.1);
background-color:#F7F8FA ;
}
100% {
box-shadow: 0 0 0 7px rgba(47, 84, 237, 0);
}
}
.damolish .cell-disabled .el-checkbox__input.is-checked:not(.is-disabled) .el-checkbox__inner {
animation: 0.5s checkboxClick;
}
/**
ui调整
*/
.el-select {
display: inline-block;
position: relative;
vertical-align: middle;
}
.el-dropdown-menu__item {
list-style: none;
line-height: 36px;
padding: 0 20px;
margin: 0;
font-size: 14px;
color: #606266;
cursor: pointer;
outline: none;
}
.el-input {
vertical-align: middle
}
.el-table__empty-block .el-table__empty-text::before {
content: "";
display: block;
margin: 0 auto 10px;
width: 50px;
height: 50px;
background: url(../img/no-data_icon1.png) no-repeat center;
background-size: contain
}
.damolish .el-table__empty-block .el-table__empty-text {
line-height: normal;
}
.damolish .el-tabs .el-tabs__header.is-top .el-tabs__nav-wrap .el-tabs__item {
padding: 0 20px;
font-weight: 400;
}
.damolish .el-table th .cell {
padding-right: 0;
font-size: 14px;
font-weight: 500;
color: #303133;
}
theme/index.css
......@@ -81851,34 +81851,3 @@
margin: 0 auto;
border-radius: 18px;
}
/**
*表格多选项禁用
*/
.cell-disabled{
pointer-events: none;
opacity: 0.8;
font-size: 0;
}
.font-size-zero{
font-size: 0;
}
.damolish .cell-disabled .el-checkbox.is-checked .el-checkbox__input:not(.is-disabled) .el-checkbox__inner{
background-color: #F7F8FA;
border-color:#C4C6CF;
}
.damolish .cell-disabled .el-checkbox .el-checkbox__input .el-checkbox__inner::after{
border-color:#C0C4CC;
}
@keyframes checkboxClick{
0% {
box-shadow: 0 0 0 3px rgba(47, 84, 237, 0.1);
background-color:#F7F8FA ;
}
100% {
box-shadow: 0 0 0 7px rgba(47, 84, 237, 0);
}
}
.damolish .cell-disabled .el-checkbox__input.is-checked:not(.is-disabled) .el-checkbox__inner {
animation: 0.5s checkboxClick;
}
\ No newline at end of file
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