-
-->
+
+
-
+
@@ -100,7 +101,7 @@
- 确认
+ 确认
@@ -469,15 +470,19 @@ export default {
if (resultData.result == 0) {
if (resultData.content.length) {
this.activityList = [
- {
- activityCode:'',
- activityName:'普通产品',
- isKmh:'',
- cvaildateStr:'',
- }
- ]
- this.activityList = this.activityList.concat(resultData.content)
- this.active_sqy_show = true
+ {
+ activityCode:'',
+ activityName:'普通产品',
+ isKmh:'',
+ cvaildateStr:'',
+ }
+ ]
+ this.activityList = this.activityList.concat(resultData.content)
+ if(resultData.content[0].isKmh == 'KMH'){
+ this.active_show = true
+ }else{
+ this.active_sqy_show = true //代表其他产品
+ }
return
}
//正常后续跳转流程
@@ -497,20 +502,35 @@ export default {
})
},
//选择活动还是普通产品，弹框确认按钮
- // comfirmCheckActive(type) {
- comfirmCheckActive() {
- let param = {
- orderDTO: {
- orderInfoDTO: {
- orderNo: this.$CacheUtils.getLocItem('orderNo'),
- activeType: this.activityList[this.active_sqy_radio].isKmh,
- activityCode: this.activityList[this.active_sqy_radio].activityCode,
- cvaliDate : this.activityList[this.active_sqy_radio].cvaildateStr
- // activeType: type=='KMH'?this.active_radio == '1'?'KMH':'':type=='SQY'?this.active_sqy_radio=='1'?'SQY':'':''
+ comfirmCheckActive(type) {
+ let param
+ if(type == 'KMH'){
+ param = {
+ orderDTO: {
+ orderInfoDTO: {
+ orderNo: this.$CacheUtils.getLocItem('orderNo'),
+ activeType: this.activityList[this.active_radio].isKmh,
+ activityCode: this.activityList[this.active_radio].activityCode,
+ cvaliDate : this.activityList[this.active_radio].cvaildateStr
+ // activeType: type=='KMH'?this.active_radio == '1'?'KMH':'':type=='SQY'?this.active_sqy_radio=='1'?'SQY':'':''
+ }
+ }
+ }
+ }else{
+ param = {
+ orderDTO: {
+ orderInfoDTO: {
+ orderNo: this.$CacheUtils.getLocItem('orderNo'),
+ activeType: this.activityList[this.active_sqy_radio].isKmh,
+ activityCode: this.activityList[this.active_sqy_radio].activityCode,
+ cvaliDate : this.activityList[this.active_sqy_radio].cvaildateStr
+ // activeType: type=='KMH'?this.active_radio == '1'?'KMH':'':type=='SQY'?this.active_sqy_radio=='1'?'SQY':'':''
+ }
}
}
}
+
// 获取订单活动信息
saveOrderActiveType(param).then(res => {
this.active_show = false
@@ -587,7 +607,7 @@ export default {
}
.radio_class {
height: 47px;
- margin-bottom: 26px;
+ margin-bottom: 10px;
}
.dialog-comfirm-button {
width: 167px;
@@ -601,8 +621,8 @@ export default {
width: 19px;
height: 19px;
position: absolute;
- right: 26px;
- top: -22px;
+ right: 15px;
+ top: -30px;
}
.icon_image_close {
width: 19px;
@@ -635,7 +655,7 @@ export default {
}
.click_buttons {
padding-top: 5px;
- padding-right: 10px;
+ padding-right: 0px;
padding-bottom: 10px;
}
}
