jufubao-mall 2.0.20 → 2.0.21-beta21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbMallHomeProductList/JfbMallHomeProductList.vue +1 -1
  3. package/src/components/JfbMallShop/JfbMallShop.vue +48 -50
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-mall",
3
- "version": "2.0.20",
3
+ "version": "2.0.21-beta21",
4
4
  "private": false,
5
5
  "description": "聚福宝商城业务组件插件包",
6
6
  "main": "index.js",
package/src/components/JfbMallHomeProductList/JfbMallHomeProductList.vue CHANGED
@@ -140,7 +140,7 @@
140
140
  </view>
141
141
  <!--商品列表-->
142
142
  <xd-no-data :scale-size="2" type="product" v-if="prodList && prodList.length === 0"></xd-no-data>
143
- <xd-more v-if="(isPreview || !hasNext) && prodList.length > 0" :color="footerColor" :background="footerColor"><text>我是有底线的</text></xd-more>
143
+ <xd-more v-if="(isPreview || !hasNext) && (prodList && prodList.length > 0)" :color="footerColor" :background="footerColor"><text>我是有底线的</text></xd-more>
144
144
  <xd-to-top :isPreview="isPreview" :mainColor="mainColor" ref="VT" :scrollTop="top"></xd-to-top>
145
145
  </view>
146
146
  </view>
package/src/components/JfbMallShop/JfbMallShop.vue CHANGED
@@ -67,62 +67,60 @@
67
67
  </view>
68
68
  <view class="shop_exchange_box">
69
69
  <template v-for="item in shopInfo.consume_options">
70
- <template v-if="isPreview || shopInfo.default_consume_type === item.consume_mode">
71
- <view v-if="item.consume_mode === 'WB' && showScan === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
72
- <view class="shop_wrap-exchange_txt">
73
- <view class="exchange_name">{{scanName}}</view>
74
- <view class="exchange_desc">{{item.desc}}</view>
75
- </view>
76
- <view class="shop_wrap-exchange_btn">
77
- <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{ scanBtnName }}</xd-button>
78
- </view>
70
+ <view v-if="item.consume_mode === 'WB' && showScan === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
71
+ <view class="shop_wrap-exchange_txt">
72
+ <view class="exchange_name">{{scanName}}</view>
73
+ <view class="exchange_desc">{{item.desc}}</view>
79
74
  </view>
80
- <view v-if="item.consume_mode === 'JHD' && showExchange==='Y'" class="shop_wrap-exchange" :key="item.consume_mode">
81
- <view class="shop_wrap-exchange_txt">
82
- <view class="exchange_name">{{ exchangeName }}</view>
83
- <view class="exchange_desc">{{item.desc}}</view>
84
- </view>
85
- <view class="shop_wrap-exchange_btn">
86
- <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{exchangeBtnName}}</xd-button>
87
- </view>
75
+ <view class="shop_wrap-exchange_btn">
76
+ <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{ scanBtnName }}</xd-button>
88
77
  </view>
89
- <view v-if="item.consume_mode === 'QP' && showTake === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
90
- <view class="shop_wrap-exchange_txt">
91
- <view class="exchange_name">{{takeName}}</view>
92
- <view class="exchange_desc">{{item.desc}}</view>
93
- </view>
94
- <view class="shop_wrap-exchange_btn">
95
- <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{takeBtnName}}</xd-button>
96
- </view>
78
+ </view>
79
+ <view v-if="item.consume_mode === 'JHD' && showExchange==='Y'" class="shop_wrap-exchange" :key="item.consume_mode">
80
+ <view class="shop_wrap-exchange_txt">
81
+ <view class="exchange_name">{{ exchangeName }}</view>
82
+ <view class="exchange_desc">{{item.desc}}</view>
97
83
  </view>
98
- <view v-if="item.consume_mode === 'SEAT' && showMovie === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
99
- <view class="shop_wrap-exchange_txt">
100
- <view class="exchange_name">{{movieName}}</view>
101
- <view class="exchange_desc">{{item.desc}}</view>
102
- </view>
103
- <view class="shop_wrap-exchange_btn">
104
- <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{ movieBtnName }}</xd-button>
105
- </view>
84
+ <view class="shop_wrap-exchange_btn">
85
+ <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{exchangeBtnName}}</xd-button>
106
86
  </view>
107
- <view v-if="item.consume_mode === 'HDSELF' && showFood === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
108
- <view class="shop_wrap-exchange_txt">
109
- <view class="exchange_name">{{foodName}}</view>
110
- <view class="exchange_desc">{{item.desc}}</view>
111
- </view>
112
- <view class="shop_wrap-exchange_btn">
113
- <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{foodBtnName}}</xd-button>
114
- </view>
87
+ </view>
88
+ <view v-if="item.consume_mode === 'QP' && showTake === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
89
+ <view class="shop_wrap-exchange_txt">
90
+ <view class="exchange_name">{{takeName}}</view>
91
+ <view class="exchange_desc">{{item.desc}}</view>
115
92
  </view>
116
- <view v-if="item.consume_mode === 'TRAVEL' && showTravel === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
117
- <view class="shop_wrap-exchange_txt">
118
- <view class="exchange_name">{{ travelName }}</view>
119
- <view class="exchange_desc">{{item.desc}}</view>
120
- </view>
121
- <view class="shop_wrap-exchange_btn">
122
- <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{travelBtnName}}</xd-button>
123
- </view>
93
+ <view class="shop_wrap-exchange_btn">
94
+ <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{takeBtnName}}</xd-button>
95
+ </view>
96
+ </view>
97
+ <view v-if="item.consume_mode === 'SEAT' && showMovie === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
98
+ <view class="shop_wrap-exchange_txt">
99
+ <view class="exchange_name">{{movieName}}</view>
100
+ <view class="exchange_desc">{{item.desc}}</view>
101
+ </view>
102
+ <view class="shop_wrap-exchange_btn">
103
+ <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{ movieBtnName }}</xd-button>
104
+ </view>
105
+ </view>
106
+ <view v-if="item.consume_mode === 'HDSELF' && showFood === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
107
+ <view class="shop_wrap-exchange_txt">
108
+ <view class="exchange_name">{{foodName}}</view>
109
+ <view class="exchange_desc">{{item.desc}}</view>
110
+ </view>
111
+ <view class="shop_wrap-exchange_btn">
112
+ <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{foodBtnName}}</xd-button>
113
+ </view>
114
+ </view>
115
+ <view v-if="item.consume_mode === 'TRAVEL' && showTravel === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
116
+ <view class="shop_wrap-exchange_txt">
117
+ <view class="exchange_name">{{ travelName }}</view>
118
+ <view class="exchange_desc">{{item.desc}}</view>
119
+ </view>
120
+ <view class="shop_wrap-exchange_btn">
121
+ <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{travelBtnName}}</xd-button>
124
122
  </view>
125
- </template>
123
+ </view>
126
124
  </template>
127
125
  </view>
128
126
  <view v-if="isShowCodeProduct && productList.length" class="code_product_wrap">