From 0057bcd28e8f1c9d6f6fb29b79517d5439752a28 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Wed, 5 Aug 2020 17:38:11 +0800
Subject: [PATCH] store 8.5

---
 common/api/shop.js               |  17 ++-
 common/api/user.js               |   5 +-
 components/shop/group/index.vue  |   6 +-
 components/shop/list/index.vue   |  18 ++-
 pageB/sdetails/index.vue         |  11 +-
 pageC/cart/ConfirmOrder.vue      |   5 +-
 pageC/merchant/classifyGoods.vue | 215 +++++++++++++++++++++++++++++++
 pageC/merchant/details.vue       |  19 +--
 pageC/merchant/goods.vue         | 200 ++++++++++++++++++++++++++++
 pageC/merchant/index.vue         | 136 +++++++++++--------
 pageC/merchant/storeClassify.vue |  88 +++++++++++++
 pageE/mine/StoreCollection.vue   |  14 +-
 pages.json                       |  47 +++++--
 pages/mine/index.vue             |   8 +-
 static/fonts/more.ttf            | Bin 0 -> 1664 bytes
 static/image/shop/10.png         | Bin 0 -> 1931 bytes
 static/image/shop/11.png         | Bin 0 -> 1764 bytes
 static/image/shop/12.png         | Bin 0 -> 2003 bytes
 static/image/shop/13.png         | Bin 0 -> 2144 bytes
 static/image/shop/8.png          | Bin 0 -> 1251 bytes
 static/image/shop/9.png          | Bin 0 -> 2030 bytes
 21 files changed, 688 insertions(+), 101 deletions(-)
 create mode 100644 pageC/merchant/classifyGoods.vue
 create mode 100644 pageC/merchant/goods.vue
 create mode 100644 pageC/merchant/storeClassify.vue
 create mode 100644 static/fonts/more.ttf
 create mode 100644 static/image/shop/10.png
 create mode 100644 static/image/shop/11.png
 create mode 100644 static/image/shop/12.png
 create mode 100644 static/image/shop/13.png
 create mode 100644 static/image/shop/8.png
 create mode 100644 static/image/shop/9.png

diff --git a/common/api/shop.js b/common/api/shop.js
index 9771263..2db23d5 100644
--- a/common/api/shop.js
+++ b/common/api/shop.js
@@ -173,10 +173,17 @@ export default {
 					goods_id: id
 				});
 			},
-			getStoreGoodsList({ id, page = 0}){
+			getStoreGoodsList({ id, page, order, gc_id }){
 				return vm.$u.post('Store/getStoreGoodsList', {
 					id: id,
-					page:page
+					page: page,
+					order: order,
+					gc_id: gc_id,
+				});
+			},
+			getStoreClassifyList({ id }) {
+				return vm.$u.post('Store/getStoreClassifyList', {
+					id: id
 				});
 			},
 			getStoreImgVideoList({id}){
@@ -306,7 +313,11 @@ export default {
 			//  达人上架商品
 			goodsShelves({live_id}){
 				return vm.$u.post('Specialci/goodsShelves',{live_id})
-			}
+			},
+			// 
+			addFavoriteStore({ id }) {
+				return vm.$u.post('member/addFavoriteStore',{ fid: id })
+			},
         }
     }
     
diff --git a/common/api/user.js b/common/api/user.js
index 2eafe9e..19d6fd8 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -175,9 +175,10 @@ export default {
 				return vm.$u.post('Member/getFavoritesList', params);
 			},
 			// 取消收藏（商品/店铺）
