Skip to content

I
integral-mall
Commit 7c2d4c54 by damodmg
Options

添加字体图标

parent a63bb0a9
Showing with 61 additions and 15 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.b15fae0abba5703094b69beb0b776fa6.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.cec5d0f83662c5d3f894.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.b50d94ff49f01377b9ebb537e2e55a75.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.e02c626caf82e78dd12a.js></script></body></html>
\ No newline at end of file
dist/static/css/iconfont.css
......@@ -40,4 +40,9 @@
content: "\e615";
}
.icon-xinxixianshi:before {
content: "\e74f";
}
dist/static/fonts/iconfont.svg
......@@ -38,6 +38,9 @@ Created by iconfont
<glyph glyph-name="daifahuo" unicode="&#58901;" d="M329.318 324.833c15.114 0 27.361 12.268 27.361 27.341V502.149c0 15.114-12.247 27.361-27.361 27.361s-27.341-12.247-27.341-27.361v-122.593h-117.74c-15.135 0-27.361-12.268-27.361-27.382 0-15.073 12.227-27.341 27.361-27.341h145.08zM721.244 214.835c-73.605 0-134.717-54.415-145.285-125.092H448.983c-10.547 70.676-71.66 125.092-145.244 125.092-80.978 0-146.862-65.884-146.862-146.883 0-80.957 65.884-146.862 146.862-146.862 69.652 0 128.143 48.742 143.135 113.91h131.195c14.991-65.188 73.523-113.91 143.155-113.91 80.957 0 146.842 65.905 146.842 146.862 0.02 80.998-65.864 146.883-146.821 146.883zM303.739-24.207c-50.811 0-92.16 41.37-92.16 92.16s41.349 92.16 92.16 92.16 92.16-41.37 92.16-92.16-41.349-92.16-92.16-92.16z m417.505 0c-50.811 0-92.14 41.37-92.14 92.16s41.329 92.16 92.14 92.16c50.77 0 92.14-41.37 92.14-92.16s-41.37-92.16-92.14-92.16zM1003.418 751.186c-2.191 29.635-14.029 54.129-34.243 70.82-33.26 27.464-77.578 25.395-88.023 24.453l-485.028-0.819c-38.953 0-60.908-15.626-72.458-28.754-23.04-26.132-21.914-59.802-21.094-69.12v-93.614l-222.72-117.76c-51.589-22.303-58.88-87.06-59.167-89.825a26.218 26.218 0 0 1-0.143-2.826l-0.061-375.849c0-15.114 12.247-27.341 27.341-27.341 15.114 0 27.361 12.227 27.361 27.32l0.061 373.965c1.004 6.144 6.84 36.311 26.808 44.564a24.372 24.372 0 0 1 2.335 1.085l238.305 125.993a27.361 27.361 0 0 1 14.561 24.207V749.158c0 1.311 0 2.089-0.184 3.359-0.492 5.12-0.041 19.702 7.782 28.426 6.001 6.636 16.486 9.994 31.293 9.994h0.061l486.339 0.819c1.044 0 2.109 0.041 3.133 0.184 0.266 0.02 30.597 2.785 48.62-12.104 8.479-7.004 13.23-17.388 14.479-31.724v-680.12c0-15.094 12.227-27.341 27.341-27.341s27.402 12.206 27.402 27.3V749.157a33.572 33.572 0 0 1-0.102 2.028z" horiz-adv-x="1024" />
<glyph glyph-name="xinxixianshi" unicode="&#59215;" d="M486.4 477.696h68.096V128H486.4V477.696zM512-42.496c239.104 0 426.496 187.904 426.496 426.496S751.104 810.496 512 810.496 85.504 623.104 85.504 384s187.392-426.496 426.496-426.496z m0-85.504C230.4-128 0 102.4 0 384S230.4 896 512 896s512-230.4 512-512-230.4-512-512-512zM520.704 568.32m-51.2 0a51.2 51.2 0 1 1 102.4 0 51.2 51.2 0 1 1-102.4 0Z" horiz-adv-x="1024" />
</font>
......
dist/static/js/app.cec5d0f83662c5d3f894.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.e02c626caf82e78dd12a.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/order/closeOrder.vue
......@@ -53,12 +53,12 @@ export default {
if (valid) {
let params = {
integralMallProExchangeId: this.refunOrderdModal.integralMallProExchangeId,
cancelReason: this.refunOrderdModal.status === 11 ? '' : this.refundForm.closeReason,
opType: this.refunOrderdModal.status === 11 ? 4 : 2
cancelReason: this.refundForm.closeReason,
opType: 2
};
request.get('/api-integral-mall/order-opt', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('修改成功');
this.$message.success('关闭订单成功');
this.refunOrderdModal.dialogVisible = false;
this.$emit('getList');
} else {
......
src/views/order/couponExchange.vue
......@@ -98,7 +98,7 @@
<span v-if="scope.row.status === 11">待付款</span>
</p>
<p style="line-height:18px">
<el-button type="text" v-if="scope.row.status === 11" @click="closeOrder(scope.row)">关闭订单</el-button>
<el-button type="text" v-if="scope.row.status === 11" @click="closeOrderNoPay(scope.row)">关闭订单</el-button>
</p>
</template>
</el-table-column>
......@@ -127,7 +127,7 @@
</el-tabs>
</div>
<!-- 关闭订单 -->
<closeOrder :refunOrderdModal="refunOrderdModal" @getList="getList"></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';
// import closeOrder from './closeOrder';
export default {
data() {
return {
......@@ -300,14 +300,28 @@ export default {
});
},
// 关闭订单
closeOrder(item) {
this.refunOrderdModal.integralMallProExchangeId = item.integralMallProExchangeId;
this.refunOrderdModal.status = item.status;
this.refunOrderdModal.dialogVisible = true;
// closeOrder(item) {
// this.refunOrderdModal.integralMallProExchangeId = item.integralMallProExchangeId;
// this.refunOrderdModal.status = item.status;
// this.refunOrderdModal.dialogVisible = true;
// }
// 待付款关闭订单
closeOrderNoPay(item) {
let params = {
integralMallProExchangeId: item.integralMallProExchangeId,
opType: 4
};
request.get('/api-integral-mall/order-opt', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('关闭订单成功');
} else {
this.$message.error(res.data.message);
}
});
}
},
components: {
closeOrder
// closeOrder
}
};
</script>
......
src/views/order/giftExchange.vue
......@@ -103,7 +103,9 @@
<el-button type="text" v-if="scope.row.status === 1 && scope.row.changeType === 2" @click="handleDeliver(scope.row)">物流发货</el-button>
<el-button type="text" v-if="scope.row.status === 1 && scope.row.changeType === 3" @click="handleDeliver(scope.row)">在线发货</el-button>
<el-button type="text" v-if="scope.row.status === 3" @click="getDeliverInfo(scope.row)">查看物流</el-button>
<el-button type="text" v-if="scope.row.status === 11 || scope.row.status === 1" @click="closeOrder(scope.row)">关闭订单</el-button>
<el-button type="text" v-if="scope.row.status === 1" @click="closeOrder(scope.row)">关闭订单</el-button>
<!-- 待付款关闭订单 -->
<el-button type="text" v-if="scope.row.status === 11" @click="closeOrderNoPay(scope.row)">关闭订单</el-button>
<el-button type="text" v-if="scope.row.status <= 0" @click="getCloseInfo(scope.row)">查看详情</el-button>
</p>
</template>
......@@ -442,9 +444,23 @@ export default {
// 关闭订单
closeOrder(item) {
this.refunOrderdModal.integralMallProExchangeId = item.integralMallProExchangeId;
this.refunOrderdModal.orderStatus = item.orderStatus;
// this.refunOrderdModal.orderStatus = item.orderStatus;
this.refunOrderdModal.dialogVisible = true;
},
// 待付款关闭订单
closeOrderNoPay(item) {
let params = {
integralMallProExchangeId: item.integralMallProExchangeId,
opType: 4
};
request.get('/api-integral-mall/order-opt', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('关闭订单成功');
} else {
this.$message.error(res.data.message);
}
});
},
// 获取关闭的详情
getCloseInfo(item) {
let params = {
......
static/css/iconfont.css
......@@ -40,4 +40,9 @@
content: "\e615";
}
.icon-xinxixianshi:before {
content: "\e74f";
}
static/fonts/iconfont.svg
......@@ -38,6 +38,9 @@ Created by iconfont
<glyph glyph-name="daifahuo" unicode="&#58901;" d="M329.318 324.833c15.114 0 27.361 12.268 27.361 27.341V502.149c0 15.114-12.247 27.361-27.361 27.361s-27.341-12.247-27.341-27.361v-122.593h-117.74c-15.135 0-27.361-12.268-27.361-27.382 0-15.073 12.227-27.341 27.361-27.341h145.08zM721.244 214.835c-73.605 0-134.717-54.415-145.285-125.092H448.983c-10.547 70.676-71.66 125.092-145.244 125.092-80.978 0-146.862-65.884-146.862-146.883 0-80.957 65.884-146.862 146.862-146.862 69.652 0 128.143 48.742 143.135 113.91h131.195c14.991-65.188 73.523-113.91 143.155-113.91 80.957 0 146.842 65.905 146.842 146.862 0.02 80.998-65.864 146.883-146.821 146.883zM303.739-24.207c-50.811 0-92.16 41.37-92.16 92.16s41.349 92.16 92.16 92.16 92.16-41.37 92.16-92.16-41.349-92.16-92.16-92.16z m417.505 0c-50.811 0-92.14 41.37-92.14 92.16s41.329 92.16 92.14 92.16c50.77 0 92.14-41.37 92.14-92.16s-41.37-92.16-92.14-92.16zM1003.418 751.186c-2.191 29.635-14.029 54.129-34.243 70.82-33.26 27.464-77.578 25.395-88.023 24.453l-485.028-0.819c-38.953 0-60.908-15.626-72.458-28.754-23.04-26.132-21.914-59.802-21.094-69.12v-93.614l-222.72-117.76c-51.589-22.303-58.88-87.06-59.167-89.825a26.218 26.218 0 0 1-0.143-2.826l-0.061-375.849c0-15.114 12.247-27.341 27.341-27.341 15.114 0 27.361 12.227 27.361 27.32l0.061 373.965c1.004 6.144 6.84 36.311 26.808 44.564a24.372 24.372 0 0 1 2.335 1.085l238.305 125.993a27.361 27.361 0 0 1 14.561 24.207V749.158c0 1.311 0 2.089-0.184 3.359-0.492 5.12-0.041 19.702 7.782 28.426 6.001 6.636 16.486 9.994 31.293 9.994h0.061l486.339 0.819c1.044 0 2.109 0.041 3.133 0.184 0.266 0.02 30.597 2.785 48.62-12.104 8.479-7.004 13.23-17.388 14.479-31.724v-680.12c0-15.094 12.227-27.341 27.341-27.341s27.402 12.206 27.402 27.3V749.157a33.572 33.572 0 0 1-0.102 2.028z" horiz-adv-x="1024" />
<glyph glyph-name="xinxixianshi" unicode="&#59215;" d="M486.4 477.696h68.096V128H486.4V477.696zM512-42.496c239.104 0 426.496 187.904 426.496 426.496S751.104 810.496 512 810.496 85.504 623.104 85.504 384s187.392-426.496 426.496-426.496z m0-85.504C230.4-128 0 102.4 0 384S230.4 896 512 896s512-230.4 512-512-230.4-512-512-512zM520.704 568.32m-51.2 0a51.2 51.2 0 1 1 102.4 0 51.2 51.2 0 1 1-102.4 0Z" horiz-adv-x="1024" />
</font>
......
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