Skip to content

I
integral-mall
Commit 00547927 by damodmg
Options

调整

parent 8121e69f
Showing with 20 additions and 11 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>微商城</title><link href=./static/css/app.e9707f369896ff46ae5c32e726eddd87.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-info.1.0.0.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2a66e15144de1c0f565b.js></script><script type=text/javascript src=./static/js/app.8fb2d3c99fb91738e079.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=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>微商城</title><link href=./static/css/app.bbe351858f2cbd3612ed348e19308bcb.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-info.1.0.0.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2a66e15144de1c0f565b.js></script><script type=text/javascript src=./static/js/app.a2ea46b4a6f1c6999df8.js></script></body></html>
\ No newline at end of file
dist/static/css/app.bbe351858f2cbd3612ed348e19308bcb.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.e9707f369896ff46ae5c32e726eddd87.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.8fb2d3c99fb91738e079.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/app.a2ea46b4a6f1c6999df8.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/goods/gift/gift.vue
......@@ -84,7 +84,7 @@
<p>{{ getSeconds(scope.row.createTime) }}</p>
</template>
</el-table-column>
<el-table-column prop="sort" label="排序" sortable="custom" min-width="140px">
<el-table-column prop="sort" label="排序" sortable="custom" min-width="140px" :render-header="renderHeader">
<template slot-scope="scope">
<p v-if="!scope.row.editStatus" class="edit-number intergral-edit">{{ scope.row.sort }}<i class="el-icon-edit" @click="editNumber(scope.row)"></i></p>
<div v-if="scope.row.editStatus">
......@@ -205,6 +205,9 @@ export default {
this.getList();
},
methods: {
renderHeader(h, { column, $index }, index) {
return h('span', {}, [h('span', {}, '序号'), h('el-popover', { props: { placement: 'top-start', width: '200', trigger: 'hover', content: '礼品在小程序端的展示排序，序号越大，排序越靠前。' } }, [h('i', { slot: 'reference', class: 'iconfont icon-xinxixianshi' }, '')])]);
},
//跳转到兑换记录
goRecord(item) {
this.$router.push({ name: 'giftExchange', query: { integralMallProId: item.integralMallProId } });
......@@ -582,4 +585,10 @@ export default {
.intergral-edit:hover .el-icon-edit {
display: inline-block;
}
.icon-xinxixianshi {
margin-left: 5px;
color: #909399;
font-size: 14px;
cursor: pointer;
}
</style>
src/views/order/couponExchange.vue
......@@ -76,10 +76,10 @@
<el-dropdown-item command="orderInfo.definedCode">订单编号：{{ orderInfo.orderNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">商户支付号：{{ orderInfo.payNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">支付流水号：{{ orderInfo.payNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">下单时间：{{ orderInfo.orderTime }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">付款时间：{{ orderInfo.payTime }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">发货时间：{{ orderInfo.deliveryTime }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">交易完成时间：{{ orderInfo.finishTime }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">下单时间：{{ orderInfo.orderTime ? getTimeAll(orderInfo.orderTime) : '--' }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">付款时间：{{ orderInfo.payTime ? getTimeAll(orderInfo.payTime) : '--' }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">发货时间：{{ orderInfo.deliveryTime ? getTimeAll(orderInfo.deliveryTime) : '--' }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">交易完成时间：{{ orderInfo.finishTime ? getTimeAll(orderInfo.finishTime) : '--' }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">收货信息：{{ orderInfo.definedCode }} {{ orderInfo.consignee }} {{ orderInfo.consigneePhone }} {{ orderInfo.receivingAddress }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
......
src/views/order/giftExchange.vue
......@@ -72,10 +72,10 @@
<el-dropdown-item command="orderInfo.definedCode">订单编号：{{ orderInfo.orderNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">商户支付号：{{ orderInfo.payNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">支付流水号：{{ orderInfo.payNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">下单时间：{{ orderInfo.orderTime }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">付款时间：{{ orderInfo.payTime }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">发货时间：{{ orderInfo.deliveryTime }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">交易完成时间：{{ orderInfo.finishTime }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">下单时间：{{ orderInfo.orderTime ? getTimeAll(orderInfo.orderTime) : '--' }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">付款时间：{{ orderInfo.payTime ? getTimeAll(orderInfo.payTime) : '--' }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">发货时间：{{ orderInfo.deliveryTime ? getTimeAll(orderInfo.deliveryTime) : '--' }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">交易完成时间：{{ orderInfo.finishTime ? getTimeAll(orderInfo.finishTime) : '--' }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">收货信息：{{ orderInfo.definedCode }} {{ orderInfo.consignee }} {{ orderInfo.consigneePhone }} {{ orderInfo.receivingAddress }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
......
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