Skip to content

I
integral-mall
Commit 5041613f by damodmg
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !49
parents c6487012 2e008d9e
Showing with 67 additions and 22 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.bf5d76c952e599554350b3884edf8228.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.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.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.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bf93010d9b9b1322a27b.js></script><script type=text/javascript src=./static/js/app.74fcff9c879331eefcc2.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.09fb6a01ac26639bc669ed3a1f28b8ff.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.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.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.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bf93010d9b9b1322a27b.js></script><script type=text/javascript src=./static/js/app.1c5da674d3974e960e05.js></script></body></html>
\ No newline at end of file
dist/static/js/app.1c5da674d3974e960e05.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.74fcff9c879331eefcc2.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
......@@ -99,7 +99,7 @@
<p style="line-height:1.5;padding: 10px 10px 20px;">确定删除该商品吗？</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="scope.row.visible2 = false">取消</el-button>
<el-button type="primary" size="mini" @click="deleteList(scope.row, 0)">确定</el-button>
<el-button type="primary" size="mini" @click="deleteList(scope.row, 0, scope.$index)">确定</el-button>
</div>
<el-button slot="reference" type="text">删除</el-button>
</el-popover>
......@@ -269,7 +269,7 @@ export default {
});
},
// 删除操作
deleteList(item, type) {
deleteList(item, type, index) {
let params = {
proId: item.integralMallProId,
type: Number(type)
......@@ -278,6 +278,14 @@ export default {
if (res.data.errorCode === 0) {
let text = Number(type) === 0 ? '删除成功' : Number(type) === 1 ? '下架成功' : '上架成功';
this.$message.success(text);
if (Number(type) === 0) {
this.tableDate.splice(index, 1);
if (this.tableDate.length === 0) {
if (this.currentPage > 1) {
this.currentPage = this.currentPage - 1;
}
}
}
this.getList(); //拉取列表
} else {
this.$message.error(res.data.message);
......
src/views/goods/gift/addSku.vue
......@@ -274,8 +274,8 @@ export default {
this.$nextTick(() => {
item.valueName = getInputVal.getInputVal(value, 10);
});
this.searchStandardValue = item.valueName;
this.getValueId();
this.searchStandardValue = value;
this.getValueId(item);
},
spliceStandard(value, item) {
this.$nextTick(() => {
......
src/views/goods/gift/gift.vue
......@@ -110,7 +110,7 @@
<p style="line-height:1.5;padding: 10px 10px 20px;">确定删除该商品吗？</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="scope.row.visible2 = false">取消</el-button>
<el-button type="primary" size="mini" @click="deleteList(scope.row, 0)">确定</el-button>
<el-button type="primary" size="mini" @click="deleteList(scope.row, 0, scope.$index)">确定</el-button>
</div>
<el-button slot="reference" type="text">删除</el-button>
</el-popover>
......@@ -370,7 +370,7 @@ export default {
});
},
// 删除操作
deleteList(item, type) {
deleteList(item, type, index) {
let params = {
proId: item.integralMallProId,
type: Number(type)
......@@ -379,6 +379,14 @@ export default {
if (res.data.errorCode === 0) {
let text = Number(type) === 0 ? '删除成功' : Number(type) === 1 ? '下架成功' : '上架成功';
this.$message.success(text);
if (Number(type) === 0) {
this.tableDate.splice(index, 1);
if (this.tableDate.length === 0) {
if (this.currentPage > 1) {
this.currentPage = this.currentPage - 1;
}
}
}
this.getList(); //拉取列表
} else {
this.$message.error(res.data.message);
......
src/views/goods/gift/info.vue
......@@ -436,7 +436,14 @@ export default {
};
this.giftType = Number(this.$route.query.type); //列表上实物是1虚拟是0
this.mallProId = this.$route.query.giftId;
this.giftForm.proReferId = this.$route.query.proReferId;
if (this.$route.query.proReferId !== '-1') {
//编辑
this.giftForm.proReferId = this.$route.query.proReferId;
} else {
//新增
this.giftForm.proReferId = '';
}
this.getCategoryOptions(); //分类数据
this.getMemberGradeList(); //会员等级列表
if (this.giftType === 1) {
......@@ -594,7 +601,7 @@ export default {
this.giftForm.marketPrice = res.data.result.marketPrice; //市场价
this.giftForm.detailDescription = res.data.result.detailDescription; //图文详情
this.giftForm.memberGrade = res.data.result.memberGrade.split(','); //适用会员
this.giftForm.proReferId = res.data.result.proReferId;
if (res.data.result.images) {
//主图
for (let item of res.data.result.images) {
......@@ -1139,7 +1146,7 @@ export default {
let outArr1;
let skuPrice = [];
let skuSta = [];
if (skuArr[0].length) {
if (skuArr[0]) {
for (let i in skuArr) {
// console.log(777, skuArr[0]);
//先获取sku价格条码这些
......@@ -1159,7 +1166,7 @@ export default {
}
// return false;
this.submitSkuJson = [];
if (skuArr[0].length) {
if (skuArr[0]) {
for (let j in skuArr) {
//数据的个数
this.submitSkuJson.push({
......@@ -1220,7 +1227,24 @@ export default {
giftImageFiledCodes.push(item.imageCode);
}
}
//校验规格明细
if (this.giftProStandardJson) {
for (let item of this.giftProStandardJson) {
if (item.standardId === '') {
this.$message.error('请填写完整的规格');
return false;
} else if (item.valueList.length === 0) {
this.$message.error('请填写完整的规格');
return false;
}
for (let item1 of item.valueList) {
if (item1.valueName === '' || item1.valueId === '') {
this.$message.error('请填写完整的规格');
return false;
}
}
}
}
//校验规格明细
if (this.submitSkuJson.length) {
for (let item of this.submitSkuJson) {
......@@ -1326,7 +1350,7 @@ export default {
proName: this.giftForm.proName, //礼品名称
giftImageUrls: giftImageUrls.join(','), //礼品主图
giftImageFiledCodes: giftImageFiledCodes.join(','),
proReferId: this.giftForm.changeType === 1 ? this.giftForm.proReferId : '', //关联id
proReferId: this.giftForm.proReferId, //关联id
cardType: this.giftForm.changeType === 1 ? this.giftForm.cardType : '', //卡券类型
proCategoryId: this.giftForm.proCategoryId, //礼品分类
detailDescription: this.giftForm.detailDescription, //图文详情
......@@ -1353,7 +1377,6 @@ export default {
releaseType: this.giftForm.releaseType, //上架状态
limitTimeBegin: this.giftForm.releaseType === 2 ? this.getTimeAll(this.giftForm.limitTimeBegin) : '', //定时上架时间
changeType: this.giftType === 0 ? String(this.giftForm.changeType) : this.giftForm.changeTypeList.join(','), //配送方式
// proReferId: this.giftForm.changeType === 1 ? this.proReferId : '', //微信兑换券
refundType: this.giftForm.refundType, //售后
giftProStandardJson: this.giftProStandardJson ? JSON.stringify(this.giftProStandardJson) : '', //规格列表
skuJson: this.submitSkuJson.length ? JSON.stringify(this.submitSkuJson) : '' //sku数据
......@@ -1383,6 +1406,7 @@ export default {
}
}
params.timeZones = timeLink.join('#');
this.submitLoading = true;
request.post('/api-integral-mall/create-integral-pro', params).then(res => {
if (res.data.errorCode === 0) {
......
src/views/order/orderDetail.vue
......@@ -209,11 +209,10 @@
</td>
<td>{{ orderDetail.goodsNum }}</td>
<td>
<span v-if="orderStatus <= 0">交易关闭</span>
<span v-if="orderStatus === 11">待付款</span>
<span v-if="orderStatus === 3">已发货</span>
<span v-if="orderStatus === 4">交易成功</span>
<span v-if="orderStatus === 1 || orderStatus === 2">已付款</span>
<span v-if="orderDetail.refundStatus === 0">退款中</span>
<span v-else-if="orderDetail.refundStatus === 1">退款成功</span>
<span v-else-if="orderDetail.refundStatus === 2">退款关闭</span>
<span v-else-if="orderDetail.refundStatus === -1">--</span>
</td>
<td>
<div>￥{{ orderDetail.cashShouldPay }}</div>
......
src/views/setting/deliverSet.vue
......@@ -47,7 +47,7 @@
<p style="line-height:1.5;padding: 10px 10px 20px;">确定删除该自提点吗？</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="scope.row.visible2 = false">取消</el-button>
<el-button type="primary" size="mini" @click="deletePoint(scope.row)">确定</el-button>
<el-button type="primary" size="mini" @click="deletePoint(scope.row, scope.$index)">确定</el-button>
</div>
<el-button slot="reference" type="text">删除</el-button>
</el-popover>
......@@ -171,12 +171,18 @@ export default {
});
},
//删除自提点
deletePoint(item) {
deletePoint(item, index) {
let params = {
integralMallPickUpPointId: item.integralMallPickUpPointId
};
request.get('/api-integral-mall/delete-pick-up-point', { params }).then(res => {
if (res.data.errorCode === 0) {
this.tableDate.splice(index, 1);
if (this.tableDate.length === 0) {
if (this.currentPage > 1) {
this.currentPage = this.currentPage - 1;
}
}
this.getList();
} else {
this.$message.error(res.data.message);
......
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