Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
R
revised-version-h5
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
孟庆瑞
revised-version-h5
Commits
89659c56
Commit
89659c56
authored
Sep 12, 2024
by
jiaoyahui
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into jyh_h5
parents
95df47af
3077860f
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
303 additions
and
20 deletions
+303
-20
request.js
src/utils/request.js
+11
-1
detail.vue
src/views/actualCombat/detail.vue
+157
-14
index.vue
src/views/actualCombat/index.vue
+135
-5
No files found.
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
This diff is collapsed.
Click to expand it.
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,8 +282,58 @@ this.clickTab('yields','总收益')
...
@@ -236,8 +282,58 @@ 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
){
this
.
$router
.
push
({
this
.
$router
.
push
({
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment