From a2d9b7de06bbc8c522d7809a3ed02e3d7cc50388 Mon Sep 17 00:00:00 2001
From: dengxiongfei <dengxiongfei@qniao.cn>
Date: Tue, 25 Jan 2022 20:23:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A2=E4=BB=B7bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                        |   42 +-
 pages/enquiry-list/index.vue      |  626 ++++++++-------
 pages/for-comparison/index.vue    | 1170 +++++++++++++--------------
 pages/order-detail/index.vue      |    7 +-
 pages/paper-details/index.vue     | 1242 +++++++++++++++--------------
 pages/store/index.vue             |  666 ++++++++--------
 static/imgs/tabbar/cart-blue.png  |  Bin 0 -> 1042 bytes
 static/imgs/tabbar/cart-gray.png  |  Bin 0 -> 1992 bytes
 static/imgs/tabbar/mine-blue.png  |  Bin 0 -> 957 bytes
 static/imgs/tabbar/mine-gray.png  |  Bin 0 -> 1522 bytes
 static/imgs/tabbar/store-blue.png |  Bin 959 -> 1151 bytes
 static/imgs/tabbar/store-gray.png |  Bin 1169 -> 1717 bytes
 12 files changed, 1896 insertions(+), 1857 deletions(-)
 create mode 100644 static/imgs/tabbar/cart-blue.png
 create mode 100644 static/imgs/tabbar/cart-gray.png
 create mode 100644 static/imgs/tabbar/mine-blue.png
 create mode 100644 static/imgs/tabbar/mine-gray.png

diff --git a/pages.json b/pages.json
index f32c716..e1d26a6 100644
--- a/pages.json
+++ b/pages.json
@@ -137,23 +137,23 @@
         "navigationStyle": "custom",
         "enablePullDownRefresh": false
       }
-    },
-	{
-	  "path": "pages/account-management/index",
-	  "style": {
-	    "navigationBarTitleText": "账号管理",
-	    "navigationStyle": "custom",
-	    "enablePullDownRefresh": false
-	  }
-	},
-	{
-	  "path": "pages/add-account/index",
-	  "style": {
-	    "navigationBarTitleText": "新增企业账号",
-	    "navigationStyle": "custom",
-	    "enablePullDownRefresh": false
-	  }
-	}
+    },
+    {
+      "path": "pages/account-management/index",
+      "style": {
+        "navigationBarTitleText": "账号管理",
+        "navigationStyle": "custom",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/add-account/index",
+      "style": {
+        "navigationBarTitleText": "新增企业账号",
+        "navigationStyle": "custom",
+        "enablePullDownRefresh": false
+      }
+    }
   ],
   "globalStyle": {
     "navigationBarTextStyle": "black",
@@ -175,14 +175,14 @@
       },
       {
         "pagePath": "pages/cart/index",
-        "iconPath": "static/imgs/tabbar/store-gray.png",
-        "selectedIconPath": "static/imgs/tabbar/store-blue.png",
+        "iconPath": "static/imgs/tabbar/cart-gray.png",
+        "selectedIconPath": "static/imgs/tabbar/cart-blue.png",
         "text": "购物车"
       },
       {
         "pagePath": "pages/mine/index",
-        "iconPath": "static/imgs/tabbar/store-gray.png",
-        "selectedIconPath": "static/imgs/tabbar/store-blue.png",
+        "iconPath": "static/imgs/tabbar/mine-gray.png",
+        "selectedIconPath": "static/imgs/tabbar/mine-blue.png",
         "text": "个人中心"
       }
     ]
diff --git a/pages/enquiry-list/index.vue b/pages/enquiry-list/index.vue
index 6475ec5..57c74ef 100644
--- a/pages/enquiry-list/index.vue
+++ b/pages/enquiry-list/index.vue
@@ -1,56 +1,64 @@
 <template>
-	<view class="warpper">
-		<uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="询价列表"></uni-nav-bar>
-		<view class="">
-			<view class="status-bar">
-				<view v-for="(item, index) in statusBarArray" :key="index" :class="{ box: true, 'box--selected': current == index }" @click="selectStatus(item, index)">
-					{{ item }}
-				</view>
-			</view>
-			<scroll-list ref="list" :option="option" @load="upCallback" @refresh="downCallback" style="background-color: #ffffff">
-				<view class="content" v-for="(item, index) in list" :key="index">
-					<uGap v-if="index > 0"></uGap>
-					<view class="header">
-						<view class="header-title">{{ item.belongEnterpriseName }}</view>
-						<view class="header-value">
-							<text :class="item.status == 30131 || item.status == 30138 ? 'failure' : ''">{{ item.status | statusName }}</text>
-						</view>
-					</view>
-					<view class="box" v-if="item.status != 30116 && item.status != 30131">
-						<view class="list-box" v-for="(sitem, sindex) in item.itemList" :key="sindex">
-							<image class="image" :src="sitem.productImg || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif'" mode=""></image>
-							<view class="info-box">
-								<view class="name">{{ sitem.brandName }}</view>
-								<view class="value">
-									{{ sitem.categoryName }}/{{ sitem.paperName }}/{{ sitem.gramWeight }}g/{{ sitem.width }}*{{ sitem.length }}/{{ sitem.quantity }}张
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="box" v-else>
-						<view class="list-box" v-for="(sitem, sindex) in item.reply.replyItemList" :key="sindex">
-							<image class="image" :src="sitem.productImg || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif'" mode=""></image>
-							<view class="info-box">
-								<view class="name">{{ sitem.brandName }}</view>
-								<view class="value">
-									{{ sitem.categoryName }}/{{ sitem.paperName }}/{{ sitem.gramWeight }}g/{{ sitem.width }}*{{ sitem.length }}/{{ sitem.quantity }}张
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="other" v-if="item.status == 30116 || item.status == 30131">
-						<view class="left">{{ item.createTime }}</view>
-						<view class="right">
-							<view class="">
-								<text class="price" v-if="item.reply">¥ {{ item.reply.totalPrice }}</text>
-							</view>
-							<view class="btn" @tap="placeOrderTap(item,item.reply.replyItemList)" v-if="item.status == 30116">去下单</view>
-						</view>
-					</view>
-				</view>
-			</scroll-list>
-		</view>
-	</view>
+  <view class="wrapper">
+    <uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="询价列表"></uni-nav-bar>
+    <view class="">
+      <view class="status-bar">
+        <view v-for="(item, index) in statusBarArray" :key="index" :class="{ box: true, 'box--selected': current == index }" @click="selectStatus(item, index)">
+          {{ item }}
+        </view>
+      </view>
+      <scroll-list ref="list" :option="option" @load="upCallback" @refresh="downCallback">
+        <view class="content" v-for="(item, index) in list" :key="index">
+          <uGap v-if="index > 0"></uGap>
+          <view class="header">
+            <view class="header-title">{{ item.belongEnterpriseName }}</view>
+            <view class="header-value">
+              <text :class="item.status == 30131 || item.status == 30138 ? 'failure' : ''">{{ item.status | statusName }}</text>
+            </view>
+          </view>
+          <view class="box" v-if="item.status != 30116 && item.status != 30131">
+            <view class="list-box" v-for="(subItem, subIndex) in item.itemList" :key="subIndex">
+              <image
+                class="image"
+                :src="subItem.productImg || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/paper-default-small.png'"
+                mode=""
+              ></image>
+              <view class="info-box">
+                <view class="name">{{ subItem.brandName }}</view>
+                <view class="value">
+                  {{ subItem.categoryName }}/{{ subItem.paperName }}/{{ subItem.gramWeight }}g/{{ subItem.width }}*{{ subItem.length }}/{{ subItem.quantity }}张
+                </view>
+              </view>
+            </view>
+          </view>
+          <view class="box" v-else>
+            <view class="list-box" v-for="(subItem, subIndex) in item.reply.replyItemList" :key="subIndex">
+              <image
+                class="image"
+                :src="subItem.productImg || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/paper-default-small.png'"
+                mode=""
+              ></image>
+              <view class="info-box">
+                <view class="name">{{ subItem.brandName }}</view>
+                <view class="value">
+                  {{ subItem.categoryName }}/{{ subItem.paperName }}/{{ subItem.gramWeight }}g/{{ subItem.width }}*{{ subItem.length }}/{{ subItem.quantity }}张
+                </view>
+              </view>
+            </view>
+          </view>
+          <view class="other" v-if="item.status == 30116 || item.status == 30131">
+            <view class="left">{{ item.createTime }}</view>
+            <view class="right">
+              <view class="">
+                <text class="price" v-if="item.reply">¥ {{ item.reply.totalPrice }}</text>
+              </view>
+              <view class="btn" @tap="placeOrderTap(item, item.reply.replyItemList)" v-if="item.status == 30116">去下单</view>
+            </view>
+          </view>
+        </view>
+      </scroll-list>
+    </view>
+  </view>
 </template>
 
 <script>
