From f47a8ba10c58f04c1d1552dd4c4f0a13c7b11fc3 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 15 Sep 2023 15:29:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=88=97=E8=A1=A8=20-=20=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=95=86=E5=93=81=E6=98=BE=E7=A4=BA=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/category_v2/category_v2.wxml        | 84 +++++++++++--------
 1 file changed, 47 insertions(+), 37 deletions(-)

diff --git a/yun-min-program-plugin-master/packageG/pages/category_v2/category_v2.wxml b/yun-min-program-plugin-master/packageG/pages/category_v2/category_v2.wxml
index 537f9db..62f148e 100644
--- a/yun-min-program-plugin-master/packageG/pages/category_v2/category_v2.wxml
+++ b/yun-min-program-plugin-master/packageG/pages/category_v2/category_v2.wxml
@@ -211,46 +211,56 @@
                       {{language.category['已售']}}{{ good.show_sales + good.virtual_sales}}{{ good.sku }}
                     </view>
                     <view class="info_c li">
-                      <view class="price span" style="color: #ff9500;" wx:if="{{good.point_goods}}" data-id="{{good.goods_id}}" catchtap="gotoGoods" data-good="{{good}}">
-                        {{ good.has_option == 1 ? ((!good.point_goods.max_point || good.point_goods.min_point == good.point_goods.max_point) ? good.point_goods.min_point : good.point_goods.min_point + "-" + good.point_goods.max_point) : good.point_goods.min_point
-                        }}{{integral}}
-                      </view>
-                      <view class="price span" wx:elif="{{!good.has_option}}" data-id="{{good.goods_id}}" catchtap="gotoGoods" data-good="{{good}}">
-                        <text class="small">{{language['money']}}</text>
-                        {{ good.vip_level_status&&good.vip_level_status.status==1?good.vip_level_status.word:good.price }}
-                      </view>
-                      <view class="price span" wx:elif="{{good.has_option && (!good.vip_level_status || good.vip_level_status.status == 0)}}" data-id="{{good.goods_id}}" catchtap="gotoGoods" data-good="{{good}}">
-                        <text class="small">{{language['money']}}</text>
-                        <text>{{ good.min_price }}</text>
-                      </view>
-                      <view class="price span" wx:elif="{{good.has_option && (good.vip_level_status && good.vip_level_status.status == 1)}}" data-id="{{good.goods_id}}" catchtap="gotoGoods" data-good="{{good}}">
-                        <text class="small">{{language['money']}}</text>
-                        {{good.vip_level_status.word}}
-                      </view>
-                      <view wx:if="{{category_template!='04' && good.is_special != 1}}">
-                        <!--good.is_special 特殊商品加入购物车隐藏-->
-                        <view class="select" wx:if="{{good.has_option != 1&&good.plugin_id != 40}}">
-                          <van-transition show="{{  goodsCarts[good.id] }}" custom-class="block">
-                            <icon wx:if="{{goodsCarts[good.id]}}" class="iconfont icon-life-game-sign" data-id="{{good.id}}" catchtap="numberLeft"></icon>
-                          </van-transition>
-                          <input type="tel" title="number" wx:if="{{goodsCarts[good.id] && !goodsCarts[good.id].option_str	}}" value="{{goodsCartsTotal[good.id].total}}" data-id="{{goodsCarts[good.id].id}}" data-stock='{{good.stock}}' data-total="{{goodsCartsTotal[good.id].total}}" bind:blur="changeblur" />
-                          <icon data-id="{{good.id}}" data-stock='{{good.stock}}' data-good='{{good}}' catchtap="numberRight" class="iconfont icon-life-game-plus"></icon>
+                      <block wx:if="{{good.point_mall_goods}}">
+                        <view class="price span">
+
+                          <text wx:if="{{good.point_mall_goods.use_money > 0}}">{{good.point_mall_goods.use_money}}元 + </text>
+                          <text>{{good.point_mall_goods.point}}积分</text>
+
                         </view>
