Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
7
7-Eleven
Overview
Overview
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
高淑倩
7-Eleven
Commits
a0bef573
Commit
a0bef573
authored
Dec 03, 2019
by
谢中龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
导购登录优化
parent
1edf109c
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
13 deletions
+38
-13
selectUsers.json
src/shoppingGuid/page/pages/selectUsers/selectUsers.json
+2
-1
welcomGuider.js
src/shoppingGuid/page/pages/welcomGuider/welcomGuider.js
+2
-5
welcomGuider.wxml
src/shoppingGuid/page/pages/welcomGuider/welcomGuider.wxml
+4
-3
welcomGuider.wxss
src/shoppingGuid/page/pages/welcomGuider/welcomGuider.wxss
+30
-4
No files found.
src/shoppingGuid/page/pages/selectUsers/selectUsers.json
View file @
a0bef573
{
{
"navigationBarTitleText"
:
"会员"
,
"navigationBarTitleText"
:
"
标签
会员"
,
"usingComponents"
:
{}
"usingComponents"
:
{}
}
}
\ No newline at end of file
src/shoppingGuid/page/pages/welcomGuider/welcomGuider.js
View file @
a0bef573
...
@@ -18,7 +18,6 @@ wxService.page({
...
@@ -18,7 +18,6 @@ wxService.page({
*/
*/
onLoad
:
function
(
options
)
{
onLoad
:
function
(
options
)
{
const
currentEnv
=
wx
.
getStorageSync
(
'_qyWeChat'
);
const
currentEnv
=
wx
.
getStorageSync
(
'_qyWeChat'
);
console
.
log
(
currentEnv
)
if
(
!
currentEnv
){
if
(
!
currentEnv
){
wx
.
showToast
({
wx
.
showToast
({
title
:
'请在企业微信中使用导购!'
,
title
:
'请在企业微信中使用导购!'
,
...
@@ -105,12 +104,12 @@ wxService.page({
...
@@ -105,12 +104,12 @@ wxService.page({
fail
:
err
=>
{
fail
:
err
=>
{
console
.
log
(
'获取企业微信信息失败,失败信息是----'
,
err
)
console
.
log
(
'获取企业微信信息失败,失败信息是----'
,
err
)
}
}
})
})
;
}
}
else
{
else
{
//不是在企业微信内打开的 提示信息
//不是在企业微信内打开的 提示信息
wx
.
showToast
({
wx
.
showToast
({
title
:
'请在企业微信内打开!'
,
title
:
'请在企业微信内打开
并登录
!'
,
icon
:
'none'
icon
:
'none'
});
});
}
}
...
@@ -131,7 +130,6 @@ wxService.page({
...
@@ -131,7 +130,6 @@ wxService.page({
wxService
.
post
(
'/member/qiyeweixin/minaLogin'
,
param
).
then
(
r
=>
{
wxService
.
post
(
'/member/qiyeweixin/minaLogin'
,
param
).
then
(
r
=>
{
wx
.
setStorageSync
(
'guidInfo'
,
userInfo
);
wx
.
setStorageSync
(
'guidInfo'
,
userInfo
);
wx
.
setStorageSync
(
'token'
,
r
.
data
.
data
.
token
);
wx
.
setStorageSync
(
'token'
,
r
.
data
.
data
.
token
);
console
.
log
(
'login token -----'
,
r
.
data
.
data
.
token
)
let
qiyeLoginUserInfo
=
r
.
data
.
data
;
let
qiyeLoginUserInfo
=
r
.
data
.
data
;
wx
.
setStorageSync
(
'guidBaseInfo'
,
qiyeLoginUserInfo
);
wx
.
setStorageSync
(
'guidBaseInfo'
,
qiyeLoginUserInfo
);
wx
.
hideLoading
();
wx
.
hideLoading
();
...
@@ -139,7 +137,6 @@ wxService.page({
...
@@ -139,7 +137,6 @@ wxService.page({
url
:
'/shoppingGuid/page/pages/home/home'
,
url
:
'/shoppingGuid/page/pages/home/home'
,
});
});
})
})
},
},
//进入商城
//进入商城
...
...
src/shoppingGuid/page/pages/welcomGuider/welcomGuider.wxml
View file @
a0bef573
<!--shoppingGuid/page/pages/welcomGuider/welcomGuider.wxml-->
<!--shoppingGuid/page/pages/welcomGuider/welcomGuider.wxml-->
<view class='login'>
<view class='login'>
<image src='https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/welcom.png' mode='widthFix'></image>
<image src='https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/7_3_0/icon_welcom_guide.jpg' mode='widthFix'></image>
<view class='tips' wx:if="{{show}}">对不起,请在企业微信中使用导购功能!</view>
<view class='tips-dark' wx:if="{{show}}">对不起,导购功能只能在企业微信中使用!</view>
<button type='primary' bindtap='onTapGetEnterpriseUserInfo' disabled='{{btnIsDisabled}}'>立即进入</button>
<view class='tips'>使用微信快捷登录,可免去信息填写</view>
<button class='enter-guide' bindtap='onTapGetEnterpriseUserInfo'>确 认</button>
<button class='enter-mall' bindtap='onTapToMall'>进入商城</button>
<button class='enter-mall' bindtap='onTapToMall'>进入商城</button>
</view>
</view>
src/shoppingGuid/page/pages/welcomGuider/welcomGuider.wxss
View file @
a0bef573
...
@@ -8,12 +8,12 @@
...
@@ -8,12 +8,12 @@
}
}
.login image{
.login image{
width:
16
0rpx;
width:
30
0rpx;
margin-bottom:
20
0rpx;
margin-bottom:
12
0rpx;
}
}
.login button{
.login button{
width:
3
00rpx;
width:
4
00rpx;
font-size: 28rpx;
font-size: 28rpx;
}
}
...
@@ -24,7 +24,17 @@
...
@@ -24,7 +24,17 @@
}
}
.tips{
.tips{
font-size: 24rpx;
font-size: 28rpx;
color: #333333;
width: 100%;
height: auto;
margin-bottom: 10rpx;
display: flex;
justify-content: center;
}
.tips-dark{
font-size: 20rpx;
color: #999999;
color: #999999;
width: 100%;
width: 100%;
height: auto;
height: auto;
...
@@ -32,3 +42,18 @@
...
@@ -32,3 +42,18 @@
display: flex;
display: flex;
justify-content: center;
justify-content: center;
}
}
.enter-guide{
background: #0091FF !important;
margin-top: 20rpx;
appearance: none;
color: #ffffff !important;
}
.enter-guide:active{
opacity: 0.7;
}
.enter-guide::after{
border: none;
}
\ No newline at end of file
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