From 9e17a4597e67449e44109142a331e0a936732ae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E5=BD=A6=E7=A5=96?= <605893810@qq.com>
Date: Thu, 25 Sep 2025 21:44:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=94=B9=E9=80=A0=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E5=92=8C=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .hbuilderx/launch.json                        |    2 +-
 components/choiceness/choiceness.vue          |  214 +--
 components/custom-tab-bar.vue                 |  179 ++-
 pages.json                                    |    2 +-
 pages/home/home.vue                           |    5 +-
 pages/mine/mine.vue                           | 1374 +++++++++--------
 .../mine_address/mine_address.vue             |    2 +-
 .../mine_address_add/mine_address_add.vue     |    3 +
 pages/shopping_cart/shopping_cart.vue         | 1119 ++++++++------
 pages/sort/sort.vue                           |  626 ++++----
 static/column/home.png                        |  Bin 1336 -> 1808 bytes
 static/column/home_sel.png                    |  Bin 1400 -> 1171 bytes
 static/column/mine.png                        |  Bin 1028 -> 1545 bytes
 static/column/mine_sel.png                    |  Bin 1053 -> 1182 bytes
 static/column/shopping.png                    |  Bin 1444 -> 1442 bytes
 static/column/shopping_sel.png                |  Bin 1587 -> 1292 bytes
 static/column/sort.png                        |  Bin 914 -> 1823 bytes
 static/column/sort_sel.png                    |  Bin 953 -> 1488 bytes
 static/column/supply_chain.png                |  Bin 2968 -> 1282 bytes
 static/column/supply_chain_sel.png            |  Bin 2847 -> 1282 bytes
 20 files changed, 1959 insertions(+), 1567 deletions(-)

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 5ff7e60242d3d136b05ccdf909c1ed5b20e9075d..d7a9d42ebd14b292fb8564bef0d2bd82e8766996 100644
GIT binary patch
delta 1793
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