-			removeFavorite({ id }) {
+			removeFavorite({ id, type }) {
 				return vm.$u.post('Member/removeFavorite', {
-					id: id,
+					fav_id: id,
+					type: type,
 				});
 			},
 			// 设置-用户信息
diff --git a/components/shop/group/index.vue b/components/shop/group/index.vue
index 5c69287..f954b6e 100644
--- a/components/shop/group/index.vue
+++ b/components/shop/group/index.vue
@@ -7,7 +7,7 @@
         <view class="label">
             <u-tabs-swiper ref="group" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="88"></u-tabs-swiper>
         </view>
-		<swiper :current="swiperCurrent" @animationfinish="animationfinish" style="height: 130px">
+		<swiper :current="swiperCurrent" @animationfinish="animationfinish" style="height: 260rpx">
 			<swiper-item class="swiper-item list" v-for="(_, i) in classifyList" :key="i">
 				<!-- 最多显示3个 -->
 				<sitem :info="info" v-for="(info, index) in groupList.slice(0, 3)" :key="index"></sitem>
@@ -97,8 +97,8 @@ export default {
 		box-sizing: border-box;
 		padding: 0 30rpx;
         display: flex;
-		&:not(:nth-child(3n)) {
-			> view {
+		> view {
+			&:not(:nth-child(3n)) {
 				margin-right: 20rpx;
 			}
 		}
diff --git a/components/shop/list/index.vue b/components/shop/list/index.vue
index 35f2e4f..b301b7b 100644
--- a/components/shop/list/index.vue
+++ b/components/shop/list/index.vue
@@ -2,7 +2,7 @@
     <view class="list">
         <view class="top">商品推荐</view>
 		<view>
-			<u-tabs-swiper ref="uTabs" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60" ></u-tabs-swiper>
+			<u-tabs-swiper ref="uTabs" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60"></u-tabs-swiper>
 		</view>
 		<swiper class="swiper-box" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" :style="{height: swiperHeight}">
 			<swiper-item class="swiper-item" v-for="(_, index) in classifyList" :key="index">
@@ -39,6 +39,7 @@ export default {
 	watch: {
 		current(index) {
 			this.page = 1;
+			this.goodsList = [];
 			const id = this.classifyList[index].gc_id;
 			this.getGoodsRecommend({gc_id: id});
 		}
@@ -68,7 +69,7 @@ export default {
 				this.page--;
 			})
 		},
-		getGoodsClassRecommend(gc_id) {
+		getGoodsClassRecommend() {
 			this.$u.api.getGoodsClassRecommend().then(res => {
 				if (res.errCode == 0) {
 					// 初始化 current
@@ -82,6 +83,7 @@ export default {
 				page: page,
 				gc_id: gc_id,
 			})
+			// this.swiperCurrent = this.current;
 			if (res.errCode == 0) {
 				this.timer = true;
 				if(reload) this.goodsList = res.data.goodsList;
@@ -93,13 +95,14 @@ export default {
 		},
 		setSwiperHeight() {
 			// height: 230px, margin-bottom: 13
-			// const height = Math.ceil(this.goodsList.length / 2) * (510 + 26);
-			// this.swiperHeight = height == 0 ? '230rpx' : height + 'rpx';
-			this.swiperHeight = Math.ceil(this.goodsList.length / 2) * (270 + 13) + 'px';
+			const height = Math.ceil(this.goodsList.length / 2) * (540 + 26);
+			this.swiperHeight = height == 0 ? '230rpx' : height + 'rpx';
+			// this.swiperHeight = Math.ceil(this.goodsList.length / 2) * (270 + 13) + 'px';
 		},
 		// tabs通知swiper切换
 		tabsChange(index) {
-			this.swiperCurrent = index;
+			this.current = index;
+			// this.getGoodsRecommend({ gc_id: this.classifyList[this.current].gc_id });
 		},
 		// swiper-item左右移动，通知tabs的滑块跟随移动
 		transition(e) {
@@ -111,8 +114,9 @@ export default {
 		animationfinish(e) {
 			let current = e.detail.current;
 			this.$refs.uTabs.setFinishCurrent(current);
-			this.swiperCurrent = current;
 			this.current = current;
+			this.swiperCurrent = current;
+			// this.getGoodsRecommend({ gc_id: this.classifyList[this.current].gc_id });
 		},
 	}
 }
diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue
index acf6c69..76ceb0b 100644
--- a/pageB/sdetails/index.vue
+++ b/pageB/sdetails/index.vue
@@ -135,7 +135,7 @@
         </u-popup>
 		<!-- 普通商品 tool -->
         <view class="tloos" v-if="type == 1">
-            <view class="navs">
+            <view class="navs" @click="toOthersPage('pageC/merchant/index?id=' + storeInfo.store_id)">
                 <image src="/static/image/common/18.png"></image>
                 店铺
             </view>
@@ -155,7 +155,7 @@
 		<!-- 秒杀 tool -->
 		<view class="spike-tool" v-if="type==3">
 			<view class="left">
-				<view>
+				<view @click="toOthersPage('pageC/merchant/index?id=' + storeInfo.store_id)">
 					<image src="/static/image/common/18.png"></image>
 					<text>店铺</text>
 				</view>
@@ -183,7 +183,8 @@ export default {
     data() {
         return {
             list: [],　// 轮播图列表
-            goodsInfo: {}, // 商品信息
+			goodsInfo: {}, // 商品信息
+			storeInfo: {},
             glist: [], // 规格列表
 			id: 0, // 商品id/秒杀id/拼团 id
 			type: '', // 商品类型 商品详情 1普通 2拼团 3秒杀 4优惠券
@@ -311,6 +312,7 @@ export default {
 				if (res.errCode == 0) {
 					this.evaluate = res.data.goods_evaluate_info;
 					this.goodsInfo = res.data.goods;
+					this.storeInfo = res.data.store;
 					this.setSwiperList(res.data.goods_image);
 					this.glist = res.data.spec_list;
 					// console.log(this.goodsInfo.mobile_body);
@@ -452,6 +454,9 @@ export default {
 				title: title
 			});
 		},
+		toOthersPage(url) {
+			this.$u.route(url);
+		},
 		viewComment() {
 			this.$u.route({
 				url: 'pageB/comment/index',
diff --git a/pageC/cart/ConfirmOrder.vue b/pageC/cart/ConfirmOrder.vue
index de275a3..5437805 100644
--- a/pageC/cart/ConfirmOrder.vue
+++ b/pageC/cart/ConfirmOrder.vue
@@ -200,11 +200,13 @@ export default {
 			if(!this.debounce) return;
 			this.debounce = false;
 			if(this.orderType == 2) {
+				// this.sendOrder(0);
 				this.withImmediate();
 			} else if(this.orderType == 1) {
 				this.sendOrder(0);
+			} else {
+				this.sendOrder(1);
 			}
-			else this.sendOrder(1);
 		},
 		// @params {Number} ifcart 是否是购物车商品
 		sendOrder(ifcart) {
@@ -254,6 +256,7 @@ export default {
 			// console.log(params);
 			this.$u.api.sendOrder(params).then(res => {
 				if(res.errCode == 0) {
+					// this.withImmediate();
 					this.$u.route({
 						type: 'redirect',
 						url: '/pageC/cart/cashier',
diff --git a/pageC/merchant/classifyGoods.vue b/pageC/merchant/classifyGoods.vue
new file mode 100644
index 0000000..469cf36
--- /dev/null
+++ b/pageC/merchant/classifyGoods.vue
@@ -0,0 +1,215 @@
+<template>
+	<view class="classify-goods">
+		<view class="tab-container">
+			<view class="overall" :class="{ 'current' : current == 0 }" @click="switchCurrent(0)">综合</view>
+			<view class="salenum" :class="{ 'current' : current == 1 }" @click="switchCurrent(1)">销量</view>
+			<view class="new" :class="{ 'current' : current == 2 }" @click="switchCurrent(2)">新品</view>
+			<view class="price" :class="{ 'current' : current == 3 }" @click="switchCurrent(3)">
+				<view class="text">价格</view>
+				<view class="icon">
+					<u-icon name="arrow-up-fill" :color="(current == 3 && priceOrderAsc) ? '#FF780F' : '#333333'" size="22"></u-icon>
+					<u-icon name="arrow-down-fill" :color="(current == 3 && !priceOrderAsc) ? '#FF780F' : '#333333'" size="22"></u-icon>
+				</view>
+			</view>
+		</view>
+		<scroll-view scroll-y class="scroll-container" :style="{ height: scrollHeight }" @scrolltolower="loadMore">
+			<view class="goods-container">
+				<view v-for="goods in goodsList" :key="goods.goods_id" class="goods-view" @click="toDetailsPage(goods.goods_id)">
+					<goodsItem :info="goods"></goodsItem>
+				</view>
+			</view>
+			<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
+			<u-empty mode="list" v-if="!goodsList.length"></u-empty>
+		</scroll-view>
+	</view>
+</template>
+<script>
+import goodsItem from "@/components/shop/list/item"
+export default {
+	data() {
+		return {
+			pageSize: 15,
+			cid: '',
+			page: 1,
+			current: 0,
+			priceOrderAsc: true,　// 是否升序
+			goodsList: [],
+			scrollHeight: '',
+			loadStatus: 'loadmore',
+			timer: true, // 防止上拉加载短时间内多次调用
+		}
+	},
+	components: {
+		goodsItem
+	},
+	watch: {
+		current(value) {
+			this.page = 1;
+			this.goodsList = [];
+			this.getStoreGoodsList({ laod: 'reload' });
+		},
+		priceOrderAsc(value) {
+			this.page = 1;
+			this.getStoreGoodsList({ laod: 'reload' });
+		}
+	},
+	onLoad(option) {
+		if(option.cid == 'all') {
+			this.current = 0;
+			this.cid = 0;
+		} else if(option.cid == 'new') {
+			this.current = 2;
+			this.cid = 0;
+		} else {
+			this.cid = option.cid;
+		}
+		this.setTitle(option.name);
+		this.sid = option.sid;
+		this.setViewHeight();
+		this.getStoreGoodsList({ load: 'reload' });
+	},
+	methods: {
+		setOrderSort() {
+			let sort = '';
+			if(this.current == 0) {
+				sort = 'goods_sort';
+			} else if(this.current == 1) {
+				sort = 'goods_salenum';
+			} else if(this.current == 2) {
+				sort = 'goods_addtime';
+			} else if(this.current == 3) {
+				if(this.priceOrderAsc) sort = 'goods_price_asc';
+				else sort = 'goods_price_desc';
+			}
+			return sort;
+		},
+		// 排序方式 goods_salenum：销量　evaluation_count：评价　goods_price_asc：价格从低到高　goods_price_desc：价格从高到低
+		async getStoreGoodsList({ load = 'reload' } = {}) {
+			const sort = this.setOrderSort();
+			let params = { 
+				id: this.sid, 
+				page: this.page,
+				order: sort,
+			};
+			console.log(this.cid);
+			if(this.cid) Object.assign(params, { gc_id: this.cid })
+			const res = await this.$u.api.getStoreGoodsList(params);
+			this.timer = true;
+			if(res.errCode == 0) {
+				this.pageSize = res.data.per_page;
+				if(load == 'reload') this.goodsList = res.data.data;
+				else if(load == 'loadmore') this.goodsList.push(...res.data.data);
+			}
+			return res.data.data.length;
+		},
+		loadMore() {
+			if(this.goodsList.length < this.pageSize) return false;
+			if(!this.timer) return false;
+			this.loadStatus = "loading";
+			this.page++;
+			this.getStoreGoodsList({  load: 'loadmore' }).then(length => {
+				if(length == 0) {
+					this.page--;
+					this.loadStatus = 'nomore';
+				} else {
+					this.loadStatus = 'loading';
+				}
+			}).catch(() => {
+				this.loadStatus = "nomore";
+				this.page--;
+			})
+		},
+		switchCurrent(current) {
+			if(current == 3 && this.current == 3) this.priceOrderAsc = !this.priceOrderAsc;
+			this.current = current;
+		},
+		setViewHeight() {
+			const res = uni.getSystemInfoSync();
+			this.scrollHeight = res.windowHeight - 90 / 2 + 'px';
+			// console.log(this.scrollHeight);
+		},
+		toDetailsPage(id) {
+			this.$u.route('/pageB/sdetails/index', {
+				id: id,
+				type: 1 // 商品详情 商品类型 1普通 2拼团 3秒杀 4优惠券
+			});
+		},
+		setTitle(title){
+			uni.setNavigationBarTitle({
+				title: title
+			});
+		},
+	}
+};
+</script>
+<style lang="scss" scoped>
+.classify-goods {
+	width: 100%;
+	background-color: #FFFFFF;
+	.tab-container {
+		box-sizing: border-box;
+		padding: 30rpx 40rpx;
+		display: flex;
+		justify-content: space-between;
+		> view {
+			height: 30rpx;
+			line-height: 30rpx;
+			font-size: 32rpx;
+			color: rgba(51,51,51,1);
+		}
+		.price {
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+			.text {
+				margin-right: 5rpx;
+			}
+			.icon {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+		.current {
+			color: rgba(255,120,15,1);
+		}
+	}
+	.scroll-container {
+		box-sizing: border-box;
+		padding: 0 30rpx;
+		.goods-container {
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+		}
+		// .goods-view {
+		// 	margin: 0 auto;
+		// 	width: 690rpx;
+		// 	display: flex;
+		// 	background-color: #F5F5F5;
+		// 	margin-bottom: 30rpx;
+		// 	align-items: center;
+		// 	> image {
+		// 		width: 220rpx;
+		// 		height: 170rpx;
+		// 		flex-shrink: 0;
+		// 		margin-right: 30rpx;
+		// 	}
+		// 	.right {
+		// 		width: 418rpx;
+		// 		.name {
+		// 			font-size: 30rpx;
+		// 			color: rgba(51,51,51,1);
+		// 			margin-bottom: 20rpx;
+		// 		}
+		// 		.briefing {
+		// 			font-size: 28rpx;
+		// 			color: rgba(102,102,102,1);
+		// 			line-height: 36rpx;
+		// 		}
+		// 	}
+		// }
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pageC/merchant/details.vue b/pageC/merchant/details.vue
index dd9f66a..e8514c2 100644
--- a/pageC/merchant/details.vue
+++ b/pageC/merchant/details.vue
@@ -3,14 +3,14 @@
 		<view class="top">
 			<image :src="info.store_avatar"></image>
 			<view class="name">{{info.store_name}}</view>
-			<view class="info">创建时间：{{store_addtime|date}} | {{info.live_store_address}}</view>
+			<view class="info">创建时间：{{ info.store_addtime | date('yyyy年mm月dd日') }} | {{ info.live_store_address || '暂无地址' }}</view>
 			<view class="num">
 				<view>
 					<view class="value">{{info.store_collect}}</view>
 					<view class="title">粉丝数</view>
 				</view>
 				<view>
-					<view class="value">23435</view>
+					<view class="value">{{ info.evaluatecount }}</view>
 					<view class="title">评价</view>
 				</view>
 				<view>
@@ -22,9 +22,9 @@
 		<view class="bottom">
 			<view class="title">
 				<view>工商执照</view>
-				<image></image>
+				<u-icon name="arrow-down" color="#999999" size="28"></u-icon>
 			</view>
-			<view class="image-list">
+			<view class="image-list" v-if="info.business_licence_number_electronic">
 				<image :src="info.business_licence_number_electronic"></image>
 			</view>
 		</view>
@@ -37,9 +37,9 @@ export default {
 			info:{}
 		}
 	},
-	onLoad(){
-		this.$u.api.getStoreInfo({id:1}).then((res)=>{
-			console.log(res)
+	onLoad(option){
+		this.$u.api.getStoreInfo({id: option.id}).then((res)=>{
+			// console.log(res)
 			this.info = res.data
 		})
 	}
@@ -113,11 +113,6 @@ export default {
 				font-weight: 500;
 				color: rgba(51,51,51,1);
 			}
-			> image {
-				width: 24rpx;
-				height: 14rpx;
-				background-color: aqua;
-			}
 		}
 		.image-list {
 			background-color: #ffffff;
diff --git a/pageC/merchant/goods.vue b/pageC/merchant/goods.vue
new file mode 100644
index 0000000..423e43c
--- /dev/null
+++ b/pageC/merchant/goods.vue
@@ -0,0 +1,200 @@
+<template>
+	<view class="classify-goods">
+		<view class="tab-container">
+			<view class="overall" :class="{ 'current' : current == 0 }" @click="switchCurrent(0)">综合</view>
+			<view class="salenum" :class="{ 'current' : current == 1 }" @click="switchCurrent(1)">销量</view>
+			<view class="new" :class="{ 'current' : current == 2 }" @click="switchCurrent(2)">新品</view>
+			<view class="price" :class="{ 'current' : current == 3 }" @click="switchCurrent(3)">
+				<view class="text">价格</view>
+				<view class="icon">
+					<u-icon name="arrow-up-fill" :color="(current == 3 && priceOrderAsc) ? '#FF780F' : '#333333'" size="22"></u-icon>
+					<u-icon name="arrow-down-fill" :color="(current == 3 && !priceOrderAsc) ? '#FF780F' : '#333333'" size="22"></u-icon>
+				</view>
+			</view>
+		</view>
+		<scroll-view scroll-y class="scroll-container" :style="{ height: scrollHeight }" @scrolltolower="loadMore">
+			<view class="goods-container">
+				<view v-for="goods in goodsList" :key="goods.goods_id" class="goods-view" @click="toDetailsPage(goods.goods_id)">
+					<goodsItem :info="goods"></goodsItem>
+				</view>
+			</view>
+			<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
+			<u-empty mode="list" v-if="!goodsList.length"></u-empty>
+		</scroll-view>
+	</view>
+</template>
+<script>
+import goodsItem from "@/components/shop/list/item"
+export default {
+	data() {
+		return {
+			pageSize: 15,
+			cid: '',
+			page: 1,
+			current: 0,
+			priceOrderAsc: true,　// 是否升序
+			goodsList: [],
+			scrollHeight: '',
+			loadStatus: 'loadmore',
+			timer: true, // 防止上拉加载短时间内多次调用
+		}
+	},
+	components: {
+		goodsItem
+	},
+	props: {
+		sid: String
+	},
+	watch: {
+		current(value) {
+			this.page = 1;
+			this.goodsList = [];
+			this.getStoreGoodsList({ laod: 'reload' });
+		},
+		priceOrderAsc(value) {
+			this.page = 1;
+			this.getStoreGoodsList({ laod: 'reload' });
+		}
+	},
+	created() {
+		this.setViewHeight();
+		this.getStoreGoodsList({ load: 'reload' });
+	},
+	methods: {
+		setOrderSort() {
+			let sort = '';
+			if(this.current == 0) {
+				sort = 'goods_sort';
+			} else if(this.current == 1) {
+				sort = 'goods_salenum';
+			} else if(this.current == 2) {
+				sort = 'goods_addtime';
+			} else if(this.current == 3) {
+				if(this.priceOrderAsc) sort = 'goods_price_asc';
+				else sort = 'goods_price_desc';
+			}
+			return sort;
+		},
+		// 排序方式 goods_salenum：销量　evaluation_count：评价　goods_price_asc：价格从低到高　goods_price_desc：价格从高到低
+		async getStoreGoodsList({ load = 'reload' } = {}) {
+			const sort = this.setOrderSort();
+			const res = await this.$u.api.getStoreGoodsList({ 
+				id: this.sid, 
+				page: this.page,
+				order: sort,
+			})
+			this.timer = true;
+			if(res.errCode == 0) {
+				this.pageSize = res.data.per_page;
+				if(load == 'reload') this.goodsList = res.data.data;
+				else if(load == 'loadmore') this.goodsList.push(...res.data.data);
+			}
+			return res.data.data.length;
+		},
+		loadMore() {
+			if(this.goodsList.length < this.pageSize) return false;
+			if(!this.timer) return false;
+			this.loadStatus = "loading";
+			this.page++;
+			this.getStoreGoodsList({  load: 'loadmore' }).then(length => {
+				if(length == 0) {
+					this.page--;
+					this.loadStatus = 'nomore';
+				} else {
+					this.loadStatus = 'loading';
+				}
+			}).catch(() => {
+				this.loadStatus = "nomore";
+				this.page--;
+			})
+		},
+		switchCurrent(current) {
+			if(current == 1 && this.current == 1) this.priceOrderAsc = !this.priceOrderAsc;
+			this.current = current;
+		},
+		setViewHeight() {
+			const res = uni.getSystemInfoSync();
+			const otherHeight = 347 + 140 + 20 + 98;
+			this.scrollHeight = res.windowHeight - otherHeight / 2 + 'px';
+			// console.log(this.scrollHeight);
+		},
+		toDetailsPage(id) {
+			this.$u.route('/pageB/sdetails/index', {
+				id: id,
+				type: 1 // 商品详情 商品类型 1普通 2拼团 3秒杀 4优惠券
+			});
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.classify-goods {
+	width: 100%;
+	background-color: #FFFFFF;
+	.tab-container {
+		box-sizing: border-box;
+		padding: 30rpx 40rpx;
+		display: flex;
+		justify-content: space-between;
+		> view {
+			height: 30rpx;
+			line-height: 30rpx;
+			font-size: 32rpx;
+			color: rgba(51,51,51,1);
+		}
+		.price {
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+			.text {
+				margin-right: 5rpx;
+			}
+			.icon {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+		.current {
+			color: rgba(255,120,15,1);
+		}
+	}
+	.scroll-container {
+		box-sizing: border-box;
+		padding: 0 30rpx;
+		.goods-container {
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+		}
+		// .goods-view {
+		// 	margin: 0 auto;
+		// 	width: 690rpx;
+		// 	display: flex;
+		// 	background-color: #F5F5F5;
+		// 	margin-bottom: 30rpx;
+		// 	align-items: center;
+		// 	> image {
+		// 		width: 220rpx;
+		// 		height: 170rpx;
+		// 		flex-shrink: 0;
+		// 		margin-right: 30rpx;
+		// 	}
+		// 	.right {
+		// 		width: 418rpx;
+		// 		.name {
+		// 			font-size: 30rpx;
+		// 			color: rgba(51,51,51,1);
+		// 			margin-bottom: 20rpx;
+		// 		}
+		// 		.briefing {
+		// 			font-size: 28rpx;
+		// 			color: rgba(102,102,102,1);
+		// 			line-height: 36rpx;
+		// 		}
+		// 	}
+		// }
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pageC/merchant/index.vue b/pageC/merchant/index.vue
index 798eaa6..5f3fc26 100644
--- a/pageC/merchant/index.vue
+++ b/pageC/merchant/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="merchant">
-		<view v-if="show">
+		<!-- <view v-if="show" class="show-hide">
 			<view>
 				<image></image>
 				<view>消息</view>
@@ -13,67 +13,70 @@
 				<image></image>
 				<view>我的</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="top" :style="{'background-image':'url(' + info.store_banner + ')'}">
 			<image :src="info.store_avatar"></image>
 			<view class="info">
 				<view class="name u-line-1">{{info.store_name}}</view>
 				<view class="num">粉丝数：{{info.store_collect}}</view>
 			</view>
-			<view class="btn">
-				<image></image>
-				<view>{{ 0 ? "关注" : "已关注" }}</view>
+			<view class="btn" @click="attentionMember">
+				<image src="/static/image/shop/8.png"></image>
+				<view>{{ info.is_attention == 0 ? "关注" : "已关注" }}</view>
 			</view>
 		</view>
-		<view class="follow">
+		<view class="follow" v-if="info.attention_member && info.attention_member.length">
 			<view class="title">关注</view>
 			<scroll-view scroll-x class="list">
 				<view class="list-items">
-					<view v-for="(item, index) in 9" :key="index" class="item">
-						<image></image>
-						<view class="nickname u-line-1">用户昵称</view>
+					<view v-for="(item, index) in info.attention_member" :key="index" class="item">
+						<image :src="item.friend_frommavatar"></image>
+						<view class="nickname u-line-1">{{ item.friend_frommname }}</view>
 					</view>
 				</view>
 			</scroll-view>
 		</view>
 		<view class="main">
-			<view class="classify" v-if="cur==0">
+			<view class="video-image" v-if="cur==0 && indextop.length">
 				<view v-for="item in indextop" :key="item.id">
 					<videoTop :url="item.url" v-if="item.type == 2"></videoTop>
 					<imageTop v-else :url="item.url"></imageTop>
 				</view>
-				<view style="display: flex;flex-wrap: wrap;">
+				<view style="display: flex;flex-wrap: wrap;" v-if="indexlist.length">
 					<listitem :style="{'margin-left': index%2 == 1 ? '20rpx':'0'}" v-for="(item,index) in indexlist" :key="item.id" :type="item.type" :url="item.url"></listitem>
 				</view>
 				
 			</view>
 			<!-- 商品筛选排序未完成 -->
 			<view class="item" v-if="cur==1">
-				<item v-for="item in list" :key="item.gc_id" :info="item" class="item"></item>
+				<!-- <item v-for="item in list" :key="item.gc_id" :info="item" class="item"></item> -->
+				<goods :sid="sid"></goods>
 			</view>
 		</view>
 		<view class="tabbar">
-			<view @click="cur=0">
-				<image></image>
+			<view @click="switchCurrent(0)">
+				<image src="/static/image/shop/9.png"></image>
 				<view>商品分类</view>
 			</view>
-			<view @click="cur=1">
-				<image></image>
-				<view>商品列表</view>
+			<view @click="switchCurrent(1)">
+				<image src="/static/image/shop/10.png" v-if="cur != 1"></image>
+				<image src="/static/image/shop/13.png" v-else></image>
+				<view :style="{ color: cur == 1 ? '#FF780F' : '#999999' }">商品列表</view>
 			</view>
-			<view @click="toDetailsPage">
-				<image></image>
+			<view @click="switchCurrent(2)">
+				<image src="/static/image/shop/11.png"></image>
 				<view>店铺信息</view>
 			</view>
-			<view>
-				<image></image>
+			<view @click="switchCurrent(3)">
+				<image src="/static/image/shop/12.png"></image>
 				<view>联系客服</view>
 			</view>
 		</view>
 	</view>
 </template>
 <script>
-import item from "@/components/shop/list/item"
+// import item from "@/components/shop/list/item"
+import goods from "./goods"
 import videoTop from "../components/merchant/video-top"
 import imageTop from "../components/merchant/image-top"
 import listitem from "../components/merchant/list-item"
@@ -81,6 +84,7 @@ import listitem from "../components/merchant/list-item"
 export default {
 	data() {
 		return {
+			sid: '',
 			show: false,
 			cur: 0,
 			list:[],
@@ -90,38 +94,64 @@ export default {
 		}
 	},
 	components:{
-		item,
+		goods,
 		videoTop,
 		imageTop,
 		listitem
 	},
-	methods: {
-		toDetailsPage() {
-			uni.navigateTo({
-				url: './details'
-			});
-		}
+	onPullDownRefresh() {
+		this.getStoreInfo();
+		this.getStoreImgVideoList();
 	},
-	onLoad(){
-		this.$u.api.getStoreGoodsList({id:1}).then((res)=>{
-			// console.log(res.data)
-			this.list= res.data.list
-		})
-		this.$u.api.getStoreImgVideoList({id:1}).then((res)=>{
-			console.log(res.data)
-			this.indextop = [res.data[0],res.data[1]] 
-			this.indexlist = res.data.slice(2,)
-		})
-		this.$u.api.getStoreInfo({id:1}).then((res)=>{
-			console.log(res)
-			this.info = res.data
-		})
+	onNavigationBarButtonTap(e) {
+		// console.log(e.index);
+		if(e.index == 1) this.$u.route('/pageC/cart/index');
+		// if(e.index == 0) this.show = true;
+	},
+	methods: {
+		switchCurrent(current) {
+			this.cur = current;
+			if(current == 0) {
+				this.$u.route('/pageC/merchant/storeClassify', { id: this.sid });
+			} else if(current == 2) {
+				this.$u.route('./details', { id: this.sid });
+			}
+		},
+		getStoreInfo() {
+			this.$u.api.getStoreInfo({ id: this.sid }).then((res)=>{
+				this.info = res.data;
+				uni.stopPullDownRefresh();
+			})
+		},
+		getStoreImgVideoList() {
+			this.$u.api.getStoreImgVideoList({ id: this.sid }).then((res)=>{
+				if(res.data.length) {
+					this.indextop = [res.data[0], res.data[1]];
+					this.indexlist = res.data.slice(2,);
+				}
+				uni.stopPullDownRefresh();
+			})
+		},
+		attentionMember() {
+			this.$u.api.attentionMember({ member_id: this.info.member_id }).then(res => {
+				if(res.errCode == 0) {
+					this.getStoreInfo();
+				}
+				this.$u.toast(res.message);
+			})
+		},
+	},
+	onLoad(option){
+		this.sid = option.id;
+		console.log(this.sid);
+		this.getStoreInfo();
+		this.getStoreImgVideoList();
 	}
 };
 </script>
 <style lang="scss" scoped>
 .merchant {
-	min-height: 100vh;
+	// min-height: 100vh;
 	background-color: #ECECEC;
 	padding-top: calc(350rpx - var(--window-top));
 	.top {
@@ -168,7 +198,6 @@ export default {
 				height: 28rpx;
 				flex-shrink: 0;
 				margin-right: 14rpx;
-				background-color: aqua;
 			}
 			> view {
 				white-space: nowrap;
@@ -230,13 +259,18 @@ export default {
 		}
 	}
 	.main{
-		padding-bottom: 98rpx;
+		.video-image {
+			padding-bottom: 98rpx;
+		}
+		> view {
+			margin-top: 20rpx;
+		}
 	}
 	.tabbar {
 		border-top: 1rpx #DBDADA solid;
 		width: 100%;
 		height: 98rpx;
-		background: rgb(95, 64, 64);
+		background: rgba(251,251,251,1);
 		display: flex;
 		padding: 10rpx 55rpx;
 		position: fixed;
@@ -251,7 +285,6 @@ export default {
 				width: 40rpx;
 				height: 40rpx;
 				margin-bottom: 15rpx;
-				background-color: aqua;
 			}
 			> view {
 				font-size: 24rpx;
@@ -259,12 +292,5 @@ export default {
 			}
 		}
 	}
-	.item{
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: space-between;
-        // margin-top: 20rpx;
-		padding:25rpx;
-    }
 }
 </style>
\ No newline at end of file
diff --git a/pageC/merchant/storeClassify.vue b/pageC/merchant/storeClassify.vue
new file mode 100644
index 0000000..fd62b9d
--- /dev/null
+++ b/pageC/merchant/storeClassify.vue
@@ -0,0 +1,88 @@
+<template>
+	<view class="classify">
+		<view class="item-view" @click="viewGoods({ type: 'all', name: '全部宝贝' })">
+			<view>全部宝贝</view>
+			<u-icon name="arrow-right" color="#999999" size="28"></u-icon>
+		</view>
+		<view class="item-view" @click="viewGoods({ type: 'new', name: '新品上架' })">
+			<view>新品上架</view>
+			<u-icon name="arrow-right" color="#999999" size="28"></u-icon>
+		</view>
+		<view class="classify-container">
+			<view v-for="classifyA in classifyList" :key="classifyA.gc_parent_id" class="classify-view">
+				<view class="title">{{ classifyA.gc_parent_name }}</view>
+				<view class="classifyA-view">
+					<view v-for="classifyB in classifyA.gc_child" :key="classifyB.gc_id" class="classifyB-item u-line-1" @click="viewGoods({ type: classifyB.gc_parent_id, name: classifyB.gc_parent_name })">{{ classifyB.gc_parent_name }}</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			classifyList: [],
+		}
+	},
+	onLoad(option) {
+		this.sid = option.id;
+		this.getStoreClassifyList();
+	},
+	methods: {
+		viewGoods({ type, name }) {
+			console.log(11);
+			this.$u.route('pageC/merchant/classifyGoods', { sid: this.sid, cid: type, name: name });
+		},
+		getStoreClassifyList() {
+			this.$u.api.getStoreClassifyList({ id: this.sid }).then(res => {
+				this.classifyList = res.data;
+			})
+		},
+	}
+};
+</script>
+<style lang="scss" scoped>
+.classify {
+	padding-top: 20rpx;
+	background-color: #ECECEC;
+	min-height: calc(100vh - var(--window-top));
+	.item-view {
+		margin-bottom: 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 35rpx 30rpx;
+		font-size: 30rpx;
+		color: rgba(51,51,51,1);
+		background-color: #FFFFFF;
+	}
+	.classify-container {
+		.classify-view {
+			padding: 30rpx 35rpx;
+			background-color: #FFFFFF;
+			margin-bottom: 20rpx;
+			.title {
+				font-size: 30rpx;
+				color: rgba(51,51,51,1);
+				margin-bottom: 34rpx;
+			}
+			.classifyA-view {
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
+				.classifyB-item {
+					width: 335rpx;
+					height: 74rpx;
+					line-height: 74rpx;
+					background: rgba(255,241,230,1);
+					padding: 0 20rpx;
+					font-size: 30rpx;
+					color: rgba(51,51,51,1);
+					margin-bottom: 20rpx;
+				}
+			}
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pageE/mine/StoreCollection.vue b/pageE/mine/StoreCollection.vue
index 29818d0..fd796ca 100644
--- a/pageE/mine/StoreCollection.vue
+++ b/pageE/mine/StoreCollection.vue
@@ -3,13 +3,13 @@
 		<u-empty mode="list" v-if="!list.length" color="#000" img-width="200" font-size="30" margin-top="300"></u-empty>
 		<u-swipe-action
 			v-for="(item, index) in list" :key="index" 
-			:index='item.favlog_id'
+			:index='item.store_id'
 			:show="item.show"
 			:options="options"
 			@click="removeFavorite"
 			@open="open"
 		>
-			<view class="item u-border-bottom">
+			<view class="item u-border-bottom" @click="toDetailsPage(item.store_id)">
 				<image :src="item.store_avatar"></image>
 				<!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
 				<view class="title-wrap">
@@ -46,12 +46,15 @@ export default {
 		getStoreFavoritesList() {
 			this.$u.api.getFavoritesList({
 				type: 2 // 店铺 type: 2
+			}).then(res => {
+				this.list = res.data;
 			})
 		},
 		removeFavorite(id) {
 			console.log(id);
 			this.$u.api.removeFavorite({
-				id: id
+				id: id,
+				type: 'store'
 			}).then(res => {
 				this.$u.toast(res.message);
 				if(res.errCode == 0) {
@@ -59,6 +62,11 @@ export default {
 				}
 			})
 		},
+		toDetailsPage(id) {
+			this.$u.route('pageC/merchant/index', {
+				id: id
+			});
+		},
 		open(index) {
 			// 先将正在被操作的swipeAction标记为打开状态，否则由于props的特性限制，
 			// 原本为'false'，再次设置为'false'会无效
diff --git a/pages.json b/pages.json
index 99adf7c..b26be16 100644
--- a/pages.json
+++ b/pages.json
@@ -301,23 +301,28 @@
 				{
 					"path": "merchant/index",
 					"style": {
+						"enablePullDownRefresh": true,
 						"app-plus": {
 							"titleSize": "36px",
 							"titleNView": {
 								"titleColor": "#333333",
 								"backgroundColor": "rgba(255,255,255,0)",
 								"buttons": [
-									{  
-										"type":"none",
-										"text":"...",
-										"float":"right",
-										"fontSize":"16"
-									},
+									// {  
+									// 	"type":"none",
+									// 	"text":"\ue62b",
+									// 	"float":"right",
+									// 	"fontSize":"20",
+									// 	"fontSrc": "/static/fonts/more.ttf",
+									// 	"color": "#FFFFFF"
+									// },
 									{
 										"type":"none",
-										"text":"\ue582",
+										"text":"\ue636",
 										"float":"right",
-										"fontSize":"16"
+										"fontSize":"22",
+										"fontSrc": "/static/fonts/cart.ttf",
+										"color": "#FFFFFF"
 									}
 								],
 								"searchInput": {
@@ -345,6 +350,32 @@
 						}
 					}
 				},
+				{
+					"path": "merchant/storeClassify",
+					"style": {
+						"navigationBarTitleText": "商品分类",
+						"app-plus": {
+							"titleSize": "36px",
+							"titleNView": {
+								"titleColor": "#333333",
+								"backgroundColor": "#FFFFFF"
+							}
+						}
+					}
+				},
+				{
+					"path": "merchant/classifyGoods",
+					"style": {
+						"navigationBarTitleText": "",
+						"app-plus": {
+							"titleSize": "36px",
+							"titleNView": {
+								"titleColor": "#333333",
+								"backgroundColor": "#FFFFFF"
+							}
+						}
+					}
+				},
 				{
 					"path": "cart/ConfirmOrder",
 					"style": {
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 8c5f496..cb68eba 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -22,8 +22,8 @@
 				<!-- <view @click="toOtherPage('/mine/GoodsCollection')">
 					<view>{{ userInfo.member_fav_goods_num || 0 }}</view>
 					<view>商品收藏</view>
-				</view>
-				<view @click="toOtherPage('/mine/StoreCollection')">
+				</view> -->
+				<!-- <view @click="toOtherPage('/mine/StoreCollection')">
 					<view>{{ userInfo.member_fav_store_num || 0 }}</view>
 					<view>店铺收藏</view>
 				</view> -->
@@ -248,8 +248,8 @@ export default {
 			box-sizing: border-box;
 			padding: 0 30rpx;
 			display: flex;
-			justify-content: space-around;
-			// justify-content: flex-start;
+			// justify-content: space-between;
+			justify-content: flex-start;
 			> view {
 				margin-right: 80rpx;
 				text-align: center;
diff --git a/static/fonts/more.ttf b/static/fonts/more.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..025b5816686188e4081a478cae00d7c86a17a60b
GIT binary patch
literal 1664
zcmd^9&ubGw7=5#wv^A|&OzJOeS=y>4DQO!;L_~|$MzCnHwI@N=Wb;F^*=4g83km@#
z=t=(tFXBx>@FaTkVtW%WYVlMLB6tyR);F`WD%JnM4LkGR``&!>ebebe0O&>=CdP|%
zmrgzT@$?HIj#52!VQ#E&{K46N@|)xfCD-;p%{|MJzvt^$8%vc#Z@<3<%z4J|)Ev9K
z=f%TE#2@({sZr=$Gj9_==Q~_;!y8=$T>FMYSHmmWn3CL_;n3mQH+-=JhZ)~ZZZ&P!
zIWhm^7USH{aDA^8u6$neX_fv7uy(V((Z=NjDZo*7^XFqIh3d!R>a8o=j(<aU<b5|g
z@l_h*IRWvSv<rq_E;AVzL5Jc}P4Ne8C?4&U!T?4grlx1+xiU%|MMR@swW(>wn2ZW4
zLS>BV6x{VblISw-8Y_(7i)Qf|1;MojlBV8m(==N-Q^w?aZao+EZ?@5<MRzZ^(#0eR
zWscEE67$+~o~m?@a%NZ56Btw;mISQlHrQu0l1H^eL}x+UfBf{Q-uLMfP-i7iiaa{~
zDI#@F=CZm`J=lsp*o%Wedgz2G?A+CB4CclD2xodlM2y0Kh{&sRB0HHCB0V%Rlo87j
z%fv*flBGr4%4V(1U|-*0<~LG&M2f1y9az(K0e!z}l=rYt>jpZ}udzveSmOjS@3zX4
z<QL+w#vRm8YMeq2MUA_WMj&rhVhh(~v8=Jcc0AVDKrdcuY*Js<I6?eD<0N+Ci^d(;
zE=-M6SP*HAyKz9&Q>O#R4xO@fb;+uiyk^B~hN&1_bgGLDJBVpKFE~M~?lrB6{CF%C
zou(7Sd0N-2g)ppGmB4eYX(n_U4bSoe@0wEz^R+PakByDVjijD0c`pBXPP1(XHbRbN
zSh$KMj&+pap^1tbL;5x=7wNBJ5e=>l{)%pPFVG#JMW4)S@#B}r_+P7vbTyT8b3H9w
z=WYd78L}peZ@^40(X_76VI>V>3%-h7W1bS-dDPS@AIC7pU))jb&#O*dc~RnTr~FR-
T>oJ7Ezh`IFX;#aNo^t#IdG*#1

literal 0
HcmV?d00001

diff --git a/static/image/shop/10.png b/static/image/shop/10.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d35be753df753e4f6b684716a9a000a0bf33094
GIT binary patch
literal 1931
zcmcIlc~BEq7>@@d(s~S?7LVfWgx2a*lHG(rvJw=MsA&yFj7qIjS(8mjA=xxpnm`Yz
zbx>Mr)!N}IC^wdoBY<*<Acz={`xFobIST@EiU{cj0qu-T|LU9BeeZko`+fJf8|dP^
zca7O5GZKlkhQE*NO6=Q-XPfB?;w|j3LWpf6&U3>LViH_~s8Eul7(0Oid^sXTT~S2r
z^R*teCy`e4%Y<&Yn_xdI!sHahh@oiZN`g%y+3(US5s@c~11C_aOu;4(<>r$CnV3yJ
z!VrK0B?tA8?ekTk2YsD|B41AtOHAJ70N86`LV+B`5kM>VQmA1qn>?o%CeFrdDjArA
z;GS&qOQ+lfE&vBpp#XzoYb}Co7=Rs%0@>1SSgaiY4TP9fkV%E;){rf11Hv>KFu%xz
zHI-NbyK?u;+ae@3*#pOwFqNv&Xeb&w1yf0>5R1j4f;1|PW=$Zh)jkRw(ON6iRtp-q
zs9L0wDRCL50E`-u6PP#7CKH~%3_-43RI5<Wr-?`yRf{O85Ct@bGzS!m7I8{%mDikc
zv51O#p>kA#s|hT$h$XTl5G=yqs8%jtM5}RE^i^zcM5~29N|fq~sxfbsh$yne%IKC7
z=BQ8v$5cWL^IFKbiwA~dY7a~aa5%;cvw&?!WC}5+QEz{ZgK`lZWs_+j4YUTC)*wR&
zF<{6Jwqbk>GGP#W2^C;snZ#!aD8uewP@?=|1V{c8EEd5MOeIH%8pw<tOI0eQbJhd`
zn6FUdh(d(&xok2K9z`Y-!yFcq#<Qhyxwbqf2;w<1nIMB}<HY08Xb=;G=nGsfCh|5`
zVu34u#pNx@HTJZzRxlS;$-Y6wdsLVln5zdYTiO?=CH2j7#Y_9bS&~a7oS_;!^tFy%
zxFW{DcwC%6LRg$&R6&fbikMFeJTQzzS_Zi67xJd3r|;jt-`(9kIy!po+O?UPnOnDR
zUAlB>WMpJ`c(|~zaBOTWJUqO-yu7lqa&T}kCMG5%BqS**X>xM1xVShaC8esW>e;hr
zj~_oC8X9`>;zeU)V^&ty^XJdw;^LyBqVC<hS5#E==+UF6PoH*mb#-=jW@cvg_V)Jm
z^(7`I*4Eahr>ED|)kQ=^3=9lhy?V91y}i1+`ug?j6B83{ZEay;VdLZDIXO8E4Gp(%
z-)?GZijIzMX=#a#jV&oDDJUqYsHjLzPR`EG?&;|X4i280n##}5FD)&-eED)~YioRb
zd}L%~Sy`E0uWxQ{e(>NyZf<UUeSJbgLRwl{US3{DN5{>ZH+4E)O-)UIfB%ywPckwx
zQd3iBXJ<o0Lk$MQsgrS;#COmgcXd8Ui2vszspXv<qArnquA@-f+<LJ@RS2%%&4cRk
zGosesJdL^Ox!t})<uwKaZ~fMdZ&?K#^9i=}Y&+U8SW1eD2M&L9-sDh{UEnrSU0}w#
zt|-4B2TpgHm3I~nCl*fIXpcL}l-dYBY<htX+<i#@{;z^CB{Lw&-(g_yxa8+?e;<zx
z<yv6vSoi9ncIh4c&hcS$(^bb#$pW^d&T@05ch*RPB!%FCsR3Q2;+HQ@7h9SPeZr{;
z*Q6#?6s4!_y}=aF{SwbckMR3;(pLQulcVA5E4P46K}Qdt>weg|<IBv?f3*$Y<#OeB
z`$|L8XQ9v){4B@gr)*0D-SNW%EhRTT&~4VFn3Va&xsQ4Wd=>w0LpUhQP^?R^u&I?=
zc5jHCtr;kFxY6dddMkUymY^~z*W{g4|H;bD-{NMUp84~f=Xa$w*%928w!McM1ra&R
zms7G56n6St>Djlp&L|v!k>hrEG>jhIc~f`gcJracqW9MRAhP3FX+`IqHof1NZed{+
zmSfQUefNxszf;OGmU&%>uw8V)LGM~Vaj}~AFeiSkyxVW(2GVbyRmz!4oyz!o<nx@l
J$xiMk{{cFNWg-9o

literal 0
HcmV?d00001

diff --git a/static/image/shop/11.png b/static/image/shop/11.png
new file mode 100644
index 0000000000000000000000000000000000000000..a44930c01aacb47203becdaa222021a358dd1739
GIT binary patch
literal 1764
zcmb_beM}Q)96m<oh?{d7r_MM%>k=Kay=!R;y;)s9aFTfpOBc$5n`iHU)81WoJ!}Ez
z$6TEHk1<B0C{Ud+0`d_I;7}CM5s9b;$`}$L3aEe}FhE2;_7<VKM6!SOCU@^gp6B;_
zeqV>eLcg3dd&z7Fg64#5)EmIQ+VlDOg8yZB<M&|uNC-9w;as#}CwL0dklZ#34q=EG
z%0Llh{127XS_ty(qKziOgm1#k93vq-7>R?i0yYG#UGK0G<{gv(Z=+&pRxNsZ`I-o(
zNwp|Kfup!pN5#?`6L=~-A=GG2*kM+YqV?<GwGIpzU?_or9gKywVGgxu(k=$ho@Yb^
zPeOzpYSBwkCOiz*aXbYpBucSaDp$aPDv4AXAXll@z%o=CgrGr)G(ap>VsaFd$>6Ca
z0^WEs8Z+oOO!)#gwJ25)tQdmW?RJShK*I4ch*YIgA*c+I$;1F5w#Bmo;SjU7mD3jV
zl+Dc3R)OYN*kh5{#>EM05m5Rv1jgz$%i5;W1QLcg2rD9$pq`K>fuz}sv&Qk3N#~>)
zp)3?bv4Ra?rCuz^5{`S}Z#2s=UbIaxP_JTpBid$+w^E3KvT<>|85B8srAL+()A1A`
zaJ-S@EYleei{%8)7Ry;-oz9bC6}&ovW=YO&`}8#qr6&YREs~)!RE!3RQH4>ez@#!v
zF8vG*!cg=j6z51fI(`PI0{s^hl%FI7;y=Np8H?t4h5$97Jspc!*_cUhIF5y|Hi2Nx
zRES<J0^vz$ngpU$N>!jNP_GQuN~OUXjZ7DyS1MInxm=0r6xwO7o-@aJDlyF^UvYzG
z<a&DAQ!7kQ@$^oL+`w}TJXsHno>_}xMtf6Sa%L^c8Mz1$gLpdhwT_*B0%PDgdgl*Z
zyc0~ZU~G9XpZlwF$G~hq3fp81E-5K-xm;OUS-rizMMXumwYATmKQAjQYj1B)N=oYP
z?j9c>fAQkQ>C>lEQ&Uf#JbC8Kng0I%;o;$P=gu`XHDzXII-Sl-mo8nsdNnyYxu>V+
z{Q2`~X=#;}m2S7YqN1Xur6ngPCqF+wH#fJqxHvB_ue!SW?%lf`9UTP)1&xi3*RNk6
z92|W1?AeniPaZye*xK59=gys>p`os>uF=uajEs!t=H`@?lm`zU^!4?fJ$tsZv$L?U
zu&u4_=FOV}0|VLF*>!bw_wU~?EiJ97sYy>yFE1}|XlNK285tWJtE#Fxb?Vf_#6(Jf
z`Wgrs7Yw1{;QGHUsCN6jy%6N13(;$gj(b<!^=vu1_y7@*w9vBZ=aQHPSIMF#e0bMH
zeYn=`@2=2%*qzvBIx>G^o!>meh4`|zEuwDM`!01Ov?1^DiUl>ZPRxs#TPuFIDQfrf
z$3fWQuY4jkTaH%!nvl1w`K`d;#`zIHd3~8>cJ)C0{>#I=j%32wJ_V(I!i~+OjC?z4
zS$0ZG&bPluLWbzY2R;stV;xyfmnt)RYf2+8M9p2ItG!mdNwTlb|Iv78XZD(diA7O=
zU#VR22Y#_FeE(m2Z!cvm_q543Apdgztv#B+1r>XI>0YPNx9iXsiaAT)$xU<a>mZ%S
znD;LJXlmX(II^b9zWSCcwRd|&-L28}={t{C<}Lc>&l6kCx83u}UlI@ZtlIOrqRH<&
zuD@c%$c+r=mQU^-?wh~-gQM*WwfX4KZo{!7tp^Lo!y^xV?K2B9l_u8X1>zx4CnzL1
KRG*{W`qMuto%%}v

literal 0
HcmV?d00001

diff --git a/static/image/shop/12.png b/static/image/shop/12.png
new file mode 100644
index 0000000000000000000000000000000000000000..982b65c4e71b41c7c44330dba02ce8cee9faa174
GIT binary patch
literal 2003
zcmcIlX;2eq7!K-Si#pS(bp##9H4YVuWH%uRWJ{!yKxJwW0R_iuU9t;gAlaBK65xkQ
z>sdQcfvO-^I3o9b%UzI5KnikNRBk~|K@f#*5YW!Z^jE)`-S2z9d7k%vcdyx4f4@a*
zhZcoG*<y8wZ%gj`$w%+A_2fIfc2JkxbO;Ma!VY&PJP{d2If&v;7+@tvTrgV<LA}ma
zW2O|!`eBj1BjG4G3=45F4N+rg3bB-AQz)ip3MnFV!wA3$a}i0n)UkqMDj-6+R0oy-
z5=eQNtLTuo472mLwikN42{|a$>;Pb@fJp^nj6eW|*j*xr6<q3)UYI<quR$uX1R>nG
z)b~y~3Tyx#F2ev8jcq8TGg*K!hel@`F*%(500W|%fRG7DH!`HNVI~AK7{KzPlGbFX
zGi=MZT((6@T&gQUNMR84^z@{88qsi>3rOd1I3UCT84N=bVJP>K5QxH1BHz2Bfse_B
zGLe)J;SxZt5plvj2riZM^nD0o>8e_Zd^t^I!axNg1?e<M9numI6|Ul>9y0eO<ERkC
z+%YjGA><^MzKSKYBoM5^KdDwMUPa3ZTkJz@pG3>;y`&gui^*{hnUE~9^Io-EQkW;h
z5CWIk<GA}u#%)}20++kuQh>)(XP5)%Ifx`E?kU&*h=cJF0^?E{5CbxVObj8GJ)H&9
zjbH}b05X9g=si?`qatUoHK0b!e?iIeqX>cgCm0pN&bUmBkTnpgI~J5mT$Zc}1hADv
zP9PE?X2s`H$?#|*5ehSS=6qwG5rfaRFsIWk4jyE&jm^z1*&IHPX<}?*w8G`%LJxH%
zR=DT~uF;xYbx*5n1@keP=p2Sx%5X8TR1a9RwlC0{`j)xq+P=`&<btF#pt?gp>e!Vl
zatzeR)%hcZ)d|KV<k-r{`K<9dS4N>|?6o;;Z_(V`9336~`t|Fvv9a;-@#^a8>FMdV
zwzlBl;MCOASFc_zEG&eFhtJK;O-xM8&(DX1ghWL}<>chV#l<~)_Uz4@H%(1Vj~+cr
zPEL-DjBIFVc>DJ4=;&yBd%IGp?CI(0?d_eKn##(`YHe-p?(QBL83_vu8yp-gDk{p%
z%)EE+-th2nUteE&d3jx3-O$ibdV2cHmoGy@LsL>x($dnNK7HEQ*ccHJ@#M*q#Kgq>
z{QSJUyxQ8@nVFf&%F3FWnxv$pn3$N^+1ZB=A5KnA=H}*BRaM=+d-wkR`<<Pg_4V~F
zEiI*`r5zm|@$vBm1qFqLg%2J)$j;6#E-rrY;ze0mSxHHWN~P-R>dMH-7#J9+sHo`g
z?@vfbc=ztzojZ3H7Z)#m-4I273K7EA+Kv?e*F{ObfYZs^Jh$Q>v{!W01v+>>hrY19
zq*0#l<o?%5y&pE|e%BGZuhVC2vTkv4Tf*6TnF6x(%R3?;@gXdmREV}yJtN@vfVRs4
z+F`e^-e@jy>o&ctsKK*r9v|RPMsvz`W(SpRy<m3HKS-nGN}AKgv$r?@_*>-Zi#<x;
zf<x<$Fy79ukJYHD(sv$+Oj1U>hnjD~u!a+kO_SU9ZxhXN5_|iYrrwT|e;=8lnQ9kT
zz}(Pv?9tR%9o-PBfi%>-*^iGfD^$GeP8NRt1)91OS`+#z>h3e+H?)ej@7XSY<>uQa
zkJEmmcN5T_ruH7!Ui7`{e(k!SQy*v_DA|jiZ-i<<*3n&@%g<~Z=Et@~O~8}PkrO$)
zC8tt63g<0ZDLxTqy*qEHG*y3Oc3p}2#$cnxZ3nDxN5g5Q|G<~&=Reo|wYN#q9&VmZ
z(-iKx^=(_rSmGA{WGznhMb)s5(r)*asA@@CT`)YqV4wlT0MNT$ZQz!!3_Q;ArUz_5
zTYo7%HB){}TeI-F%dM@(sk4Sk_E+Vz!HX_TvxbqMx?c09I5y0naYc{Y^f8?XVVqm$
zCLb=lz0xu;qhfAXNqijMJ`|f6cJ%zu&5wocfvk!C9YH4pZ?>?<%X9OJ^c@W5X6NVj
al~CxuoBvd9XqBsfvsM<?{ABYpzW)FNS&)bT

literal 0
HcmV?d00001

diff --git a/static/image/shop/13.png b/static/image/shop/13.png
new file mode 100644
index 0000000000000000000000000000000000000000..16ea712116b9818d5018fb9e022f9af2496aa406
GIT binary patch
literal 2144
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
VZFys#G}k{rG&o$hMf26He*o<W|7-vN

literal 0
HcmV?d00001

diff --git a/static/image/shop/8.png b/static/image/shop/8.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d485e50bf1b049b31005df87686b216c5bebd0f
GIT binary patch
literal 1251
zcmah|OK8(z91k1#7~8>}d`t}4Wuk4qq>nXW-RP25tEO~a$0{B)OTKP#O}?0XwOQH8
z7b+gqgNP3h5d=X&nJ9Wt*vW%95j+Sxi3b(&fr<xZe(Bb#uwqE^J^1~8|M!V(W?M(w
z`ZkK9I?~(a99cJ#uWMB+`QKP0pC`*YoGjpBRKyk4fmA|AV~|dp>Nw0nRi8TW1olx>
z>w6<#zy)QOs39|``k0_++JsF}eFL7YYLgJtV{qKC;>^c~j~Lp}<IHG80g5fb31fTJ
zfy32IUaL-Og3b)|(|w*u1Wbrk+A~X*D|&IJrYn-Yf6X#<4T2}*%%W2TB}+@lfpjDo
z4QO0ALiY+mE*c68!d99GT#N-VmJ0>As2Bz!&(li}L##P^QOwDyC0pbaXC^SVMV75p
zD#1!9h@5ej69j<;Jj?R|f(W=%7FNB0<#yK<Waw&+VPgYXw6Ca+p)!s$#M8wPOuHd#
zxl3sx31dCgX1O5nL#hFFt%0-4PN`;G*H~DBCbY0iuv`O6vZN>t__DI5*+9EE2mi#j
zEZWUa*^tda7nL226uH>#yJd@#167QiJVK><#<LR$BX<JXv?Tc%7U-T)!_ra3-TW5^
z$|{C&h6g+dfLH)T@?1pZ0C~57m<YfkR6)8?oN59Mh5mt(^6M&A{|nYNv4|W~B{eYo
zj%96Yyk<>N#I)sN)zV;Ejx!{@pke5u1cXFrP~zlhGQn}lM1oHx1t}JbrT_rp-f*2O
zBdzRLqR!R-aQUWOzo-3Li86GIgHTU7$fRra5RIn345pguEpheczJR7&mN>)u9r{<t
z*00DI_}j+(kwasGp+&~lA@kX@vi&ZZ?G@Qw`Q$?F8JYf8A~!8Kml<B5-rNH_$jM5}
ziM;pf(%GGzkLgv?>@W7i)l<jT-VSUidV@cXpFcKp<@B9HL;I@R-d>(NdnI4pUG9Hz
zf9U7ak@=H*9-za~Bdzn#KD|qwdoFig|K4@sc}Tvv`e<SQ=j`6O{a^Id%=NF6=Irzt
d@cP=OmUe3HW=qC9^Rkmzrqaobd~0yuq2JFGlHdRU

literal 0
HcmV?d00001

diff --git a/static/image/shop/9.png b/static/image/shop/9.png
new file mode 100644
index 0000000000000000000000000000000000000000..47c6e568e9188abe985f265ea0a95e3b794d62ec
GIT binary patch
literal 2030
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
KtR%Bj7ybq|Jf2Jd

literal 0
HcmV?d00001

-- 
2.45.2