Merge branch 'master' into jyh_h5

src/api/test.js

@@ -83,6 +83,10 @@ const testApi = {
   getFollowAccountYieldsRecords(data){
 	return http.post('/invest/admin/pc/followaccount/getFollowAccountYieldsRecords', data)
   },
+  //积分兑换记录列表
+  exchangeRecord(data){
+	return http.get('/invest/customer/exchange/records')
+  }
 };
 
 export default testApi

src/router/router_modular/index.js

@@ -64,6 +64,11 @@ const router_modular = [
         path: '/detail',
         name: 'detail',
         component: () => import('@/views/actualCombat/detail')
+    },
+    {
+        path: '/exchangeRecordList',
+        name: 'exchangeRecordList',
+        component: () => import('@/views/actualCombat/exchangeRecordList')
     }
 
    

src/views/actualCombat/detail.vue

@@ -57,7 +57,7 @@
             <span>{{(formData.monthlyBackYields*100).toFixed(2)}}%</span>
         </div>
         <div class="tab-box-Two">
-            <span>{{(formData.position).toFixed(2)}}%</span>
+            <span>{{(formData.position*100).toFixed(2)}}%</span>
         </div>
         <div class="tab-box-Two">
             <span>{{(backYields*100).toFixed(2)}}%</span>
@@ -252,7 +252,7 @@
             <span>{{formDataTwo.price}}</span>
         </div>
         <div class="contectBox">
-            <span>{{formDataTwo.remark*100}}%</span>
+            <span>{{(formDataTwo.remark*100).toFixed(2)}}%</span>
         </div>
         <div class="contectBox">
             <span style="display:block;height:0.5rem;margin-top:-0.3rem">{{state_type(formDataTwo.created_TIME)}}</span>
@@ -469,7 +469,7 @@ export default {
       }
        this.server.followaccountDetail(temp).then((res) =>{
           this.formData=res.data.data
-          this.formData.position=parseFloat(res.data.data.position)*100
+          this.formData.position=parseFloat(res.data.data.position)
           this.clickTab()
           this.getAbnomalList()
           this.getAcountList()

src/views/actualCombat/exchangeRecordList.vue

+<template>
+  <div class="content">
+       <!-- <div class="ster">
+        <img
+          src="../../assets/left.png"
+          alt=""
+          style="width: 0.5rem;
+    height: 0.8rem;
+    margin-top: 0.1rem;
+    margin-left: 0.2rem;"
+          @click="tab_oimg"
+        />
+        <div class="deta">客户兑换记录</div>
+      </div> -->
+    <div class="head-box">
+        <div class="tab-box">
+            <span>产品名称</span>
+        </div>
+        <div class="tab-box">
+            <span>积分价格</span>
+        </div>
+        <div class="tab-box">
+            <span>数量</span>
+        </div>
+        <div class="tab-box">
+            <span>兑换时间</span>
+        </div>
+        <div class="tab-box">
+            <span>到期时间</span>
+        </div>
+        
+    </div>
+    <!-- 灰线 -->
+    <div class="line">
+
+    </div>
+    <div v-for="i in list" :key="i.code">
+<div class="contect-list">
+        <!-- <div v-if="i.direction==1" class="maiTwo">
+            <span >买</span>
+        </div>
+        <div v-if="i.direction==2" class="mai">
+            <span >卖</span>
+        </div> -->
+        <div class="contectBox">
+            <span>{{i.productName}}</span>
+        </div>
+        <div class="contectBox">
+            <span style="display:block;">{{i.useIntegrationTotal}}</span>
+        </div>
+        <div class="contectBox">
+            <span>{{i.monthNum}}</span>
+        </div>
+        <div class="contectBox">
+            <span style="display:block;">{{state_type(i.exchangeTime)}}</span>
+        </div>
+        <div class="contectBox">
+            <!-- <span style="display:block;height:0.5rem;margin-top:-0.3rem">{{state_type(i.created_TIME)}}</span> -->
+            <span style="display:block;">{{state_type(i.expiredTime)}}</span>
+        </div>
+    </div>
+    <!-- 灰线 -->
+    <div class="lineTwo">
+
+    </div>
+    </div>
+    
+  </div>
+</template>
+
+<script>
+// import { mapState, mapMutations } from "vuex";
+
+// import testApi from "@/api/test";
+export default {
+  computed: {
+    // ...mapState("store_modular", ["name"]),
+  },
+  data() {
+    return {
+      num: 0,
+      list: [],
+    };
+  },
+  mounted(){
+       if(this.$route.query.token){
+localStorage.setItem("getToken",this.$route.query.token)
+    }
+      this.getList()
+  },
+  methods: {
+    // ...mapMutations("store_modular", ["operation"]),
+    getList() {
+    //   let temp={
+    //     followAccountId:this.$route.query.id,
+    //     page:1,
+    //     pageSize:100
+    //   }
+       this.server.exchangeRecord().then((res) =>{
+          this.list=res.data.data
+        //   this.list.forEach((i,index)=>{
+        //     i.remark=parseFloat(i.remark)*100
+        //   })
+        })
+        
+      
+//       this.$toast.loading({
+//   message: '加载中...',
+//   forbidClick: true,
+//   duration:0
+// });
+     
+    },
+     tab_oimg: function () {
+            this.$router.push({
+          path: '/detail',
+          query: {
+              id:this.$route.query.id
+          }
+        });
+      // this.$router.push("../detail");
+    },
+     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 = Year+'-'+ 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
+        },
+  
+    
+  },
+ 
+};
+</script>
+
+<style scoped>
+.head-box{
+       height: 1.2rem;
+    width: 100%;
+    display: flex;
+    /* background-color: yellow; */
+}
+.tab-box{
+width: 20%;
+height: 100%;
+text-align: center;
+line-height: 1.2rem;
+font-size: 0.35rem;
+/* background-color: aquamarine; */
+}
+.line{
+    width: 100%;
+    height: 0.3rem;
+    background-color:rgb(246, 247, 249) ;
+}
+.lineTwo{
+    width: 100%;
+    height: 0.01rem;
+    background-color:rgb(216, 216, 216) ;
+}
+.contect-list{
+      display: flex;
+       height: 1.5rem;
+      
+    width: 100%;
+    /* background-color: yellowgreen; */
+    font-size: 0.3rem;
+}
+.contectBox{
+width: 20%;
+height: 100%;
+text-align: center;
+ display: flex;
+ justify-content: center;
+  align-items: center;
+/* line-height: 1.5rem; */
+}
+.mai{
+        display: block;
+    height: 1rem;
+    width: 1rem;
+    border: 1px solid rgb(69, 137, 235);
+    color: rgb(69, 137, 235);
+    text-align: center;
+    line-height: 1rem;
+    margin: auto;
+    border-radius: 50%;
+
+}
+.maiTwo{
+    display: block;
+    height: 1rem;
+    width: 1rem;
+    border: 1px solid rgb(214, 85, 72);
+    color: rgb(214, 85, 72);
+    text-align: center;
+    line-height: 1rem;
+    margin: auto;
+    border-radius: 50%;
+}
+.ster {
+  display: flex;
+  background-color: rgb(226, 74, 68);
+  height: 1rem;
+  line-height: 1rem;
+}
+.deta {
+  width: 70%;
+  text-align: center;
+  margin-left: 34px;
+  font-size: 0.5rem;
+  color: white;
+  /* background: #e03939; */
+  font-weight: bolder;
+}
+</style>
\ No newline at end of file