Merge branch 'lj'

components/SearchShopListItem/SearchShopListItem.vue

@@ -3,7 +3,7 @@
 		<view class="yzr" v-if="showStyle === 2">
 			<u-image src="/static/cjal/anl_tu.png" width="156rpx" height="156rpx"></u-image>
 		</view>
-		<view class="list-container">
+		<view class="list-container" @click="enterDetail()">
 			<view class="text-area">
 				<u-text style="font-weight: 500;" :text="shopInfo.tt" :lines="2" ></u-text>
 
@@ -141,6 +141,18 @@
 
 		},
 		methods: {
+			enterDetail() {
+				// console.log("进入详情页面");
+				const query = this.$u.queryParams({
+					id: this.shopInfo.id,
+					type: this.shopInfo.type,
+					search: 1
+				})
+				console.log("query", query);
+				uni.navigateTo({
+					url: '/pages/detail/detail' + `${query}`
+				})
+			},
 			handleEdit(searchid) {
 				// TODO 完成页面跳转
 				console.log("点击了编辑ID为", searchid);
@@ -221,6 +233,7 @@
 			flex-direction: column;
 			justify-content: space-between;
 			width: 100%;
+
 			>text {
 				font-size: 14px;
 			}

components/ShowShopList/ShowShopList.vue

@@ -1,7 +1,8 @@
 <template>
 	<view>
 		<ShowShopListItem v-for="item in shopInfoList" :key="shopid" :shopInfo="item" :is-adshow="isADshow"
-			:adlinkPath="adlinkPath" :show-style="showStyle" :is-edit="isEdit" @delItem="handleDel"></ShowShopListItem>
+			:adlinkPath="adlinkPath" :show-style="showStyle" :is-edit="isEdit" @delItem="handleDel"
+			@updateItem="hanldeUpdate"></ShowShopListItem>
 	</view>
 </template>
 
@@ -71,6 +72,9 @@
 		},
 
 		methods: {
+			hanldeUpdate(shopid) {
+				this.$emit('updateItem', shopid)
+			},
 			handleDel(shopid) {
 				console.log("删除了商铺", shopid);
 				this.$emit('delItem', shopid)

components/ShowShopListItem/ShowShopListItem.vue

@@ -150,6 +150,7 @@
 			handleEdit(shopid) {
 				// TODO 完成页面跳转
 				console.log("点击了编辑ID为", shopid);
+				this.$emit('updateItem', shopid)
 			},
 			handleDel(shopid) {
 				// 需完善删除请求