Merge branch 'master' of http://154.209.4.10:3001/tt0101/zhunong-h5

src/views/Mall.vue

@@ -30,12 +30,10 @@
         </div>
         <div class="plan-col-btn">
           <button 
-            class="plan-btn" 
-            :class="{ 'disabled': !canClick(item) }"
-            @click="canClick(item) && toPayment(item)"
-            :disabled="!canClick(item)"
+            class="plan-btn"
+            @click="toPayment(item)"
           >
-            {{ canClick(item) ? '立即参与' : '已参与' }}
+            立即参与
           </button>
         </div>
       </div>
@@ -160,21 +158,6 @@ export default {
           this.loading = false;
         });
     },
-    canClick(item) {
-      const { chuji, yiji, erji, sanji } = this.userInfo;
-      switch(item.id) {
-        case 1:
-          return chuji === 0;
-        case 2:
-          return yiji === 0;
-        case 3:
-          return erji === 0;
-        case 4:
-          return sanji === 0;
-        default:
-          return false;
-      }
-    },
     goToAuth() {
       this.$router.push('/user-center');
     }
@@ -279,10 +262,6 @@ export default {
 .plan-btn:hover {
   background: #a00028;
 }
-.plan-btn.disabled {
-  background: #cccccc;
-  cursor: not-allowed;
-}
 .loading-mask {
   position: fixed;
   left: 0; top: 0; right: 0; bottom: 0;

src/views/RetirementSubsidy.vue

@@ -28,12 +28,12 @@
             <div class="subsidy-row">
               <span>收益率</span>
               <span>每日获得</span>
-              <span>参与份数</span>
+              <span>已参与份数</span>
             </div>
             <div class="subsidy-row">
               <span>10%</span>
-              <span>3000元</span>
-              <span>1份</span>
+              <span>{{ 3000 * (userInfo.chuji || 0) }}元</span>
+              <span>{{ userInfo.chuji || 0 }}份</span>
             </div>
           </div>
         </div>
@@ -45,12 +45,12 @@
             <div class="subsidy-row">
               <span>收益率</span>
               <span>每日获得</span>
-              <span>参与份数</span>
+              <span>已参与份数</span>
             </div>
             <div class="subsidy-row">
               <span>10%</span>
-              <span>6000元</span>
-              <span>1份</span>
+              <span>{{ 6000 * (userInfo.yiji || 0) }}元</span>
+              <span>{{ userInfo.yiji || 0 }}份</span>
             </div>
           </div>
         </div>
@@ -62,12 +62,12 @@
             <div class="subsidy-row">
               <span>收益率</span>
               <span>每日获得</span>
-              <span>参与份数</span>
+              <span>已参与份数</span>
             </div>
             <div class="subsidy-row">
               <span>10%</span>
-              <span>10000元</span>
-              <span>1份</span>
+              <span>{{ 10000 * (userInfo.erji || 0) }}元</span>
+              <span>{{ userInfo.erji || 0 }}份</span>
             </div>
           </div>
         </div>
@@ -79,12 +79,12 @@
             <div class="subsidy-row">
               <span>收益率</span>
               <span>每日获得</span>
-              <span>参与份数</span>
+              <span>已参与份数</span>
             </div>
             <div class="subsidy-row">
               <span>10%</span>
-              <span>20000元</span>
-              <span>1份</span>
+              <span>{{ 20000 * (userInfo.sanji || 0) }}元</span>
+              <span>{{ userInfo.sanji || 0 }}份</span>
             </div>
           </div>
         </div>
@@ -94,8 +94,27 @@
 </template>
 
 <script>
+import { getUserInfo } from '@/api/home.js';
 export default {
-  name: 'RetirementSubsidy'
+  name: 'RetirementSubsidy',
+  data() {
+    return {
+      userInfo: {
+        chuji: 0,
+        yiji: 0,
+        erji: 0,
+        sanji: 0
+      }
+    }
+  },
+  async created() {
+    try {
+      const res = await getUserInfo();
+      this.userInfo = res.data || {};
+    } catch (e) {
+      // 处理异常
+    }
+  }
 }
 </script>
 
@@ -214,8 +233,6 @@ export default {
   width: 33.33%;
 }
 
-
-
 .subsidy-row:last-child {
   margin-bottom: 0;
   font-weight: bold;