Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mayi-mp-shop
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
程默
mayi-mp-shop
Commits
f70cdaf5
Commit
f70cdaf5
authored
Jan 10, 2022
by
李嘉林
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-1-8' into nativehome_tst
parents
d7f88160
83b1d2f9
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
14 deletions
+36
-14
src/pages/login/index.vue
+2
-2
src/pages/wo/improveInformation/index.vue
+11
-3
src/pages/wo/showPassCheck/index.vue
+18
-4
src/pages/wo/vehicleApplication/index.vue
+2
-2
src/pages/wo/verification/index.vue
+1
-1
src/pages/wo/writeInformation/index.vue
+2
-2
No files found.
src/pages/login/index.vue
View file @
f70cdaf5
...
...
@@ -245,9 +245,9 @@ export default {
log
.
info
(
'存入openid失败'
,
e
)
}
log
.
info
(
this
.
$store
.
state
.
mixid
,
'mixid------230'
)
//冬奥会
测试赛
(mixid=CL)定制一键登录直接返回不用手机号
//冬奥会
赛区通行
(mixid=CL)定制一键登录直接返回不用手机号
let
isCertified
=
false
;
// this.mpApp.globalData.shopInfo.outCode正式环境提审
测试赛
项目 这个值后台改为1 审核通过改为空
// this.mpApp.globalData.shopInfo.outCode正式环境提审
赛区通行
项目 这个值后台改为1 审核通过改为空
if
(
this
.
$store
.
state
.
mixid
==
'CL'
&&
this
.
mpApp
.
globalData
.
shopInfo
.
outCode
==
''
)
{
isCertified
=
res
.
data
.
data
.
isCertified
==
'true'
if
(
isCertified
&&
res
.
data
.
data
.
sessionId
)
{
...
...
src/pages/wo/improveInformation/index.vue
View file @
f70cdaf5
...
...
@@ -20,7 +20,7 @@
<image
v-else
mode=
"aspectFill"
src=
"http://
mayi-newshop.oss-cn-shanghai.aliyuncs.com/public/jpeg/9e733736-3e9d-48d1-82a8-96d21ee014df.jpe
g"
src=
"http://
cdn.mayi888.com/public/png/4660508a-ee25-4872-a3a8-da10a0fbaab1.pn
g"
alt=
""
></image>
</div>
...
...
@@ -51,7 +51,7 @@
</div>
<div
class=
"cell flex"
>
<div
class=
"label"
>
<p>
身份
</p>
<p>
人员类别
</p>
</div>
<div
class=
"text"
>
<p>
{{
userInfo
.
identity
}}
</p>
...
...
@@ -67,7 +67,15 @@
</div>
<div
class=
"cell flex"
>
<div
class=
"label"
>
<p>
就餐权限
</p>
<p>
住宿地点
</p>
</div>
<div
class=
"text"
>
<p></p>
</div>
</div>
<div
class=
"cell flex"
>
<div
class=
"label"
>
<p>
用餐权限
</p>
</div>
<div
class=
"text"
>
<p>
{{
userInfo
.
diningPlace
?
'有'
:
'无'
}}
</p>
...
...
src/pages/wo/showPassCheck/index.vue
View file @
f70cdaf5
...
...
@@ -10,14 +10,23 @@
<div
class=
"cont"
>
<div
class=
"main flex"
>
<div
class=
"title flex"
>
<div
class=
"title-left flex"
>
<div
class=
"img"
>
<image
mode=
"widthFix"
src=
"http://cdn.mayi888.com/public/png/9462ce53-792c-4607-ab7c-1875bed2d3ba.png"
alt=
""
></image>
</div>
<p>
{{
userInfo
.
company
}}
</p>
</div>
<div
class=
"img"
>
<image
mode=
"widthFix"
src=
"http://
mayi-newshop.oss-cn-shanghai.aliyuncs.com/public/png/9462ce53-792c-4607-ab7c-1875bed2d3ba
.png"
src=
"http://
cdn.mayi888.com/public/png/92ba7c1a-2ab9-4ff9-9ed4-aba4e219ca58
.png"
alt=
""
></image>
</div>
<p>
{{
userInfo
.
company
}}
</p>
</div>
<div
class=
"userImg"
>
<image
...
...
@@ -44,7 +53,7 @@
</div>
<div
class=
"time"
v-if=
"updateTime"
>
{{
updateTime
}}
</div>
</div>
<div
class=
"explain"
>
相约北京系列冬季体育赛事张家口赛区组委会
</div>
<div
class=
"explain"
>
张家口市冬奥会城市运行和环境建设管理指挥部
</div>
</div>
</div>
</
template
>
...
...
@@ -71,7 +80,7 @@ export default {
computed
:
{},
onReady
()
{
console
.
log
(
"---onready"
);
wx
.
setNavigationBarTitle
({
title
:
"
测试赛通行证
"
});
wx
.
setNavigationBarTitle
({
title
:
"
赛区通行
"
});
},
onLoad
()
{
console
.
log
(
"---onLoad"
);
...
...
@@ -228,10 +237,15 @@ export default {
}
.title
{
align-items
:
center
;
justify-content
:
space-between
;
width
:
100%
;
.title-left{
align-items
:
center
;
}
.img
{
width
:
30px
;
height
:
36px
;
flex-shrink
:
0
;
}
p
{
margin-left
:
10px
;
...
...
src/pages/wo/vehicleApplication/index.vue
View file @
f70cdaf5
...
...
@@ -22,7 +22,7 @@
<div
class=
"time"
v-if=
"updateTime"
>
{{
updateTime
}}
</div>
</div>
<div
class=
"changeVehicleText"
@
click=
"changeVehicle"
>
更换车辆
</div>
<div
class=
"explain"
>
相约北京系列冬季体育赛事张家口赛区组委会
</div>
<div
class=
"explain"
>
张家口市冬奥会城市运行和环境建设管理指挥部
</div>
</div>
</div>
</
template
>
...
...
@@ -49,7 +49,7 @@ export default {
computed
:
{},
onReady
()
{
console
.
log
(
"---onready"
);
wx
.
setNavigationBarTitle
({
title
:
"
测试赛通行证
"
});
wx
.
setNavigationBarTitle
({
title
:
"
赛区通行
"
});
},
onLoad
()
{
console
.
log
(
"---onLoad"
);
...
...
src/pages/wo/verification/index.vue
View file @
f70cdaf5
...
...
@@ -32,7 +32,7 @@
<div
class=
"val"
>
{{
userInfo
.
company
}}
</div>
</div>
<div
class=
"cell flex"
>
<div
class=
"label"
>
身份
</div>
<div
class=
"label"
>
人员类别
</div>
<div
class=
"val"
>
{{
userInfo
.
identity
}}
</div>
</div>
<div
class=
"cell flex"
>
...
...
src/pages/wo/writeInformation/index.vue
View file @
f70cdaf5
<
template
>
<!-- 冬奥会
测试赛
填报资料 -->
<!-- 冬奥会
赛区通行
填报资料 -->
<div
class=
"writeInformation"
>
<div
class=
"info flex"
>
<i
class=
"iconfont icon-gantanhao"
></i>
...
...
@@ -54,7 +54,7 @@
</div>
<div
class=
"btm"
>
<p
class=
"btm-info"
>
本次操作遵守国家相关法律法规,采集信息仅用于
测试赛
相关核验查询
本次操作遵守国家相关法律法规,采集信息仅用于
赛区通行
相关核验查询
</p>
<div
class=
"btn"
:class=
"
{ btn1: onInput }" @click="next">下一步
</div>
</div>
...
...
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