fly 1 tydzień temu
rodzic
commit
699d7a0ca5

+ 3 - 3
src/views/AssetCenter.vue

@@ -5,11 +5,11 @@
       <div class="back-btn" @click="$router.back()">
         <i class="arrow-left"></i>
       </div>
-      <div class="title">资产中心</div>
+      <div class="title">资金明细</div>
     </div>
 
     <!-- 固定顶部资产信息 -->
-    <div class="fixedTop">
+    <!-- <div class="fixedTop">
       <div class="top">
         <div class="flex totalView">
           <div class="totalText" style="font-weight: bold;">账户总资产</div>
@@ -48,7 +48,7 @@
         <div class="flex opts"></div>
       </div>
       <div class="flex acc"></div>
-    </div>
+    </div> -->
 
     <!-- 交易记录列表 -->
     <div class="record-list">

+ 14 - 2
src/views/Mall.vue

@@ -34,7 +34,9 @@
             :class="{ 'disabled': !canClick(item) }"
             @click="canClick(item) && toPayment(item)"
             :disabled="!canClick(item)"
-          >{{disabled ? '立即参与' : '已参与'}}</button>
+          >
+            {{ canClick(item) ? '立即参与' : '已参与' }}
+          </button>
         </div>
       </div>
     </div>
@@ -47,6 +49,7 @@
 
 <script>
 import {getMiner,getUserInfo,joinRetirement} from '@/api/home.js'
+import { Toast } from 'vant';
 export default {
   name: 'Mall',
   data() {
@@ -114,9 +117,18 @@ export default {
       this.loading = true;
       joinRetirement(item.type)
         .then(res => {
-          console.log(res, '2222222222');
+          Toast({
+            message: res.msg || (res.code === 1 ? '参与成功' : '参与失败'),
+            duration: 2000,
+            onClose: () => {
+              if (res.code === 1) {
+                this.getUserInfo();
+              }
+            }
+          });
         })
         .catch(err => {
+          Toast('网络异常,请重试');
           console.error(err);
         })
         .finally(() => {

+ 3 - 3
src/views/OrderManagement.vue

@@ -26,15 +26,15 @@
         <div class="earnings-details">
           <div class="detail-item">
             <span class="detail-label">日收益</span>
-            <span class="detail-value">{{ item.start_output }} 元</span>
+            <span class="detail-value">{{ ((item.money * item.start_output) / 100).toFixed(2) }} 元</span>
           </div>
           <div class="detail-item">
             <span class="detail-label">收益期限</span>
             <span class="detail-value">{{ item.cycle }} 天</span>
           </div>
           <div class="detail-item">
-            <span class="detail-label">已获得股权</span>
-            <span class="detail-value">{{ item.miner_datail.computing_power }}</span>
+            <span class="detail-label">已获得医疗补贴</span>
+            <span class="detail-value">{{ item.miner_datail.computing_power }}.00元</span>
           </div>
           <div class="detail-item">
             <span class="detail-label">参与价格</span>

+ 11 - 18
src/views/Signin.vue

@@ -72,17 +72,20 @@ export default {
     return {
       userInfo: {},
       dailyBonus: 2800,
-      dailyCoins: 10,
-      lastSignDate: null
+      dailyCoins: 10
     }
   },
   computed: {
     hasSignedToday() {
-      // 如果没有最后签到日期,说明还没签到过
-      if (!this.lastSignDate) return false;
-      
-      const today = new Date().toLocaleDateString();
-      return today === this.lastSignDate;
+      if (!this.userInfo.sign_times) return false;
+      // 假设 sign_times 是秒级时间戳
+      const signDate = new Date(this.userInfo.sign_times * 1000);
+      const today = new Date();
+      return (
+        signDate.getFullYear() === today.getFullYear() &&
+        signDate.getMonth() === today.getMonth() &&
+        signDate.getDate() === today.getDate()
+      );
     }
   },
   methods: {
@@ -90,29 +93,19 @@ export default {
       try {
         const res = await getUserInfo();
         this.userInfo = res.data;
-        // 获取本地存储的最后签到日期
-        this.lastSignDate = localStorage.getItem('lastSignDate');
       } catch (error) {
         console.error('获取用户信息失败:', error);
       }
     },
     async handleSignIn() {
-      // 如果今天已经签到,就不再调用接口
       if (this.hasSignedToday) {
         alert('今日已签到,请明天再来');
         return;
       }
-
       try {
         await signIn();
-        // 保存签到日期到本地存储
-        const today = new Date().toLocaleDateString();
-        localStorage.setItem('lastSignDate', today);
-        this.lastSignDate = today;
-        
         alert('签到成功');
-        // 刷新用户信息以更新签到天数
-        await this.getUserInfo();
+        await this.getUserInfo(); // 签到后刷新状态
       } catch (error) {
         console.error('签到失败:', error);
         alert('签到失败,请重试');