Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
X
XiTianSenMall
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
leiqingsong
XiTianSenMall
Commits
daaefe4d
Commit
daaefe4d
authored
3 years ago
by
leiqingsong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_lqs' into 'master'
Dev lqs See merge request
!164
parents
af6986b2
c7fe0a9a
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
30 additions
and
19 deletions
+30
-19
airDropPool.vue
H5/src/views/airDropPool.vue
+0
-1
customer-service.vue
H5/src/views/customer-service.vue
+3
-1
grade.vue
H5/src/views/grade.vue
+11
-7
wallet.vue
H5/src/views/income/wallet.vue
+3
-1
invite.vue
H5/src/views/invite.vue
+3
-1
fastest-progress.vue
H5/src/views/rewards/fastest-progress.vue
+7
-7
month-award.vue
H5/src/views/rewards/month-award.vue
+3
-1
No files found.
H5/src/views/airDropPool.vue
View file @
daaefe4d
...
...
@@ -92,7 +92,6 @@ export default {
this
.
canScroll
=
true
;
},
openUserInfo
(
item
)
{
console
.
log
(
123
);
this
.
canScroll
=
false
;
this
.
userInfoDialog
=
true
;
this
.
currentUser
=
item
;
...
...
This diff is collapsed.
Click to expand it.
H5/src/views/customer-service.vue
View file @
daaefe4d
...
...
@@ -35,7 +35,9 @@ export default {
};
},
created
()
{
this
.
getCustomerData
();
setTimeout
(()
=>
{
this
.
getCustomerData
();
},
200
);
},
mounted
()
{},
methods
:
{
...
...
This diff is collapsed.
Click to expand it.
H5/src/views/grade.vue
View file @
daaefe4d
...
...
@@ -99,8 +99,10 @@ export default {
]
};
},
created
()
{
this
.
getstatus
();
created
()
{
setTimeout
(()
=>
{
this
.
getstatus
();
},
200
);
},
methods
:
{
handlerBack
()
{
...
...
@@ -146,11 +148,13 @@ export default {
let
desObj
=
{};
if
(
diffrentMap
)
{
diffrentMap
.
forEach
(
v
=>
{
if
(
v
.
label
==
"差额"
){
v
.
value
=
data
.
differenceMap
.
differenceAmount
;
}
else
{
v
.
value
=
data
.
differenceMap
.
recommendDifferenceSeedling
;
}
// v.value = data.differenceMap[v.field];
if
(
v
.
label
==
"差额"
)
{
v
.
value
=
data
.
differenceMap
.
differenceAmount
;
}
else
{
v
.
value
=
data
.
differenceMap
.
recommendDifferenceSeedling
;
}
if
(
desObj
[
v
.
type
])
{
desObj
[
v
.
type
].
push
(
v
);
}
else
{
...
...
This diff is collapsed.
Click to expand it.
H5/src/views/income/wallet.vue
View file @
daaefe4d
...
...
@@ -49,7 +49,9 @@ export default {
};
},
mounted
()
{
this
.
getWalletInfo
();
setTimeout
(()
=>
{
this
.
getWalletInfo
();
});
},
methods
:
{
// 跳转到可提现界面
...
...
This diff is collapsed.
Click to expand it.
H5/src/views/invite.vue
View file @
daaefe4d
...
...
@@ -28,7 +28,9 @@ export default {
};
},
mounted
()
{
this
.
inviteCode
();
setTimeout
(()
=>
{
this
.
inviteCode
();
},
200
);
},
methods
:
{
onSave
()
{
...
...
This diff is collapsed.
Click to expand it.
H5/src/views/rewards/fastest-progress.vue
View file @
daaefe4d
...
...
@@ -82,13 +82,13 @@ export default {
getProgressPrizes
().
then
(
res
=>
{
if
(
res
.
code
===
0
)
{
_this
.
growthTotal
=
res
.
data
.
growthTotal
;
_this
.
prizeVos
=
res
.
data
.
prizeVos
.
map
(
item
=>
{
const
temp
=
item
;
temp
.
userId
=
item
.
userId
.
substring
(
0
,
3
)
+
"****"
+
item
.
userId
.
substring
(
7
);
return
temp
;
});
// _this.prizeVos = res.data.prizeVos;
_this
.
prizeVos
=
res
.
data
.
prizeVos
.
map
(
item
=>
{
const
temp
=
item
;
temp
.
userId
=
item
.
userId
.
substring
(
0
,
3
)
+
"****"
+
item
.
userId
.
substring
(
7
);
return
temp
;
});
// _this.prizeVos = res.data.prizeVos;
}
else
{
_this
.
growthTotal
=
0
;
_this
.
prizeVos
=
[];
...
...
This diff is collapsed.
Click to expand it.
H5/src/views/rewards/month-award.vue
View file @
daaefe4d
...
...
@@ -110,7 +110,9 @@ export default {
};
},
created
()
{
this
.
getData
();
setTimeout
(()
=>
{
this
.
getData
();
},
200
);
},
methods
:
{
handlerBack
()
{
...
...
This diff is collapsed.
Click to expand it.
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