Skip to content

I
integral-mall
Commit 34f4af93 by damodmg
Options

调整样式

parent 16a94342
Showing with 35 additions and 27 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/integral-mall/static/css/app.dd991a305181070dae536527ee639d33.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/integral-mall/static/js/manifest.003beacb9c9ae622c7f2.js></script><script type=text/javascript src=/integral-mall/static/js/vendor.18cfc34dddb593b2154e.js></script><script type=text/javascript src=/integral-mall/static/js/app.f784e17355b3e3680b2c.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/integral-mall/static/css/app.c0aaac987c8ea7b696f8c5ba33f80928.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/integral-mall/static/js/manifest.003beacb9c9ae622c7f2.js></script><script type=text/javascript src=/integral-mall/static/js/vendor.18cfc34dddb593b2154e.js></script><script type=text/javascript src=/integral-mall/static/js/app.9e95d2b9e913f53ccc8b.js></script></body></html>
\ No newline at end of file
dist/static/js/app.9e95d2b9e913f53ccc8b.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.f784e17355b3e3680b2c.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/style/base/index.scss
......@@ -183,6 +183,7 @@
white-space: normal;
white-space: nowrap;
display: inline-block;
line-height:1;
}
.left-aside-contain {
......
src/assets/theme/index.css
......@@ -3975,12 +3975,13 @@
font-size: 18px;
color: #303133; }
.el-dialog__body {
padding: 30px 20px;
padding: 20px 20px 10px 20px;
color: #606266;
font-size: 14px; }
.el-dialog__footer {
padding: 20px;
padding-top: 10px;
border-top:1px solid #DCDFE6;
padding: 10px 20px;
/* padding-top: 10px; */
text-align: right;
-webkit-box-sizing: border-box;
box-sizing: border-box; }
......@@ -31812,8 +31813,8 @@
padding-left: 35px;
padding-right: 35px; }
.el-input-number.is-without-controls .el-input__inner {
padding-left: 15px;
padding-right: 15px; }
padding-left: 12px;
padding-right: 12px; }
.el-input-number.is-controls-right .el-input__inner {
padding-left: 15px;
padding-right: 42px; }
......@@ -42238,7 +42239,7 @@
font-size: 14px;
border-radius: 4px; }
.el-button + .el-button {
margin-left: 8px; }
margin-left: 4px; }
.el-button.is-round {
padding: 8px 15px; }
.el-button:hover, .el-button:focus {
......@@ -42411,21 +42412,23 @@
background-color: #fff7e8;
border-color: #feefd0; }
.el-button--danger {
color: #fff;
background-color: #f5222d;
border-color: #f5222d; }
color: #F5222D;
background-color: #F5F7FA;
border-color: #DCDFE6;
}
.el-button--danger:hover, .el-button--danger:focus {
background: #f74e57;
border-color: #f74e57;
background: #F5222D;
border-color: #F5222D;
color: #fff; }
.el-button--danger:active {
background: #dd1f29;
border-color: #dd1f29;
background: #CF1322;
border-color: #CF1322;
color: #fff;
outline: none; }
.el-button--danger.is-active {
background: #dd1f29;
border-color: #dd1f29;
background: #CF1322;
border-color: #CF1322;
color: #fff; }
/* .el-button--danger.is-disabled, .el-button--danger.is-disabled:hover, .el-button--danger.is-disabled:focus, .el-button--danger.is-disabled:active {
color: #fff;
src/views/mall/coupon/info.vue
......@@ -74,8 +74,8 @@
<el-radio :label="1">立即发布</el-radio>
<el-radio :label="2">定时发布</el-radio>
</el-radio-group>
<div class="pt8">
<el-date-picker v-if="form.releaseType ===2" v-model="form.limitTimeBegin" type="datetime" placeholder="选择日期时间"></el-date-picker>
<div class="pt8" v-if="form.releaseType ===2">
<el-date-picker v-model="form.limitTimeBegin" type="datetime" placeholder="选择日期时间"></el-date-picker>
</div>
</el-form-item>
</div>
......
src/views/mall/coupon/list.vue
......@@ -10,7 +10,7 @@
<img class="vertical-middle table__avatar--gift" :src="filterAvatar(scope.row.cardType)" width="40" height="40" />
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.proTitle || '--'}}</p>
<p class="fz13 gray">{{scope.row.proSubTitle || '--'}}</p>
<p class="fz13 gray" style="line-height:1">{{scope.row.proSubTitle || '--'}}</p>
</div>
</div>
</template>
......
src/views/mall/gift/info.vue
......@@ -70,12 +70,16 @@
<el-radio :label="3">每月</el-radio>
<el-radio :label="4">每周</el-radio>
</el-radio-group>
<div class="pt10">
<el-date-picker class="w300" v-model="form.exchangeFixDate" v-if="form.exchangeDateType === 2" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
<el-select class="w300" size="small" v-model="form.exchangeDateDayArr" v-if="form.exchangeDateType === 3" multiple placeholder="请选择">
<div class="pt8" v-if="form.exchangeDateType === 2">
<el-date-picker class="w300" v-model="form.exchangeFixDate" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</div>
<div class="pt8" v-if="form.exchangeDateType === 3">
<el-select class="w300" size="small" v-model="form.exchangeDateDayArr" multiple placeholder="请选择">
<el-option v-for="item in monthOptions" :key="item" :label="item" :value="item"></el-option>
</el-select>
<el-select class="w300" size="small" v-model="form.exchangeDateWeekArr" v-if="form.exchangeDateType === 4" multiple placeholder="请选择">
</div>
<div class="pt8" v-if="form.exchangeDateType ===4">
<el-select class="w300" size="small" v-model="form.exchangeDateWeekArr" multiple placeholder="请选择">
<el-option v-for="item in exchangeDateWeekOptions" :key="item" :label="item" :value="item"></el-option>
</el-select>
</div>
......@@ -108,8 +112,8 @@
<el-radio :label="1">立即发布</el-radio>
<el-radio :label="2">定时发布</el-radio>
</el-radio-group>
<div class="pt8">
<el-date-picker v-if="form.releaseType ===2" v-model="form.limitTimeBegin" type="datetime" placeholder="选择日期时间"></el-date-picker>
<div class="pt8" v-if="form.releaseType ===2">
<el-date-picker v-model="form.limitTimeBegin" type="datetime" placeholder="选择日期时间"></el-date-picker>
</div>
</el-form-item>
<el-form-item prop="changeType" label="兑换方式" class="is-required">
......
src/views/mall/goods/list.vue
......@@ -19,7 +19,7 @@
<img class="vertical-middle table__avatar" :src="scope.row.giftMainPic || defaultAvatar" width="60" height="60" />
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.giftName || '--'}}</p>
<p class="fz13 gray">{{scope.row.giftCategoryName || '--'}}</p>
<p class="fz13 gray" style="line-height:1">{{scope.row.giftCategoryName || '--'}}</p>
</div>
</div>
</template>
......
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