Commit 696c93dd authored by zhengke's avatar zhengke

修改

parent aab64af4
Pipeline #121 canceled with stages
......@@ -54,7 +54,7 @@ export default {
pageinfo: {},
sureStyle: "",
cancelStyle: "",
showDialog: true,
showDialog: false,
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() {
......
......@@ -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";
......
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment