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

# Conflicts:
#	src/api/home.js
#	src/views/Mall.vue

src/api/home.js

@@ -27,11 +27,14 @@ export const getChongInfo = (params) => request({ url: "index/get_chong_info", m
 // 党员申请 
 export const applyDangyuan = (data) => request({ url: "user/apply_dangyuan", method: "post", data,loading:true });
 // 参与退休计划 
-export const joinRetirement = (type) => request({ 
-  url: "/user/join_retirement", 
-  method: "post", 
-  data: new URLSearchParams({ type }),
-  headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-  loading: true 
-});
-
+export function joinRetirement(data) {
+  const formData = new FormData();
+  formData.append('type', data);
+  
+  return request({
+    url: '/user/join_retirement',
+    method: 'post',
+    data: formData,
+    loading: true
+  })
+}

src/utils/request.js

@@ -41,6 +41,9 @@ service.interceptors.response.use(
     }
     if (code === 401) {
       Toast("登录状态已过期，您可以继续留在该页面，或者重新登录");
+    } else if (code === 500) {
+      Toast("服务器错误，请稍后重试");
+      return Promise.reject("error");
     } else if (code !== 1) {
       Toast(`${res.data.msg}`);
       return Promise.reject("error");

src/views/China.vue

@@ -4,42 +4,53 @@
       红旗资本医疗补贴
     </div>
     <div class="invite-list">
-      <div class="invite-item">
+      <div class="invite-item" v-for="item in rewards" :key="item.id">
         <div class="item_header">
-
+            <div class="title">{{ item.title }}</div>
+            <div class="titletwo">获得{{item.computing_power}}万元医疗补贴</div>
+        </div>
+        <div class="item_body">
+            <div class="body_left">
+                <div class="bodt_one">{{item.power}}%</div>
+                <div class="bodt_two">每日收益</div>
+            </div>
+            <div class="body_right">
+                <div class="bodt_one">{{item.money}}元</div>
+                <div class="bodt_two">1000份</div>
+            </div>
+            <div class="body_btn">立即抢购</div>
         </div>
-        <div class="item_body"></div>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import { getShareccb } from '@/api/profile';
+import {getMiner} from '@/api/home.js'
 
 export default {
   name: 'Dynamic',
   data() {
     return {
-      rewards: [
-        { renshu: 5, title: '邀请5人实名认证', reward: '奖励60000元红旗资产' },
-        { renshu: 10, title: '邀请10人实名认证', reward: '奖励150000元红旗资产' },
-        { renshu: 20, title: '邀请20人实名认证', reward: '奖励300000元红旗资产' },
-        { renshu: 50, title: '邀请50人实名认证', reward: '奖励800000元红旗资产' },
-        { renshu: 100, title: '邀请100人实名认证', reward: '奖励1800000元红旗资产' },
-        { renshu: 150, title: '邀请150人实名认证', reward: '获得国家神秘奖励' }
-      ]
+     rewards: [{},{},{},{}]
     }
   },
   methods: {
-    async receiveReward(renshu) {
-      try {
-        const res = await getShareccb(renshu);
-        alert(res.data.msg);
-      } catch (e) {
-        // 接口异常时不弹窗
+     getPlans(){
+      let data = {
+        page:'',
+        size:'',
+        type:1
       }
-    }
+      getMiner(data).then(res=>{
+        if(res.code === 1){
+          this.rewards = res.data
+        }
+      })
+    },
+  },
+  mounted(){
+    this.getPlans()
   }
 }
 </script>
@@ -78,13 +89,43 @@ export default {
 .invite-item {
   margin-bottom: 22px;
   width:100%;
-  height:100px;
-  background:#000;
-  padding-left:20px;
+  height:88px;
+  background:#fff;
 }
 .item_header{
     height:30px;
+    line-height:30px;
     background:#a30100;
+    display:flex;
+    color:#fff;
+    font-size:14px;
+}
+.title{
+    margin-left:20px;
+}
+.titletwo{
+    margin-left:65px;
+}
+.item_body{
+    padding:8px 20px;
+    display:flex;
+    justify-content: space-between;
+    text-align:center;
+    align-items: center;
+}
+.bodt_two{
+    margin-top:4px;
+}
+.body_btn{
+    width:60px;
+    height:20px;
+    background:#a30100;
+    color:#fff;
+    font-size:12px;
+    text-align:center;
+    line-height:20px;
+    border-radius:12px;
+    padding:2px 4px;
+    
 }
-
 </style> 

src/views/Medical.vue

@@ -0,0 +1,130 @@
+<template>
+  <div class="usremei-container">
+    <div class="invite-header">
+      红旗资本原始股
+    </div>
+    <div class="invite-list">
+      <div class="invite-item" v-for="item in rewards" :key="item.id">
+        <div class="item_header">
+            <div class="title">{{ item.title }}</div>
+            <div class="titletwo">获得{{item.computing_power}}万元医疗补贴</div>
+        </div>
+        <div class="item_body">
+            <div class="body_left">
+                <div class="bodt_one">{{item.power}}%</div>
+                <div class="bodt_two">每日收益</div>
+            </div>
+            <div class="body_right">
+                <div class="bodt_one">{{item.money}}元</div>
+            </div>
+            <div class="body_btn">立即抢购</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {getMiner} from '@/api/home.js'
+
+export default {
+  name: 'Dynamic',
+  data() {
+    return {
+      rewards: [{},{},{},{}]
+    }
+  },
+  methods: {
+     getPlans(){
+      let data = {
+        page:'',
+        size:'',
+        type:1
+      }
+      getMiner(data).then(res=>{
+        if(res.code === 1){
+          this.rewards = res.data
+        }
+      })
+    },
+  },
+  mounted(){
+    this.getPlans()
+  }
+}
+</script>
+
+<style scoped>
+.usremei-container {
+  min-height: 100vh;
+  background-image: url('../assets/dabag.png');
+  background-size: cover;
+  background-position: center;
+  padding-top: 60px;
+  padding-bottom: 80px;
+  box-sizing: border-box;
+  overflow-y: auto;
+  position: relative;
+}
+
+.invite-header {
+  background: #ffeddf;
+  color: #f11859;
+  font-size: 24px;
+  font-weight: bold;
+  text-align: center;
+  margin: 0 auto 30px auto;
+  padding: 20px 0 10px 0;
+  width: 90%;
+  box-shadow: 0 4px 16px rgba(208,2,27,0.08);
+  letter-spacing: 2px;
+}
+
+.invite-list {
+  width: 90%;
+  margin: 0 auto;
+}
+
+.invite-item {
+  margin-bottom: 22px;
+  width:100%;
+  height:88px;
+  background:#fff;
+}
+.item_header{
+    height:30px;
+    line-height:30px;
+    background:#a30100;
+    display:flex;
+    color:#fff;
+    font-size:14px;
+}
+.title{
+    margin-left:20px;
+}
+.titletwo{
+    margin-left:65px;
+}
+.item_body{
+    padding:8px 20px;
+    display:flex;
+    justify-content: space-between;
+    text-align:center;
+    align-items: center;
+}
+.bodt_two{
+    margin-top:4px;
+}
+.body_btn{
+    width:60px;
+    height:20px;
+    background:#a30100;
+    color:#fff;
+    font-size:12px;
+    text-align:center;
+    line-height:20px;
+    border-radius:12px;
+    padding:2px 4px;
+    
+}
+</style>