Skip to content

I
integral-mall
Commit b0d3d378 by huaying
Options

fix: bug修复

parent 5961a841
Showing with 96 additions and 10 deletions
src/components/couponLadderPrice.vue
......@@ -18,7 +18,22 @@
<el-input size="small" v-model.trim="list3[index].skuList[0].giftProSkuIntegral" style="width:180px" />
</el-form-item>
<el-form-item label="现金">
<el-input size="small" v-model.trim="list3[index].skuList[0].giftProSkuCash" style="width:180px" />&nbsp;&nbsp;元
<el-popover
popper-class="noClass"
v-if="jifenquanxian == true"
placement="bottom"
trigger="hover"
content="无积分购现金权限">
<el-input slot="reference"
size="small"
:disabled="jifenquanxian"
v-model.trim="list3[index].skuList[0].giftProSkuCash"
style="width:180px" />
</el-popover>
<el-input v-else
size="small"
v-model.trim="list3[index].skuList[0].giftProSkuCash"
style="width:180px" />&nbsp;&nbsp;元
</el-form-item>
</el-form>
</el-tab-pane>
......@@ -46,6 +61,7 @@ export default {
},
data () {
return {
jifenquanxian: '',
selectTab: 0,
loading: false,
dialogVisible: false,
......@@ -58,6 +74,7 @@ export default {
};
},
created () {
this.jifenquanxian = localStorage.getItem('limitCodeType') == 'true';
this.dialogVisible = true;
this.id = this.ladderPriceData.id;
this.getInfo();
......
src/components/giftLadderPrice.vue
......@@ -25,7 +25,23 @@
v-model="integral"
size="small"
/>
<el-popover
popper-class="noClass"
v-if="jifenquanxian"
placement="bottom"
trigger="hover"
content="无积分购现金权限">
<el-input
slot="reference"
:disabled="jifenquanxian"
class="w-100"
placeholder="请输入金额"
v-model="cash"
size="small"
/>
</el-popover>
<el-input
v-else
class="w-100"
placeholder="请输入金额"
v-model="cash"
......@@ -48,7 +64,18 @@
</el-table-column>
<el-table-column label="现金(元)">
<template slot-scope="{ row }">
<el-input size="small" v-model.trim="row.giftProSkuCash" />
<el-popover
popper-class="noClass"
v-if="jifenquanxian == true"
placement="bottom"
trigger="hover"
content="无积分购现金权限">
<el-input slot="reference"
size="small"
v-model.trim="row.giftProSkuCash"
:disabled="jifenquanxian"/>
</el-popover>
<el-input v-else size="small" v-model.trim="row.giftProSkuCash" />
</template>
</el-table-column>
</el-table>
......@@ -57,7 +84,22 @@
<el-input size="small" v-model.trim="list3[index].skuList[0].giftProSkuIntegral" style="width:180px" />
</el-form-item>
<el-form-item label="现金">
<el-input size="small" v-model.trim="list3[index].skuList[0].giftProSkuCash" style="width:180px" />&nbsp;&nbsp;元
<el-popover
popper-class="noClass"
v-if="jifenquanxian == true"
placement="bottom"
trigger="hover"
content="无积分购现金权限">
<el-input slot="reference"
size="small"
:disabled="jifenquanxian"
v-model.trim="list3[index].skuList[0].giftProSkuCash"
style="width:180px" />
</el-popover>
<el-input v-else
size="small"
v-model.trim="list3[index].skuList[0].giftProSkuCash"
style="width:180px" />&nbsp;&nbsp;元
</el-form-item>
</el-form>
</el-tab-pane>
......@@ -86,6 +128,7 @@ export default {
},
data () {
return {
jifenquanxian: '',
selectTab: 0,
loading: false,
dialogVisible: false,
......@@ -104,6 +147,7 @@ export default {
};
},
created () {
this.jifenquanxian = localStorage.getItem('limitCodeType') == 'true';
// console.log(this.ladderPriceData);
this.dialogVisible = true;
this.id = this.ladderPriceData.id;
......@@ -168,6 +212,10 @@ export default {
break;
}
if ((skuList[j].giftProSkuCash === '' || skuList[j].giftProSkuCash === null) && skuList[j].giftProSkuIntegral) {
if (this.jifenquanxian) {
skuList[j].giftProSkuCash = 0;
return;
}
this.isCorrect = false;
this.$message.error('已填入积分，则必填现金');
break;
......
src/views/goods/coupon/detail.vue
......@@ -1493,6 +1493,20 @@ export default {
if (!data) return false;
this.$refs[couponForm].validate(valid => {
if (valid) {
if (this.submitLadderList) {
// eslint-disable-next-line array-callback-return
this.submitLadderList.map(item => {
// eslint-disable-next-line array-callback-return
item.skuList.map(item2 => {
if (this.jifenquanxian && this.isCopy) {
item2.giftProSkuCash = 0;
} else {
// eslint-disable-next-line no-unused-expressions
item2.giftProSkuCash == 0 ? '0.00' : item2.giftProSkuCash;
}
});
});
}
let params = {
proName: this.cardList.length > 1 ? this.couponForm.proName : this.cardList[0].cardName,
integralMallProId: this.isCopy ? '' : (this.mallProId === '-1' ? '' : this.mallProId), // 礼品id
......
src/views/goods/gift/detail.vue
......@@ -2326,23 +2326,29 @@ export default {
if(!data) return false;
this.$refs[form].validate(valid => {
if (valid) {
if(this.submitLadderList.skuList) {
this.submitLadderList.skuList.map(item=>{
item.giftProSkuCash == 0 ? '0.00' : item.giftProSkuCash
if(this.submitLadderList) {
this.submitLadderList.map(item=>{
item.skuList.map(item2=>{
if(this.jifenquanxian&&this.isCopy){
item2.giftProSkuCash = 0
}else{
item2.giftProSkuCash == 0 ? '0.00' : item2.giftProSkuCash
}
})
})
}
if(this.submitSkuJson) {
this.submitSkuJson.map(item=>{
console.log(item.giftProSkuCash, 'giftProSkuCash');
if(item.giftProSkuCash){
console.log(item.giftProSkuCash, 'iiii');
if(this.jifenquanxian&&this.isCopy){
item.giftProSkuCash = '0.00'
}
}else{
console.log(item.giftProSkuCash, 'ooo');
item.giftProSkuCash = '0.00'
}
})
}
console.log(this.submitSkuJson, 'dfsdfd');
let params = {
integralMallProId: this.isCopy? (this.giftType == 1? '' : this.mallProId):this.mallProId === '-1' ? '' : this.mallProId, //礼品id 复制时 虚拟礼品拿到新id 实物礼品不传id
proType: this.giftForm.changeType === 1 ? 2 : 3, //发货方式是微信兑换券传2其他传3
......@@ -2385,6 +2391,7 @@ export default {
};
// 可见配置参数组装
params = {...params,...data};
console.log(params, 'params');
if (this.pickUpPointType === 4) {
params.pickUpPoint = this.pickUpPointStr;
}
......
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