Skip to content

I
integral-mall
Commit 85c35c55 by zhangmeng
Options

改bug

parent a995e236
Showing with 14 additions and 13 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.5d5432d8578c9f793c25928617d19674.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.567b5be279b1403c5cc7.js></script><script type=text/javascript src=/integral-mall/static/js/app.cdfd4afc7e8bad3ff5ac.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.666b41302a48f2391024def3e10cee17.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.567b5be279b1403c5cc7.js></script><script type=text/javascript src=/integral-mall/static/js/app.92be8ce46f1447df154d.js></script></body></html>
\ No newline at end of file
dist/static/css/app.5d5432d8578c9f793c25928617d19674.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.666b41302a48f2391024def3e10cee17.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.92be8ce46f1447df154d.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.cdfd4afc7e8bad3ff5ac.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/theme/index.css
......@@ -9243,7 +9243,7 @@
box-shadow: 0 0 2px 2px #1890ff; }
.el-radio__label {
font-size: 14px;
padding-left: 10px; }
padding-left: 8px; }
/* BEM support Func
-------------------------- */
......@@ -22891,7 +22891,7 @@
width: 25px;
display: inline-block;
float: right;
line-height: 32px; }
line-height: 24px; }
.el-range-editor.el-input__inner {
display: -webkit-inline-box;
......@@ -41626,7 +41626,7 @@
.el-textarea__inner {
display: block;
resize: vertical;
padding: 5px 15px;
padding: 5px 12px;
line-height: 1.5;
-webkit-box-sizing: border-box;
box-sizing: border-box;
......@@ -42515,7 +42515,8 @@
color: #1890ff;
background: transparent;
padding-left: 0;
padding-right: 0; }
padding-right: 0;
padding: 0; }
.el-button--text:hover, .el-button--text:focus {
color: #46a6ff;
border-color: transparent;
src/views/mall/coupon/exchange.vue
......@@ -44,7 +44,7 @@ import {formateDateTimeByType} from '@/utils/index.js';
</div>
</a>`;
}},
{label:'消耗积分',prop:'payCost',width:'80',align:'left'},
{label:'消耗积分',prop:'unitCostIntegral',width:'80',align:'left'},
{label:'领取状态',prop:'status',width:'100',align:'left',formatter(row){
let statusLabel ='--';
_vm.statusOptions.map(v => {
......@@ -59,8 +59,8 @@ import {formateDateTimeByType} from '@/utils/index.js';
}},
],
total:0,
statusOptions:[{label:'所有领取状态',value:-1},{label:'兑换取消(礼品)',value:0},{label:'兑换',value:1},{label:'领取(卡券)',value:2},{label:'已发货(礼品)',value:3}],
useStatusOptions:[{label:'所有使用状态',value:-1},{label:'已使用',value:5},{label:'未使用',value:0}],
statusOptions:[{label:'所有领取状态',value:-1},{label:'未领取',value:1},{label:'已领取',value:2}],
useStatusOptions:[{label:'所有使用状态',value:-1},{label:'已使用',value:1},{label:'未使用',value:2}],
listParams:{
pageSize: 20,
currentPage: 1,
......
src/views/mall/gift/exchange.vue
......@@ -15,14 +15,14 @@
<span v-else>{{scope.row[v.prop]}}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="left" width="100px">
<el-table-column label="使用状态" align="left" width="100px">
<template slot-scope="scope">
<p v-if="isWxExchange">
<span type="text">{{scope.row.useStatus === 5?'已使用':'未使用'}}</span>
</p>
<p>
<el-button type="text" v-if="scope.row.status !== 1 && !isWxExchange" @click="queryExpress(scope.row)">查看物流</el-button>
<el-button type="text" v-if="isWxExchange">
<el-button type="text" v-else-if="isWxExchange">
<a :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberId">查看详情</a>
</el-button>
<span type="text" v-else>--</span>
......@@ -62,8 +62,8 @@ import express from '../common/express';
</div>
</a>`;
}},
{label:'消耗积分',prop:'payCost',width:'80',align:'left'},
{label:'状态',prop:'status',width:'100',align:'left',formatter(row){
{label:'消耗积分',prop:'unitCostIntegral',width:'80',align:'left'},
{label:'领取状态',prop:'status',width:'100',align:'left',formatter(row){
if (_vm.isWxExchange) {
return row.status === 1?'待领取':'已领取';
} else {
......
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