From d0593cf3eb46f3d904fcf6b2e58a3cde85f509d4 Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Fri, 25 Apr 2025 11:21:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mall/index.vue      | 18 +++++++++---------
 pages/sangdai/sangdai.vue |  4 ++--
 pages/user/hsjl.vue       | 40 +++++++++++----------------------------
 3 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/pages/mall/index.vue b/pages/mall/index.vue
index 17263af..b82606f 100644
--- a/pages/mall/index.vue
+++ b/pages/mall/index.vue
@@ -79,18 +79,18 @@
 								<image v-else :src="$img1('common/check.png')" lazy-load></image>
 							</view>
 						</view>
-						<!-- <view class="pay-type" @click="changePay(1)">
+						<view class="pay-type" @click="changePay(1)">
 
-						<view class="" style="width: 100%;	color: #333333;">
-							{{ $config.getAppSetting('currency2_name') }}
-							{{ orderData.goods.price * 100 }} (剩余:{{ orderData.use_integral }})
-						</view>
+							<view class="" style="width: 100%;	color: #333333;">
+								{{ $config.getAppSetting('currency2_name') }}
+								{{ orderData.goods.price * 100 }} (剩余:{{ orderData.use_integral }})
+							</view>
 
-						<view class="icon">
-							<image v-if="zhifu == 1" :src="$img1('common/check_act.png')" lazy-load></image>
-							<image v-else :src="$img1('common/check.png')" lazy-load></image>
+							<view class="icon">
+								<image v-if="zhifu == 1" :src="$img1('common/check_act.png')" lazy-load></image>
+								<image v-else :src="$img1('common/check.png')" lazy-load></image>
+							</view>
 						</view>
-					</view> -->
 
 					</view>
 
diff --git a/pages/sangdai/sangdai.vue b/pages/sangdai/sangdai.vue
index 5e3806a..bd5d8f2 100644
--- a/pages/sangdai/sangdai.vue
+++ b/pages/sangdai/sangdai.vue
@@ -78,10 +78,10 @@
 						<view class="list-item" v-for="(a, b) in item.orderlist" :key="a.prize_code">
 							<view class="pic">
 								<image :src="a.goodslist_imgurl" lazy-load></image>
-								<view class="type center"
+								<!-- <view class="type center"
 									:style="{ backgroundColor: getBgColor(a.shang_title), color: getTextColor(a.shang_title) }">
 									{{ a.shang_title }}
-								</view>
+								</view> -->
 								<view class="num">{{ a.prize_num }}</view>
 								<view class="yu-tag ziti" v-if="subTab[subTabCur].id == 2">预售</view>
 							</view>
diff --git a/pages/user/hsjl.vue b/pages/user/hsjl.vue
index 11a5466..2e88fe0 100644
--- a/pages/user/hsjl.vue
+++ b/pages/user/hsjl.vue
@@ -1,28 +1,12 @@
 <template>
   <view class="content">
-    <uni-nav-bar
-      left-icon="left"
-      title="兑换记录"
-      color="#000000"
-      backgroundColor="transparent"
-      :fixed="true"
-      :statusBar="true"
-      :border="false"
-      @clickLeft="back"
-    ></uni-nav-bar>
+    <uni-nav-bar left-icon="left" title="兑换记录" color="#000000" backgroundColor="transparent" :fixed="true"
+      :statusBar="true" :border="false" @clickLeft="back"></uni-nav-bar>
 
-    <mescroll-body
-      ref="mescrollRef"
-      @init="mescrollInit"
-      :down="downOption"
-      @down="downCallback"
-      @up="upCallback"
-    >
+    <mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
       <view class="xuyuan br20" v-for="(v, i) in listData" :key="i">
         <view class="xuyuan_head">
-          <view style="opacity: 1; color: #8a8a8a; font-size: 20rpx"
-            >打包时间：{{ v.addtime }}</view
-          >
+          <view style="opacity: 1; color: #8a8a8a; font-size: 20rpx">打包时间：{{ v.addtime }}</view>
           <view style="font-size: 20rpx; color: #8a8a8a">
             共
             <text style="margin: 0 4rpx; color: #333333">{{ v.count }}</text>
@@ -39,9 +23,7 @@
               <view class="hang1 mt10" style="width: 180rpx">{{
                 a.goodslist_title
               }}</view>
-              <view class="hang1 mt10"
-                >兑换价：{{ a.goodslist_money * 100 }}</view
-              >
+              <view class="hang1 mt10" style="width: 180rpx">兑换价：{{ $c.removeTrailingZeros((a.goodslist_money * 100).toFixed(2)) }}</view>
             </view>
           </view>
         </view>
@@ -49,7 +31,7 @@
         <view class="xuyuan_foot">
           <view>
             共计兑换{{ $config.getAppSetting("currency2_name") }}：
-            <text style="color: #333333">￥{{ v.money * 100 }}</text>
+            <text style="color: #333333">{{ $c.removeTrailingZeros((v.money * 100).toFixed(2)) }}</text>
           </view>
         </view>
       </view>
@@ -69,7 +51,7 @@ export default {
       listData: [],
     };
   },
-  onLoad(e) {},
+  onLoad(e) { },
   methods: {
     back() {
       uni.navigateBack();
@@ -123,7 +105,7 @@ export default {
   margin-top: 4rpx;
   padding: 0 10rpx;
 
-  > view:nth-child(2) {
+  >view:nth-child(2) {
     font-weight: 400;
     font-size: 16rpx;
     color: #8a8a8a;
@@ -176,7 +158,7 @@ export default {
   }
 }
 
-.list_img > image {
+.list_img>image {
   width: 100%;
   height: 100%;
 }
@@ -253,12 +235,12 @@ export default {
       padding-left: 30rpx;
       box-sizing: border-box;
 
-      > view:nth-of-type(1) {
+      >view:nth-of-type(1) {
         display: flex;
         align-items: center;
       }
 
-      > view:nth-of-type(2) {
+      >view:nth-of-type(2) {
         width: 520rpx;
         text-align: center;
         /* margin: auto; */