Commit bae3a221 authored by 罗超's avatar 罗超

Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel

parents 43461bc8 61108758
...@@ -45,9 +45,9 @@ ...@@ -45,9 +45,9 @@
</view> </view>
<view class="cdTiaojianBRight"> <view class="cdTiaojianBRight">
<view class="cdTiaojianBRTitle">使用说明</view> <view class="cdTiaojianBRTitle">使用说明</view>
<view class="cdTiaojianBRText">券类型:{{ g.couponsType==1?'抵用券':'折扣' }}</view> <view class="cdTiaojianBRText">券类型:{{ g.couponsType==1?'抵用券':'折扣' }}</view>
<view class="cdTiaojianBRText">使用范围:{{ g.couponsUseScopeName }}</view> <view class="cdTiaojianBRText">使用范围:{{ g.couponsUseScopeName }}</view>
<!-- <view class="cdTiaojianBRText">{{ g.remark }}</view> --> <view class="cdTiaojianBRText" v-if="x.remark&&x.remark!=''">备注:{{ g.remark }}</view>
</view> </view>
</view> </view>
<view class="cdTiaojianButtom" @click="gouseUrl(g)">立即使用</view> <view class="cdTiaojianButtom" @click="gouseUrl(g)">立即使用</view>
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</Text> </Text>
<Text class="small" style="font-family: microsoft yahei ui light;margin-left: 5rpx;">{{ x.couponsType != 1? "折" : "" }}</Text> <Text class="small" style="font-family: microsoft yahei ui light;margin-left: 5rpx;">{{ x.couponsType != 1? "折" : "" }}</Text>
</view> </view>
<view class="tiaojian">{{x.couponsType==1?'抵扣券':'折扣'}}</view> <view class="tiaojian">{{x.couponsType==1?'抵扣券':'折扣'}}</view>
</view> </view>
</view> </view>
<view class="detail"> <view class="detail">
......
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