Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
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
d70c7ff2
Commit
d70c7ff2
authored
4 years ago
by
leiqingsong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
2742a920
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
66 additions
and
60 deletions
+66
-60
index.js
H5/src/router/index.js
+0
-1
bridgeToAppFun.js
H5/src/utils/bridgeToAppFun.js
+5
-5
airDropPool.vue
H5/src/views/airDropPool.vue
+1
-1
canCashOut.vue
H5/src/views/canCashOut.vue
+8
-7
cash-out-record.vue
H5/src/views/cashOut/cash-out-record.vue
+4
-4
cash-out.vue
H5/src/views/cashOut/cash-out.vue
+11
-11
instructions.vue
H5/src/views/instructions.vue
+6
-4
modefyAvatar.vue
H5/src/views/modefyAvatar.vue
+15
-13
register.vue
H5/src/views/register.vue
+2
-2
settings.vue
H5/src/views/settings.vue
+14
-12
No files found.
H5/src/router/index.js
View file @
d70c7ff2
...
@@ -156,7 +156,6 @@ const routes = [
...
@@ -156,7 +156,6 @@ const routes = [
}
}
];
];
const
router
=
new
VueRouter
({
const
router
=
new
VueRouter
({
mode
:
"history"
,
mode
:
"history"
,
base
:
process
.
env
.
BASE_URL
,
base
:
process
.
env
.
BASE_URL
,
...
...
This diff is collapsed.
Click to expand it.
H5/src/utils/bridgeToAppFun.js
View file @
d70c7ff2
...
@@ -56,7 +56,7 @@ class bridgeToAppFun {
...
@@ -56,7 +56,7 @@ class bridgeToAppFun {
console
.
log
(
"an"
);
console
.
log
(
"an"
);
window
.
android
.
logout
();
window
.
android
.
logout
();
}
else
{
}
else
{
console
.
log
(
'ios'
);
console
.
log
(
"ios"
);
jsBridge
.
callhandler
(
"logout"
);
jsBridge
.
callhandler
(
"logout"
);
}
}
}
}
...
@@ -66,15 +66,15 @@ class bridgeToAppFun {
...
@@ -66,15 +66,15 @@ class bridgeToAppFun {
console
.
log
(
"an"
);
console
.
log
(
"an"
);
try
{
try
{
const
referrer
=
document
.
referrer
;
const
referrer
=
document
.
referrer
;
if
(
referrer
!==
''
)
{
if
(
referrer
!==
""
)
{
console
.
log
(
'reffer不为空'
,
referrer
);
console
.
log
(
"reffer不为空"
,
referrer
);
// location.href = referrer;
// location.href = referrer;
}
else
{
}
else
{
console
.
log
(
'调用navigateBack'
);
console
.
log
(
"调用navigateBack"
);
window
.
android
.
navigateBack
();
window
.
android
.
navigateBack
();
}
}
}
catch
{
}
catch
{
console
.
log
(
'返回调用失败,都不行'
);
console
.
log
(
"返回调用失败,都不行"
);
}
}
}
else
{
}
else
{
jsBridge
.
callhandler
(
"navigateBack"
);
jsBridge
.
callhandler
(
"navigateBack"
);
...
...
This diff is collapsed.
Click to expand it.
H5/src/views/airDropPool.vue
View file @
d70c7ff2
...
@@ -63,7 +63,7 @@ export default {
...
@@ -63,7 +63,7 @@ export default {
queryData
()
{
queryData
()
{
const
_this
=
this
;
const
_this
=
this
;
queryAerialDelivery
().
then
(
res
=>
{
queryAerialDelivery
().
then
(
res
=>
{
console
.
log
(
'空投池'
,
res
);
console
.
log
(
"空投池"
,
res
);
if
(
res
.
code
===
0
)
{
if
(
res
.
code
===
0
)
{
_this
.
total
=
res
.
data
.
total
;
_this
.
total
=
res
.
data
.
total
;
_this
.
userPoolVos
=
res
.
data
.
userPoolVos
;
_this
.
userPoolVos
=
res
.
data
.
userPoolVos
;
...
...
This diff is collapsed.
Click to expand it.
H5/src/views/canCashOut.vue
View file @
d70c7ff2
...
@@ -43,13 +43,14 @@ export default {
...
@@ -43,13 +43,14 @@ export default {
return
{
return
{
preNum
:
"125"
,
preNum
:
"125"
,
currentNum
:
"325"
,
currentNum
:
"325"
,
rules
:
rules
:
"提现规则:"
,
"提现规则:"
,
rulesMent
:
rulesMent
:
'1、结算:所有购买及推广产生的佣金实时结算,月度肥料及进步奖每月1号结算上个月收益,在APP我的收益页面可随时查询收益情况。'
,
"1、结算:所有购买及推广产生的佣金实时结算,月度肥料及进步奖每月1号结算上个月收益,在APP我的收益页面可随时查询收益情况。"
,
rulesWith
:
'2、提现:可提现部分为结算后已通过平台审核的佣金,佣金审核周期为1-15个工作日,审核通过后可实时提现。'
,
rulesWith
:
rulesPoundage
:
'3、手续费:提现无需手续费。'
,
"2、提现:可提现部分为结算后已通过平台审核的佣金,佣金审核周期为1-15个工作日,审核通过后可实时提现。"
,
rulesTax
:
'4、税费:提现时系统自动扣除2%个人所得税,剩余税费由平台替缴。'
,
rulesPoundage
:
"3、手续费:提现无需手续费。"
,
rulesAttribution
:
'此规则最终解释权归西田森市场运营部所有'
,
rulesTax
:
"4、税费:提现时系统自动扣除2%个人所得税,剩余税费由平台替缴。"
,
rulesAttribution
:
"此规则最终解释权归西田森市场运营部所有"
};
};
},
},
mounted
()
{
mounted
()
{
...
...
This diff is collapsed.
Click to expand it.
H5/src/views/cashOut/cash-out-record.vue
View file @
d70c7ff2
...
@@ -39,7 +39,7 @@ export default {
...
@@ -39,7 +39,7 @@ export default {
name
:
"CashOutRecord"
,
name
:
"CashOutRecord"
,
data
()
{
data
()
{
return
{
return
{
maxDate
:
''
,
maxDate
:
""
,
show
:
false
,
show
:
false
,
options
:
[{
text
:
"2021年3月"
,
value
:
0
}],
options
:
[{
text
:
"2021年3月"
,
value
:
0
}],
selected
:
""
,
selected
:
""
,
...
@@ -48,9 +48,9 @@ export default {
...
@@ -48,9 +48,9 @@ export default {
};
};
},
},
mounted
()
{
mounted
()
{
this
.
maxDate
=
new
Date
(
),
(
this
.
maxDate
=
new
Date
()
),
this
.
selected
=
`
${
this
.
currentDate
.
getFullYear
()}
年
${
this
.
currentDate
.
getMonth
()
+
(
this
.
selected
=
`
${
this
.
currentDate
.
getFullYear
()}
年
${
this
.
currentDate
.
getMonth
()
+
1
}
月`
;
1
}
月`
)
;
const
time
=
this
.
currentDate
.
toLocaleDateString
().
replace
(
/
\/
/g
,
"-"
);
const
time
=
this
.
currentDate
.
toLocaleDateString
().
replace
(
/
\/
/g
,
"-"
);
this
.
getRecordList
(
time
);
this
.
getRecordList
(
time
);
},
},
...
...
This diff is collapsed.
Click to expand it.
H5/src/views/cashOut/cash-out.vue
View file @
d70c7ff2
...
@@ -22,11 +22,11 @@
...
@@ -22,11 +22,11 @@
<div
class=
"real"
>
<div
class=
"real"
>
<p
class=
"real-item"
>
<p
class=
"real-item"
>
<span>
实际到账
</span>
<span>
实际到账
</span>
<span>
{{
account
}}
</span>
<span>
{{
account
}}
</span>
</p>
</p>
<p
class=
"real-item"
>
<p
class=
"real-item"
>
<span>
税款
</span>
<span>
税款
</span>
<span>
{{
rate
}}
</span>
<span>
{{
rate
}}
</span>
</p>
</p>
<p
class=
"explain"
>
<p
class=
"explain"
>
<span>
扣税说明
</span>
<span>
扣税说明
</span>
...
@@ -95,8 +95,8 @@ export default {
...
@@ -95,8 +95,8 @@ export default {
userPhone
:
this
.
$userId
,
userPhone
:
this
.
$userId
,
bank
:
""
,
bank
:
""
,
money
:
null
,
money
:
null
,
account
:
0
,
account
:
0
,
rate
:
0
,
rate
:
0
,
remainMoney
:
100
,
remainMoney
:
100
,
resultDialogTitle
:
""
,
resultDialogTitle
:
""
,
resultDialogTip
:
""
,
resultDialogTip
:
""
,
...
@@ -117,9 +117,9 @@ export default {
...
@@ -117,9 +117,9 @@ export default {
return
false
;
return
false
;
}
}
},
},
inputClick
()
{
inputClick
()
{
this
.
rate
=
this
.
money
*
0.02
this
.
rate
=
this
.
money
*
0.02
;
this
.
account
=
this
.
money
-
this
.
rate
this
.
account
=
this
.
money
-
this
.
rate
;
},
},
canCashOut
()
{
canCashOut
()
{
const
params
=
{
const
params
=
{
...
@@ -173,7 +173,7 @@ export default {
...
@@ -173,7 +173,7 @@ export default {
}
}
});
});
},
},
onCloseDialog
()
{
onCloseDialog
()
{
this
.
validCodeDialogShow
=
false
;
this
.
validCodeDialogShow
=
false
;
},
},
onSubmit
()
{
onSubmit
()
{
...
...
This diff is collapsed.
Click to expand it.
H5/src/views/instructions.vue
View file @
d70c7ff2
...
@@ -71,16 +71,18 @@
...
@@ -71,16 +71,18 @@
</span>
</span>
</p>
</p>
<p
style=
"text-align: left"
>
<p
style=
"text-align: left"
>
<span
class=
"paragraph"
>
(a)用户授权本APP透露这些信息。
</span>
<span
class=
"paragraph"
<span
class=
"paragraph"
>
(a)用户授权本APP透露这些信息。
</span>
>
(b)相应的法律及程序要求本APP提供用户的个人资料。如果用户提供的资料包含有不正确的信息,本APP保留结束用户使用本APP信息服务资格的权利。
<span
class=
"paragraph"
>
(b)相应的法律及程序要求本APP提供用户的个人资料。如果用户提供的资料包含有不正确的信息,本APP保留结束用户使用本APP信息服务资格的权利。
</span>
</span>
</p>
</p>
<p
style=
"text-align: left"
>
<p
style=
"text-align: left"
>
<span
class=
"paragraph"
<span
class=
"paragraph"
>
四、
用户在注册时应当选择常用的手机号码,且同意接受并阅读本APP发往用户的各类短信。如用户未及时从自己的手机接受短信或因用户手机或用户短信接收及阅读程序本身的问题使短信无法正常接收或阅读的,只要本APP成功发送了手机短信,应当视为用户已经接收到相关的短信。
>
四、
用户在注册时应当选择常用的手机号码,且同意接受并阅读本APP发往用户的各类短信。如用户未及时从自己的手机接受短信或因用户手机或用户短信接收及阅读程序本身的问题使短信无法正常接收或阅读的,只要本APP成功发送了手机短信,应当视为用户已经接收到相关的短信。
用户在注册时应当填写正确、有效的手机号码,此手机号码用以获取验证码,如因用户未填写正确、有效的手机号码而导致验证码无法查收,无法正确登陆本APP造成用户本人损失的,本APP不承担相关责任。
</span>
用户在注册时应当填写正确、有效的手机号码,此手机号码用以获取验证码,如因用户未填写正确、有效的手机号码而导致验证码无法查收,无法正确登陆本APP造成用户本人损失的,本APP不承担相关责任。
</span
<span
class=
"paragraph"
>
五、
服务条款的修改
>
<span
class=
"paragraph"
>
五、
服务条款的修改
本APP有权在必要时修改服务条款,本APP服务条款一旦发生变动,将会在重要页面上提示修改内容。如果不同意所改动的内容,用户可以主动取消获得的本APP信息服务。如果用户继续享用本APP信息服务,则视为接受服务条款的变动。本APP保留随时修改或中断服务而不需通知用户的权利。本APP行使修改或中断服务的权利,不需对用户或第三方负责。
本APP有权在必要时修改服务条款,本APP服务条款一旦发生变动,将会在重要页面上提示修改内容。如果不同意所改动的内容,用户可以主动取消获得的本APP信息服务。如果用户继续享用本APP信息服务,则视为接受服务条款的变动。本APP保留随时修改或中断服务而不需通知用户的权利。本APP行使修改或中断服务的权利,不需对用户或第三方负责。
</span>
</span>
</p>
</p>
...
...
This diff is collapsed.
Click to expand it.
H5/src/views/modefyAvatar.vue
View file @
d70c7ff2
...
@@ -60,24 +60,26 @@ export default {
...
@@ -60,24 +60,26 @@ export default {
});
});
},
},
onRead
(
file
)
{
onRead
(
file
)
{
if
(
!
localStorage
.
getItem
(
'user'
).
inviteCode
)
{
if
(
!
localStorage
.
getItem
(
"user"
).
inviteCode
)
{
this
.
$toast
.
fail
(
'当前用户没有邀请码'
);
this
.
$toast
.
fail
(
"当前用户没有邀请码"
);
return
return
;
}
}
const
inviteCode
=
JSON
.
parse
(
localStorage
.
getItem
(
'user'
).
inviteCode
);
const
inviteCode
=
JSON
.
parse
(
localStorage
.
getItem
(
"user"
).
inviteCode
);
const
params
=
{
const
params
=
{
inviteCode
:
inviteCode
inviteCode
:
inviteCode
};
};
const
fd
=
new
FormData
();
const
fd
=
new
FormData
();
fd
.
append
(
"files"
,
file
.
file
);
fd
.
append
(
"files"
,
file
.
file
);
uploadImage
(
params
,
fd
).
then
(
res
=>
{
uploadImage
(
params
,
fd
)
.
then
(
res
=>
{
console
.
log
(
res
);
console
.
log
(
res
);
this
.
avatar
=
file
.
content
;
this
.
avatar
=
file
.
content
;
this
.
imageUrl
=
res
.
zxUrl
;
this
.
imageUrl
=
res
.
zxUrl
;
this
.
canSubmit
=
true
;
this
.
canSubmit
=
true
;
}).
catch
(
err
=>
{
})
console
.
log
(
'上传图像'
,
err
);
.
catch
(
err
=>
{
this
.
$toast
.
fail
(
'图片上传失败,请重新选择'
);
console
.
log
(
"上传图像"
,
err
);
this
.
$toast
.
fail
(
"图片上传失败,请重新选择"
);
});
});
},
},
onDeleteAvatar
(
file
,
detail
)
{
onDeleteAvatar
(
file
,
detail
)
{
...
...
This diff is collapsed.
Click to expand it.
H5/src/views/register.vue
View file @
d70c7ff2
This diff is collapsed.
Click to expand it.
H5/src/views/settings.vue
View file @
d70c7ff2
...
@@ -84,11 +84,13 @@ export default {
...
@@ -84,11 +84,13 @@ export default {
});
});
},
},
logout
()
{
logout
()
{
logout
().
then
(
res
=>
{
logout
()
.
then
(
res
=>
{
if
(
res
.
code
==
0
)
{
if
(
res
.
code
==
0
)
{
localStorage
.
clear
()
localStorage
.
clear
();
}
}
}).
catch
(
err
=>
{
})
.
catch
(
err
=>
{
console
.
log
(
err
);
console
.
log
(
err
);
});
});
this
.
$bridgeToAppFun
.
logoutToApp
();
this
.
$bridgeToAppFun
.
logoutToApp
();
...
@@ -109,11 +111,11 @@ export default {
...
@@ -109,11 +111,11 @@ export default {
},
},
onFillInviteeCode
()
{
onFillInviteeCode
()
{
if
(
!
this
.
fillCode
)
{
if
(
!
this
.
fillCode
)
{
this
.
$toast
.
fail
(
'请填写推荐人邀请码'
)
this
.
$toast
.
fail
(
"请填写推荐人邀请码"
);
return
;
return
;
}
}
if
(
!
/^
[
A-z|
\d]{6}
$/
.
test
(
this
.
fillCode
))
{
if
(
!
/^
[
A-z|
\d]{6}
$/
.
test
(
this
.
fillCode
))
{
this
.
$toast
.
fail
(
'邀请码只支持6位数字+字母的组合'
)
this
.
$toast
.
fail
(
"邀请码只支持6位数字+字母的组合"
);
return
;
return
;
}
}
this
.
inviteeCodeDialog
=
false
;
this
.
inviteeCodeDialog
=
false
;
...
@@ -125,7 +127,7 @@ export default {
...
@@ -125,7 +127,7 @@ export default {
fillInviteCode
(
params
).
then
();
fillInviteCode
(
params
).
then
();
},
},
fillInviterCode
()
{
fillInviterCode
()
{
if
(
this
.
inviteeCode
===
"未填写"
||
this
.
inviteeCode
==
'1'
)
{
if
(
this
.
inviteeCode
===
"未填写"
||
this
.
inviteeCode
==
"1"
)
{
this
.
inviteeCodeDialog
=
true
;
this
.
inviteeCodeDialog
=
true
;
this
.
fillCode
=
""
;
this
.
fillCode
=
""
;
}
}
...
@@ -138,8 +140,8 @@ export default {
...
@@ -138,8 +140,8 @@ export default {
.settings
{
.settings
{
box-sizing
:
border-box
;
box-sizing
:
border-box
;
padding
:
10px
16px
;
padding
:
10px
16px
;
.van-less
{
.van-less
{
.van-cell__right-icon
{
.van-cell__right-icon
{
display
:
none
;
display
:
none
;
}
}
}
}
...
...
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