Merge branch 'master' into jyh_h5

src/api/test.js

@@ -38,7 +38,23 @@ const testApi = {
    pageStockProfitLogList(params) {
 	return http.post('/invest/admin/pc/smart/pageStockProfitLogList', params)
   
-  }
+  },
+  //AI账户首页收益接口
+  followaccount(data){
+	return http.post('/invest/admin/pc/followaccount/queryFollowAccountNewYields', data)
+  },
+  //跟投产品详情
+  productDetail(data){
+	return http.post('/newcrm/open/vip/product/detail', data)
+  },
+  //兑换产品
+  exchangeProduct(data){
+	return http.post('/open/vip/product/exchange/product', data)
+  },
+  //异动点评列表
+  queryFollowAccountReviews(data){
+	return http.post('/invest/admin/pc/followaccount/queryFollowAccountReviews', data)
+  },
 };
 
 export default testApi

src/config/index.js

 export default {
     /**接口请求的基础路径 */
     baseUrl: {
-      dev: 'http://192.168.0.93:8080', // 开发路径
+      // dev: 'http://192.168.0.93:8080', // 开发路径
       dev: 'https://test6.douniu8.com/', // 开发路径
       // dev: 'https://autumnfish.cn',
       // dev: 'http://10.0.0.147:8301',

src/views/actualCombat/abnormalReview.vue

 <template>
   <div class="content">
-    <div class="listBox">
+    <div class="listBox" v-for="i in list" :key="i.id">
         <div class="left-box">
           <div class="left-time">
-            <span style="display:block;font-size:0.3rem;color:gray">12-19</span>
-            <span style="display:block;font-size:0.3rem;color:gray">09:39</span>
+            <span style="display:block;font-size:0.3rem;color:gray">{{state_type(i.created_TIME) }}</span>
+            <span style="display:block;font-size:0.3rem;color:gray">{{state_typeTwo(i.created_TIME)}}</span>
           </div>
           <div class="left-line">
 
           </div>
         </div>
         <div class="right-box">
-          <span style="display:block;font-size:0.5rem; font-weight: bold;margin-top:0.2rem">盘中点评</span>
+          <span style="display:block;font-size:0.5rem; font-weight: bold;margin-top:0.2rem">{{i.reviewsType}}</span>
+          <div class="ellipsis-multiline">
+  {{i.comments}}
+  <!-- 这里是文本内容 -->
+</div>
+<div class="more-button" v-if="ifMore" @click="clickMore(i.id)">展开</div>
           <!-- <van-text-ellipsis :content="text" expand-text="展开" collapse-text="收起" /> -->
-          <span ref="myDiv" class="overText" style="font-size:0.35rem;margin-top:0.2rem;">盘中点评这是啊飒飒Asia哦撒发达啊沙发沙发破萨满怕是安检门破手机批发爱上方面强迫我反对换个地方恢复鬼画符发是反对鬼地方和梵蒂冈很快就会给客户票佛爱上放大泼妇发票豆腐干地方和广泛的回复</span>
+          <!-- <span ref="myDiv" class="overText" style="font-size:0.35rem;margin-top:0.2rem;">盘中点评这是啊飒飒Asia哦撒发达啊沙发沙发破萨满怕是安检门破手机批发爱上方面强迫我反对换个地方恢复鬼画符发是反对鬼地方和梵蒂冈很快就会给客户票佛爱上放大泼妇发票豆腐干地方和广泛的回复</span> -->
         </div>
     </div>
   </div>
@@ -31,12 +36,77 @@ export default {
     return {
       num: 0,
       list: [],
+      ifMore:false,
     };
   },
-  
+  mounted(){
+    this.getList()
+  },
   methods: {
     // ...mapMutations("store_modular", ["operation"]),
-    
+    getList() {
+      let temp={
+        followAccountId:5,
+        page:1,
+        pageSize:100
+      }
+       this.server.queryFollowAccountReviews(temp).then((res) =>{
+          this.list=res.data.data.list
+          this.list.forEach((i,index)=>{
+            if(i.comments.length<=48){
+              i.ifMore=false
+            }else{
+              i.ifMore=true
+            }
+          })
+        })
+        
+      
+//       this.$toast.loading({
+//   message: '加载中...',
+//   forbidClick: true,
+//   duration:0
+// });
+     
+    },
+    clickMore(val){
+      document.querySelector('.ellipsis-multiline').style.webkitLineClamp = 'initial'; // 移除行数限制
+      this.list.forEach((i,index)=>{
+        if(i.id==val){
+          i.ifMore=false
+        }
+      })
+    },
+    state_type(row) {
+              console.log("睡觉哦",row)
+              // if(cellValue==null){
+              //   return cellValue
+              // }
+             let date = new Date(parseInt(row));
+let Year = date.getFullYear();
+let Moth = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1);
+let Day = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate());
+let Hour = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours());
+let Minute = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes());
+let Sechond = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
+let  GMT =  Moth + '-' + Day
+return GMT
+        },
+      state_typeTwo(row) {
+              console.log("睡觉哦",row)
+              // if(cellValue==null){
+              //   return cellValue
+              // }
+             let date = new Date(parseInt(row));
+let Year = date.getFullYear();
+let Moth = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1);
+let Day = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate());
+let Hour = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours());
+let Minute = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes());
+let Sechond = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
+let  GMT =  Hour + ':' + Minute
+return GMT
+        },
   },
  
 };
