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
30f426cb
authored
2019-11-05 15:22:26 +0800
by
simon
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
默认提交
1 parent
64f1f09f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
29 additions
and
6 deletions
src/config.js
src/pages/rank/rank.js
src/pages/rank/rank.scss
src/pages/scan-result/scan-result.js
src/pages/scan-result/scan-result.wxml
src/config.js
View file @
30f426c
...
...
@@ -2,7 +2,7 @@ let ENV_CONFIG = require('./env/index');
const
APPID
=
''
/** ====每次发布版本记得修改此环境配置==== */
const
ENV
=
'
Dev
'
;
// Dev Prod
const
ENV
=
'
Prod
'
;
// Dev Prod
const
NET_CONFIG
=
ENV_CONFIG
[
ENV
];
const
MOCKAPI
=
ENV_CONFIG
.
mockApi
;
...
...
src/pages/rank/rank.js
View file @
30f426c
...
...
@@ -88,7 +88,7 @@ Page({
*/
formatRankInfo
(
val
,
status
)
{
let
rankInfo
=
val
;
if
(
!
rankInfo
)
return
;
if
(
!
rankInfo
)
return
null
;
if
(
status
==
"promotion"
)
{
rankInfo
.
myMember
.
rank
=
rankInfo
.
myMember
.
promotionNo
;
...
...
src/pages/rank/rank.scss
View file @
30f426c
...
...
@@ -88,7 +88,7 @@ $contentWidth:690px;
.func
{
@extend
.fcc
;
height
:
80px
;
font-size
:
3
2
px
;
font-size
:
3
0
px
;
color
:
#3680EB
;
background
:
#F5F8FE
;
border-radius
:
8px
;
...
...
src/pages/scan-result/scan-result.js
View file @
30f426c
...
...
@@ -158,6 +158,20 @@ Page({
})
},
/**
* 我知道了
* @param {*} evt
*/
onSureHandler
(
evt
)
{
// app.router.push({
// openType: "reLaunch",
// path: "index"
// })
wx
.
navigateBack
({
delta
:
1
});
},
// 隐藏蒙层
hideMask
()
{
this
.
setData
({
...
...
src/pages/scan-result/scan-result.wxml
View file @
30f426c
...
...
@@ -22,12 +22,21 @@
<text wx:if="{{prizeInfo.qrCodeStatus == 2}}" class="tips tips1">
此产品码已被扫过!\n若有异常,请联系客服
</text>
<!-- 码已经被使用 -->
<text wx:elif="{{prizeInfo.qrCodeStatus == 3}}" class="tips tips1">
积分获取失败!\n产品积分码获取对象为:\n电工及终端消费者。
</text>
<!-- 其他异常 -->
<text wx:else class="tips tips1">此产品码已被扫过!\n若有异常,请联系客服</text>
<view class="btn-wrap">
<view bindtap="onScanHandler" class="btn">再扫一次</view>
<view bindtap="onMyIntegralHandler" class="btn btn2">查看我的积分</view>
<!-- <view class="btn btn2">联系客服</view> -->
<!-- 非 产品积分码获取对象为:电工及终端消费者。 -->
<block wx:if="{{prizeInfo.qrCodeStatus == 3}}">
<view bindtap="onSureHandler" class="btn">我知道了</view>
</block>
<block wx:else>
<view bindtap="onScanHandler" class="btn">再扫一次</view>
<view bindtap="onMyIntegralHandler" class="btn btn2">查看我的积分</view>
</block>
</view>
</view>
</view>
...
...
Please
register
or
sign in
to post a comment