@@ -28,7 +28,8 @@ Page({ | |||||
sec: "00", | sec: "00", | ||||
paramData:null, | paramData:null, | ||||
showErr:false, | showErr:false, | ||||
showTime:true | |||||
showTime: true, | |||||
merchantVoList: [] | |||||
}, | }, | ||||
/** | /** | ||||
@@ -203,7 +204,8 @@ Page({ | |||||
data.validStartDate = utils.formatTime(data.validStartDate, 'yyyy-MM-dd') | data.validStartDate = utils.formatTime(data.validStartDate, 'yyyy-MM-dd') | ||||
data.validEndDate = utils.formatTime(data.validEndDate, 'yyyy-MM-dd') | data.validEndDate = utils.formatTime(data.validEndDate, 'yyyy-MM-dd') | ||||
that.setData({ | that.setData({ | ||||
data | |||||
data, | |||||
merchantVoList: data.merchantVoList | |||||
}); | }); | ||||
}); | }); | ||||
}, | }, | ||||
@@ -30,7 +30,7 @@ | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<!-- 适用门店 --> | <!-- 适用门店 --> | ||||
<store merchantVoList="{{data.merchantVoList}}"></store> | |||||
<store merchantVoList="{{merchantVoList}}"></store> | |||||
<view class='text'> | <view class='text'> | ||||
<view class='p-des'> | <view class='p-des'> | ||||
<view class='p-title'>购买须知:</view> | <view class='p-title'>购买须知:</view> | ||||
@@ -46,7 +46,8 @@ Page({ | |||||
queueData: null, | queueData: null, | ||||
zIndex: 11, | zIndex: 11, | ||||
display: "none", | display: "none", | ||||
orderGroupId:'' | |||||
orderGroupId:'', | |||||
merchantVoList:[] | |||||
}, | }, | ||||
/** | /** | ||||
@@ -50,7 +50,7 @@ | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<!-- 适用门店 --> | <!-- 适用门店 --> | ||||
<store merchantVoList="{{merchantVoList}}"></store> | |||||
<store merchantVoList="{{merchantVoList}}"></store> | |||||
<view class='notes'> | <view class='notes'> | ||||
<view> | <view> | ||||
<text>购买须知</text> | <text>购买须知</text> | ||||