-                        <!-- 分类页返回了plugin_id:0||商城商品，plugin_id：40||租赁，plugin_id：92||供应商商品 -->
-                        <view class="select optionClass leaseBox" wx:if="{{good.has_option == 1 && good.plugin_id != 40}}">
-                          <view data-item="{{good}}" class="p" catchtap="addGood">{{language.category['选规格']}}</view>
-                          <!-- {{goodsCartsTotal[good.id].total+'有数字'}}{{good.id}} -->
-                          <icon wx:if="{{!m2._isTextEmpty(goodsCartsTotal[good.id])}}">
-                            {{goodsCartsTotal[good.id].total}}
-                          </icon>
+                      </block>
+                      <block wx:else>
+                        <view class="price span" style="color: #ff9500;" wx:if="{{good.point_goods}}" data-id="{{good.goods_id}}" catchtap="gotoGoods" data-good="{{good}}">
+                          {{ good.has_option == 1 ? ((!good.point_goods.max_point || good.point_goods.min_point == good.point_goods.max_point) ? good.point_goods.min_point : good.point_goods.min_point + "-" + good.point_goods.max_point) : good.point_goods.min_point
+                          }}{{integral}}
                         </view>
-                        <view class="select leaseBox span" wx:if="{{good.plugin_id == 40}}">{{language.category['去租赁']}}</view>
-                      </view>
-                      <view wx:if="{{category_template=='04'}}">
-                        <view class="select" catchtap="gotoGoods" data-id="{{good.goods_id}}" data-good="{{good}}">
-                          <icon class="iconfont icon-life-game-plus"></icon>
+                        <view class="price span" wx:elif="{{!good.has_option}}" data-id="{{good.goods_id}}" catchtap="gotoGoods" data-good="{{good}}">
+                          <text class="small">{{language['money']}}</text>
+                          {{ good.vip_level_status&&good.vip_level_status.status==1?good.vip_level_status.word:good.price }}
                         </view>
-                      </view>
+                        <view class="price span" wx:elif="{{good.has_option && (!good.vip_level_status || good.vip_level_status.status == 0)}}" data-id="{{good.goods_id}}" catchtap="gotoGoods" data-good="{{good}}">
+                          <text class="small">{{language['money']}}</text>
+                          <text>{{ good.min_price }}</text>
+                        </view>
+                        <view class="price span" wx:elif="{{good.has_option && (good.vip_level_status && good.vip_level_status.status == 1)}}" data-id="{{good.goods_id}}" catchtap="gotoGoods" data-good="{{good}}">
+                          <text class="small">{{language['money']}}</text>
+                          {{good.vip_level_status.word}}
+                        </view>
+                        <view wx:if="{{category_template!='04' && good.is_special != 1}}">
+                          <!--good.is_special 特殊商品加入购物车隐藏-->
+                          <view class="select" wx:if="{{good.has_option != 1&&good.plugin_id != 40}}">
+                            <van-transition show="{{  goodsCarts[good.id] }}" custom-class="block">
+                              <icon wx:if="{{goodsCarts[good.id]}}" class="iconfont icon-life-game-sign" data-id="{{good.id}}" catchtap="numberLeft"></icon>
+                            </van-transition>
+                            <input type="tel" title="number" wx:if="{{goodsCarts[good.id] && !goodsCarts[good.id].option_str	}}" value="{{goodsCartsTotal[good.id].total}}" data-id="{{goodsCarts[good.id].id}}" data-stock='{{good.stock}}' data-total="{{goodsCartsTotal[good.id].total}}" bind:blur="changeblur" />
+                            <icon data-id="{{good.id}}" data-stock='{{good.stock}}' data-good='{{good}}' catchtap="numberRight" class="iconfont icon-life-game-plus"></icon>
+                          </view>
+                          <!-- 分类页返回了plugin_id:0||商城商品，plugin_id：40||租赁，plugin_id：92||供应商商品 -->
+                          <view class="select optionClass leaseBox" wx:if="{{good.has_option == 1 && good.plugin_id != 40}}">
+                            <view data-item="{{good}}" class="p" catchtap="addGood">{{language.category['选规格']}}</view>
+                            <!-- {{goodsCartsTotal[good.id].total+'有数字'}}{{good.id}} -->
+                            <icon wx:if="{{!m2._isTextEmpty(goodsCartsTotal[good.id])}}">
+                              {{goodsCartsTotal[good.id].total}}
+                            </icon>
+                          </view>
+                          <view class="select leaseBox span" wx:if="{{good.plugin_id == 40}}">{{language.category['去租赁']}}</view>
+                        </view>
+                        <view wx:if="{{category_template=='04'}}">
+                          <view class="select" catchtap="gotoGoods" data-id="{{good.goods_id}}" data-good="{{good}}">
+                            <icon class="iconfont icon-life-game-plus"></icon>
+                          </view>
+                        </view>
+                      </block>
                     </view>
                   </block>