delta 1318
zcmV+>1=;$L4!8=CBYyw^b5ch_0Itp)=>Px(@<~KNR9HvtnQLeqRTRh1xw~mMHi^Xu
zqD7i$G_rxs%-n#jf<y(Y(pdVz4<e+*YE;m+S|7B&K%{DYw7yVNYoRD2MMW!$f(S}&
zMem(SAgi%aQ>9jsNX%L{E!lgV8)m}IHp%Q}cZ*{7+s-|Y-+%t+%)N8YBK*fbSP5R+
zw$IXWUDy4k-0{l_Y+2SS#@H4_OlnXfN-L!{d!F}hxxmW;+|tr=S|X8n767iF0qpg$
zv9Wdi{r!KG3SKg><2W6N_%Z;T83A*Ih;Eir?kxp+&cK#sEsn)v&j3KD2@sUQP5K&R
zY)4oghRyC=E`PV)^SqI{fX@lovaG8aV?Btt#7LSWqNhejM;{y<96YA4H#IdatgEYg
z7!fxDKrFN+qQgq5ZqM^RC>FXXV9xoeMD#Qwb^(Ct`z;Z5NhuFZ2jDo)GDO@302dhR
zL`1s~@lGMcpM`=K49q#d0svkCfU`|i0bu*^@bLXZLw`eKvn6e4Xh_u8*FORP8%(tU
z;Aa51Q3&yIA<&V)&CSiVwY9ZR`nOTn<)l3k9aKtnd7ihgkVK)4Wmy+9#<a5MnQHsx
zwIh?s+%+&TkeMystiZNyUyg`7{oA?Js6T~>&jG+@A;jOsz=pP*^HTs|3lZIph|Gw6
zh=|s@u7CT<OmU|LP9~Ez)z#HoiRczYG;O|DO5NbP?q_oW&G)fw`x3_3s{nAW0ZoYb
zQZ}2tC!J3JmG5%`u)bxnSZp@{oMWmA056V@kKfzZ*LSoWuwjf;Dzzvck3S9ox0-7E
z+vN|rT&^>}<fZ^Sj<Xs7-ay2K2Go!KgRxc!@qcMKLGxpA&M);J=$!!2Xb7dZ$Lpk&
z?}XPTfo<Df${6bdfI7XX_Z)qKWwY74r@J+kfDcOX34J0Or8ugTO1Z9kNavgcb{uCL
zBI+$i!yYA~YhBm<uo7TVF>Twv3K91p;-Y|OyOi>deBkelt!9%D;<2c}m0ahXZ_+zS
z0DpW?N_l=h@K{*8N~w!n*WF)9ps3ikZ7*kxeGvd3lTs$80CUdCDE2lfrHBez$#utZ
zI3j)><`6<ml<#B>&jXhz|GdH_3K;1=uW+P9B^vzi6^`4s-RU3YBT~w@ix4y3*4DNr
zm&=W~uKU((eq~kIahwf^xGgw^UXW6*1AhQD8-VUyYHDis0KkgC?@B4<M>F}96_|6r
zUiWgw$@sZaYNO|QUrhtRY};PV7}M`2O~(3)+4{J$0=Kuf$1|CXZb;XdfV$5EfPIMg
z8xbuC#sHTA!0E=1)32@f2_YUmX(bUR;+#LAdpiJ_crhv9^Skcjq?B()*_KsdGk;ks
zm1?Z2s(Q#DR<82PWbq6jKM~Puh`6=T8AQc^4YjM3Qu>v!k%-Rll|Sw`vA+VqH?HgU
zMk$)VUUA@Jfuii^fuj^Eb-fUUM**NV*wj0ul<$|Cv=o2GaaJN?I7`k5Att(cvuoau
zh|2=ty;90+N=aC%uj4rHA!0|sbAP};6_@7&-xkcwCUOyx{&hV7aHQ1aMf&SWes>5P
zu;{(}`6<B3WO6}ub@i73U=^95(&k<^o4qidP9L8FtiQCjwl0as<GObLEzsWh`1s1+
z-rmEZDklsBwbF@1qFetX<WFB(!UwU^G8*wS{?w@-0Q5gkJ)yEQ0-r>%IUl8poWRd1
cY6YGC0Um<3OYEQ6ZvX%Q07*qoM6N<$f_nyySpWb4

diff --git a/static/column/home_sel.png b/static/column/home_sel.png
index aad67302ee8f5cd45129b8af76789ecce9b41537..bb315670129e9226e0847ead14c3c0a044ce0f16 100644
GIT binary patch
delta 1151
zcmV-_1c3Ya3X=(tBYy-)Nkl<ZcmeE}TWB0r7{~wL>~8jwpf&+p^3W<VP$)*SGsX)v
z^r6&%T0~P2g=k+IZK)!(-5n!#g=*q0Dz#8*g+!~R2(3XPR_mqG&}w%Bq7PEk;)8+&
zL27npXD@U7M!LzQv)Rk+ZjxRO=Wx!R@Af<2IWuQg!ev&jW`AHo(Xjq#RMAeVvi2|c
znyP5uMdjqy7{2z_Y9nis;n*6{tSYHbNfL($=mw#Q`yfMh5z#(Fxnm+C>nr(p)wOEi
zsFLh7f~hzldWz6=Nn}n&!_&odikQ!essfHEdLKX&40|(57HT1q#-ob9I|ku8t}DYW
zvhb;j_O=8udVg{2OXB{oK#&L`W+>XYy81#3T$GA|cXcLPn@RtMV{PN+vQiHky@`R&
zq*AGaih$LyzE<*3g0p&erGXs!gjG3-PN_<=-yth9Q8sWy)}9uU_>y5)6!BM)hzNdw
z_DAL9=reZ->#c%PMJlBblSN3CwGa64y~(h?Qu=P>M1Ry5NNZ=J;nXdq?27{Llv8a6
z^wS_bQp!=)a-t5Ba&c8oK2XfpyucATd9N4dS%&Q>=AgDRx?X^eJ}YZOn;<-ed=~^(
zW&JUUXpCW(6*8*l91%zmBJGNPB(_dCu5<@*<aT2Xn;c-Mf-B_t1*rmfC^emmTpG*)
zEScGztbf$NZP6=VOgkRG>3qNr;s6F{J(ft}EZ?wv*@`YZjsuv_PtD%5_CT)39?@#I
zbpR8vsAty>XN}3EIXn(vOKB;$Yrys1ohv89_0E)A|JO3?Hgo0Lxz2F-J`Xl*^`f!D
z&m*^X`31QGZtIfJySoAFHv918h#xI0DerIIUVq~6uHNT;Gj<zyx%*sk1q{CA^JLAf
z61I){(cR}opb3s5@jbPAt%U7|{0QIA)DDfxCR_pkde+2O?`CEq1)2yw+kF`LB7pvb
zemwl551V2>Y~I^|fzJcz8}?&)+ia*me>U;SYv~#LN(QrDDzReS6Z^CH_@y+`+HAT#
zUVp->+az>s@S>Cdue9IkLGZe{$K}TpIULwxVES)%;-b0+wqkvMEQjG<1M#se3>&y5
zvp3TOeoN%=PQQV}DlbyEODh{!1#E@7FePwwPX>F|r!exAf$=vo`1ZXFCJtwDd|w7f
zo=ao!9vugtNaOq@lUqhrw5oygv2%Q+&wrgZG4Wv*pY6?Jd^m%XBU$`#Jcr~zd9CXE
zngLgjQl5v)ADEwc-rVw5yC7O5=DhzL876_>7X+ltARd~_;{fIikCo}G{%Qh$oQnq&
z_CO9`-7sI}t9Qz-v}j`@^&?Qu9^V1{)=y1;<pee^CbST+YHTnbeBTahjUB+&<ajHS
zp);Cc-pW?5Gx#rjOzQq1axBKg6!*sjsCy{h_=3f9X)6e9DOs5wN`!U{CPM8)@leBH
zJVf<u982O@H*){r%ZcDAi=j}P7r2n}QkeS>00960IDG2c00006Nkl<Z0{{zVUT8{a
R!c71G002ovPDHLkV1ij)H#PtO

delta 1382
zcmV-s1)2Jj3HS<-BYyw^b5ch_0Itp)=>Px)GD$>1R9Hvtn0stfRUF5^ztcT#Z#N+L
z1Y!_GF(W~?HVB#+ABm^|34i#9A%P$=)Hoi3Tf3n)M%LSjGQ}4IBq0)Gh#G}xG%+L^
z1VbM{!hGNh4G$%fvC-Sx!972{g_heg)^2Ty#-0Cq&hPj8et+`4zk7SmA^gV%m4dgi
zHa6O-+ZJ^lEq48)0=IY)vn9(`5Z5F@nK~uO=3vP6QL(^_0=#_Esga6O{wfG_`vhZb
zHH<S$)*c*wvQY4Xft%`#SwhJ507m72IVPo89E>R23xOUq@Ukg9LMhW<A<(=G0On39
zXpuE1ByRxGxqtRJKN!5lIIAvg-$z}80Us2w&l7t9OdTMMxc~x_Bwjk*?R<9KkCd?H
z8zyjN)v);UEU<zAhmHCOi0cC(*Czvo9uRPo`{Zz<%9jbW0Dvu*zB45+Xp5+O`T}UI
z)2BHEZ3g&eyV(rh%$#^C7#?{lU+}zvy>8=PBDoR3b$_<vCNtWVznrW5zmn0PsQ-Fa
zj4R?V5MdeYZUetFi$}Gv@_9bcIe{A|a&=j?u||Ryk<C?R93sMkKuFz{k5DSc=h1Ix
z#%3biXlo}Hpbckxl$CAYQ%`^O`UP&Tjo-t9H-RwL)_;<Lbtlo)+z}qF4+J(9Tkk%q
zj>L#o0)HAn5VqQfNz%gBsPl_U)$J4biJCvFhC5wt40?>n-mCaYn)FC8>ilvrpxHT1
zwedTIgWm>lL)vWy6ZoxD@mS*<omZdE&bbKKdSn1?0eHOKRS@1h)7#y&=D@YFV!)<q
ztekw@RbDYH2*%?XZi9XXcwTnPWdM8Y^f@5BOMiq)8`Lkvw6Hbo+*wS}>{`w4_+3oA
z3BWj;+X*lp)*|YMskt<8OKp6tbl?EM!>mPSSTDl*in#K$zmqO{G^K#|*Kk#@(|A#W
z7hh;a>J}y@uZ}toTbgNLpGRK{BtJP8Y>bH?3Wi*tmI5qS%_dLme!;X21lRf4_CQEo
zo__)Cb?ZN*KQ&CgK-j6}DqPBSulux*NVJ|e@Q@Z(Z_0Go9XCLHu6Iq`7Kp05O9_;#
zwy##74hOzY#xW)SF;K~F2~Ib=WRDhcg>w}x<+`^n<|aX*ltv(=CfnEE!$ZJ@Jb@vH
z3vn->+#!eaajB4)|F^?_aGBvT=8@#CKz~I2AYUi_*jbkFOr6grb!k!c{r>Wb>afqF
zTYC;`?_rJCD?`pDevs@BpmE}fYDbm24Ma1nI4R|Q!AR9-m&z$BaI;%q%7pf`7~?Az
zyh7XS+M5mF2Mfa!pF>O<h$p1~O<Bz7?;KZDVE>(5mgvzpf@r=S&^qS<ybGW|z<;P9
z!WbsLn?P4y00jfoqJ^D-%hnPpA+J0B3=x_EPHs$c4#o*)vq6hgzn3evs1Do3R!xnM
zGfg}P;@JR3^aaAeZv=iva-uEYJBX42rvU5STz-`_rb}Ut1Bq)O(MtlyO;dgwj8^T>
z<!JVL$$<w7lq-G+IG00(uIJ-$H-CWYq>vP|0ug0Lp`wN4`|6CD5HfX_+!F|?$<uuL
z#Nl=8yNNK(nq=^HE#!Kz5Wzxoy`I>|1e%rPVeHYu>hw%tkMSfyu1kO5!P`kXIvD1$
zLd6G?PjHN4Vb-T$&lxBhw2<;z2C%<|D-x>y4M0-{B2fBR-dCxsxB5G&H(vwT`q6TW
zK1P=Fj(-m{?-OTe=IZ_Gk(4nPT?SfC8)~8+EawtoQu;+Ky_G429%dW_iLHuW*^zSg
olE9abYj8?AZ{P=4wscv41LP~XOF)9ljsO4v07*qoM6N<$f~16%3IG5A

diff --git a/static/column/mine.png b/static/column/mine.png
index 13bbdc89806977f34bff98074db70652c0596ad2..cb63df30069f80b6568b476e32f4d98a71ea98f7 100644
GIT binary patch
delta 1528
zcmV<U1qb?s2#E}kBYy?HNkl<Zcmd>?X-r*36vv0PB!UG~8z9t}R2!)V8dF;nTZ$BI
zwKO72BWobQ16-o1`<6VcAt7y3P5Pm10jqThv8Mf?BnG5bCDAr~FtJtzLRi#j6o^YB
zo4<3z++3EzoyVip_;UX5oSA#(%>SM{b7$rTs{h#U|4X={qJQExkH_<3Sy|cJ=nixn
z`c3qH^m>0i$R%gEq@*ONyu7?~a&q!(NWB^m5Ril3flfi^qYtBhfOso@iP%dLp9y=t
z-atqk3<?T5Gc`4J=VB}%zKfeWPn-RV`7U(bSHb~<gM;rt;wc>*(wDH`MHfSCC%Bh#
z1?AJ|aiH)I0)K}YB8Q~x3w$C>hgEdE&(Y!O@$vBub#-+)_4W154Gj(L;A6_Qlplb6
z0>nRe_&-@%T3X^LyEcsp^GI){^A{XF9EDhVQ&UsFqi%)?`3u9t!!o8%>I;E^fkz4o
z3fAhfTWw63%*w<Hk`A!jV`F0<$DRTUN=r-2KR6VCZ-0PDL|9mu^TwraQ5X>}Dk_R3
z;vOI}Nv5A*@=Z#?4R{iN;r9%%gd5JGy%7f^=T)m#?V_g;Ao3Li<W(lNYtZIHZggn6
z!P<d=fi2UvD`iBOj&9OXu{*SFsAc$ks@ss|o3-sm8xba84AAnUHhj=J!}6+&Hfe7}
zn5_PxgMVXRqis`7R_(UL`O~Dm5n(!VX66=?j%NAVZJjY^`OI51CH#esLPz&yXJ?1%
zvRhqTTzoygcL5RBl*vvp+`@=(ZEfv20_z20O;l9W!<3CABqZc{8UzEyaOh-F`B`kY
zFd{5LNr`hGaDXK?LF(OrRWcR7$ABdeK4=*Re}Be=M@B}D5&t3(31^9I^>{p6rLYk2
z*~2h;A0M6F4zhcSvXK}QmL--fKS(blKtx`3XCZWy3~rDLC#c&5-l9%+ZP%hj`p3q`
zWZx{d5sV2-bTV@Rod$jZBC`5DLIy8FyccwUvk)Dmt_$Shr2Fcnyt}!%`6ud(MF%l%
z$bS<18JU)$@X4&kH&WgKwm~cwtwmNi*{yA1^6CwczUEr{Ojvp#)4dQ+Ve;Hh`6PP2
zMc{YpPk?RsW`bYw^;s@U*d$_oef>ue$z)uvp<O(g-wDBFGQ5H9=UT4k1N$A0kI&*4
z!n$|H<t2!JOXk}lc!o#+z1Qotjz`*Osejt9gqKRjO?y{_*|>*sL@#94zsBsZ^&^fE
z>lJXj8?xfFC}CEzxX{qhF2>{=j7d2Td1&Y_loRV^VxJ=!2e22F1qpNKA*^H{5XIhI
zVf$T3gvd)Ir+Bg83liqe<*qkNkl^58wRi7cm7kyQH{|8zsf`;qN_Yz-=XJg$*?*@R
zt8&)gWeJnrySeSBwSPuNhDu9IQ`@(1_ZyOul2m17rHYP@*4;!v`UGzlYrml@oqArv
z+~svR9S7ER$wEqsd{&^w&%*pr3<V`mP(qWWEki>?RbtNvi_q)~d@rk`E)J-OhzP}7
zLe5@NTo$Zbw@#&}r#oXm%OsTL-G5nU*>eap6iT_02`nirEL5vkueR*v{7X$uRq^rh
zx(oRRcRV*YH%eD%J%ccJCELRz`eJf&vPwvBy+7B@e9{aB>q&-(hwJt?@N{MGt;?2n
z5~fXnj9aTkOiYZ*%(N42IWPBLWMrh0C#w75EwzvFov+KHZNg-CHx;s7w0|Z5j!Gs3
zbyrjp6BCuZJ#?qMHN4suZ4;(&2e3pM#Kl>2&MIH&zpSh*XR_8$zqKqHHetrY-&PHO
zeSLkZr>94WUI}z{bt$&0FtKEObad3_W)o(-oB|W#(%s#yYHDg!b#?WMfN#z62|%cb
zZsi;~moWR+@9=mI(sGo+ym2a|pToeTP9}DSr4rJI807b0zX$Oz!TFT{{kMUtiHV6#
zjg5_c*tX0dEVY~x+Bh{l1o^FC^GbmJQ-K$<zX>NN<`8yXyc+F)0RRC1|K5vsQvd(}
e21!IgR09BIY+{C}M{z3v0000<MNUMnLSTZk+};TQ

delta 1007
zcmV<L0}%X)41@@fBYyw^b5ch_0Itp)=>Px&zDYzuR9Hvtm``j}MI6V!zxQ^FCD3Af
zAi)NTmXtJUyKjbr7ZN?_!H6ga(O^Ii_~%48SR!hKfDr0|ctY{upI{UYpkO@E10-HJ
zIP<n`(nzdY4UlkXWn0t2Zr>X_&3opt>F&<H-Nig*j&FbS`+t7sH@}_VZ-$VtK?&o<
zec(p#SluGr+uQqKI-TAM;29$70k9^3zoC>G18}}jD119QI{IfVi>ev8v$OMo_V)I@
z00sc8ssM8fz~JQM<nf7#iQ93&YXa`??|;a)?Qe)^Q#ImBsUJPhdv<tu_<A+-v~6r)
z4Vy}(t^nwWh=0xkIOqHRMWxgqivmPzEz5cmz;g@HT^_N$Ha|cAXtmI>fOQ(QwYB|F
z6xlPr@9%Y8_r_9Da~x-lWm(4oJRkn9BRw@WwYi$~hy~0!e+$5o2-smE#JeWj%Q-&;
z;GKx=ej&tBlew`{LZ1drO-;W6XbnWp2qCtc3Tivf`G4t1q;vUve!c1GQFVkFV=oiY
zrvc!s@B14{r9r7h1nKc}nA1wBSEQ7mnJhXE@L3|#e;_@+6hgdYB2;X{IX?wphyJdV
zIwz&vX5y!6V9xnZ0J^nv-}iU9uKR_FP_d2UI6E!N`aJl4RS2=s#7`XHX#gv=bI<c0
z&t|iiO@D-nZ8Dk6W43Ky3ck+>AzDoQ{4ao$l@g4xWc}$9cdP}4<JU-MR%_w7mCxrN
zZdl<6Dphhyvj$FF^P`~?)n0}Ne4-lo5IS;2+862IN)@dffMfsK6)8%Um`kWh{jaA@
z)xAVL#pC!g26h~0UGV1c$U+`A#}O+tXHF^gi+_H*a9#KJa=t49cXf3wYi(`)0Kgjn
zQgsF`b~g{;L@t+mb9{XK&Qe;HfK#0F?*Tl~V9;XsLqdqB7A~uL0e6kEz>Kl?i0D9M
z#!aQv(84Q^et)RvSWZMbD62!KN~r@<%7ezhnM`JtZQJ@WWbt+ZU}$b`Zrj+{*kAP|
z4S#+0^z^J~Zf-ss+07Zx^VVjwS^d2A&nOvT$8lb;EbFVla<)(?bdQXTTx$eu=(De{
zuOppKUkz{5zVE;2y6)FTz>Kl?iD<tzR!V&*rQFg;*w8m)>;e%z9q1mBQod~j%sD>+
z;PqhQCsN8+?-B4xBHA5jeI$g?r&HyWU}%heOhk*2N~x1l%Gd4@a9Q1wIeZ`3aC<5R
z>OU3X0U|mU<nTTz<)C4ZYBFPtmDMd7VckQtw6yHe>eJKHAC{`^HPJ0Gxsq<BUZUPS
dHTz2(@ZYP=0855hMtcAN002ovPDHLkV1f-|^ltzF

diff --git a/static/column/mine_sel.png b/static/column/mine_sel.png
index 7fc789ad65830a5de4c14cb1f1c80aae23f62d63..992a75e49cb550fa10e9e649ee068d84a788445c 100644
GIT binary patch
delta 1163
zcmV;61a$kI2%ZU$BYy-_Nkl<Zcmd>>U1%It6vxlGlds);SgQnuB1*L=(c0`xQy;|E
zs<fytQYZ$3AWD4^)Y`f`tHMTW)-(yxx9F2rs)$hOlYNP%AO_5C*U$P@h!T(%KTCFZ
zc9Y#XJ+pL|X=Xp>PKIVnhkN$kx#yh!{mtEb=R?31c3i!{QGYFeXGAkz)-~fpUCYks
zYIZuJWk2A0|3Njk(XT&p)iWIKU%W4>W@ibC-y_f=02*Yt?SQZo0fxAqXhHLgu4Ybz
z`_p%`Z&k%Ja12QB?2QRUIY|ijG^9Y>g^EaW&i;n6bpkvB6XsRpBc8njb+jEWo^ge9
zCL(Hf+~IWD;eQF32OQ>s_qrUz5rzma>YDMC!{MSs8aTXlu@4ZVF0>nj(By&5i@gnk
z9Bye~VJe48f2~7Gx}&?LRgu1MDd6X~&^q2=k4U4{P8hT{Z*8~JBL&<cj9omttxg$l
zJ-n8Cvms+ZCR++v2)tEB+)b<^@HRJb<rpbo0`talqJLjC0o@>@B?XM6q-Dfi#S&#)
z#a#@N0w#bzFXs7H@t%;<lmafA#jkuLwS)*v%+svZbZb(;hf|#i7G7ZUry$IZ{Lpny
zMobF0BuwD>J)o3t`!RvWY^Sc8(!gho`6*t@zqnGb6T})bqlwPrbwaATq=7#<-M3_#
z#m4~fJb!pU7K&&NdP$cCwgx$Ts{1FC;87s>%Q}~|c_=Eo$L6}uO6HZqJpo&pqshRR
z%gamK0PqWNckn8JV@p&Rh^N|5yGwCKc?Pzm#=l!PA5R2!^5%J%&yNv-^C3X+9}pZh
z5$=sAf_o;CJ%4ko=TZ|`Mv*tqXBN!af6iSGq<`E&CO!Z~+)*fqP3_%*-gq)NG&&db
z<sR+}aQWii`~8+&JlX#9o2LSw$5VlmW8ZZA7MsCB+3!c~E3h9xjWk>V$8M&MsAfFD
z-*Rt7w9GqxnXVaA5jFE#RLz7MftLLZfnVC3-H^Y|ND<Kci0~W&?(@q4=ov(O)dWoF
zs(<l%8LD1g7kHmatx6kw3JAB?6Irbfc?JOK6+M)GvXNF@;Pp_tYORroZ+@Y?9SP;?
ze$~_jj;hA}2yoCh7*|5njlw({+d(b0!m9$m(06`4AsykRP}N^c%%}c=d^$T^ORFkS
zd!Y4QPT0V<CWQdQdcU!~+Taf0h?;qtmw&>ZYQdMQkH=R)p(ByI{=atRn8Mzn59Br>
zh)HOU<0fotn_7ut111F1<aJA3D}&bT9AR%blpeB=UjYtl+1>2m*G2wqq9TM6v*T2N
z1&OV8NAt94qjlFR^HhNOHfEGNo2)KCPfvxd0*uSzH~|!!43=Lv=)~kKI)UTgc7OcJ
z&-4gGb7>mv1!0P3?KG7cwmRc;!EsT<hq(PQ+t)ylToVJBMxf!GvApGtRNxP0sgz5A
zt=^GTV46R79%tLepElZ>SR(k~NTM?~`QtVJT1<9x0Nb6-*uDS&0RR8VXg|;Z000I_
dL_t&o0Fjo{Xrp{qTL1t607*qoL<FuvV1nc;IC}s9

delta 1033
zcmV+k1or!$37rU#BYyw^b5ch_0Itp)=>Px&*GWV{R9HvtnO$rYRTRhnXSQWKvn^}`
zkpu|%QGy{M0y{)rNc2G;jC?+b2BPwy0tpdfY<CO9B|v9dW6+SuhYy0ms62oI;ekGA
z;){k^(U=gL@*N<-K)SWvnXc{5A+ujCwcEY3A0?yA+s>YQ{(rxF?z#7zn<04YA&>Fm
zF>tk4tYQ%kFNimy*1r<OD?pe}zzheTfjeMa1k))DCV$ZX4EB^Wsj`8iPjcPB)WkL-
zsTn}92uz&W?x?#T*cZJ{1EqkM1-$(^bEaL3?*XVT#SLi?tM>k(+;%yx^iAi$rfTsE
z0kcMknqWFfgnx53hHg6VCDhDj#>*gH4M54+GH}Z`h^20!ONy|Q2FYpG&kseGaXe-7
zwvG#dJ7Yzyc~N49PojMwyf)&0!+%d+<|aK#0uG1zBScbLUYK}~c0RCEWO*Y?61%~)
zBOhtDTlHAICNkEsaSiO82IQ~32GEqW2;;aGQ`U+KI)8SNkonzkq`8-qgHMT`9`1n`
zTW^!ZUuFT#REp;oN`pd^NT-L7x^p?rHf_*<laGi@+C6Z{JV69!0|885YcYAfh|p-8
zNXR+{;&o{^jFWmyStH`dJ+NwCB4A!7pXjYNL;gxcXtYhMYQ4$equJupr5nn#B7R&0
zM^y7~0Dlb`q121I(eRUq&}f^m+V=v%_ha^bpJphNMg08tfx}))iLmE3o#&3Vbm5qE
zHQ$+)T{sZu<UdbWt#CLy*;A$20rp(;<3M|=z04i(o@(H8(8E_GYRPwS1xpt9GIRSQ
zyCRL`^2{Yvr2bdZ#&s`IN%2yA2?KwysArB}@_(<eVLt;RxfHR&sm+!I=}OX0p8DiM
z<Bjor7X{wZ)a|bi&ioj_CIB@R1^u_PApi&Z<F`NDe|c_lEUj^Yqu`pPI&c=?m#Pdp
z$~|@Zjk;H&AZG#(J>vq0RqG=HM~6r7T?TamY*uyxq)<92G(G2+K~de1cL@V;UDy+p
zYk%r)0-U~G0MyxQ_O1E+;uHOqh0S=|JpZryDN4hM;nk!*YiMBhr@uGGN9q-faEofb
zE&<<Ujm?w~^E!T2ZdC&|=d<~FbCxfKuH0?f2Ht2lly8NABWhwVK&@$G<}+F>u)LbE
zIp2{`;xvd}&HUyz%?NB40&Wdi2bg$c7Jv8)Ef#opf`AW$=$%ZQ=%5~xozp4*6ikV*
znm9zDG$ex$>qg+ci2yF9`xv;~RrvozIHH=)CxG^B#9A~%=_ogPBIAqc7R=!-P3*4^
zTJJj|{c-uT{g-LX+Aad&#-^BV(dNgE*hJWR4)_5E{Qyg>NA6<)0000<MNUMnLIPld
D4|DaR

diff --git a/static/column/shopping.png b/static/column/shopping.png
index 047249d77655613f1273b214744b154a9c6f4704..f418a41e8fd35276e168e726a1a001eebbd3b683 100644
GIT binary patch
delta 1425
zcmV;C1#bGJ3!)2<BYy=~Nkl<ZcmdRzZD?Cn7{_nZ7jgR_E!K^#z6>l3(YDM@aFppB
z%!yP{Dfog)+ODl=oP{|%#TgjR=@d2vNt33HgX**@D1NYtU8~NwS+o=si*|PHX3#-r
zvC=e2<L|k<xxKc{y}3<qx|Q?0&y$n$@;}c#_vGADmvVvqU4M9j>+9>AU;+{;2$O&N
z`Eny9!p|XQ8Kg=p_`(b4MH0bpq@kpoD4Pu`jV2bSh|BNy?})`>tK;!_>1^oY6Ofdj
zNF+9hv(!k0mA1CF)4^cy*V!Ph7m{gX(pgHY3Qi?}sD79HE+;4F#-zWL)>JSek0Wjx
zBvmqxo423)yMG6Nb6s6s8I)94S6?gzvVo~!=J(%3`4>${A@&6Z;fHteyIn3<Ka3O>
z7XHfsgi&liV>*g`59^2h_`4b!8fx+H!fvXqt-ZFUre>AL<GF}-Y$a2{T1($**2+kf
zS5v5r0o{zf8@nBz!hey0x8lE#?aj^29mvbeI~9pUCVv^kKMd$3{DA)%_8suy?}MET
z(2c#7Jav^yNAQnym`o?=@R8~1>1W7z1wVxS5PJ-M#{Uzdkal7a%PD+0RN&u&t%e5t
z-Ee?*+pr&#*X#9qU6z8W@Fj)SgnwBe5b(9Ow(euP?8J9t@5ENZHTWx_U}9q85~j);
z2DToyQh)D0c$7x=z(M@Oi1-NqYmg~-hP*hwSz13lJiOLYa7jr?KdnrGLMO|)MWy1K
z(b3T{?(_M6XJCEsDT6rzuQQmv(1ibROG`@?{zg~}#pLBrO-;#jay8;_fNk{g07(BB
zMJXsKh*}EfHpHlGoEBTu+KYclghHXSi2n`o$A6&<|4q7?1O*L=NF*|1DOd^<*<)e_
zZn0&ArQ9MS^IMub!+<8!6+9p{G;Y(Z<A#+XpH5bSOve$iX$fYJ(IbTgqFw6cX%*jT
zcyMKzR5das(ihBwa{_VWASo{#4sR02Y1ot{r-O8LQZA}`anj(cWEtjhR(5VgSQpHl
z9e<Vn?FiO?@wh$fq_We{k1m)Xr9UM^7?t()kk3vnZ8SZTh^j7_pK^OsA{vbzrKtqS
z6I<+dyNktl7+tVsgl7w34LnO;7}Ugwx2le_mn*d9<AZ~Pr^UB3hb6MzQc2@F%{pn4
z5&om6rza*I*%EA=$IP#7EbN;dMDAdbh<^n2fx{|x1?#U&R4#{Z2kD~i9FR0D7r~Zb
zqAF`~L@H(z?(7H2{%i?m_avM1zGP(@`U3xeQ_#M=sZ_CZJ3=37vL#rpp(w^_G0Grz
zIR!$SK{onY*NVM4EVUT5{)@-wte;ibjxaknJ;KcCD_JE@Im{3*p?44*HQ5%-DSy!r
zQT|J<eeSXf<0NYc%;WT-CfkCg77ZL0n=J^CysWC-El4mA*^`Lg05>@ed*TWnyk}Ll
zToxpldI{cozlYDAhAC*=CE8yl5IZOF>R$y1dH9}&OXn0Y$&lkJ>O97S^(xeGPM2#^
zJafTxc8ED9r$0OB=y@1uY;3#=Yk!%jyNp-&Zz%X0Q_BNE&gr_$L@#to(1)UMa(O*s
zJ?e*<%S!gHFU@>3^_uv$0*q-(QBl!D#tfsMkzgWH4mrjKHD5MHnrmw2EysZ8&6k!k
z5=_H#E+*~FCRP6b%5it*Ek_XM&6mm<3Fco6a%$Nj4H+2cb*kC$Ii-uRmw#c%Sb#zF
zjg5^3jd?~tBf-)TYvhAOx{i+Cf<ydtm$kRI|0Lg8!FnzS=Ibc87v6^547Refvr|2M
z<nx@Av0z$EaL^JA1OoTN6GUC#Z1bIE649^+?uGrKP)I%eOI7hd00030|6I&kRsaA1
f21!IgR09B`OiG5HaVWb0015yANkvXXu0mjf)AYGR

delta 1427
zcmV;E1#J4F3#1E>BYyw^b5ch_0Itp)=>Px)UP(kjR9HvVn0<&;RTRL_dDE7Ixf&K0
z7;0=$)3VOJcQY{zF|b7XP>7_EKFB|`tcXfNLNJOn`ooVku#bh1z`#BvNRkSplE`y*
zcGrq>%*_xgW4F<am6`WWdx!hB*=5~%cV`y$!7y*;opbK*o_}}mx#t{&3+%!Rj28xh
zwbttpaUB4pD<%;Fz>z45Hg$A#ybS<yt|vGMY>YVx0Fy=mdX0#lId6cq*6oP+&?rC>
zhT+Y*T<*Jb2|Z*DE2U-xK`^)^!Z4hWN~LxJz>N-aJrQj<Z-7SvF~+<C0Bh|t5!uDe
z%g<|It@Xo*Xn!}Hy>djP+<l<6eh~oXB4SYQNr*^4A|49Euq~I%^~Cn8hP7-qJ1><=
zeeD!Z6OrARVvJb=03X*IbOd{+0AK+Tv3*t*c+Q+TQ^PR)tHRI>B08qEZb3wABsJd9
zBC?;E7bF6<LdKXA0C0I(0ddj6g9rDy|FwwRgosrq?teQe5xE8tpLKiZ3^Pyg0saaA
zZgI+Mn0cEofUmqU=3W4J&*}X^L{}yT)>^-Xh>tknZOpvJ7r<BE7_$QaRt}F&iC(4F
z`Z+}0=my<KM2ma@eC4&)M-g$R(_2YIZzlF|YisM>BJ!bAK1M_{d;xsqv)SymsZ{Fc
zSSO02nSUJ}9ls_9HpW~J06)6d6CvUxBKp?{!bjE^vl;-}+<1qX`MOv?(ULI6Gys4F
zyvQnsVW@JsT+Ro=N7fkgJ^(CrI@^ipF)v^%Y>fE{0Ln8Jk>$+1%Ll?kHf4;laes=_
zSxQ9la;$!E!~<!q_aNe(?)SJQL0W5j)E{u;lz(jeC!&J4hqczPB4V5mze_|9cz7+b
zs4?aR04QgKB65J4=T#~vTElKhJPH7BIAtQD*2EMZg2tFH0bssU*+4|=#{{gko{xyu
zn4S4Q%sg6k;(_?TXeN`nG@VZO0)XA*_L@&b_LLpG5_?!Fbwv;af5w`nQfYc;XXo)T
zk$;^<$r!T=0JgiwHcOjIM8z=yTP3Y^FCt#%ynGuoe_k(OrPPWb2<&lOPI5$KCo``Y
zZa=Yy-8#0rcdj$CnuuN>3Am-DWg;R@34&lU08B>2^0y0B@%`X8A~plStO{Evi^XEL
ztE=m1t-$R75ErVOiRh_;9c?R*t%!Js1Al6a516rdUqt#4aWN5nJCeSyho1+4m)$Gd
z%gl?FQnv;{uzxIY!*p!VV_&IMTGQFtIhaS(<YBG#GDO_%fP0vEmNDik0QjNeWU3q^
z6cM|5Y~Z(_zbo$J{|X}V`#@pv4KwGfP29`FN~uf`1m8R0sJFLwVoy&`zl9c&*?&<K
zor<EUU_br+{e^r!Z(-}&E%E}+WHJ}0(`lOo#dTZ@5p`GdN<E)@0lP?X7yz1_m+xcd
zxQwYM*I8|O18c2!BjPd#eAun&y1aG~IZ-N=c64=hojx1!Sb%Q_fKSGwQg%*gW9G-}
z25b!}rPc;P@X~nnBt)d0nac%l&3|#Y(tuKGHX`1Sh|`iZWD+iLo2zUjqRPh25LNFb
zk#OK~6RQhwb93{whK7c#`}+D0*|?mPR%?BOm1X8~ft%#28CWUx^gvJ9_AG3H`WpZ&
zsTP}?nwl<YY;62!pcJwj*j}F&3WdA!`TUt`&@}<O2KbR-o9_!ES~%Lk#(x;wIodKz
z<_RL&I<CN4>xGE;S>+%ia-5l`k2bK&?uLXe5lPentI5OJY}V$yzr;zsgM5dG9<1Ww
zdjQ~rVKPI?`MQU-*q}`>5pj#{gNexAVzIcYySuxu+N*W_x+krih-_x&P1SVl^O`)I
hWPp0hTyVhu0a(TnOC8PbUkm^M002ovPDHLkV1gB5s+s@*

diff --git a/static/column/shopping_sel.png b/static/column/shopping_sel.png
index d6f5b5d9022800448adb43b4c7f39b8b798a9dc4..fef60b59b436777d8b84058bdb072b0b7d25aec2 100644
GIT binary patch
delta 1273
zcmV<V1P1%F42%kpBYy<JNkl<ZcmdQ{U1%It6h7yUZFXm4F;!4nMTH1HNRsYM9$JdO
z4?ai*m4XNg{<OYWYfzJ!fVv=dH*JMhUnCeoLHt1l#RnB^8?{yIPSX%52okkPV?hgT
zlAYNk&K%F(WHxKMJG;~E?zETt%{g;_&iU@0GxyG10hd|2{C^1d>voT++c^eR!0A3M
zci*M*AOr!v!emrNrF^YGOjW9EcDVqecdI+a&g~in4XV0{i_}7-Ep?~s(t7g5E$4yg
zn?*mg>S~eiUeu$#7GApDBZ;ZZvDj}bfhdN3dgQsAd_788AY6$6x$e<o9g2-bJwhdz
zu$cb^2t3IT34b=5nq!zrXPcqh5A|v@cl9S{J9<0p>w7j*T()Tj0tpXTYtIqTuLU9q
zZGe;pL4yeJiGs=j5@J+Y4HK~i$2N6_W>1=$J<0<*XzIC7P0blJG&^JJv%OsZq>;2A
z=<9ZF@7HH;>)nuBx1*g}3bsRB0tqkK`FTlJ5flf6^?!^G9?+ct_#h8(8zS@phyeh4
z8wGqOh=vK2F-5^styejDQ@3XsCmAD#W`E1_V^eqDGPK+-Q=5Ik>~<dSPv-AUEv-^j
z3G+IA92%PvZ2ksD7Z2`kmRosnPa~oUDE9EO`wj{3t2uOrQ^3!Z8w6$~`XR7E^D6b3
z4YRjaoqyrj8g-O8%`+m;f>te5C7e2h|1#4?hXuO`&ctz&INLH&m9R8J9vqf3N+7{M
zsXs7Z6Jb=mu_(zFd?QRqSrg#}R1V3;QG!FFcEWp)#(xLEX^1c(z)9)8rWuwE8AlkA
zWe>bb>AYsb2wsglo-}*$!82TYNJ#gdhjKlZYJVg^5aB{1@68?Lz~>B+B#$t7hF7xM
zcf9Q^KbF%g%bRh}v*gCD*p&2Da}3MIKzN`an|$Gk`YQ#69T!3oCZwq1xDXC<o<b2u
z7ngsTWbfwTPv2E2!e>P62oTKqotq^&BtG|jg(5s?;Q}I9erG2CJ--lp8U}&^@Mz1f
ztbh8U?=uu(*@?*&!-5bdGg-B_VX#yqeJt^%^y?!uVSYTt9gjcxHu;8{B|{VT=0tIZ
z`G@mHQ@2kw7~}kheZM~;p$TWkV&fdUfBOblu4^!ERup`eeH3zN!m<~~@q1D>4Macs
zzAlJx#)`kl2Z-ICi+400URT;myi^xq;C~YmK0wS4jKsfdJX-&^yI#-?!-~|G%xy6=
zd!Lzf`k&XPuUSzYcq@;q4BdXl)a*A5-FadwkP_6PZo*7-zYzEZZzwzY-0ij1c*U5}
z<=hnH)UVsFO{sib^%F0ZZ}N(>1A&Ixb?56K(sdCwk~vK}@(C=->rkQHOM0MKi+^oB
z+@On5n(t}v&OcUKP^#BOn7{Qpd3HFLnq(cZldn}X5|wR7Uiorqur9&~?&49bv{VA}
zk7!HE%BxhiKZi!ya%rP3!s+aq!@P;SFAXgNr_ptd<@?H-2kKq`9EZ|GV6`~vP-#)A
zUKe3$C~d_b1)!%`|9}Yg&%4l(9&)+z1m9Q90~Vh1D3&CmS9vq~2*@*A&crvTPGH5u
z$GQmvugU3bVkn(eAIVtibFYuYiyzxiLz1L3R^ny;;(Iu4wPsR$eiqd2KL7v#|NpM4
j$gcnZ00v1!K~w_(3;e5hUN7fn00000NkvXXu0mjfz3Nqp

delta 1571
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
VD@!1u@_GOO002ovPDHLkV1iPj@d5w<

diff --git a/static/column/sort.png b/static/column/sort.png
index 636cfac84df3fcff7acf62f7aa540389982cee0c..a8a52cd17bc16f13a5b5379d2af8ca22c715fc06 100644
GIT binary patch
delta 1809
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

delta 892
zcmV-?1B3jZ4w46uBYyw^b5ch_0Itp)=>Px&Oi4sRR9HvtSxabBK@`0wF^N`NFsaK*
z5$dA0i_Da4tswZJU8*Q9)VdJ`KiIlcbms?kp}4Us2#UJ2qC&yqvSj8hTD!0y#V$1w
z+8Rw`a_z)Pc&V*PQz*WYw|Z~hoik@HckY}!1M=7dkMX4v!hfBeoolA2r_V6+Q2;GO
z6eu$xCZcc5Jjl$K9mg44$UYj4wgR{WU?&l6Bq|+ufj${#9tZHSzP|qU(9qDYf=!XI
zAv-lSH2`2&HC|`t@65c{ah&(={?TZ3JAhXJ)>n!9wxOY+t3bL)SW0=Gh^|)y>gqF@
zNF=sSOicVVZGX+p&1)l($VVb-S|)C<QtF1mC=wPzd;rjD8kzag?Ck8ty1Kg5zXr-?
zvtZ^9B6<N}gYDa`wH`3<LWnK^FKzn_5$yvI_xt@OloowbsZ?Ds7`y`Di0wP3wcb`j
zSV}oth}m>Hy?JzWbh1*fNGYEX(LoD-PHTP35<UyyrhmnGs+2lZDP~(+TT>_$`fTkp
zN~z#{!o^wp{r<+`;o(H3;6jLg0LLuh3tH=ImT(_{tG4}t*1D%s%vdZI$!4=(3-(H>
zd^EUYxJFnAQS)#uB$&Cj=uCE46<H$ZN^_f(QpFrtE_cq$!+l!o{1z{S=mn6^$;`Z@
zJS?SbB!8kWc5GHk`R3<gvr&XC_#UnGn{q_$f1i{xPDIf>AaFb$kN2DRj*gBVX1;Ij
z9Ho@m#*JgjK0=7y0A5?egi^{(phQbN1F+u`o-rC=ZUOx$hYY|F&68#3Tqcug85tS*
zWWL+m+qVP)0V5Oh-XS7~nVkwS*D-UqOP@T~T7MrXA#644aJ4ef627aoKIJAPgt!CX
zWI2+H{kO6;R?yld0^Vp>pU?MrsdCVGmWb{FIIEP(xCfU~2AJ81p%X4oSIU1fm&+Y?
zYwW*DB%@)&;jpO;DyleqK3_7OPQNRJ!D38Ic!WZs9l2c2tdnx3nVIx>GMOAKXzK!Q
zxpj_}dSb=wyieFuA>pY-=ee{dgz(nJA*KAEx8|f$DpIo3Nhv)ieriQ%tq851OZ?Hq
zwIbA{vsF=qdM>Sb>$ug62io4cGVt7`j7c4)!kxRuI_-&TuNA8zmpPE<iqPLp%L8d;
SXn>Xg0000<MNUMnLSTY<Fs~i}

diff --git a/static/column/sort_sel.png b/static/column/sort_sel.png
index 4c1710d9f4714f188223a8f37b29fa091cb9c818..8d848a217804f25e00684d44c1b5dfcbcc43c1e1 100644
GIT binary patch
delta 1471
zcmV;w1wi__2ha<UBYy>jNkl<ZcmeF0eN0tl9LLXdUN1<9Ft0E8hFYljLNf!w9J*{|
zmaz&4WH0~p;u@MWHP?pA8s^-}aye#e*;H^Ab2aJ3-5Ka|mCnS$m@`Z*SRhzLz&-cg
zbNYQx_qn^g%yT&x+uSZY-#x$c`~9BJ^F0p-?l~X|ci7jEhJQ`dOef`&Rz;u{)HB8I
zy3s>IZzN2tojw$^pJ7usvwv?i&VRkv*KlaFe*Dvo-Y@M`xmEwl^O3*##&yF(hGq<0
z1Ub~ugI+rx>R1~d;02z-nIXd{oUI9XK776}v+jUjYB(7Xn@$;moi2I;lBdEa?JenB
ze(8*H+Uzx_@_z*oBZnG#&}+v-9c#k_yucH@ac0PH%Vl%lv2s1$2=LPIMsJTG9C^b#
zzN_2V#b+W$4mF+|&Im8?1aEwvWthHg>GdA}JT&lvld-o;5Sr@D$BE~H5F_V=#pl2i
zyb;g3r!B)&OzXI2G8&^kZnhc{K_)=Kn8N6eptm$oxPM_e;5T`UykpUhm^4{|f-!~B
z9YJq0C?jGLp#MuT!?$~<V>=w%;Q>1kyCnu}$cUfv9qv^$=I|+^zb8o+!0e-JudG@z
zh0z_V%ktI>3g8$UC(hy_PMym=UF@dWEs#4+{F}z8k4YIKK0WIJvRpF8TJO!5j*l9H
zlyi-r$$!kb%cKh8`ALC{JZb;984Qa#h9<e0nfb7Ilz8ocScVZKj$<#a-L3sHW`eV4
zpviMZqo`avBWpq#co1UB{Wvk*nQ8Yl(JbDrHYOyCuYd=I4AT{~PMI%eZ8+k3zj&v5
zW96%gkY8%AM>nbFvwO5(U)-;ijh)7pGsdiY4S#Tod)#R(Z`~)ZH=lV|yN2FKn2&5!
z1lqiobqBRwlV*#H8DpK`K_SC9p+bim&(_a-P#(LaSRS=>t(;`1#cQOvS-Dc0q_DSW
zz89QuQLc|_+h;!@O{Ly=J09w}MRNR{JSkOkv8^<}-_Jom!+arnSjO}00y>XGnbe<5
zy??hnf<2M&&;uqs3}W^(?Dd-S+pZY3CqMT6_W2H9?a?ybW2fr3eWy+z^0#%hnbl+}
zb>Irfp@tsx+VN1w+VB7`@D$Dr8P;_(v#B;v_rcSBOHb_ci|4-ZE9YwhvYpNz^D8y)
z`J_EXy#>wZjPJ={XlD>3hZ=g&YsW(!Yk$K7yucH@anm8gomb6@&$jEM{e$j8-g@h?
z=PyC1+UA||&!5ISyc02UsPWuzMtFfIc;oXd!?Y7KFPsQ0^y@tBZ0x3=<;L%fLgHx<
zV&t6B{+k6)@J76u$XJFcn9+X4aP|wBCWjw4TLip&;kK9<jKj;0;-EL{k2Kt{5`TQr
za|8^ZL>zpwsgwf~F@@0`#Dq@;6a*OW7{v_V?r&9WhhsZDU<YEi#DEPM@l(FTIz6)*
zBS9w)J~8njuS+sR95q(aM7$v5#WwU-dwJY+>qReWc*-P($0zG0G&z;Qc+|`Z_gL56
z2#~eIjIrkVE7%W;hLm$9jb}o}GJokH@pNcT9;-?mYc1v&>bgr17Ca<<OFV2sXom&&
zbm@h{9crf<=Zu}`W<t?U^^z+=c%2jCM~hpE%GKtC6rLI07?&srMdez{m{j&MpK0wd
zPUs36GIFKd(!;KAR&G!NSx?EnMFo<ra@NSc)mv1(w9<88a)y{g9D2wEQGXC9ZlAh9
z%voO<clfc_6d!scVP+S~zEztPe`%Gg`tB?-n>bg6;8(~n&Y8xVQYMS}OG;$->dngi
z1>4kII}vzc){|1osL|{>0(XEDF3SCpkjzTRL^Ac>XU9XGE^ZNBTuPE#e1hg*59jqW
z%nQ`iN&1=eQv|w5J@{)6pEy3`h#pcsDH7%d>ZAWj4MzP700960xB$lO00006Nkl<Z
Z0{~MikcKW;&MW``002ovPDHLkV1fjs+EoAm

delta 932
zcmV;V16%yi3%Li7BYyw^b5ch_0Itp)=>Px&b4f%&R9HvtSzT-lQ562pt^UkxE72D5
zP(i{&J=IRVB5C3$`iKw@^%IGZ_-B`dk}&JH9*9H~iG<)$1xXX)QE%-N51JtQAbwhj
zc4w-!_sGobw7W%jRf3V3r`bE_e)qd)&pr1$_Ywm3P{8;ihktPMLZ0v?Wp9U~bxb^)
zfZ{w8Vt_w^sU0eP*i2SD|B-#XuCErN=n#k-0Gb5kjyt*!14G2r1;JNJBih;KNA%UV
z87AzK?HgzV@#1lLosklXmK{xMkF)#7>+A&(d>4es_;Be#X+_y`pY$-{c)hh7jFaO6
z9qH8l_T#%bSASp69B`VNX1pq!Rz39vfSTXJCG0Uf^ivMT2;r#x48*lgBQswu5_C|J
zW{ow_V7iZrSr|m(HVEaet>Q-WX{610jn7LhhoC!dJENajtr#LDONuIZEL_31o>qK>
zh?=~<^xW*!=H?KN8P=d5vw|@FXoucis8`~KbsfNJkAD|-CZyityvGb{2LWd?I5$kG
zuPGGsK)qF?7;iF|LkX#u<a*e!MrJLvYV!&86bc?QQmq79pRwO(O8tcEVZ+)B;J7y^
zUrxx#hC(sp^SKJj{^;AAQg@?aBqTz@p@+ke2p8RdmnD>+<_7ue<kOuKhjU=Q+!-_M
zRsy>rL4UyBV^Vjw`2B{phXFSyGw5<cY6a)vUD40gB{bnfW^6X4E=J|yR1ZLvF1S)l
z6Hm+U=OgNTZw8AmhAjcqdG@r?lv=B|ao8IGzLdd9mP*ZN204z&`^4t;FCiiBWej^v
zsaNL`j#@WCSm_!t`a!tEV0&z20RlTjJ+chNLVwIobd<exe#YttW|2}|Ah_NEkYrF2
z7@ISJG%y;6^$Fva*{QF}CG2U|C*ziZ9-;H5)VF3&GHzJs0Bp(Y(w`YHQc&snzShnW
z@UC_(;%mPw2N?>43q7puxY$WU*<){ta&Z;eEnsZU@^qp6yG5GTW^3&4N+egqR!(VP
zL4SEG4sw(zsF#Tz`eE=hCT@5zFCuUy7gBL3?t0t%zTMZ>K5npUx<db_ziAijkO<VG
z%ar25No(=IZ5+nGyft&LDI-<6JDp(#P5gvab6Dn&j^XeiB|P~FkE%Qw_h$|RgLm8-
zv;*zHT^R)KQpQ;=o1(I~O4M!(#I@JotR2&SW$eIJ&EEhB6^vSpH6`f)0000<MNUMn
GLSTY(VaJXD

diff --git a/static/column/supply_chain.png b/static/column/supply_chain.png
index 47daad32f61ad2b3930b036875aafd61685ba6e3..c75c75b1078b2285a376a977df0c318a8360ae6f 100644
GIT binary patch
delta 1263
zcmV<L1Q7d}7lI0qBYy<9Nkl<ZcmeE}TWefZ6vt;K#yp6Spy-2OgxaT;d;q~4UO=c)
z#WX@d0-0n+R0IVn_$=nd7nL}ZOhO*SOCws^fS`g}?H4HRQ!N_72SrH0_94w&`up$M
zd$Z<rPMMOqG|;fu*=w)0&iViLIcM)P$z}H0-)-PtKd}9Ohks{gW*(ZGn=8%F&u`LK
z=^OntuPN=4Sdvey<qiY(?C|jLxokFDpzuNZA^N^HuPN<<Sj1!jBCuxDXf(d&gu89Q
zAbqijNo;{50yCTADo}!=P3)Pit*w!zrKM~?O`6iiHpL<)vB{T3U=q(M;4Qzry!_+(
z`ubHr?pr6#Wq-60%ww)uwg}9O9&lL>+uPe`=my#>gJp}r%pxu@&2pf$h+78B7J;eR
z7j3V=S@z9o8MDn|sg0Ur*ej_89VYe!TqqQ#d0d~#fcYRzliUI|UtwS1A4{w2B)%tL
zD*(*9`F#FW8<Ve?a`L_HNwe+Ad|kerot=Hm3#4}Ca)0@AR`4lbkj>?COWeUn{5T_D
zF~;t7Q7v263C1^U(iTIzA`84@3Z{mJhJHct)5*!nxO<p<aO-U9(}0}wff4TJHwcc)
z@V_NKf@M^rTKqcJwn<Bx(xzYv3oWu);19{h1bzm=;@H^O$MVx`adGi-y<UHT{J)sm
z{oK`4GJgj5VQT-VMztEGnY5&t$cssAE*ydR{JzI$@h<MfVQj-?n};Ir;iFBr{c&Yw
zMW6B)$?D>o=mf$OjMa9y-b<>{AkBCpdIgIi&p8{|VKIp<#3Qf*Y}Pg2u?yJq6bERu
zvu`M$G~TlVJi?3g4T{c^caNXmHoYciRpV<9*ned3c_Odlhj)EL4A=!R5s$3}I7XY!
z@n)CN9ZS2zM*)2})8U`5J=(6EoYjch$=Xz4zU3E9@jb@3?n$1+?>2BF-`Ac@skt}A
z6WSr{`c&Z2(b0phqIvkQ*|i>dw=VJ64${Y;pe(K@LluBO+nlex6!M8aY9zE<%5p6u
zGk?Hcz+6N4H|O;5fX1)p@=@EwoZABI_rXIfj?=tTM_fflTWI4G@3(X;q`2tt-T!_p
zo}WSy*LWht)pK1f(6);XU}-dTF6SMg_B3`#Oo|1Iz+CWs_Q5L@pT`2M>PnSL#m-)_
zU|m~uUZWH)EC%enn8X(15tzU`Sj)D=tba@FgKrW~Yu#LQ8EHu~AtolVxv&LR!UZ|$
zM6FhPoJI0lavyXB{=kCj=Az3;OPbOagO^bk*(|UU&Nyj`FVn#OO_H`498BWS7C2FJ
zQ$y~|ADmFd^ug(Pk5+vr)^%X+&L)fHDa7BZR;zE*ceQmLSakeOKEwO{(dz2z|9={H
z(|Q8jO~B-}A~5e>EhO2j?+pH+ddpzhA~5gW-vN$qxqh35;Xr!JVA&!tv-r-CRroAE
zZD(n6J$0oiZA2=VYnCkn@9yp{kZ_BH8I5B<@LAm9v*>;!^sASqw6Sr~ib-tpWf6F7
zZS7BrURHq;w}Od9OkxW>5m*7XqG<1#%>;#I#(&Yrg~+%s&1*`#EEX|Y;TB*eG#fsP
zMGD91@1T!A&imneO=%a!A|`9s0o&xQ=-&qJ^;6k*cla6r00960x8^DL00006Nkl<Z
Z0{~I$8iv%8;3fb7002ovPDHLkV1ju)j3WR5

delta 2963
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
JPDHLkV1m>RzzzTa

diff --git a/static/column/supply_chain_sel.png b/static/column/supply_chain_sel.png
index 53c16e53b0566249e2519d3fb8184a976acdba73..c75c75b1078b2285a376a977df0c318a8360ae6f 100644
GIT binary patch
delta 1263
zcmV<L1Q7e57J>?pBYy<9Nkl<ZcmeE}TWefZ6vt;K#yp6Spy-2OgxaT;d;q~4UO=c)
z#WX@d0-0n+R0IVn_$=nd7nL}ZOhO*SOCws^fS`g}?H4HRQ!N_72SrH0_94w&`up$M
zd$Z<rPMMOqG|;fu*=w)0&iViLIcM)P$z}H0-)-PtKd}9Ohks{gW*(ZGn=8%F&u`LK
z=^OntuPN=4Sdvey<qiY(?C|jLxokFDpzuNZA^N^HuPN<<Sj1!jBCuxDXf(d&gu89Q
zAbqijNo;{50yCTADo}!=P3)Pit*w!zrKM~?O`6iiHpL<)vB{T3U=q(M;4Qzry!_+(
z`ubHr?pr6#Wq-60%ww)uwg}9O9&lL>+uPe`=my#>gJp}r%pxu@&2pf$h+78B7J;eR
z7j3V=S@z9o8MDn|sg0Ur*ej_89VYe!TqqQ#d0d~#fcYRzliUI|UtwS1A4{w2B)%tL
zD*(*9`F#FW8<Ve?a`L_HNwe+Ad|kerot=Hm3#4}Ca)0@AR`4lbkj>?COWeUn{5T_D
zF~;t7Q7v263C1^U(iTIzA`84@3Z{mJhJHct)5*!nxO<p<aO-U9(}0}wff4TJHwcc)
z@V_NKf@M^rTKqcJwn<Bx(xzYv3oWu);19{h1bzm=;@H^O$MVx`adGi-y<UHT{J)sm
z{oK`4GJgj5VQT-VMztEGnY5&t$cssAE*ydR{JzI$@h<MfVQj-?n};Ir;iFBr{c&Yw
zMW6B)$?D>o=mf$OjMa9y-b<>{AkBCpdIgIi&p8{|VKIp<#3Qf*Y}Pg2u?yJq6bERu
zvu`M$G~TlVJi?3g4T{c^caNXmHoYciRpV<9*ned3c_Odlhj)EL4A=!R5s$3}I7XY!
z@n)CN9ZS2zM*)2})8U`5J=(6EoYjch$=Xz4zU3E9@jb@3?n$1+?>2BF-`Ac@skt}A
z6WSr{`c&Z2(b0phqIvkQ*|i>dw=VJ64${Y;pe(K@LluBO+nlex6!M8aY9zE<%5p6u
zGk?Hcz+6N4H|O;5fX1)p@=@EwoZABI_rXIfj?=tTM_fflTWI4G@3(X;q`2tt-T!_p
zo}WSy*LWht)pK1f(6);XU}-dTF6SMg_B3`#Oo|1Iz+CWs_Q5L@pT`2M>PnSL#m-)_
zU|m~uUZWH)EC%enn8X(15tzU`Sj)D=tba@FgKrW~Yu#LQ8EHu~AtolVxv&LR!UZ|$
zM6FhPoJI0lavyXB{=kCj=Az3;OPbOagO^bk*(|UU&Nyj`FVn#OO_H`498BWS7C2FJ
zQ$y~|ADmFd^ug(Pk5+vr)^%X+&L)fHDa7BZR;zE*ceQmLSakeOKEwO{(dz2z|9={H
z(|Q8jO~B-}A~5e>EhO2j?+pH+ddpzhA~5gW-vN$qxqh35;Xr!JVA&!tv-r-CRroAE
zZD(n6J$0oiZA2=VYnCkn@9yp{kZ_BH8I5B<@LAm9v*>;!^sASqw6Sr~ib-tpWf6F7
zZS7BrURHq;w}Od9OkxW>5m*7XqG<1#%>;#I#(&Yrg~+%s&1*`#EEX|Y;TB*eG#fsP
zMGD91@1T!A&imneO=%a!A|`9s0o&xQ=-&qJ^;6k*cla6r00960x8^DL00006Nkl<Z
Z0{~I$8iv%8;3fb7002ovPDHLkV1ky|j41#B

delta 2841
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