Skip to content

I
integral-mall
Commit 996a2a22 by damodmg
Options

添加跳转的链接

parent 14022020
Showing with 32 additions and 61 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.d68ad8180809a3af62b44dbe6c275fd3.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/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.2034d145f27b7b58674b.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.1b8e76fa6e07fc4684c92c713e83cfdc.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/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.30a7272b92ae99f5d2aa.js></script></body></html>
\ No newline at end of file
dist/static/js/app.2034d145f27b7b58674b.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.30a7272b92ae99f5d2aa.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/goods/coupon/coupon.vue
......@@ -46,7 +46,7 @@
<img v-if="scope.row.cardType === 1" src="../../../../static/img/zhe.png" alt="" />
<div class="info-name">
<p class="pro-ellipsis">{{ scope.row.proTitle }}</p>
<p class="category-ellipsis">编码：{{ scope.row.giftCategoryName }}</p>
<p class="category-ellipsis">{{ scope.row.proSubTitle }}</p>
</div>
</div>
</template>
......@@ -69,7 +69,8 @@
</el-table-column>
<el-table-column prop="sortTimes" label="销量" sortable="custom">
<template slot-scope="scope">
<p>{{ scope.row.allExchangeNumber }}</p>
<el-button type="text" @click="goRecord(scope.row)">{{ scope.row.allExchangeNumber }}</el-button>
<!-- <p>{{ scope.row.allExchangeNumber }}</p> -->
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" sortable="custom" min-width="110px">
......@@ -167,6 +168,10 @@ export default {
this.getList();
},
methods: {
//跳转到兑换记录
goRecord(item) {
this.$router.push({ name: 'couponExchange', query: { integralMallProId: item.integralMallProId } });
},
// 获取列表
getList() {
let params = {
......
src/views/goods/gift/gift.vue
......@@ -72,7 +72,10 @@
</el-table-column>
<el-table-column prop="sortTimes" label="销量" sortable="custom">
<template slot-scope="scope">
<p>{{ scope.row.allExchangeNumber }}</p>
<!-- <p>{{ scope.row.allExchangeNumber }}</p>
-->
<el-button type="text" @click="goRecord(scope.row)">{{ scope.row.allExchangeNumber }}</el-button>
<!-- <a :href="windowUrl + '/member/#/wechatmemberDetail?memberId=' + scope.row.memberId" target="_blank">{{ scope.row.cardNum }}</a> -->
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" min-width="110px">
......@@ -195,62 +198,17 @@ export default {
list: [],
type: ''
},
list: [
{
giftProSkuIntegral: '23',
giftProSkuCash: '2',
stock: '3',
giftProSkuStandCode: '34234dew',
giftProGiftCode: '34242',
giftProSkuId: '1543202',
giftPropValues: [
{
valueId: 'ff80808169c34b2f0169c39549240017',
valueName: '桃花粉',
groupId: 'ff80808169c34a980169c38bc4e00048',
propId: 'ff80808169c34a980169c38b311f0044',
proName: '颜色测试'
},
{
valueId: 'ff80808169c34a980169c39583aa006a',
valueName: '160',
groupId: 'ff80808169c34a980169c394b1810067',
propId: 'ff80808169c34a980169c38b92a60047',
proName: '尺码测试'
}
]
},
{
giftProSkuIntegral: '23',
giftProSkuCash: '2',
stock: '3',
giftProSkuStandCode: '34234dew',
giftProGiftCode: '34242',
giftProSkuId: '1543202',
giftPropValues: [
{
valueId: 'ff80808169c34b2f0169c39549240017',
valueName: '桃花粉',
groupId: 'ff80808169c34a980169c38bc4e00048',
propId: 'ff80808169c34a980169c38b311f0044',
proName: '颜色测试'
},
{
valueId: 'ff80808169c34a980169c39583aa006b',
valueName: '165',
groupId: 'ff80808169c34a980169c394b1810067',
propId: 'ff80808169c34a980169c38b92a60047',
proName: '尺码测试'
}
]
}
]
list: []
};
},
created() {
this.getList();
},
methods: {
//跳转到兑换记录
goRecord(item) {
this.$router.push({ name: 'giftExchange', query: { integralMallProId: item.integralMallProId } });
},
// 获取列表
getList() {
let params = {
......
src/views/order/couponExchange.vue
......@@ -51,7 +51,7 @@
<p class="pro-ellipsis">{{ scope.row.giftName }}</p>
<!-- status： 1是未领取，2是已领取 -->
<p><span style="margin-right:10px;">领取状态：</span><span v-if="scope.row.cardType === 2">已领取</span><span v-if="scope.row.cardType <= 0">未领取</span></p>
<p><span>使用状态</span><span v-if="scope.row.useStatus === 5">已使用</span><span v-if="scope.row.useStatus === 0">未使用</span></p>
<p><span>使用状态：</span><span v-if="scope.row.useStatus === 5">已使用</span><span v-if="scope.row.useStatus === 0">未使用</span></p>
<!-- <p class="category-ellipsis">
<span v-for="(i, v) in scope.row.sku" :key="v" style="margin-right:3px">{{ i.proName }}:{{ v.valueName ? v.valueName : '--' }}</span>
</p>
......@@ -167,16 +167,19 @@ export default {
//关闭订单
dialogVisible: false,
integralMallProExchangeId: ''
}
},
integralMallProId: ''
};
},
created() {
this.integralMallProId = this.$route.query.integralMallProId;
this.getList();
},
methods: {
// tab切换
handleClick(tab) {
this.orderStatus = tab.name;
this.getList();
},
// 搜索
......@@ -271,7 +274,8 @@ export default {
pageType: 1,
beginTime: this.beginTime,
endTime: this.endTime,
sortType: this.sortType
sortType: this.sortType,
integralMallProId: this.integralMallProId ? this.integralMallProId : ''
};
this.loading = true;
request.post('/api-integral-mall/page-undeliver', qs.stringify(params)).then(res => {
......
src/views/order/giftExchange.vue
......@@ -229,12 +229,14 @@ export default {
cancelTime: '',
clerkName: '', //操作人员
cancelReason: ''
}
},
integralMallProId: '' //礼品id
};
},
created() {
this.getList();
this.getNumber();
this.integralMallProId = this.$route.query.integralMallProId;
this.getList();
},
methods: {
// tab切换
......@@ -310,8 +312,10 @@ export default {
pageType: 2, //1、代表优惠券订单列表 2、礼品订单
beginTime: this.beginTime,
endTime: this.endTime,
sortType: this.sortType
sortType: this.sortType,
integralMallProId: this.integralMallProId ? this.integralMallProId : ''
};
this.loading = true;
request.post('/api-integral-mall/page-undeliver', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
......
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