@@ -44,9 +114,10 @@ export default {
 
 <style scoped>
 .listBox{
-    height: 3rem;
+    /* height: 3rem; */
     width: 100%;
     display: flex;
+    margin-top: 0.5rem;
     /* background-color: bisque; */
 }
 .left-box{
@@ -63,9 +134,9 @@ export default {
 .right-box{
   width: 80%;
   height: 100%;
-  border-bottom: 1px solid gray;
+  border-bottom: 1px solid rgb(226, 226, 226);
   margin-left: 2%;
- 
+ padding-bottom: 0.3rem;
 }
 .overText{
   overflow: hidden;
@@ -79,4 +150,20 @@ export default {
 		-webkit-box-orient: vertical;
 		/*将对象作为弹性伸缩盒子模型显示*/
 }
+.ellipsis-multiline {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 4; /* 定义显示的行数 */
+  overflow: hidden;
+  text-overflow: ellipsis;
+  font-size: 0.35rem;
+  margin-top: 0.3rem;
+}
+ 
+.more-button {
+  cursor: pointer;
+  text-align: center;
+  color: blue;
+  font-size: 0.3rem;
+}
 </style>
\ No newline at end of file

src/views/actualCombat/detail.vue

@@ -159,7 +159,7 @@
     <!-- 已售罄 -->
     <div class="soldOut">
       <div class="soltBox">
-
+        <span>已售罄</span>
       </div>
       <div class="soldText">
         <span>-1.12%</span>
@@ -216,7 +216,7 @@
             <span >卖</span>
         </div>
         <div class="contectSold" @click="showPopup">
-
+<span>已售罄</span>
         </div>
         <!-- <div class="contectBox">
             <span>300***</span>
@@ -258,7 +258,7 @@
 </van-radio-group>
     </div>
 <div class="checkBoxTwo" style="margin-bottom:0.5rem;color:black">
-<span style="font-size: 0.4rem;">当前积分</span><span class="usePointThree">12435</span><span class="usePointFour">积分</span>
+<span style="font-size: 0.4rem;">当前积分</span><span class="usePointThree">{{morePoint}}</span><span class="usePointFour">积分</span>
 
       </div>
      <div v-if="ifexchange" class="exchange">
@@ -304,6 +304,7 @@ export default {
       radio:'1',
       radio2:'1',
       show:false,
+      morePoint:12345,
       list: [],
       ifexchange:true,
       checkList:[
@@ -894,9 +895,10 @@ display: flex;
   width: 50%;
 height: 100%;
 background-color:gray ;
-/* text-align: center;
+color: white;
+text-align: center;
 line-height: 1.2rem;
-font-size: 0.35rem; */
+font-size: 0.35rem;
 
 }
 .soldText{
@@ -925,6 +927,10 @@ line-height: 1.5rem;
   width: 40%;
   background: gray;
   border-radius: 0.2rem;
+  color: white;
+text-align: center;
+line-height: 1.5rem;
+font-size: 0.35rem;
 }
 .mai{
         display: block;

src/views/actualCombat/index.vue

@@ -5,12 +5,12 @@
           <span>明星分析师</span>
       </div>
       <div class="tab-box" >
-          <span :class="tabIndex==0?'table-contect':'table-contectHid'" @click="clickTab('0','总收益')">总收益</span>
-           <span :class="tabIndex==1?'table-contect':'table-contectHid'"  @click="clickTab('1','今年收益')">今年收益</span>
-            <span :class="tabIndex==2?'table-contect':'table-contectHid'"  @click="clickTab('2','月收益')">月收益</span>
-             <span :class="tabIndex==3?'table-contect':'table-contectHid'"  @click="clickTab('3','回撤率')">回撤率</span>
-              <span :class="tabIndex==4?'table-contect':'table-contectHid'"  @click="clickTab('4','胜率')">胜率</span>
-               <span :class="tabIndex==5?'table-contect':'table-contectHid'"  @click="clickTab('5','仓位')">仓位</span>
+          <span :class="tabIndex=='yields'?'table-contect':'table-contectHid'" @click="clickTab('yields','总收益')">总收益</span>
+           <span :class="tabIndex=='seasonYields'?'table-contect':'table-contectHid'"  @click="clickTab('seasonYields','季收益')">季收益</span>
+            <span :class="tabIndex=='monthlyYields'?'table-contect':'table-contectHid'"  @click="clickTab('monthlyYields','月收益')">月收益</span>
+             <span :class="tabIndex=='backYields'?'table-contect':'table-contectHid'"  @click="clickTab('backYields','回撤率')">回撤率</span>
+              <span :class="tabIndex=='successPercent'?'table-contect':'table-contectHid'"  @click="clickTab('successPercent','胜率')">胜率</span>
+               <span :class="tabIndex=='position'?'table-contect':'table-contectHid'"  @click="clickTab('position','仓位')">仓位</span>
 <!-- <van-tabs  type="card" >
   <van-tab title="标签 1">内容 1</van-tab>
   <van-tab title="标签 2">内容 2</van-tab>
@@ -22,50 +22,66 @@
           <div class="left-card">
               <div class="card-title">
                   <span style="display:block;margin-bottom:0.1rem">{{tableName}}</span>
-                  <span style="display:block;font-size:0.5rem;">34.59%</span>
+                  <span style="display:block;font-size:0.5rem;">{{profitSecond*100}}%</span>
               </div>
               <span class="left-contect">
-                    大展宏图2024
+                    {{productNameSecond}}
               </span>
-              <span class="clickBtn" @click="showPopup">解锁订阅</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">
               <div class="card-title">
                   <span style="display:block;margin-bottom:0.1rem">{{tableName}}</span>
-                  <span style="display:block;font-size:0.5rem;">34.59%</span>
+                  <span style="display:block;font-size:0.5rem;">{{profitFirst*100}}%</span>
               </div>
             <span class="left-contect">
-                    大展宏图2024
+                    {{productNameFirst}}
               </span>
-              <span class="clickBtn">解锁订阅</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">
                <div class="card-title">
                   <span style="display:block;margin-bottom:0.1rem">{{tableName}}</span>
-                  <span style="display:block;font-size:0.5rem;">34.59%</span>
+                  <span style="display:block;font-size:0.5rem;">{{profitThree*100}}%</span>
               </div>
                 <span class="left-contect">
-                    大展宏图2024
+                   {{productNameThree}}
               </span>
-              <span class="clickBtn">解锁订阅</span>
+              <span v-if="isBuyThree==2" class="clickBtn"  @click="showPopup(profitIdThree)">兑换解锁</span>
+               <span v-if="isBuyThree==1" class="clickBtnGray"   >已兑换</span>
           </div>
       </div>
       <!-- 内容盒子 -->
-      <div class="bottomcontect-box">
+      <div  style="padding-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">
-<span style="display:block;font-size:0.5rem">大展宏图2024</span>
-<span style="display:block;font-size:0.5rem;margin-top: 0.2rem;">{{tableName}}: <span style="color:red">12.20%</span> </span>
+<span style="display:block;font-size:0.5rem">{{i.productName}}</span>
+<span style="display:block;font-size:0.5rem;margin-top: 0.2rem;">
+  {{tableName}}: 
+  <span v-if="tabIndex=='yields'" style="color:red">{{i.yields*100}}%</span> 
+  <span v-if="tabIndex=='seasonYields'" style="color:red">{{i.seasonYields*100}}%</span> 
+  <span v-if="tabIndex=='monthlyYields'" style="color:red">{{i.monthlyYields*100}}%</span> 
+  <span v-if="tabIndex=='backYields'" style="color:red">{{i.backYields*100}}%</span> 
+  <span v-if="tabIndex=='successPercent'" style="color:red">{{i.successPercent*100}}%</span> 
+  <span v-if="tabIndex=='position'" style="color:red">{{i.position*100}}%</span> 
+  </span>
 </div>
 <div class="top-right">
-<span class="clickBtnTwo">解锁订阅</span>
+<span v-if="i.isBuy==2" class="clickBtnTwo" @click="showPopup(i.id)">兑换解锁</span>
+<span v-if="i.isBuy==1" class="clickBtnTwoGray" >已兑换</span>
 </div>
 </div>
 <div class="bottomthis-box">
-<span style="display:block;font-size:0.4rem;margin-left:0.2rem">仓位  99.90%</span><span style="display:block;font-size:0.5rem;font-size:0.4rem;margin-left:0.4rem">周收益  99.90%</span><span style="display:block;font-size:0.5rem;font-size:0.4rem;margin-left:0.4rem">月收益  99.90%</span>
+<span style="display:block;font-size:0.4rem;margin-left:0.2rem">仓位  {{i.position*100}}%</span><span style="display:block;font-size:0.5rem;font-size:0.4rem;margin-left:0.4rem">周收益  {{i.weekYields*100}}%</span><span style="display:block;font-size:0.5rem;font-size:0.4rem;margin-left:0.4rem">月收益  {{i.monthlyYields*100}}%</span>
 </div>
       </div>
       </div>
+     
+      </div>
      <!-- 弹出层 -->
     <van-popup v-model="show" position="bottom" :style="{ height: '70%' }">
       <div class="popup-title">
@@ -84,7 +100,7 @@
     ">
     <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>
+  <van-radio :name="i.count" icon-size="12px" checked-color="#ee0a24">{{i.countName}}</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> -->
@@ -134,43 +150,59 @@ export default {
     return {
       num: 0,
       list: [],
-      tabIndex:0,
+      tabIndex:'yields',
       ifexchange:true,
       show:false,
+      isBuyFirst:2,
+      isBuyTwo:2,
+      isBuyThree:2,
+      profitFirst:'',
+      profitSecond:'',
+      profitThree:'',
+      productNameFirst:'',
+      productNameSecond:'',
+      productNameThree:'',
+      profitIdFirst:'',
+      profitIdTwo:'',
+      profitIdThree:'',
       tableName:'总收益',
-      radio2:'1',
+      radio2:1,
       morePoint:12345,
+      profitList:[],
+      productExchangeId:'',
       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',
-        }
+        // {
+        //   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(){
 
+this.clickTab('yields','总收益')
  if(this.morePoint>=this.checkList[0].point){
             this.ifexchange=true
           }else{
             this.ifexchange=false
           }
+         
   },
   methods: {
     ...mapMutations("store_modular", ["operation"]),
@@ -192,13 +224,114 @@ export default {
 // });
      
     },
-    showPopup(){
+    showPopup(id){
       this.show=true
+      // this.productExchangeId=id
+      let temp={
+        productId:id,
+        productTypeCode:'FollowUp'
+      }
+      this.server.productDetail(temp).then((res)=>{
+        // console.log
+        this.checkList=res.data.data
+      })
     },
     //点击标签页
     clickTab(index,name){
+      console.log()
         this.tabIndex=index
         this.tableName=name
+        let temp={
+            page:1,
+            pageSize:10,
+            orderByColumn:this.tabIndex,
+            orderByDirection:'desc'
+        }
+        this.server.followaccount(temp).then((res)=>{
+          // console.log("好好哄",res.data.data.list)
+          this.profitList=res.data.data.list
+         if(this.tabIndex=='yields'){
+    this.profitFirst=this.profitList[0].yields,
+    this.profitSecond=this.profitList[1].yields,
+    this.profitThree=this.profitList[2].yields,
+     this.productNameFirst=this.profitList[0].productName,
+     this.productNameSecond=this.profitList[1].productName,
+     this.productNameThree=this.profitList[2].productName
+     this.profitIdFirst=this.profitList[0].id
+     this.profitIdTwo=this.profitList[1].id
+     this.profitIdThree=this.profitList[2].id
+     this.isBuyFirst=this.profitList[0].isBuy
+      this.isBuyTwo=this.profitList[1].isBuy
+       this.isBuyThree=this.profitList[2].isBuy
+         }
+         else if(this.tabIndex=='seasonYields'){
+ this.profitFirst=this.profitList[0].seasonYields,
+    this.profitSecond=this.profitList[1].seasonYields,
+    this.profitThree=this.profitList[2].seasonYields,
+     this.productNameFirst=this.profitList[0].productName,
+     this.productNameSecond=this.profitList[1].productName,
+     this.productNameThree=this.profitList[2].productName
+      this.profitIdFirst=this.profitList[0].id
+     this.profitIdTwo=this.profitList[1].id
+     this.profitIdThree=this.profitList[2].id
+     this.isBuyFirst=this.profitList[0].isBuy
+      this.isBuyTwo=this.profitList[1].isBuy
+       this.isBuyThree=this.profitList[2].isBuy
+         }else if(this.tabIndex=='monthlyYields'){
+            this.profitFirst=this.profitList[0].monthlyYields,
+    this.profitSecond=this.profitList[1].monthlyYields,
+    this.profitThree=this.profitList[2].monthlyYields,
+     this.productNameFirst=this.profitList[0].productName,
+     this.productNameSecond=this.profitList[1].productName,
+     this.productNameThree=this.profitList[2].productName
+      this.profitIdFirst=this.profitList[0].id
+     this.profitIdTwo=this.profitList[1].id
+     this.profitIdThree=this.profitList[2].id
+     this.isBuyFirst=this.profitList[0].isBuy
+      this.isBuyTwo=this.profitList[1].isBuy
+       this.isBuyThree=this.profitList[2].isBuy
+         }else if(this.tabIndex=='backYields'){
+            this.profitFirst=this.profitList[0].backYields,
+    this.profitSecond=this.profitList[1].backYields,
+    this.profitThree=this.profitList[2].backYields,
+     this.productNameFirst=this.profitList[0].productName,
+     this.productNameSecond=this.profitList[1].productName,
+     this.productNameThree=this.profitList[2].productName
+      this.profitIdFirst=this.profitList[0].id
+     this.profitIdTwo=this.profitList[1].id
+     this.profitIdThree=this.profitList[2].id
+     this.isBuyFirst=this.profitList[0].isBuy
+      this.isBuyTwo=this.profitList[1].isBuy
+       this.isBuyThree=this.profitList[2].isBuy
+         }else if(this.tabIndex=='successPercent'){
+            this.profitFirst=this.profitList[0].successPercent,
+    this.profitSecond=this.profitList[1].successPercent,
+    this.profitThree=this.profitList[2].successPercent,
+     this.productNameFirst=this.profitList[0].productName,
+     this.productNameSecond=this.profitList[1].productName,
+     this.productNameThree=this.profitList[2].productName
+      this.profitIdFirst=this.profitList[0].id
+     this.profitIdTwo=this.profitList[1].id
+     this.profitIdThree=this.profitList[2].id
+     this.isBuyFirst=this.profitList[0].isBuy
+      this.isBuyTwo=this.profitList[1].isBuy
+       this.isBuyThree=this.profitList[2].isBuy
+         }else if(this.tabIndex=='position'){
+            this.profitFirst=this.profitList[0].position,
+    this.profitSecond=this.profitList[1].position,
+    this.profitThree=this.profitList[2].position,
+     this.productNameFirst=this.profitList[0].productName,
+     this.productNameSecond=this.profitList[1].productName,
+     this.productNameThree=this.profitList[2].productName
+      this.profitIdFirst=this.profitList[0].id
+     this.profitIdTwo=this.profitList[1].id
+     this.profitIdThree=this.profitList[2].id
+     this.isBuyFirst=this.profitList[0].isBuy
+      this.isBuyTwo=this.profitList[1].isBuy
+       this.isBuyThree=this.profitList[2].isBuy
+         }
+          // if(this.index)
+        })
     },
     //选择积分
     clickBox(val){
@@ -220,7 +353,7 @@ export default {
 
 <style scoped>
 .content{
-    background-color: rgb(239, 239, 239);
+    /* background-color: rgb(239, 239, 239); */
     min-height: 100vh;
 }
 .analyst{
@@ -324,6 +457,20 @@ export default {
     left: 0.5rem;
 
 }
+.clickBtnGray{
+   width: 2rem;
+    line-height: 0.7rem;
+    border-radius: 1rem;
+    text-align: center;
+    height: 0.7rem;
+    font-size: 0.27rem;
+    display: block;
+    background: gray;
+    color: white;
+    position: absolute;
+    bottom: 0.1rem;
+    left: 0.5rem;
+}
 .clickBtnTwo{
          width: 2rem;
     line-height: 0.7rem;
@@ -339,6 +486,21 @@ export default {
     bottom: 0.1rem;
     left: 0.5rem; */
 }
+.clickBtnTwoGray{
+         width: 2rem;
+    line-height: 0.7rem;
+    border-radius: 1rem;
+    text-align: center;
+    height: 0.7rem;
+    font-size: 0.27rem;
+    display: block;
+    background: gray;
+    color: white;
+    margin: auto 0;
+    /* position: absolute;
+    bottom: 0.1rem;
+    left: 0.5rem; */
+}
 .card-title{
         font-size: 0.4rem;
     position: absolute;