Skip to content

I
integral-mall
Commit 8121e69f by damodmg
Options

修改

parent 3e7e55d6
Showing with 13 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.238f8e3329af8c9de08b21291d57dc4e.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.1e07456c7bd2ceb02a1f.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.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
dist/static/js/app.1e07456c7bd2ceb02a1f.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.8fb2d3c99fb91738e079.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/info.vue
......@@ -1031,8 +1031,8 @@ export default {
changeType: this.giftForm.changeType, //配送方式
// proReferId: this.giftForm.changeType === 1 ? this.proReferId : '', //微信兑换券
refundType: this.giftForm.refundType, //售后
giftProStandardJson: JSON.stringify(this.giftProStandardJson), //规格列表
skuJson: JSON.stringify(this.submitSkuJson) //sku数据
giftProStandardJson: this.giftProStandardJson ? JSON.stringify(this.giftProStandardJson) : '', //规格列表
skuJson: this.submitSkuJson ? JSON.stringify(this.submitSkuJson) : '' //sku数据
};
// 门店分类
if (this.sendChildData.storeType === 1) {
......
src/views/order/closeOrder.vue
......@@ -52,11 +52,11 @@ export default {
this.$refs[formName].validate(valid => {
if (valid) {
let params = {
integralMallProRefundId: this.refunOrderdModal.mallProId,
integralMallProExchangeId: this.refunOrderdModal.integralMallProExchangeId,
cancelReason: this.refundForm.closeReason,
opType: this.refunOrderdModal.orderStatus === 11 ? 4 : 2
};
request.get('/api-integral-mall/order-opt', params).then(res => {
request.get('/api-integral-mall/order-opt', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('修改成功');
this.refunOrderdModal.dialogVisible = false;
......
src/views/order/closeRefund.vue
......@@ -53,7 +53,7 @@ export default {
integralMallProRefundId: this.refundModal.mallProId,
reason: this.refundForm.reason
};
request.get('/api-integral-mall/refuse-refund', params).then(res => {
request.get('/api-integral-mall/refuse-refund', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('修改成功');
this.refundModal.dialogVisible = false;
......
src/views/order/couponExchange.vue
......@@ -127,7 +127,7 @@
</el-tabs>
</div>
<!-- 关闭订单 -->
<closeOrder :refunOrderdModal="refunOrderdModal"></closeOrder>
<closeOrder :refunOrderdModal="refunOrderdModal" @getList="getList"></closeOrder>
<!-- 导出订单 -->
<vue-gic-export-excel :dataArr="tableData" :dialogVisible.sync="dialogVisible" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
</div>
......@@ -137,7 +137,7 @@
import qs from 'qs';
import request from '../../service/request.js';
import getInputVal from '../../utils/common.js';
import closeOrder from './closeOrder';
export default {
data() {
return {
......@@ -305,7 +305,9 @@ export default {
this.refunOrderdModal.dialogVisible = true;
}
},
components: {}
components: {
closeOrder
}
};
</script>
<style scoped>
......
src/views/order/giftExchange.vue
......@@ -141,7 +141,7 @@
<!-- 物流详情 -->
<deliverInfoModal :deliverInfodModal="deliverInfodModal" v-show="deliverInfodModal.dialogVisible"></deliverInfoModal>
<!-- 关闭订单 -->
<closeOrder :refunOrderdModal="refunOrderdModal"></closeOrder>
<closeOrder :refunOrderdModal="refunOrderdModal" @getList="getList"></closeOrder>
<!-- 取消订单 -->
<cancelOrder :closeInfoModal="closeInfoModal"></cancelOrder>
<!-- 会员信息 -->
......
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