Commit bf579af6 by 宋冰琦

修复部分bug

parent 2a0b6748
...@@ -254,9 +254,7 @@ export default { ...@@ -254,9 +254,7 @@ export default {
display: flex; display: flex;
align-items: flex-end; align-items: flex-end;
justify-content: center; justify-content: center;
.dkStyle {
font-size: 48rpx;
}
.dw { .dw {
height: 40rpx; height: 40rpx;
font-size: 24rpx; font-size: 24rpx;
...@@ -266,6 +264,11 @@ export default { ...@@ -266,6 +264,11 @@ export default {
line-height: 30rpx; line-height: 30rpx;
} }
} }
.dkStyle {
font-size: 48rpx;
margin-top: -5rpx;
}
} }
.price_desc { .price_desc {
height: 28rpx; height: 28rpx;
...@@ -275,6 +278,7 @@ export default { ...@@ -275,6 +278,7 @@ export default {
color: var(color); color: var(color);
line-height: 28rpx; line-height: 28rpx;
width: 178rpx; width: 178rpx;
margin-top: 2rpx;
text-align: center; text-align: center;
} }
} }
...@@ -360,7 +364,7 @@ export default { ...@@ -360,7 +364,7 @@ export default {
margin-right: 32rpx; margin-right: 32rpx;
.more_info { .more_info {
padding-bottom: 8rpx; padding-bottom: 8rpx;
padding-top: 8rpx; padding-top: 10rpx;
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
......
...@@ -124,9 +124,9 @@ export default { ...@@ -124,9 +124,9 @@ export default {
this.animation = uni.createAnimation() this.animation = uni.createAnimation()
this.BottomSafeHeight = uni.getStorageSync('BottomSafeHeight')||50 this.BottomSafeHeight = uni.getStorageSync('BottomSafeHeight')||50
console.log(this.BottomSafeHeight,'this.BottomSafeHeight') console.log(this.BottomSafeHeight,'this.BottomSafeHeight')
this.bottomPadding = 205 this.bottomPadding = 204
this.shopCar = uni.getStorageSync('shopCar')+4 this.shopCar = uni.getStorageSync('shopCar')+5
if(!this.userms){ if(!this.userms){
User.wxLoginAndGetOpenid(true).then(loginInfo=>{ User.wxLoginAndGetOpenid(true).then(loginInfo=>{
this.loginInfo = loginInfo this.loginInfo = loginInfo
...@@ -598,7 +598,7 @@ export default { ...@@ -598,7 +598,7 @@ export default {
font-family: Futura-Medium, Futura; font-family: Futura-Medium, Futura;
background: #FF63BA; background: #FF63BA;
right: -22rpx; right: -22rpx;
top: -6rpx; top: -8rpx;
min-width: 32rpx; min-width: 32rpx;
font-weight: 500; font-weight: 500;
font-size: 20rpx; font-size: 20rpx;
......
...@@ -246,13 +246,13 @@ export default { ...@@ -246,13 +246,13 @@ export default {
// 从订阅消息进入 // 从订阅消息进入
let Authorization = uni.getStorageSync('Authorization') let Authorization = uni.getStorageSync('Authorization')
if(orderId){ if(orderId){
uni.setStorageSync("updataShopCar",false)
if(!Authorization){ if(!Authorization){
this.backFlag = true this.backFlag = true
uni.switchTab({ url: '/pages/order/order' }) uni.switchTab({ url: '/pages/order/order' })
return return
}else{ }else{
this.backFlag = false this.backFlag = false
this.backToMneu = true
oId = orderId oId = orderId
} }
} }
......
...@@ -203,8 +203,10 @@ export default { ...@@ -203,8 +203,10 @@ export default {
$EventBus.$on('getMenuList', (data) => { $EventBus.$on('getMenuList', (data) => {
if(this.shopInfo && this.shopInfo.id != data.id) { if(this.shopInfo && this.shopInfo.id != data.id) {
// 切换店铺清空购物车 // 切换店铺清空购物车
uni.removeStorageSync('shopCarInfo'); if(this.shopInfo.id){
$EventBus.$emit('updateCar'); uni.removeStorageSync('shopCarInfo');
$EventBus.$emit('updateCar');
}
} }
this.shopInfo = data; this.shopInfo = data;
uni.setStorageSync("shopInfo",JSON.stringify(this.shopInfo)) uni.setStorageSync("shopInfo",JSON.stringify(this.shopInfo))
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<view class="box" @click.stop="goToPage('coupon')"> <view class="box" @click.stop="goToPage('coupon')">
<view class="left"> <view class="left">
<view class="text">HOOLOO券</view> <view class="text">HOOLOO券</view>
<view class="tickNum" v-if="tickNum">{{tickNum}}张可用</view> <view class="tickNum" v-if="tickNum"><span :style="{'color':'#FA5151'}">{{tickNum}}</span>张可用</view>
</view> </view>
<view class="right"><image class="icon" src="/static/imgs/youhuijuan.png"></image></view> <view class="right"><image class="icon" src="/static/imgs/youhuijuan.png"></image></view>
</view> </view>
......
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