Merge branch 'master' into jyh_h5

src/views/actualCombat/detail.vue

@@ -249,7 +249,7 @@
     width: 90%;
   margin: 0 auto;
     ">
-    <van-radio-group v-model="radio2">
+    <van-radio-group @change="clickBox" v-model="radio2">
       <div class="checkBox" v-for="(i,index) in checkList">
   <van-radio :name="i.id" icon-size="12px" checked-color="#ee0a24">{{i.name}}</van-radio><span class="usePoint">{{i.point}}</span><span class="usePointTwo">积分</span>
       </div>
@@ -261,7 +261,10 @@
 <span style="font-size: 0.4rem;">当前积分</span><span class="usePointThree">12435</span><span class="usePointFour">积分</span>
 
       </div>
-      <div class="exchange">
+     <div v-if="ifexchange" class="exchange">
+        <span>立即兑换</span>
+      </div>
+      <div v-if="!ifexchange" class="exchangeTwo">
         <span>立即兑换</span>
       </div>
     </van-popup>
@@ -302,6 +305,7 @@ export default {
       radio2:'1',
       show:false,
       list: [],
+      ifexchange:true,
       checkList:[
         {
           id:'1',
@@ -380,7 +384,7 @@ export default {
         "上海": '#e0815b',
         "广州": '#ffaf33',
         "深圳": '#637be6',
-        "成都": '#a1b2ff',
+        "成都": '#a1b2ff'
         // "西安": '#b3daff',
       },
     };
@@ -418,6 +422,20 @@ let myChart = echarts.init(document.getElementById('myChart'), 'light') // 初
 // });
      
     },
+    //选择积分
+    clickBox(val){
+      console.log("这是啥啊",val)
+      this.checkList.forEach((i,index)=>{
+        if(val==i.id){
+          console.log("我的积分",this.morePoint>=i.point)
+          if(this.morePoint>=i.point){
+            this.ifexchange=true
+          }else{
+            this.ifexchange=false
+          }
+        }
+      })
+    },
     showPopup(){
       this.show=true
     },
@@ -973,4 +991,15 @@ right: 0;
     font-size: 0.4rem;
     margin: 3rem auto;
 }
+.exchangeTwo{
+     width: 5rem;
+    height: 1rem;
+    background-color: gray;
+    color: white;
+    line-height: 1rem;
+    border-radius: 0.2rem;
+    text-align: center;
+    font-size: 0.4rem;
+    margin: 3rem auto;
+}
 </style>
\ No newline at end of file

src/views/actualCombat/index.vue

@@ -27,7 +27,7 @@
               <span class="left-contect">
                     大展宏图2024
               </span>
-              <span class="clickBtn">解锁订阅</span>
+              <span class="clickBtn" @click="showPopup">解锁订阅</span>
           </div>
           <div class="center-card">
               <div class="card-title">
@@ -55,7 +55,7 @@
 <div class="topthis-box">
 <div class="top-left">
 <span style="display:block;font-size:0.5rem">大展宏图2024</span>
-<span style="display:block;font-size:0.5rem">{{tableName}}: <span style="color:red">12.20%</span> </span>
+<span style="display:block;font-size:0.5rem;margin-top: 0.2rem;">{{tableName}}: <span style="color:red">12.20%</span> </span>
 </div>
 <div class="top-right">
 <span class="clickBtnTwo">解锁订阅</span>
@@ -66,7 +66,41 @@
 </div>
       </div>
       </div>
-      
+     <!-- 弹出层 -->
+    <van-popup v-model="show" position="bottom" :style="{ height: '70%' }">
+      <div class="popup-title">
+<span style="font-size: 0.5rem;
+    font-weight: bold;">热点精选</span><span style="font-size: 0.4rem;color:gray;margin-left:0.3rem">智能策略</span>
+    <span style="font-size: 0.3rem;color:gray;display:block">热点股票强度深度建模后优选好股票</span>
+      </div>
+      <div class="popup-title" style="margin-bottom:0.5rem">
+<span style="font-size: 0.4rem;">产品周期</span>
+      </div>
+      <div  style="font-size: 0.3rem;
+    height: 3rem;
+    
+    width: 90%;
+  margin: 0 auto;
+    ">
+    <van-radio-group @change="clickBox" v-model="radio2">
+      <div class="checkBox" v-for="(i,index) in checkList">
+  <van-radio :name="i.id" icon-size="12px" checked-color="#ee0a24">{{i.name}}</van-radio><span class="usePoint">{{i.point}}</span><span class="usePointTwo">积分</span>
+      </div>
+
+  <!-- <van-radio name="2" icon-size="12px" checked-color="#ee0a24">单选框 2</van-radio> -->
+</van-radio-group>
+    </div>
+<div class="checkBoxTwo" style="margin-bottom:0.5rem;color:black">
+<span style="font-size: 0.4rem;">当前积分</span><span class="usePointThree">{{morePoint}}</span><span class="usePointFour">积分</span>
+
+      </div>
+      <div v-if="ifexchange" class="exchange">
+        <span>立即兑换</span>
+      </div>
+      <div v-if="!ifexchange" class="exchangeTwo">
+        <span>立即兑换</span>
+      </div>
+    </van-popup>
     <!-- <div style="font-size:18px">{{ name }}</div>
     <div>
       <van-button type="primary" @click="operation('点赞关注')"
