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;