Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
trip_Manager
Project
Project
Details
Activity
Releases
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
zhengke
trip_Manager
Commits
696c93dd
Commit
696c93dd
authored
Oct 13, 2021
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
aab64af4
Pipeline
#121
canceled with stages
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
19 deletions
+19
-19
index.vue
components/auth/index.vue
+15
-15
index.vue
pages/index/index.vue
+2
-2
jz_LineDetail.vue
pages/jiuzhai/jz_LineDetail.vue
+2
-2
No files found.
components/auth/index.vue
View file @
696c93dd
...
...
@@ -54,7 +54,7 @@ export default {
pageinfo
:
{},
sureStyle
:
""
,
cancelStyle
:
""
,
showDialog
:
tru
e
,
showDialog
:
fals
e
,
showCoupons
:
false
,
couponMessage
:
""
,
ComeFrom
:
""
,
...
...
@@ -64,20 +64,20 @@ export default {
};
},
created
()
{
this
.
pageinfo
=
uni
.
getStorageSync
(
"basedata"
)
?
uni
.
getStorageSync
(
"basedata"
).
auth_page
:
{};
if
(
wx
.
getUserProfile
)
{
console
.
log
(
"进入新的"
);
this
.
canIUseGetUserProfile
=
true
;
}
// #ifdef MP-ALIPAY
this
.
canIUseGetUserProfile
=
true
;
// #endif
let
x
=
this
.
pageinfo
.
hotspot
;
let
y
=
this
.
pageinfo
.
hotspot_cancel
;
this
.
sureStyle
=
`height:
${
x
.
height
}
rpx;width:
${
x
.
width
}
rpx;left:
${
x
.
left
}
rpx;top:
${
x
.
top
}
rpx;`
;
this
.
cancelStyle
=
`height:
${
y
.
height
}
rpx;width:
${
y
.
width
}
rpx;left:
${
y
.
left
}
rpx;top:
${
y
.
top
}
rpx;`
;
//
this.pageinfo = uni.getStorageSync("basedata")
//
? uni.getStorageSync("basedata").auth_page
//
: {};
//
if (wx.getUserProfile) {
//
console.log("进入新的");
//
this.canIUseGetUserProfile = true;
//
}
//
//
#ifdef MP-ALIPAY
//
this.canIUseGetUserProfile = true;
//
//
#endif
//
let x = this.pageinfo.hotspot;
//
let y = this.pageinfo.hotspot_cancel;
//
this.sureStyle = `height:${x.height}rpx;width:${x.width}rpx;left:${x.left}rpx;top:${x.top}rpx;`;
//
this.cancelStyle = `height:${y.height}rpx;width:${y.width}rpx;left:${y.left}rpx;top:${y.top}rpx;`;
},
methods
:
{
getoldUser
()
{
...
...
pages/index/index.vue
View file @
696c93dd
...
...
@@ -199,7 +199,7 @@
</
template
>
</view>
</template>
<view
v-if=
"showtabs == true"
>
<view
v-if=
"showtabs == true
&&myPageData.home_pages.navbar.navs.length>0
"
>
<tabbar></tabbar>
</view>
...
...
@@ -1402,7 +1402,7 @@ export default {
y
.
templateBg
.
height
=
this
.
contentHeight
+
"px"
;
}
else
{
y
.
templateBg
.
overflowY
=
"auto"
;
y
.
templateBg
.
height
=
this
.
contentHeight
+
40
+
"px"
;
//
y.templateBg.height = this.contentHeight + 40 + "px";
}
if
(
x
.
data
.
titleColor
)
{
y
.
templateBg
.
titleColor
=
x
.
data
.
titleColor
+
" !important"
;
...
...
pages/jiuzhai/jz_LineDetail.vue
View file @
696c93dd
...
...
@@ -869,7 +869,7 @@
}}
</text
>
</view>
<view
style=
"display: flex; align-items: center"
>
<view
style=
"display: flex; align-items: center
;
"
>
<!-- #ifdef MP-WEIXIN -->
<button
open-type=
"contact"
class=
"jz_ConButton"
>
<img
...
...
@@ -886,7 +886,7 @@
</view>
</u-popup>
</scroll-view>
<view
class=
"jz_orderbox"
v-if=
"!showOrderPreviwe && !showDateChosen"
>
<view
class=
"jz_orderbox"
v-if=
"!showOrderPreviwe && !showDateChosen"
style=
"display:none;"
>
<view
class=
"jz_OrderDiv"
>
<view
style=
"color: #ff3166; font-weight: bold"
>
<text
style=
"font-size: 22rpx"
>
¥
</text>
...
...
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