Merge branch 'develop' of https://gitee.com/qinxingxing/alpha-shopping into develop

# Conflicts:
#	pages/mine/mine.vue
#	pages/supply_chain/supply_chain.vue

components/custom-tab-bar.vue

@@ -81,14 +81,15 @@ export default {
 }
 
 .tab-icon {
-	width: 24px;
+	margin-top: 5rpx;
+	width: 44rpx;
 	/* 图标大小 */
-	height: 24px;
+	height: 44rpx;
 	/* 图标大小 */
 }
 
 .tab-text {
-	font-size: 12px;
+	font-size: 24rpx
 	/* 文字大小 */
 }
 

pages/home/home.vue

@@ -495,7 +495,7 @@ export default {
 <style lang="scss" scoped>
 .home_warp {
 	background: $app-bj;
-	height: calc(100vh - 140rpx); // 140rpx 是底部的导航栏高度
+	height: calc(100vh - env(safe-area-inset-bottom)); // 是底部的导航栏高度
 	overflow: auto;
 	position: relative;
 }

pages/mine_package/mine_order/mine_order.vue

@@ -352,7 +352,7 @@ export default {
   onLoad(options) {
     const type = options.type;
     this.form.type =
-      type && type < 5 ? parseInt(type, 10) : MINE_ORDER_TYPE.UNPAID;
+      type ? parseInt(type, 10) : MINE_ORDER_TYPE.UNPAID;
     this.loadData();
     // 待收货判断是否签署
     if (
@@ -403,7 +403,7 @@ export default {
         this.aftterSalesProduct = item;
         this.afterShow = true;
         this.aftterSalesProduct.status = 9;
-        this.aftterSalesProduct.afterType = this.form.type - 1;
+        this.aftterSalesProduct.afterType = this.form.type == MINE_ORDER_TYPE.UNSHIPPED ? 1 : 2;
       }
     },
     // 售后订单详情
@@ -800,7 +800,7 @@ export default {
 }
 
 .order_warp {
-  height: calc(100vh - 130rpx);
+  height: calc(100vh - env(safe-area-inset-bottom)); 
   background-color: $app-bj;
   padding: 100rpx 30rpx 30rpx;
   overflow-y: hidden;

pages/other_package/invite_friends/invite_friends.vue

@@ -1,8 +1,9 @@
 <template>
 	<view class="invite_friends_warp">
 		<view class="invite_img">
-			<up-image :loading="imageLoading" :src="inviteImage" width="100%" height="460" bgColor="#f1f6ff00" shape="square"
+			<!-- <up-image :loading="imageLoading" :src="inviteImage" class="invite_imgage" bgColor="#f1f6ff00" shape="square"
-				radius=10></up-image>
+				radius=10></up-image> -->
+				<image :src="inviteImage" class="invite_imgage"></image>
 		</view>
 		<view class="invite_but">
 			<view class="save_but">
@@ -97,12 +98,23 @@ export default {
 <style lang="scss" scoped>
 .invite_friends_warp {
 	height: calc(100vh - 80rpx);
-	padding: 40rpx;
+	padding: 10rpx 40rpx 40rpx;
 }
 
-.invite_img {
+// .invite_img {
-	margin-top: 52rpx;
+// 	height: 920rpx;
-	height: 930rpx;
+// }
+
+.invite_imgage{
+// width="100%" height="460" 
+img {
+	width: 100%;
+	height: 920rpx;
+}
+::v-deep(uni-image){
+	width: 100%;
+	height: 920rpx;
+}
 }
 
 .invite_but {

pages/sort/sort.vue

@@ -244,7 +244,7 @@ export default {
 	display: flex;
 	overflow: hidden;
 	margin-top: 20rpx;
-	height: calc(100vh - 356rpx);
+	height: calc(100vh - 216rpx - env(safe-area-inset-bottom));
 }
 
 .u-search-inner {