Merge branch 'main' of https://gitlab.com/tea28/client

src/pages/to-pay-list/index.vue

@@ -56,7 +56,8 @@
                     <view class="list_name flex_r flex_jb"><text>茶</text><text>宝</text></view>
                     <view class="list_con p_color">(可用{{userinfo.cha_bao}})</view>
                 </view>
-                <view class="list_con">{{goodsInfo.treasure_price }} 茶宝</view>
+                <view class="list_con" v-if="Data.type != 5">{{goodsInfo.treasure_price }} 茶宝</view>
+                <view class="list_con" v-else>{{goodsInfo.cha_bao }} 茶宝</view>
             </view>
             <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type == 2">
                 <view class="flex_r flex_ac">