Skip to content

I
integral-mall
Commit d2fce093 by 萱草
Options

update: bug修复及定制if判断

parent 2ecad3df
Showing with 63 additions and 10 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.ec5e453e1bb1285f47f47c1ddd6df2a0.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.0e99f2578970bafc9ab2.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.55d290df2c74e9278a54087b87a70ce1.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.4a330df69593ddfe1fd4.js></script></body></html>
\ No newline at end of file
dist/static/js/app.0e99f2578970bafc9ab2.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.4a330df69593ddfe1fd4.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/goodsSelect.vue
......@@ -15,7 +15,7 @@
</div>
<div class="search-item">
<el-select v-model="shelf" placeholder="所有商品状态" clearable class="w-160" @change="getInfo">
<el-option label="已上架" :value="0"></el-option>
<el-option label="已上架" :value="2"></el-option>
<el-option label="已下架" :value="1"></el-option>
</el-select>
</div>
......@@ -174,7 +174,8 @@ export default {
});
} else {
params = {
...this.query
...this.query,
shelf: this.shelf ? this.shelf : -1 // 上下架状态
};
request.post('/api-integral-mall/page-cards', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
......
src/views/activities/flashSale/detail.vue
......@@ -503,12 +503,14 @@ export default {
it.children[index].activityIntegral = item2.activityIntegral;
it.children[index].activityPrice = item2.activityPrice;
it.children[index].activityStock = item2.activityStock;
it.children[index].activityProStatus = item2.activityProStatus;
});
} else {
it.activityExchangeLimit = item.activityExchangeLimit;
it.activityIntegral = item.activityIntegral;
it.activityPrice = item.activityPrice;
it.activityStock = item.activityStock;
it.activityProStatus = item.activityProStatus;
}
}
});
......
src/views/goods/coupon/info.vue
......@@ -177,7 +177,7 @@
<el-option v-for="item in memberGradeList" :key="item.gradeId" :label="item.gradeName" :value="item.gradeId"> </el-option>
</el-select>
</el-form-item>
<el-form-item prop="ladder">
<el-form-item prop="ladder" v-if="specialOrder">
<el-checkbox-group v-model="couponForm.ladder" @change="changeladder" style="display:inline-block">
<el-checkbox label="1">设置阶梯价</el-checkbox>
</el-checkbox-group>
......@@ -468,11 +468,14 @@ export default {
// responseParams: [] //回显的数据
memberGrade: '',
isEdit: false,
isCorrect: true // 校验阶梯价的验证是否可以保存阶梯价
isCorrect: true, // 校验阶梯价的验证是否可以保存阶梯价
enterpriseId: '', // 商户id
specialOrder: false // 是否定制
};
},
mounted() {
this.getOpenStatus();
this.getUserId();
window.onbeforeunload = function(e) {
localStorage.removeItem('giftListObj');
};
......@@ -500,6 +503,27 @@ export default {
}
},
methods: {
// 阶梯价定制，判断达摩测试环境与地素环境
// 达摩 ff8080815dacd3a2015dacd3ef5c0000
// 地素 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';
if (this.enterpriseId === id1 || this.enterpriseId === id2 || this.enterpriseId === id3) {
this.specialOrder = true;
} else {
this.specialOrder = false;
}
} else {
this.$message.error(res.data.message);
}
});
},
memberChange() {
// this.ladderMemberGradeChange = [];
// let lists = this.memberGradeList.filter(item => {
......@@ -512,8 +536,10 @@ export default {
// });
// });
// console.log(this.ladderMemberGradeChange);
this.setLadder();
this.submitLadderList = copy(this.list3);
if (this.isDifferentialPricing) {
this.setLadder();
this.submitLadderList = copy(this.list3);
}
},
changeladder(value) {
if (value.length) {
......
src/views/goods/gift/info.vue
......@@ -130,7 +130,7 @@
<el-option v-for="item in memberGradeList" :key="item.gradeId" :label="item.gradeName" :value="item.gradeId"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="ladder">
<el-form-item prop="ladder" v-if="specialOrder">
<el-checkbox-group v-model="giftForm.ladder" @change="changeladder" style="display:inline-block">
<el-checkbox label="1">设置阶梯价</el-checkbox>
</el-checkbox-group>
......@@ -592,7 +592,9 @@ export default {
},
memberGrade: '',
isEdit: false,
isCorrect: true // 校验阶梯价的验证是否可以保存阶梯价
isCorrect: true, // 校验阶梯价的验证是否可以保存阶梯价
enterpriseId: '', // 商户id
specialOrder: false // 是否定制
};
},
// watch: {
......@@ -606,6 +608,7 @@ export default {
mounted() {
this.getOpenStatus();
this.getUserId();
window.onbeforeunload = function(e) {
// var storage = window.localStorage;
// storage.clear('giftListObj');
......@@ -673,6 +676,27 @@ export default {
// // this.getGroupList();
// },
methods: {
// 阶梯价定制，判断达摩测试环境与地素环境
// 达摩 ff8080815dacd3a2015dacd3ef5c0000
// 地素 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';
if (this.enterpriseId === id1 || this.enterpriseId === id2 || this.enterpriseId === id3) {
this.specialOrder = true;
} else {
this.specialOrder = false;
}
} else {
this.$message.error(res.data.message);
}
});
},
memberChange() {
// this.ladderMemberGradeChange = [];
// let lists = this.memberGradeList.filter(item => {
......
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