Skip to content

I
integral-mall
Commit bd7212c2 by damodmg
Options

调整

parent ba84d3ef
Showing with 33 additions and 12 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.483bf34521d3852f90adb1618cbd8518.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/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.b8457af7b78f55e06584.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.9ae6d1940c49c010ce3ad33ff0c8e911.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/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.d4079795272114a03e9d.js></script></body></html>
\ No newline at end of file
dist/static/css/app.483bf34521d3852f90adb1618cbd8518.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.9ae6d1940c49c010ce3ad33ff0c8e911.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.b8457af7b78f55e06584.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.d4079795272114a03e9d.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/goods/gift/addSku.vue
......@@ -125,7 +125,9 @@ export default {
stock: '',
code: '',
barCode: '',
spuStock: 0
spuStock: 0,
searchStandard: '',
searchStandardValue: ''
// isStdImg: false
};
},
......@@ -142,7 +144,8 @@ export default {
standradIds = '';
}
let params = {
standardIds: standradIds
standardIds: standradIds,
search: this.searchStandard
};
request.get('/api-integral-mall/load-standard', { params }).then(res => {
if (res.data.errorCode === 0) {
......@@ -221,7 +224,8 @@ export default {
}
let params = {
standardId: item.standardId,
standardValueIds: standardValueIdArr.join(',')
standardValueIds: standardValueIdArr.join(','),
search: this.searchStandardValue
};
request.get('/api-integral-mall/load-standard_value', { params }).then(res => {
if (res.data.errorCode === 0) {
......@@ -260,11 +264,15 @@ export default {
this.$nextTick(() => {
item.valueName = getInputVal.getInputVal(value, 10);
});
this.searchStandardValue = item.valueName;
this.getValueId();
},
spliceStandard(value, item) {
this.$nextTick(() => {
item.standardName = getInputVal.getInputVal(value, 10);
});
this.searchStandard = item.standardName;
this.getStandardList();
},
//去重规格值
getStdValueList(item) {
......@@ -792,4 +800,9 @@ export default {
width: 30px;
height: 30px;
}
/* 下拉滚动 */
.el-dropdown-menu {
height: 200px !important;
overflow-y: auto !important;
}
</style>
src/views/goods/gift/info.vue
......@@ -289,7 +289,7 @@ export default {
releaseType: 1, //上架时间
limitTimeBegin: '', //上架时间具体
changeType: 1, //配送方式T
refundType: 1, //是否允许退款
refundType: 0, //是否允许退款
costValue: '', //礼品成本
proCode: '', //编码
integralCost: '', //积分
......@@ -980,8 +980,16 @@ export default {
//校验规格明细
if (this.submitSkuJson.length) {
for (let item of this.submitSkuJson) {
if (item.giftPropValues.length) {
for (let i of item.giftPropValues) {
if (i.proId === '' || i.proName === '' || i.valueId === '' || i.valueName === '') {
this.$message.error('请填写完整的sku数据');
return false;
}
}
}
if (!item.stock) {
this.$message.error('请填写库存2');
this.$message.error('请填写库存');
return false;
}
if (!item.giftProSkuCash) {
......@@ -1015,7 +1023,7 @@ export default {
this.$message.error('请填写礼品现金');
return false;
} else if (this.giftForm.virtualStock === '') {
this.$message.error('请填写礼品库存1');
this.$message.error('请填写礼品库存');
return false;
}
if (Number(this.giftForm.virtualStock) === 0) {
......
src/views/order/getCloseDetail.vue
<template>
<el-dialog title="查看详情" :visible.sync="closeInfoModal.dialogVisible" width="600px" @close="cancelSubmit('closeInfoModal')">
<el-form :model="closeInfoModal" ref="closeInfoModal" :rules="modalRules">
<el-form-item label="收件人" label-width="80px">
<el-form-item label="收件人" label-width="80px" v-show="closeInfoModal.changeType === 2">
<span>{{ closeInfoModal.consignee }}</span>
</el-form-item>
<el-form-item label="联系方式" label-width="80px">
<el-form-item label="联系方式" label-width="80px" v-show="closeInfoModal.changeType === 2">
<span>{{ closeInfoModal.consigneePhone }}</span>
</el-form-item>
<el-form-item label="收货地址" label-width="80px">
<el-form-item label="收货地址" label-width="80px" v-show="closeInfoModal.changeType === 2">
<span>{{ closeInfoModal.receivingAddress }}</span>
</el-form-item>
<el-form-item label="取消时间" label-width="80px">
......
src/views/order/giftExchange.vue
......@@ -480,7 +480,7 @@ export default {
this.closeInfoModal.cancelTime = res.data.result.changeLog.cancelTime; //取消时间时间
this.closeInfoModal.clerkName = res.data.result.changeLog.clerkName; //操作人员
this.closeInfoModal.cancelReason = res.data.result.changeLog.cancelReason; //取消原因
this.closeInfoModal.changeType = item.changeType;
this.closeInfoModal.dialogVisible = true;
} 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