Merge pull request 'dj' (#112) from dj into master

Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/112

components/ShowShopListItem/ShowShopListItem.vue

@@ -5,7 +5,7 @@
 				<u-image :src="leftImage" width="80px" height="80px" radius="8px"></u-image>
 			</view>
 			<view class="text-area">
-				<u-text style="font-weight: 500;" :text="shopInfo.tt" :lines="2" ></u-text>
+				<u-text style="font-weight: 500;" :text="shopInfo.tt" :lines="2"></u-text>
 				<view v-if="showStyle == 0" class="pos-and-sqr">
 					<view>
 						<view>
@@ -142,9 +142,22 @@
 		},
 		computed: {
 
+		},
+		watch: {
+			shopInfo(newVal, oldVal) {
+				if (newVal.pics.includes(",")) {
+					this.leftImage = this.$api.imgUrl + newVal.pics.split(',')[0]
+				} else {
+					this.leftImage = this.$api.imgUrl + newVal.pics
+				}
+			}
 		},
 		created() {
-			this.leftImage = this.$api.imgUrl + this.shopInfo.pics.split(',')[0]
+			if (this.shopInfo.pics.includes(",")) {
+				this.leftImage = this.$api.imgUrl + this.shopInfo.pics.split(',')[0]
+			} else {
+				this.leftImage = this.$api.imgUrl + this.shopInfo.pics
+			}
 		},
 		methods: {
 			handleEdit(shopid) {
@@ -157,7 +170,7 @@
 				this.$emit('delItem', shopid)
 			},
 			enterDetail() {
-				// console.log("进入详情页面");
+				console.log("进入详情页面", this.shopInfo.id, this.shopInfo.type);
 				const query = this.$u.queryParams({
 					id: this.shopInfo.id,
 					type: this.shopInfo.type
@@ -205,7 +218,8 @@
 			flex-direction: column;
 			justify-content: space-between;
 
-			>text, >u-text {
+			>text,
+			>u-text {
 				font-size: 14px;
 			}
 

pages/index/map/map.vue

@@ -118,21 +118,7 @@
 					// 	alpha: 1
 					// }
 				],
-				shopList: {
+				shopList: {}
-					shopid: 1,
-					imageUrl: 'https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg',
-					title: '琴行铺面转让',
-					promotionNum: 23,
-					price: 6000,
-					date: '2023-11-02',
-					pos: '锦江区',
-					exactPos: '锦江区-汇源南路366号',
-					sqr: 100,
-					zrfText: "转让费：20万",
-					category: '餐饮美食',
-					uname: "张先生",
-					phoneNum: 13348946108,
-				}
 			}
 		},
 		onShow() {
@@ -189,24 +175,10 @@
 					console.log('详情', res);
 					const data = res.data.data
 					if (res.data.code == 1) {
-						this.shopList = data
+						this.shopList = {
-						// {
+							...data,
-						// 	shopid: 1,
+							id: id
-						// 	pics: this.$api.imgUrl + data.pics,
+						}
-						// 	tt: data.tt,
-						// 	num: data.num,
-						// 	zujin: data.zujin,
-						// 	date: data.update_time,
-						// 	area1: data.area1,
-						// 	address: data.address,
-						// 	mianji: data.mianji,
-						// 	zhuanrangfei: "转让费：" + data.zhuanrangfei,
-						// 	trade: data.trade,
-						// 	lianxiren: data.lianxiren,
-						// 	mobile: data.mobile,
-						// }
-						// data.pics = [this.$api.imgUrl + data.pics]
-						// this.shopInfo = data
 					}
 				})
 			},