From 1256956825d18b75619bf64f6469810e1251f960 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Sun, 1 Oct 2023 09:53:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E5=88=B0=EF=BC=9A=E7=AD=BE=E5=88=B0?=
 =?UTF-8?q?=E5=90=8E=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E3=80=81=E7=BB=8F=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/users/user_sgin/index.vue      | 21 +++++++++++++++++----
 pages/users/user_sgin_list/index.vue | 14 +++++++++++++-
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/pages/users/user_sgin/index.vue b/pages/users/user_sgin/index.vue
index 71071156..144ba0b7 100644
--- a/pages/users/user_sgin/index.vue
+++ b/pages/users/user_sgin/index.vue
@@ -60,7 +60,14 @@
 							<view class='name line1'>第 {{item.day}} 天签到积分奖励</view>
 							<view class='data'>{{ formatDate(item.createTime) }}</view>
 						</view>
-						<view class='num font-color'>+{{ item.point }}</view>
+            <view>
+              <view class='num font-color' v-if="item.point > 0">
+                <span class="num-title">积分</span> +{{ item.point }}
+              </view>
+              <view class='num font-color' v-if="item.experience > 0">
+                <span class="num-title">经验</span> +{{ item.experience }}
+              </view>
+            </view>
 					</view>
 					<view class='loading' @click='goSignList' v-if="signRecordList.length >= 3">
             点击加载更多 <text class='iconfont icon-xiangyou' />
@@ -73,7 +80,8 @@
 				<view class='signTipLight loadingpic'></view>
 				<view class='signTipCon'>
 					<view class='state'>签到成功</view>
-					<view class='integral'>获得{{ point }}积分</view>
+					<view class='integral' v-if="signResult.point > 0">获得{{ signResult.point }}积分</view>
+					<view class='integral' v-if="signResult.experience > 0">获得{{ signResult.experience }}经验</view>
 					<view class='signTipBnt' @click='close'>好的</view>
 				</view>
 			</view>
@@ -98,7 +106,7 @@
         signRecordList: [], // 签到记录
 
         active: false, // 签到提示
-				point: 0, // 刚签到获得的奖励
+        signResult: 0, // 签到的结果
 			};
 		},
 		computed: mapGetters(['isLogin', 'userInfo']),
@@ -176,7 +184,7 @@
         }
         SignInApi.createSignInRecord().then(res => {
 					this.active = true;
-					this.point = res.data.point;
+					this.signResult = res.data;
           // 重新获得签到信息
           this.getSignInfo();
           this.getSignList();
@@ -420,6 +428,11 @@
 		margin-top: 9rpx;
 	}
 
+  .sign .list3 .item .num-title {
+    font-size: 10rpx;
+    margin-right: 8rpx;
+  }
+
 	.sign .list3 .item .num {
 		font-size: 36rpx;
 		font-family: 'Guildford Pro';
diff --git a/pages/users/user_sgin_list/index.vue b/pages/users/user_sgin_list/index.vue
index 6acb95e6..0a45edab 100644
--- a/pages/users/user_sgin_list/index.vue
+++ b/pages/users/user_sgin_list/index.vue
@@ -9,7 +9,14 @@
 		                  <view class='name line1'>第 {{item.day}} 天签到积分奖励</view>
 		                  <view>{{ formatDate(item.createTime) }}</view>
 		               </view>
-		               <view class='num font-color'>+{{ item.point }}</view>
+                  <view>
+                    <view class='num font-color' v-if="item.point > 0">
+                      <span class="num-title">积分</span> +{{ item.point }}
+                    </view>
+                    <view class='num font-color' v-if="item.experience > 0">
+                      <span class="num-title">经验</span> +{{ item.experience }}
+                    </view>
+                  </view>
 		            </view>
 		         </view>
 		      </view>
@@ -92,4 +99,9 @@
 </script>
 
 <style>
+.sign-record .list .item .num-title {
+  font-size: 10rpx;
+  margin-right: 8rpx;
+}
+
 </style>