Skip to content

R
revised-version-h5
Commit 89659c56 authored by jiaoyahui's avatar jiaoyahui
Browse files
Options

Merge branch 'master' into jyh_h5

parents 95df47af 3077860f
Hide whitespace changes
Inline Side-by-side
Showing with 303 additions and 20 deletions
src/utils/request.js
View file @ 89659c56
...@@ -18,9 +18,19 @@ const service = axios.create({ ...@@ -18,9 +18,19 @@ const service = axios.create({
service.interceptors.request.use(config => { service.interceptors.request.use(config => {
//发请求前做的一些处理，数据转化，配置请求头，设置token,设置loading等，根据需求去添加 //发请求前做的一些处理，数据转化，配置请求头，设置token,设置loading等，根据需求去添加
config.data = JSON.stringify(config.data); //数据转化,也可以使用qs转换 config.data = JSON.stringify(config.data); //数据转化,也可以使用qs转换
// config.headers['Authorization'] = "Bearer " + token;
// let token='eyJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3MjY2NTY2NjUsInN1YiI6IjQ4MjY2NiIsImlhdCI6MTcyNjA1MTg2NX0.obv2AOw311MIF_Wx9ese0IS4BhE3CY3hEy7NFi17VovEc24hpQw-i8_ZaftK6NKd_AY0Q0bfU62I-wEGGiNx_Q'
let token= localStorage.getItem("getToken")
// Bearer eyJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3MjY2NTY2NjUsInN1YiI6IjQ4MjY2NiIsImlhdCI6MTcyNjA1MTg2NX0.obv2AOw311MIF_Wx9ese0IS4BhE3CY3hEy7NFi17VovEc24hpQw-i8_ZaftK6NKd_AY0Q0bfU62I-wEGGiNx_Q
config.headers = { config.headers = {
'Content-Type':'application/json' ,//配置请求头 'Content-Type':'application/json' ,//配置请求头
'Authorization': 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3MjY2NTY2NjUsInN1YiI6IjQ4MjY2NiIsImlhdCI6MTcyNjA1MTg2NX0.obv2AOw311MIF_Wx9ese0IS4BhE3CY3hEy7NFi17VovEc24hpQw-i8_ZaftK6NKd_AY0Q0bfU62I-wEGGiNx_Q' 'Authorization': 'Bearer'+token
} }
//如有需要：注意使用token的时候需要引入cookie方法或者用本地localStorage等方法，推荐js-cookie //如有需要：注意使用token的时候需要引入cookie方法或者用本地localStorage等方法，推荐js-cookie
//const token = getCookie('名称');//这里取token之前，你肯定需要先拿到token,存一下 //const token = getCookie('名称');//这里取token之前，你肯定需要先拿到token,存一下
......
src/views/actualCombat/detail.vue
View file @ 89659c56
...@@ -172,10 +172,10 @@ ...@@ -172,10 +172,10 @@
</div> </div>
<!-- 已售罄 --> <!-- 已售罄 -->
<div class="soldOut"> <div class="soldOut">
<div class="soltBox" v-if="isBuy==2"> <div class="soltBox" v-if="isBuy==2" >
<!-- <span>已售罄</span> --> <!-- <span>已售罄</span> -->
<img style="height: 1rem; <img style="height: 1rem;
margin-top: 0.2rem;" src="../../assets/sure.png" alt=""> margin-top: 0.2rem;" src="../../assets/sure.png" @click="showPopup()" alt="">
</div> </div>
<div v-if="isBuy==1" class="soldText"> <div v-if="isBuy==1" class="soldText">
<span>{{formDataThree.count}}</span> <span>{{formDataThree.count}}</span>
...@@ -240,10 +240,10 @@ ...@@ -240,10 +240,10 @@
<div v-if="formDataTwo.direction==2" class="mai"> <div v-if="formDataTwo.direction==2" class="mai">
<span >卖</span> <span >卖</span>
</div> </div>
<div class="contectSold" v-if="isBuy==2" @click="showPopup"> <div class="contectSold" v-if="isBuy==2" >
<!-- <span>已售罄</span> --> <!-- <span>已售罄</span> -->
<img style="height: 1rem; <img style="height: 1rem;
margin-top: 0.2rem;" src="../../assets/sure.png" alt=""> margin-top: 0.2rem;" src="../../assets/sure.png" @click="showPopup()" alt="">
</div> </div>
<div class="contectBox" v-if="isBuy==1"> <div class="contectBox" v-if="isBuy==1">
<span>{{formDataTwo.count}}</span> <span>{{formDataTwo.count}}</span>
...@@ -260,8 +260,8 @@ ...@@ -260,8 +260,8 @@
</div> </div>
</div> </div>
<!-- 弹出层 --> <!-- 积分弹出层 -->
<van-popup v-model="show" position="bottom" :style="{ height: '70%' }"> <van-popup v-model="showTwo" position="bottom" :style="{ height: '70%' }" get-container="#app">
<div class="popup-title"> <div class="popup-title">
<span style="font-size: 0.5rem; <span style="font-size: 0.5rem;
font-weight: bold;">热点精选</span><span style="font-size: 0.4rem;color:gray;margin-left:0.3rem">智能策略</span> font-weight: bold;">热点精选</span><span style="font-size: 0.4rem;color:gray;margin-left:0.3rem">智能策略</span>
...@@ -278,7 +278,7 @@ ...@@ -278,7 +278,7 @@
"> ">
<van-radio-group @change="clickBox" v-model="radio2"> <van-radio-group @change="clickBox" v-model="radio2">
<div class="checkBox" v-for="(i,index) in checkList"> <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> </div>
<!-- <van-radio name="2" icon-size="12px" checked-color="#ee0a24">单选框 2</van-radio> --> <!-- <van-radio name="2" icon-size="12px" checked-color="#ee0a24">单选框 2</van-radio> -->
...@@ -288,13 +288,48 @@ ...@@ -288,13 +288,48 @@
<span style="font-size: 0.4rem;">当前积分</span><span class="usePointThree">{{morePoint}}</span><span class="usePointFour">积分</span> <span style="font-size: 0.4rem;">当前积分</span><span class="usePointThree">{{morePoint}}</span><span class="usePointFour">积分</span>
</div> </div>
<div v-if="ifexchange" class="exchange"> <div v-if="ifexchange" class="exchange" @click="exchangeBtn()">
<span>立即兑换</span> <span>立即兑换</span>
</div> </div>
<div v-if="!ifexchange" class="exchangeTwo"> <div v-if="!ifexchange" class="exchangeTwo">
<span>立即兑换</span> <span>立即兑换</span>
</div> </div>
</van-popup> </van-popup>
<!-- 免责声明弹出层 -->
<van-popup v-model="disclaimerShow" position="bottom" :style="{ height: '70%'}" style="border-radius:0.5rem 0.5rem 0 0;">
<div class="popup-title" style="text-align: center; ">
<span style="font-size: 0.5rem;
font-weight: bold;">免责声明</span>
<!-- <span style="font-size: 0.3rem;color:gray;display:block">热点股票强度深度建模后优选好股票</span> -->
</div>
<div class="disclaimerBox" @scroll="handleScroll">
<span>山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外
山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外
山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外
山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外
山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外
山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外
</span>
</div>
<div v-if="!bottomBtnShow" class="disclaimerBottom">
<span>下滑至底部并同意</span>
</div>
<div v-if="bottomBtnShow" @click="agreeBtn()" class="disclaimerBottomTwo">
<span>我已知晓并同意</span>
</div>
<!-- <div class="popup-title" style="margin-bottom:0.5rem">
<span style="font-size: 0.4rem;">产品周期</span>
</div> -->
<!-- <div v-if="ifexchange" class="exchange">
<span>立即兑换</span>
</div>
<div v-if="!ifexchange" class="exchangeTwo">
<span>立即兑换</span>
</div> -->
</van-popup>
</div> </div>
</template> </template>
...@@ -303,7 +338,7 @@ ...@@ -303,7 +338,7 @@
</script> </script>
<script> <script>
import { mapState, mapMutations } from "vuex"; // import { mapState, mapMutations } from "vuex";
import { Dialog,Button,Popup } from 'vant'; import { Dialog,Button,Popup } from 'vant';
import * as echarts from 'echarts'; import * as echarts from 'echarts';
...@@ -319,18 +354,21 @@ import * as echarts from 'echarts'; ...@@ -319,18 +354,21 @@ import * as echarts from 'echarts';
// import testApi from "@/api/test"; // import testApi from "@/api/test";
export default { export default {
computed: { computed: {
...mapState("store_modular", ["name"]), // ...mapState("store_modular", ["name"]),
}, },
components: { components: {
[Button.name]: Button, [Button.name]: Button,
[Dialog.name]: Dialog, [Dialog.name]: Dialog,
[Popup.name]: Popup,
}, },
data() { data() {
return { return {
num: 0, num: 0,
radio:'1', radio:'1',
radio2:'1', radio2:1,
show:false, showTwo:false,
disclaimerShow:false,
bottomBtnShow:false,
isBuy:2, isBuy:2,
morePoint:12345, morePoint:12345,
list: [], list: [],
...@@ -370,6 +408,8 @@ export default { ...@@ -370,6 +408,8 @@ export default {
chart: null, chart: null,
_thisForChart: null, _thisForChart: null,
_thisForWindow: null, _thisForWindow: null,
countId:'',
pointNumber:'',
colorItem: { colorItem: {
// "北京": '#ff6161', // "北京": '#ff6161',
// "上海": '#e0815b', // "上海": '#e0815b',
...@@ -407,10 +447,12 @@ export default { ...@@ -407,10 +447,12 @@ export default {
}; };
}, },
mounted(){ mounted(){
this.getFollowAccountIndustryPercent() this.getFollowAccountIndustryPercent()
this.getList() this.getList()
this.getFollowAccountYieldsRecords() this.getFollowAccountYieldsRecords()
}, },
beforeDestroy () { beforeDestroy () {
this.removeEventListenerToSidebarContainer() this.removeEventListenerToSidebarContainer()
...@@ -432,6 +474,13 @@ export default { ...@@ -432,6 +474,13 @@ export default {
this.getAbnomalList() this.getAbnomalList()
this.getAcountList() this.getAcountList()
this.queryFollowAccountPositions() this.queryFollowAccountPositions()
if(this.checkList.length>0){
if(this.morePoint>=this.checkList[0].point){
this.ifexchange=true
}else{
this.ifexchange=false
}
}
// this.list.forEach((i,index)=>{ // this.list.forEach((i,index)=>{
// if(i.comments.length<=48){ // if(i.comments.length<=48){
// i.ifMore=false // i.ifMore=false
...@@ -745,7 +794,9 @@ this.formDataTwo.remark= Math.round(a * 100) / 100 ...@@ -745,7 +794,9 @@ this.formDataTwo.remark= Math.round(a * 100) / 100
clickBox(val){ clickBox(val){
console.log("这是啥啊",val) console.log("这是啥啊",val)
this.checkList.forEach((i,index)=>{ this.checkList.forEach((i,index)=>{
if(val==i.id){ if(val==i.count){
this.countId=i.count
this.pointNumber=i.point
console.log("我的积分",this.morePoint>=i.point) console.log("我的积分",this.morePoint>=i.point)
if(this.morePoint>=i.point){ if(this.morePoint>=i.point){
this.ifexchange=true this.ifexchange=true
...@@ -757,9 +808,69 @@ this.formDataTwo.remark= Math.round(a * 100) / 100 ...@@ -757,9 +808,69 @@ this.formDataTwo.remark= Math.round(a * 100) / 100
}, },
tab_oimg: function () { tab_oimg: function () {
this.$router.push("../actualCombat"); this.$router.push("../actualCombat");
},
//免责声明弹窗
exchangeBtn(){
this.disclaimerShow=true
this.showTwo=false
},
//下滑
handleScroll(event){
const { scrollTop, clientHeight, scrollHeight } = event.target;
// console.log("这是下滑",scrollTop)
if (scrollTop + clientHeight >= scrollHeight - 1) {
console.log('已经下滑到底部');
this.bottomBtnShow=true
// 执行到达底部后的操作
}
},
agreeBtn(){
// countId:'',
// pointNumber:'',
let params = {
clientAppType: "H5",
investProductId: this.productExchangeId,
investProductTypeCode: 'FollowUp',
monthNum: this.countId,
useIntegrationTotal: this.pointNumber,
// useIntegrationTotal : this.crmIntegral
};
this.server.newcrmqueryproduct(params).then((res) => {
if (res.data.code == 200) {
alert("兑换成功");
this.disclaimerShow=false
} else if (res.data.code == 500) {
alert("网络错误，请稍后重试");
} else if (res.data.code == 600) {
alert(res.data.message);
}
});
}, },
showPopup(){ showPopup(){
this.show=true this.showTwo=true
this.radio2=1
this.productExchangeId=this.$route.query.id
let temp={
productId:this.$route.query.id,
productTypeCode:'FollowUp'
}
this.server.productDetail(temp).then((res)=>{
// console.log
this.morePoint=res.data.data.crmIntegral
this.checkList=res.data.data.investProductCycles
this.checkList.forEach((i,index)=>{
if(this.radio2==i.count){
this.countId=i.count
this.pointNumber=i.point
console.log("我的积分",this.morePoint>=i.point)
if(this.morePoint>=i.point){
this.ifexchange=true
}else{
this.ifexchange=false
}
}
})
})
}, },
initPieChart () { initPieChart () {
let echartData =this.echartData let echartData =this.echartData
...@@ -963,6 +1074,38 @@ Dialog.alert({ ...@@ -963,6 +1074,38 @@ Dialog.alert({
background-color: rgb(226, 74, 68); background-color: rgb(226, 74, 68);
/* border-radius: 0 0 3rem 3rem; */ /* border-radius: 0 0 3rem 3rem; */
} }
.disclaimerBox{
width: 90%;
margin: 0 auto;
height: 12rem;
font-size: 0.3rem;
padding: 0.3rem;
overflow-y:scroll ;
/* background-color: aqua; */
}
.disclaimerBottom{
width: 38%;
height: 0.8rem;
margin: 0.5rem auto;
background-color: gray;
color: white;
border-radius: 0.2rem;
text-align: center;
line-height: 0.8rem;
font-size: 0.3rem;
}
.disclaimerBottomTwo{
width: 38%;
height: 0.8rem;
margin: 0.5rem auto;
background-color: rgb(226, 74, 68);
color: white;
border-radius: 0.2rem;
text-align: center;
line-height: 0.8rem;
font-size: 0.3rem;
}
.typeList{ .typeList{
height: 1rem; height: 1rem;
width: 100%; width: 100%;
......
src/views/actualCombat/index.vue
View file @ 89659c56
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
</div> </div>
</div> </div>
<!-- 弹出层 --> <!-- 积分弹出层 -->
<van-popup v-model="show" position="bottom" :style="{ height: '70%' }"> <van-popup v-model="show" position="bottom" :style="{ height: '70%' }">
<div class="popup-title"> <div class="popup-title">
<span style="font-size: 0.5rem; <span style="font-size: 0.5rem;
...@@ -110,13 +110,48 @@ ...@@ -110,13 +110,48 @@
<span style="font-size: 0.4rem;">当前积分</span><span class="usePointThree">{{morePoint}}</span><span class="usePointFour">积分</span> <span style="font-size: 0.4rem;">当前积分</span><span class="usePointThree">{{morePoint}}</span><span class="usePointFour">积分</span>
</div> </div>
<div v-if="ifexchange" class="exchange"> <div v-if="ifexchange" class="exchange" @click="exchangeBtn()">
<span>立即兑换</span> <span>立即兑换</span>
</div> </div>
<div v-if="!ifexchange" class="exchangeTwo"> <div v-if="!ifexchange" class="exchangeTwo">
<span>立即兑换</span> <span>立即兑换</span>
</div> </div>
</van-popup> </van-popup>
<!-- 免责声明弹出层 -->
<van-popup v-model="disclaimerShow" position="bottom" :style="{ height: '70%'}" style="border-radius:0.5rem 0.5rem 0 0;">
<div class="popup-title" style="text-align: center; ">
<span style="font-size: 0.5rem;
font-weight: bold;">免责声明</span>
<!-- <span style="font-size: 0.3rem;color:gray;display:block">热点股票强度深度建模后优选好股票</span> -->
</div>
<div class="disclaimerBox" @scroll="handleScroll">
<span>山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外
山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外
山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外
山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外
山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外
山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外山豆根山豆根豆腐干的山豆根士大夫和法国莫塞福农速递公司公司按时到喷射发动机扫i爱上佛i三个房间哦四个爱上放大毛粉沫i额外
</span>
</div>
<div v-if="!bottomBtnShow" class="disclaimerBottom">
<span>下滑至底部并同意</span>
</div>
<div v-if="bottomBtnShow" @click="agreeBtn()" class="disclaimerBottomTwo">
<span>我已知晓并同意</span>
</div>
<!-- <div class="popup-title" style="margin-bottom:0.5rem">
<span style="font-size: 0.4rem;">产品周期</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 style="font-size:18px">{{ name }}</div>
<div> <div>
<van-button type="primary" @click="operation('点赞关注')" <van-button type="primary" @click="operation('点赞关注')"
...@@ -152,7 +187,9 @@ export default { ...@@ -152,7 +187,9 @@ export default {
list: [], list: [],
tabIndex:'yields', tabIndex:'yields',
ifexchange:true, ifexchange:true,
bottomBtnShow:false,
show:false, show:false,
disclaimerShow:false,
isBuyFirst:2, isBuyFirst:2,
isBuyTwo:2, isBuyTwo:2,
isBuyThree:2, isBuyThree:2,
...@@ -164,7 +201,8 @@ export default { ...@@ -164,7 +201,8 @@ export default {
productNameThree:'', productNameThree:'',
profitIdFirst:'', profitIdFirst:'',
profitIdTwo:'', profitIdTwo:'',
countId:'',
pointNumber:'',
profitIdThree:'', profitIdThree:'',
tableName:'总收益', tableName:'总收益',
radio2:1, radio2:1,
...@@ -196,13 +234,20 @@ export default { ...@@ -196,13 +234,20 @@ export default {
}; };
}, },
mounted(){ mounted(){
if(this.$route.query.token){
localStorage.setItem("getToken",this.$route.query.token)
}
this.clickTab('yields','总收益') this.clickTab('yields','总收益')
if(this.checkList.length>0){
if(this.morePoint>=this.checkList[0].point){ if(this.morePoint>=this.checkList[0].point){
this.ifexchange=true this.ifexchange=true
}else{ }else{
this.ifexchange=false this.ifexchange=false
} }
}
}, },
methods: { methods: {
...@@ -227,7 +272,8 @@ this.clickTab('yields','总收益') ...@@ -227,7 +272,8 @@ this.clickTab('yields','总收益')
}, },
showPopup(id){ showPopup(id){
this.show=true this.show=true
// this.productExchangeId=id this.radio2=1
this.productExchangeId=id
let temp={ let temp={
productId:id, productId:id,
productTypeCode:'FollowUp' productTypeCode:'FollowUp'
...@@ -236,7 +282,57 @@ this.clickTab('yields','总收益') ...@@ -236,7 +282,57 @@ this.clickTab('yields','总收益')
// console.log // console.log
this.morePoint=res.data.data.crmIntegral this.morePoint=res.data.data.crmIntegral
this.checkList=res.data.data.investProductCycles this.checkList=res.data.data.investProductCycles
this.checkList.forEach((i,index)=>{
if(this.radio2==i.count){
this.countId=i.count
this.pointNumber=i.point
console.log("我的积分",this.morePoint>=i.point)
if(this.morePoint>=i.point){
this.ifexchange=true
}else{
this.ifexchange=false
}
}
}) })
})
},
//同意按钮
agreeBtn(){
// countId:'',
// pointNumber:'',
let params = {
clientAppType: "H5",
investProductId: this.productExchangeId,
investProductTypeCode: 'FollowUp',
monthNum: this.countId,
useIntegrationTotal: this.pointNumber,
// useIntegrationTotal : this.crmIntegral
};
this.server.newcrmqueryproduct(params).then((res) => {
if (res.data.code == 200) {
alert("兑换成功");
this.disclaimerShow=false
} else if (res.data.code == 500) {
alert("网络错误，请稍后重试");
} else if (res.data.code == 600) {
alert(res.data.message);
}
});
},
//免责声明弹窗
exchangeBtn(){
this.disclaimerShow=true
this.show=false
},
//下滑
handleScroll(event){
const { scrollTop, clientHeight, scrollHeight } = event.target;
// console.log("这是下滑",scrollTop)
if (scrollTop + clientHeight >= scrollHeight - 1) {
console.log('已经下滑到底部');
this.bottomBtnShow=true
// 执行到达底部后的操作
}
}, },
//跳转到详情页 //跳转到详情页
jumpDetail(id){ jumpDetail(id){
...@@ -348,7 +444,9 @@ this.clickTab('yields','总收益') ...@@ -348,7 +444,9 @@ this.clickTab('yields','总收益')
clickBox(val){ clickBox(val){
console.log("这是啥啊",val) console.log("这是啥啊",val)
this.checkList.forEach((i,index)=>{ this.checkList.forEach((i,index)=>{
if(val==i.id){ if(val==i.count){
this.countId=i.count
this.pointNumber=i.point
console.log("我的积分",this.morePoint>=i.point) console.log("我的积分",this.morePoint>=i.point)
if(this.morePoint>=i.point){ if(this.morePoint>=i.point){
this.ifexchange=true this.ifexchange=true
...@@ -551,6 +649,38 @@ this.clickTab('yields','总收益') ...@@ -551,6 +649,38 @@ this.clickTab('yields','总收益')
width: 90%; width: 90%;
margin: 0 auto; margin: 0 auto;
} }
.disclaimerBox{
width: 90%;
margin: 0 auto;
height: 12rem;
font-size: 0.3rem;
padding: 0.3rem;
overflow-y:scroll ;
background-color: aqua;
}
.disclaimerBottom{
width: 38%;
height: 0.8rem;
margin: 0.5rem auto;
background-color: gray;
color: white;
border-radius: 0.2rem;
text-align: center;
line-height: 0.8rem;
font-size: 0.3rem;
}
.disclaimerBottomTwo{
width: 38%;
height: 0.8rem;
margin: 0.5rem auto;
background-color: rgb(226, 74, 68);
color: white;
border-radius: 0.2rem;
text-align: center;
line-height: 0.8rem;
font-size: 0.3rem;
}
.checkBox{ .checkBox{
width: 100%; width: 100%;
height: 0.8rem; height: 0.8rem;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment