Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
dev
/
zhiliang-light-mp
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
64f1f09f
authored
2019-11-04 22:59:27 +0800
by
simon
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
默认提交
1 parent
689dd682
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
100 additions
and
25 deletions
src/component/sign-tips-comp/sign-tips-comp.js
src/component/sign-tips-comp/sign-tips-comp.wxml
src/config.js
src/pages/auction-detail/auction-detail.js
src/pages/auction-detail/auction-detail.wxml
src/pages/seckill-detail/seckill-detail.js
src/pages/seckill-detail/seckill-detail.wxml
src/pages/user-center/user-center.js
src/pages/user-center/user-center.wxml
src/component/sign-tips-comp/sign-tips-comp.js
View file @
64f1f09
...
...
@@ -13,7 +13,7 @@ Component({
},
innerText
:
{
type
:
String
,
value
:
''
,
value
:
'
只有通过审核的会员才可参与活动
'
,
},
innerButton
:
{
type
:
String
,
...
...
@@ -34,7 +34,7 @@ Component({
// 隐藏蒙层
hideMask
()
{
this
.
triggerEvent
(
'evtcomp'
,
{
name
:
"_evt_
hide_mask
"
name
:
"_evt_
not_verify
"
});
},
// 点击自定义按钮
...
...
src/component/sign-tips-comp/sign-tips-comp.wxml
View file @
64f1f09
...
...
@@ -2,7 +2,7 @@
<view class="cspace"></view>
<view class="cont">
<view class="tit">
<text>
只有通过审核的会员才可参与签到
</text>
<text>
{{innerText}}
</text>
</view>
<view class="tips">
<text></text>
...
...
src/config.js
View file @
64f1f09
...
...
@@ -2,7 +2,7 @@ let ENV_CONFIG = require('./env/index');
const
APPID
=
''
/** ====每次发布版本记得修改此环境配置==== */
const
ENV
=
'
Prod
'
;
// Dev Prod
const
ENV
=
'
Dev
'
;
// Dev Prod
const
NET_CONFIG
=
ENV_CONFIG
[
ENV
];
const
MOCKAPI
=
ENV_CONFIG
.
mockApi
;
...
...
src/pages/auction-detail/auction-detail.js
View file @
64f1f09
...
...
@@ -15,6 +15,7 @@ Page({
auctionBidSuccessVisible
:
false
,
auctionBidFailVisible
:
false
,
commonTipsCompVisible
:
false
,
signTipsCompVisible
:
false
,
innerTitle
:
"提示"
,
innerText
:
""
,
userInfo
:
{},
...
...
@@ -178,16 +179,16 @@ Page({
// })
resolve
();
}).
catch
((
err
)
=>
{
// clearTimeout(_this.data.navBackTimeout);
// _this.data.navBackTimeout = setTimeout(() =>
{
// wx.navigateBack({
// delta: 1
// });
// }, 1000);
_this
.
setData
({
commonTipsCompVisible
:
true
,
innerText
:
err
.
errMsg
||
"您未达到进入条件"
}
)
if
(
err
.
code
==
1002
)
{
_this
.
setData
(
{
signTipsCompVisible
:
true
,
})
}
else
{
_this
.
setData
({
commonTipsCompVisible
:
true
,
innerText
:
err
.
errMsg
||
"您未达到进入条件"
})
}
});
})
},
...
...
@@ -405,8 +406,23 @@ Page({
auctionBidVisible
:
false
,
auctionBidSuccessVisible
:
false
,
auctionBidFailVisible
:
false
,
commonTipsCompVisible
:
false
,
signTipsCompVisible
:
false
,
})
},
/**
* 去验证
*/
toVipLoginHandler
()
{
app
.
router
.
push
({
openType
:
"redirect"
,
path
:
"vipLogin"
})
},
// 子组件事件
evtcomp
(
evt
)
{
let
{
...
...
@@ -444,11 +460,28 @@ Page({
// 通用按钮
case
"_evt_common_comp_button"
:
this
.
hideMask
();
wx
.
navigateBack
({
delta
:
1
});
break
;
// 去验证
case
"_evt_to_verify"
:
this
.
hideMask
();
this
.
toVipLoginHandler
();
break
;
// 暂不验证
case
"_evt_not_verify"
:
this
.
hideMask
();
wx
.
navigateBack
({
delta
:
1
});
break
;
default
:
break
;
}
...
...
src/pages/auction-detail/auction-detail.wxml
View file @
64f1f09
...
...
@@ -99,3 +99,6 @@
<van-popup show="{{ commonTipsCompVisible }}">
<common-tips-comp bind:evtcomp="evtcomp" inner-title="{{innerTitle}}" inner-text="{{innerText}}"></common-tips-comp>
</van-popup>
<van-popup show="{{ signTipsCompVisible }}">
<sign-tips-comp bind:evtcomp="evtcomp"></sign-tips-comp>
</van-popup>
...
...
src/pages/seckill-detail/seckill-detail.js
View file @
64f1f09
...
...
@@ -13,6 +13,7 @@ Page({
authorizeVisible
:
false
,
seckillOrderVisible
:
false
,
commonTipsCompVisible
:
false
,
signTipsCompVisible
:
false
,
innerTitle
:
"提示"
,
innerText
:
""
,
userInfo
:
{},
...
...
@@ -149,16 +150,17 @@ Page({
console
.
log
(
"result:"
,
result
);
resolve
();
}).
catch
((
err
)
=>
{
// clearTimeout(_this.data.navBackTimeout);
// _this.data.navBackTimeout = setTimeout(() => {
// wx.navigateBack({
// delta: 1
// });
// }, 1000);
_this
.
setData
({
commonTipsCompVisible
:
true
,
innerText
:
err
.
errMsg
||
"您未达到进入条件"
})
if
(
err
.
code
==
1002
)
{
_this
.
setData
({
signTipsCompVisible
:
true
,
})
}
else
{
_this
.
setData
({
commonTipsCompVisible
:
true
,
innerText
:
err
.
errMsg
||
"您未达到进入条件"
})
}
});
})
},
...
...
@@ -238,8 +240,22 @@ Page({
this
.
setData
({
authorizeVisible
:
false
,
seckillOrderVisible
:
false
,
commonTipsCompVisible
:
false
,
signTipsCompVisible
:
false
,
})
},
/**
* 去验证
*/
toVipLoginHandler
()
{
app
.
router
.
push
({
openType
:
"redirect"
,
path
:
"vipLogin"
})
},
// 子组件事件
evtcomp
(
evt
)
{
let
{
...
...
@@ -270,6 +286,21 @@ Page({
// 通用按钮
case
"_evt_common_comp_button"
:
this
.
hideMask
();
wx
.
navigateBack
({
delta
:
1
});
break
;
// 去验证
case
"_evt_to_verify"
:
this
.
hideMask
();
this
.
toVipLoginHandler
();
break
;
// 暂不验证
case
"_evt_not_verify"
:
this
.
hideMask
();
wx
.
navigateBack
({
delta
:
1
});
...
...
src/pages/seckill-detail/seckill-detail.wxml
View file @
64f1f09
...
...
@@ -57,3 +57,6 @@
<common-tips-comp bind:evtcomp="evtcomp" inner-title="{{innerTitle}}" inner-text="{{innerText}}"></common-tips-comp>
</van-popup>
<van-popup show="{{ signTipsCompVisible }}">
<sign-tips-comp bind:evtcomp="evtcomp"></sign-tips-comp>
</van-popup>
...
...
src/pages/user-center/user-center.js
View file @
64f1f09
...
...
@@ -323,6 +323,11 @@ Page({
this
.
toVipLoginHandler
();
break
;
// 暂不验证
case
"_evt_not_verify"
:
this
.
hideMask
();
break
;
// 隐藏弹窗
case
"_evt_hide_mask"
:
this
.
hideMask
();
...
...
src/pages/user-center/user-center.wxml
View file @
64f1f09
...
...
@@ -129,7 +129,7 @@
<common-tips-comp bind:evtcomp="evtcomp" inner-title="{{innerTitle}}" inner-text="{{innerText}}"></common-tips-comp>
</van-popup>
<van-popup show="{{ signTipsCompVisible }}">
<sign-tips-comp bind:evtcomp="evtcomp"></sign-tips-comp>
<sign-tips-comp
inner-text="只有通过审核的会员才可参与签到"
bind:evtcomp="evtcomp"></sign-tips-comp>
</van-popup>
<van-popup show="{{ giftSignTipsCompVisible }}">
<gift-sign-tips-comp bind:evtcomp="evtcomp" prize-info="{{signPrize}}"></gift-sign-tips-comp>
...
...
Please
register
or
sign in
to post a comment