Merge branch 'master' of http://git.cc-lotus.info/pointToNetwork/point-app

# Conflicts:
#	pagesMy/collection/market.vue

pagesMy/collection/market.vue

@@ -123,6 +123,7 @@
 			}
 		}
 	}
+
 	.scroll-view {
 		position: absolute;
 		top: 0;

pagesMy/collection/shop.vue

@@ -1,23 +1,149 @@
 <template>
 	<mobile-frame>
-		店铺
+		<view class="main">
+			<view class="one">
+				<view class="list" v-for="(item, index) in list" :key="index" @click="toView(item)">
+					<image class="image" :src="item.file" mode=""></image>
+					<view class="name">{{item.name||'暂无'}}</view>
+					<view class="other">
+						<view class="other_1">
+							<text>￥{{item.sell_money||0}}</text>
+						</view>
+						<view class="other_1">
+							<view>{{item.person||0}}人评价</view>
+							<text @click="toDel(item)" class="iconfont icon-del"></text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="two" v-if="!list">
+				<text class="heng"></text>
+				<view class="title"><text>没有更多收藏了</text></view>
+			</view>
+		</view>
 	</mobile-frame>
 </template>
 
 <script>
 	export default {
 		data() {
-			return {};
+			return {
+				list: [{
+						file: require('@/static/test.png'),
+						name: '官方自营店',
+						num: 2,
+						time: '2022-09-27'
+					},
+					{
+						file: require('@/static/test.png'),
+						name: '官方自营店',
+						num: 2,
+						time: '2022-09-27'
+					},
+					{
+						file: require('@/static/test.png'),
+						name: '官方自营店',
+						num: 2,
+						time: '2022-09-27'
+					}
+				]
+			};
 		},
 		onShow: function() {
 
 		},
 		methods: {
-
+			// 详细信息
+			toView(e) {
+				const that = this;
+				console.log(e);
+			},
+			// 删除
+			toDel(e) {
+				const that = this;
+				console.log(e);
+			},
 		}
 	}
 </script>
 
 <style lang="scss">
+	.main {
+		display: flex;
+		flex-direction: column;
+		width: 100vw;
+		height: 100vh;
+
+		.one {
+			display: flex;
+			flex-wrap: wrap;
+			width: 100vw;
+			text-align: center;
+
+			.list {
+				width: 45vw;
+				margin: 2vw;
+				padding: 1vw 0;
+				border: 0.1vw solid var(--fcColor);
+			}
+
+			.image {
+				width: 45vw;
+				height: 45vw;
+			}
+
+			.name {
+				margin: 2vw 0 5vw 0;
+				font-size: var(--font14Size);
+			}
+
+			.other {
+				display: flex;
+				flex-direction: column;
+
+				.other_1:first-child {
+					color: var(--ff0Color);
+					font-size: var(--font16Size);
+				}
+
+				.other_1 {
+					display: flex;
+					flex-direction: row;
+					justify-content: space-between;
+					padding: 0 4vw;
+					font-size: var(--font14Size);
+					color: var(--fcColor);
 
+					.iconfont {
+						font-size: 20px;
+					}
+				}
+			}
+		}
+
+		.two {
+			padding: 3vw 0;
+			margin: 0 0 3vw 0;
+			text-align: center;
+
+			.heng {
+				display: inline-block;
+				width: 95vw;
+				height: 0.1vw;
+				background-color: var(--fcColor);
+			}
+
+			.title {
+				margin: -5vw 0 0 0;
+
+				text {
+					display: inline-block;
+					padding: 0 3vw;
+					background-color: var(--mainColor);
+					color: var(--fcColor);
+					font-size: var(--font12Size);
+				}
+			}
+		}
+	}
 </style>