Merge branch 'master' into jyh_h5

src/views/actualCombat/index.vue

@@ -19,35 +19,35 @@
       </div>
       <!-- 卡片盒子 -->
       <div class="card-box">
-          <div class="left-card" @click="jumpDetail(profitIdTwo)">
+          <div class="left-card" >
               <div class="card-title">
-                  <span style="display:block;margin-bottom:0.1rem">{{tableName}}</span>
+                  <span style="display:block;margin-bottom:0.1rem" >{{tableName}}</span>
                   <span style="display:block;font-size:0.5rem;">{{profitSecond*100}}%</span>
               </div>
-              <span class="left-contect">
+              <span class="left-contect" @click="jumpDetail(profitIdTwo)">
                     {{productNameSecond}}
               </span>
               <span v-if="isBuyFirst==2" class="clickBtn" @click="showPopup(profitIdTwo)">兑换解锁</span>
               <span v-if="isBuyFirst==1" class="clickBtnGray" >已兑换</span>
               
           </div>
-          <div class="center-card" @click="jumpDetail(profitIdFirst)">
+          <div class="center-card" >
               <div class="card-title">
                   <span style="display:block;margin-bottom:0.1rem">{{tableName}}</span>
                   <span style="display:block;font-size:0.5rem;">{{profitFirst*100}}%</span>
               </div>
-            <span class="left-contect">
+            <span class="left-contect" @click="jumpDetail(profitIdFirst)">
                     {{productNameFirst}}
               </span>
               <span v-if="isBuyTwo==2"  class="clickBtn"  @click="showPopup(profitIdFirst)">兑换解锁</span>
               <span v-if="isBuyTwo==1" class="clickBtnGray"   >已兑换</span>
           </div> 
-           <div class="rigth-card" @click="jumpDetail(profitThree)">
+           <div class="rigth-card" >
                <div class="card-title">
                   <span style="display:block;margin-bottom:0.1rem">{{tableName}}</span>
                   <span style="display:block;font-size:0.5rem;">{{profitThree*100}}%</span>
               </div>
-                <span class="left-contect">
+                <span class="left-contect" @click="jumpDetail(profitThree)">
                    {{productNameThree}}
               </span>
               <span v-if="isBuyThree==2" class="clickBtn"  @click="showPopup(profitIdThree)">兑换解锁</span>
@@ -56,9 +56,9 @@
       </div>
       <!-- 内容盒子 -->
       <div  style="padding-bottom:0.5rem">
- <div class="bottomcontect-box" v-for="(i,index) in profitList" :key="i.id" @click="jumpDetail(i.id)" style="margin-bottom:0.5rem">
+ <div class="bottomcontect-box" v-for="(i,index) in profitList" :key="i.id" style="margin-bottom:0.5rem">
 <div class="topthis-box">
-<div class="top-left">
+<div class="top-left" @click="jumpDetail(i.id)" >
 <span style="display:block;font-size:0.5rem">{{i.productName}}</span>
 <span style="display:block;font-size:0.5rem;margin-top: 0.2rem;">
   {{tableName}}: 
@@ -164,6 +164,7 @@ export default {
       productNameThree:'',
       profitIdFirst:'',
       profitIdTwo:'',
+     
       profitIdThree:'',
       tableName:'总收益',
       radio2:1,
@@ -233,7 +234,8 @@ this.clickTab('yields','总收益')
       }
       this.server.productDetail(temp).then((res)=>{
         // console.log
-        this.checkList=res.data.data
+        this.morePoint=res.data.data.crmIntegral
+        this.checkList=res.data.data.investProductCycles
       })
     },
     //跳转到详情页
@@ -450,6 +452,8 @@ this.clickTab('yields','总收益')
 }
 .left-contect{
     font-size: 0.4rem;
+    display:block;
+    height: 100%;
 }
 .clickBtn{
        width: 2rem;