Skip to content

I
integral-mall
Commit 07debd55 by 萱草
Options

update: 更改

parent 575454c2
Showing with 51 additions and 47 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.ddfae28c4b820801118d191bf85ef74b.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/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.be8aabf13848b6ca3aa7.js></script><script type=text/javascript src=./static/js/app.a3bc6a7cb39efe3f1679.js></script></body></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.2c36254039b7e7249b02a112ee2614cb.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/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.be8aabf13848b6ca3aa7.js></script><script type=text/javascript src=./static/js/app.e63e4e23012d4945f429.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/app.a3bc6a7cb39efe3f1679.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.e63e4e23012d4945f429.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/goods/coupon/coupon.vue
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
<div> <div>
<el-button type="text" @click="getLink(scope.row)" v-if="scope.row.canEdit">推广</el-button> <el-button type="text" @click="getLink(scope.row)" v-if="scope.row.canEdit">推广</el-button>
<el-button type="text" v-if="scope.row.status === 2 && scope.row.canEdit && scope.row.releaseType === 1" @click="deleteList(scope.row, 1)">下架</el-button> <el-button type="text" v-if="scope.row.status === 2 && scope.row.canEdit && scope.row.releaseType === 1" @click="deleteList(scope.row, 1)">下架</el-button>
<el-button type="text" @click="ladderList(scope.row)">阶梯价</el-button> <el-button type="text" @click="ladderList(scope.row)" v-if="scope.row.isDifferentialPricing">阶梯价</el-button>
<el-button type="text" v-if="scope.row.status === 2 && scope.row.canEdit && scope.row.releaseType === 2 && scope.row.isShelves === 1" @click="deleteList(scope.row, 2)">上架</el-button> <el-button type="text" v-if="scope.row.status === 2 && scope.row.canEdit && scope.row.releaseType === 2 && scope.row.isShelves === 1" @click="deleteList(scope.row, 2)">上架</el-button>
<el-button type="text" v-if="scope.row.status === 2 && scope.row.canEdit && scope.row.releaseType === 2 && scope.row.isShelves === 0" @click="deleteList(scope.row, 1)">下架</el-button> <el-button type="text" v-if="scope.row.status === 2 && scope.row.canEdit && scope.row.releaseType === 2 && scope.row.isShelves === 0" @click="deleteList(scope.row, 1)">下架</el-button>
<el-button type="text" v-if="scope.row.status === 1 && scope.row.canEdit" @click="deleteList(scope.row, 2)">上架</el-button> <el-button type="text" v-if="scope.row.status === 1 && scope.row.canEdit" @click="deleteList(scope.row, 2)">上架</el-button>
......
src/views/goods/coupon/info.vue
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item prop="memberGrade" :label="cliqueStatus ? '' : '适用会员'"> <el-form-item prop="memberGrade" :label="cliqueStatus ? '' : '适用会员'">
<el-select v-model="couponForm.memberGrade" multiple placeholder="请选择" size="small" class="w-600"> <el-select v-model="couponForm.memberGrade" multiple placeholder="请选择" size="small" class="w-600" @change="memberChange">
<el-option v-for="item in memberGradeList" :key="item.gradeId" :label="item.gradeName" :value="item.gradeId"> </el-option> <el-option v-for="item in memberGradeList" :key="item.gradeId" :label="item.gradeName" :value="item.gradeId"> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -196,7 +196,9 @@ ...@@ -196,7 +196,9 @@
</el-form> </el-form>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<el-button type="primary" @click="saveLadderDetail">保存</el-button> <div style="margin-top:10px;text-align:right">
<el-button type="primary" @click="saveLadderDetail">保存</el-button>
</div>
<el-button slot="reference" type="text" v-show="isDifferentialPricing" style="border-bottom:1px solid #1890ff;margin-left:15px;display:inline-block;position:absolute;top:12px" @click="setLadder">点击设置</el-button> <el-button slot="reference" type="text" v-show="isDifferentialPricing" style="border-bottom:1px solid #1890ff;margin-left:15px;display:inline-block;position:absolute;top:12px" @click="setLadder">点击设置</el-button>
</el-popover> </el-popover>
</el-form-item> </el-form-item>
...@@ -352,6 +354,7 @@ export default { ...@@ -352,6 +354,7 @@ export default {
integral: '', integral: '',
cash: '', cash: '',
list2: [], list2: [],
ladderMemberGradeChange: [],
getTimeAll: getInputVal.formatDate, getTimeAll: getInputVal.formatDate,
getTime: getInputVal.getTime, getTime: getInputVal.getTime,
getTime2: getInputVal.getTime2, getTime2: getInputVal.getTime2,
...@@ -398,8 +401,8 @@ export default { ...@@ -398,8 +401,8 @@ export default {
dataDialogueId: '', // 数据对话id dataDialogueId: '', // 数据对话id
ladder: [] ladder: []
}, },
uploadAction: window.location.origin + '/api-plug/upload-img?requestProject=integral-mall', // uploadAction: window.location.origin + '/api-plug/upload-img?requestProject=integral-mall',
// uploadAction: 'http://gicdev.demogic.com/api-plug/upload-img?requestProject=integral-mall', uploadAction: 'http://gicdev.demogic.com/api-plug/upload-img?requestProject=integral-mall',
headersUpload: { headersUpload: {
sign: '' sign: ''
}, },
...@@ -495,6 +498,19 @@ export default { ...@@ -495,6 +498,19 @@ export default {
} }
}, },
methods: { methods: {
memberChange() {
this.ladderMemberGradeChange = [];
let lists = this.memberGradeList.filter(item => {
return this.couponForm.memberGrade.join(',').indexOf(item.gradeId) != -1;
});
lists.forEach(item => {
this.ladderMemberGradeChange.push({
gradeId: item.gradeId,
gradeName: item.gradeName
});
});
// console.log(this.ladderMemberGradeChange);
},
changeladder(value) { changeladder(value) {
if (value.length) { if (value.length) {
this.isDifferentialPricing = 1; this.isDifferentialPricing = 1;
...@@ -503,18 +519,16 @@ export default { ...@@ -503,18 +519,16 @@ export default {
} }
}, },
setLadder() { setLadder() {
if (!this.isEdit) { this.ladderMemberGrade = [];
this.ladderMemberGrade = []; let lists = this.memberGradeList.filter(item => {
let lists = this.memberGradeList.filter(item => { return this.couponForm.memberGrade.join(',').indexOf(item.gradeId) != -1;
return this.couponForm.memberGrade.join('').indexOf(item.gradeId) != -1; });
}); lists.forEach(item => {
lists.forEach(item => { this.ladderMemberGrade.push({
this.ladderMemberGrade.push({ gradeId: item.gradeId,
gradeId: item.gradeId, gradeName: item.gradeName
gradeName: item.gradeName
});
}); });
} });
this.list2 = copy(this.ladderMemberGrade); this.list2 = copy(this.ladderMemberGrade);
this.ladderSkuList = copy(this.cardCouponList); this.ladderSkuList = copy(this.cardCouponList);
this.ladderSkuList.forEach(item => { this.ladderSkuList.forEach(item => {
...@@ -593,9 +607,11 @@ export default { ...@@ -593,9 +607,11 @@ export default {
} }
if (this.isDifferentialPricing && res.data.result.gradeProSkus.length > 0) { if (this.isDifferentialPricing && res.data.result.gradeProSkus.length > 0) {
this.list3 = res.data.result.gradeProSkus; // 阶梯价详情 this.list3 = res.data.result.gradeProSkus; // 阶梯价详情
this.submitLadderList = res.data.result.gradeProSkus;
} else { } else {
this.list3 = []; this.list3 = [];
} }
// console.log(this.list3);
// 积分费用包 // 积分费用包
if (res.data.result.cardCostList) { if (res.data.result.cardCostList) {
this.cardCouponList = res.data.result.cardCostList; this.cardCouponList = res.data.result.cardCostList;
...@@ -1173,53 +1189,41 @@ export default { ...@@ -1173,53 +1189,41 @@ export default {
} }
params.timeZones = timeLink.join('#'); params.timeZones = timeLink.join('#');
this.submitLoading = true; this.submitLoading = true;
// if (this.ladderMemberGrade.length === this.list2.length) { // if (this.cardCouponList.length === this.ladderSkuList.length) {
// let num = 0; // let num2 = 0;
// this.ladderMemberGrade.map(v1 => { // this.cardCouponList.map(v1 => {
// this.list2.forEach(v2 => { // this.ladderSkuList.forEach(v2 => {
// if (v1.gradeId !== v2.gradeId) { // if (v1.proRefId !== v2.proRefId) {
// num++; // num2++;
// } // }
// }); // });
// }); // });
// console.log(num); // let num = 0;
// let num2 = 0; // if (this.ladderMemberGradeChange.length) {
// if (this.combineListPre.length === this.combineList.length && this.combineListPre.length && this.combineList.length) { // this.ladderMemberGradeChange.map(v1 => {
// this.combineListPre.map(v1 => { // this.list2.forEach(v2 => {
// this.combineList.forEach(v2 => { // if (v1.gradeId !== v2.gradeId) {
// if (v1.mapId !== v2.mapId) { // num++;
// num2++;
// } // }
// }); // });
// }); // });
// } // }
// console.log(num2);
// if (!num && !num2) { // if (!num && !num2) {
// this.saveDeatail(params); // this.saveDeatail(params);
// } else { // } else {
// this.confirmDetail(params); // this.confirmDetail(params);
// } // }
// } else { // } else {
this.confirmDetail(params); // this.confirmDetail(params);
// } // }
// request.post('/api-integral-mall/create-integral-pro', params).then(res => { this.confirmDetail(params);
// if (res.data.errorCode === 0) {
// this.$router.push({
// name: 'coupon'
// });
// this.submitLoading = false;
// } else {
// this.$message.error(res.data.message);
// this.submitLoading = false;
// }
// });
} else { } else {
return false; return false;
} }
}); });
}, },
confirmDetail(params) { confirmDetail(params) {
this.$confirm('<div>更改规格或适用会员后未去设置阶梯价，会导致阶梯价未变动，是否继续操作?</div>', '提示', { this.$confirm('<div>如更改规格或适用会员后，请先去设置阶梯价并保存，否则会使用原阶梯价，是否继续操作?</div>', '提示', {
closeOnClickModal: false, closeOnClickModal: false,
showClose: false, showClose: false,
type: 'warning', type: 'warning',
...@@ -1236,7 +1240,7 @@ export default { ...@@ -1236,7 +1240,7 @@ export default {
if (res.data.errorCode === 0) { if (res.data.errorCode === 0) {
this.$message.success('保存成功'); this.$message.success('保存成功');
this.$router.push({ this.$router.push({
name: 'gift' name: 'coupon'
}); });
this.submitLoading = false; this.submitLoading = false;
} else { } else {
......
src/views/goods/gift/gift.vue
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
<div> <div>
<el-button type="text" @click="getLink(scope.row)" v-if="scope.row.canEdit">推广</el-button> <el-button type="text" @click="getLink(scope.row)" v-if="scope.row.canEdit">推广</el-button>
<el-button type="text" v-if="scope.row.changeType === '5' && scope.row.canEdit" @click="getCouponList(scope.row.integralMallProId)">券码</el-button> <el-button type="text" v-if="scope.row.changeType === '5' && scope.row.canEdit" @click="getCouponList(scope.row.integralMallProId)">券码</el-button>
<el-button type="text" @click="ladderList(scope.row)">阶梯价</el-button> <el-button type="text" @click="ladderList(scope.row)" v-if="scope.row.isDifferentialPricing">阶梯价</el-button>
<el-button type="text" v-if="scope.row.status === 2 && scope.row.canEdit && scope.row.releaseType === 1" @click="deleteList(scope.row, 1)">下架</el-button> <el-button type="text" v-if="scope.row.status === 2 && scope.row.canEdit && scope.row.releaseType === 1" @click="deleteList(scope.row, 1)">下架</el-button>
<el-button type="text" v-if="scope.row.status === 2 && scope.row.canEdit && scope.row.releaseType === 2 && scope.row.isShelves === 1" @click="deleteList(scope.row, 2)">上架</el-button> <el-button type="text" v-if="scope.row.status === 2 && scope.row.canEdit && scope.row.releaseType === 2 && scope.row.isShelves === 1" @click="deleteList(scope.row, 2)">上架</el-button>
<el-button type="text" v-if="scope.row.status === 2 && scope.row.canEdit && scope.row.releaseType === 2 && scope.row.isShelves === 0" @click="deleteList(scope.row, 1)">下架</el-button> <el-button type="text" v-if="scope.row.status === 2 && scope.row.canEdit && scope.row.releaseType === 2 && scope.row.isShelves === 0" @click="deleteList(scope.row, 1)">下架</el-button>
......
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