@@ -101,9 +135,43 @@ export default {
       num: 0,
       list: [],
       tabIndex:0,
-      tableName:'总收益'
+      ifexchange:true,
+      show:false,
+      tableName:'总收益',
+      radio2:'1',
+      morePoint:12345,
+      checkList:[
+        {
+          id:'1',
+          name:'1个月',
+          point:'1222',
+        },
+        {
+          id:'2',
+          name:'3个月',
+          point:'1222211',
+        },
+        {
+          id:'3',
+          name:'6个月',
+          point:'1222',
+        },
+        {
+          id:'4',
+          name:'12个月',
+          point:'1222',
+        }
+      ],
     };
   },
+  mounted(){
+
+ if(this.morePoint>=this.checkList[0].point){
+            this.ifexchange=true
+          }else{
+            this.ifexchange=false
+          }
+  },
   methods: {
     ...mapMutations("store_modular", ["operation"]),
     getList() {
@@ -124,10 +192,27 @@ export default {
 // });
      
     },
+    showPopup(){
+      this.show=true
+    },
     //点击标签页
     clickTab(index,name){
         this.tabIndex=index
         this.tableName=name
+    },
+    //选择积分
+    clickBox(val){
+      console.log("这是啥啊",val)
+      this.checkList.forEach((i,index)=>{
+        if(val==i.id){
+          console.log("我的积分",this.morePoint>=i.point)
+          if(this.morePoint>=i.point){
+            this.ifexchange=true
+          }else{
+            this.ifexchange=false
+          }
+        }
+      })
     }
   },
 };
@@ -198,6 +283,7 @@ export default {
     border-radius: 0.2rem;
         margin-top: 1rem;
         position: relative;
+        /* text-align: center; */
 
 }
 .center-card{
@@ -207,6 +293,7 @@ export default {
     border-radius: 0.2rem;
     margin-top: 0.4rem;
     position: relative;
+    /* text-align: center; */
     
 }
 .rigth-card{
@@ -216,6 +303,7 @@ export default {
     border-radius: 0.2rem;
         margin-top: 1rem;
         position: relative;
+        /* text-align: center; */
     
 }
 .left-contect{
@@ -284,4 +372,68 @@ export default {
     display: flex;
     line-height: 1rem;
 }
+.popup-title{
+  width: 90%;
+  margin: 0 auto;
+}
+.checkBox{
+  width: 100%;
+  height: 0.8rem;
+  position: relative;
+}
+.usePoint{
+  position: absolute;
+    right: 0.8rem;
+    color: red;
+    font-size: 0.4rem;
+    top: 0;
+}
+.usePointTwo{
+   position: absolute;
+  right:0;
+  color: red;
+    font-size: 0.3rem;
+  top: 0.05rem;
+}
+.checkBoxTwo{
+   width: 90%;
+  height: 0.8rem;
+   margin: 0 auto;
+  position: relative;
+  line-height: 0.8rem;
+}
+.usePointThree{
+position: absolute;
+    top: 0.1rem;
+right: 0.8rem;
+font-size: 0.4rem;
+}
+.usePointFour{
+position: absolute;
+    top: 0.1rem;
+right: 0;
+   font-size: 0.3rem;
+}
+.exchange{
+     width: 5rem;
+    height: 1rem;
+    background-color: rgb(226, 74, 68);
+    color: white;
+    line-height: 1rem;
+    border-radius: 0.2rem;
+    text-align: center;
+    font-size: 0.4rem;
+    margin: 3rem auto;
+}
+.exchangeTwo{
+     width: 5rem;
+    height: 1rem;
+    background-color: gray;
+    color: white;
+    line-height: 1rem;
+    border-radius: 0.2rem;
+    text-align: center;
+    font-size: 0.4rem;
+    margin: 3rem auto;
+}
 </style>
\ No newline at end of file