diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 1b8d0f6..8ae452a 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -2,7 +2,7 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         }
     ]
diff --git a/components/choiceness/choiceness.vue b/components/choiceness/choiceness.vue
index 5d48df7..e1bbcd8 100644
--- a/components/choiceness/choiceness.vue
+++ b/components/choiceness/choiceness.vue
@@ -1,114 +1,146 @@
 <template>
-	<view class="choiceness_warp">
-		<view class="choiceness_title">
-			<up-image src="/static/common/jingxuan_left.png" width="24" height="8" bgColor="#f1f6ff00"></up-image>
-			<view class="choiceness_title_msg">为您精选</view>
-			<up-image src="/static/common/jingxuan_right.png" width="24" height="8" bgColor="#f1f6ff00"></up-image>
-		</view>
-		<view class="choiceness_product">
-			<view v-for="item in productList" :key="item.id" class="choiceness_product_item" @click="jumpInfo(item)">
-				<up-image :src="item.url" width="100%" height="140" bgColor="#f1f6ff00"></up-image>
-				<view class="product_item_name">{{ item.title }}</view>
-				<view class="product_item_price">
-					<view class="price_">
-						<text>￥</text>
-						<text style="color:36rpx;">{{ item.price }}</text>
-					</view>
-					<view class="price_sell">已售{{ item.sales }}件</view>
-				</view>
-			</view>
-		</view>
-	</view>
+  <view class="choiceness_warp">
+    <view class="choiceness_title">
+      <up-image
+        src="/static/common/jingxuan_left.png"
+        width="24"
+        height="8"
+        bgColor="#f1f6ff00"
+      ></up-image>
+      <view class="choiceness_title_msg">为您精选</view>
+      <up-image
+        src="/static/common/jingxuan_right.png"
+        width="24"
+        height="8"
+        bgColor="#f1f6ff00"
+      ></up-image>
+    </view>
+    <view
+      class="choiceness_product"
+      :class="platformType ? '' : 'iosplatformType'"
+    >
+      <view
+        v-for="item in productList"
+        :key="item.id"
+        class="choiceness_product_item"
+        @click="jumpInfo(item)"
+      >
+        <up-image
+          :src="item.url"
+          width="100%"
+          height="140"
+          bgColor="#f1f6ff00"
+        ></up-image>
+        <view class="product_item_name">{{ item.title }}</view>
+        <view class="product_item_price">
+          <view class="price_">
+            <text>￥</text>
+            <text style="color: 36rpx">{{ item.price }}</text>
+          </view>
+          <view class="price_sell">已售{{ item.sales }}件</view>
+        </view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-import { searchList } from '@/api/product.js';
+import { searchList } from "@/api/product.js";
 
 export default {
-	name: "choiceness",
-	data() {
-		return {
-			productList: []
-		};
-	},
-	mounted() {
-		this.getSearchList();
-	},
-	methods: {
-		//
-		jumpInfo(item) {
-			uni.navigateTo({
-				url: '/pages/other_package/productInfo/productInfo?id=' + item.id,
-			})
-		},
-		async getSearchList() {
-			const params = {
-				isRecomm: true,
-				page: 1,
-				pageSize: 66,
-			}
-			const resp = await searchList(params);
-			if (resp && resp.bizcode === 100) {
-				this.productList = resp.data
-			}
-		}
-	}
-}
+  name: "choiceness",
+  data() {
+    return {
+      productList: [],
+      platformType: true,
+    };
+  },
+  mounted() {
+	  /*#ifdef APP-PLUS*/
+    const appUpdate = uni.getStorageSync("platform");
+    this.platformType = appUpdate == "android" ? "ANDROID" : "IOS";
+	 /*#endif*/
+    this.getSearchList();
+  },
+  methods: {
+    //
+    jumpInfo(item) {
+      uni.navigateTo({
+        url: "/pages/other_package/productInfo/productInfo?id=" + item.id,
+      });
+    },
+    async getSearchList() {
+      const params = {
+        isRecomm: true,
+        page: 1,
+        pageSize: 66,
+      };
+      const resp = await searchList(params);
+      if (resp && resp.bizcode === 100) {
+        this.productList = resp.data;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
 .choiceness_warp {
-	margin-top: 50rpx;
+  margin-top: 50rpx;
 }
 
 .choiceness_title {
-	display: flex;
-	justify-content: center;
+  display: flex;
+  justify-content: center;
 
-	.choiceness_title_msg {
-		margin: 0 18rpx;
-	}
+  .choiceness_title_msg {
+    margin: 0 18rpx;
+  }
 }
 
 .choiceness_product {
-	margin-top: 40rpx;
-	display: flex;
-	flex-wrap: wrap;
-	justify-content: space-between;
+  margin-top: 40rpx;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  padding-bottom: calc(env(safe-area-inset-bottom) + 100rpx);
+  &.iosplatformType {
+    padding-bottom: 100rpx;
+  }
 
-	.choiceness_product_item {
-		background: #FFFFFF;
-		box-shadow: 0rpx 0rpx 10rpx 0rpx #EEEEEE;
-		border-radius: 24rpx;
-		width: 43%;
-		margin-bottom: 20rpx;
-		padding: 20rpx;
-	}
+  .choiceness_product_item {
+    background: #ffffff;
+    box-shadow: 0rpx 0rpx 10rpx 0rpx #eeeeee;
+    border-radius: 24rpx;
+    width: 43%;
+    margin-bottom: 20rpx;
+    padding: 20rpx;
+  }
 
-	.product_item_name {
-		font-weight: bold;
-		font-size: 26rpx;
-		color: #333333;
-		margin-top: 20rpx;
-	}
+  .product_item_name {
+    font-weight: bold;
+    font-size: 26rpx;
+    color: #333333;
+    margin-top: 20rpx;
+  }
 
-	.product_item_price {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-top: 10rpx;
+  .product_item_price {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 10rpx;
 
-		.price_ {
-			font-weight: bold;
-			font-size: 26rpx;
-			color: $app-bt-bj;
-		}
+    .price_ {
+      font-weight: bold;
+      font-size: 26rpx;
+      color: $app-bt-bj;
+    }
 
-		.price_sell {
-			font-weight: 400;
-			font-size: 18rpx;
-			color: #999999;
-		}
-	}
+    .price_sell {
+      font-weight: 400;
+      font-size: 18rpx;
+      color: #999999;
+    }
+  }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/components/custom-tab-bar.vue b/components/custom-tab-bar.vue
index 3c55a22..a939c63 100644
--- a/components/custom-tab-bar.vue
+++ b/components/custom-tab-bar.vue
@@ -1,99 +1,124 @@
 <template>
-	<view class="custom-tab-bar">
-		<view v-for="(item, index) in tabs" :key="index" class="tab-item" @click="switchTab(index)">
-			<image :src="tabIndex === index ? item.selectedIconPath : item.iconPath" class="tab-icon"></image>
-			<text :class="tabIndex === index ? 'tab-text tab-text-sel' : 'tab-text'">{{ item.text }}</text>
-		</view>
-	</view>
+  <view class="custom-tab-bar" :class="platformType ? '' : 'iosplatformType'">
+    <view
+      v-for="(item, index) in tabs"
+      :key="index"
+      class="tab-item"
+      @click="switchTab(index)"
+    >
+      <image
+        :src="tabIndex === index ? item.selectedIconPath : item.iconPath"
+        class="tab-icon"
+      ></image>
+      <text
+        :class="tabIndex === index ? 'tab-text tab-text-sel' : 'tab-text'"
+        >{{ item.text }}</text
+      >
+    </view>
+  </view>
 </template>
 
 <script>
 export default {
-	name: "custom-tab-bar",
-	props: {
-		tabIndex: { //当前选中的tab项
-			type: Number,
-			default: 0
-		}
-	},
-	data() {
-		return {
-			tabs: [
-				{
-					"pagePath": "/pages/home/home",
-					"text": "首页",
-					"iconPath": "/static/column/home.png",
-					"selectedIconPath": "/static/column/home_sel.png"
-				},
-				{
-					"pagePath": "/pages/sort/sort",
-					"text": "分类",
-					"iconPath": "/static/column/sort.png",
-					"selectedIconPath": "/static/column/sort_sel.png"
-				},
-				{
-					"pagePath": "/pages/supply_chain/supply_chain",
-					"text": "平价专区",
-					"iconPath": "/static/column/supply_chain.png",
-					"selectedIconPath": "/static/column/supply_chain_sel.png"
-				},
-				{
-					"pagePath": "/pages/shopping_cart/shopping_cart",
-					"text": "购物车",
-					"iconPath": "/static/column/shopping.png",
-					"selectedIconPath": "/static/column/shopping_sel.png"
-				}, {
-					"pagePath": "/pages/mine/mine",
-					"text": "我的",
-					"iconPath": "/static/column/mine.png",
-					"selectedIconPath": "/static/column/mine_sel.png"
-				}
-			]
-		};
-	},
-	methods: {
-		switchTab(index) {
-			const pagePath = this.tabs[index].pagePath;
-			uni.switchTab({ url: pagePath });
-		}
-	}
-}
+  name: "custom-tab-bar",
+  props: {
+    tabIndex: {
+      //当前选中的tab项
+      type: Number,
+      default: 0,
+      platformType: 0,
+    },
+  },
+  data() {
+    return {
+      tabs: [
+        {
+          pagePath: "/pages/home/home",
+          text: "首页",
+          iconPath: "/static/column/home.png",
+          selectedIconPath: "/static/column/home_sel.png",
+        },
+        {
+          pagePath: "/pages/sort/sort",
+          text: "分类",
+          iconPath: "/static/column/sort.png",
+          selectedIconPath: "/static/column/sort_sel.png",
+        },
+        {
+          pagePath: "/pages/supply_chain/supply_chain",
+          text: "平价",
+          iconPath: "/static/column/supply_chain.png",
+          selectedIconPath: "/static/column/supply_chain_sel.png",
+        },
+        {
+          pagePath: "/pages/shopping_cart/shopping_cart",
+          text: "购物车",
+          iconPath: "/static/column/shopping.png",
+          selectedIconPath: "/static/column/shopping_sel.png",
+        },
+        {
+          pagePath: "/pages/mine/mine",
+          text: "我的",
+          iconPath: "/static/column/mine.png",
+          selectedIconPath: "/static/column/mine_sel.png",
+        },
+      ],
+    };
+  },
+  created() {
+    /*#ifdef APP-PLUS*/
+    const appUpdate = uni.getStorageSync("platform");
+    this.platformType = appUpdate == "android" ? "ANDROID" : "IOS";
+    /*#endif*/
+  },
+  methods: {
+    switchTab(index) {
+      const pagePath = this.tabs[index].pagePath;
+      uni.switchTab({ url: pagePath });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
 .custom-tab-bar {
-	position: fixed;
-	display: flex;
-	justify-content: space-around;
-	align-items: center;
-	//height: 140rpx;
-	/* 根据需要调整 */
-	background-color: #fff;
-	/* 背景颜色 */
-	bottom: 0;
-	width: 100%;
+  position: fixed;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  height: calc(100rpx + env(safe-area-inset-bottom));
+  /* 根据需要调整 */
+  background-color: #fff;
+  /* 背景颜色 */
+  bottom: 0;
+  width: 100%;
+  padding-bottom: calc(env(safe-area-inset-bottom));
+  &.iosplatformType {
+    height: 100rpx;
+    padding-bottom: 0;
+  }
 }
 
 .tab-item {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
 }
 
 .tab-icon {
-	margin-top: 5rpx;
-	width: 44rpx;
-	/* 图标大小 */
-	height: 44rpx;
-	/* 图标大小 */
+  margin-top: 5rpx;
+  width: 44rpx;
+  /* 图标大小 */
+  height: 44rpx;
+  /* 图标大小 */
 }
 
 .tab-text {
-	font-size: 24rpx
-	/* 文字大小 */
+  font-size: 24rpx;
+  /* 文字大小 */
 }
 
 .tab-text-sel {
-	color: $app-bt-bj;
+  color: $app-bt-bj;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages.json b/pages.json
index 28290ba..db4af3a 100644
--- a/pages.json
+++ b/pages.json
@@ -532,7 +532,7 @@
 			},
 			{
 				"pagePath": "pages/supply_chain/supply_chain",
-				"text": "平价商品",
+				"text": "平价",
 				"iconPath": "/static/column/supply_chain.png",
 				"selectedIconPath": "/static/column/supply_chain_sel.png"
 			},
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 567a60d..7730748 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="home_warp">
+	<view class="home_warp" :class="platformType ? '' :'iosplatformType'">
 		<!-- 带背景的头部 -->
 		<view class="home_header_warp"></view>
 		<view class="home_content_z_warp">
@@ -496,6 +496,9 @@ export default {
 	height: calc(100vh - env(safe-area-inset-bottom)); // 是底部的导航栏高度
 	overflow: auto;
 	position: relative;
+	&.iosplatformType{
+		height:100vh;
+	}
 }
 
 .home_header_warp {
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index da5cfb3..873596b 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -1,24 +1,39 @@
 <template>
-    <view class="mine_warp">
-        <view class="mine_header">
-            <view class="mine_login_data" v-if="currentUserData && Object.keys(currentUserData).length !== 0">
-                <view class="mine_data">
-                    <up-image :src="currentUserData.avatarUrl ? currentUserData.avatarUrl : '/static/mine/avatar.png'" shape="circle" width="54" height="54" bgColor="#f1f6ff00"></up-image>
-                    <view class="mine_info">
-                        <view class="mine_info_name">
-                            <text style="margin-right: 20rpx">{{ currentUserData.nickname || '信任桥用户' }}</text>
-                            <view class="level">
-                                <up-image
-                                    src="/static/mine/rz.png"
-                                    style="margin-right: 8rpx; margin-top: 6rpx"
-                                    shape="circle"
-                                    width="12"
-                                    height="12"
-                                    bgColor="#f1f6ff00"
-                                ></up-image>
-                                <view>{{ currentUserData.gradeName }}</view>
-                            </view>
-                            <!--   <view class="grade_warp" v-if="currentUserData && Object.keys(currentUserData).length !== 0">
+  <view class="mine_warp" :class="platformType ? '' : 'iosplatformType'">
+    <view class="mine_header">
+      <view
+        class="mine_login_data"
+        v-if="currentUserData && Object.keys(currentUserData).length !== 0"
+      >
+        <view class="mine_data">
+          <up-image
+            :src="
+              currentUserData.avatarUrl
+                ? currentUserData.avatarUrl
+                : '/static/mine/avatar.png'
+            "
+            shape="circle"
+            width="54"
+            height="54"
+            bgColor="#f1f6ff00"
+          ></up-image>
+          <view class="mine_info">
+            <view class="mine_info_name">
+              <text style="margin-right: 20rpx">{{
+                currentUserData.nickname || "信任桥用户"
+              }}</text>
+              <view class="level">
+                <up-image
+                  src="/static/mine/rz.png"
+                  style="margin-right: 8rpx; margin-top: 6rpx"
+                  shape="circle"
+                  width="12"
+                  height="12"
+                  bgColor="#f1f6ff00"
+                ></up-image>
+                <view>{{ currentUserData.gradeName }}</view>
+              </view>
+              <!--   <view class="grade_warp" v-if="currentUserData && Object.keys(currentUserData).length !== 0">
                                 <up-image
                                     :src="
                                         currentUserData.gradeLevel || currentUserData.gradeLevel === 0
@@ -33,707 +48,842 @@
                                     {{ currentUserData.gradeName }}
                                 </view>
                             </view> -->
-                        </view>
-                        <view class="mine_info_id">
-                            <text style="margin-right: 20rpx">邀请码:{{ currentUserData.inviteCode }}</text>
-                            <up-image src="/static/common/copy.png" width="14" height="14" bgColor="#f1f6ff00" @click="copyData(currentUserData.inviteCode)"></up-image>
-                        </view>
-                    </view>
-                </view>
-                <view @click="jumpSetting">
-                    <up-image src="/static/mine/icon_arrow_black_off.png" width="22" height="22" bgColor="#f1f6ff00"></up-image>
-                </view>
             </view>
-            <view class="mine_no_login_data" v-else>
-                <view class="mine_data">
-                    <up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/avater_not.png" shape="circle" width="80" height="80" bgColor="#f1f6ff00"></up-image>
-                    <view class="mine_info_not_login">未登录</view>
-                </view>
-                <view @click="jumpLogin" class="login_warp">
-                    <text style="margin-right: 10rpx">立即登录</text>
-                    <up-image src="/static/common/right_y_st.png" width="18" height="18" bgColor="#f1f6ff00"></up-image>
-                </view>
+            <view class="mine_info_id">
+              <text style="margin-right: 20rpx"
+                >邀请码:{{ currentUserData.inviteCode }}</text
+              >
+              <up-image
+                src="/static/common/copy.png"
+                width="14"
+                height="14"
+                bgColor="#f1f6ff00"
+                @click="copyData(currentUserData.inviteCode)"
+              ></up-image>
             </view>
+          </view>
         </view>
-        <view class="mine_content_warp">
-            <!-- 我的订单 -->
-            <view class="mine_content_comm_warp">
-                <view class="mine_order_title">
-                    <view>我的订单</view>
-                    <view class="mine_order_title_all" @click="jumpOrder({})">
-                        <view style="margin-right: 10rpx; font-size: 28rpx; font-weight: normal">全部</view>
-                        <up-image style="margin-top: 10rpx" src="/static/common/right.png" width="15" height="15" bgColor="#f1f6ff00"></up-image>
-                    </view>
-                </view>
-                <view class="mine_order_list">
-                    <view class="mine_fontsize_comm_warp order_list_item" v-for="item in orderTemplList" :key="item.id" @click="jumpOrder(item)">
-                        <up-image :src="item.url" width="28" height="28" bgColor="#f1f6ff00"></up-image>
-                        <view>{{ item.title }}</view>
-                        <up-badge :absolute="true" :offset="[0, 8]" max="99" :value="statisticsObj[item.note]"></up-badge>
-                    </view>
-                </view>
-            </view>
-            <!-- 应用 -->
-            <view class="mine_content_comm_warp mine_top_comm_warp apply_list">
-                <view class="apply_item mine_fontsize_comm_warp" v-for="item in applyList" :key="item.id" @click="jumpTool(item)">
-                    <up-image :src="item.url" width="36" height="36" bgColor="#f1f6ff00"></up-image>
-                    <view>{{ item.title }}</view>
-                </view>
-            </view>
-            <!-- 入驻 -->
-            <view class="mine_content_comm_warp mine_top_comm_warp mine_tool_warp">
-                <view class="mine_tool_title">入驻信任桥</view>
-                <view class="settled_list">
-                    <view class="enter_item" @click="jumpEnter('merchant')">
-                        <view class="enter_item_cell">
-                            <up-image src="/static/mine/enter_sj.png" width="36" height="36" bgColor="#f1f6ff00"></up-image>
-                            <view class="enter_item_text">
-                                <view class="enter_title">商家入驻</view>
-                                <view class="enter_remark">获取更多客户与订单机会</view>
-                            </view>
-                        </view>
-                        <view class="enter_apply">
-                            <text class="enter_apply_title">申请</text>
-                            <view style="margin-top: 10rpx">
-                                <up-image src="/static/common/right.png" width="14" height="14" bgColor="#f1f6ff00"></up-image>
-                            </view>
-                        </view>
-                    </view>
-
-                    <view class="enter_item" @click="jumpEnter('brand')">
-                        <view class="enter_item_cell">
-                            <up-image src="/static/mine/enter_pp.png" width="36" height="36" bgColor="#f1f6ff00"></up-image>
-                            <view class="enter_item_text">
-                                <view class="enter_title">企业/品牌入驻</view>
-                                <view class="enter_remark">助您打造专属品牌馆</view>
-                            </view>
-                        </view>
-
-                        <view class="enter_apply">
-                            <text class="enter_apply_title">申请</text>
-                            <view style="margin-top: 10rpx">
-                                <up-image src="/static/common/right.png" width="14" height="14" bgColor="#f1f6ff00"></up-image>
-                            </view>
-                        </view>
-                    </view>
-                </view>
-            </view>
-
-            <!-- 服务工具 -->
-            <view class="mine_content_comm_warp mine_top_comm_warp mine_tool_warp">
-                <view class="mine_tool_title">服务工具</view>
-                <view class="tool_list">
-                    <view class="tool_item" v-for="item in toolList" :key="item.id" @click="jumpTool(item)">
-                        <up-image :src="item.url" width="28" height="28" bgColor="#f1f6ff00"></up-image>
-                        <text class="mine_fontsize_comm_warp">{{ item.title }}</text>
-                    </view>
-                </view>
-            </view>
+        <view @click="jumpSetting">
+          <up-image
+            src="/static/mine/icon_arrow_black_off.png"
+            width="22"
+            height="22"
+            bgColor="#f1f6ff00"
+          ></up-image>
         </view>
-        <!-- #ifndef H5 -->
-        <CustomTabBar :tabIndex="4" />
-        <!-- #endif -->
-        <!-- 品牌入驻弹框 -->
-        <up-modal :show="brandShow" :showConfirmButton="false">
-            <view class="slot-content">
-                <view class="close_warp" @click="brandShow = false">
-                    <up-image src="/static/common/close.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
-                </view>
-                <view class="content_">
-                    <view class="content_1">企业入驻</view>
-                    <view class="content_2">请联系负责人</view>
-                    <view class="content_3">{{ CUSTOMER_SERVICE_PHONE_NUMBER }}</view>
-                </view>
-                <view class="but_">
-                    <view class="but_copy" @click="copyMobile(CUSTOMER_SERVICE_PHONE_NUMBER)">复制号码</view>
-                    <view class="but_close" @click="brandShow = false">取消</view>
-                </view>
-            </view>
-        </up-modal>
-        <!-- 我的客服 -->
-        <up-modal :show="serviceShow" :showConfirmButton="false">
-            <view class="slot-content">
-                <view class="close_warp" @click="serviceShow = false">
-                    <up-image src="/static/common/close.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
-                </view>
-                <view class="content_">
-                    <view class="content_1">联系客服</view>
-                    <view class="content_3">{{ CUSTOMER_SERVICE_PHONE_NUMBER }}</view>
-                </view>
-                <view class="but_">
-                    <view class="but_copy" @click="copyMobile(CUSTOMER_SERVICE_PHONE_NUMBER)">复制号码</view>
-                    <view class="but_close" @click="serviceShow = false">取消</view>
-                </view>
-            </view>
-        </up-modal>
-        <!-- 暂未开放 -->
-        <up-modal :show="openShow" :showConfirmButton="false">
-            <view class="slot-content">
-                <view class="close_warp" @click="openShow = false">
-                    <up-image src="/static/common/close.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
-                </view>
-                <view class="content_">
-                    <view class="content_1">温馨提示</view>
-                    <view class="content_2">暂未开放</view>
-                </view>
-                <view class="but_">
-                    <view class="but_copy" @click="openShow = false">确定</view>
-                </view>
-            </view>
-        </up-modal>
+      </view>
+      <view class="mine_no_login_data" v-else>
+        <view class="mine_data">
+          <up-image
+            src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/avater_not.png"
+            shape="circle"
+            width="80"
+            height="80"
+            bgColor="#f1f6ff00"
+          ></up-image>
+          <view class="mine_info_not_login">未登录</view>
+        </view>
+        <view @click="jumpLogin" class="login_warp">
+          <text style="margin-right: 10rpx">立即登录</text>
+          <up-image
+            src="/static/common/right_y_st.png"
+            width="18"
+            height="18"
+            bgColor="#f1f6ff00"
+          ></up-image>
+        </view>
+      </view>
     </view>
+    <view class="mine_content_warp">
+      <!-- 我的订单 -->
+      <view class="mine_content_comm_warp">
+        <view class="mine_order_title">
+          <view>我的订单</view>
+          <view class="mine_order_title_all" @click="jumpOrder({})">
+            <view
+              style="margin-right: 10rpx; font-size: 28rpx; font-weight: normal"
+              >全部</view
+            >
+            <up-image
+              style="margin-top: 10rpx"
+              src="/static/common/right.png"
+              width="15"
+              height="15"
+              bgColor="#f1f6ff00"
+            ></up-image>
+          </view>
+        </view>
+        <view class="mine_order_list">
+          <view
+            class="mine_fontsize_comm_warp order_list_item"
+            v-for="item in orderTemplList"
+            :key="item.id"
+            @click="jumpOrder(item)"
+          >
+            <up-image
+              :src="item.url"
+              width="28"
+              height="28"
+              bgColor="#f1f6ff00"
+            ></up-image>
+            <view>{{ item.title }}</view>
+            <up-badge
+              :absolute="true"
+              :offset="[0, 8]"
+              max="99"
+              :value="statisticsObj[item.note]"
+            ></up-badge>
+          </view>
+        </view>
+      </view>
+      <!-- 应用 -->
+      <view class="mine_content_comm_warp mine_top_comm_warp apply_list">
+        <view
+          class="apply_item mine_fontsize_comm_warp"
+          v-for="item in applyList"
+          :key="item.id"
+          @click="jumpTool(item)"
+        >
+          <up-image
+            :src="item.url"
+            width="36"
+            height="36"
+            bgColor="#f1f6ff00"
+          ></up-image>
+          <view>{{ item.title }}</view>
+        </view>
+      </view>
+      <!-- 入驻 -->
+      <view class="mine_content_comm_warp mine_top_comm_warp mine_tool_warp">
+        <view class="mine_tool_title">入驻信任桥</view>
+        <view class="settled_list">
+          <view class="enter_item" @click="jumpEnter('merchant')">
+            <view class="enter_item_cell">
+              <up-image
+                src="/static/mine/enter_sj.png"
+                width="36"
+                height="36"
+                bgColor="#f1f6ff00"
+              ></up-image>
+              <view class="enter_item_text">
+                <view class="enter_title">商家入驻</view>
+                <view class="enter_remark">获取更多客户与订单机会</view>
+              </view>
+            </view>
+            <view class="enter_apply">
+              <text class="enter_apply_title">申请</text>
+              <view style="margin-top: 10rpx">
+                <up-image
+                  src="/static/common/right.png"
+                  width="14"
+                  height="14"
+                  bgColor="#f1f6ff00"
+                ></up-image>
+              </view>
+            </view>
+          </view>
+
+          <view class="enter_item" @click="jumpEnter('brand')">
+            <view class="enter_item_cell">
+              <up-image
+                src="/static/mine/enter_pp.png"
+                width="36"
+                height="36"
+                bgColor="#f1f6ff00"
+              ></up-image>
+              <view class="enter_item_text">
+                <view class="enter_title">企业/品牌入驻</view>
+                <view class="enter_remark">助您打造专属品牌馆</view>
+              </view>
+            </view>
+
+            <view class="enter_apply">
+              <text class="enter_apply_title">申请</text>
+              <view style="margin-top: 10rpx">
+                <up-image
+                  src="/static/common/right.png"
+                  width="14"
+                  height="14"
+                  bgColor="#f1f6ff00"
+                ></up-image>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <!-- 服务工具 -->
+      <view class="mine_content_comm_warp mine_top_comm_warp mine_tool_warp">
+        <view class="mine_tool_title">服务工具</view>
+        <view class="tool_list">
+          <view
+            class="tool_item"
+            v-for="item in toolList"
+            :key="item.id"
+            @click="jumpTool(item)"
+          >
+            <up-image
+              :src="item.url"
+              width="28"
+              height="28"
+              bgColor="#f1f6ff00"
+            ></up-image>
+            <text class="mine_fontsize_comm_warp">{{ item.title }}</text>
+          </view>
+        </view>
+      </view>
+    </view>
+    <!-- #ifndef H5 -->
+    <CustomTabBar :tabIndex="4" />
+    <!-- #endif -->
+    <!-- 品牌入驻弹框 -->
+    <up-modal :show="brandShow" :showConfirmButton="false">
+      <view class="slot-content">
+        <view class="close_warp" @click="brandShow = false">
+          <up-image
+            src="/static/common/close.png"
+            width="20"
+            height="20"
+            bgColor="#f1f6ff00"
+          ></up-image>
+        </view>
+        <view class="content_">
+          <view class="content_1">企业入驻</view>
+          <view class="content_2">请联系负责人</view>
+          <view class="content_3">{{ CUSTOMER_SERVICE_PHONE_NUMBER }}</view>
+        </view>
+        <view class="but_">
+          <view
+            class="but_copy"
+            @click="copyMobile(CUSTOMER_SERVICE_PHONE_NUMBER)"
+            >复制号码</view
+          >
+          <view class="but_close" @click="brandShow = false">取消</view>
+        </view>
+      </view>
+    </up-modal>
+    <!-- 我的客服 -->
+    <up-modal :show="serviceShow" :showConfirmButton="false">
+      <view class="slot-content">
+        <view class="close_warp" @click="serviceShow = false">
+          <up-image
+            src="/static/common/close.png"
+            width="20"
+            height="20"
+            bgColor="#f1f6ff00"
+          ></up-image>
+        </view>
+        <view class="content_">
+          <view class="content_1">联系客服</view>
+          <view class="content_3">{{ CUSTOMER_SERVICE_PHONE_NUMBER }}</view>
+        </view>
+        <view class="but_">
+          <view
+            class="but_copy"
+            @click="copyMobile(CUSTOMER_SERVICE_PHONE_NUMBER)"
+            >复制号码</view
+          >
+          <view class="but_close" @click="serviceShow = false">取消</view>
+        </view>
+      </view>
+    </up-modal>
+    <!-- 暂未开放 -->
+    <up-modal :show="openShow" :showConfirmButton="false">
+      <view class="slot-content">
+        <view class="close_warp" @click="openShow = false">
+          <up-image
+            src="/static/common/close.png"
+            width="20"
+            height="20"
+            bgColor="#f1f6ff00"
+          ></up-image>
+        </view>
+        <view class="content_">
+          <view class="content_1">温馨提示</view>
+          <view class="content_2">暂未开放</view>
+        </view>
+        <view class="but_">
+          <view class="but_copy" @click="openShow = false">确定</view>
+        </view>
+      </view>
+    </up-modal>
+  </view>
 </template>
 
 <script>
-import { getStorageFun, USER_DATA, clear } from '@/utils/auth.js';
-import { ORDER_TYPE, MINE_ORDER_TYPE } from '@/utils/enumUtils.js';
-import { copyData } from '@/utils/index.js';
-import CustomTabBar from '@/components/custom-tab-bar.vue';
-import { getStatistics } from '@/api/order.js';
-import { getUserInfo } from '@/api/auth.js';
-import { CUSTOMER_SERVICE_PHONE_NUMBER } from '@/utils/config.js';
+import { getStorageFun, USER_DATA, clear } from "@/utils/auth.js";
+import { ORDER_TYPE, MINE_ORDER_TYPE } from "@/utils/enumUtils.js";
+import { copyData } from "@/utils/index.js";
+import CustomTabBar from "@/components/custom-tab-bar.vue";
+import { getStatistics } from "@/api/order.js";
+import { getUserInfo } from "@/api/auth.js";
+import { CUSTOMER_SERVICE_PHONE_NUMBER } from "@/utils/config.js";
 
 export default {
-    computed: {
-        CUSTOMER_SERVICE_PHONE_NUMBER() {
-            return CUSTOMER_SERVICE_PHONE_NUMBER;
-        }
+  computed: {
+    CUSTOMER_SERVICE_PHONE_NUMBER() {
+      return CUSTOMER_SERVICE_PHONE_NUMBER;
     },
-    components: { CustomTabBar },
-    data() {
-        return {
-            userData: {}, // 当前登录对象
-            currentUserData: {}, // 当前登录对象
-            orderTemplList: [
-                {
-                    id: ORDER_TYPE.UNPAID,
-                    title: '待支付',
-                    url: '/static/mine/order_unpaid.png',
-                    path: '/pages/mine_package/mine_order/mine_order?type=' + MINE_ORDER_TYPE.UNPAID,
-                    note: 'unPayNum'
-                },
-                {
-                    id: ORDER_TYPE.UNSHIPPED,
-                    title: '待发货',
-                    url: '/static/mine/order_unshipped.png',
-                    path: '/pages/mine_package/mine_order/mine_order?type=' + MINE_ORDER_TYPE.UNSHIPPED,
-                    note: 'unSentNum'
-                },
-                {
-                    id: ORDER_TYPE.NOT_RECEIVE,
-                    title: '待收货',
-                    url: '/static/mine/order_notReceive.png',
-                    path: '/pages/mine_package/mine_order/mine_order?type=' + MINE_ORDER_TYPE.NOT_RECEIVE,
-                    note: 'unTakeNum'
-                },
-                {
-                    id: ORDER_TYPE.SUCCEED,
-                    title: '已完成',
-                    url: '/static/mine/order_afterSale.png',
-                    path: '/pages/mine_package/mine_order/mine_order?type=' + MINE_ORDER_TYPE.SUCCEED,
-                    note: 'unCommentNum'
-                },
-                {
-                    id: ORDER_TYPE.AFTER_SALE,
-                    title: '售后',
-                    url: '/static/mine/order_afterSale.png',
-                    path: '/pages/mine_package/mine_order/mine_order?type=' + MINE_ORDER_TYPE.AFTER_SALE,
-                    note: 'unCommentNum'
-                }
-            ],
-            applyList: [
-                {
-                    id: 1,
-                    title: '钱包',
-                    url: '/static/mine/apply_purse.png',
-                    path: '/pages/mine_package/mine_purse/mine_purse'
-                },
-                {
-                    id: 2,
-                    title: '抽奖',
-                    url: '/static/mine/apply_prize.png',
-                    path: '/pages/other_package/nine-grid/nine-grid'
-                },
-                {
-                    id: 4,
-                    title: '我的推广',
-                    url: '/static/mine/tool_team.png',
-                    path: '/pages/mine_package/mine_my_team/mine_my_team'
-                },
-                {
-                    id: 5,
-                    title: '加速次数',
-                    url: '/static/mine/tool_js.png',
-                    path: '/pages/rwa_package/dongjian/jia'
-                }
-                // {
-                // 	id: 3,
-                // 	title: "交易",
-                // 	url: 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/apply_hm.png'
-                // },
-                // {
-                // 	id:4,
-                // 	title:"贡献值",
-                // 	url:'/static/mine/apply_gx.png'
-                // },{
-                // 	id:5,
-                // 	title:"数据",
-                // 	url:'/static/mine/apply_sj.png'
-                // },
-            ], // 应用模版
-            toolList: [
-                {
-                    id: 5,
-                    title: '地址管理',
-                    url: '/static/mine/tool_dz.png',
-                    path: '/pages/mine_package/mine_address/mine_address'
-                },
-                {
-                    id: 9,
-                    title: '实名认证',
-                    url: '/static/mine/tool_sm.png'
-                },
-                {
-                    id: 10,
-                    title: '银行卡管理',
-                    url: '/static/mine/tool_card.png',
-                    path: '/pages/mine_package/mine_bank_card/mine_bank_card'
-                },
-                {
-                    id: 3,
-                    title: '邀请好友',
-                    url: '/static/mine/tool_invite.png',
-                    path: '/pages/other_package/invite_friends/invite_friends'
-                },
-                // {
-                // 	id:2,
-                // 	title:"我的团队",
-                // 	url:'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/tool_team.png',
-                // 	path:"/pages/mine_package/mine_my_team/mine_my_team",
-                // },
-                // {
-                // 	id:6,
-                // 	title:"卡券",
-                // 	url:'/static/mine/tool_kj.png',
-                // 	// path:"/pages/mine_package/mine_coupon/mine_coupon",
-                // },
-                {
-                    id: 7,
-                    title: '联系客服',
-                    url: '/static/mine/xlkf.png'
-                },
-                // {
-                // 	id:4,
-                // 	title:"加速次数",
-                // 	url:'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/tool_js.png',
-                // 	path:"/pages/login_package/accelerate/accelerate"
-                // },
-                {
-                    id: 8,
-                    title: '商学院资讯',
-                    url: '/static/mine/tool_sxy.png',
-                    path: '/pages/login_package/news/news'
-                },
-                {
-                    id: 12,
-                    title: '财务',
-                    url: '/static/mine/tool_cw.png',
-                    path: '/pages/rwa_package/dongjian/finance'
-                },
-                {
-                    id: 11,
-                    title: '股东行权',
-                    url: '/static/mine/tool_gdxq.png',
-                    path: '/pages/rwa_package/rwa/rwa'
-                }
-                // {
-                // 	id:1,
-                // 	title:"IM聊天",
-                // 	url:'/static/mine/tool_im.png'
-                // },
-            ], // 工具
-            brandShow: false, // 品牌入驻弹框
-            statisticsObj: {
-                unPayNum: 0, //待支付数量
-                unSentNum: 0, //待发货数量
-                unTakeNum: 0, //待收货数量
-                unCommentNum: 0 //待评价数量
-            }, // 角标统计
-            serviceShow: false, // 我的客服弹框
-            openShow: false // 暂未开放
-        };
-    },
-    onShow() {
-        this.userData = getStorageFun(USER_DATA);
-        /*#ifdef APP-PLUS*/
-        uni.hideTabBar({
-            animation: false
-        });
-        /*#endif*/
-        this.getStatistics();
+  },
+  components: { CustomTabBar },
+  data() {
+    return {
+      userData: {}, // 当前登录对象
+      currentUserData: {}, // 当前登录对象
+      orderTemplList: [
+        {
+          id: ORDER_TYPE.UNPAID,
+          title: "待支付",
+          url: "/static/mine/order_unpaid.png",
+          path:
+            "/pages/mine_package/mine_order/mine_order?type=" +
+            MINE_ORDER_TYPE.UNPAID,
+          note: "unPayNum",
+        },
+        {
+          id: ORDER_TYPE.UNSHIPPED,
+          title: "待发货",
+          url: "/static/mine/order_unshipped.png",
+          path:
+            "/pages/mine_package/mine_order/mine_order?type=" +
+            MINE_ORDER_TYPE.UNSHIPPED,
+          note: "unSentNum",
+        },
+        {
+          id: ORDER_TYPE.NOT_RECEIVE,
+          title: "待收货",
+          url: "/static/mine/order_notReceive.png",
+          path:
+            "/pages/mine_package/mine_order/mine_order?type=" +
+            MINE_ORDER_TYPE.NOT_RECEIVE,
+          note: "unTakeNum",
+        },
+        {
+          id: ORDER_TYPE.SUCCEED,
+          title: "已完成",
+          url: "/static/mine/order_afterSale.png",
+          path:
+            "/pages/mine_package/mine_order/mine_order?type=" +
+            MINE_ORDER_TYPE.SUCCEED,
+          note: "unCommentNum",
+        },
+        {
+          id: ORDER_TYPE.AFTER_SALE,
+          title: "售后",
+          url: "/static/mine/order_afterSale.png",
+          path:
+            "/pages/mine_package/mine_order/mine_order?type=" +
+            MINE_ORDER_TYPE.AFTER_SALE,
+          note: "unCommentNum",
+        },
+      ],
+      applyList: [
+        {
+          id: 1,
+          title: "钱包",
+          url: "/static/mine/apply_purse.png",
+          path: "/pages/mine_package/mine_purse/mine_purse",
+        },
+        {
+          id: 2,
+          title: "抽奖",
+          url: "/static/mine/apply_prize.png",
+          path: "/pages/other_package/nine-grid/nine-grid",
+        },
+        {
+          id: 4,
+          title: "我的推广",
+          url: "/static/mine/tool_team.png",
+          path: "/pages/mine_package/mine_my_team/mine_my_team",
+        },
+        {
+          id: 5,
+          title: "加速次数",
+          url: "/static/mine/tool_js.png",
+          path: "/pages/rwa_package/dongjian/jia",
+        },
+        // {
+        // 	id: 3,
+        // 	title: "交易",
+        // 	url: 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/apply_hm.png'
+        // },
+        // {
+        // 	id:4,
+        // 	title:"贡献值",
+        // 	url:'/static/mine/apply_gx.png'
+        // },{
+        // 	id:5,
+        // 	title:"数据",
+        // 	url:'/static/mine/apply_sj.png'
+        // },
+      ], // 应用模版
+      toolList: [
+        {
+          id: 5,
+          title: "地址管理",
+          url: "/static/mine/tool_dz.png",
+          path: "/pages/mine_package/mine_address/mine_address",
+        },
+        {
+          id: 9,
+          title: "实名认证",
+          url: "/static/mine/tool_sm.png",
+        },
+        {
+          id: 10,
+          title: "银行卡管理",
+          url: "/static/mine/tool_card.png",
+          path: "/pages/mine_package/mine_bank_card/mine_bank_card",
+        },
+        {
+          id: 3,
+          title: "邀请好友",
+          url: "/static/mine/tool_invite.png",
+          path: "/pages/other_package/invite_friends/invite_friends",
+        },
+        // {
+        // 	id:2,
+        // 	title:"我的团队",
+        // 	url:'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/tool_team.png',
+        // 	path:"/pages/mine_package/mine_my_team/mine_my_team",
+        // },
+        // {
+        // 	id:6,
+        // 	title:"卡券",
+        // 	url:'/static/mine/tool_kj.png',
+        // 	// path:"/pages/mine_package/mine_coupon/mine_coupon",
+        // },
+        {
+          id: 7,
+          title: "联系客服",
+          url: "/static/mine/xlkf.png",
+        },
+        // {
+        // 	id:4,
+        // 	title:"加速次数",
+        // 	url:'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/tool_js.png',
+        // 	path:"/pages/login_package/accelerate/accelerate"
+        // },
+        {
+          id: 8,
+          title: "商学院资讯",
+          url: "/static/mine/tool_sxy.png",
+          path: "/pages/login_package/news/news",
+        },
+        {
+          id: 12,
+          title: "财务",
+          url: "/static/mine/tool_cw.png",
+          path: "/pages/rwa_package/dongjian/finance",
+        },
+        {
+          id: 11,
+          title: "股东行权",
+          url: "/static/mine/tool_gdxq.png",
+          path: "/pages/rwa_package/rwa/rwa",
+        },
+        // {
+        // 	id:1,
+        // 	title:"IM聊天",
+        // 	url:'/static/mine/tool_im.png'
+        // },
+      ], // 工具
+      brandShow: false, // 品牌入驻弹框
+      statisticsObj: {
+        unPayNum: 0, //待支付数量
+        unSentNum: 0, //待发货数量
+        unTakeNum: 0, //待收货数量
+        unCommentNum: 0, //待评价数量
+      }, // 角标统计
+      serviceShow: false, // 我的客服弹框
+      openShow: false, // 暂未开放
+      platformType: true,
+    };
+  },
+  onShow() {
+    this.userData = getStorageFun(USER_DATA);
+    /*#ifdef APP-PLUS*/
+    uni.hideTabBar({
+      animation: false,
+    });
+    const appUpdate = uni.getStorageSync("platform");
+    this.platformType = appUpdate == "android" ? "ANDROID" : "IOS";
+    /*#endif*/
+    this.getStatistics();
 
-        this.getUserInfo();
+    this.getUserInfo();
+  },
+  mounted() {},
+  methods: {
+    copyData,
+    // 查询用户等级
+    async getUserInfo() {
+      const result = await getUserInfo();
+      if (result && result.bizcode === 100) {
+        const data = result.data;
+        this.currentUserData = result.data || {};
+      }
     },
-    mounted() {},
-    methods: {
-        copyData,
-        // 查询用户等级
-        async getUserInfo() {
-            const result = await getUserInfo();
-            if (result && result.bizcode === 100) {
-                const data = result.data;
-                this.currentUserData = result.data || {};
-            }
-        },
-        /**
-         * 跳转到工具
-         * @param {Object} item
-         */
-        jumpTool(item) {
-            // 客服
-            if (item.id === 7) {
-                uni.navigateTo({
-                	url:'/pages/rwa_package/setting/kefu?type=5257'
-                })
-            } else if (item.id === 9) {
-                // 实名认证
-                const currentUserData = this.currentUserData;
-                console.log('currentUserData', this.currentUserData);
-                let path = '/pages/mine_package/mine_authentication/mine_authentication';
-                // if (currentUserData && Object.keys(currentUserData).length !== 0 && currentUserData.certStatus && currentUserData.certStatus !== 0) {
-                // 	path = "/pages/mine_package/mine_authentication_ok/mine_authentication_ok"
-                // }
-                uni.navigateTo({
-                    url: path
-                });
-            } else if (item.path) {
-                uni.navigateTo({
-                    url: item.path
-                });
-            } else {
-                this.openShow = true;
-            }
-        },
-        jumpOrder(item) {
-            let path = '/pages/mine_package/mine_order/mine_order';
-            if (item && Object.keys(item).length !== 0) {
-                path = item.path;
-            }
-            uni.navigateTo({
-                url: path
-            });
-        },
-        jumpLogin() {
-            uni.navigateTo({
-                url: '/pages/login_package/login/login'
-            });
-        },
-        // 跳转到入驻页面
-        jumpEnter(type) {
-            // 商家入驻
-            if (type === 'merchant') {
-                // uni.navigateTo({
-                // 	url: '/pages/rwa_package/merchant_settlement/merchant_settlement.vue',
-                // })
-                this.openShow = true;
-            } else if (type === 'brand') {
-                // 企业/品牌入驻
-                // uni.navigateTo({
-                // 	url: '/pages/brand_settlement/brand_settlement',
-                // })
-                // this.brandShow = true;
-                 this.openShow = true;
-            }
-        },
-        copyMobile(mobile) {
-            copyData(mobile);
-            this.brandShow = false;
-            this.serviceShow = false;
-        },
-        // 查询统计
-        async getStatistics() {
-            const result = await getStatistics();
-            if (result && result.bizcode === 100 && result.data) {
-                this.statisticsObj = {
-                    ...result.data,
-                    unCommentNum: 0 //待评价数量
-                };
-            } else {
-                this.statisticsObj = {
-                    unPayNum: 0, //待支付数量
-                    unSentNum: 0, //待发货数量
-                    unTakeNum: 0, //待收货数量
-                    unCommentNum: 0 //待评价数量
-                };
-            }
-        },
-        jumpSetting() {
-            uni.navigateTo({
-                url: '/pages/rwa_package/setting/setting'
-            });
-        }
+    /**
+     * 跳转到工具
+     * @param {Object} item
+     */
+    jumpTool(item) {
+      // 客服
+      if (item.id === 7) {
+        uni.navigateTo({
+          url: "/pages/rwa_package/setting/kefu?type=5257",
+        });
+      } else if (item.id === 9) {
+        // 实名认证
+        const currentUserData = this.currentUserData;
+        console.log("currentUserData", this.currentUserData);
+        let path =
+          "/pages/mine_package/mine_authentication/mine_authentication";
+        // if (currentUserData && Object.keys(currentUserData).length !== 0 && currentUserData.certStatus && currentUserData.certStatus !== 0) {
+        // 	path = "/pages/mine_package/mine_authentication_ok/mine_authentication_ok"
+        // }
+        uni.navigateTo({
+          url: path,
+        });
+      } else if (item.path) {
+        uni.navigateTo({
+          url: item.path,
+        });
+      } else {
+        this.openShow = true;
+      }
     },
-    beforeDestroy() {
+    jumpOrder(item) {
+      let path = "/pages/mine_package/mine_order/mine_order";
+      if (item && Object.keys(item).length !== 0) {
+        path = item.path;
+      }
+      uni.navigateTo({
+        url: path,
+      });
+    },
+    jumpLogin() {
+      uni.navigateTo({
+        url: "/pages/login_package/login/login",
+      });
+    },
+    // 跳转到入驻页面
+    jumpEnter(type) {
+      // 商家入驻
+      if (type === "merchant") {
+        // uni.navigateTo({
+        // 	url: '/pages/rwa_package/merchant_settlement/merchant_settlement.vue',
+        // })
+        this.openShow = true;
+      } else if (type === "brand") {
+        // 企业/品牌入驻
+        // uni.navigateTo({
+        // 	url: '/pages/brand_settlement/brand_settlement',
+        // })
+        // this.brandShow = true;
+        this.openShow = true;
+      }
+    },
+    copyMobile(mobile) {
+      copyData(mobile);
+      this.brandShow = false;
+      this.serviceShow = false;
+    },
+    // 查询统计
+    async getStatistics() {
+      const result = await getStatistics();
+      if (result && result.bizcode === 100 && result.data) {
         this.statisticsObj = {
-            unPayNum: 0, //待支付数量
-            unSentNum: 0, //待发货数量
-            unTakeNum: 0, //待收货数量
-            unCommentNum: 0 //待评价数量
-        }; // 角标统计
-    }
+          ...result.data,
+          unCommentNum: 0, //待评价数量
+        };
+      } else {
+        this.statisticsObj = {
+          unPayNum: 0, //待支付数量
+          unSentNum: 0, //待发货数量
+          unTakeNum: 0, //待收货数量
+          unCommentNum: 0, //待评价数量
+        };
+      }
+    },
+    jumpSetting() {
+      uni.navigateTo({
+        url: "/pages/rwa_package/setting/setting",
+      });
+    },
+  },
+  beforeDestroy() {
+    this.statisticsObj = {
+      unPayNum: 0, //待支付数量
+      unSentNum: 0, //待发货数量
+      unTakeNum: 0, //待收货数量
+      unCommentNum: 0, //待评价数量
+    }; // 角标统计
+  },
 };
 </script>
 
 <style lang="scss">
-
 .mine_warp {
-    height: calc(100vh - env(safe-area-inset-bottom)); 
-    overflow: auto;
-    position: relative;
-    background-color: $app-bj;
+  height: calc(100vh - env(safe-area-inset-bottom));
+  overflow: auto;
+  position: relative;
+  background-color: $app-bj;
+  &.iosplatformType {
+    height: 100vh;
+    .mine_content_warp {
+      padding-bottom: 100rpx !important;
+    }
+  }
 }
 
 .mine_header {
-    // height: 300rpx;
-    background: linear-gradient(180deg, #f2ebff 0%, rgba(245, 245, 247, 0) 100%, #ffffff 100%);
-    /* 将图片居中显示 */
-    padding: 90rpx 40rpx 0;
+  // height: 300rpx;
+  background: linear-gradient(
+    180deg,
+    #f2ebff 0%,
+    rgba(245, 245, 247, 0) 100%,
+    #ffffff 100%
+  );
+  /* 将图片居中显示 */
+  padding: 90rpx 40rpx 0;
 
-    .mine_login_data {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-    }
-}
-
-.mine_content_warp {
-    margin-top: 20rpx;
-    margin-left: 30rpx;
-    width: 690rpx;
-    padding-bottom: calc(100rpx + env(safe-area-inset-bottom));
-}
-
-.mine_no_login_data {
+  .mine_login_data {
     display: flex;
     justify-content: space-between;
     align-items: center;
+  }
+}
 
-    .login_warp {
-        display: flex;
-        align-items: center;
-        font-weight: 500;
-        font-size: 26rpx;
-        color: #111111;
-    }
+.mine_content_warp {
+  margin-top: 20rpx;
+  margin-left: 30rpx;
+  width: 690rpx;
+  padding-bottom: calc(100rpx + env(safe-area-inset-bottom));
+}
+
+.mine_no_login_data {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  .login_warp {
+    display: flex;
+    align-items: center;
+    font-weight: 500;
+    font-size: 26rpx;
+    color: #111111;
+  }
 }
 
 .mine_data {
-    display: flex;
-    align-items: center;
+  display: flex;
+  align-items: center;
 }
 
 .mine_info_not_login {
-    font-weight: bold;
-    font-size: 40rpx;
-    color: #111111;
+  font-weight: bold;
+  font-size: 40rpx;
+  color: #111111;
 }
 
 .mine_info {
-    margin-left: 20rpx;
+  margin-left: 20rpx;
 }
 
 .mine_info_name {
-    font-weight: bold;
-    font-size: 40rpx;
-    color: #111111;
+  font-weight: bold;
+  font-size: 40rpx;
+  color: #111111;
+  display: flex;
+  justify-content: start;
+  align-items: center;
+  .grade_warp {
+    position: relative;
+  }
+  .level {
+    background: rgba(122, 53, 246, 0.1);
+    border-radius: 8rpx;
     display: flex;
-    justify-content: start;
+    justify-content: center;
     align-items: center;
-    .grade_warp {
-        position: relative;
-    }
-    .level {
-        background: rgba(122, 53, 246, 0.1);
-        border-radius: 8rpx;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        padding: 2rpx 16rpx;
-        color: #7a35f6;
-        font-size: 24rpx;
-    }
-    .grade_key_warp {
-        position: absolute;
-        top: 0rpx;
-        left: 30%;
-        font-size: 24rpx;
-        color: #ffffff;
-        width: 100rpx;
-        height: 44rpx;
-        line-height: 50rpx;
-        text-align: center;
-    }
+    padding: 2rpx 16rpx;
+    color: #7a35f6;
+    font-size: 24rpx;
+  }
+  .grade_key_warp {
+    position: absolute;
+    top: 0rpx;
+    left: 30%;
+    font-size: 24rpx;
+    color: #ffffff;
+    width: 100rpx;
+    height: 44rpx;
+    line-height: 50rpx;
+    text-align: center;
+  }
 
-    .grade_key_warp1 {
-        font-size: 24rpx;
-        line-height: 48rpx;
-    }
+  .grade_key_warp1 {
+    font-size: 24rpx;
+    line-height: 48rpx;
+  }
 
-    .grade_key_warp3 {
-        font-size: 20rpx;
-    }
+  .grade_key_warp3 {
+    font-size: 20rpx;
+  }
 }
 
 .mine_info_id {
-    font-weight: 500;
-    font-size: 24rpx;
-    color: #666666;
-    display: flex;
-    margin-top: 10rpx;
+  font-weight: 500;
+  font-size: 24rpx;
+  color: #666666;
+  display: flex;
+  margin-top: 10rpx;
 }
 
 /* 内容公共 start */
 .mine_content_comm_warp {
-    background: #ffffff;
-    box-shadow: 0rpx 0rpx 10rpx 0rpx #eeeeee;
-    border-radius: 30rpx;
-    padding: 30rpx;
+  background: #ffffff;
+  box-shadow: 0rpx 0rpx 10rpx 0rpx #eeeeee;
+  border-radius: 30rpx;
+  padding: 30rpx;
 }
 
 .mine_fontsize_comm_warp {
-    font-weight: 500;
-    font-size: 24rpx;
-    color: #222222;
+  font-weight: 500;
+  font-size: 24rpx;
+  color: #222222;
 }
 
 .mine_top_comm_warp {
-    margin-top: 30rpx;
+  margin-top: 30rpx;
 
-    .settled_list {
-        width: 100%;
-        box-sizing: border-box;
+  .settled_list {
+    width: 100%;
+    box-sizing: border-box;
 
-        .enter_item {
-            width: 100%;
-            margin-top: 10rpx;
-            padding: 12rpx 0;
-            box-sizing: border-box;
+    .enter_item {
+      width: 100%;
+      margin-top: 10rpx;
+      padding: 12rpx 0;
+      box-sizing: border-box;
 
-            .enter_item_cell {
-                display: flex;
+      .enter_item_cell {
+        display: flex;
 
-                .u-transition {
-                    margin-top: 5rpx;
-                }
-
-                .enter_item_text {
-                    margin-left: 10rpx;
-
-                    .enter_remark {
-                        font-size: 24rpx;
-                        color: #999999;
-                        margin-top: 10rpx;
-                    }
-                }
-            }
+        .u-transition {
+          margin-top: 5rpx;
         }
+
+        .enter_item_text {
+          margin-left: 10rpx;
+
+          .enter_remark {
+            font-size: 24rpx;
+            color: #999999;
+            margin-top: 10rpx;
+          }
+        }
+      }
     }
+  }
 }
 
 /* 内容公共 end */
 
 .mine_order_title {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    font-weight: bold;
-    font-size: 32rpx;
-    color: #333333;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-weight: bold;
+  font-size: 32rpx;
+  color: #333333;
 }
 
 .mine_order_title_all {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 20rpx;
-    color: #bbbbbb;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 20rpx;
+  color: #bbbbbb;
 }
 
 .mine_order_list {
-    display: flex;
-    justify-content: space-between;
-    margin: 40rpx 0 10rpx 0;
+  display: flex;
+  justify-content: space-between;
+  margin: 40rpx 0 10rpx 0;
 }
 
 .order_list_item {
-    width: 25%;
-    text-align: center;
-    position: relative;
+  width: 25%;
+  text-align: center;
+  position: relative;
 }
 
 .apply_list {
-    display: flex;
-    justify-content: space-between;
+  display: flex;
+  justify-content: space-between;
 }
 
 .apply_item {
-    width: 20%;
-    text-align: center;
+  width: 20%;
+  text-align: center;
 }
 
 .enter_list {
-    display: flex;
-    justify-content: space-between;
+  display: flex;
+  justify-content: space-between;
 }
 
 .enter_item {
-    width: 40%;
-    background: #ffffff;
-    border-radius: 30rpx;
-    display: flex;
-    justify-content: space-between;
-    padding: 12rpx 30rpx;
-    align-items: center;
+  width: 40%;
+  background: #ffffff;
+  border-radius: 30rpx;
+  display: flex;
+  justify-content: space-between;
+  padding: 12rpx 30rpx;
+  align-items: center;
 }
 
 .enter_title {
-    font-weight: bold;
-    font-size: 26rpx;
-    color: #333333;
+  font-weight: bold;
+  font-size: 26rpx;
+  color: #333333;
 }
 
 .enter_apply {
-    font-weight: 400;
-    font-size: 24rpx;
-    color: #666666;
-    display: flex;
-    align-items: center;
-    margin-top: 10rpx;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #666666;
+  display: flex;
+  align-items: center;
+  margin-top: 10rpx;
 }
 
 .enter_apply_title {
-    margin-right: 10rpx;
+  margin-right: 10rpx;
 }
 
 .mine_tool_title {
-    font-weight: bold;
-    font-size: 30rpx;
-    color: #333333;
+  font-weight: bold;
+  font-size: 30rpx;
+  color: #333333;
 }
 
 .tool_list {
-    display: flex;
-    flex-wrap: wrap;
-    margin-top: 10rpx;
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 10rpx;
 }
 
 .tool_item {
-    width: 25%;
-    text-align: center;
-    margin-top: 20rpx;
+  width: 25%;
+  text-align: center;
+  margin-top: 20rpx;
 }
 
 ::v-deep .u-modal__content {
-    padding: 40rpx !important;
+  padding: 40rpx !important;
 }
 </style>
diff --git a/pages/mine_package/mine_address/mine_address.vue b/pages/mine_package/mine_address/mine_address.vue
index 874a525..49ffce2 100644
--- a/pages/mine_package/mine_address/mine_address.vue
+++ b/pages/mine_package/mine_address/mine_address.vue
@@ -8,7 +8,7 @@
 				<view style="margin-left: 20rpx;">{{ item.phone }}</view>
 			</view>
 			<view class="address_item_address">
-				{{ item.countryName }} {{ item.provinceName }} {{ item.cityName }} {{ item.areaName }} {{ item.address }}
+				{{ item.countryName }} {{ item.provinceName }} {{ item.cityName }} {{ item.areaName }} {{ item.address }}{{ item.townshipName }}
 			</view>
 			<view class="address_operate">
 				<up-checkbox :customStyle="{}" label="已默认" name="agree" usedAlone :checked="item.isDefault" shape="circle"
diff --git a/pages/mine_package/mine_address_add/mine_address_add.vue b/pages/mine_package/mine_address_add/mine_address_add.vue
index 06ad036..17bb43a 100644
--- a/pages/mine_package/mine_address_add/mine_address_add.vue
+++ b/pages/mine_package/mine_address_add/mine_address_add.vue
@@ -121,6 +121,9 @@ export default {
 				if (data.areaName) {
 					regionStr.push(data.areaName);
 				}
+				if (data.townshipName) {
+					regionStr.push(data.townshipName);
+				}
 
 				this.form.regionStr = regionStr;// 所属地区
 			}
diff --git a/pages/shopping_cart/shopping_cart.vue b/pages/shopping_cart/shopping_cart.vue
index 2cdd18d..a97a7a2 100644
--- a/pages/shopping_cart/shopping_cart.vue
+++ b/pages/shopping_cart/shopping_cart.vue
@@ -1,546 +1,663 @@
 <template>
-	<view>
-		<view :style="{ 'height': isDataNull ? 'calc(100vh - 134rpx)' : 'calc(100vh - 410rpx)' }"
-			class="shopping_cart_warp">
-			<view class="shopping_cart_header">
-				<view class="cart">购物车({{ shoppingTotal }})</view>
-				<view class="enit_but" @click="isEdit = true" v-if="!isEdit" v-show="!isDataNull">编辑</view>
-				<view class="enit_but" @click="isEdit = false" v-else v-show="isDataNull">取消</view>
-			</view>
-			<!-- 购物车列表 -->
-			<up-loading-page :loading="listLoading"></up-loading-page>
-			<view class="shopping_cart_content">
-				<view v-if="!isDataNull" class="shopping_cart_content_item" v-for="(item, index) in shoppingList"
-					:key="item.id">
-					<!-- 店铺头部 -->
-					<up-checkbox :customStyle="{ marginBottom: '8px' }" name="isCheck" usedAlone v-model:checked="item.isCheck"
-						shape="circle" activeColor="#7934F6" size="19" iconSize="18"
-						@change="(event) => shoppingChange(event, index)">
-						<template #label>
-							<view class="content_item_header">
-								<up-image :src="item.shopLogo ? item.shopLogo : '/static/shopping/store.png'" width="22" height="22"
-									bgColor="#f1f6ff00" shape="circle"></up-image>
-								<view class="order_product_title">{{ item.shopName }}{{ item.id }}</view>
-							</view>
-						</template>
-					</up-checkbox>
+  <view>
+    <view
+      :calss="[
+        isDataNull ? 'isDataNull-calss' : 'isDataNull-active',
+        platformType ? '' : 'iosplatformType',
+      ]"
+      class="shopping_cart_warp"
+    >
+      <view class="shopping_cart_header">
+        <view class="cart">购物车({{ shoppingTotal }})</view>
+        <view
+          class="enit_but"
+          @click="isEdit = true"
+          v-if="!isEdit"
+          v-show="!isDataNull"
+          >编辑</view
+        >
+        <view
+          class="enit_but"
+          @click="isEdit = false"
+          v-else
+          v-show="isDataNull"
+          >取消</view
+        >
+      </view>
+      <!-- 购物车列表 -->
+      <up-loading-page :loading="listLoading"></up-loading-page>
+      <view class="shopping_cart_content">
+        <view
+          v-if="!isDataNull"
+          class="shopping_cart_content_item"
+          v-for="(item, index) in shoppingList"
+          :key="item.id"
+        >
+          <!-- 店铺头部 -->
+          <up-checkbox
+            :customStyle="{ marginBottom: '8px' }"
+            name="isCheck"
+            usedAlone
+            v-model:checked="item.isCheck"
+            shape="circle"
+            activeColor="#7934F6"
+            size="19"
+            iconSize="18"
+            @change="(event) => shoppingChange(event, index)"
+          >
+            <template #label>
+              <view class="content_item_header">
+                <up-image
+                  :src="
+                    item.shopLogo ? item.shopLogo : '/static/shopping/store.png'
+                  "
+                  width="22"
+                  height="22"
+                  bgColor="#f1f6ff00"
+                  shape="circle"
+                ></up-image>
+                <view class="order_product_title"
+                  >{{ item.shopName }}{{ item.id }}</view
+                >
+              </view>
+            </template>
+          </up-checkbox>
 
-					<view>
-						<view class="content_item_info" v-for="(pItem, pIndex) in item.product" :key="pItem.id">
-							<!-- 单个商品 -->
-							<up-checkbox :customStyle="{ marginBottom: '8px' }" name="isCheck" usedAlone
-								v-model:checked="pItem.isCheck" shape="circle" activeColor="#7934F6" size="19" iconSize="18"
-								:disabled="!isEdit && [1, 2].includes(pItem.goodsStatus)"
-								@change="(event) => productChange(event, index, pIndex)">
-							</up-checkbox>
-							<view class="info_item">
-								<up-image :src="pItem.mainGraph" width="100" height="100" bgColor="#f1f6ff00"
-									@click="jumpInfo(pItem)"></up-image>
-								<view class="content_info">
-									<view class="shopping_content_info_title" @click="jumpInfo(pItem)">{{ pItem.name }}</view>
-									<view class="content_info_description">
-										{{ pItem.goodsSpece }}
-									</view>
-									<view class="shopping_info_amount">
-										<view>
-											<view style="color: #7934F6;">
-												<text style="font-size: 22rpx;">￥</text>
-												<text style="font-size: 32rpx;">{{ pItem.unitPrice }}</text>
-											</view>
-											<view class="shopping_info_amount_original">￥{{ pItem.unitPrice }}</view>
-										</view>
-										<view>
-											<view class="shopping_info_quantity">
-												<view class="quantity_but" @click="quantityFun('minus', index, pIndex, pItem.id)">-</view>
-												<view class="quantity_value">{{ pItem.buyNum }}</view>
-												<view class="quantity_but" @click="quantityFun('add', index, pIndex, pItem.id)">+</view>
-											</view>
-											<view v-if="[1].includes(pItem.goodsStatus)" class="insufficient_stock">库存不足</view>
-											<view v-if="[2].includes(pItem.goodsStatus)" class="insufficient_stock">商品已下架</view>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view v-else class="not_order_warp">
-					<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/not_shopping.png" width="80" height="80"
-						bgColor="#f1f6ff00"></up-image>
-					<view class="not_order_msg_warp">购物车是空的</view>
-				</view>
-				<choiceness />
-			</view>
-			<!-- 操作按钮 -->
-			<view v-if="!isDataNull">
-				<view class="shopping_cart_but">
-					<!-- 全选 -->
-					<view class="shopping_cart_but_total">
-						<up-checkbox name="isAll" usedAlone v-model:checked="isAll" shape="circle" activeColor="#7934F6" size="19"
-							iconSize="18" @change="isAllChange">
-							<template #label>
-								<text style="font-size: 26rpx;color: #444444;">全选</text>
-							</template>
-						</up-checkbox>
-						<text style="margin-left: 20rpx;font-size: 24rpx;color: #444444;" v-if="!isEdit">合计：</text>
-						<text style="font-size: 24rpx;" v-if="!isEdit">￥</text>
-						<text style="font-size: 32rpx;" v-if="!isEdit">{{ total }}</text>
-					</view>
-					<view v-if="isEdit" class="delete_but_css" @click="deleteShopping">
-						删除({{ count }})
-					</view>
-					<view v-else class="add_but_css" @click="settleShopping">
-						结算({{ count }})
-					</view>
-				</view>
-			</view>
+          <view>
+            <view
+              class="content_item_info"
+              v-for="(pItem, pIndex) in item.product"
+              :key="pItem.id"
+            >
+              <!-- 单个商品 -->
+              <up-checkbox
+                :customStyle="{ marginBottom: '8px' }"
+                name="isCheck"
+                usedAlone
+                v-model:checked="pItem.isCheck"
+                shape="circle"
+                activeColor="#7934F6"
+                size="19"
+                iconSize="18"
+                :disabled="!isEdit && [1, 2].includes(pItem.goodsStatus)"
+                @change="(event) => productChange(event, index, pIndex)"
+              >
+              </up-checkbox>
+              <view class="info_item">
+                <up-image
+                  :src="pItem.mainGraph"
+                  width="100"
+                  height="100"
+                  bgColor="#f1f6ff00"
+                  @click="jumpInfo(pItem)"
+                ></up-image>
+                <view class="content_info">
+                  <view
+                    class="shopping_content_info_title"
+                    @click="jumpInfo(pItem)"
+                    >{{ pItem.name }}</view
+                  >
+                  <view class="content_info_description">
+                    {{ pItem.goodsSpece }}
+                  </view>
+                  <view class="shopping_info_amount">
+                    <view>
+                      <view style="color: #7934f6">
+                        <text style="font-size: 22rpx">￥</text>
+                        <text style="font-size: 32rpx">{{
+                          pItem.unitPrice
+                        }}</text>
+                      </view>
+                      <view class="shopping_info_amount_original"
+                        >￥{{ pItem.unitPrice }}</view
+                      >
+                    </view>
+                    <view>
+                      <view class="shopping_info_quantity">
+                        <view
+                          class="quantity_but"
+                          @click="quantityFun('minus', index, pIndex, pItem.id)"
+                          >-</view
+                        >
+                        <view class="quantity_value">{{ pItem.buyNum }}</view>
+                        <view
+                          class="quantity_but"
+                          @click="quantityFun('add', index, pIndex, pItem.id)"
+                          >+</view
+                        >
+                      </view>
+                      <view
+                        v-if="[1].includes(pItem.goodsStatus)"
+                        class="insufficient_stock"
+                        >库存不足</view
+                      >
+                      <view
+                        v-if="[2].includes(pItem.goodsStatus)"
+                        class="insufficient_stock"
+                        >商品已下架</view
+                      >
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view v-else class="not_order_warp">
+          <up-image
+            src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/not_shopping.png"
+            width="80"
+            height="80"
+            bgColor="#f1f6ff00"
+          ></up-image>
+          <view class="not_order_msg_warp">购物车是空的</view>
+        </view>
+        <choiceness />
+      </view>
+      <!-- 操作按钮 -->
+      <view v-if="!isDataNull">
+        <view class="shopping_cart_but">
+          <!-- 全选 -->
+          <view class="shopping_cart_but_total">
+            <up-checkbox
+              name="isAll"
+              usedAlone
+              v-model:checked="isAll"
+              shape="circle"
+              activeColor="#7934F6"
+              size="19"
+              iconSize="18"
+              @change="isAllChange"
+            >
+              <template #label>
+                <text style="font-size: 26rpx; color: #444444">全选</text>
+              </template>
+            </up-checkbox>
+            <text
+              style="margin-left: 20rpx; font-size: 24rpx; color: #444444"
+              v-if="!isEdit"
+              >合计：</text
+            >
+            <text style="font-size: 24rpx" v-if="!isEdit">￥</text>
+            <text style="font-size: 32rpx" v-if="!isEdit">{{ total }}</text>
+          </view>
+          <view v-if="isEdit" class="delete_but_css" @click="deleteShopping">
+            删除({{ count }})
+          </view>
+          <view v-else class="add_but_css" @click="settleShopping">
+            结算({{ count }})
+          </view>
+        </view>
+      </view>
 
-			<up-toast ref="uToastRef"></up-toast>
-		</view>
+      <up-toast ref="uToastRef"></up-toast>
+    </view>
 
-		<!-- #ifndef H5 -->
-		<CustomTabBar :tabIndex="3" />
-		<!-- #endif -->
-
-	</view>
+    <!-- #ifndef H5 -->
+    <CustomTabBar :tabIndex="3" />
+    <!-- #endif -->
+  </view>
 </template>
 
 <script>
-
-import choiceness from '@/components/choiceness/choiceness.vue';
-import { getCartList, updateGoodsNum, removeGoods } from '@/api/cart.js';
-import CustomTabBar from '@/components/custom-tab-bar.vue';
+import choiceness from "@/components/choiceness/choiceness.vue";
+import { getCartList, updateGoodsNum, removeGoods } from "@/api/cart.js";
+import CustomTabBar from "@/components/custom-tab-bar.vue";
 
 export default {
-	components: { choiceness, CustomTabBar },
-	data() {
-		return {
-			shoppingTotal: 0,// 总条数
-			setShoppingList: [],
-			isDataNull: false,// 数据是否为空
-			shoppingList: [],// 购物车列表
-			isEdit: false,// 是否编辑
-			isAll: false,// 是否全选
-			total: 0,// 总合计的金额
-			count: 0,// 总条数
-			listLoading: false,
-		}
-	},
-	onShow() {
-		/*#ifdef APP-PLUS*/
-		uni.hideTabBar({
-			animation: false
-		})
-		/*#endif*/
-		this.getCartList();
-	},
-	onLoad() {
+  components: { choiceness, CustomTabBar },
+  data() {
+    return {
+      shoppingTotal: 0, // 总条数
+      setShoppingList: [],
+      isDataNull: false, // 数据是否为空
+      shoppingList: [], // 购物车列表
+      isEdit: false, // 是否编辑
+      isAll: false, // 是否全选
+      total: 0, // 总合计的金额
+      count: 0, // 总条数
+      listLoading: false,
+      platformType: true,
+    };
+  },
+  onShow() {
+    /*#ifdef APP-PLUS*/
+    uni.hideTabBar({
+      animation: false,
+    });
 
-	},
-	methods: {
-		/**
-		 * 查询购物车列表
-		 */
-		async getCartList() {
-			this.listLoading = true;
-			let result = [];
-			const resp = await getCartList();
-			if (resp && resp.bizcode === 100) {
-				const data = resp.data || []
-				if (data && data.length !== 0) {
-					// 处理了后的数据
-					result = this.transformedArray(data);
-				}
-				this.shoppingTotal = data.length;
-			}
-			this.shoppingList = result;
-			this.listLoading = false;
-			this.total = 0;// 总合计的金额
-			this.count = 0;// 总条数
-			this.isDataNull = result.length === 0 ? true : false;
-		},
-		// 处理购物车的数据
-		transformedArray(originalArray) {
-			const newOriginalArray = [];
-			if (!originalArray || originalArray.length === 0) {
-				return newOriginalArray;
-			}
-			originalArray.map(curr => {
-				const existingShop = newOriginalArray.find(shop => shop.shopId === curr.shopId && shop.shopName === curr.shopName);
-				if (existingShop) {
-					// 如果商店已存在，则向 productObj 数组中添加新产品对象
-					existingShop.product.push({
-						id: curr.id,
-						goodsId: curr.goodsId, // 商品ID
-						name: curr.name, // 商品名称
-						mainGraph: curr.mainGraph,// 主图
-						buyNum: curr.buyNum,// 数量
-						unitPrice: curr.unitPrice,// 商品单价
-						goodsSpece: curr.goodsSpece,// 规格
-						specsId: curr.specsId,// 规格Id
-						isCheck: false,// 用作于全选
-						goodsStatus: curr.goodsStatus,//商品状态:0-可下单，1-库存不够，2-商品已下架
-					});
-				} else {
-					// 如果商店不存在，则创建一个新商店对象，并初始化 productObj 数组
-					newOriginalArray.push({
-						isCheck: false,// 用作于全选
-						shopId: curr.shopId,
-						shopName: curr.shopName,
-						name: curr.name,
-						shopLogo: curr.shopLogo,
-						product: [{
-							id: curr.id,
-							goodsId: curr.goodsId, // 商品ID
-							name: curr.name, // 商品名称
-							mainGraph: curr.mainGraph,// 主图
-							buyNum: curr.buyNum,// 数量
-							unitPrice: curr.unitPrice,// 商品单价
-							goodsSpece: curr.goodsSpece,// 规格
-							specsId: curr.specsId,// 规格Id
-							isCheck: false,// 用作于全选
-							goodsStatus: curr.goodsStatus,//商品状态:0-可下单，1-库存不够，2-商品已下架
-						}]
-					});
-				}
-			})
-			return newOriginalArray;
-		},
-		/**
-		 * 数量进行增加删除
-		 * @param {Object} type 区分是 + 还是 -
-		 * @param {Object} pItem 父节点数据，用作与从新修改数据
-		 * @param {Object} cItem 需要修改的数据节点
-		 */
-		async quantityFun(type, index, pIndex, id) {
-			// 选中的当前商品
-			const currentData = this.shoppingList[index].product[pIndex];
-			let currentQuantity = this.shoppingList[index].product[pIndex].buyNum;// 当前数量
-			let total = Number(this.total);
-			let count = Number(this.count);
+    const appUpdate = uni.getStorageSync("platform");
+    this.platformType = appUpdate == "android" ? "ANDROID" : "IOS";
+    /*#endif*/
+    this.getCartList();
+  },
+  onLoad() {},
+  methods: {
+    /**
+     * 查询购物车列表
+     */
+    async getCartList() {
+      this.listLoading = true;
+      let result = [];
+      const resp = await getCartList();
+      if (resp && resp.bizcode === 100) {
+        const data = resp.data || [];
+        if (data && data.length !== 0) {
+          // 处理了后的数据
+          result = this.transformedArray(data);
+        }
+        this.shoppingTotal = data.length;
+      }
+      this.shoppingList = result;
+      this.listLoading = false;
+      this.total = 0; // 总合计的金额
+      this.count = 0; // 总条数
+      this.isDataNull = result.length === 0 ? true : false;
+    },
+    // 处理购物车的数据
+    transformedArray(originalArray) {
+      const newOriginalArray = [];
+      if (!originalArray || originalArray.length === 0) {
+        return newOriginalArray;
+      }
+      originalArray.map((curr) => {
+        const existingShop = newOriginalArray.find(
+          (shop) =>
+            shop.shopId === curr.shopId && shop.shopName === curr.shopName
+        );
+        if (existingShop) {
+          // 如果商店已存在，则向 productObj 数组中添加新产品对象
+          existingShop.product.push({
+            id: curr.id,
+            goodsId: curr.goodsId, // 商品ID
+            name: curr.name, // 商品名称
+            mainGraph: curr.mainGraph, // 主图
+            buyNum: curr.buyNum, // 数量
+            unitPrice: curr.unitPrice, // 商品单价
+            goodsSpece: curr.goodsSpece, // 规格
+            specsId: curr.specsId, // 规格Id
+            isCheck: false, // 用作于全选
+            goodsStatus: curr.goodsStatus, //商品状态:0-可下单，1-库存不够，2-商品已下架
+          });
+        } else {
+          // 如果商店不存在，则创建一个新商店对象，并初始化 productObj 数组
+          newOriginalArray.push({
+            isCheck: false, // 用作于全选
+            shopId: curr.shopId,
+            shopName: curr.shopName,
+            name: curr.name,
+            shopLogo: curr.shopLogo,
+            product: [
+              {
+                id: curr.id,
+                goodsId: curr.goodsId, // 商品ID
+                name: curr.name, // 商品名称
+                mainGraph: curr.mainGraph, // 主图
+                buyNum: curr.buyNum, // 数量
+                unitPrice: curr.unitPrice, // 商品单价
+                goodsSpece: curr.goodsSpece, // 规格
+                specsId: curr.specsId, // 规格Id
+                isCheck: false, // 用作于全选
+                goodsStatus: curr.goodsStatus, //商品状态:0-可下单，1-库存不够，2-商品已下架
+              },
+            ],
+          });
+        }
+      });
+      return newOriginalArray;
+    },
+    /**
+     * 数量进行增加删除
+     * @param {Object} type 区分是 + 还是 -
+     * @param {Object} pItem 父节点数据，用作与从新修改数据
+     * @param {Object} cItem 需要修改的数据节点
+     */
+    async quantityFun(type, index, pIndex, id) {
+      // 选中的当前商品
+      const currentData = this.shoppingList[index].product[pIndex];
+      let currentQuantity = this.shoppingList[index].product[pIndex].buyNum; // 当前数量
+      let total = Number(this.total);
+      let count = Number(this.count);
 
-			const data = this.shoppingList[index].product[pIndex];
+      const data = this.shoppingList[index].product[pIndex];
 
-			if (type === "minus") {
-				if (currentQuantity === 1) {
-					this.$refs.uToastRef.show({
-						type: 'warring',
-						message: "宝贝数量不能在减少啦~",
-					});
-					return;
-				} else {
-					currentQuantity = currentQuantity - 1;
-					total = total - data.unitPrice;
-					count = count - 1;
-				}
-			} else if (type === "add") {
-				// 需要判断一下库存
-				currentQuantity = currentQuantity + 1;
-				total = total + data.unitPrice;
-				count = count + 1;
-			}
-			const params = {
-				id,
-				goodsNum: currentQuantity,
-			}
-			const result = await updateGoodsNum(params);
-			if (result && result.bizcode === 100) {
-				this.shoppingList[index].product[pIndex].buyNum = currentQuantity;
-				if (currentData.isCheck) {
-					this.total = total.toFixed(2);
-					this.count = count;
-				}
-			}
-		},
-		/**
-		 * 结算订单
-		 */
-		settleShopping() {
-			const deleteId = this.getCheckList();
-			if (!deleteId || deleteId.length === 0) {
-				this.$refs.uToastRef.show({
-					type: 'warring',
-					message: "请先选择需要结算的商品",
-				});
-				return;
-			}
-			uni.navigateTo({
-				url: "/pages/order_package/order_submit/order_submit?ids=" + deleteId.join(","),
-			})
-			this.isAll = false;
-		},
-		/**
-		 * 删除选中的
-		 */
-		deleteShopping() {
-			const then = this;
-			uni.showModal({
-				title: '提示',
-				content: '您确定要删除选中的(' + this.getCheckList().length + '件)商品吗？',
-				success: function (res) {
-					if (res.confirm) {
-						then.deleteShoppingFun();
-					}
-				}
-			});
-		},
-		// 删除选中的
-		async deleteShoppingFun() {
-			const deleteId = this.getCheckList();
-			if (!deleteId || deleteId.length === 0) {
-				this.$refs.uToastRef.show({
-					type: 'warring',
-					message: "请先选择需要删除的商品",
-				});
-				return;
-			}
-			const params = {
-				ids: deleteId.join(","),
-			}
-			const result = await removeGoods(params);
-			if (result && result.bizcode === 100) {
-				this.isEdit = false;
-				this.$refs.uToastRef.show({
-					type: 'success',
-					message: "删除成功",
-				});
-				this.getCartList();
-			} else {
-				this.$refs.uToastRef.show({
-					type: 'error',
-					message: "删除失败",
-				});
-			}
+      if (type === "minus") {
+        if (currentQuantity === 1) {
+          this.$refs.uToastRef.show({
+            type: "warring",
+            message: "宝贝数量不能在减少啦~",
+          });
+          return;
+        } else {
+          currentQuantity = currentQuantity - 1;
+          total = total - data.unitPrice;
+          count = count - 1;
+        }
+      } else if (type === "add") {
+        // 需要判断一下库存
+        currentQuantity = currentQuantity + 1;
+        total = total + data.unitPrice;
+        count = count + 1;
+      }
+      const params = {
+        id,
+        goodsNum: currentQuantity,
+      };
+      const result = await updateGoodsNum(params);
+      if (result && result.bizcode === 100) {
+        this.shoppingList[index].product[pIndex].buyNum = currentQuantity;
+        if (currentData.isCheck) {
+          this.total = total.toFixed(2);
+          this.count = count;
+        }
+      }
+    },
+    /**
+     * 结算订单
+     */
+    settleShopping() {
+      const deleteId = this.getCheckList();
+      if (!deleteId || deleteId.length === 0) {
+        this.$refs.uToastRef.show({
+          type: "warring",
+          message: "请先选择需要结算的商品",
+        });
+        return;
+      }
+      uni.navigateTo({
+        url:
+          "/pages/order_package/order_submit/order_submit?ids=" +
+          deleteId.join(","),
+      });
+      this.isAll = false;
+    },
+    /**
+     * 删除选中的
+     */
+    deleteShopping() {
+      const then = this;
+      uni.showModal({
+        title: "提示",
+        content:
+          "您确定要删除选中的(" + this.getCheckList().length + "件)商品吗？",
+        success: function (res) {
+          if (res.confirm) {
+            then.deleteShoppingFun();
+          }
+        },
+      });
+    },
+    // 删除选中的
+    async deleteShoppingFun() {
+      const deleteId = this.getCheckList();
+      if (!deleteId || deleteId.length === 0) {
+        this.$refs.uToastRef.show({
+          type: "warring",
+          message: "请先选择需要删除的商品",
+        });
+        return;
+      }
+      const params = {
+        ids: deleteId.join(","),
+      };
+      const result = await removeGoods(params);
+      if (result && result.bizcode === 100) {
+        this.isEdit = false;
+        this.$refs.uToastRef.show({
+          type: "success",
+          message: "删除成功",
+        });
+        this.getCartList();
+      } else {
+        this.$refs.uToastRef.show({
+          type: "error",
+          message: "删除失败",
+        });
+      }
+    },
+    // 获取选中的数据
+    getCheckList() {
+      const shoppingList = this.shoppingList;
+      const deleteId = [];
+      shoppingList.map((item) => {
+        if (item.product && item.product.length !== 0) {
+          item.product.map((pItem) => {
+            if (pItem.isCheck) {
+              deleteId.push(pItem.id);
+            }
+          });
+        }
+      });
+      return deleteId;
+    },
 
-		},
-		// 获取选中的数据
-		getCheckList() {
-			const shoppingList = this.shoppingList;
-			const deleteId = [];
-			shoppingList.map(item => {
-				if (item.product && item.product.length !== 0) {
-					item.product.map(pItem => {
-						if (pItem.isCheck) {
-							deleteId.push(pItem.id);
-						}
-					})
-				}
-			})
-			return deleteId;
-		},
+    // 全部选中 or 全部取消选中
+    isAllChange(isAll) {
+      const currentShoppingList = this.shoppingList;
+      currentShoppingList.map((item, index) => {
+        if (isAll) {
+          item.isCheck = true;
+        } else {
+          item.isCheck = false;
+        }
+        if (item.product && item.product.length !== 0) {
+          if (isAll) {
+            item.product.forEach((o) => (o.isCheck = true));
+          } else {
+            item.product.forEach((o) => (o.isCheck = false));
+          }
+        }
+      });
+      this.shoppingList = currentShoppingList;
+      if (isAll) {
+        this.checkIsAll();
+      } else {
+        this.total = 0;
+        this.count = 0;
+      }
+    },
 
-		// 全部选中 or 全部取消选中
-		isAllChange(isAll) {
-			const currentShoppingList = this.shoppingList;
-			currentShoppingList.map((item, index) => {
-				if (isAll) {
-					item.isCheck = true;
-				} else {
-					item.isCheck = false;
-				}
-				if (item.product && item.product.length !== 0) {
-					if (isAll) {
-						item.product.forEach(o => o.isCheck = true);
-					} else {
-						item.product.forEach(o => o.isCheck = false);
-					}
-				}
-			})
-			this.shoppingList = currentShoppingList;
-			if (isAll) {
-				this.checkIsAll();
-			} else {
-				this.total = 0;
-				this.count = 0;
-			}
-		},
+    /**
+     * 商品详情
+     * @param {Object} item
+     */
+    jumpInfo(item) {
+      uni.navigateTo({
+        url: "/pages/other_package/productInfo/productInfo?id=" + item.goodsId,
+      });
+    },
 
-		/**
-		 * 商品详情
-		 * @param {Object} item
-		 */
-		jumpInfo(item) {
-			uni.navigateTo({
-				url: '/pages/other_package/productInfo/productInfo?id=' + item.goodsId,
-			})
-		},
-
-		// 单个产品的单选按钮选中与取消选中
-		productChange(val, index, pIndex) {
-			setTimeout(() => {
-				// 检查全选按钮
-				this.checkIsAll();
-			}, 300);
-		},
-		// 单个店铺的单选按钮选中与取消选中
-		shoppingChange(isAll, index) {
-			const data = this.shoppingList[index];
-			if (isAll) {
-				data.product.forEach(o => o.isCheck = true);
-			} else {
-				data.product.forEach(o => o.isCheck = false);
-			}
-			this.shoppingList[index] = data;
-			setTimeout(() => {
-				// 检查全选按钮
-				this.checkIsAll();
-			}, 300);
-		},
-		/**
-		 * 检查是否全选
-		 */
-		checkIsAll() {
-
-			let total = 0;
-			let count = 0;
-			const shoppingList = this.shoppingList;
-			if (shoppingList && shoppingList.length !== 0) {
-				let sumFlag = false;
-				shoppingList.map(item => {
-					let flag = true;
-					item.product.map(oItem => {
-						if (oItem.isCheck) {
-							total = total + oItem.buyNum * oItem.unitPrice;
-							count = count + oItem.buyNum;
-						} else {
-							flag = false;
-						}
-					})
-					if (flag) {
-						item.isCheck = true;
-						sumFlag = true;
-					} else {
-						item.isCheck = false;
-					}
-				})
-				this.shoppingList = shoppingList;
-				this.isAll = sumFlag;
-				// 删除不需要显示价格
-				if (!this.isEdit) {
-					this.total = total.toFixed(2);
-				}
-				this.count = count;
-			}
-		},
-
-
-	}
-}
+    // 单个产品的单选按钮选中与取消选中
+    productChange(val, index, pIndex) {
+      setTimeout(() => {
+        // 检查全选按钮
+        this.checkIsAll();
+      }, 300);
+    },
+    // 单个店铺的单选按钮选中与取消选中
+    shoppingChange(isAll, index) {
+      const data = this.shoppingList[index];
+      if (isAll) {
+        data.product.forEach((o) => (o.isCheck = true));
+      } else {
+        data.product.forEach((o) => (o.isCheck = false));
+      }
+      this.shoppingList[index] = data;
+      setTimeout(() => {
+        // 检查全选按钮
+        this.checkIsAll();
+      }, 300);
+    },
+    /**
+     * 检查是否全选
+     */
+    checkIsAll() {
+      let total = 0;
+      let count = 0;
+      const shoppingList = this.shoppingList;
+      if (shoppingList && shoppingList.length !== 0) {
+        let sumFlag = false;
+        shoppingList.map((item) => {
+          let flag = true;
+          item.product.map((oItem) => {
+            if (oItem.isCheck) {
+              total = total + oItem.buyNum * oItem.unitPrice;
+              count = count + oItem.buyNum;
+            } else {
+              flag = false;
+            }
+          });
+          if (flag) {
+            item.isCheck = true;
+            sumFlag = true;
+          } else {
+            item.isCheck = false;
+          }
+        });
+        this.shoppingList = shoppingList;
+        this.isAll = sumFlag;
+        // 删除不需要显示价格
+        if (!this.isEdit) {
+          this.total = total.toFixed(2);
+        }
+        this.count = count;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
 .shopping_cart_warp {
-	// height: calc(100vh - 256rpx);
-	background-color: $app-bj;
-	padding: 104rpx 30rpx 30rpx;
-	overflow: hidden;
+  background-color: $app-bj;
+  padding: 104rpx 30rpx 30rpx;
+  overflow: hidden;
+  &.isDataNull-calss {
+    height: calc(100vh - 100rpx - env(safe-area-inset-bottom));
+  }
+  &.isDataNull-active {
+    height: calc(100vh - 100rpx - env(safe-area-inset-bottom) - 100rpx);
+  }
+  &.iosplatformType {
+    height: calc(100vh - 100rpx - 50rpx) !important;
+
+    .shopping_cart_content {
+      height: calc(100vh - 104rpx - 30rpx - 30rpx - 100rpx - 10rpx) !important;
+    }
+
+	.shopping_cart_but{
+		bottom: 90rpx !important;
+	}
+  }
 }
 
 .shopping_cart_header {
-	display: flex;
-	justify-content: space-between;
-	color: #222222;
+  display: flex;
+  justify-content: space-between;
+  color: #222222;
 
-	.cart {
-		font-weight: bold;
-		font-size: 38rpx;
-	}
+  .cart {
+    font-weight: bold;
+    font-size: 38rpx;
+  }
 
-	.enit_but {
-		font-weight: 500;
-		font-size: 28rpx;
-	}
+  .enit_but {
+    font-weight: 500;
+    font-size: 28rpx;
+  }
 }
 
 .shopping_cart_content {
-	margin-top: 30rpx;
-	height: calc(100vh - 456rpx);
-	overflow-y: auto;
+  margin-top: 30rpx;
+  height: calc(
+    100vh - 104rpx - 30rpx - 30rpx - 100rpx - env(safe-area-inset-bottom) -
+      10rpx
+  );
+  overflow-y: auto;
 
-	.shopping_cart_content_item {
-		background-color: #FFFFFF;
-		border-radius: 30rpx;
-		padding: 30rpx;
-		margin-bottom: 20rpx;
+  .shopping_cart_content_item {
+    background-color: #ffffff;
+    border-radius: 30rpx;
+    padding: 30rpx;
+    margin-bottom: 20rpx;
 
-		.content_item_header {
-			display: flex;
-		}
+    .content_item_header {
+      display: flex;
+    }
 
-		.order_product_title {
-			margin-left: 10rpx;
-		}
+    .order_product_title {
+      margin-left: 10rpx;
+    }
 
-		.info_item {
-			display: flex;
-			margin-top: 10rpx;
-			width: calc(100% - 40rpx);
-		}
+    .info_item {
+      display: flex;
+      margin-top: 10rpx;
+      width: calc(100% - 40rpx);
+    }
 
-		.content_info {
-			margin-left: 10rpx;
-			width: calc(100% - 100rpx);
-		}
+    .content_info {
+      margin-left: 10rpx;
+      width: calc(100% - 100rpx);
+    }
 
-		.shopping_content_info_title {
-			font-weight: bold;
-			font-size: 28rpx;
-			color: #272727;
-		}
+    .shopping_content_info_title {
+      font-weight: bold;
+      font-size: 28rpx;
+      color: #272727;
+    }
 
-		.shopping_info_amount {
-			display: flex;
-			justify-content: space-between;
-			margin-top: 20rpx;
-		}
+    .shopping_info_amount {
+      display: flex;
+      justify-content: space-between;
+      margin-top: 20rpx;
+    }
 
-		.shopping_info_amount_original {
-			font-size: 24rpx;
-			color: #999999;
-			text-decoration-line: line-through;
-		}
+    .shopping_info_amount_original {
+      font-size: 24rpx;
+      color: #999999;
+      text-decoration-line: line-through;
+    }
 
-		.insufficient_stock {
-			text-align: center;
-			color: #9E9E9E;
-			font-size: 22rpx;
-			margin-top: 4rpx;
-		}
-	}
+    .insufficient_stock {
+      text-align: center;
+      color: #9e9e9e;
+      font-size: 22rpx;
+      margin-top: 4rpx;
+    }
+  }
 
-
-	.content_item_info {
-		display: flex;
-	}
+  .content_item_info {
+    display: flex;
+  }
 }
 
 .shopping_cart_but {
-	position: fixed;
-	bottom: 140rpx;
-	left: 0;
-	width: calc(100% - 40rpx);
-	background: #FFFFFF;
-	box-shadow: 0rpx -1rpx 0rpx 0rpx #EEEEEE;
-	height: 84rpx;
-	display: flex;
-	justify-content: space-between;
-	padding: 20rpx;
-	align-items: center;
+  position: fixed;
+  bottom: calc(90rpx + env(safe-area-inset-bottom));
+  left: 0;
+  width: calc(100% - 40rpx);
+  background: #ffffff;
+  box-shadow: 0rpx -1rpx 0rpx 0rpx #eeeeee;
+  height: 84rpx;
+  display: flex;
+  justify-content: space-between;
+  padding: 20rpx 20rpx 15rpx;
+  align-items: center;
 
-	.shopping_cart_but_total {
-		font-weight: bold;
-		color: $app-bt-bj;
-		display: flex;
-		align-items: center;
-	}
+  .shopping_cart_but_total {
+    font-weight: bold;
+    color: $app-bt-bj;
+    display: flex;
+    align-items: center;
+  }
 
-	.add_but_css {
-		height: 38rpx;
-		width: 226rpx;
-	}
+  .add_but_css {
+    height: 38rpx;
+    width: 226rpx;
+  }
 
-	.delete_but_css {
-		width: 226rpx;
-	}
+  .delete_but_css {
+    width: 226rpx;
+  }
 }
 </style>
diff --git a/pages/sort/sort.vue b/pages/sort/sort.vue
index 2bdb2bb..7bd528d 100644
--- a/pages/sort/sort.vue
+++ b/pages/sort/sort.vue
@@ -1,354 +1,416 @@
 <template>
-	<view class="sort_warp">
-		<view class="sort_header">
-			<!-- 分类切换 -->
-			<view class="sort_category_header">
-				<view :class="selCategory === 1 ? 'category_item category_item_sel' : 'category_item'"
-					@click="checkCategory(1)">
-					<view>分类</view>
-					<view v-if="selCategory === 1" class="category_item_sel_but"></view>
-				</view>
-				<!-- <view :class="selCategory === 2 ? 'category_item category_item_sel':'category_item'" @click="checkCategory(2)">
+  <view class="sort_warp" :class="platformType ? '' : 'iosplatformType'">
+    <view class="sort_header">
+      <!-- 分类切换 -->
+      <view class="sort_category_header">
+        <view
+          :class="
+            selCategory === 1
+              ? 'category_item category_item_sel'
+              : 'category_item'
+          "
+          @click="checkCategory(1)"
+        >
+          <view>分类</view>
+          <view v-if="selCategory === 1" class="category_item_sel_but"></view>
+        </view>
+        <!-- <view :class="selCategory === 2 ? 'category_item category_item_sel':'category_item'" @click="checkCategory(2)">
 					<view>品牌</view>
 					<view v-if="selCategory === 2" class="category_item_sel_but"></view>
 				</view> -->
-			</view>
-			<!-- 搜索 -->
-			<view style="width: 200rpx;" @click="jumpSearch">
-				<up-search shape="square" bgColor="#EEEEEEFF" color="#666666FF" :showAction="false"
-					placeholder="搜索"></up-search>
-			</view>
-		</view>
-		<view class="u-menu-wrap">
-			<!-- 左侧类别 -->
-			<scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop">
-				<view v-for="(item, index) in tabbarList" :key="index" class="u-tab-item"
-					:class="[current == index ? 'u-tab-item-active' : '']" :data-current="index"
-					@tap.stop="swichMenu(item, index)">
-					<text class="u-line-1">{{ item.name }}</text>
-				</view>
-			</scroll-view>
-			<!-- 商品类别数据 -->
-			<scroll-view scroll-y class="right-box">
-				<!-- banner图 -->
-				<view style="padding: 0rpx 20rpx;">
-					<up-swiper :list="bannerList" height="80px"></up-swiper>
-				</view>
-				<view class="page-view">
-					<!-- 这里还有一层循环 -->
-					<up-loading-page :loading="tabbarContentLoading"></up-loading-page>
-					<view class="class-item" v-for="(item, index) in tabbarContentList" :key="index">
-						<view class="item-title">
-							<text>{{ item.name }}</text>
-						</view>
-						<view class="item-container" v-if="item.foods && item.foods.length !== 0">
-							<view class="thumb-box" v-for="(item1, index1) in item.foods" :key="index1" @click="jumpInfo(item1)">
-								<image class="item-menu-image" :src="item1.icon ? item1.icon : '/static/common/def_img.jpg'" mode="">
-								</image>
-								<view class="item-menu-name">{{ item1.name }}</view>
-							</view>
-						</view>
-						<view v-else class="not_order_warp">
-							<view class="not_order_warp_img"><up-image
-									src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/not_shopping.png" width="100" height="100"
-									bgColor="#f1f6ff00"></up-image></view>
-							<view class="not_order_msg_warp">暂无分类，快去添加吧~</view>
-						</view>
-					</view>
-				</view>
-			</scroll-view>
-		</view>
-		<!-- #ifndef H5 -->
-		<CustomTabBar :tabIndex="1" />
-		<!-- #endif -->
-
-	</view>
+      </view>
+      <!-- 搜索 -->
+      <view style="width: 200rpx" @click="jumpSearch">
+        <up-search
+          shape="square"
+          bgColor="#EEEEEEFF"
+          color="#666666FF"
+          :showAction="false"
+          placeholder="搜索"
+        ></up-search>
+      </view>
+    </view>
+    <view class="u-menu-wrap">
+      <!-- 左侧类别 -->
+      <scroll-view
+        scroll-y
+        scroll-with-animation
+        class="u-tab-view menu-scroll-view"
+        :scroll-top="scrollTop"
+      >
+        <view
+          v-for="(item, index) in tabbarList"
+          :key="index"
+          class="u-tab-item"
+          :class="[current == index ? 'u-tab-item-active' : '']"
+          :data-current="index"
+          @tap.stop="swichMenu(item, index)"
+        >
+          <text class="u-line-1">{{ item.name }}</text>
+        </view>
+      </scroll-view>
+      <!-- 商品类别数据 -->
+      <scroll-view scroll-y class="right-box">
+        <!-- banner图 -->
+        <view style="padding: 0rpx 20rpx">
+          <up-swiper :list="bannerList" height="80px"></up-swiper>
+        </view>
+        <view class="page-view">
+          <!-- 这里还有一层循环 -->
+          <up-loading-page :loading="tabbarContentLoading"></up-loading-page>
+          <view
+            class="class-item"
+            v-for="(item, index) in tabbarContentList"
+            :key="index"
+          >
+            <view class="item-title">
+              <text>{{ item.name }}</text>
+            </view>
+            <view
+              class="item-container"
+              v-if="item.foods && item.foods.length !== 0"
+            >
+              <view
+                class="thumb-box"
+                v-for="(item1, index1) in item.foods"
+                :key="index1"
+                @click="jumpInfo(item1)"
+              >
+                <image
+                  class="item-menu-image"
+                  :src="item1.icon ? item1.icon : '/static/common/def_img.jpg'"
+                  mode=""
+                >
+                </image>
+                <view class="item-menu-name">{{ item1.name }}</view>
+              </view>
+            </view>
+            <view v-else class="not_order_warp">
+              <view class="not_order_warp_img"
+                ><up-image
+                  src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/not_shopping.png"
+                  width="100"
+                  height="100"
+                  bgColor="#f1f6ff00"
+                ></up-image
+              ></view>
+              <view class="not_order_msg_warp">暂无分类，快去添加吧~</view>
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+    <!-- #ifndef H5 -->
+    <CustomTabBar :tabIndex="1" />
+    <!-- #endif -->
+  </view>
 </template>
 
 <script>
-import { getCascadeCategory, getCarouselImage } from '@/api/common.js';
-import CustomTabBar from '@/components/custom-tab-bar.vue';
-import { APP_PAGE_TYPE } from '@/utils/enumUtils.js'
+import { getCascadeCategory, getCarouselImage } from "@/api/common.js";
+import CustomTabBar from "@/components/custom-tab-bar.vue";
+import { APP_PAGE_TYPE } from "@/utils/enumUtils.js";
 
 export default {
-	components: { CustomTabBar },
-	data() {
-		return {
-			selCategory: 1,
-			scrollTop: 0, //tab标题的滚动条位置
-			current: null, // 预设当前项的值
-			menuHeight: 0, // 左边菜单的高度
-			menuItemHeight: 0, // 左边菜单item的高度
-			bannerList: [],
-			tabbarList: [],// 左侧的主分类
-			tabbarContentList: [],// 右侧内容的分类
-			tabbarContentLoading: false,
-		}
-	},
-	onShow() {
-		/*#ifdef APP-PLUS*/
-		uni.hideTabBar({
-			animation: false
-		})
-		/*#endif*/
-		const then = this;
-		this.getSort(0).then(resp => {
-			if (resp && resp.length !== 0) {
-				this.tabbarList = resp;
-				const sortId = uni.getStorageSync('sortId');
-				// 如果有默认的参数就默认选中参数
-				if (sortId && sortId !== 0) {
-					let fData = {};
-					let currentIndex = 0;
-					resp.map((item, index) => {
-						if (item.id === sortId) {
-							fData = item;
-							currentIndex = index;
-							return;
-						}
-					})
-					this.swichMenu(fData, currentIndex);
-				} else {
-					const fData = resp[0];
-					// 否则就选中第一个
-					this.swichMenu(fData, 0);
-				}
-			}
-		});
-		this.getCarouselImage();
-	},
-	methods: {
-		checkCategory(val) {
-			this.selCategory = val;
-		},
-		// 查询轮播图
-		async getCarouselImage() {
-			const params = {
-				pageUi: APP_PAGE_TYPE.SORT,
-			}
-			const resp = await getCarouselImage(params);
-			if (resp && resp.bizcode === 100) {
-				const data = resp.data || [];
-				this.bannerList = data.length !== 0 ? data.map(obj => obj.carouselImage) : [];
-			}
-		},
-		jumpSearch(item) {
+  components: { CustomTabBar },
+  data() {
+    return {
+      selCategory: 1,
+      scrollTop: 0, //tab标题的滚动条位置
+      current: null, // 预设当前项的值
+      menuHeight: 0, // 左边菜单的高度
+      menuItemHeight: 0, // 左边菜单item的高度
+      bannerList: [],
+      tabbarList: [], // 左侧的主分类
+      tabbarContentList: [], // 右侧内容的分类
+      tabbarContentLoading: false,
+      platformType: true,
+    };
+  },
+  onShow() {
+    /*#ifdef APP-PLUS*/
+    uni.hideTabBar({
+      animation: false,
+    });
+    const appUpdate = uni.getStorageSync("platform");
+    this.platformType = appUpdate == "android" ? "ANDROID" : "IOS";
+    /*#endif*/
+    const then = this;
+    this.getSort(0).then((resp) => {
+      if (resp && resp.length !== 0) {
+        this.tabbarList = resp;
+        const sortId = uni.getStorageSync("sortId");
+        // 如果有默认的参数就默认选中参数
+        if (sortId && sortId !== 0) {
+          let fData = {};
+          let currentIndex = 0;
+          resp.map((item, index) => {
+            if (item.id === sortId) {
+              fData = item;
+              currentIndex = index;
+              return;
+            }
+          });
+          this.swichMenu(fData, currentIndex);
+        } else {
+          const fData = resp[0];
+          // 否则就选中第一个
+          this.swichMenu(fData, 0);
+        }
+      }
+    });
+    this.getCarouselImage();
+  },
+  methods: {
+    checkCategory(val) {
+      this.selCategory = val;
+    },
+    // 查询轮播图
+    async getCarouselImage() {
+      const params = {
+        pageUi: APP_PAGE_TYPE.SORT,
+      };
+      const resp = await getCarouselImage(params);
+      if (resp && resp.bizcode === 100) {
+        const data = resp.data || [];
+        this.bannerList =
+          data.length !== 0 ? data.map((obj) => obj.carouselImage) : [];
+      }
+    },
+    jumpSearch(item) {
+      uni.navigateTo({
+        url: "/pages/rwa_package/dongjian/search",
+      });
+    },
+    jumpInfo(item) {
+      console.log(item, "item");
+      // uni.navigateTo({
+      // 	url: `/pages/other_package/productInfo/productInfo?id=${item.id}`,
+      // })
+      uni.navigateTo({
+        url: `/pages/rwa_package/shop/sort-shop?id=${item.id}&name=${item.name}`,
+      });
+    },
+    // 查询分类
+    async getSort(pId) {
+      const params = {
+        parentId: pId,
+      };
+      const resp = await getCascadeCategory(params);
+      if (resp && resp.bizcode === 100) {
+        return resp.data;
+      }
+      return [];
+    },
+    getImg() {
+      return Math.floor(Math.random() * 35);
+    },
+    // 点击左边的栏目切换
+    async swichMenu(item, index) {
+      if (index == this.current) return;
+      this.tabbarContentLoading = true;
+      const firstData = await this.getSort(item.id);
+      for (let fItem of firstData) {
+        const twoData = await this.getSort(fItem.id);
+        fItem.foods = twoData;
+      }
+      this.tabbarContentList = firstData;
+      this.current = index;
+      // 如果为0，意味着尚未初始化
+      if (this.menuHeight == 0 || this.menuItemHeight == 0) {
+        await this.getElRect("menu-scroll-view", "menuHeight");
+        await this.getElRect("u-tab-item", "menuItemHeight");
+      }
+      // 将菜单菜单活动item垂直居中
+      this.scrollTop =
+        index * this.menuItemHeight +
+        this.menuItemHeight / 2 -
+        this.menuHeight / 2;
+      this.tabbarContentLoading = false;
+    },
 
-			uni.navigateTo({
-				url: '/pages/rwa_package/dongjian/search',
-			})
-
-		},
-		jumpInfo(item) {
-			console.log(item,'item');
-			// uni.navigateTo({
-			// 	url: `/pages/other_package/productInfo/productInfo?id=${item.id}`,
-			// })
-			uni.navigateTo({
-				url:`/pages/rwa_package/shop/sort-shop?id=${item.id}&name=${item.name}`
-			})
-		},
-		// 查询分类
-		async getSort(pId) {
-			const params = {
-				parentId: pId,
-			}
-			const resp = await getCascadeCategory(params);
-			if (resp && resp.bizcode === 100) {
-				return resp.data;
-			}
-			return [];
-		},
-		getImg() {
-			return Math.floor(Math.random() * 35);
-		},
-		// 点击左边的栏目切换
-		async swichMenu(item, index) {
-			if (index == this.current) return;
-			this.tabbarContentLoading = true;
-			const firstData = await this.getSort(item.id);
-			for (let fItem of firstData) {
-				const twoData = await this.getSort(fItem.id);
-				fItem.foods = twoData;
-			}
-			this.tabbarContentList = firstData;
-			this.current = index;
-			// 如果为0，意味着尚未初始化
-			if (this.menuHeight == 0 || this.menuItemHeight == 0) {
-				await this.getElRect('menu-scroll-view', 'menuHeight');
-				await this.getElRect('u-tab-item', 'menuItemHeight');
-			}
-			// 将菜单菜单活动item垂直居中
-			this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2;
-			this.tabbarContentLoading = false;
-		},
-
-		// 获取一个目标元素的高度
-		getElRect(elClass, dataVal) {
-			new Promise((resolve, reject) => {
-				const query = uni.createSelectorQuery().in(this);
-				query.select('.' + elClass).fields({ size: true }, res => {
-					// 如果节点尚未生成，res值为null，循环调用执行
-					if (!res) {
-						setTimeout(() => {
-							this.getElRect(elClass);
-						}, 10);
-						return;
-					}
-					this[dataVal] = res.height;
-				}).exec();
-			})
-		},
-	},
-}
+    // 获取一个目标元素的高度
+    getElRect(elClass, dataVal) {
+      new Promise((resolve, reject) => {
+        const query = uni.createSelectorQuery().in(this);
+        query
+          .select("." + elClass)
+          .fields({ size: true }, (res) => {
+            // 如果节点尚未生成，res值为null，循环调用执行
+            if (!res) {
+              setTimeout(() => {
+                this.getElRect(elClass);
+              }, 10);
+              return;
+            }
+            this[dataVal] = res.height;
+          })
+          .exec();
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
 .sort_warp {
-	padding: 130rpx 0rpx 0rpx;
-	height: calc(100vh - 270rpx); // 130 上边的导航栏，140下边的导航栏
+  padding: 130rpx 0rpx 0rpx;
+  height: calc(100vh - 270rpx); // 130 上边的导航栏，140下边的导航栏
+  &.iosplatformType {
+    .u-menu-wrap {
+      height: calc(100vh - 216rpx) !important;
+    }
+    .right-box {
+      padding-bottom: 100rpx !important;
+    }
+  }
 }
 
 .sort_header {
-	display: flex;
-	justify-content: space-between;
-	padding: 0 30rpx;
+  display: flex;
+  justify-content: space-between;
+  padding: 0 30rpx;
 
-	.sort_category_header {
-		display: flex;
-		align-items: center;
-	}
+  .sort_category_header {
+    display: flex;
+    align-items: center;
+  }
 
-	.category_item {
-		width: 140rpx;
-		font-weight: bold;
-		font-size: 36rpx;
-		color: #999999;
-	}
+  .category_item {
+    width: 140rpx;
+    font-weight: bold;
+    font-size: 36rpx;
+    color: #999999;
+  }
 
-	.category_item_sel {
-		font-size: 44rpx;
-		color: #1A1A1A;
-	}
+  .category_item_sel {
+    font-size: 44rpx;
+    color: #1a1a1a;
+  }
 
-	.category_item_sel_but {
-		height: 8rpx;
-		width: 50rpx;
-		background: $app-bt-bj;
-		margin-top: 4rpx;
-		margin-left: 12%;
-		border-radius: 20rpx;
-	}
+  .category_item_sel_but {
+    height: 8rpx;
+    width: 50rpx;
+    background: $app-bt-bj;
+    margin-top: 4rpx;
+    margin-left: 12%;
+    border-radius: 20rpx;
+  }
 }
 
-.sort_content {}
+.sort_content {
+}
 
 .u-menu-wrap {
-	flex: 1;
-	display: flex;
-	overflow: hidden;
-	margin-top: 20rpx;
-	height: calc(100vh - 216rpx - env(safe-area-inset-bottom));
+  flex: 1;
+  display: flex;
+  overflow: hidden;
+  margin-top: 20rpx;
+  height: calc(100vh - 216rpx - env(safe-area-inset-bottom));
 }
 
 .u-search-inner {
-	background-color: rgb(234, 234, 234);
-	border-radius: 100rpx;
-	display: flex;
-	align-items: center;
-	padding: 10rpx 16rpx;
+  background-color: rgb(234, 234, 234);
+  border-radius: 100rpx;
+  display: flex;
+  align-items: center;
+  padding: 10rpx 16rpx;
 }
 
 .u-search-text {
-	font-size: 26rpx;
-	color: $u-tips-color;
-	margin-left: 10rpx;
+  font-size: 26rpx;
+  color: $u-tips-color;
+  margin-left: 10rpx;
 }
 
 .u-tab-view {
-	width: 200rpx;
-	height: 100%;
-	background: #f6f6f6;
+  width: 200rpx;
+  height: 100%;
+  background: #f6f6f6;
 }
 
 .u-tab-item {
-	height: 110rpx;
-	// background: #f6f6f6;
-	box-sizing: border-box;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	font-size: 26rpx;
-	color: #444;
-	font-weight: 400;
-	line-height: 1;
+  height: 110rpx;
+  // background: #f6f6f6;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 26rpx;
+  color: #444;
+  font-weight: 400;
+  line-height: 1;
 }
 
 .u-tab-item-active {
-	position: relative;
-	color: #000;
-	font-size: 30rpx;
-	font-weight: 600;
-	background: #fff;
+  position: relative;
+  color: #000;
+  font-size: 30rpx;
+  font-weight: 600;
+  background: #fff;
 }
 
 .u-tab-item-active::before {
-	content: "";
-	position: absolute;
-	border-left: 4px solid $app-bt-bj;
-	height: 32rpx;
-	left: 0;
-	top: 39rpx;
+  content: "";
+  position: absolute;
+  border-left: 4px solid $app-bt-bj;
+  height: 32rpx;
+  left: 0;
+  top: 39rpx;
 }
 
 .u-tab-view {
-	height: 100%;
+  height: 100%;
 }
 
 .right-box {
-	background-color: rgb(250, 250, 250);
+  padding-bottom: calc(100rpx + env(safe-area-inset-bottom));
+  background-color: rgb(250, 250, 250);
 }
 
 .page-view {
-	padding: 16rpx;
+  padding: 16rpx;
 }
 
 .class-item {
-	margin-bottom: 30rpx;
-	background-color: #fff;
-	padding: 16rpx;
-	border-radius: 8rpx;
+  margin-bottom: 30rpx;
+  background-color: #fff;
+  padding: 16rpx;
+  border-radius: 8rpx;
+  &:last-child {
+    margin-bottom: 0;
+  }
 }
 
 .item-title {
-	font-size: 26rpx;
-	color: $u-main-color;
-	font-weight: bold;
+  font-size: 26rpx;
+  color: $u-main-color;
+  font-weight: bold;
 }
 
 .item-menu-name {
-	font-weight: normal;
-	font-size: 24rpx;
-	color: $u-main-color;
-	margin-top: 10rpx;
+  font-weight: normal;
+  font-size: 24rpx;
+  color: $u-main-color;
+  margin-top: 10rpx;
 }
 
 .item-container {
-	display: flex;
-	flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 }
 
 .thumb-box {
-	width: 33.333333%;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	flex-direction: column;
-	margin-top: 20rpx;
+  width: 33.333333%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  margin-top: 20rpx;
 }
 
 .item-menu-image {
-	width: 110rpx;
-	height: 110rpx;
+  width: 110rpx;
+  height: 110rpx;
 }
 </style>
diff --git a/static/column/home.png b/static/column/home.png
index 5ff7e60..d7a9d42 100644
Binary files a/static/column/home.png and b/static/column/home.png differ
diff --git a/static/column/home_sel.png b/static/column/home_sel.png
index aad6730..bb31567 100644
Binary files a/static/column/home_sel.png and b/static/column/home_sel.png differ
diff --git a/static/column/mine.png b/static/column/mine.png
index 13bbdc8..cb63df3 100644
Binary files a/static/column/mine.png and b/static/column/mine.png differ
diff --git a/static/column/mine_sel.png b/static/column/mine_sel.png
index 7fc789a..992a75e 100644
Binary files a/static/column/mine_sel.png and b/static/column/mine_sel.png differ
diff --git a/static/column/shopping.png b/static/column/shopping.png
index 047249d..f418a41 100644
Binary files a/static/column/shopping.png and b/static/column/shopping.png differ
diff --git a/static/column/shopping_sel.png b/static/column/shopping_sel.png
index d6f5b5d..fef60b5 100644
Binary files a/static/column/shopping_sel.png and b/static/column/shopping_sel.png differ
diff --git a/static/column/sort.png b/static/column/sort.png
index 636cfac..a8a52cd 100644
Binary files a/static/column/sort.png and b/static/column/sort.png differ
diff --git a/static/column/sort_sel.png b/static/column/sort_sel.png
index 4c1710d..8d848a2 100644
Binary files a/static/column/sort_sel.png and b/static/column/sort_sel.png differ
diff --git a/static/column/supply_chain.png b/static/column/supply_chain.png
index 47daad3..c75c75b 100644
Binary files a/static/column/supply_chain.png and b/static/column/supply_chain.png differ
diff --git a/static/column/supply_chain_sel.png b/static/column/supply_chain_sel.png
index 53c16e5..c75c75b 100644
Binary files a/static/column/supply_chain_sel.png and b/static/column/supply_chain_sel.png differ