diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue
index 6fa340e..6a89011 100644
--- a/pages/order/fillorder.vue
+++ b/pages/order/fillorder.vue
@@ -182,7 +182,7 @@
-
+
@@ -255,7 +255,7 @@ export default {
masterWay: "", //团长信息
pintuanFlage: true, //是开团还是拼团
notSupportFreight: [], //不支持运费
- notSupportFreightGoodsList:['以下商品超出配送范围:'],
+ notSupportFreightGoodsList: ["以下商品超出配送范围:"],
};
},
filters: {
@@ -532,11 +532,10 @@ export default {
if (res.data.result.notSupportFreight.length != 0) {
this.notSupportFreight = res.data.result.notSupportFreight;
-
- res.data.result.notSupportFreight.forEach(item=>{
- this.notSupportFreightGoodsList[0]+=(item.goodsSku.goodsName)
- })
-
+
+ res.data.result.notSupportFreight.forEach((item) => {
+ this.notSupportFreightGoodsList[0] += item.goodsSku.goodsName;
+ });
}
});
},
@@ -676,7 +675,11 @@ export default {
}
.notSupportFreight {
position: fixed;
+
+ bottom: calc(100rpx + env(safe-area-inset-bottom)) ;
+ // #ifdef H5
bottom: 100rpx;
+ // #endif
display: flex;
align-items: center;
left: 0;
@@ -684,13 +687,13 @@ export default {
height: 100rpx;
width: 100%;
transition: 0.35s;
-
+
> .tips {
margin: 0 32rpx;
}
}
-/deep/ .u-notice-bar-wrap{
- width: 100%;
+/deep/ .u-notice-bar-wrap {
+ width: 100% !important;
}
.userClass {
diff --git a/pages/passport/codeLogin.vue b/pages/passport/codeLogin.vue
index dbe2797..9c3d524 100644
--- a/pages/passport/codeLogin.vue
+++ b/pages/passport/codeLogin.vue
@@ -102,8 +102,7 @@ export default {
duration: 2000,
icon: "none",
});
- this.flage = false;
- this.codeFlag = true;
+ uni.navigateBack();
}
})
.catch((e) => {
@@ -212,7 +211,7 @@ export default {
uni.hideLoading();
}, 2000);
}
-
+
if (!this.$u.test.mobile(this.codeForm.mobile)) {
uni.showToast({
title: "请输入正确手机号",