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

---
 .../packageG/mycomponent/goods/goods.wxml     | 293 ++++++++++++------
 1 file changed, 191 insertions(+), 102 deletions(-)

diff --git a/yun-min-program-plugin-master/packageG/mycomponent/goods/goods.wxml b/yun-min-program-plugin-master/packageG/mycomponent/goods/goods.wxml
index a71fed3..9e6052c 100644
--- a/yun-min-program-plugin-master/packageG/mycomponent/goods/goods.wxml
+++ b/yun-min-program-plugin-master/packageG/mycomponent/goods/goods.wxml
@@ -54,20 +54,33 @@
             <view class="oneChild_activity" style="color:#fff;" wx:if="{{util.inOf(datas.content_list,'5') > -1 && item.award == 1 && (!item.vip_level_status || (item.vip_level_status && item.vip_level_status.status==0))}}">
               赠送{{item.award_proportion}}{{item.love_name||"爱心值"}}</view>
           </view>
-          <view class="Child_member_price" wx:if="{{util.inOf(datas.content_list,'4') > -1 && !item.point_goods && !item.notshow}}">会员价 {{ item.vip_level_status&&item.vip_level_status.status==1
+          <view class="Child_member_price" wx:if="{{util.inOf(datas.content_list,'4') > -1 && !item.point_goods && !item.notshow && !item.point_mall_goods}}">
+            会员价 {{ item.vip_level_status&&item.vip_level_status.status==1
               ?item.vip_level_status.word
               :(item.price_level==1?item.vip_price:item.vip_next_price) }}
           </view>
           <view class="Child_price">
             <view class="Child_now_price" style="width: {{datas.button_type == 0 ? '100%' : '70%'}}">
-              <text wx:if="{{(util.inOf(datas.content_list,'3') > -1 && util.inOf(datas.content_list,'8') <= -1) || (util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method === 0)}}" style="font-size: {{item.vip_level_status&&item.vip_level_status.status==1 ? '12px': ''}}">
-                <text class="span" wx:if="{{datas.show_price_text && !item.point_goods}}"> {{price_text}} </text><text class="span" wx:if="{{!item.point_goods}}">{{language['money']}}</text> {{ item.point_goods ? item.point_goods.min_point
-                :(item.vip_level_status && item.vip_level_status.status == 1
-                ? item.vip_level_status.word
-                : item.pricenow) }}<text class="span" wx:if="{{item.point_goods}}">{{integral}}</text></text>
-              <text wx:if="{{util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method !== 0}}"><text class="span" wx:if="{{datas.show_price_text}}"> 券后价 </text><text class="span">{{language['money']}}</text> {{item.coupon.deduct_price}}</text>
-
-              <text class="oneChild_original_price" wx:if="{{util.inOf(datas.content_list,'2') > -1 && item.priceold != 0 && item.priceold!=item.pricenow && !item.point_goods}}"><text wx:if="{{datas.show_price_text}}"> {{market_price_text}}</text> {{language['money']}}{{item.priceold}}</text></view>
+              <block wx:if="{{item.point_mall_goods}}">
+                <text class="span" wx:if="{{item.point_mall_goods.use_money > 0}}">{{item.point_mall_goods.use_money}}元 + </text>
+                <text class="span">{{item.point_mall_goods.point}}积分</text>
+              </block>
+              <block wx:else>
+                <text wx:if="{{(util.inOf(datas.content_list,'3') > -1 && util.inOf(datas.content_list,'8') <= -1) || (util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method === 0)}}" style="font-size: {{item.vip_level_status&&item.vip_level_status.status==1 ? '12px': ''}}">
+                  <text class="span" wx:if="{{datas.show_price_text && !item.point_goods}}"> {{price_text}}</text>
+                  <text class="span" wx:if="{{!item.point_goods}}">{{language['money']}}</text>{{ item.point_goods ? item.point_goods.min_point :(item.vip_level_status && item.vip_level_status.status == 1 ? item.vip_level_status.word : item.pricenow) }}
+                  <text class="span" wx:if="{{item.point_goods}}">{{integral}}</text>
+                </text>
+                <text wx:if="{{util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method !== 0}}">
+                  <text class="span" wx:if="{{datas.show_price_text}}"> 券后价 </text>
+                  <text class="span">{{language['money']}}</text>
+                  {{item.coupon.deduct_price}}
+                </text>
+              </block>
+              <text class="oneChild_original_price" wx:if="{{util.inOf(datas.content_list,'2') > -1 && item.priceold != 0 && item.priceold!=item.pricenow && !item.point_goods}}">
+                <text wx:if="{{datas.show_price_text}}"> {{market_price_text}}</text> {{language['money']}}{{item.priceold}}
+              </text>
+            </view>
             <view class="Child_buyBtn" wx:if="{{datas.button_type!=0}}">
               <view class="buyBtn_{{datas.button_type}} buyBtn" style="border: solid 1rpx {{datas.button_bg_color}};color: {{datas.button_type == 2 || datas.button_type == 4 || datas.button_type == 6 ? datas.button_bg_color: datas.button_color}};background-color: {{datas.button_type == 1 || datas.button_type == 3 || datas.button_type == 5 ? datas.button_bg_color: ''}}">
                 <view wx:if="{{datas.button_type == 1||datas.button_type==2}}">{{datas.button_title}}</view>
@@ -87,6 +100,7 @@
       </view>
     </view>
 
+
     <view class="u_goodslist_three" wx:if="{{datas.sort_style.choose_icon == 2}}">
       <view wx:if="{{list.length <= 0 && showList}}"
         style="width: 100%;height: 300rpx;line-height: 100rpx;text-align: center;font-size: 18px">
@@ -134,31 +148,45 @@
               </view>
               <view class="oneChild_activity" wx:if="{{util.inOf(datas.content_list,'5') > -1 && item.award == 1 && (!item.vip_level_status || (item.vip_level_status && item.vip_level_status.status==0))}}">赠送{{item.award_proportion}}{{item.love_name||"爱心值"}}</view>
             </view>
-            <view class="Child_member_price" wx:if="{{util.inOf(datas.content_list,'4') > -1 && !item.point_goods && !item.notshow}}">会员<text style="font-size:12px">{{language['money']}}</text>{{ item.vip_level_status&&item.vip_level_status.status==1
+            <view class="Child_member_price" wx:if="{{util.inOf(datas.content_list,'4') > -1 && !item.point_goods && !item.notshow && !item.point_mall_goods}}">会员<text style="font-size:12px">{{language['money']}}</text>{{ item.vip_level_status&&item.vip_level_status.status==1
               ?item.vip_level_status.word
               :(item.price_level==1?item.vip_price:item.vip_next_price) }}</view>
             <view class="Child_price">
-              <view class="Child_now_price" style="width: {{datas.button_type == 1 || datas.button_type == 2 ? '50%' : '80%'}};font-size: {{item.vip_level_status&&item.vip_level_status.status==1 ? '12px': ''}}" wx:if="{{(util.inOf(datas.content_list,'3') > -1 && util.inOf(datas.content_list,'8') <= -1) || (util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method === 0)}}">
-                <text class="span" wx:if="{{datas.show_price_text && !item.point_goods}}">{{util.substring(price_text)}} </text><text class="span" wx:if="{{!item.point_goods}}">{{language['money']}}</text> {{ item.point_goods ? item.point_goods.min_point
-                :(item.vip_level_status && item.vip_level_status.status == 1
-                ? item.vip_level_status.word
-                : item.pricenow) }}<text class="span" wx:if="{{item.point_goods}}">{{integral}}</text>
-              </view>
-              <view class="Child_now_price" style="width: {{datas.button_type == 1 || datas.button_type == 2 ? '50%' : '80%'}}" wx:if="{{util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method !== 0}}"><text class="span" wx:if="{{datas.show_price_text}}">券 </text><text class="span">{{language['money']}}</text> {{item.coupon.deduct_price}}
-              </view>
-
-              <view class="Child_now_price" wx:if="{{!util.inOf(datas.content_list,'3') > -1 && !util.inOf(datas.content_list,'8') > -1}}"></view>
-              <view class="Child_buyBtn" wx:if="{{datas.button_type!=0}}">
-                <view class="buyBtn_{{datas.button_type}} buyBtn" style="border: solid 1rpx {{datas.button_bg_color}};color: {{datas.button_type == 2 || datas.button_type == 4 || datas.button_type == 6 ? datas.button_bg_color: datas.button_color}};background-color: {{datas.button_type == 1 || datas.button_type == 3 || datas.button_type == 5 ? datas.button_bg_color: ''}}">
-                  <view wx:if="{{datas.button_type == 1||datas.button_type==2}}" >{{datas.button_title}}</view>
-                  <icon class="iconfont icon-gaiicon-" wx:if="{{datas.button_type == 3||datas.button_type==4}}"></icon>
-                  <icon class="iconfont icon-life-game-plus" wx:if="{{datas.button_type == 5||datas.button_type==6}}">
-                  </icon>
+              <block wx:if="{{item.point_mall_goods}}">
+                <view class="Child_now_price" style="width:100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                  <text wx:if="{{item.point_mall_goods.use_money > 0}}">{{item.point_mall_goods.use_money}}元 + </text>
+                  <text class="Child_now_price">{{item.point_mall_goods.point}}积分</text>
                 </view>
-              </view>
+                <view class="Child_buyBtn" wx:if="{{datas.button_type!=0}}" style="width:100%;display: inline-flex;flex-direction: row;justify-content: flex-end;">
+                  <view class="buyBtn_{{datas.button_type}} buyBtn" style="border: solid 1rpx {{datas.button_bg_color}};color: {{datas.button_type == 2 || datas.button_type == 4 || datas.button_type == 6 ? datas.button_bg_color: datas.button_color}};background-color: {{datas.button_type == 1 || datas.button_type == 3 || datas.button_type == 5 ? datas.button_bg_color: ''}}">
+                    <view wx:if="{{datas.button_type == 1||datas.button_type==2}}" >{{datas.button_title}}</view>
+                    <icon class="iconfont icon-gaiicon-" wx:if="{{datas.button_type == 3||datas.button_type==4}}"></icon>
+                    <icon class="iconfont icon-life-game-plus" wx:if="{{datas.button_type == 5||datas.button_type==6}}">
+                    </icon>
+                  </view>
+                </view>
+              </block>
+              <block wx:else>
+                <view class="Child_now_price" style="width: {{datas.button_type == 1 || datas.button_type == 2 ? '50%' : '80%'}};font-size: {{item.vip_level_status&&item.vip_level_status.status==1 ? '12px': ''}}" wx:if="{{(util.inOf(datas.content_list,'3') > -1 && util.inOf(datas.content_list,'8') <= -1) || (util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method === 0)}}">
+                  <text class="span" wx:if="{{datas.show_price_text && !item.point_goods}}">{{util.substring(price_text)}} </text><text class="span" wx:if="{{!item.point_goods}}">{{language['money']}}</text> {{ item.point_goods ? item.point_goods.min_point
+                  :(item.vip_level_status && item.vip_level_status.status == 1
+                  ? item.vip_level_status.word
+                  : item.pricenow) }}<text class="span" wx:if="{{item.point_goods}}">{{integral}}</text>
+                </view>
+                <view class="Child_now_price" style="width: {{datas.button_type == 1 || datas.button_type == 2 ? '50%' : '80%'}}" wx:if="{{util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method !== 0}}"><text class="span" wx:if="{{datas.show_price_text}}">券 </text><text class="span">{{language['money']}}</text> {{item.coupon.deduct_price}}</view>
+                <view class="Child_now_price" wx:if="{{!util.inOf(datas.content_list,'3') > -1 && !util.inOf(datas.content_list,'8') > -1}}"></view>
+                <view class="Child_buyBtn" wx:if="{{datas.button_type!=0}}">
+                  <view class="buyBtn_{{datas.button_type}} buyBtn" style="border: solid 1rpx {{datas.button_bg_color}};color: {{datas.button_type == 2 || datas.button_type == 4 || datas.button_type == 6 ? datas.button_bg_color: datas.button_color}};background-color: {{datas.button_type == 1 || datas.button_type == 3 || datas.button_type == 5 ? datas.button_bg_color: ''}}">
+                    <view wx:if="{{datas.button_type == 1||datas.button_type==2}}" >{{datas.button_title}}</view>
+                    <icon class="iconfont icon-gaiicon-" wx:if="{{datas.button_type == 3||datas.button_type==4}}"></icon>
+                    <icon class="iconfont icon-life-game-plus" wx:if="{{datas.button_type == 5||datas.button_type==6}}">
+                    </icon>
+                  </view>
+                </view>
+              </block>
             </view>
             <view class="pass_price" wx:if="{{item.pass_price}}">{{item.pass_price.name}}:{{item.pass_price.price}}</view>
-            <view class="oneChild_original_price" wx:if="{{util.inOf(datas.content_list,'2') > -1 && item.priceold != 0 && item.priceold!=item.pricenow && !item.point_goods}}">
+            <view class="oneChild_original_price" wx:if="{{util.inOf(datas.content_list,'2') > -1 && item.priceold != 0 && item.priceold!=item.pricenow && !item.point_goods && !item.point_mall_goods}}">
               <text wx:if="{{datas.show_price_text}}"> {{util.substring(market_price_text)}}</text> {{language['money']}}{{item.priceold}}
             </view>
             
@@ -232,21 +260,27 @@
             </view>
           </view>
           <view class="oneChild_r_flexbottom">
-            <view class="Child_member_price" wx:if="{{util.inOf(datas.content_list,'4') > -1 && !item.point_goods && !item.notshow}}">会员价 {{ item.vip_level_status&&item.vip_level_status.status==1
-              ?item.vip_level_status.word
-              :(item.price_level==1?item.vip_price:item.vip_next_price) }}
+            <view class="Child_member_price" wx:if="{{util.inOf(datas.content_list,'4') > -1 && !item.point_goods && !item.notshow && !item.point_mall_goods}}">
+              会员价 {{ item.vip_level_status&&item.vip_level_status.status==1 ?item.vip_level_status.word :(item.price_level==1?item.vip_price:item.vip_next_price) }}
             </view>
             <view class="Child_price">
-              <view class="Child_now_price" style="width: {{datas.button_type == 1 || datas.button_type == 2 ? '50%' : '80%'}};font-size: {{item.vip_level_status&&item.vip_level_status.status==1 ? '12px': ''}}" wx:if="{{(util.inOf(datas.content_list,'3') > -1 && util.inOf(datas.content_list,'8') <= -1) || (util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method === 0)}}">
-                <text class="span" wx:if="{{datas.show_price_text && !item.point_goods}}"> {{price_text}} </text><text class="span" wx:if="{{!item.point_goods}}">{{language['money']}}</text> {{ item.point_goods ? item.point_goods.min_point
-                :(item.vip_level_status && item.vip_level_status.status == 1
-                ? item.vip_level_status.word
-                : item.pricenow) }}<text class="span" wx:if="{{item.point_goods}}">{{integral}}</text>
-              </view>
-              <view class="Child_now_price" style="width: {{datas.button_type == 1 || datas.button_type == 2 ? '50%' : '80%'}}" wx:if="{{util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method !== 0}}"><text class="span" wx:if="{{datas.show_price_text}}"> 券后价 </text><text class="span">{{language['money']}}</text> {{ item.coupon.deduct_price }}
-              </view>
-
-              <view class="Child_now_price" wx:if="{{!util.inOf(datas.content_list,'3') > -1 && !util.inOf(datas.content_list,'8') > -1}}"></view>
+              <block wx:if="{{item.point_mall_goods}}">
+                <view class="Child_now_price" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;width: {{datas.button_type == 1 || datas.button_type == 2 ? '50%' : '80%'}};font-size: {{item.vip_level_status&&item.vip_level_status.status==1 ? '12px': ''}}">
+                  <text wx:if="{{item.point_mall_goods.use_money > 0}}">{{item.point_mall_goods.use_money}}元 + </text>
+                  <text class="Child_now_price">{{item.point_mall_goods.point}}积分</text>
+                </view>
+              </block>
+              <block wx:else>
+                <view class="Child_now_price" style="width: {{datas.button_type == 1 || datas.button_type == 2 ? '50%' : '80%'}};font-size: {{item.vip_level_status&&item.vip_level_status.status==1 ? '12px': ''}}" wx:if="{{(util.inOf(datas.content_list,'3') > -1 && util.inOf(datas.content_list,'8') <= -1) || (util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method === 0)}}">
+                  <text class="span" wx:if="{{datas.show_price_text && !item.point_goods}}"> {{price_text}} </text><text class="span" wx:if="{{!item.point_goods}}">{{language['money']}}</text> {{ item.point_goods ? item.point_goods.min_point
+                  :(item.vip_level_status && item.vip_level_status.status == 1
+                  ? item.vip_level_status.word
+                  : item.pricenow) }}<text class="span" wx:if="{{item.point_goods}}">{{integral}}</text>
+                </view>
+                <view class="Child_now_price" style="width: {{datas.button_type == 1 || datas.button_type == 2 ? '50%' : '80%'}}" wx:if="{{util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method !== 0}}"><text class="span" wx:if="{{datas.show_price_text}}"> 券后价 </text><text class="span">{{language['money']}}</text> {{ item.coupon.deduct_price }}
+                </view>
+                <view class="Child_now_price" wx:if="{{!util.inOf(datas.content_list,'3') > -1 && !util.inOf(datas.content_list,'8') > -1}}"></view>
+              </block>
               <view class="Child_buyBtn" wx:if="{{datas.button_type!=0}}">
                 <view class="buyBtn_{{datas.button_type}} buyBtn" style="border: solid 1rpx {{datas.button_bg_color}};color: {{datas.button_type == 2 || datas.button_type == 4 || datas.button_type == 6 ? datas.button_bg_color: datas.button_color}};background-color: {{datas.button_type == 1 || datas.button_type == 3 || datas.button_type == 5 ? datas.button_bg_color: ''}}">
                   <view wx:if="{{datas.button_type == 1||datas.button_type==2}}">{{datas.button_title}}</view>
@@ -265,7 +299,6 @@
               {{ itemName.name }}:{{ itemName.value }}
             </view>
           </view>
-
           </view>
         </view>
       </view>
@@ -320,29 +353,43 @@
               <view class="oneChild_sales" wx:if="{{util.inOf(datas.content_list,'5') > -1 && item.award == 1 && (!item.vip_level_status || (item.vip_level_status && item.vip_level_status.status==0))}}">赠送{{item.award_proportion}}{{item.love_name||"爱心值"}}</view>
               <view class="oneChild_activity" wx:if="{{util.inOf(datas.content_list,'7') > -1}}">销量 {{item.sales}}</view>
             </view>
-            <view class="Child_member_price" wx:if="{{util.inOf(datas.content_list,'4') > -1 && !item.point_goods && !item.notshow}}">会员<text style="font-size:12px">{{language['money']}}</text>{{ item.vip_level_status&&item.vip_level_status.status==1
+            <view class="Child_member_price" wx:if="{{util.inOf(datas.content_list,'4') > -1 && !item.point_goods && !item.notshow && !item.point_mall_goods}}">会员<text style="font-size:12px">{{language['money']}}</text>{{ item.vip_level_status&&item.vip_level_status.status==1
               ?item.vip_level_status.word
               :(item.price_level==1?item.vip_price:item.vip_next_price) }}</view>
             <view class="Child_price">
-              <view class="Child_now_price" style="width: {{datas.button_type == 0 || datas.button_type == 1 || datas.button_type == 2 ? '100%' : '80%'}};font-size: {{item.vip_level_status&&item.vip_level_status.status==1 ? '12px': ''}}" wx:if="{{(util.inOf(datas.content_list,'3') > -1 && util.inOf(datas.content_list,'8') <= -1) || (util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method === 0)}}">
-                <text class="span" wx:if="{{datas.show_price_text && !item.point_goods}}"> {{util.substring(price_text)}} </text><text class="span" wx:if="{{!item.point_goods}}">{{language['money']}}</text>{{ item.point_goods ? item.point_goods.min_point
-                :(item.vip_level_status && item.vip_level_status.status == 1
-                ? item.vip_level_status.word
-                : item.pricenow) }}<text class="span" wx:if="{{item.point_goods}}">{{integral}}</text>
-              </view>
-              <view class="Child_now_price" style="width: {{datas.button_type == 0 || datas.button_type == 1 || datas.button_type == 2 ? '100%' : '80%'}}" wx:if="{{util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method !== 0}}"><text class="span" wx:if="{{datas.show_price_text}}">券 </text><text class="span">{{language['money']}}</text> {{item.coupon.deduct_price}}
-              </view>
-
-              <view class="Child_now_price" wx:if="{{!util.inOf(datas.content_list,'3') > -1 && !util.inOf(datas.content_list,'8') > -1}}"></view>
-              <view class="Child_buyBtn" wx:if="{{datas.button_type != 1 && datas.button_type!=2 && datas.button_type!=0}}">
-                <view class="buyBtn_{{datas.button_type}} buyBtn" style="border: solid 1rpx {{datas.button_bg_color}};color: {{datas.button_type == 2 || datas.button_type == 4 || datas.button_type == 6 ? datas.button_bg_color: datas.button_color}};background-color: {{datas.button_type == 1 || datas.button_type == 3 || datas.button_type == 5 ? datas.button_bg_color: ''}}">
-                  <!-- 三排没有样式1、样式2的购买按钮 -->
-                  <!-- <view wx:if="{{datas.button_type == 1||datas.button_type==2">{{datas.button_title}}</view> -->
-                  <icon class="iconfont icon-gaiicon-" wx:if="{{datas.button_type == 3||datas.button_type==4}}"></icon>
-                  <icon class="iconfont icon-life-game-plus" wx:if="{{datas.button_type == 5||datas.button_type==6}}">
-                  </icon>
+              <block wx:if="{{item.point_mall_goods}}">
+                <view class="Child_now_price" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;width: 100%;font-size: {{item.vip_level_status&&item.vip_level_status.status==1 ? '12px': ''}}">
+                  <text wx:if="{{item.point_mall_goods.use_money > 0}}">{{item.point_mall_goods.use_money}}元 + </text>
+                  <text class="Child_now_price">{{item.point_mall_goods.point}}积分</text>
                 </view>
-              </view>
+                <view class="Child_buyBtn" wx:if="{{datas.button_type != 1 && datas.button_type!=2 && datas.button_type!=0}}">
+                  <view class="buyBtn_{{datas.button_type}} buyBtn" style="width:100%;display: inline-flex;flex-direction: row;justify-content: flex-end;border: solid 1rpx {{datas.button_bg_color}};color: {{datas.button_type == 2 || datas.button_type == 4 || datas.button_type == 6 ? datas.button_bg_color: datas.button_color}};background-color: {{datas.button_type == 1 || datas.button_type == 3 || datas.button_type == 5 ? datas.button_bg_color: ''}}">
+                    <icon class="iconfont icon-gaiicon-" wx:if="{{datas.button_type == 3||datas.button_type==4}}"></icon>
+                    <icon class="iconfont icon-life-game-plus" wx:if="{{datas.button_type == 5||datas.button_type==6}}">
+                    </icon>
+                  </view>
+                </view>
+              </block>
+              <block wx:else>
+                <view class="Child_now_price" style="width: {{datas.button_type == 0 || datas.button_type == 1 || datas.button_type == 2 ? '100%' : '80%'}};font-size: {{item.vip_level_status&&item.vip_level_status.status==1 ? '12px': ''}}" wx:if="{{(util.inOf(datas.content_list,'3') > -1 && util.inOf(datas.content_list,'8') <= -1) || (util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method === 0)}}">
+                  <text class="span" wx:if="{{datas.show_price_text && !item.point_goods}}"> {{util.substring(price_text)}} </text><text class="span" wx:if="{{!item.point_goods}}">{{language['money']}}</text>{{ item.point_goods ? item.point_goods.min_point
+                  :(item.vip_level_status && item.vip_level_status.status == 1
+                  ? item.vip_level_status.word
+                  : item.pricenow) }}<text class="span" wx:if="{{item.point_goods}}">{{integral}}</text>
+                </view>
+                <view class="Child_now_price" style="width: {{datas.button_type == 0 || datas.button_type == 1 || datas.button_type == 2 ? '100%' : '80%'}}" wx:if="{{util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method !== 0}}"><text class="span" wx:if="{{datas.show_price_text}}">券 </text><text class="span">{{language['money']}}</text> {{item.coupon.deduct_price}}
+                </view>
+                <view class="Child_now_price" wx:if="{{!util.inOf(datas.content_list,'3') > -1 && !util.inOf(datas.content_list,'8') > -1}}"></view>
+                <view class="Child_buyBtn" wx:if="{{datas.button_type != 1 && datas.button_type!=2 && datas.button_type!=0}}">
+                  <view class="buyBtn_{{datas.button_type}} buyBtn" style="border: solid 1rpx {{datas.button_bg_color}};color: {{datas.button_type == 2 || datas.button_type == 4 || datas.button_type == 6 ? datas.button_bg_color: datas.button_color}};background-color: {{datas.button_type == 1 || datas.button_type == 3 || datas.button_type == 5 ? datas.button_bg_color: ''}}">
+                    <!-- 三排没有样式1、样式2的购买按钮 -->
+                    <!-- <view wx:if="{{datas.button_type == 1||datas.button_type==2">{{datas.button_title}}</view> -->
+                    <icon class="iconfont icon-gaiicon-" wx:if="{{datas.button_type == 3||datas.button_type==4}}"></icon>
+                    <icon class="iconfont icon-life-game-plus" wx:if="{{datas.button_type == 5||datas.button_type==6}}">
+                    </icon>
+                  </view>
+                </view>
+              </block>
             </view>
             <view class="pass_price" wx:if="{{item.pass_price}}">{{item.pass_price.name}}:{{item.pass_price.price}}</view>
             <view class="oneChild_original_price" wx:if="{{util.inOf(datas.content_list,'2') > -1 && item.priceold != 0 && item.priceold!=item.pricenow && !item.point_goods}}">
@@ -409,29 +456,46 @@
                 <view class="oneChild_sales" wx:if="{{util.inOf(datas.content_list,'5') > -1 && item.award == 1 && (!item.vip_level_status || (item.vip_level_status && item.vip_level_status.status==0))}}">赠送{{item.award_proportion}}{{item.love_name||"爱心值"}}</view>
                 <view class="oneChild_activity" wx:if="{{util.inOf(datas.content_list,'7') > -1}}">销量 {{item.sales}}</view>
               </view>
-              <view class="Child_member_price" wx:if="{{util.inOf(datas.content_list,'4') > -1 && !item.point_goods && !item.notshow}}">会员<text style="font-size:12px">{{language['money']}}</text>{{ item.vip_level_status&&item.vip_level_status.status==1
+              <view class="Child_member_price" wx:if="{{util.inOf(datas.content_list,'4') > -1 && !item.point_goods && !item.notshow && !item.point_mall_goods}}">会员<text style="font-size:12px">{{language['money']}}</text>{{ item.vip_level_status&&item.vip_level_status.status==1
               ?item.vip_level_status.word
               :(item.price_level==1?item.vip_price:item.vip_next_price) }}</view>
               <view class="Child_price">
-                <view class="Child_now_price" style="width: {{datas.button_type == 0 || datas.button_type == 1 || datas.button_type == 2 ? '100%' : '80%'}};font-size: {{item.vip_level_status&&item.vip_level_status.status==1 ? '12px': ''}}" wx:if="{{(util.inOf(datas.content_list,'3') > -1 && util.inOf(datas.content_list,'8') <= -1) || (util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method === 0)}}">
-                  <text class="span" wx:if="{{datas.show_price_text && !item.point_goods}}"> {{util.substring(price_text)}} </text><text class="span" wx:if="{{!item.point_goods}}">{{language['money']}}</text> {{ item.point_goods ? item.point_goods.min_point
-                  :(item.vip_level_status && item.vip_level_status.status == 1
-                  ? item.vip_level_status.word
-                  : item.pricenow) }}<text class="span" wx:if="{{item.point_goods}}">{{integral}}</text>
-                </view>
-                <view class="Child_now_price" style="width: {{datas.button_type == 0 || datas.button_type == 1 || datas.button_type == 2 ? '100%' : '80%'}}" wx:if="{{util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method !== 0}}"><text class="span" wx:if="{{datas.show_price_text}}">券 </text><text class="span">{{language['money']}}</text> {{item.coupon.deduct_price}}
-                </view>
-
-                <view class="Child_now_price" wx:if="{{!util.inOf(datas.content_list,'3') > -1 && !util.inOf(datas.content_list,'8') > -1}}"></view>
-                <view class="Child_buyBtn" wx:if="{{datas.button_type != 1 && datas.button_type!=2 && datas.button_type!=0}}">
-                  <view class="buyBtn_{{datas.button_type}} buyBtn" style="border: solid 1rpx {{datas.button_bg_color}};color: {{datas.button_type == 2 || datas.button_type == 4 || datas.button_type == 6 ? datas.button_bg_color: datas.button_color}};background-color: {{datas.button_type == 1 || datas.button_type == 3 || datas.button_type == 5 ? datas.button_bg_color: ''}}">
-                    <!-- 三排没有样式1、样式2的购买按钮 -->
-                    <!-- <view wx:if="{{datas.button_type == 1||datas.button_type==2">{{datas.button_title}}</view> -->
-                    <icon class="iconfont icon-gaiicon-" wx:if="{{datas.button_type == 3||datas.button_type==4}}"></icon>
-                    <icon class="iconfont icon-life-game-plus" wx:if="{{datas.button_type == 5||datas.button_type==6}}">
-                    </icon>
+                <block wx:if="{{item.point_mall_goods}}">
+                  <view class="Child_now_price" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;width: 100%;font-size: {{item.vip_level_status&&item.vip_level_status.status==1 ? '12px': ''}}">
+                    <text wx:if="{{item.point_mall_goods.use_money > 0}}">{{item.point_mall_goods.use_money}}元 + </text>
+                    <text class="Child_now_price">{{item.point_mall_goods.point}}积分</text>
                   </view>
-                </view>
+                  <view class="Child_buyBtn" wx:if="{{datas.button_type != 1 && datas.button_type!=2 && datas.button_type!=0}}">
+                    <view class="buyBtn_{{datas.button_type}} buyBtn" style="border: solid 1rpx {{datas.button_bg_color}};color: {{datas.button_type == 2 || datas.button_type == 4 || datas.button_type == 6 ? datas.button_bg_color: datas.button_color}};background-color: {{datas.button_type == 1 || datas.button_type == 3 || datas.button_type == 5 ? datas.button_bg_color: ''}}">
+                      <!-- 三排没有样式1、样式2的购买按钮 -->
+                      <!-- <view wx:if="{{datas.button_type == 1||datas.button_type==2">{{datas.button_title}}</view> -->
+                      <icon class="iconfont icon-gaiicon-" wx:if="{{datas.button_type == 3||datas.button_type==4}}"></icon>
+                      <icon class="iconfont icon-life-game-plus" wx:if="{{datas.button_type == 5||datas.button_type==6}}">
+                      </icon>
+                    </view>
+                  </view>
+                </block>
+                <block wx:else>
+                  <view class="Child_now_price" style="width: {{datas.button_type == 0 || datas.button_type == 1 || datas.button_type == 2 ? '100%' : '80%'}};font-size: {{item.vip_level_status&&item.vip_level_status.status==1 ? '12px': ''}}" wx:if="{{(util.inOf(datas.content_list,'3') > -1 && util.inOf(datas.content_list,'8') <= -1) || (util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method === 0)}}">
+                    <text class="span" wx:if="{{datas.show_price_text && !item.point_goods}}"> {{util.substring(price_text)}} </text><text class="span" wx:if="{{!item.point_goods}}">{{language['money']}}</text> {{ item.point_goods ? item.point_goods.min_point
+                    :(item.vip_level_status && item.vip_level_status.status == 1
+                    ? item.vip_level_status.word
+                    : item.pricenow) }}<text class="span" wx:if="{{item.point_goods}}">{{integral}}</text>
+                  </view>
+                  <view class="Child_now_price" style="width: {{datas.button_type == 0 || datas.button_type == 1 || datas.button_type == 2 ? '100%' : '80%'}}" wx:if="{{util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method !== 0}}"><text class="span" wx:if="{{datas.show_price_text}}">券 </text><text class="span">{{language['money']}}</text> {{item.coupon.deduct_price}}
+                  </view>
+                  <view class="Child_now_price" wx:if="{{!util.inOf(datas.content_list,'3') > -1 && !util.inOf(datas.content_list,'8') > -1}}"></view>
+                  <view class="Child_buyBtn" wx:if="{{datas.button_type != 1 && datas.button_type!=2 && datas.button_type!=0}}">
+                    <view class="buyBtn_{{datas.button_type}} buyBtn" style="border: solid 1rpx {{datas.button_bg_color}};color: {{datas.button_type == 2 || datas.button_type == 4 || datas.button_type == 6 ? datas.button_bg_color: datas.button_color}};background-color: {{datas.button_type == 1 || datas.button_type == 3 || datas.button_type == 5 ? datas.button_bg_color: ''}}">
+                      <!-- 三排没有样式1、样式2的购买按钮 -->
+                      <!-- <view wx:if="{{datas.button_type == 1||datas.button_type==2">{{datas.button_title}}</view> -->
+                      <icon class="iconfont icon-gaiicon-" wx:if="{{datas.button_type == 3||datas.button_type==4}}"></icon>
+                      <icon class="iconfont icon-life-game-plus" wx:if="{{datas.button_type == 5||datas.button_type==6}}">
+                      </icon>
+                    </view>
+                  </view>
+                </block>
+
               </view>
               <view class="pass_price" wx:if="{{item.pass_price}}">{{item.pass_price.name}}:{{item.pass_price.price}}</view>
               <view class="oneChild_original_price" wx:if="{{util.inOf(datas.content_list,'2') > -1 && item.priceold != 0 && item.priceold!=item.pricenow && !item.point_goods}}">
@@ -499,12 +563,19 @@
                   赠送{{item.award_proportion}}{{item.love_name||"爱心值"}}
                 </view>
               </view>
-              <view class="Child_member_price" wx:if="{{util.inOf(datas.content_list,'4') > -1 && !item.point_goods && !item.notshow}}">会员价 {{ item.vip_level_status&&item.vip_level_status.status==1
+              <view class="Child_member_price" wx:if="{{util.inOf(datas.content_list,'4') > -1 && !item.point_goods && !item.notshow && !item.point_mall_goods}}">会员价 {{ item.vip_level_status&&item.vip_level_status.status==1
               ?item.vip_level_status.word
               :(item.price_level==1?item.vip_price:item.vip_next_price) }}
               </view>
               <view class="Child_price">
-                <view class="Child_now_price" style="width: {{datas.button_type == 0 ? '100%' : '70%'}}">
+                <block wx:if="{{item.point_mall_goods}}">
+                  <view class="Child_now_price" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;width: {{datas.button_type == 0 ? '100%' : '70%'}};font-size: {{item.vip_level_status&&item.vip_level_status.status==1 ? '12px': ''}}">
+                    <text wx:if="{{item.point_mall_goods.use_money > 0}}">{{item.point_mall_goods.use_money}}元 + </text>
+                    <text class="Child_now_price">{{item.point_mall_goods.point}}积分</text>
+                  </view>
+                </block>
+                <block wx:else>
+                  <view class="Child_now_price" style="width: {{datas.button_type == 0 ? '100%' : '70%'}}">
                   <text wx:if="{{(util.inOf(datas.content_list,'3') > -1 && util.inOf(datas.content_list,'8') <= -1) || (util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method === 0)}}" style="font-size: {{item.vip_level_status&&item.vip_level_status.status==1 ? '12px': ''}}">
                     <text class="span" wx:if="{{datas.show_price_text && !item.point_goods}}"> {{price_text}} </text><text class="span" wx:if="{{!item.point_goods}}">{{language['money']}}</text>{{ item.point_goods ? item.point_goods.min_point
                     :(item.vip_level_status && item.vip_level_status.status == 1
@@ -513,6 +584,7 @@
                   <text wx:if="{{util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method !== 0}}"><text class="span" wx:if="{{datas.show_price_text}}"> 券后价 </text><text class="span">{{language['money']}}</text> {{item.coupon.deduct_price}}</text>
 
                   <text class="oneChild_original_price" wx:if="{{util.inOf(datas.content_list,'2') > -1 && item.priceold != 0 && item.priceold!=item.pricenow && !item.point_goods}}"><text wx:if="{{datas.show_price_text}}"> {{market_price_text}}</text> {{language['money']}}{{item.priceold}}</text></view>
+                </block>
                 <view class="Child_buyBtn" wx:if="{{datas.button_type!=0}}">
                   <view class="buyBtn_{{datas.button_type}} buyBtn" style="border: solid 1rpx {{datas.button_bg_color}};color: {{datas.button_type == 2 || datas.button_type == 4 || datas.button_type == 6 ? datas.button_bg_color: datas.button_color}};background-color: {{datas.button_type == 1 || datas.button_type == 3 || datas.button_type == 5 ? datas.button_bg_color: ''}}">
                     <view wx:if="{{datas.button_type == 1||datas.button_type==2}}">{{datas.button_title}}</view>
@@ -577,30 +649,47 @@
                   </view>
                   <view class="oneChild_activity" wx:if="{{util.inOf(datas.content_list,'5') > -1 && item.award == 1 && (!item.vip_level_status || (item.vip_level_status && item.vip_level_status.status==0))}}">赠送{{item.award_proportion}}{{item.love_name||"爱心值"}}</view>
                 </view>
-                <view class="Child_member_price" wx:if="{{util.inOf(datas.content_list,'4') > -1 && !item.point_goods && !item.notshow}}">会员<text style="font-size:12px">{{language['money']}}</text>{{ item.vip_level_status&&item.vip_level_status.status==1
+                <view class="Child_member_price" wx:if="{{util.inOf(datas.content_list,'4') > -1 && !item.point_goods && !item.notshow && !item.point_mall_goods}}">会员<text style="font-size:12px">{{language['money']}}</text>{{ item.vip_level_status&&item.vip_level_status.status==1
                 ?item.vip_level_status.word
                 :(item.price_level==1?item.vip_price:item.vip_next_price) }}</view>
                 <view class="Child_price">
-                  <view class="Child_now_price" style="width: {{datas.button_type == 1 || datas.button_type == 2 ? '50%' : '80%'}};font-size: {{item.vip_level_status&&item.vip_level_status.status==1 ? '12px': ''}}" wx:if="{{(util.inOf(datas.content_list,'3') > -1 && util.inOf(datas.content_list,'8') <= -1) || (util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method === 0)}}">
-                    <text class="span" wx:if="{{datas.show_price_text && !item.point_goods}}">{{util.substring(price_text)}} </text><text class="span" wx:if="{{!item.point_goods}}">{{language['money']}}</text> {{ item.point_goods ? item.point_goods.min_point
-                    :(item.vip_level_status && item.vip_level_status.status == 1
-                    ? item.vip_level_status.word
-                    : item.pricenow) }}<text class="span" wx:if="{{item.point_goods}}">{{integral}}</text>
-                  </view>
-                  <view class="Child_now_price" style="width: {{datas.button_type == 1 || datas.button_type == 2 ? '50%' : '80%'}}" wx:if="{{util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method !== 0}}"><text class="span" wx:if="{{datas.show_price_text}}">券 </text><text class="span">{{language['money']}}</text> {{item.coupon.deduct_price}}
-                  </view>
-
-                  <view class="Child_now_price" wx:if="{{!util.inOf(datas.content_list,'3') > -1 && !util.inOf(datas.content_list,'8') > -1}}"></view>
-                  <view class="Child_buyBtn" wx:if="{{datas.button_type!=0}}">
-                    <view class="buyBtn_{{datas.button_type}} buyBtn" style="border: solid 1rpx {{datas.button_bg_color}};color: {{datas.button_type == 2 || datas.button_type == 4 || datas.button_type == 6 ? datas.button_bg_color: datas.button_color}};background-color: {{datas.button_type == 1 || datas.button_type == 3 || datas.button_type == 5 ? datas.button_bg_color: ''}}">
-                      <view wx:if="{{datas.button_type == 1||datas.button_type==2}}">{{datas.button_title}}</view>
-                      <icon class="iconfont icon-gaiicon-" wx:if="{{datas.button_type == 3||datas.button_type==4}}">
-                      </icon>
-                      <icon class="iconfont icon-life-game-plus"
-                        wx:if="{{datas.button_type == 5||datas.button_type==6}}">
-                      </icon>
+                  <block wx:if="{{item.point_mall_goods}}">
+                    <view class="Child_now_price" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;width:100%;font-size: {{item.vip_level_status&&item.vip_level_status.status==1 ? '12px': ''}}">
+                      <text wx:if="{{item.point_mall_goods.use_money > 0}}">{{item.point_mall_goods.use_money}}元 + </text>
+                      <text class="Child_now_price">{{item.point_mall_goods.point}}积分</text>
                     </view>
-                  </view>
+                    <view class="Child_buyBtn" wx:if="{{datas.button_type!=0}}">
+                      <view class="buyBtn_{{datas.button_type}} buyBtn" style="width:100%;display: inline-flex;flex-direction: row;justify-content: flex-end;border: solid 1rpx {{datas.button_bg_color}};color: {{datas.button_type == 2 || datas.button_type == 4 || datas.button_type == 6 ? datas.button_bg_color: datas.button_color}};background-color: {{datas.button_type == 1 || datas.button_type == 3 || datas.button_type == 5 ? datas.button_bg_color: ''}}">
+                        <view wx:if="{{datas.button_type == 1||datas.button_type==2}}">{{datas.button_title}}</view>
+                        <icon class="iconfont icon-gaiicon-" wx:if="{{datas.button_type == 3||datas.button_type==4}}">
+                        </icon>
+                        <icon class="iconfont icon-life-game-plus"
+                              wx:if="{{datas.button_type == 5||datas.button_type==6}}">
+                        </icon>
+                      </view>
+                    </view>
+                  </block>
+                  <block wx:else>
+                    <view class="Child_now_price" style="width: {{datas.button_type == 1 || datas.button_type == 2 ? '50%' : '80%'}};font-size: {{item.vip_level_status&&item.vip_level_status.status==1 ? '12px': ''}}" wx:if="{{(util.inOf(datas.content_list,'3') > -1 && util.inOf(datas.content_list,'8') <= -1) || (util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method === 0)}}">
+                      <text class="span" wx:if="{{datas.show_price_text && !item.point_goods}}">{{util.substring(price_text)}} </text><text class="span" wx:if="{{!item.point_goods}}">{{language['money']}}</text> {{ item.point_goods ? item.point_goods.min_point
+                      :(item.vip_level_status && item.vip_level_status.status == 1
+                      ? item.vip_level_status.word
+                      : item.pricenow) }}<text class="span" wx:if="{{item.point_goods}}">{{integral}}</text>
+                    </view>
+                    <view class="Child_now_price" style="width: {{datas.button_type == 1 || datas.button_type == 2 ? '50%' : '80%'}}" wx:if="{{util.inOf(datas.content_list,'8') > -1 && item.coupon && item.coupon.coupon_method !== 0}}"><text class="span" wx:if="{{datas.show_price_text}}">券 </text><text class="span">{{language['money']}}</text> {{item.coupon.deduct_price}}
+                    </view>
+                    <view class="Child_now_price" wx:if="{{!util.inOf(datas.content_list,'3') > -1 && !util.inOf(datas.content_list,'8') > -1}}"></view>
+                    <view class="Child_buyBtn" wx:if="{{datas.button_type!=0}}">
+                      <view class="buyBtn_{{datas.button_type}} buyBtn" style="border: solid 1rpx {{datas.button_bg_color}};color: {{datas.button_type == 2 || datas.button_type == 4 || datas.button_type == 6 ? datas.button_bg_color: datas.button_color}};background-color: {{datas.button_type == 1 || datas.button_type == 3 || datas.button_type == 5 ? datas.button_bg_color: ''}}">
+                        <view wx:if="{{datas.button_type == 1||datas.button_type==2}}">{{datas.button_title}}</view>
+                        <icon class="iconfont icon-gaiicon-" wx:if="{{datas.button_type == 3||datas.button_type==4}}">
+                        </icon>
+                        <icon class="iconfont icon-life-game-plus"
+                              wx:if="{{datas.button_type == 5||datas.button_type==6}}">
+                        </icon>
+                      </view>
+                    </view>
+                  </block>
                 </view>
                 <view class="pass_price" wx:if="{{item.pass_price}}">{{item.pass_price.name}}:{{item.pass_price.price}}</view>
                 <view class="oneChild_original_price" wx:if="{{util.inOf(datas.content_list,'2') > -1 && item.priceold != 0 && item.priceold!=item.pricenow && !item.point_goods}}">