Skip to content

M
marketing
Commit 1f9af4c9 by zhangmeng
Options

积分商城

parent a5460ebd
Showing with 31 additions and 24 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=/marketing/static/css/app.839d8ec914e09f595f9b1b82f34c427d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.ccb4bd422cd76a080cba.js></script><script type=text/javascript src=/marketing/static/js/app.b45a645e3ccc85b0643f.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=/marketing/static/css/app.303307f1473347af30da8c7f3cc53ab0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.ccb4bd422cd76a080cba.js></script><script type=text/javascript src=/marketing/static/js/app.121f56222c8ac9e8618d.js></script></body></html>
\ No newline at end of file
dist/static/css/app.303307f1473347af30da8c7f3cc53ab0.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.839d8ec914e09f595f9b1b82f34c427d.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.121f56222c8ac9e8618d.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.b45a645e3ccc85b0643f.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
......@@ -9194,8 +9194,8 @@
.el-radio__input.is-checked .el-radio__inner::after {
-webkit-transform: translate(-50%, -50%) scale(1);
transform: translate(-50%, -50%) scale(1); }
.el-radio__input.is-checked + .el-radio__label {
color: #1890ff; }
/* .el-radio__input.is-checked + .el-radio__label {
color: #1890ff; } */
.el-radio__input.is-focus .el-radio__inner {
border-color: #1890ff; }
.el-radio__inner {
......@@ -10349,8 +10349,8 @@
.el-checkbox__input.is-checked .el-checkbox__inner::after {
-webkit-transform: rotate(45deg) scaleY(1);
transform: rotate(45deg) scaleY(1); }
.el-checkbox__input.is-checked + .el-checkbox__label {
color: #1890ff; }
/* .el-checkbox__input.is-checked + .el-checkbox__label {
color: #1890ff; } */
.el-checkbox__input.is-focus {
/*focus时 视觉上区分*/ }
.el-checkbox__input.is-focus .el-checkbox__inner {
......@@ -14633,8 +14633,8 @@
.el-checkbox__input.is-checked .el-checkbox__inner::after {
-webkit-transform: rotate(45deg) scaleY(1);
transform: rotate(45deg) scaleY(1); }
.el-checkbox__input.is-checked + .el-checkbox__label {
color: #1890ff; }
/* .el-checkbox__input.is-checked + .el-checkbox__label {
color: #1890ff; } */
.el-checkbox__input.is-focus {
/*focus时 视觉上区分*/ }
.el-checkbox__input.is-focus .el-checkbox__inner {
......@@ -16475,8 +16475,8 @@
.el-checkbox__input.is-checked .el-checkbox__inner::after {
-webkit-transform: rotate(45deg) scaleY(1);
transform: rotate(45deg) scaleY(1); }
.el-checkbox__input.is-checked + .el-checkbox__label {
color: #1890ff; }
/* .el-checkbox__input.is-checked + .el-checkbox__label {
color: #1890ff; } */
.el-checkbox__input.is-focus {
/*focus时 视觉上区分*/ }
.el-checkbox__input.is-focus .el-checkbox__inner {
......@@ -30037,8 +30037,8 @@
.el-checkbox__input.is-checked .el-checkbox__inner::after {
-webkit-transform: rotate(45deg) scaleY(1);
transform: rotate(45deg) scaleY(1); }
.el-checkbox__input.is-checked + .el-checkbox__label {
color: #1890ff; }
/* .el-checkbox__input.is-checked + .el-checkbox__label {
color: #1890ff; } */
.el-checkbox__input.is-focus {
/*focus时 视觉上区分*/ }
.el-checkbox__input.is-focus .el-checkbox__inner {
......@@ -43040,8 +43040,8 @@
.el-checkbox__input.is-checked .el-checkbox__inner::after {
-webkit-transform: rotate(45deg) scaleY(1);
transform: rotate(45deg) scaleY(1); }
.el-checkbox__input.is-checked + .el-checkbox__label {
color: #1890ff; }
/* .el-checkbox__input.is-checked + .el-checkbox__label {
color: #1890ff; } */
.el-checkbox__input.is-focus {
/*focus时 视觉上区分*/ }
.el-checkbox__input.is-focus .el-checkbox__inner {
src/views/mall/coupon/list.vue
......@@ -6,13 +6,13 @@
<el-table tooltipEffect="light" :data="tableList" style="width: 100%" v-loading="loading">
<el-table-column label="商品" align="left" prop="timesStatus" min-width="140">
<template slot-scope="scope">
<div class="ellipsis-100" >
<img class="vertical-middle table__avatar" :src="defaultAvatar" width="60" height="60" />
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.proTitle || '--'}}</p>
<p class="fz13 gray">{{scope.row.proSubTitle || '--'}}</p>
</div>
<div class="ellipsis-100" >
<img class="vertical-middle table__avatar" :src="filterAvatar(scope.row.cardType)" width="60" height="60" />
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.proTitle || '--'}}</p>
<p class="fz13 gray">{{scope.row.proSubTitle || '--'}}</p>
</div>
</div>
</template>
</el-table-column>
<el-table-column label="积分费用" align="left" prop="integralCost" width="180">
......@@ -72,6 +72,9 @@ export default {
data () {
return {
defaultAvatar:require('../../../assets/img/head_default.png'),
daijinAvatar:require('../../../assets/img/credit_daijin_icon.png'),
zhekouAvatar:require('../../../assets/img/credit_zhekou_icon.png'),
duihuanAvatar:require('../../../assets/img/head_default.png'),
loading:false,
tableList:[],
listParams:{
......@@ -86,6 +89,9 @@ export default {
this.getPageCardsList();
},
methods: {
filterAvatar(val){
return (val === 0 ? this.daijinAvatar : (val === 1 ? this.zhekouAvatar: this.duihuanAvatar));
},
search() {
this.listParams.currentPage = 1;
this.getPageCardsList();
......
src/views/mall/gift/info.js
......@@ -301,10 +301,11 @@ export default {
console.log(params)
createIntegralProService(params).then(res => {
if(res.errorCode === 0) {
this.$router.push('/mall/coupon');
this.$router.push('/mall/gift');
this.$tips({type:'success',message:'操作成功'});
} else {
this.$tips({type:'error',message:'操作失败'});
......
src/views/mall/goods/send-goods.vue
<template>
<el-dialog class="express dialog__body__nopadding" title="查看物流信息" :visible.sync="show" width="60%" :before-close="close">
<el-dialog class="express dialog__body__nopadding" title="查看物流信息" :visible.sync="show" width="40%" :before-close="close">
<div class="express--info">
<p>收件人：{{info.clerkName || '--'}}</p>
<p>联系方式：{{info.consigneePhone || '--'}}</p>
<p>收货地址：{{info.receivingAddress || '--'}}</p>
<p class="pb10">快递公司：<el-select class="vertical-middle w200" v-model="params.logisticsCompanyId" placeholder="选择快递">
<p class="pb10">快递公司：<el-select class="vertical-middle w300" v-model="params.logisticsCompanyId" placeholder="选择快递">
<el-option v-for="v in logisticsOptions" :key="v.logisticsCompanyCode" :label="v.logisticsCompanyName" :value="v.logisticsCompanyId"></el-option>
</el-select>
</p>
<p>运单号码：<el-input class="vertical-middle w200" v-model="params.courierNumber" placeholder="请输入快递单号"></el-input></p>
<p>运单号码：<el-input class="vertical-middle w300" v-model="params.courierNumber" placeholder="请输入快递单号"></el-input></p>
</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="submit">确 定</el-button>
......
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