Skip to content

I
integral-mall
Commit ad714d27 by damodmg
Options

添加微信兑换券2

parent 26f333ac
Showing with 49 additions and 7 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.3989cb46107a23638dfa12f769744d67.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.f2a0eb46e60be63e3ed2.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.08542af77fb87ef992c1f86e2a90da53.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.b2873efac6168f202be3.js></script></body></html>
\ No newline at end of file
dist/static/js/app.b2873efac6168f202be3.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.f2a0eb46e60be63e3ed2.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/goods/coupon/info.vue
......@@ -130,7 +130,7 @@
<div class="confim-btn" :style="{ width: fixedWidth + 'px' }">
<el-form-item class="fix-btn">
<el-button type="primary" size="small" @click="submitForm('couponForm')">保存</el-button>
<el-button size="small">返回</el-button>
<el-button size="small" @click="goBack">返回</el-button>
</el-form-item>
</div>
</el-form>
......@@ -408,6 +408,11 @@ export default {
return false;
}
});
},
goBack() {
this.$router.push({
name: 'coupon'
});
}
},
components: {}
......
src/views/order/couponExchange.vue
......@@ -30,7 +30,7 @@
</div>
</div>
<div class="fr">
<el-button plain><i class="iconfont icon-icon_yunxiazai" style="margin-right:5px"></i>导出订单</el-button>
<el-button plain @click="exportExcel"><i class="iconfont icon-icon_yunxiazai" style="margin-right:5px"></i>导出订单</el-button>
</div>
</div>
</div>
......@@ -49,7 +49,11 @@
<img v-if="scope.row.cardType === 1" src="../../../static/img/zhe.png" alt="" />
<div class="info-name">
<p class="pro-ellipsis">{{ scope.row.giftName }}</p>
<p><span style="margin-right:10px;">领取状态：已领取未领取</span><span>使用状态：已使用未使用</span></p>
<!-- status： 1是未领取，2是已领取 -->
<p>
<span style="margin-right:10px;">领取状态：{{ scope.row.status === 1 ? '已领取' : '未领取' }}</span>
<span>使用状态：已使用未使用</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>
......@@ -127,6 +131,8 @@
</div>
<!-- 关闭订单 -->
<closeOrder :refunOrderdModal="refunOrderdModal"></closeOrder>
<!-- 导出订单 -->
<vue-gic-export-excel :dataArr="tableData" :dialogVisible.sync="dialogVisible" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
</div>
</template>
......@@ -153,7 +159,12 @@ export default {
windowUrl: window.location.origin,
orderStatus: '-1',
dateValue: [new Date() - 90 * 24 * 60 * 60 * 1000, new Date().valueOf()],
orderInfo: {},
// 导出数据控件
projectName: 'integral-mall', // 当前项目名
dialogVisible: false,
excelUrl: '/api-integral-mall/download-integral-online-excel', // 下载数据的地址
params: {}, // 传递的参数
orderInfo: {}, //订单信息
refunOrderdModal: {
//关闭订单
dialogVisible: false,
......@@ -186,6 +197,31 @@ export default {
this.currentPage = page;
this.getList();
},
// 导出发货单
exportExcel() {
if (this.dateValue) {
this.beginTime = this.getTimeAll(this.dateValue[0]);
this.endTime = this.getTimeAll(this.dateValue[1]);
} else {
this.beginTime = '';
this.endTime = '';
}
if (!this.beginTime || !this.beginTime) {
this.$message.error('时间不能为空');
return;
}
this.params = {
orderStatus: this.orderStatus,
changeType: this.changeType,
searchParams: this.searchValue,
beginTime: this.beginTime,
endTime: this.endTime,
pageType: 1, //1、代表优惠券订单列表 2、礼品订单
requestProject: 'integral-mall'
};
this.dialogVisible = true;
// window.location = `${exportOnlineListExcel}?orderStatus=${this.listParams.orderStatus}&changeType=${this.listParams.changeType}&searchParams=${this.listParams.searchParams}&beginTime=${this.listParams.beginTime}&endTime=${this.listParams.endTime}&requestProject=marketing`;
},
getOrderInfo(i, integralMallProExchangeId) {
let params = {
integralMallProExchangeId: integralMallProExchangeId
......
src/views/order/giftExchange.vue
......@@ -352,7 +352,8 @@ export default {
this.beginTime = this.getTimeAll(this.dateValue[0]);
this.endTime = this.getTimeAll(this.dateValue[1]);
} else {
this.beginTime = this.listParams.senendTimedEndTime = '';
this.beginTime = '';
this.beginTime = '';
}
if (!this.beginTime || !this.beginTime) {
this.$message.error('时间不能为空');
......
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