Skip to content

I
integral-mall
Commit 0ef4e7da by 萱草
Options

update: 地素判断使用库存分布

parent dab2cca1
Showing with 60 additions and 6 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.3d23fa6b5b64c9a2eeac1af64fff2c71.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.45.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.19.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.2.28.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.175ccdf2bfbfc0694b7c.js></script><script type=text/javascript src=./static/js/app.ef643ba00a6ef71e262b.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.c6ad7e667418737b25c2d6f437382dfd.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.45.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.19.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.2.28.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.175ccdf2bfbfc0694b7c.js></script><script type=text/javascript src=./static/js/app.e40e39cb033689a9b855.js></script></body></html>
\ No newline at end of file
dist/static/js/app.e40e39cb033689a9b855.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.ef643ba00a6ef71e262b.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/coupon.vue
......@@ -96,7 +96,8 @@
<el-table-column prop="sortCost" label="库存" sortable="custom" :render-header="renderHeader2">
<template slot-scope="scope">
<p class="intergral-edit">
<el-button type="text" @click="checkStockDistribute(scope.row)">{{ scope.row.virtualStock }}</el-button>
<el-button v-if="specialOrder" type="text" @click="checkStockDistribute(scope.row)">{{ scope.row.virtualStock }}</el-button>
<span v-else>{{ scope.row.virtualStock }}</span>
<i class="el-icon-edit" @click="handleTable(scope.row, 3)" v-if="scope.row.canEdit"></i>
</p>
</template>
......@@ -278,7 +279,9 @@ export default {
// show: false
},
ladderDialogVisible: false,
stockDialog: false
stockDialog: false,
enterpriseId: '',
specialOrder: false
};
},
created() {
......@@ -295,8 +298,32 @@ export default {
}
this.getStatus();
this.getList();
this.getUserId();
},
methods: {
// 阶梯价定制，判断达摩测试环境与地素环境
// 达摩测试 ff8080815dacd3a2015dacd3ef5c0000
// 达摩生产 ff8080816a36326c016a53380d8b5f52
// 地素 ff80808163218c030163429b47110635
// 地素测试 ff8080816f12b5c0016f1d5896820147
getUserId() {
request.get('/api-auth/get-login-user-info').then(res => {
if (res.data.errorCode === 0) {
this.enterpriseId = res.data.result.enterpriseId;
let id1 = 'ff8080815dacd3a2015dacd3ef5c0000';
let id2 = 'ff80808163218c030163429b47110635';
let id3 = 'ff8080816f12b5c0016f1d5896820147';
let id4 = 'ff8080816a36326c016a53380d8b5f52';
if (this.enterpriseId === id1 || this.enterpriseId === id2 || this.enterpriseId === id3 || this.enterpriseId === id4) {
this.specialOrder = true;
} else {
this.specialOrder = false;
}
} else {
this.$message.error(res.data.message);
}
});
},
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' }, '')])]);
},
......
src/views/goods/gift/gift.vue
......@@ -96,7 +96,8 @@
<el-table-column prop="sortCost" label="库存" sortable="custom" :render-header="renderHeader2">
<template slot-scope="scope">
<p class="intergral-edit">
<el-button type="text" @click="checkStockDistribute(scope.row)">{{ scope.row.virtualStock }}</el-button>
<el-button v-if="specialOrder" type="text" @click="checkStockDistribute(scope.row)">{{ scope.row.virtualStock }}</el-button>
<span v-else>{{ scope.row.virtualStock }}</span>
<i class="el-icon-edit" v-if="scope.row.giftType === 1 && scope.row.canEdit" @click="handleTable(scope.row, 'stock')"></i>
</p>
</template>
......@@ -278,7 +279,9 @@ export default {
// show: false
},
ladderDialogVisible: false,
stockDialog: false
stockDialog: false,
enterpriseId: '',
specialOrder: false
};
},
created() {
......@@ -297,8 +300,32 @@ export default {
}
this.getStatus();
this.getList();
this.getUserId();
},
methods: {
// 阶梯价定制，判断达摩测试环境与地素环境
// 达摩测试 ff8080815dacd3a2015dacd3ef5c0000
// 达摩生产 ff8080816a36326c016a53380d8b5f52
// 地素 ff80808163218c030163429b47110635
// 地素测试 ff8080816f12b5c0016f1d5896820147
getUserId() {
request.get('/api-auth/get-login-user-info').then(res => {
if (res.data.errorCode === 0) {
this.enterpriseId = res.data.result.enterpriseId;
let id1 = 'ff8080815dacd3a2015dacd3ef5c0000';
let id2 = 'ff80808163218c030163429b47110635';
let id3 = 'ff8080816f12b5c0016f1d5896820147';
let id4 = 'ff8080816a36326c016a53380d8b5f52';
if (this.enterpriseId === id1 || this.enterpriseId === id2 || this.enterpriseId === id3 || this.enterpriseId === id4) {
this.specialOrder = true;
} else {
this.specialOrder = false;
}
} else {
this.$message.error(res.data.message);
}
});
},
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' }, '')])]);
},
......
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