@@ -58,268 +66,266 @@ import { go2, back } from '@/utils/hook.js'
 import uGap from '@/components/u-gap/u-gap.vue'
 import { getEnquiryOrder, createByEnquiry } from '@/apis/enquiryListApi.js'
 export default {
-	components: { uGap },
-	data() {
-		return {
-			current: 0,
-			statusBarArray: ['全部', '待报价', '已报价', '已成交'],
-			option: {
-				size: 10,
-				auto: true,
-				emptyText: '暂无数据~',
-				background: '#F7F8FA',
-				disabled: false,
-				emptyImage: '/static/imgs/order/order-empty.png'
-			},
+  components: { uGap },
+  data() {
+    return {
+      current: 0,
+      statusBarArray: ['全部', '待报价', '已报价', '已成交'],
+      option: {
+        size: 10,
+        auto: true,
+        emptyText: '暂无数据~',
+        background: '#F7F8FA',
+        disabled: false,
+        emptyImage: '/static/imgs/order/order-empty.png'
+      },
 
-			pagination: {
-				status: 0,
-				pageNum: 0, // 初始会执行一次下拉加载
-				pageSize: 10
-			},
-			list: []
-		}
-	},
-	filters: {
-		statusName(e) {
-			let name = ''
-			switch (e) {
-				case 30114:
-					name = '待报价'
-					break
-				case 30116:
-					name = '已报价'
-					break
-				case 30131:
-					name = '已成交'
-					break
-				case 30138:
-					name = '已失效'
-					break
-				default:
-					break
-			}
-			return name
-		}
-	},
-	onShow() {
-		// this.getList()
-	},
-	methods: {
-		go2,
-		back,
-		selectStatus(item, index) {
-			this.current = index
-			this.pagination.status = index
-			this.downCallback()
-		},
-		getList() {
-			return new Promise((resolve, reject) => {
-				getEnquiryOrder({ ...this.pagination })
-					.then(res => {
-						// console.log('询价列表', res.records)
-						if (res) {
-							if (this.pagination.pageNum == 1) {
-								this.list = res.records
-							} else {
-								this.list = this.list.concat(res.records)
-							}
-							resolve({ list: this.list, total: res.total })
-						} else {
-							reject()
-						}
-					})
-					.catch(err => {
-						reject(err)
-					})
-			})
-		},
-		downCallback() {
-			this.pagination.pageNum = 1
-			this.getList()
-				.then(({ list, total }) => {
-					this.$refs.list.refreshSuccess({ list, total })
-				})
-				.catch(() => {
-					this.$refs.list.refreshFail()
-				})
-		},
-		upCallback() {
-			this.pagination.pageNum++
-			this.getList()
-				.then(({ list, total }) => {
-					this.$refs.list.loadSuccess({ list, total })
-				})
-				.catch(() => {
-					this.$refs.list.loadFail()
-				})
-		},
-		// 确认下单
-		placeOrderTap(item, replyItemList) {
-			console.log('replyItemList', replyItemList)
-			const params = {
-				enquiryId: item.id,
-				orderGoodsList: replyItemList,
-				purchaserEnterpriseId: this.$store.state.companyInfo.id,
-				userId: this.$store.state.userInfo.userId,
-				// purchaserEnterpriseId: '677166943471538176',
-				// userId: '573244119569272832',
-			}
-			createByEnquiry(params).then(res => {
-				if (res) {
-					uni.showToast({
-						title: '下单成功',
-						icon: 'success'
-					})
-					setTimeout(() => {
-						go2('order-make', { orderId: item.orderId })
-					}, 500)
-				}
-			})
-		}
-	}
+      pagination: {
+        status: 0,
+        pageNum: 0, // 初始会执行一次下拉加载
+        pageSize: 10
+      },
+      list: []
+    }
+  },
+  filters: {
+    statusName(e) {
+      let name = ''
+      switch (e) {
+        case 30114:
+          name = '待报价'
+          break
+        case 30116:
+          name = '已报价'
+          break
+        case 30131:
+          name = '已成交'
+          break
+        case 30138:
+          name = '已失效'
+          break
+        default:
+          break
+      }
+      return name
+    }
+  },
+  onShow() {
+    this.downCallback()
+  },
+  methods: {
+    go2,
+    back,
+    selectStatus(item, index) {
+      this.current = index
+      this.pagination.status = index
+      this.downCallback()
+    },
+    getList() {
+      return new Promise((resolve, reject) => {
+        getEnquiryOrder({ ...this.pagination })
+          .then((res) => {
+            // console.log('询价列表', res.records)
+            if (res) {
+              if (this.pagination.pageNum == 1) {
+                this.list = res.records
+              } else {
+                this.list = this.list.concat(res.records)
+              }
+              resolve({ list: this.list, total: res.total })
+            } else {
+              reject()
+            }
+          })
+          .catch((err) => {
+            reject(err)
+          })
+      })
+    },
+    downCallback() {
+      this.pagination.pageNum = 1
+      this.getList()
+        .then(({ list, total }) => {
+          this.$refs.list.refreshSuccess({ list, total })
+        })
+        .catch(() => {
+          this.$refs.list.refreshFail()
+        })
+    },
+    upCallback() {
+      this.pagination.pageNum++
+      this.getList()
+        .then(({ list, total }) => {
+          this.$refs.list.loadSuccess({ list, total })
+        })
+        .catch(() => {
+          this.$refs.list.loadFail()
+        })
+    },
+    // 确认下单
+    placeOrderTap(item, replyItemList) {
+      const params = {
+        enquiryId: item.id,
+        orderGoodsList: replyItemList,
+        purchaserEnterpriseId: this.$store.state.companyInfo.id,
+        userId: this.$store.state.userInfo.userId
+      }
+      createByEnquiry(params).then((res) => {
+        if (res) {
+          uni.showToast({
+            title: '下单成功',
+            icon: 'success'
+          })
+          setTimeout(() => {
+            go2('order-make', { orderId: res.orderId })
+          }, 500)
+        }
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
-.warpper {
-	display: flex;
-	flex-direction: column;
-	flex: 1;
-	height: 100vh;
-	.status-bar {
-		flex-grow: 0;
-		flex-shrink: 0;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 0 32rpx;
-		// border-bottom: 2rpx solid #DDDDDD;
-		background-color: #fff;
-		border-bottom: 2rpx solid rgba($color: #dddddd, $alpha: 0.8);
-		height: 90rpx;
-		.box {
-			height: 86rpx;
-			flex-grow: 0;
-			flex-shrink: 0;
-			color: #000000;
-			font-size: 28rpx;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			// border-bottom: 4rpx solid #f8f8f8;
-		}
-		.box--selected {
-			border-bottom: 4rpx solid #007aff;
-			color: #007aff;
-		}
-	}
-	.content {
-		.header {
-			display: flex;
-			flex-direction: row;
-			justify-content: space-between;
-			align-items: center;
-			height: 88rpx;
-			background: #ffffff;
-			padding: 0rpx 32rpx;
-			border-bottom: 2rpx solid #dddddd;
-			.header-title {
-				font-size: 30rpx;
-				color: #333333;
-				letter-spacing: 0;
-				font-weight: 500;
-			}
-			.header-value {
-				font-size: 30rpx;
-				color: #ff5368;
-				letter-spacing: 0;
-				text-align: right;
-				font-weight: 500;
-				.failure {
-					color: #888888;
-				}
-			}
-		}
-		.box {
-			padding: 24rpx 32rpx;
-			.list-box:nth-last-child(even) {
-				border-bottom: 2rpx solid #dddddd;
-			}
-			.list-box {
-				display: flex;
-				flex-direction: row;
-				height: 148rpx;
-				background: #ffffff;
+.wrapper {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  height: 100vh;
+  .status-bar {
+    flex-grow: 0;
+    flex-shrink: 0;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 32rpx;
+    // border-bottom: 2rpx solid #DDDDDD;
+    background-color: #fff;
+    border-bottom: 2rpx solid rgba($color: #dddddd, $alpha: 0.8);
+    height: 90rpx;
+    .box {
+      height: 86rpx;
+      flex-grow: 0;
+      flex-shrink: 0;
+      color: #000000;
+      font-size: 28rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      // border-bottom: 4rpx solid #f8f8f8;
+    }
+    .box--selected {
+      border-bottom: 4rpx solid #007aff;
+      color: #007aff;
+    }
+  }
+  .content {
+    .header {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: center;
+      height: 88rpx;
+      background: #ffffff;
+      padding: 0rpx 32rpx;
+      border-bottom: 2rpx solid #dddddd;
+      .header-title {
+        font-size: 30rpx;
+        color: #333333;
+        letter-spacing: 0;
+        font-weight: 500;
+      }
+      .header-value {
+        font-size: 30rpx;
+        color: #ff5368;
+        letter-spacing: 0;
+        text-align: right;
+        font-weight: 500;
+        .failure {
+          color: #888888;
+        }
+      }
+    }
+    .box {
+      background-color: #fff;
+      padding: 24rpx 32rpx;
+      .list-box:nth-last-child(even) {
+        border-bottom: 2rpx solid #dddddd;
+      }
+      .list-box {
+        display: flex;
+        flex-direction: row;
+        height: 148rpx;
+        background: #ffffff;
 
-				padding: 24rpx 0rpx;
-				.image {
-					width: 100rpx;
-					height: 100rpx;
-					flex: 0 0 100rpx;
-					margin-right: 20rpx;
-				}
-				.info-box {
-					.name {
-						font-size: 30rpx;
-						color: #333333;
-						letter-spacing: 0;
-						text-align: left;
-						font-weight: 400;
-						padding-top: 4rpx;
-					}
-					.value {
-						font-size: 26rpx;
-						color: #888888;
-						letter-spacing: 0;
-						text-align: left;
-						font-weight: 400;
-						padding-top: 26rpx;
-					}
-				}
-			}
-		}
-		.other {
-			display: flex;
-			flex-direction: row;
-			justify-content: space-between;
-			align-items: center;
-			padding: 0rpx 32rpx;
-			height: 80rpx;
-			background: #ffffff;
-			border-top: 2rpx solid #dddddd;
-			.left {
-				font-size: 26rpx;
-				color: #888888;
-				letter-spacing: 0;
-				text-align: left;
-				font-weight: 400;
-			}
-			.right {
-				display: flex;
-				align-items: center;
-				.price {
-					font-size: 30rpx;
-					color: #ff5368;
-					letter-spacing: 0;
-					text-align: right;
-					font-weight: 500;
-				}
-				.btn {
-					margin-left: 24rpx;
-					width: 132rpx;
-					height: 54rpx;
-					line-height: 54rpx;
-					background: #007aff;
-					border-radius: 27rpx;
-					font-size: 28rpx;
-					color: #ffffff;
-					letter-spacing: 0;
-					text-align: center;
-					font-weight: 500;
-				}
-			}
-		}
-	}
+        padding: 24rpx 0rpx;
+        .image {
+          width: 100rpx;
+          height: 100rpx;
+          flex: 0 0 100rpx;
+          margin-right: 20rpx;
+        }
+        .info-box {
+          .name {
+            font-size: 30rpx;
+            color: #333333;
+            letter-spacing: 0;
+            text-align: left;
+            font-weight: 400;
+            padding-top: 4rpx;
+          }
+          .value {
+            font-size: 26rpx;
+            color: #888888;
+            letter-spacing: 0;
+            text-align: left;
+            font-weight: 400;
+            padding-top: 26rpx;
+          }
+        }
+      }
+    }
+    .other {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: center;
+      padding: 0rpx 32rpx;
+      height: 80rpx;
+      background: #ffffff;
+      border-top: 2rpx solid #dddddd;
+      .left {
+        font-size: 26rpx;
+        color: #888888;
+        letter-spacing: 0;
+        text-align: left;
+        font-weight: 400;
+      }
+      .right {
+        display: flex;
+        align-items: center;
+        .price {
+          font-size: 30rpx;
+          color: #ff5368;
+          letter-spacing: 0;
+          text-align: right;
+          font-weight: 500;
+        }
+        .btn {
+          margin-left: 24rpx;
+          width: 132rpx;
+          height: 54rpx;
+          line-height: 54rpx;
+          background: #007aff;
+          border-radius: 27rpx;
+          font-size: 28rpx;
+          color: #ffffff;
+          letter-spacing: 0;
+          text-align: center;
+          font-weight: 500;
+        }
+      }
+    }
+  }
 }
-</style>
+</style>
diff --git a/pages/for-comparison/index.vue b/pages/for-comparison/index.vue
index c02a2a4..87b1c4f 100644
--- a/pages/for-comparison/index.vue
+++ b/pages/for-comparison/index.vue
@@ -1,148 +1,154 @@
 <template>
-	<view class="content">
-		<uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="实单询比价"></uni-nav-bar>
-		<view>
-			<view class="hint-box">全网优质原纸供应商，20分钟极速响应。</view>
-			<view class="qn-form-item qn-form-item">
-				<view class="label">
-					<uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons>
-					<text class="label__text">纸种</text>
-				</view>
-				<view class="value">
-					<picker :value="form.categoryIndex" @change="categoryChange" :range="categoryNameList">
-						<view>
-							<text class="uni-input">{{ form.categoryName }}</text>
-							<uni-icons type="right" color="#000000" size="16"></uni-icons>
-						</view>
-					</picker>
-				</view>
-			</view>
-			<view class="qn-form-item qn-form-item">
-				<view class="label">
-					<uni-icons custom-prefix="iconfont"  type="icon-required" size="14" color="#F5222D"></uni-icons>
-					<text class="label__text">品牌</text>
-				</view>
-				<view class="value">
-					<picker :value="form.brandIndex" @change="brandChange" :range="brandNameList" >
-						<view>
-							<text class="uni-input">{{ form.brandName }}</text>
-							<uni-icons type="right" color="#000000" size="16"></uni-icons>
-						</view>
-					</picker>
-				</view>
-			</view>
-			<view class="qn-form-item qn-form-item">
-				<view class="label">
-					<uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons>
-					<text class="label__text">纸品名称</text>
-				</view>
-				<view class="value"><qn-easyinput :maxlength="20" v-model="form.paperName" :inputBorder="false" text="right" placeholder="请输入纸品名称"></qn-easyinput></view>
-			</view>
-			<view class="qn-form-item qn-form-item">
-				<view class="label">
-					<uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons>
-					<text class="label__text">克重(g)</text>
-				</view>
-				<view class="value">
-					<picker :value="form.gramWeightIndex"  @change="gramWeightChange"  :range="weightList">
-						<view>
-							<text class="uni-input">{{ form.gramWeight }}</text>
-							<uni-icons type="right" color="#000000" size="16"></uni-icons>
-						</view>
-					</picker>
-				</view>
-			</view>
-			<view class="qn-form-item-gg ">
-				<view class="label">
-					<uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons>
-					<text class="label__text">规格(mm)</text>
-				</view>
-				<view class="value">
-					<view class="value">
-						<!-- <qn-easyinput :maxlength="20" v-model="form.shortName" :inputBorder="false" text="right" placeholder="请输入数量"></qn-easyinput> -->
-						<radio-group>
-							<label v-for="(ritem, rindex) in radioGroupList" :key="rindex" @tap="specificationTap(ritem, rindex)">
-								<radio :checked="rindex === 0" style="transform:scale(0.7)" />
-								<text class="uni-input">{{ ritem.name }}</text>
-							</label>
-						</radio-group>
-					</view>
-					<view class="input-row">
-						<view class=""><uni-easyinput :inputBorder="false" class="easyinput" type="number" v-model="form.width" placeholder="请输入"></uni-easyinput></view>
-						<view class="symbol">x</view>
-						<view class=""><uni-easyinput :inputBorder="false" class="easyinput" type="number" v-model="form.length" placeholder="请输入"></uni-easyinput></view>
-					</view>
-				</view>
-			</view>
-			<view class="qn-form-item qn-form-item">
-				<view class="label">
-					<uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons>
-					<text class="label__text">数量(张)</text>
-				</view>
-				<view class="value">
-					<view class="value"><qn-easyinput :maxlength="20" v-model="form.quantity" :inputBorder="false" text="right" placeholder="请输入数量"></qn-easyinput></view>
-				</view>
-			</view>
-			<view class="qn-form-item qn-form-item">
-				<view class="label"><text class="label__text">交货时间</text></view>
-				<view class="value">
-					<picker :value="paperIndex" :range="deliveryTimeList" @change="deliveryTimeChange">
-						<view>
-							<text class="uni-input">{{ form.deliveryDay }}</text>
-							<uni-icons type="right" color="#000000" size="16"></uni-icons>
-						</view>
-					</picker>
-				</view>
-			</view>
-			<view class="qn-form-item qn-form-item" style="border: none;">
-				<view class="label">
-					<!-- <uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons> -->
-					<text class="label__text">交货区域</text>
-				</view>
-				<view class="value">
-					<!-- <qn-easyinput v-model="form.shortName" :inputBorder="false" text="right" placeholder="选择所在区域"></qn-easyinput> -->
-					<qn-data-picker
-						:readonly="hasSelected"
-						text="right"
-						:border="false"
-						class="qn-picker"
-						placeholder="区域"
-						popup-title="请选择城市"
-						:map="{ text: 'name', value: 'id' }"
-						@change="onAreaChange"
-						:clear-icon="true"
-						:localdata="items"
-					>
-						<text v-if="form.locDistrictId">
-							{{ `${form.deliveryProvinceName || ''}/${form.deliveryCityName || ''}/${form.deliveryDistrictName || ''}/${form.deliveryStreetName || ''}` }}
-						</text>
-					</qn-data-picker>
-				</view>
-			</view>
-			<uGap></uGap>
-			<view class="qn-form-item-remark">
-				<view class="label"><text class="label__text">询价备注</text></view>
-				<view class="value">
-					<qn-easyinput
-						class="paper-price-textArea"
-						:maxlength="200"
-						:styles="{ disableColor: '#F7F8FA' }"
-						v-model="form.remark"
-						:inputBorder="false"
-						type="textarea"
-						placeholder="请输入拜访对象"
-					></qn-easyinput>
-				</view>
-			</view>
-		</view>
+  <view class="content">
+    <uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="实单询比价"></uni-nav-bar>
+    <view>
+      <view class="hint-box">全网优质原纸供应商，20分钟极速响应。</view>
+      <view class="qn-form-item qn-form-item">
+        <view class="label">
+          <uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons>
+          <text class="label__text">纸种</text>
+        </view>
+        <view class="value">
+          <picker :value="form.categoryIndex" @change="categoryChange" :range="categoryNameList">
+            <view>
+              <text class="uni-input">{{ form.categoryName }}</text>
+              <uni-icons type="right" color="#000000" size="16"></uni-icons>
+            </view>
+          </picker>
+        </view>
+      </view>
+      <view class="qn-form-item qn-form-item">
+        <view class="label">
+          <uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons>
+          <text class="label__text">品牌</text>
+        </view>
+        <view class="value">
+          <picker :value="form.brandIndex" @change="brandChange" :range="brandNameList">
+            <view>
+              <text class="uni-input">{{ form.brandName }}</text>
+              <uni-icons type="right" color="#000000" size="16"></uni-icons>
+            </view>
+          </picker>
+        </view>
+      </view>
+      <view class="qn-form-item qn-form-item">
+        <view class="label">
+          <uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons>
+          <text class="label__text">纸品名称</text>
+        </view>
+        <view class="value">
+          <qn-easyinput :maxlength="20" v-model="form.paperName" :inputBorder="false" text="right" placeholder="请输入纸品名称"></qn-easyinput>
+        </view>
+      </view>
+      <view class="qn-form-item qn-form-item">
+        <view class="label">
+          <uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons>
+          <text class="label__text">克重(g)</text>
+        </view>
+        <view class="value">
+          <picker :value="form.gramWeightIndex" @change="gramWeightChange" :range="weightList">
+            <view>
+              <text class="uni-input">{{ form.gramWeight }}</text>
+              <uni-icons type="right" color="#000000" size="16"></uni-icons>
+            </view>
+          </picker>
+        </view>
+      </view>
+      <view class="qn-form-item-gg">
+        <view class="label">
+          <uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons>
+          <text class="label__text">规格(mm)</text>
+        </view>
+        <view class="value">
+          <view class="value">
+            <!-- <qn-easyinput :maxlength="20" v-model="form.shortName" :inputBorder="false" text="right" placeholder="请输入数量"></qn-easyinput> -->
+            <radio-group>
+              <label v-for="(ritem, rindex) in radioGroupList" :key="rindex" @tap="specificationTap(ritem, rindex)">
+                <radio :checked="rindex === 0" style="transform: scale(0.7)" />
+                <text class="uni-input">{{ ritem.name }}</text>
+              </label>
+            </radio-group>
+          </view>
+          <view class="input-row">
+            <view class=""><uni-easyinput :inputBorder="false" class="easyinput" type="number" v-model="form.width" placeholder="请输入"></uni-easyinput></view>
+            <view class="symbol">x</view>
+            <view class="">
+              <uni-easyinput :inputBorder="false" class="easyinput" type="number" v-model="form.length" placeholder="请输入"></uni-easyinput>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="qn-form-item qn-form-item">
+        <view class="label">
+          <uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons>
+          <text class="label__text">数量(张)</text>
+        </view>
+        <view class="value">
+          <view class="value">
+            <qn-easyinput :maxlength="20" v-model="form.quantity" :inputBorder="false" text="right" placeholder="请输入数量"></qn-easyinput>
+          </view>
+        </view>
+      </view>
+      <view class="qn-form-item qn-form-item">
+        <view class="label"><text class="label__text">交货时间</text></view>
+        <view class="value">
+          <picker :value="paperIndex" :range="deliveryTimeList" @change="deliveryTimeChange">
+            <view>
+              <text class="uni-input">{{ form.deliveryDay }}</text>
+              <uni-icons type="right" color="#000000" size="16"></uni-icons>
+            </view>
+          </picker>
+        </view>
+      </view>
+      <view class="qn-form-item qn-form-item" style="border: none">
+        <view class="label">
+          <!-- <uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons> -->
+          <text class="label__text">交货区域</text>
+        </view>
+        <view class="value">
+          <!-- <qn-easyinput v-model="form.shortName" :inputBorder="false" text="right" placeholder="选择所在区域"></qn-easyinput> -->
+          <qn-data-picker
+            :readonly="hasSelected"
+            text="right"
+            :border="false"
+            class="qn-picker"
+            placeholder="区域"
+            popup-title="请选择城市"
+            :map="{ text: 'name', value: 'id' }"
+            @change="onAreaChange"
+            :clear-icon="true"
+            :localdata="items"
+          >
+            <text v-if="form.locDistrictId">
+              {{ `${form.deliveryProvinceName || ''}/${form.deliveryCityName || ''}/${form.deliveryDistrictName || ''}/${form.deliveryStreetName || ''}` }}
+            </text>
+          </qn-data-picker>
+        </view>
+      </view>
+      <uGap></uGap>
+      <view class="qn-form-item-remark">
+        <view class="label"><text class="label__text">询价备注</text></view>
+        <view class="value">
+          <qn-easyinput
+            class="paper-price-textArea"
+            :maxlength="200"
+            :styles="{ disableColor: '#F7F8FA' }"
+            v-model="form.remark"
+            :inputBorder="false"
+            type="textarea"
+            placeholder="请输入询价备注"
+          ></qn-easyinput>
+        </view>
+      </view>
+    </view>
 
-		<qn-footer fixed height="120rpx">
-			<view class="button-area">
-				<!-- <view class="button button__cancel" @click="back"><text class="text">取消</text></view> -->
-				<view class="button button__submit" @click="addUser"><text class="text" style="color: white">提交询价</text></view>
-			</view>
-		</qn-footer>
-	</view>
+    <qn-footer fixed height="120rpx">
+      <view class="button-area">
+        <!-- <view class="button button__cancel" @click="back"><text class="text">取消</text></view> -->
+        <view class="button button__submit" @click="addUser"><text class="text" style="color: white">提交询价</text></view>
+      </view>
+    </qn-footer>
+  </view>
 </template>
 
 <script>
@@ -156,469 +162,469 @@ import uGap from '@/components/u-gap/u-gap.vue'
 import { createEnquiryOrder, getCategoryList } from '@/apis/forComparisonApi.js'
 const validateFields = ['categoryName', 'brandName', 'paperName', 'gramWeight', 'width', 'length', 'quantity']
 export default {
-	components: { qnEasyinput, qnDataPicker, qnDatetimePicker, qnFooter, uGap },
-	data() {
-		return {
-			paperIndex: 0,
-			categoryNameList: [],
-			brandNameList: [],
-			weightList: [],
-			deliveryTimeList: ['当天到', '明天到'],
-			radioGroupList: [
-				{
-					name: '正度',
-					width: '787',
-					length: '1092',
-					disabled: true
-				},
-				{
-					name: '大度',
-					width: '889',
-					length: '1194',
-					disabled: true
-				},
-				{
-					name: '特规分切',
-					width: '',
-					length: '',
-					disabled: false
-				}
-			],
-			form: {
-				deliveryArea: '',
-				deliveryCityId: '',
-				deliveryCityName: '',
-				deliveryDay: '',
-				deliveryDayIndex: 0,
-				deliveryDistrictId: '',
-				deliveryDistrictName: '',
-				deliveryId: '',
-				deliveryProvinceId: '',
-				deliveryProvinceName: '',
-				deliveryStreetId: '',
-				deliveryStreetName: '',
-				detailList: [],
-				offerEnterprise: '',
-				remark: '',
-				brandId: '',
-				brandName: '',
-				brandIndex: 0,
-				categoryId: '',
-				categoryName: '',
-				categoryIndex: 0,
-				gramWeight: '',
-				gramWeightIndex: 0,
-				length: '1092',
-				paperName: '',
-				quantity: '',
-				remark: '',
-				width: '787',
-				productImg: '',
-			},
-			searchList: [],
-			hasSelected: false,
-			items: []
-		}
-	},
-	mounted() {
-		getArea().then(res => {
-			if (res) {
-				this.items = res
-			}
-		})
-	},
-	onLoad(option) {
-		this.form.offerEnterprise = option.id
-		this.form.productImg = option.productImg
-		this.getCategoryList()
-	},
-	methods: {
-		back,
-		// 查询纸种列表
-		getCategoryList() {
-			const params = {
-				paperSupplierId: this.$store.state.supplierId
-			}
-			getCategoryList(params).then(res => {
-				// console.log('纸种列表', res)
-				if (res) {
-					this.categoryNameList = res.categoryNameList
-					this.brandNameList = res.brandNameList
-					this.weightList = res.weightList
-					this.form.categoryName = this.categoryNameList[0]
-					this.form.brandName = this.brandNameList[0]
-					this.form.gramWeight = this.weightList[0]
-				}
-			})
-		},
-		// 选择纸种
-		categoryChange(e) {
-			// console.log('e.target.value', e.target.value)
-			let index = e.target.value
-			this.form.categoryIndex = e.target.value
-			this.form.categoryName = this.categoryNameList[index]
-		},
-		// 选择品牌
-		brandChange(e) {
-			let index = e.target.value
-			this.form.brandIndex = e.target.value
-			this.form.brandName = this.brandNameList[index]
-		},
-		// 克重
-		gramWeightChange(e) {
-			let index = e.target.value
-			this.form.gramWeightIndex = e.target.value
-			this.form.gramWeight = this.weightList[index]
-		},
-		// 规格切换
-		specificationTap(item, index) {
-			this.form.width = item.width
-			this.form.length = item.length
-		},
-		// 交货时间
-		deliveryTimeChange(e) {
-			this.form.deliveryDayIndex = e.target.value
-			// 0 当天 1明天
-			if (this.form.deliveryDayIndex == 0) {
-				this.form.deliveryDay = this.getDay(0, 3600000)
-			} else {
-				this.form.deliveryDay = this.getDay(1, 3600000)
-			}
-		},
-		onAreaChange(e) {
-			if (e.detail.value && e.detail.value.length > 0) {
-				const [province, city, district, street] = e.detail.value
-				this.form.deliveryProvinceId = province.value
-				this.form.deliveryProvinceName = province.text
-				this.form.deliveryCityId = city.value
-				this.form.deliveryCityName = city.text
-				this.form.deliveryDistrictId = district.value
-				this.form.deliveryDistrictName = district.text
-				this.form.deliveryStreetId = street.value
-				this.form.deliveryStreetName = street.text
-				this.form.deliveryArea = province.text + city.text + district.text + street.text
-			} else {
-				this.form.deliveryProvinceId = null
-				this.form.deliveryProvinceName = null
-				this.form.deliveryCityId = null
-				this.form.deliveryCityName = null
-				this.form.deliveryDistrictId = null
-				this.form.deliveryDistrictName = null
-				this.form.deliveryStreetId = null
-				this.form.deliveryStreetName = null
-				this.form.deliveryArea = null
-			}
-		},
-		selectedImage(type) {
-			uploadImage()
-				.then(urls => {
-					if (urls) {
-						this.form[type] = urls[0]
-					}
-				})
-				.catch(e => {
-					uni.showToast({
-						title: '上传失败',
-						icon: 'fail'
-					})
-				})
-		},
-		showImage() {
-			uni.previewImage({
-				urls: [this.form.businessLicenseImg]
-			})
-		},
-		addUser() {
-			for (let i = 0; i < validateFields.length; i++) {
-				if (this.form[validateFields[i]] === null || this.form[validateFields[i]] === '') {
-					uni.showToast({
-						title: '请完善信息',
-						icon: 'none'
-					})
-					return
-				}
-			}
-			const params = {
-				deliveryArea: this.form.deliveryArea,
-				deliveryCityId: this.form.deliveryCityId,
-				deliveryCityName: this.form.deliveryCityName,
-				deliveryDay: this.form.deliveryDay,
-				deliveryDistrictId: this.form.deliveryDistrictId,
-				deliveryDistrictName: this.form.deliveryDistrictName,
-				deliveryId: this.form.deliveryId,
-				deliveryProvinceId: this.form.deliveryProvinceId,
-				deliveryProvinceName: this.form.deliveryProvinceName,
-				deliveryStreetId: this.form.deliveryStreetId,
-				deliveryStreetName: this.form.deliveryStreetName,
-				detailList: [
-					{
-						brandId: this.form.brandId,
-						brandName: this.form.brandName,
-						categoryId: this.form.categoryId,
-						categoryName: this.form.categoryName,
-						gramWeight: this.form.gramWeight,
-						length: this.form.length,
-						paperName: this.form.paperName,
-						quantity: this.form.quantity,
-						remark: this.form.remark,
-						width: this.form.width
-					}
-				],
-				offerEnterprise: this.form.offerEnterprise,
-				remark: this.form.remark,
-				enterpriseId: this.$store.state.companyInfo.id,
-				productImg: this.form.productImg,
-				userId: this.$store.state.userInfo.userId
-			}
-			createEnquiryOrder(params).then(res => {
-				if (res) {
-					uni.showToast({
-						title: '添加成功',
-						icon: 'success'
-					})
-					setTimeout(() => {
-						back()
-					}, 1000)
-				}
-			})
-		},
+  components: { qnEasyinput, qnDataPicker, qnDatetimePicker, qnFooter, uGap },
+  data() {
+    return {
+      paperIndex: 0,
+      categoryNameList: [],
+      brandNameList: [],
+      weightList: [],
+      deliveryTimeList: ['当天到', '明天到'],
+      radioGroupList: [
+        {
+          name: '正度',
+          width: '787',
+          length: '1092',
+          disabled: true
+        },
+        {
+          name: '大度',
+          width: '889',
+          length: '1194',
+          disabled: true
+        },
+        {
+          name: '特规分切',
+          width: '',
+          length: '',
+          disabled: false
+        }
+      ],
+      form: {
+        deliveryArea: '',
+        deliveryCityId: '',
+        deliveryCityName: '',
+        deliveryDay: '',
+        deliveryDayIndex: 0,
+        deliveryDistrictId: '',
+        deliveryDistrictName: '',
+        deliveryId: '',
+        deliveryProvinceId: '',
+        deliveryProvinceName: '',
+        deliveryStreetId: '',
+        deliveryStreetName: '',
+        detailList: [],
+        offerEnterprise: '',
+        remark: '',
+        brandId: '',
+        brandName: '',
+        brandIndex: 0,
+        categoryId: '',
+        categoryName: '',
+        categoryIndex: 0,
+        gramWeight: '',
+        gramWeightIndex: 0,
+        length: '1092',
+        paperName: '',
+        quantity: '',
+        remark: '',
+        width: '787',
+        productImg: ''
+      },
+      searchList: [],
+      hasSelected: false,
+      items: []
+    }
+  },
+  mounted() {
+    getArea().then((res) => {
+      if (res) {
+        this.items = res
+      }
+    })
+  },
+  onLoad(option) {
+    this.form.offerEnterprise = option.id
+    this.form.productImg = option.productImg
+    this.getCategoryList()
+  },
+  methods: {
+    back,
+    // 查询纸种列表
+    getCategoryList() {
+      const params = {
+        paperSupplierId: this.$store.state.supplierId
+      }
+      getCategoryList(params).then((res) => {
+        // console.log('纸种列表', res)
+        if (res) {
+          this.categoryNameList = res.categoryNameList
+          this.brandNameList = res.brandNameList
+          this.weightList = res.weightList
+          this.form.categoryName = this.categoryNameList[0]
+          this.form.brandName = this.brandNameList[0]
+          this.form.gramWeight = this.weightList[0]
+        }
+      })
+    },
+    // 选择纸种
+    categoryChange(e) {
+      // console.log('e.target.value', e.target.value)
+      let index = e.target.value
+      this.form.categoryIndex = e.target.value
+      this.form.categoryName = this.categoryNameList[index]
+    },
+    // 选择品牌
+    brandChange(e) {
+      let index = e.target.value
+      this.form.brandIndex = e.target.value
+      this.form.brandName = this.brandNameList[index]
+    },
+    // 克重
+    gramWeightChange(e) {
+      let index = e.target.value
+      this.form.gramWeightIndex = e.target.value
+      this.form.gramWeight = this.weightList[index]
+    },
+    // 规格切换
+    specificationTap(item, index) {
+      this.form.width = item.width
+      this.form.length = item.length
+    },
+    // 交货时间
+    deliveryTimeChange(e) {
+      this.form.deliveryDayIndex = e.target.value
+      // 0 当天 1明天
+      if (this.form.deliveryDayIndex == 0) {
+        this.form.deliveryDay = this.getDay(0, 3600000)
+      } else {
+        this.form.deliveryDay = this.getDay(1, 3600000)
+      }
+    },
+    onAreaChange(e) {
+      if (e.detail.value && e.detail.value.length > 0) {
+        const [province, city, district, street] = e.detail.value
+        this.form.deliveryProvinceId = province.value
+        this.form.deliveryProvinceName = province.text
+        this.form.deliveryCityId = city.value
+        this.form.deliveryCityName = city.text
+        this.form.deliveryDistrictId = district.value
+        this.form.deliveryDistrictName = district.text
+        this.form.deliveryStreetId = street.value
+        this.form.deliveryStreetName = street.text
+        this.form.deliveryArea = province.text + city.text + district.text + street.text
+      } else {
+        this.form.deliveryProvinceId = null
+        this.form.deliveryProvinceName = null
+        this.form.deliveryCityId = null
+        this.form.deliveryCityName = null
+        this.form.deliveryDistrictId = null
+        this.form.deliveryDistrictName = null
+        this.form.deliveryStreetId = null
+        this.form.deliveryStreetName = null
+        this.form.deliveryArea = null
+      }
+    },
+    selectedImage(type) {
+      uploadImage()
+        .then((urls) => {
+          if (urls) {
+            this.form[type] = urls[0]
+          }
+        })
+        .catch((e) => {
+          uni.showToast({
+            title: '上传失败',
+            icon: 'fail'
+          })
+        })
+    },
+    showImage() {
+      uni.previewImage({
+        urls: [this.form.businessLicenseImg]
+      })
+    },
+    addUser() {
+      for (let i = 0; i < validateFields.length; i++) {
+        if (this.form[validateFields[i]] === null || this.form[validateFields[i]] === '') {
+          uni.showToast({
+            title: '请完善信息',
+            icon: 'none'
+          })
+          return
+        }
+      }
+      const params = {
+        deliveryArea: this.form.deliveryArea,
+        deliveryCityId: this.form.deliveryCityId,
+        deliveryCityName: this.form.deliveryCityName,
+        deliveryDay: this.form.deliveryDay,
+        deliveryDistrictId: this.form.deliveryDistrictId,
+        deliveryDistrictName: this.form.deliveryDistrictName,
+        deliveryId: this.form.deliveryId,
+        deliveryProvinceId: this.form.deliveryProvinceId,
+        deliveryProvinceName: this.form.deliveryProvinceName,
+        deliveryStreetId: this.form.deliveryStreetId,
+        deliveryStreetName: this.form.deliveryStreetName,
+        detailList: [
+          {
+            brandId: this.form.brandId,
+            brandName: this.form.brandName,
+            categoryId: this.form.categoryId,
+            categoryName: this.form.categoryName,
+            gramWeight: this.form.gramWeight,
+            length: this.form.length,
+            paperName: this.form.paperName,
+            quantity: this.form.quantity,
+            remark: this.form.remark,
+            width: this.form.width
+          }
+        ],
+        offerEnterprise: this.form.offerEnterprise,
+        remark: this.form.remark,
+        enterpriseId: this.$store.state.companyInfo.id,
+        productImg: this.form.productImg,
+        userId: this.$store.state.userInfo.userId
+      }
+      createEnquiryOrder(params).then((res) => {
+        if (res) {
+          uni.showToast({
+            title: '添加成功',
+            icon: 'success'
+          })
+          setTimeout(() => {
+            back()
+          }, 1000)
+        }
+      })
+    },
 
-		/**
-		 * @param {Object} day '昨天：', this.getDay(-1, 7200000)  '今天：', this.getDay(0, 3600000) '明天：', this.getDay(1, 3600000)
-		 * @param {Object} hours
-		 * 获取当前时间的前一天 后一天 一周 或者是当前时间的几个小时
-		 */
-		getDay(day, hours) {
-			var today = new Date()
-			var targetday = today.getTime() + 1000 * 60 * 60 * 24 * day + hours
-			today.setTime(targetday)
-			var tYear = today.getFullYear()
-			var tMonth = today.getMonth()
-			var tDate = today.getDate()
-			var getHours = today.getHours()
-			tMonth = this.doHandleMonth(tMonth + 1)
-			tDate = this.doHandleMonth(tDate)
-			return tYear + '-' + tMonth + '-' + tDate + ' ' + '23:59:59'
-		},
-		doHandleMonth(month) {
-			var m = month
-			if (month.toString().length === 1) {
-				m = '0' + month
-			}
-			return m
-		}
-	}
+    /**
+     * @param {Object} day '昨天：', this.getDay(-1, 7200000)  '今天：', this.getDay(0, 3600000) '明天：', this.getDay(1, 3600000)
+     * @param {Object} hours
+     * 获取当前时间的前一天 后一天 一周 或者是当前时间的几个小时
+     */
+    getDay(day, hours) {
+      var today = new Date()
+      var targetday = today.getTime() + 1000 * 60 * 60 * 24 * day + hours
+      today.setTime(targetday)
+      var tYear = today.getFullYear()
+      var tMonth = today.getMonth()
+      var tDate = today.getDate()
+      var getHours = today.getHours()
+      tMonth = this.doHandleMonth(tMonth + 1)
+      tDate = this.doHandleMonth(tDate)
+      return tYear + '-' + tMonth + '-' + tDate + ' ' + '23:59:59'
+    },
+    doHandleMonth(month) {
+      var m = month
+      if (month.toString().length === 1) {
+        m = '0' + month
+      }
+      return m
+    }
+  }
 }
 </script>
 
 <style lang="scss">
 .content {
-	width: 750rpx;
-	display: flex;
-	flex-direction: column;
-	background-color: #f7f8fa;
+  width: 750rpx;
+  display: flex;
+  flex-direction: column;
+  background-color: #f7f8fa;
 }
 .hint-box {
-	padding: 0rpx 32rpx;
-	height: 76rpx;
-	line-height: 76rpx;
-	background: #e5f1ff;
-	font-size: 30rpx;
-	color: #007aff;
-	letter-spacing: 0;
-	font-weight: 400;
+  padding: 0rpx 32rpx;
+  height: 76rpx;
+  line-height: 76rpx;
+  background: #e5f1ff;
+  font-size: 30rpx;
+  color: #007aff;
+  letter-spacing: 0;
+  font-weight: 400;
 }
 .uni-input {
-	font-size: 28rpx;
-	color: #333333;
-	letter-spacing: 0;
-	text-align: right;
-	font-weight: 400;
-	padding-right: 16rpx;
+  font-size: 28rpx;
+  color: #333333;
+  letter-spacing: 0;
+  text-align: right;
+  font-weight: 400;
+  padding-right: 16rpx;
 }
 .qn-form-item-remark {
-	width: 750rpx;
-	padding: 28rpx 32rpx 10rpx 32rpx;
-	background-color: #fff;
-	.label {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: flex-start;
-		margin-right: 20rpx;
+  width: 750rpx;
+  padding: 28rpx 32rpx 10rpx 32rpx;
+  background-color: #fff;
+  .label {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: flex-start;
+    margin-right: 20rpx;
 
-		.label__text {
-			font-size: 28rpx;
-			color: #000000;
-		}
-	}
-	.value {
-		padding: 16rpx 0rpx;
-	}
-	.paper-price-textArea {
-		background: #f7f8fa;
-		border-radius: 20rpx;
-		padding: 10rpx;
-		height: 155rpx;
-	}
+    .label__text {
+      font-size: 28rpx;
+      color: #000000;
+    }
+  }
+  .value {
+    padding: 16rpx 0rpx;
+  }
+  .paper-price-textArea {
+    background: #f7f8fa;
+    border-radius: 20rpx;
+    padding: 10rpx;
+    height: 155rpx;
+  }
 }
 .qn-form-item-gg {
-	width: 750rpx;
-	padding: 24rpx 32rpx;
-	background-color: #fff;
-	display: flex;
-	flex-direction: row;
-	justify-content: space-between;
-	border-bottom: 2rpx solid #d8d8d8;
-	.label {
-		flex-grow: 0;
-		flex-shrink: 0;
-		display: flex;
-		flex-direction: row;
-		justify-content: flex-start;
-		margin-right: 20rpx;
-		.label__text {
-			font-size: 28rpx;
-			color: #000000;
-		}
-	}
-	.value {
-		flex-grow: 1;
-		flex-shrink: 1;
-		text-align: right;
-	}
-	.input-row {
-		display: flex;
-		flex-direction: row;
-		justify-content: flex-end;
-		align-items: center;
-		padding-top: 20rpx;
-		.easyinput {
-			height: 64rpx;
-			width: 160rpx;
-			background: #f5f5f5;
-			border-radius: 8rpx;
-		}
-		.symbol {
-			padding: 0rpx 16rpx;
-			font-size: 32rpx;
-			color: rgba(0, 0, 0, 0.85);
-			font-weight: 400;
-		}
-	}
+  width: 750rpx;
+  padding: 24rpx 32rpx;
+  background-color: #fff;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  border-bottom: 2rpx solid #d8d8d8;
+  .label {
+    flex-grow: 0;
+    flex-shrink: 0;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    margin-right: 20rpx;
+    .label__text {
+      font-size: 28rpx;
+      color: #000000;
+    }
+  }
+  .value {
+    flex-grow: 1;
+    flex-shrink: 1;
+    text-align: right;
+  }
+  .input-row {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+    align-items: center;
+    padding-top: 20rpx;
+    .easyinput {
+      height: 64rpx;
+      width: 160rpx;
+      background: #f5f5f5;
+      border-radius: 8rpx;
+    }
+    .symbol {
+      padding: 0rpx 16rpx;
+      font-size: 32rpx;
+      color: rgba(0, 0, 0, 0.85);
+      font-weight: 400;
+    }
+  }
 }
 .qn-form-item {
-	width: 750rpx;
-	padding: 0rpx 32rpx;
-	background-color: #fff;
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	justify-content: space-between;
-	border-bottom: 2rpx solid #d8d8d8;
-	min-height: 80rpx;
-	.label {
-		flex-grow: 0;
-		flex-shrink: 0;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: flex-start;
-		margin-right: 20rpx;
-		.label__text {
-			font-size: 28rpx;
-			color: #000000;
-		}
-	}
-	.value {
-		flex-grow: 1;
-		flex-shrink: 1;
-		text-align: right;
-	}
+  width: 750rpx;
+  padding: 0rpx 32rpx;
+  background-color: #fff;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  border-bottom: 2rpx solid #d8d8d8;
+  min-height: 80rpx;
+  .label {
+    flex-grow: 0;
+    flex-shrink: 0;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: flex-start;
+    margin-right: 20rpx;
+    .label__text {
+      font-size: 28rpx;
+      color: #000000;
+    }
+  }
+  .value {
+    flex-grow: 1;
+    flex-shrink: 1;
+    text-align: right;
+  }
 }
 .qn-form-item__title {
-	background-color: #f7f8fa;
-	padding: 20rpx 32rpx;
-	border: none;
-	.title {
-		font-size: 30rpx;
-		color: #888888;
-	}
+  background-color: #f7f8fa;
+  padding: 20rpx 32rpx;
+  border: none;
+  .title {
+    font-size: 30rpx;
+    color: #888888;
+  }
 }
 .popup_modal {
-	width: 750rpx;
-	height: 600rpx;
-	background-color: #fff;
-	border-radius: 10px 10px 0 0;
-	.popup_modal-title {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-		width: 750rpx;
-		height: 88rpx;
-		font-weight: 600;
-		border-bottom: 2rpx solid #d8d8d8;
-	}
-	.popup_modal-scroll {
-		width: 750rpx;
-		height: 600rpx;
-		.popup_modal-scroll-item {
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			justify-content: flex-start;
-			width: 750rpx;
-			height: 88rpx;
-			padding: 0rpx 32rpx;
-			border-bottom: 2rpx solid #d8d8d8;
-		}
-	}
+  width: 750rpx;
+  height: 600rpx;
+  background-color: #fff;
+  border-radius: 10px 10px 0 0;
+  .popup_modal-title {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    width: 750rpx;
+    height: 88rpx;
+    font-weight: 600;
+    border-bottom: 2rpx solid #d8d8d8;
+  }
+  .popup_modal-scroll {
+    width: 750rpx;
+    height: 600rpx;
+    .popup_modal-scroll-item {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: flex-start;
+      width: 750rpx;
+      height: 88rpx;
+      padding: 0rpx 32rpx;
+      border-bottom: 2rpx solid #d8d8d8;
+    }
+  }
 }
 .upload-area {
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	justify-content: space-between;
-	margin-top: 10rpx;
-	margin-bottom: 24rpx;
-	.idCard {
-		width: 324rpx;
-		height: 280rpx;
-		flex-grow: 0;
-		flex-shrink: 0;
-	}
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 10rpx;
+  margin-bottom: 24rpx;
+  .idCard {
+    width: 324rpx;
+    height: 280rpx;
+    flex-grow: 0;
+    flex-shrink: 0;
+  }
 }
 .button-area {
-	width: 750rpx;
-	padding: 0 32rpx;
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	// justify-content: space-between;
-	.button {
-		flex-grow: 0;
-		flex-shrink: 0;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		border-radius: 10rpx;
-		.text {
-			font-size: 30rpx;
-			font-weight: 500;
-			text-align: center;
-		}
-	}
-	.button__cancel {
-		width: 270rpx;
-		height: 88rpx;
-		border: 2rpx solid #979797;
-	}
-	.button__submit {
-		// width: 400rpx;
-		width: 100%;
-		height: 88rpx;
-		background: #007aff;
-	}
+  width: 750rpx;
+  padding: 0 32rpx;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  // justify-content: space-between;
+  .button {
+    flex-grow: 0;
+    flex-shrink: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 10rpx;
+    .text {
+      font-size: 30rpx;
+      font-weight: 500;
+      text-align: center;
+    }
+  }
+  .button__cancel {
+    width: 270rpx;
+    height: 88rpx;
+    border: 2rpx solid #979797;
+  }
+  .button__submit {
+    // width: 400rpx;
+    width: 100%;
+    height: 88rpx;
+    background: #007aff;
+  }
 }
 </style>
diff --git a/pages/order-detail/index.vue b/pages/order-detail/index.vue
index 9cc9267..dda61a6 100644
--- a/pages/order-detail/index.vue
+++ b/pages/order-detail/index.vue
@@ -223,6 +223,9 @@ export default {
       let outboundQuantity = 0
       if (list && list.length > 0) {
         list.forEach((item) => {
+          if (item.userName && item.userName.length > 3) {
+            item.userName = item.userName.substr(0, 2) + '...'
+          }
           if (item.status == '30301') {
             step1.push({
               title: '分切',
@@ -231,13 +234,13 @@ export default {
           } else if (item.status == '30302') {
             step2.push({
               title: '出库',
-              desc: item.userName + item.quantity + '\n\r' + item.createTime
+              desc: item.userName + ' ' + item.quantity + '\n\r' + item.createTime
             })
             outboundQuantity += item.quantity
           } else if (item.status == '30303') {
             step3.push({
               title: '完成',
-              desc: '已收货'
+              desc: '已完成'
             })
           }
         })
diff --git a/pages/paper-details/index.vue b/pages/paper-details/index.vue
index f8200e2..b4098b4 100644
--- a/pages/paper-details/index.vue
+++ b/pages/paper-details/index.vue
@@ -1,129 +1,140 @@
 <template>
-	<view class="warpper">
-		<view class="swiper-dot">
-			<uni-swiper-dot :info="info.imgList" :current="current" field="content" mode="indexes" style="height: 100%;">
-				<swiper class="swiper-box" @change="swiperChange" style="height: 100%;">
-					<swiper-item v-for="(item, index) in info.imgList" :key="index">
-						<view class="" @tap="previewImg(item, info.imgList)">
-							<image class="image" :src="item || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif'" mode=""></image>
-						</view>
-					</swiper-item>
-				</swiper>
-			</uni-swiper-dot>
-		</view>
-		<uGap></uGap>
-		<view class="info-box">
-			<view class="info">
-				<view class="price-row">
-					<text class="price">¥{{ info.skuList[0].listPrice }}</text>
-					<text class="unit">/{{ info.skuList[0].stockUnit |  stockUnit}}</text>
-				</view>
-				<view class="row">
-					<view class="name">{{ info.name }}</view>
-					<view class="value">库存：{{ info.skuList[0].stock || XX }}{{ info.skuList[0].stockUnit |  stockUnit}}</view>
-				</view>
-			</view>
-			<view class="list-box">
-				<view class="label">克重：</view>
-				<view class="tag-box" v-for="(titem, tindex) in info.skuList" :key="tindex">
-					<text>{{ titem.weight }}g</text>
-				</view>
-			</view>
-			<view class="list-box">
-				<view class="label" style="font-size: 24rpx;">规格：</view>
-				<view class="tag-box"><text>787*1092</text></view>
-				<view class="tag-box"><text>899*1194</text></view>
-			</view>
-		</view>
-		<uGap></uGap>
-		<view class="other">
-			<view class="title">商品卖点</view>
-			<view class="desc">{{ info.sellingProposition }}</view>
-		</view>
-		<view class="other">
-			<view class="title">商品描述</view>
-			<view class="desc">{{ info.description }}</view>
-		</view>
-		<view class="other">
-			<view class="title">送货说明</view>
-			<view class="desc">{{ info.shippingNote }}</view>
-		</view>
-		<view class="other" style="border: none;">
-			<view class="title">其他说明</view>
-			<view class="desc">{{ info.otherNote }}</view>
-		</view>
-		<qn-footer fixed height="100rpx">
-			<view class="footer-row">
-				<view class="left">
-					<view class="">
-						<image class="icon" src="/static/imgs/paperDetails/shop-icon.png"></image>
-						<view class="label" @tap="storeTap">店铺</view>
-					</view>
-					<view class="">
-						<image class="icon" src="/static/imgs/paperDetails/shopping-trolley.png"></image>
-						<view class="label" @tap="shoppingCartTap">购物车</view>
-					</view>
-					<view class="" @tap="addShoppingTap(1)">
-						<image class="icon" src="/static/imgs/paperDetails/add-shopping-trolley.png"></image>
-						<view class="label">加购物车</view>
-					</view>
-				</view>
-				<view class="right">
-					<view class="inquiry-btn" @tap="inquiryTap">立即询单</view>
-					<view class="book-btn" @tap="addShoppingTap(2)">立即订购</view>
-				</view>
-			</view>
-		</qn-footer>
-		<uni-popup ref="popup" type="bottom">
-			<view class="popup_modal">
-				<!-- <slot name="title"><view class="popup_modal-title">可选择已录入公司</view></slot> -->
-				<view class="card-box">
-					<view class="box">
-						<!-- <image class="image" :src="info.imgList[0] || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif'" mode=""></image> -->
-						<view class="right-box">
-							<view class="title-row">
-								<view class="name">{{ info.name }}</view>
-								<view class="close-icon" @tap="closeTap"><uni-icons size="20" type="close" color="#888888"></uni-icons></view>
-							</view>
-							<view class="price">¥{{ buyPaperDto.unitPrice }}</view>
-						</view>
-					</view>
-				</view>
-				<view class="choose-box">
-					<view class="label">请选择克重</view>
-					<view class="tag-row">
-						<view :class="['tag-box', kgActive === kIndex ? 'kg-select' : '']" v-for="(kItem, kIndex) in info.skuList" :key="kIndex" @tap="weightTap(kItem, kIndex)">
-							{{ kItem.weight }}g
-						</view>
-					</view>
-				</view>
-				<view class="choose-box">
-					<view class="label">请选择规格</view>
-					<view class="tag-row">
-						<view
-							:class="['tag-box', specificationObj.active === sIndex ? 'kg-select' : '']"
-							v-for="(sItem, sIndex) in specificationList"
-							:key="sIndex"
-							@tap="specificationTap(sItem, sIndex)"
-						>
-							{{ sItem.name }}
-						</view>
-					</view>
-					<view class="input-row">
-						<view class=""><uni-easyinput :inputBorder="false" class="easyinput" type="number" v-model="buyPaperDto.width" placeholder="请输入"></uni-easyinput></view>
-						<view class="symbol">x</view>
-						<view class=""><uni-easyinput :inputBorder="false" class="easyinput" type="number" v-model="buyPaperDto.length" placeholder="请输入"></uni-easyinput></view>
-					</view>
-				</view>
-				<view class="quantity-row">
-					<view class="label">购买数量(张)</view>
-					<view class=""><qnInputNumber @change="change" /></view>
-				</view>
-				<view class="ygzl-text">预估重量：{{ buyTon }}吨</view>
-				<view class="popup-footer-row"><view class="btn" @tap="confirm">确认</view></view>
-			</view>
-		</uni-popup>
-	</view>
+  <view class="warpper">
+    <view class="swiper-dot">
+      <uni-swiper-dot :info="info.imgList" :current="current" field="content" mode="indexes" style="height: 100%">
+        <swiper class="swiper-box" @change="swiperChange" style="height: 100%">
+          <swiper-item v-for="(item, index) in info.imgList" :key="index">
+            <view class="" @tap="previewImg(item, info.imgList)">
+              <image class="image" :src="item || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/paper-default.png'" mode=""></image>
+            </view>
+          </swiper-item>
+        </swiper>
+      </uni-swiper-dot>
+    </view>
+    <uGap></uGap>
+    <view class="info-box">
+      <view class="info">
+        <view class="price-row">
+          <text class="price">¥{{ info.skuList[0] ? info.skuList[0].listPrice : '-' }}</text>
+          <text class="unit">/{{ (info.skuList[0] ? info.skuList[0].stockUnit : '-') | stockUnit }}</text>
+        </view>
+        <view class="row">
+          <view class="name">{{ info.name }}</view>
+          <view class="value">
+            库存：{{ info.skuList[0] ? info.skuList[0].stock : '-' || 'XX' }}{{ (info.skuList[0] ? info.skuList[0].stockUnit : '-') | stockUnit }}
+          </view>
+        </view>
+      </view>
+      <view class="list-box">
+        <view class="label">克重：</view>
+        <view class="tag-box" v-for="(titem, tindex) in info.skuList" :key="tindex">
+          <text>{{ titem.weight }}g</text>
+        </view>
+      </view>
+      <view class="list-box">
+        <view class="label" style="font-size: 24rpx">规格：</view>
+        <view class="tag-box"><text>787*1092</text></view>
+        <view class="tag-box"><text>899*1194</text></view>
+      </view>
+    </view>
+    <uGap></uGap>
+    <view class="other">
+      <view class="title">商品卖点</view>
+      <view class="desc">{{ info.sellingProposition }}</view>
+    </view>
+    <view class="other">
+      <view class="title">商品描述</view>
+      <view class="desc">{{ info.description }}</view>
+    </view>
+    <view class="other">
+      <view class="title">送货说明</view>
+      <view class="desc">{{ info.shippingNote }}</view>
+    </view>
+    <view class="other" style="border: none">
+      <view class="title">其他说明</view>
+      <view class="desc">{{ info.otherNote }}</view>
+    </view>
+    <qn-footer fixed height="100rpx">
+      <view class="footer-row">
+        <view class="left">
+          <view class="">
+            <image class="icon" src="/static/imgs/paperDetails/shop-icon.png"></image>
+            <view class="label" @tap="storeTap">店铺</view>
+          </view>
+          <view class="">
+            <image class="icon" src="/static/imgs/paperDetails/shopping-trolley.png"></image>
+            <view class="label" @tap="shoppingCartTap">购物车</view>
+          </view>
+          <view class="" @tap="addShoppingTap(1)">
+            <image class="icon" src="/static/imgs/paperDetails/add-shopping-trolley.png"></image>
+            <view class="label">加购物车</view>
+          </view>
+        </view>
+        <view class="right">
+          <view class="inquiry-btn" @tap="inquiryTap">立即询单</view>
+          <view class="book-btn" @tap="addShoppingTap(2)">立即订购</view>
+        </view>
+      </view>
+    </qn-footer>
+    <uni-popup ref="popup" type="bottom">
+      <view class="popup_modal">
+        <!-- <slot name="title"><view class="popup_modal-title">可选择已录入公司</view></slot> -->
+        <view class="card-box">
+          <view class="box">
+            <!-- <image class="image" :src="info.imgList[0] || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif'" mode=""></image> -->
+            <view class="right-box">
+              <view class="title-row">
+                <view class="name">{{ info.name }}</view>
+                <view class="close-icon" @tap="closeTap"><uni-icons size="20" type="close" color="#888888"></uni-icons></view>
+              </view>
+              <view class="price">¥{{ buyPaperDto.unitPrice }}</view>
+            </view>
+          </view>
+        </view>
+        <view class="choose-box">
+          <view class="label">请选择克重</view>
+          <view class="tag-row">
+            <view
+              :class="['tag-box', kgActive === kIndex ? 'kg-select' : '']"
+              v-for="(kItem, kIndex) in info.skuList"
+              :key="kIndex"
+              @tap="weightTap(kItem, kIndex)"
+            >
+              {{ kItem.weight }}g
+            </view>
+          </view>
+        </view>
+        <view class="choose-box">
+          <view class="label">请选择规格</view>
+          <view class="tag-row">
+            <view
+              :class="['tag-box', specificationObj.active === sIndex ? 'kg-select' : '']"
+              v-for="(sItem, sIndex) in specificationList"
+              :key="sIndex"
+              @tap="specificationTap(sItem, sIndex)"
+            >
+              {{ sItem.name }}
+            </view>
+          </view>
+          <view class="input-row">
+            <view class="">
+              <uni-easyinput :inputBorder="false" class="easyinput" type="number" v-model="buyPaperDto.width" placeholder="请输入"></uni-easyinput>
+            </view>
+            <view class="symbol">x</view>
+            <view class="">
+              <uni-easyinput :inputBorder="false" class="easyinput" type="number" v-model="buyPaperDto.length" placeholder="请输入"></uni-easyinput>
+            </view>
+          </view>
+        </view>
+        <view class="quantity-row">
+          <view class="label">购买数量(张)</view>
+          <view class=""><qnInputNumber @change="change" /></view>
+        </view>
+        <view class="ygzl-text">预估重量：{{ buyTon }}吨</view>
+        <view class="popup-footer-row"><view class="btn" @tap="confirm">确认</view></view>
+      </view>
+    </uni-popup>
+  </view>
 </template>
 
 <script>
@@ -133,500 +144,505 @@ import qnInputNumber from '@/components/qn-input-number/qn-input-number.vue'
 import { go2 } from '@/utils/hook.js'
 import { getPaperDetail, createGoodsReserve, createShoppingCar } from '@/apis/paperDetailsApi.js'
 export default {
-	components: { uGap, qnFooter, qnInputNumber },
-	data() {
-		return {
-			current: 0,
-			weightList: ['240', '250', '280'],
-			specificationList: [
-				{
-					name: '正度',
-					width: '787',
-					length: '1092',
-					disabled: true
-				},
-				{
-					name: '特规分切',
-					width: '889',
-					length: '1194',
-					disabled: true
-				},
-				{
-					name: '特规分切',
-					width: '',
-					length: '',
-					disabled: false
-				}
-			],
-			kgActive: 0,
-			specificationObj: {
-				active: 0,
-				width: '787',
-				length: '1092',
-				disabled: true
-			},
-			value: null,
-			params: {
-				productId: ''
-			},
-			buyPaperDto: {
-				buyTon: '',
-				gramWeight: '',
-				length: '',
-				mallSupplierId: '',
-				pieceQuantity: '',
-				productId: '',
-				productSkuId: '',
-				unitPrice: '',
-				width: '',
-				img: '',
-				listPrice: '',
-				name: ''
-			},
-			shoppingCarType: 1, // 1：加购物车 2：订购
-			info: {},
-		}
-	},
-	filters: {
-		stockUnit(value) {
-			let name = value == 1 ? '张' : '吨'
-			return name
-		}
-	},
-	onLoad(option) {
-		this.params.productId = option.id
-		this.queryData()
-	},
-	computed: {
-		buyTon() {
-			let num = 0
-			num = Number(this.buyPaperDto.gramWeight) * Number(this.buyPaperDto.pieceQuantity)
+  components: { uGap, qnFooter, qnInputNumber },
+  data() {
+    return {
+      current: 0,
+      weightList: ['240', '250', '280'],
+      specificationList: [
+        {
+          name: '正度',
+          width: '787',
+          length: '1092',
+          disabled: true
+        },
+        {
+          name: '特规分切',
+          width: '889',
+          length: '1194',
+          disabled: true
+        },
+        {
+          name: '特规分切',
+          width: '',
+          length: '',
+          disabled: false
+        }
+      ],
+      kgActive: 0,
+      specificationObj: {
+        active: 0,
+        width: '787',
+        length: '1092',
+        disabled: true
+      },
+      value: null,
+      params: {
+        productId: ''
+      },
+      buyPaperDto: {
+        buyTon: '',
+        gramWeight: '',
+        length: '',
+        mallSupplierId: '',
+        pieceQuantity: '',
+        productId: '',
+        productSkuId: '',
+        unitPrice: '',
+        width: '',
+        img: '',
+        listPrice: '',
+        name: ''
+      },
+      shoppingCarType: 1, // 1：加购物车 2：订购
+      info: {
+        skuList: []
+      }
+    }
+  },
+  filters: {
+    stockUnit(value) {
+      let name = value == 1 ? '张' : '吨'
+      return name
+    }
+  },
+  onLoad(option) {
+    this.params.productId = option.id
+    this.queryData()
+  },
+  computed: {
+    buyTon() {
+      let num = 0
+      num = Number(this.buyPaperDto.gramWeight) * Number(this.buyPaperDto.pieceQuantity)
 
-			this.buyPaperDto.buyTon = num / (1000 * 1000)
-			return this.buyPaperDto.buyTon.toFixed(4)
-		}
-	},
-	methods: {
-		// 查询店铺纸品详情
-		queryData() {
-			getPaperDetail(this.params).then(res => {
-				console.log('店铺纸品详情', res)
-				if (res) {
-					this.info = res
-				}
-			})
-		},
-		// 点击店铺
-		storeTap() {
-			go2('store')
-		},
-		// 点击购物车
-		shoppingCartTap() {
-			go2('cart')
-		},
-		// 立即订购
-		addShoppingTap(type) {
-			this.shoppingCarType = type
-			this.buyPaperDto = {
-				buyTon: 0,
-				gramWeight: this.info.skuList[0].weight,
-				length: this.specificationObj.length,
-				mallSupplierId: this.info.supplierId,
-				pieceQuantity: 0,
-				productId: this.info.id,
-				productSkuId: this.info.skuList[0].id,
-				unitPrice: this.info.skuList[0].listPrice,
-				width: this.specificationObj.width
-			}
-			this.$refs.popup.open('bottom')
-		},
+      this.buyPaperDto.buyTon = num / (1000 * 1000)
+      return this.buyPaperDto.buyTon.toFixed(4)
+    }
+  },
+  methods: {
+    // 查询店铺纸品详情
+    queryData() {
+      getPaperDetail(this.params).then((res) => {
+        console.log('店铺纸品详情', res)
+        if (res) {
+          this.info = res
+          if (!this.info.imgList || this.info.imgList.length == 0) {
+            this.info.imgList = ['']
+          }
+        }
+      })
+    },
+    // 点击店铺
+    storeTap() {
+      go2('store')
+    },
+    // 点击购物车
+    shoppingCartTap() {
+      go2('cart')
+    },
+    // 立即订购
+    addShoppingTap(type) {
+      this.shoppingCarType = type
+      this.buyPaperDto = {
+        buyTon: 0,
+        gramWeight: this.info.skuList[0].weight,
+        length: this.specificationObj.length,
+        mallSupplierId: this.info.supplierId,
+        pieceQuantity: 0,
+        productId: this.info.id,
+        productSkuId: this.info.skuList[0].id,
+        unitPrice: this.info.skuList[0].listPrice,
+        width: this.specificationObj.width
+      }
+      this.$refs.popup.open('bottom')
+    },
 
-		// 路由到实单询比价
-		inquiryTap() {
-			go2('for-comparison', { id: this.info.supplierId, productImg: this.info.imgList[0] })
-		},
-		closeTap() {
-			this.$refs.popup.close()
-		},
-		// 重量切换
-		weightTap(item, index) {
-			console.log('item', item)
-			this.kgActive = index
-			this.buyPaperDto.gramWeight = item.weight
-			this.buyPaperDto.unitPrice = item.listPrice
-			this.buyPaperDto.productSkuId = item.id
-		},
-		// 规格切换
-		specificationTap(item, index) {
-			this.specificationObj.active = index
-			this.specificationObj.width = item.width
-			this.specificationObj.length = item.length
-			this.specificationObj.disabled = item.disabled
-			this.buyPaperDto.width = item.width
-			this.buyPaperDto.length = item.length
-		},
-		/**
-		 * @param {Number} num
-		 * 计数器返回值
-		 */
-		change(num) {
-			this.buyPaperDto.pieceQuantity = num
-		},
-		// 确定
-		confirm() {
-			// 加入购物车
-			if(this.shoppingCarType == 1) {
-				const params = {
-					  length: this.specificationObj.length,
-					  productId: this.info.id,
-					  productSkuId: this.buyPaperDto.productSkuId,
-					  quantity: this.buyPaperDto.pieceQuantity,
-					  supplierId: this.info.supplierId,
-					  width: this.specificationObj.width,
-					  enterpriseId: this.$store.state.companyInfo.id,
-					  userId: this.$store.state.userInfo.userId
-				}
-				// console.log('加入购物车', params)
-				createShoppingCar(params).then(res => {
-					if(res) {
-						uni.showToast({
-							title: '加入成功！',
-							icon: 'success'
-						})
-						this.$refs.popup.close()
-					}
-				})
-			}else { // 立即订购
-				const params = {
-					orderGoodsList: [{ ...this.buyPaperDto }],
-					purchaserEnterpriseId: this.$store.state.companyInfo.id
-				}
-				createGoodsReserve(params).then(res => {
-					if (res) {
-						uni.showToast({
-							title: '订购成功！',
-							icon: 'success'
-						})
-						this.$refs.popup.close()
-						setTimeout(() => {
-							go2('order-make', { orderId: res.orderId })
-						}, 1000)
-					}
-				})
-			}
-
-		},
-		// 轮播图片滑动
-		swiperChange(e) {
-			this.current = e.detail.current
-		},
-		previewImg(index, list) {
-			uni.previewImage({
-				urls: list,
-				current: index
-			})
-		}
-	}
+    // 路由到实单询比价
+    inquiryTap() {
+      go2('for-comparison', { id: this.info.supplierId, productImg: this.info.imgList[0] })
+    },
+    closeTap() {
+      this.$refs.popup.close()
+    },
+    // 重量切换
+    weightTap(item, index) {
+      console.log('item', item)
+      this.kgActive = index
+      this.buyPaperDto.gramWeight = item.weight
+      this.buyPaperDto.unitPrice = item.listPrice
+      this.buyPaperDto.productSkuId = item.id
+    },
+    // 规格切换
+    specificationTap(item, index) {
+      this.specificationObj.active = index
+      this.specificationObj.width = item.width
+      this.specificationObj.length = item.length
+      this.specificationObj.disabled = item.disabled
+      this.buyPaperDto.width = item.width
+      this.buyPaperDto.length = item.length
+    },
+    /**
+     * @param {Number} num
+     * 计数器返回值
+     */
+    change(num) {
+      this.buyPaperDto.pieceQuantity = num
+    },
+    // 确定
+    confirm() {
+      // 加入购物车
+      if (this.shoppingCarType == 1) {
+        const params = {
+          length: this.specificationObj.length,
+          productId: this.info.id,
+          productSkuId: this.buyPaperDto.productSkuId,
+          quantity: this.buyPaperDto.pieceQuantity,
+          supplierId: this.info.supplierId,
+          width: this.specificationObj.width,
+          enterpriseId: this.$store.state.companyInfo.id,
+          userId: this.$store.state.userInfo.userId
+        }
+        // console.log('加入购物车', params)
+        createShoppingCar(params).then((res) => {
+          if (res) {
+            uni.showToast({
+              title: '加入成功！',
+              icon: 'success'
+            })
+            this.$refs.popup.close()
+          }
+        })
+      } else {
+        // 立即订购
+        const params = {
+          orderGoodsList: [{ ...this.buyPaperDto }],
+          purchaserEnterpriseId: this.$store.state.companyInfo.id
+        }
+        createGoodsReserve(params).then((res) => {
+          if (res) {
+            uni.showToast({
+              title: '订购成功！',
+              icon: 'success'
+            })
+            this.$refs.popup.close()
+            setTimeout(() => {
+              go2('order-make', { orderId: res.orderId })
+            }, 1000)
+          }
+        })
+      }
+    },
+    // 轮播图片滑动
+    swiperChange(e) {
+      this.current = e.detail.current
+    },
+    previewImg(index, list) {
+      uni.previewImage({
+        urls: list,
+        current: index
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss">
 .warpper {
-	.swiper-dot {
-		width: 100%;
-		height: 500rpx;
-	}
-	.image {
-		width: 100%;
-		height: 500rpx;
-	}
-	.info-box {
-		height: 370rpx;
-		background: #ffffff;
-		.info {
-			padding: 0rpx 32rpx;
-			.price-row {
-				padding: 20rpx 0rpx;
-			}
-			.price {
-				font-size: 48rpx;
-				color: #f5222d;
-				letter-spacing: 0;
-				text-align: left;
-				font-weight: 500;
-			}
-			.unit {
-				font-size: 28rpx;
-				color: #f5222d;
-				letter-spacing: 0;
-				text-align: left;
-				font-weight: 400;
-			}
-			.row {
-				display: flex;
-				flex-direction: row;
-				justify-content: space-between;
-				align-items: center;
-				padding-bottom: 20rpx;
-				.name {
-					font-size: 34rpx;
-					color: #000000;
-					letter-spacing: 0;
-					text-align: left;
-					font-weight: 600;
-				}
-				.value {
-					font-size: 24rpx;
-					color: rgba(0, 0, 0, 0.55);
-					letter-spacing: 0;
-					text-align: left;
-					font-weight: 400;
-				}
-			}
-		}
-		.list-box {
-			margin: 0rpx 32rpx;
-			height: 104rpx;
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			border-top: 2rpx solid rgba($color: #dddddd, $alpha: 0.8);
-			.label {
-				flex: 0 0 84rpx;
-				font-size: 28rpx;
-				color: #333333;
-				letter-spacing: 0;
-				text-align: left;
-				font-weight: 500;
-			}
-			.tag-box {
-				height: 60rpx;
-				line-height: 60rpx;
-				text-align: center;
-				background: #f4f5f6;
-				border-radius: 4rpx;
-				font-size: 28rpx;
-				color: #555555;
-				letter-spacing: 0;
-				font-weight: 400;
-				margin-right: 10rpx;
-				padding: 0rpx 17rpx;
-			}
-		}
-	}
-	.other {
-		padding: 0rpx 32rpx;
-		border-bottom: 2rpx solid #d8d8d8;
-		background: #ffffff;
-		.title {
-			font-size: 28rpx;
-			color: #000000;
-			letter-spacing: 0;
-			font-weight: 500;
-			padding: 24rpx 0rpx 16rpx 0rpx;
-		}
-		.desc {
-			font-size: 28rpx;
-			color: #333333;
-			letter-spacing: 0;
-			font-weight: 400;
-			padding: 0rpx 0rpx 24rpx 0rpx;
-		}
-	}
-	.footer-row {
-		display: flex;
-		flex-direction: row;
-		// align-items: center;
-		justify-content: space-between;
-		padding: 0rpx 32rpx;
-		.left {
-			flex: 0 0 294rpx;
-			display: flex;
-			flex-direction: row;
-			justify-content: space-between;
-			text-align: center;
-			padding-right: 24rpx;
-			.icon {
-				width: 40rpx;
-				height: 40rpx;
-			}
-			.label {
-				font-size: 22rpx;
-				color: #555555;
-				letter-spacing: 0;
-				font-weight: 400;
-				padding-top: 6rpx;
-			}
-		}
-		.right {
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			font-size: 28rpx;
-			color: #ffffff;
-			letter-spacing: 0;
-			text-align: center;
-			font-weight: 400;
-			.inquiry-btn {
-				width: 200rpx;
-				height: 80rpx;
-				line-height: 80rpx;
-				background: #faab0c;
-				border-top-left-radius: 2002000rpx;
-				border-bottom-left-radius: 2002000rpx;
-			}
-			.book-btn {
-				width: 200rpx;
-				height: 80rpx;
-				line-height: 80rpx;
-				background: #ee0a24;
-				border-top-right-radius: 2002000rpx;
-				border-bottom-right-radius: 2002000rpx;
-			}
-		}
-	}
-	.popup_modal {
-		// height: 960rpx;
-		background: #ffffff;
-		border-radius: 20rpx 20rpx 0 0;
-		.card-box {
-			padding: 0rpx 32rpx;
-			.box {
-				display: flex;
-				flex-direction: row;
-				// align-items: center;
-				// height: 240rpx;
-				background: #ffffff;
-				border-bottom: 2rpx solid #d8d8d8;
-				padding: 40rpx 0rpx;
-				.image {
-					flex: 0 0 160rpx;
-					width: 160rpx;
-					height: 160rpx;
-					border-radius: 10px;
-					margin-right: 20rpx;
-				}
-				.right-box {
-					flex: 1;
-					width: 100%;
-					padding-top: 10rpx;
-				}
-				.title-row {
-					display: flex;
-					flex-direction: row;
-					justify-content: space-between;
-					.name {
-						font-size: 34rpx;
-						color: #000000;
-						letter-spacing: 0;
-						text-align: left;
-						font-weight: 600;
-						padding-bottom: 30rpx;
-					}
-					.close-icon {
-						position: relative;
-						top: -20rpx;
-					}
-				}
-				.price {
-					font-size: 40rpx;
-					color: #f5222d;
-					letter-spacing: 0;
-					text-align: left;
-					font-weight: 600;
-				}
-			}
-		}
-		.choose-box {
-			border-bottom: 2rpx solid #d8d8d8;
-			padding: 24rpx 32rpx;
-			.label {
-				font-size: 30rpx;
-				color: rgba(0, 0, 0, 0.85);
-				letter-spacing: 0;
-				text-align: left;
-				font-weight: 400;
-				padding: 0rpx 0rpx 20rpx 0rpx;
-			}
-			.tag-row {
-				display: flex;
-				flex-direction: row;
-				align-items: center;
-			}
-			.tag-box {
-				padding: 0rpx 47rpx;
-				height: 60rpx;
-				line-height: 60rpx;
-				background: #f5f5f5;
-				border-radius: 8px;
-				margin-right: 12rpx;
-				font-size: 28rpx;
-				color: rgba(0, 0, 0, 0.75);
-				text-align: center;
-				font-weight: 400;
-			}
-			.kg-select {
-				background: #1890ff;
-				color: #ffffff;
-			}
-			.input-row {
-				display: flex;
-				flex-direction: row;
-				align-items: center;
-				padding-top: 20rpx;
-				.easyinput {
-					height: 64rpx;
-					background: #f5f5f5;
-					border-radius: 8rpx;
-				}
-				.symbol {
-					padding: 0rpx 16rpx;
-					font-size: 32rpx;
-					color: rgba(0, 0, 0, 0.85);
-					font-weight: 400;
-				}
-			}
-		}
-		.quantity-row {
-			display: flex;
-			flex-direction: row;
-			justify-content: space-between;
-			align-items: center;
-			padding: 32rpx 32rpx 0rpx 32rpx;
-			.label {
-				font-size: 30rpx;
-				color: rgba(0, 0, 0, 0.85);
-				letter-spacing: 0;
-				font-weight: 400;
-			}
-		}
-		.ygzl-text {
-			padding: 20rpx 32rpx 0rpx;
-			display: flex;
-			flex-direction: row;
-			justify-content: flex-end;
-			font-family: PingFangSC-Regular;
-			font-size: 24rpx;
-			color: rgba(0, 0, 0, 0.5);
-			font-weight: 400;
-		}
-		.popup-footer-row {
-			display: flex;
-			flex-direction: row;
-			justify-content: center;
-			padding: 48rpx 32rpx 20rpx 32rpx;
-			.btn {
-				width: 686rpx;
-				height: 96rpx;
-				line-height: 96rpx;
-				text-align: center;
-				background: #007aff;
-				border-radius: 10rpx;
-				font-size: 36rpx;
-				color: #ffffff;
-				font-weight: 500;
-			}
-		}
-	}
+  .swiper-dot {
+    width: 100%;
+    height: 500rpx;
+  }
+  .image {
+    width: 100%;
+    height: 500rpx;
+  }
+  .info-box {
+    height: 370rpx;
+    background: #ffffff;
+    .info {
+      padding: 0rpx 32rpx;
+      .price-row {
+        padding: 20rpx 0rpx;
+      }
+      .price {
+        font-size: 48rpx;
+        color: #f5222d;
+        letter-spacing: 0;
+        text-align: left;
+        font-weight: 500;
+      }
+      .unit {
+        font-size: 28rpx;
+        color: #f5222d;
+        letter-spacing: 0;
+        text-align: left;
+        font-weight: 400;
+      }
+      .row {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: center;
+        padding-bottom: 20rpx;
+        .name {
+          font-size: 34rpx;
+          color: #000000;
+          letter-spacing: 0;
+          text-align: left;
+          font-weight: 600;
+        }
+        .value {
+          font-size: 24rpx;
+          color: rgba(0, 0, 0, 0.55);
+          letter-spacing: 0;
+          text-align: left;
+          font-weight: 400;
+        }
+      }
+    }
+    .list-box {
+      margin: 0rpx 32rpx;
+      height: 104rpx;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      border-top: 2rpx solid rgba($color: #dddddd, $alpha: 0.8);
+      .label {
+        flex: 0 0 84rpx;
+        font-size: 28rpx;
+        color: #333333;
+        letter-spacing: 0;
+        text-align: left;
+        font-weight: 500;
+      }
+      .tag-box {
+        height: 60rpx;
+        line-height: 60rpx;
+        text-align: center;
+        background: #f4f5f6;
+        border-radius: 4rpx;
+        font-size: 28rpx;
+        color: #555555;
+        letter-spacing: 0;
+        font-weight: 400;
+        margin-right: 10rpx;
+        padding: 0rpx 17rpx;
+      }
+    }
+  }
+  .other {
+    padding: 0rpx 32rpx;
+    border-bottom: 2rpx solid #d8d8d8;
+    background: #ffffff;
+    .title {
+      font-size: 28rpx;
+      color: #000000;
+      letter-spacing: 0;
+      font-weight: 500;
+      padding: 24rpx 0rpx 16rpx 0rpx;
+    }
+    .desc {
+      font-size: 28rpx;
+      color: #333333;
+      letter-spacing: 0;
+      font-weight: 400;
+      padding: 0rpx 0rpx 24rpx 0rpx;
+    }
+  }
+  .footer-row {
+    display: flex;
+    flex-direction: row;
+    // align-items: center;
+    justify-content: space-between;
+    padding: 0rpx 32rpx;
+    .left {
+      flex: 0 0 294rpx;
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      text-align: center;
+      padding-right: 24rpx;
+      .icon {
+        width: 40rpx;
+        height: 40rpx;
+      }
+      .label {
+        font-size: 22rpx;
+        color: #555555;
+        letter-spacing: 0;
+        font-weight: 400;
+        padding-top: 6rpx;
+      }
+    }
+    .right {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      font-size: 28rpx;
+      color: #ffffff;
+      letter-spacing: 0;
+      text-align: center;
+      font-weight: 400;
+      .inquiry-btn {
+        width: 200rpx;
+        height: 80rpx;
+        line-height: 80rpx;
+        background: #faab0c;
+        border-top-left-radius: 2002000rpx;
+        border-bottom-left-radius: 2002000rpx;
+      }
+      .book-btn {
+        width: 200rpx;
+        height: 80rpx;
+        line-height: 80rpx;
+        background: #ee0a24;
+        border-top-right-radius: 2002000rpx;
+        border-bottom-right-radius: 2002000rpx;
+      }
+    }
+  }
+  .popup_modal {
+    // height: 960rpx;
+    background: #ffffff;
+    border-radius: 20rpx 20rpx 0 0;
+    .card-box {
+      padding: 0rpx 32rpx;
+      .box {
+        display: flex;
+        flex-direction: row;
+        // align-items: center;
+        // height: 240rpx;
+        background: #ffffff;
+        border-bottom: 2rpx solid #d8d8d8;
+        padding: 40rpx 0rpx;
+        .image {
+          flex: 0 0 160rpx;
+          width: 160rpx;
+          height: 160rpx;
+          border-radius: 10px;
+          margin-right: 20rpx;
+        }
+        .right-box {
+          flex: 1;
+          width: 100%;
+          padding-top: 10rpx;
+        }
+        .title-row {
+          display: flex;
+          flex-direction: row;
+          justify-content: space-between;
+          .name {
+            font-size: 34rpx;
+            color: #000000;
+            letter-spacing: 0;
+            text-align: left;
+            font-weight: 600;
+            padding-bottom: 30rpx;
+          }
+          .close-icon {
+            position: relative;
+            top: -20rpx;
+          }
+        }
+        .price {
+          font-size: 40rpx;
+          color: #f5222d;
+          letter-spacing: 0;
+          text-align: left;
+          font-weight: 600;
+        }
+      }
+    }
+    .choose-box {
+      border-bottom: 2rpx solid #d8d8d8;
+      padding: 24rpx 32rpx;
+      .label {
+        font-size: 30rpx;
+        color: rgba(0, 0, 0, 0.85);
+        letter-spacing: 0;
+        text-align: left;
+        font-weight: 400;
+        padding: 0rpx 0rpx 20rpx 0rpx;
+      }
+      .tag-row {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+      }
+      .tag-box {
+        padding: 0rpx 47rpx;
+        height: 60rpx;
+        line-height: 60rpx;
+        background: #f5f5f5;
+        border-radius: 8px;
+        margin-right: 12rpx;
+        font-size: 28rpx;
+        color: rgba(0, 0, 0, 0.75);
+        text-align: center;
+        font-weight: 400;
+      }
+      .kg-select {
+        background: #1890ff;
+        color: #ffffff;
+      }
+      .input-row {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        padding-top: 20rpx;
+        .easyinput {
+          height: 64rpx;
+          background: #f5f5f5;
+          border-radius: 8rpx;
+        }
+        .symbol {
+          padding: 0rpx 16rpx;
+          font-size: 32rpx;
+          color: rgba(0, 0, 0, 0.85);
+          font-weight: 400;
+        }
+      }
+    }
+    .quantity-row {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: center;
+      padding: 32rpx 32rpx 0rpx 32rpx;
+      .label {
+        font-size: 30rpx;
+        color: rgba(0, 0, 0, 0.85);
+        letter-spacing: 0;
+        font-weight: 400;
+      }
+    }
+    .ygzl-text {
+      padding: 20rpx 32rpx 0rpx;
+      display: flex;
+      flex-direction: row;
+      justify-content: flex-end;
+      font-family: PingFangSC-Regular;
+      font-size: 24rpx;
+      color: rgba(0, 0, 0, 0.5);
+      font-weight: 400;
+    }
+    .popup-footer-row {
+      display: flex;
+      flex-direction: row;
+      justify-content: center;
+      padding: 48rpx 32rpx 20rpx 32rpx;
+      .btn {
+        width: 686rpx;
+        height: 96rpx;
+        line-height: 96rpx;
+        text-align: center;
+        background: #007aff;
+        border-radius: 10rpx;
+        font-size: 36rpx;
+        color: #ffffff;
+        font-weight: 500;
+      }
+    }
+  }
 }
 </style>
diff --git a/pages/store/index.vue b/pages/store/index.vue
index 5e8d7e2..01c3e0b 100644
--- a/pages/store/index.vue
+++ b/pages/store/index.vue
@@ -1,344 +1,352 @@
 <template>
-	<view class="warpper">
-		<qnHeader class="header">
-			<view class="header-title">店铺首页</view>
-			<view class=""></view>
-		</qnHeader>
-		<view class="top-box">
-			<view class="">
-				<!-- <image class="image" src="https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif" mode=""></image> -->
-				<image class="image" :src="customerInfo.logo || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif'" mode=""></image>
-			</view>
-			<view class="center">
-				<view class="title">{{ customerInfo.name }}</view>
-				<view class="desc">全部商品 {{ customerInfo.productNumber }} &nbsp; | &nbsp;上新 {{ customerInfo.currentProductNumber }}</view>
-			</view>
-		</view>
-		<view class="search-box">
-			<uni-easyinput
-				v-model="enterpriseName"
-				:inputBorder="false"
-				:clearSize="18"
-				:placeholderStyle="'font-size:25rpx;text-align: center;font-weight: 400;color: rgba(34,34,34,0.75);'"
-				placeholder="搜索"
-				confirmType="search"
-				type="text"
-				class="easyinput"
-			 prefixIcon="search"
-				@confirm="searchConfirm"
-			/>
-		</view>
-		<scroll-list ref="list" :option="option" @load="upCallback" @refresh="downCallback" style="background-color: #FFFFFF;">
-			<view class="content">
-				<view class="box" v-for="(item, index) in list" :key="index"  @tap="seeDetailsTap(item)">
-					<view class="image-box">
-						<view class=""><image class="special-img" :src="item.isPromoting ? '/static/imgs/store/special-offe.png' : ''" mode=""></image></view>
-						<image class="image" :src="item.litPicUrl || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif'" mode=""></image>
-					</view>
-					<view class="title">{{ item.name }}</view>
-					<view class="desc">
-						<view class="">
-							<image class="icon" src="/static/imgs/store/address-icon.png"></image>
-							<text style="padding-left: 6rpx;">{{ customerInfo.area }}</text>
-						</view>
-						<view class="">库存:{{ item.stock || XX }} {{ item.stockUnit == 1 ? '张' : '吨' }}</view>
-					</view>
-					<view class="footer">
-						<view class="left">
-							<text class="price">{{ item.priceRange }}</text>
-							<!-- <text class="unit">/吨</text> -->
-						</view>
-						<view class="btn">马上抢</view>
-					</view>
-				</view>
-			</view>
-		</scroll-list>
-	</view>
+  <view class="warpper">
+    <qnHeader class="header">
+      <view class="header-title">店铺首页</view>
+      <view class=""></view>
+    </qnHeader>
+    <view class="top-box">
+      <view class="">
+        <!-- <image class="image" src="https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/paper-default-small.png" mode=""></image> -->
+        <image
+          class="image"
+          :src="customerInfo.logo || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/paper-default-small.png'"
+          mode=""
+        ></image>
+      </view>
+      <view class="center">
+        <view class="title">{{ customerInfo.name }}</view>
+        <view class="desc">全部商品 {{ customerInfo.productNumber }} &nbsp; | &nbsp;上新 {{ customerInfo.currentProductNumber }}</view>
+      </view>
+    </view>
+    <view class="search-box">
+      <uni-easyinput
+        v-model="enterpriseName"
+        :inputBorder="false"
+        :clearSize="18"
+        :placeholderStyle="'font-size:25rpx;text-align: center;font-weight: 400;color: rgba(34,34,34,0.75);'"
+        placeholder="搜索"
+        confirmType="search"
+        type="text"
+        class="easyinput"
+        prefixIcon="search"
+        @confirm="searchConfirm"
+      />
+    </view>
+    <scroll-list ref="list" :option="option" @load="upCallback" @refresh="downCallback" style="background-color: #ffffff">
+      <view class="content">
+        <view class="box" v-for="(item, index) in list" :key="index" @tap="seeDetailsTap(item)">
+          <view class="image-box">
+            <view class=""><image class="special-img" :src="item.isPromoting ? '/static/imgs/store/special-offe.png' : ''" mode=""></image></view>
+            <image
+              class="image"
+              :src="item.litPicUrl || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/paper-default-small.png'"
+              mode=""
+            ></image>
+          </view>
+          <view class="title">{{ item.name }}</view>
+          <view class="desc">
+            <view class="">
+              <image class="icon" src="/static/imgs/store/address-icon.png"></image>
+              <text style="padding-left: 6rpx">{{ customerInfo.area }}</text>
+            </view>
+            <view class="">库存:{{ item.stock || 'XX' }} {{ item.stockUnit == 1 ? '张' : '吨' }}</view>
+          </view>
+          <view class="footer">
+            <view class="left">
+              <text class="price">{{ item.priceRange }}</text>
+              <!-- <text class="unit">/吨</text> -->
+            </view>
+            <view class="btn">马上抢</view>
+          </view>
+        </view>
+      </view>
+    </scroll-list>
+  </view>
 </template>
 
 <script>
 import qnHeader from '@/components/qn-header/qn-header.vue'
-import { go2 } from '@/utils/hook.js'
+import { go2, loginGo2 } from '@/utils/hook.js'
 import { getCustomer, getPaperList } from '@/apis/storeApi.js'
 export default {
-	components: { qnHeader },
-	data() {
-		return {
-			option: {
-				size: 10,
-				auto: true,
-				emptyText: '暂无数据~',
-				background: '#F7F8FA',
-				disabled: false
-			},
-			params: {
-				asc: '',
-				desc: '',
-				name: '',
-				name: '',
-				supplierId: this.$store.state.supplierId || null
-			},
-			pagination: {
-				pageNum: 0, // 初始会执行一次下拉加载
-				pageSize: 10
-			},
-			enterpriseName: '',
-			list: [],
-			customerParams: {
-				supplierId: this.$store.state.supplierId || null
-				// supplierId: '677166944742412288'
-			},
-			customerInfo: {}
-		}
-	},
-	onLoad() {
-		this.getCustomer()
-	},
-	methods: {
-		seeDetailsTap(item) {
-			go2('paper-details', { id: item.id })
-		},
-		// 获取店铺信息
-		getCustomer() {
-			getCustomer(this.customerParams).then(res => {
-				// console.log('获取店铺信息', res)
-				if (res) {
-					this.customerInfo = res
-				}
-			})
-		},
-		getList() {
-			return new Promise((resolve, reject) => {
-				getPaperList({ ...this.params, ...this.pagination })
-					.then(res => {
-						console.log('纸品列表', res)
-						if (res) {
-							if (this.pagination.pageNum == 1) {
-								this.list = res.records
-							} else {
-								this.list = this.list.concat(res.records)
-							}
-							// this.list = []
-							// this.list = [...this.list, ...[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]]
-							resolve({ list: this.list, total: res.total })
-						}
-					})
-					.catch(err => {
-						reject(err)
-					})
-			})
-		},
-		downCallback() {
-			this.pagination.pageNum = 1
-			this.getList()
-				.then(({ list, total }) => {
-					this.$refs.list.refreshSuccess({ list, total })
-				})
-				.catch(() => {
-					this.$refs.list.refreshFail()
-				})
-		},
-		upCallback() {
-			this.pagination.pageNum++
-			this.getList()
-				.then(({ list, total }) => {
-					this.$refs.list.loadSuccess({ list, total })
-				})
-				.catch(() => {
-					this.$refs.list.loadFail()
-				})
-		},
-		searchConfirm(value) {
-			this.params.name = value
-			this.pagination.pageNum = 1
-			this.getList()
-		}
-	}
+  components: { qnHeader },
+  data() {
+    return {
+      option: {
+        size: 10,
+        auto: true,
+        emptyText: '暂无数据~',
+        background: '#F7F8FA',
+        disabled: false
+      },
+      params: {
+        asc: '',
+        desc: '',
+        name: '',
+        name: '',
+        supplierId: this.$store.state.supplierId || null
+      },
+      pagination: {
+        pageNum: 0, // 初始会执行一次下拉加载
+        pageSize: 10
+      },
+      enterpriseName: '',
+      list: [],
+      customerParams: {
+        supplierId: this.$store.state.supplierId || null
+        // supplierId: '677166944742412288'
+      },
+      customerInfo: {}
+    }
+  },
+  onLoad() {
+    this.getCustomer()
+  },
+  methods: {
+    seeDetailsTap(item) {
+      loginGo2('paper-details', { id: item.id })
+    },
+    // 获取店铺信息
+    getCustomer() {
+      getCustomer(this.customerParams).then((res) => {
+        // console.log('获取店铺信息', res)
+        if (res) {
+          this.customerInfo = res
+        }
+      })
+    },
+    getList() {
+      return new Promise((resolve, reject) => {
+        getPaperList({ ...this.params, ...this.pagination })
+          .then((res) => {
+            console.log('纸品列表', res)
+            if (res) {
+              if (this.pagination.pageNum == 1) {
+                this.list = res.records
+              } else {
+                this.list = this.list.concat(res.records)
+              }
+              // this.list = []
+              // this.list = [...this.list, ...[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]]
+              resolve({ list: this.list, total: res.total })
+            }
+          })
+          .catch((err) => {
+            reject(err)
+          })
+      })
+    },
+    downCallback() {
+      this.pagination.pageNum = 1
+      this.getList()
+        .then(({ list, total }) => {
+          this.$refs.list.refreshSuccess({ list, total })
+        })
+        .catch(() => {
+          this.$refs.list.refreshFail()
+        })
+    },
+    upCallback() {
+      this.pagination.pageNum++
+      this.getList()
+        .then(({ list, total }) => {
+          this.$refs.list.loadSuccess({ list, total })
+        })
+        .catch(() => {
+          this.$refs.list.loadFail()
+        })
+    },
+    searchConfirm(value) {
+      this.params.name = value
+      this.pagination.pageNum = 1
+      this.getList()
+    }
+  }
 }
 </script>
 
 <style lang="scss">
 .warpper {
-	.header {
-		justify-content: space-between;
-		.header-title {
-			font-size: 36rpx;
-			color: #000000;
-			letter-spacing: 0;
-			text-align: center;
-			font-weight: 500;
-		}
+  .header {
+    justify-content: space-between;
+    .header-title {
+      font-size: 36rpx;
+      color: #000000;
+      letter-spacing: 0;
+      text-align: center;
+      font-weight: 500;
+    }
 
-		.right-title {
-			font-size: 28rpx;
-			color: #007aff;
-			text-align: center;
-			line-height: 40rpx;
-			font-weight: 500;
-		}
-	}
-	.top-box {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		// justify-content: space-around;
-		height: 180rpx;
-		background: url('/static/imgs/store/store-icon.png') no-repeat;
-		background-size: 100%;
-		.image {
-			width: 100rpx;
-			height: 100rpx;
-			border-radius: 50%;
-			margin-left: 32rpx;
-		}
-		.right {
-			width: 140rpx;
-		}
-		.center {
-			padding-left: 20rpx;
-		}
-		.title {
-			font-size: 34rpx;
-			color: #ffffff;
-			letter-spacing: 2rpx;
-			font-weight: 600;
-			padding-bottom: 12rpx;
-		}
-		.desc {
-			opacity: 0.75;
-			font-size: 28rpx;
-			color: #ffffff;
-			letter-spacing: 0;
-			font-weight: 500;
-			padding-right: 32rpx;
-			padding-top: 12rpx;
-		}
-		.cut {
-			display: flex;
-			align-items: center;
-			font-size: 24rpx;
-			color: #ffffff;
-			letter-spacing: 0;
-			text-align: center;
-			font-weight: 400;
-			.cut-icon {
-				width: 29.42rpx;
-				height: 26.67rpx;
-				margin-left: 10rpx;
-			}
-		}
-		.set {
-			opacity: 0.75;
-			font-size: 28rpx;
-			color: #ffffff;
-			letter-spacing: 0;
-			font-weight: 500;
-			position: relative;
-			top: 39rpx;
-			left: 60rpx;
-		}
-	}
-	.search-box {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		padding: 0rpx 32rpx;
-		height: 104rpx;
-		background: #ffffff;
-		.easyinput {
-			height: 72rpx;
-			background: #f5f6f7;
-			border-radius: 16rpx;
-		}
-	}
-	.content {
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-		flex-wrap: wrap;
-		padding: 0rpx 32rpx 20rpx 32rpx;
-		.box {
-			// height: 514rpx;
-			width: 330rpx;
-			background: #ffffff;
-			box-shadow: 0rpx 8rpx 28rpx 0rpx rgba(112, 112, 112, 0.1);
-			border-radius: 10rpx;
-			.special-img {
-				width: 110rpx;
-				height: 110rpx;
-				position: absolute;
-				z-index: 10;
-			}
-			.image {
-				width: 330rpx;
-				height: 330rpx;
-				z-index: 9;
-				border-top-left-radius: 10rpx;
-			}
-			.title {
-				padding: 0rpx 16rpx;
-				font-size: 28rpx;
-				color: #000000;
-				letter-spacing: 0;
-				font-weight: 500;
-				padding-top: 10rpx;
-			}
-			.desc {
-				display: flex;
-				flex-direction: row;
-				justify-content: space-between;
-				align-items: center;
-				font-size: 20rpx;
-				color: #333333;
-				letter-spacing: 0;
-				font-weight: 400;
-				padding: 16rpx 16rpx 10rpx 16rpx;
-				.icon {
-					width: 16rpx;
-					height: 16rpx;
-				}
-			}
-			.footer {
-				display: flex;
-				flex-direction: row;
-				justify-content: space-between;
-				align-items: center;
-				padding: 10rpx 16rpx 37rpx 16rpx;
-				.left {
-					flex-grow: 1;
-					flex-shrink: 1;
-				}
-				.price {
-					font-size: 34rpx;
-					color: #f5222d;
-					letter-spacing: 0;
-					font-weight: 600;
-				}
-				.unit {
-					font-size: 24rpx;
-					color: #f5222d;
-					letter-spacing: 0;
-					text-align: left;
-					font-weight: 400;
-				}
-				.btn {
-					flex-grow: 0;
-					flex-shrink: 0;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					// text-align: center;
-					width: 108rpx;
-					height: 48rpx;
-					background: #ff4849;
-					border-radius: 27rpx;
-					ont-size: 26rpx;
-					color: #ffffff;
-					letter-spacing: 0;
-					font-weight: 400;
-				}
-			}
-		}
-	}
+    .right-title {
+      font-size: 28rpx;
+      color: #007aff;
+      text-align: center;
+      line-height: 40rpx;
+      font-weight: 500;
+    }
+  }
+  .top-box {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    // justify-content: space-around;
+    height: 180rpx;
+    background: url('/static/imgs/store/store-icon.png') no-repeat;
+    background-size: 100%;
+    .image {
+      width: 100rpx;
+      height: 100rpx;
+      border-radius: 50%;
+      margin-left: 32rpx;
+    }
+    .right {
+      width: 140rpx;
+    }
+    .center {
+      padding-left: 20rpx;
+    }
+    .title {
+      font-size: 34rpx;
+      color: #ffffff;
+      letter-spacing: 2rpx;
+      font-weight: 600;
+      padding-bottom: 12rpx;
+    }
+    .desc {
+      opacity: 0.75;
+      font-size: 28rpx;
+      color: #ffffff;
+      letter-spacing: 0;
+      font-weight: 500;
+      padding-right: 32rpx;
+      padding-top: 12rpx;
+    }
+    .cut {
+      display: flex;
+      align-items: center;
+      font-size: 24rpx;
+      color: #ffffff;
+      letter-spacing: 0;
+      text-align: center;
+      font-weight: 400;
+      .cut-icon {
+        width: 29.42rpx;
+        height: 26.67rpx;
+        margin-left: 10rpx;
+      }
+    }
+    .set {
+      opacity: 0.75;
+      font-size: 28rpx;
+      color: #ffffff;
+      letter-spacing: 0;
+      font-weight: 500;
+      position: relative;
+      top: 39rpx;
+      left: 60rpx;
+    }
+  }
+  .search-box {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0rpx 32rpx;
+    height: 104rpx;
+    background: #ffffff;
+    .easyinput {
+      height: 72rpx;
+      background: #f5f6f7;
+      border-radius: 16rpx;
+    }
+  }
+  .content {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    padding: 0rpx 32rpx 20rpx 32rpx;
+    .box {
+      // height: 514rpx;
+      width: 330rpx;
+      background: #ffffff;
+      box-shadow: 0rpx 8rpx 28rpx 0rpx rgba(112, 112, 112, 0.1);
+      border-radius: 10rpx;
+      .special-img {
+        width: 110rpx;
+        height: 110rpx;
+        position: absolute;
+        z-index: 10;
+      }
+      .image {
+        width: 330rpx;
+        height: 330rpx;
+        z-index: 9;
+        border-top-left-radius: 10rpx;
+      }
+      .title {
+        padding: 0rpx 16rpx;
+        font-size: 28rpx;
+        color: #000000;
+        letter-spacing: 0;
+        font-weight: 500;
+        padding-top: 10rpx;
+      }
+      .desc {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: center;
+        font-size: 20rpx;
+        color: #333333;
+        letter-spacing: 0;
+        font-weight: 400;
+        padding: 16rpx 16rpx 10rpx 16rpx;
+        .icon {
+          width: 16rpx;
+          height: 16rpx;
+        }
+      }
+      .footer {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: center;
+        padding: 10rpx 16rpx 37rpx 16rpx;
+        .left {
+          flex-grow: 1;
+          flex-shrink: 1;
+        }
+        .price {
+          font-size: 34rpx;
+          color: #f5222d;
+          letter-spacing: 0;
+          font-weight: 600;
+        }
+        .unit {
+          font-size: 24rpx;
+          color: #f5222d;
+          letter-spacing: 0;
+          text-align: left;
+          font-weight: 400;
+        }
+        .btn {
+          flex-grow: 0;
+          flex-shrink: 0;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          // text-align: center;
+          width: 108rpx;
+          height: 48rpx;
+          background: #ff4849;
+          border-radius: 27rpx;
+          ont-size: 26rpx;
+          color: #ffffff;
+          letter-spacing: 0;
+          font-weight: 400;
+        }
+      }
+    }
+  }
 }
 </style>
diff --git a/static/imgs/tabbar/cart-blue.png b/static/imgs/tabbar/cart-blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb55a789914460aa105136c63a95f8001d13fe51
GIT binary patch
literal 1042
zcmV+t1nv8YP)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91ET97b1ONa40RR91EC2ui0Q_#}qW}N{d`Uz>R9Fe^SW9aZK@k3GHc=x+
z;~PXlAqaXA;zh)Z9z1vvJ%~Xt;7u?dJP7V8jwEhCP%t-tfEN!c<dkzRo&*ykCccBO
z7=s=XABoxW>)jnPkIl}^W-}Wx4YOTU-BtBXO?7Q|150fw0-gwnhck?-;0m_q<#qS~
zTc+~#BKZjd&S)PL2a5QnA$W+DXh%jy7XxN5U|TIr;T?f(^?(yR#%AotdHL;;*MPA+
zK5fZi8TK-&Cy+ub$L{CH6)hOUQP12OG2RIKL3HbKjN(00WCLH~0f%q-r&OJ{=&b?6
zNXu9$+vNcpjg0ov#NkrP3o0`Ks>c~F`tNQ(-jr~U%+gP1$pk6IF-!-)XgFX&Z2%Wy
z(*|2Nxx*9=STW#MNR(EXs<p-KGaPU|o^iqD+)9bkDa^S2g#)(b2NmA9l@g-`e^_3J
z-2TD=7iQNgkB9tQgJ^&S&)sjC7+qrhL<5||%fvu>9R<E@G{9Dk09(Nd6%DZBh4;l1
z;{qi${IA(yGkfF=CP_6U230VDPOOHAx_w5Aa6##nTXDf@#h@Ro@fi)UnJEdUg#`0A
zF5sjqMIe9U0oH^oMe5&*@Fbe>$VAlNqUUgurA=@X7v!fOtl^^r?&MKP@T-)Os>uZA
zbdlys<Jw#{>*g8=$W3WW>ubt)2gc?S2zRr<IG?ZiUW>g|>~kD5w6M?NGwbe1sZ!=P
zA04pKGNnxkSYWoCJ$z=t7{@c@Q|wbkxh)e$EpodaJ~JL*r&1`PW#weJ`RdPzp2Nns
z;7JieBTv&cxu=M>mv91=)%Dy_yk%OfDvE~r5}qTBGqvJg@r9Q;=eThXY%Pt=cqx&V
zaa`6m>fI&i73_DiuXfwT<Na|OEeSYYgdJ$MHgo;Aa)mb&aAh_eTfu&emyb6V%jIJb
zUQ9`4(Xq9O=h@qg?m_w+V4-hk&Y2n=uieuW`q4o<rs9n9i(N#A^p!IbuSz(UrqRtp
zf0~ZA@j1erE8KEA<5By5F0LFd(Z&uw`?!32U>0_nRvBR6kjJKC53iKgd1O(ToX-xh
zhJXGo<y0#LJm@p}5m)ieCktmSo+{kUT%1_mixc;-p(_I{{FF}F5qzSRQ(=1mzvDdL
zh%VNc-aKvo?iFXb7Dh_Wt%@+K8}kR$`5NoewYa18^EI=i|6fMnFW`;aeX>7YO#lD@
M07*qoM6N<$f+*|9i2wiq

literal 0
HcmV?d00001

diff --git a/static/imgs/tabbar/cart-gray.png b/static/imgs/tabbar/cart-gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2a9f03e1192b2b38c70b25678534fd86ee6a1f7
GIT binary patch
literal 1992
zcmV;(2RHbMP)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91ET97b1ONa40RR91EC2ui0Q_#}qW}O0GD$>1R9Fe^SzTxxRTQ3?JAb>I
zq}}Z{O))Ljm=ya5eG}9NE2xbc5TOq?im6T8B(zWv@y$n3Q7X}-NoYd@DcA=Eky;TA
zs1N#Lwe%;JT9Il@mUgq7O?Gy6ey-oyI%PK9&CZq$dFf?``!naB^WAgLIrq$6LAYP;
zYoJI2Vo?vBk&%&ImSt^q9Kli)=?})(weIfjKNr)jRKE!D(9qEKxq0LBoN2X)qA1|8
zLz;3~*W?d-dwWl<6iB~Z$=|U#Z*^V18jnCv-m+yZV27Ev-zUxcX;-Q(`vq^=y!ngE
zlanD;WxFIvVj>rwnw`rwXBN!05|cVX`<<VDCE7(M;Q`>B!x}_BFfj03dci!M%jFvy
zBKl9UXv6NVuCCPZi4z@WHur?XdCr?ttC|GM61ybJ;`xII4^A%TTN1EGbn@iM4awBp
zSJ3d*a7eqhs!nf*=0%vvm)Tst)uXF*Ex~_uO}U^c(wm15AO70UzsQFDFR0zr)Rd5!
zG)ryQaUX!@8}VqI3!KJiwaf9?wj<1E%^h%~{?XCVCX(fqA{+Jwy}G@<-8^=z|8H8c
z<GLZsa<?5h(lazLGO}MYl&4+6^+;=0!xHNSF1|FIUT6mB7DZKdgZZc@U`fD4Br@SL
zte_Azpxx~>*4y3v11fr!rS$iIVj%v%g-9jYw%h0zvZP56A(Q3vOp;&`q)*;T4(VsG
z9Br5LIOKq}C;(v5HdX{Ii{cFgxC8+M=rzN`!)ulUq{s8jnKO)Yx5b5mm?S!~EdA=e
zqq-tsY|S)d(lik}wi8E`SWE5YD(Q4OZaHq0^vjqy1$k3`Srq|erAfraIhy1+d>#7B
zs$qy(M{-D>EVBemV}{yZsR$Us+Y&@RO_2h&rNapx_9ib!?Kn;|9A+Ik3VbJd;J|^T
zUrt59M2s}(I`9%;!Lsemeg?H}o0hZFL39uinGoWx;oz&z=?IV_%fG{x1dd1!^qXo8
z($CLzoUOMVPJ$@*oBtiP18EqZdJTY0(lBhQ32CUZm{BeIXV0G11c7fLIWPwU`S``f
zd;<Xn$Rt9{?a=1%hEOOJUCgK!{TnxKtg{?m;El*Mr6@{~!;y?YfHh4^g264CfbEKz
zrnxMU0*Yw_|MetCX6&Y}>jfoI-z$LtM<S6VqC|!!+3;Z7wqqWHTGogVEr>!fI2y&^
zL}zDbA)NYU1OmKg&z?LqJVT6dzU$CJi=RoY+A!T0pk)C80?y5^l;T@4`MEPm6t5SO
zATUJY9w@ZYF`LO`!m!0qKA#T(Oc;v|foB-I6vgS=h);z$w6F#-tkp2>$FPHx3mclE
zOx%&}YXk<2t++~uhmFr^*X9oq4+3;Em3q?6J8@TV8bvO~Dc?XmBF9-h_3ums9<O3o
zG&}{sSTBv$BVSO_M%1APX%%XU4#>X+T~&TWN^stX^G-7`U|m<QX7HK8Z9(NCUq3N1
zAz!?B@s(`Oe%G>{LViKpNkXZn6d%8`rLgNz02YT|!Da<jlIH6o`ivY29q8`rx+_8u
zv%r7>0*)t<*EVA->k)!tq9i>FjjyF`{9iWg58`pikiDaA;Ka(HUI3;nb}5H=p2s^A
z1Q-`msOjjvg_X`|nmiec#eRX$%oDg$r7FPKE(&eU02wn3BNh&Y-f$g0?{K${iTIR~
zq+70QCt-iIumph30ic0)R+eQ-%Cos#&Om-(;N4OiPzq~dEHL0`G<qv*Ocz2M%$UCI
zqWkvkqp#Z6%W^OC0tr=_H<gFUlmeGyAN7x?GTE1LYzp{-9@8}S9cYRLW)Of7{M`Nf
z_fMAFfxsFjSu&H)!Gm8kOe>Vhny(sp`x!X66#z$I5++N=#{&c3VnR=;NmT)EY+Umx
zPuzSBj2_4Ro0_+rLZV%Y@x6}09g!V|Z;p?TNB8dCTexEI^Qy`uXd*JTaNg$KwrxG{
zIBq?>KhSCE7rInim6^&UHrUtKGgOMMYQP>7Tn=u++5ZUov-S1$cU>uYbd_qHgmKV3
zhzOE{-CjcN(sfw5dG`dke_)`4+wKPoMt+qdONmfe8|&-od9R$1a^uI3A8*B>b8f*f
z!$@D}HBC8txUcUhIbOLrRRbOz9DEQ?_t{*=*y#n*RdwM+B&>EIT>V^5(Bkp2v9U-p
zl|DU}$#u}32Nm2yFEm8LM_~>li|M_7)%J(gugAUd1`jMT%I3^Qm`7EYgGh$rw&iZ{
zz!D!gaRi6ZHfonERRe~NrBp>J%2O4YA;D+=loL{F9Q0{bkqbw-_g-PlmL&PA*DqC9
z4H*A-T+vl_sxGWgQDy~GNQZUxo3^&Ls_xpzv2bzzc0-+Z9Sf!m&1|UCFGND>cqyRX
zSk*R66LBny2yc(#>!1x^27etobm;q~9K{n>s)plj0lyuXpW3)_;{@H9mZG~qc3%T!
aH1Hn*T@%Iz?pTZf0000<MNUMnLSTY%Gno|t

literal 0
HcmV?d00001

diff --git a/static/imgs/tabbar/mine-blue.png b/static/imgs/tabbar/mine-blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..f893dcf42fd5d72256605510bdcc3f8117822d20
GIT binary patch
literal 957
zcmV;u148_XP)<h;3K|Lk000e1NJLTq001oj001or1^@s6IvV1d00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91EuaGc1ONa40RR91EdT%j07j?<Pyhe}CrLy>R9Fe^m`!XAQ547jr=^Mz
z#lm-NEHv0iDp6r2@exW$R|FBUWg(Hy!$@1fqS(<$h^55B#;!>htZYQWqP`NLK9Z71
z1bx-xKk9AX%$>PsUO!&s-DEnQd;aH~-<-Mc&b<TFTCD=k3W(E^$Dk@Wi)JX6^O%D=
zd_*G#5Xh%I;aooB10Cp6COFMwKVcV@B~u6<^XSDo+(x_nF0-32D~AsB1VJw_^UTcb
zf@heHc7*agQ=1~F3_8$W0v}6>A2$iUvFdH;lK!~SuO~lrpalYV`lX4fzH+>8Aoz=z
z#iOInLlc*Tx`v(S;|A}ZCf@K(Z*`e4AM`M~nKYko2|%$K1>IJ<w4CjUL!Hktxx<pg
zsU5{Zr!B=`hc03(t2`|wrp2_~A}(p|(2A8M=W#eUA=J6nICkhdEU+d?)sNWY*`XDK
zsSq|}G|)cST##!9cw<fC)C<=pq5O2(9R_=)XX7Db{c^;!bu0R84r6LNbcYPl^<JK2
zF`s%|kM((U*rB7K4Y<U)de|erTO#O3r#x~C+?IUMp*$sYv=q(TqNjBruX8@=C|f74
z^6xcsV!;>GV=ubpz1jDlL;h7>DPxEB@ZXcA%ha>rGuP9toH1Ue>N1S^p$od3uk(OM
zOGb`z^J@;RD_DUWI4;F<qtCS+I?#;-z0BaPJ_(!}!7JJVbm1;U)Tv7__(MmV)-yPV
zQEpwqT8&o|PM`B|2&d$`Z%Du7q0T}PcUa+lzJX0T!4r=4HjeeTK7QHIp*9e>kHDLJ
z0#=|I<nwFsnN_l<ydvLP6Av8S>k=OK(W9BW`gG{A&jUv)sGiMLu^vOXmF46f9-%Jd
zi+X?oGVeSqiP>I<o!qHEaQV3_UHrS-o_yelRB@3z8Yf$_A=GBN9*+E{q$$?&$M4+q
zCPR-9xYADqmENu5s4GM=v|^9TVbb~~TBGQ~q<nGcg05zjS0#xjwJ&<oBiNOcGY+lT
zk|dmxJ_k!28i>9%S4&G|NrGNnEyUzVWcg2^6*H=+(v3+h@ehfDcbq+<*LO9vAJqU+
fW2jYNqATzRYhI(5a~tP?00000NkvXXu0mjf1L>^x

literal 0
HcmV?d00001

diff --git a/static/imgs/tabbar/mine-gray.png b/static/imgs/tabbar/mine-gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6c94fba68a96b737071e3e57e9986a1652a9cf8
GIT binary patch
literal 1522
zcmV<O1r7R%P)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91ET97b1ONa40RR91EC2ui0Q_#}qW}N}TuDShR9Fe^SY2owRTMsVX0|4=
zjcskEYSC0n)rtra#2@hI!4@C1qLMx+h9X7qXC<4THF1;NB<rThCL3F=5aNRseMnHm
zzJ&Ir_#l=*1%FTo##BTqTD47^-<_H3Ig`D!v+2(6oz03bxsaT5&pqcm-<-LBI{<5K
ztpaNmxS|4meSI6~?}~vk7+4uFARbTMXtDJ3!e;vb#9ablJ>eqwW&HOoV{lv-p^sv*
z$ZxC7w<^M^RH|}j&g?)EuL~h63z1=r&Expt>MEl<5{ZyrQY)D-Rn-*c=K{n%K{7L7
zXAEZSE4A7s5$37XW|%W4u&TF8vIw+*uYVK?jSDcQ$<Dysfe-XJ2-uI)q{8)OYznH3
zdwC@Cx3sBBL)9_IZ_XUeA<N)|0mi{ttnt?zKY$7BkH+JJ?IxHbLcm@cr&xv<s6Iyh
zAT4l(yW;)N*g||Fli=L^c=xWF`ntM0OWN|uv9U4zhsm?YknD4ETx0Cn&REN*vacdF
z6(_F`ChU@ZB>Vm5>WUYOktKifAzzA-@m?%xD<%UG=81vZaW3BJf@;tj4u==rei6m-
z#Te;EScED2Dl!mZu*Dt;ihJu{yLZ-%%f70l7>afMJ(#YofD(+b5I1?SCRC<^$KO#i
zF|-($TP~)w`pRI0nb?v=(#~h~pqeK(2eUX%Fv3Fn!-W)LldA_+ys=(P1)M;H8Hisz
zn6<dd18<9&m|BUm0#llOWiY~qc3L9g33fwIZ}K78SCte)vC^M;Fr}@K3`Dr2wdo9&
z^g9V?+ake*P{tr%ijnbzMVPX$B9)U#Fb3LDspC=m0KC<ol>MR-eVv$$qZg}atQ({1
znen4J*cDHn!q@t+48_yygUXNyN2Ae8(&m+PnV(O?J4m)(+VPU~MQ5z}QH;g&L%juF
zGz86ihibq~e}$yC$y7)Hw>dGa>1^EA#WdM9i|w#2ysZIy34Pry5q*CLBXmD+Z8$6A
zRb@$p2^>k^0#^DYR@}W}swBmVPJtfUgJgeJ@n7i^cn(VdT~F&+(Vt{rU1E%|OS{%$
zlE4+_Lqi*3E}g)8#X+2WB_+nBCTMH~szPnNq2Yr1!v-YG6N9_JvX0|?yv>`$Apq=4
zeEgGi5a8~0j>Z|YuNS~>#$OzGX%Y{vd_cSeO@d}T!P^=qy?BLm<qGqj<Rh5$GbFoF
z0^;JCL6XU<^z}zuTVMW1+VjcY-uE^wT9;oz^38}*EqxH<0@K9Poo_}@Nn0VQM7XDK
z=niWseL5!*W1~=^y~>-K0$qamz`zz*u;0bSx?d8b2iMny?rV=W{3vaHvMAx@%3Q)9
zoUoHXGW%wX$6DMI%MZMeoyYsza6F#5TM(|&57VN%#G*BOSdt|IxX(vdOO|j5gRn@a
z=4_91*4xWH|NjLm+<j>9ZaZy$jf=&3Fno0%^7fW`f4JZyyr=&dPPG>(63N(F$f)gj
zqwyO*q=FT;P3w?{?0LAR;x#{@lI@6zg>cpZ<)WO0uzU&gz9ZW)(D{x)0QmIXJRF`W
z1XjuzVG_0{c5f!P$COol2}64EDbIqK72CItWW&m<ZMfQa9~a#$p;At^w16KK^EZFO
zU_a@G2r<qN99VGsWmcSzgP23Y3MNV*ESTr}13MwX{xhk0a(HvENSL?6!^6WNd^w)0
z<MMTJMQmBSc%)Bf0mZgu4q1!T@)ACG@#3|#lamu|HM-DCxRuEiYEo$HrYM)=jkz5T
zc|sjhdF;TG$?L$jjdfOKx~(nzXFi{D+Y*T*TbK0t5NMjoo13$r6v~}w4R5Ui|6>LI
Y1-mBj*OxxQpa1{>07*qoM6N<$g7k09*8l(j

literal 0
HcmV?d00001

diff --git a/static/imgs/tabbar/store-blue.png b/static/imgs/tabbar/store-blue.png
index d75c4741782ef3be192ee007ffa84da2169005f4..edc9af289da5f9da498a54b371c2be3773587a34 100644
GIT binary patch
delta 1037
zcmV+o1oHd82mc6=fq&^qL_t(o3GG;0NK`=>{${<E7s`sVsEp`>&{OxTK7@n>(OXd1
zje3bF@TG7!Sjr1QL<JHQ3Q=!?L@!~`gAZbn6j<~i7G^gpwbqKt&7Hn~ujj1ioL$S@
zCHBBLGynhn|9tb!?3p<NnJ1&b|D}LRYC3McmbhI|n3WWMyni5#&&a}UoL2Xe2~AA8
zR&OWSThPc(CgERUTsVX})to4YGik3b!3cVpq##kE3G$C37c1da-A?&jPEPzn4gHfv
zSg2%Cq*IQZ=(Jbbt7pKEm)sVGiIPmPUsLTBRQs7-UVEkeIGzH+!c$Q!j~(F<z{-18
z7r{rBfnqE7KYzC=1dxL=s@-EXmbKD897!2rVX5Kb@5yaNSZrhW^m#oMgXm-6Y`dUI
zu`ANf!E&noB7VHFN)Pc}nQFqqQqBcGYU2q@->kG(=Mvb<fCX0I6xjS^xD@qDeqYhY
ztn>)>rV(KwnL|D&qHM#B7-_9V^)Z0>fE4r(LQZDG6MrM^!F<}67<}o{%)=<kjbvh^
zfw@LUTD1c~L8Fvnr1OJ^Nz{>MjgLk?G16}Jo{mAIGcDSo)3M#iB}Q7T3YU$}G-+Ss
z0n=~fVkTXLb0j`s1UR-8+US4ih%r0+ng2RX+HAJzDSYKiZ_MS%O!}nq5ww*lOnb;C
zWfSU9g?|!kA(6W_n3!4NIdL0#Q0%4g5Q{T$g&|@psq))cl2FS`T5R&w;KC*jaFZnv
zAHe==mcwXJN4YNfOszRl`6P3*3|rvkRBI+?H3`4rJGYRrEj*+vX@6pYmu>op9LkBm
zZ{;^1<M9ZuUd&^C18FT}qM!V(c+6y-oY)Vzb$>PO7a8KCeK*diPRM0z2-`T-rL^ZV
zrjKOXh#w$ct_C+))-$dFr7Z9G1|G#K_RCoci2uU+0avgSO4+W2J!!9A!h|z<qwYqH
z`p&_CMqP|=*hy0R*sBQILVq*|Y~_GgNwqyVDY1LCi#gV?>|sx~#8fedpQjYy3S(M>
zD}NBNdUP4{FXC$4iJ0PRd(s|#fWa*c7$qUu<I_376hnfyBv`?fxI}wZ)Gk*_jSr0R
zvzFsGFY2>yh@!*9e<xnB^5M}z(wnW};9L_wS;4{0gk|6LP|;r2U8WSFe>KcwOeyV&
z2ur94H!VEDq`s7rAuWm1>dBCvtmVikoqti<L4p5ld&vKcQ}rl(avIu6=`OzZtu9QF
zeA(efq>k7pqV8}?Vo$nWy&~y)+hC1#yaY9JTGh6gKXJ$nF9#Q#LhbJ!ktmPe!6SA*
zyUSQ7b1X+9$5RI=P#*)@Fb7RIrhbkmID^e7kWnB73j7AZs_7*WF>6Es0000<MFvhp
Hu0mjflidGo

delta 843
zcmV-R1GN1A2)_rAfqyAUL_t(o3GG<VYZE~f{<gbOtI*KK76kQDtHmOEu|;|mwH{Q&
zf{1^DdeWPqmx>_uCPGC)5Iy)mXth+tUk8u1v_gsnwT);sO>MI2yrk2aByT6#4Jk?4
z2Vo{}-+cScw==u%jg?BJvS=`CYB0Vzx*_THdTI@+wBx1D?0*7q|GkZgISX!?ts30|
z9P4y(;ecBLH<bWJKH8Z6Wg%Mzr)?{6dY_9^;%738dwUS!!y}t8pR`P4ORin+OJn#%
zX3ak_Z{f&;2$IYGaE6YiajjqBtO2fe*yTYA`z1_x_ukn^EUH@!zp;H2rqQ>?Y@`ih
zv!rQB1TzbhLVsOpUjpJRiYGJkTcVV<Ea`G<xD-ZtGTOSW2FEm(C9NpbXD=kZUe6^|
zI#k-Az{Xh~Et?I~EOUwS5NXxmv}iaIPqwVm$M+b%p>ibC?uus7y<L4>g5n(7;i6q6
zPhQ57rfiLpA3zcC0+4<p{A_R;w)%?WQf~$q4|*p)a(}Ge?v1&4e3tI*ZETh&!zuZp
zTtfde%WHZ|OM(>E3G3It{{yBIA~n^WOg|>n?P|-SNt-wm1|w;1Kt1@_<xvmBOdLEb
z7fRsoihQ_|%7xw%wCQLKJ5|Uq9=C9N%)vmHiz|KJdx2dZR3cI3;<w_UP50=Gc@vow
z?0*=+r+?Y}tm9Xg(6Nn=W_6*O&M#qtfBM<R53%Wj+MgvgazX1WZ@$NprXn<`O^LUJ
zv=84boO}|&&}&<|a_!q03j@M`XS~o~5M=nnk}g*@8}JHVYd1$7jDBqrq#aCZlezxF
z!7Jgv@zO!uP*!=}hb8S5?ANb9Vz2(+|LVz9iho~I(v_0%8yAxHt60$ZQ0bt``5m`$
zl%~_mphoFst&LThj$4BmCGeCFOS3g}J=ZSqR}drdWUCF4F67RK>A1Byq6ny~e2+?`
z=jYP}3H-VJ`N{Wmxae+ISc9v68q?XT`Fry5y*pj(j`H^*FPr7ba5`?K(@WD~AjMJ<
z>O@u3%_V`>W|UMlKZU=|!yglVQ}tpbEy>qg%Px<4BU#KRBwegXt^S8f*Gk!9+!eML
V>x73#TD<@O002ovPDHLkV1j=ir?~(C

diff --git a/static/imgs/tabbar/store-gray.png b/static/imgs/tabbar/store-gray.png
index c64fad49e4864381c41e0cef8f6ba1872dcabce0..07fe841efec0e3fd7ad11786f1070f7fdfde9317 100644
GIT binary patch
delta 1608
zcmV-O2DkZ<3AGK7fPV%bNkl<ZSPAV}U2GIp6h3!m*)63-3!xEtpok(gMuQ>`V(=%?
zgajW<phipNNlKI;E$%|ME!@&=H`}dk6lfwbk|3H=R7AkU2L*r77!!R##NY$vClFB)
zLn-a<%=Np|o!jZ`%r-)Qkn|>-d+xd4`I$54oVhbgG(N^7aDQt>fDLsy^|6+ff{fL`
z-Alyshr(aiz7PiFx`?s;lpjd)s;a+o>B;FdZ)k26Br0<$816mB*omN)w>TPId(lsK
zz;9zq{Pp>!VXPz3kHFPkL8MJT{0;LN6$&93eslZGUJiY)`04bGG><j!hJtb_$VhvF
z*M*PxDH#raV}E1Y^pu(U5_k3<M7t-X7tE-xe)*D@Zq19ylgVNdV!7Odg3m|VVQHtP
zrt&-^7MC=FHL=gU@}i`@hNsiiD^?*Zf|h_Lws{GT1Wy!C-oqGOmb!(YRem<IoaToQ
z%RHCe0%<{~OYfd_z)yI%`MjdyDs;Xp^&;A(Jl684mw$~cr`gdTo`t{+31%9#mz9;t
zb~Ji}X>TcG!mLoVgUE6kg|J5MBg)q%ut{$_u%klqn(#5C$hZB*#4_I6I>l{xkkh;|
zc|US#u?1qRBN|=vr(0k&){OKW(hlk>kM*Qix@`_}nuKXZ*#a@z>IRS2x-ehsL?`)M
z+Vd(%mw(gj83}~Icf2O@qol`TR8>{=5EHwkZPeG?hD6&uryt7cL?Tg$e7?ilWUSK(
z8VeeE{jqJ=Oc@JpTF%Ppo-~`SHiS5?=rJM!6g;6!GjmWeDyIWNA1FFK^I%a@qfewX
znrK@U#Ln5YoYjG;ws!p)oa!!EDPo96uy@c2bbr(6H1{FlWU&_De%146BsV^mSU`fc
zqhLZf8bmkOgb%rOI@iqTTa-DgQ9!WooqH<M8Ri$(%-9;9NZjcJI%&RrdjXkdCyL~8
z{1%WQ_VA{bQYXeq_xD=%0Rr+c@Mx>%dkqcE1L^1lgXTMT<{`S9B^yoQWNqzhT~5eg
zr++7esu6{5C@!QvI>_T~B~GxUo0_&wrAyuW5Cv7yp!0DN2W6jk<K^j%uBHw^=S+JK
zZR|FKiBH{KLGH)n?L~C%;(p-mi&|^T*>l#>l*f|m5Q#PkuzDpEyK&U}2}={{Fdw&g
z1tO*j166(sPLx=9#!|rS!}I@Zw5&ex9)H9W;sq-RSO9w->mpoao`olbhOrNsprhEm
z2EFqj2Ru#h-)Hahx`=f=mTP-tIW0Hp8<H>KIKCCeLN?Gn<Bp_YsEVddeupkz?f};6
z@ot>G2L3n&LQ5!}Dj_mHf@4$dJ+B$~meM&T8@<jxo=!_8Tow+oO^DnQL`D@Xlz;Vr
zcSsKgH`Q&Z{KYm{A8TF?N7m!^EW`yUy)q}k+d*?m-sELvGWulYcz3!MWI3W+Z0mq-
zEa@xKMJtbP_{8SBXQkY|VXt{x+wIylbC#JlrlCvxF)7G?4Tr<s_P%?zULbn4yYMUv
zlCGcT)s?5*7<=8>*{L7@?aXYAjDP8-pvxhxpv&)V#g_Ts&YqFp($xHzX^1yaP`h|-
zxYd1iTnLRCle-YjVhU+1csTsK8*{yD-jLXf;+%rVTRD$JE_mq~-10IA)1+6C#}A-k
z$h^xMT0FT3d0UPgehM}JTo&Lu8C&8l55ev-=zfy*lJ$=2rOMN36ob{$;D1z+6;+oc
zz9SSWmc|MceS?IV7DcuSl(M32o;`azZSUTsv$xX>vA&6ix6?O)!|2(bO+vahq|>E)
z_xcKt)wK=jw5MaHc17_`F+eNk$P#`|=g#Sx_1_@;9k_#s16pv@U(M8+!WA1FhWf|Z
zvuEY!u^xLZXU?pzr_Vci!+%2Sc=Qi^8nVtQUV43;w%!q+mID7=O&!4()IqO1N)b-#
ziuNLKTJmBmo?G6O546k>bj&8*v!~N~khL4VVl{Fk4-Xi;3Fpohw^FtKuVNWIuJmUy
zXXa;0kBjik>AFbdB);P<Mb37)@FTi}Jt6Ca0>P#BG1kjq?%M~6SV631W}2D)k5paH
z8Bf!|p)<$OGV=J>LFDO^&urXSVSVb&Au_%-9)Vjf0{;S8X&O4A_JhIz0000<MNUMn
GLSTYZsVay7

delta 1056
zcmV+*1mF9$4Uq|ufPVw~Nkl<ZSPAV|>rWFw5T7>mg%M~$d5Ue3M<FIAqM&H-9ivDz
z{(oxxpnn3Ah#-`wKoAlACh~q*N(+=i3H9da?(LQ7wI^WOq?5qS&d$#MIyW~vvxaau
z9EA)cV}{|C;buYqueX+wp3X_+oz1N+7#sfzKA#_=QSEQlVt=)O+gS+>^>s(g`TZL(
zJ~0XYjR1hQ8L-)`P*Yt6)tB5y?1%ybl|2yft2gf;w6i1XCgrbPy#f#JwQ@b*x*uM@
zeGidHgv(N4?zXl-^YzArs$_VehxG!+9lnfBz)m>KHyaur)eRUId;5psK;!L_;ejE+
z=ypppl$I8=p?~}|fI&6>)YAuRe|)lReSHJU%SvP(J<aIh{X1Z{=d+>wjJMO#`4NJf
zTM*gbhhQKG1qEt-wwMGh#xMe|aygkk`5cry$|xE=V65s}s3<RmlH&7xj$(3hOk6Bt
z;KCR~hDW?ox{cEcv_Tzp34N7TpcA5uo5+HWbI7R;vwxmGHP^-&CiAq#V&-byJzf|Z
z9^+$*Sy^4>VvEHh@QR&|&Mq*Ul`&Tmm_Trok3>6M7-LA#Zr4San*J%Pu#+x+AvMm=
zI}1gH4nE~}IpNpLtUO*`QGOU#NWkDBl$&cyFbhD&G*)X^{OBPB{Ji}s7=&coDA~B&
z;L&3S3V$7TXm5M0xrVIr*a|Fuu$B;yW;Q22@l~RSMZn_x_IBv7G)+>Q+H5v(NT8FQ
zF`A&ojnj!I!y}ylQdr0j5f!nl92yx-t#gsG4SsYO!$u*dsSUMcbMp((KR5zaZkOga
zMS{i_NpHu2Sz>i{4ceYO(!!-V*VWwzOUo;A#($~z)WDhCTvDG55A5mmwn%9G+xH)^
z9SV^fr6Szj-Q#L|0?&mphW0czp)taa0}FU9!h?h5VZT4XJ+!#A0-yT^;6g<i+`8Gs
zP0TMWL0|tMI4@Shji$uCAYTy2kf6oPge_9Cj>BwLIu5br?)479%<ozGuijG&4ts&T
zeSc4{7v|;{CHWkn9CN%LBEv(EfkRz7v#MVAp7QEN`M-qW34zxCGmo<(3;H<T)3Y|~
zX+7RLj&4SJn#|L9d&%g7ba0qVVjgBQQbvy5f(AF0jswff(<Tx$Ubjw8P0M@Z-CC-I
z1w7WnjEqJle~Y!Y(Wty&wOr5_beKK%RDV`8iS)$#VZ3fN<&eKg&{SAFHDA7XrYhj;
zYHMVLb47)!Hq293Ez5C@J$6c>z*Bdqj~AHv`FXMq^-r@2!0T4Lz0|r4M5EZbB<kt#
z%GhSL9_eaAAxSQUq3CI}CCjD$Q1LlR)uahpt(ra~GCa};9*ramn)b`dOS7Inc^RM5
a7XJbm-$0UX@)b$|0000<MNUMnLSTaM0|xK_