Commit 696c93dd authored by zhengke's avatar zhengke

修改

parent aab64af4
Pipeline #121 canceled with stages
...@@ -54,7 +54,7 @@ export default { ...@@ -54,7 +54,7 @@ export default {
pageinfo: {}, pageinfo: {},
sureStyle: "", sureStyle: "",
cancelStyle: "", cancelStyle: "",
showDialog: true, showDialog: false,
showCoupons: false, showCoupons: false,
couponMessage: "", couponMessage: "",
ComeFrom: "", ComeFrom: "",
...@@ -64,20 +64,20 @@ export default { ...@@ -64,20 +64,20 @@ export default {
}; };
}, },
created() { created() {
this.pageinfo = uni.getStorageSync("basedata") // this.pageinfo = uni.getStorageSync("basedata")
? uni.getStorageSync("basedata").auth_page // ? uni.getStorageSync("basedata").auth_page
: {}; // : {};
if (wx.getUserProfile) { // if (wx.getUserProfile) {
console.log("进入新的"); // console.log("进入新的");
this.canIUseGetUserProfile = true; // this.canIUseGetUserProfile = true;
} // }
// #ifdef MP-ALIPAY // // #ifdef MP-ALIPAY
this.canIUseGetUserProfile = true; // this.canIUseGetUserProfile = true;
// #endif // // #endif
let x = this.pageinfo.hotspot; // let x = this.pageinfo.hotspot;
let y = this.pageinfo.hotspot_cancel; // 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.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.cancelStyle = `height:${y.height}rpx;width:${y.width}rpx;left:${y.left}rpx;top:${y.top}rpx;`;
}, },
methods: { methods: {
getoldUser() { getoldUser() {
......
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
</template> </template>
</view> </view>
</template> </template>
<view v-if="showtabs == true"> <view v-if="showtabs == true&&myPageData.home_pages.navbar.navs.length>0">
<tabbar></tabbar> <tabbar></tabbar>
</view> </view>
...@@ -1402,7 +1402,7 @@ export default { ...@@ -1402,7 +1402,7 @@ export default {
y.templateBg.height = this.contentHeight + "px"; y.templateBg.height = this.contentHeight + "px";
} else { } else {
y.templateBg.overflowY = "auto"; y.templateBg.overflowY = "auto";
y.templateBg.height = this.contentHeight + 40 + "px"; // y.templateBg.height = this.contentHeight + 40 + "px";
} }
if (x.data.titleColor) { if (x.data.titleColor) {
y.templateBg.titleColor = x.data.titleColor + " !important"; y.templateBg.titleColor = x.data.titleColor + " !important";
......
...@@ -869,7 +869,7 @@ ...@@ -869,7 +869,7 @@
}}</text }}</text
> >
</view> </view>
<view style="display: flex; align-items: center"> <view style="display: flex; align-items: center;">
<!-- #ifdef MP-WEIXIN --> <!-- #ifdef MP-WEIXIN -->
<button open-type="contact" class="jz_ConButton"> <button open-type="contact" class="jz_ConButton">
<img <img
...@@ -886,7 +886,7 @@ ...@@ -886,7 +886,7 @@
</view> </view>
</u-popup> </u-popup>
</scroll-view> </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 class="jz_OrderDiv">
<view style="color: #ff3166; font-weight: bold"> <view style="color: #ff3166; font-weight: bold">
<text style="font-size: 22rpx">¥</text> <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