jufubao-mall 2.0.119 → 2.0.121

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 (5) hide show
  1. package/get.package.path.js +2 -2
  2. package/package.json +1 -1
  3. package/src/components/JfbMallProductList/JfbMallProductList.vue +10 -0
  4. package/src/components/JfbMallResourceShop/ShowCard.vue +6 -6
  5. package/src/components/JfbMallShop/ShowCard.vue +6 -6
package/get.package.path.js CHANGED
@@ -8,11 +8,11 @@
8
8
  */
9
9
  const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
10
10
  if(packname === 'gxd-commands-bussiness') {
11
- return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
11
+ return `/Users/shiyonggao/home/root/Base-Jufubao/xd-commands-bussiness/${threePackagePath}`;
12
12
  }
13
13
 
14
14
  if (packname === 'gxd-uni-library-editx') {
15
- return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
15
+ return `/Users/shiyonggao/home/root/Base-Jufubao/xd-uni-library-editx/${threePackagePath}`;
16
16
  }
17
17
 
18
18
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-mall",
3
- "version": "2.0.119",
3
+ "version": "2.0.121",
4
4
  "private": false,
5
5
  "description": "聚福宝商城业务组件插件包",
6
6
  "main": "index.js",
package/src/components/JfbMallProductList/JfbMallProductList.vue CHANGED
@@ -154,6 +154,7 @@
154
154
  :height="contProductImageHeight"
155
155
  :cell="column_num"
156
156
  :name-font="itemFontStyle"
157
+ :price-font="itemPriceFontStyle"
157
158
  :product-config="productConfig"
158
159
  :isPlus="isGVipSite"
159
160
  :item="item"
@@ -324,6 +325,7 @@
324
325
  imageRadius:'0',
325
326
  radius:'0',
326
327
  itemFontStyle:{},
328
+ itemPriceFontStyle:{},
327
329
  itemBgcColor:'',
328
330
  contBorder:'',
329
331
  contStyleBorder:0,
@@ -953,6 +955,14 @@
953
955
  gCPVal(container,'contStyle', {}, {sKey:'contStyleStatus',fields:['itemSpacing','contStyle']}),
954
956
  {fontSize: '28rpx', color: '#000', fontWeight: 'normal'},
955
957
  )
958
+ this.itemPriceFontStyle = this.getFontAndBgcStyle(
959
+ gCPVal(container,'priceFont', {}, {sKey:'priceFontStatus',fields:['priceFont']}),
960
+ {fontSize: '40', color: '', fontWeight: 'normal'},
961
+ )
962
+ //配置面板存储的fontSize带rpx后缀，此处去除避免下游重复拼接rpx导致单位无效
963
+ if (this.itemPriceFontStyle && this.itemPriceFontStyle.fontSize) {
964
+ this.itemPriceFontStyle.fontSize = String(this.itemPriceFontStyle.fontSize).replace('rpx', '');
965
+ }
956
966
 
957
967
  //商品样式关联属性
958
968
  const sValue = "{\"border\":0,\"backgroundColor\":\"#fff\"}";
package/src/components/JfbMallResourceShop/ShowCard.vue CHANGED
@@ -42,9 +42,9 @@
42
42
  </slot>
43
43
  </xd-no-data>
44
44
  </view>
45
- <view class="qrcode_choose" @click="handleChooseCard">
45
+ <view class="qrcode_choose" v-if="showCardList.length" @click="handleChooseCard">
46
46
  <view class="qrcode_choose_name"><xd-font-icon style="margin-right: 24rpx;" size="32" icon="iconpiao"></xd-font-icon>{{card_name}}</view>
47
- <view class="qrcode_choose_icon"><xd-font-icon style="margin-left: 4rpx;" size="22" icon="iconxiangyou_xian"></xd-font-icon></view>
47
+ <view class="qrcode_choose_icon"><view>切换票券</view><xd-font-icon style="margin-left: 4rpx;" size="22" icon="iconxiangyou_xian"></xd-font-icon></view>
48
48
  </view>
49
49
  <xd-down-drawer
50
50
  :show.sync="showCardDialog"
@@ -269,10 +269,10 @@
269
269
  }).then(res => {
270
270
  this.showCardList = res.list;
271
271
 
272
- //自动选择逻辑
273
- let useCard = this.showCardList.filter(item => item.is_auto_use === 'Y');
274
- if(useCard.length>0 && this.chooseData.length ===0) {
275
- let ticket = useCard[0];
272
+ //自动选择逻辑：优先选择is_login为Y的卡，否则选择第一张卡
273
+ if(this.chooseData.length === 0 && this.showCardList.length) {
274
+ let useCard = this.showCardList.filter(item => item.is_login === 'Y');
275
+ let ticket = useCard.length > 0 ? useCard[0] : this.showCardList[0];
276
276
  this.handlerTicketSelect(!this.checkedCards.includes(ticket.card_number), ticket);
277
277
  setTimeout(() => {
278
278
  this.handleChooseConfirm()
package/src/components/JfbMallShop/ShowCard.vue CHANGED
@@ -42,9 +42,9 @@
42
42
  </slot>
43
43
  </xd-no-data>
44
44
  </view>
45
- <view class="qrcode_choose" @click="handleChooseCard">
45
+ <view class="qrcode_choose" v-if="showCardList.length" @click="handleChooseCard">
46
46
  <view class="qrcode_choose_name"><xd-font-icon style="margin-right: 24rpx;" size="32" icon="iconpiao"></xd-font-icon>{{card_name}}</view>
47
- <view class="qrcode_choose_icon"><xd-font-icon style="margin-left: 4rpx;" size="22" icon="iconxiangyou_xian"></xd-font-icon></view>
47
+ <view class="qrcode_choose_icon"><view>切换票券</view><xd-font-icon style="margin-left: 4rpx;" size="22" icon="iconxiangyou_xian"></xd-font-icon></view>
48
48
  </view>
49
49
  <xd-down-drawer
50
50
  :show.sync="showCardDialog"
@@ -276,10 +276,10 @@
276
276
  }).then(res => {
277
277
  this.showCardList = res.list;
278
278
 
279
- //自动选择逻辑
280
- let useCard = this.showCardList.filter(item => item.is_auto_use === 'Y');
281
- if(useCard.length>0 && this.chooseData.length ===0) {
282
- let ticket = useCard[0];
279
+ //自动选择逻辑：优先选择is_login为Y的卡，否则选择第一张卡
280
+ if(this.chooseData.length === 0 && this.showCardList.length) {
281
+ let useCard = this.showCardList.filter(item => item.is_login === 'Y');
282
+ let ticket = useCard.length > 0 ? useCard[0] : this.showCardList[0];
283
283
  this.handlerTicketSelect(!this.checkedCards.includes(ticket.card_number), ticket);
284
284
  setTimeout(() => {
285
285
  this.handleChooseConfirm()