From 7523e0e2626f3432cc5ad69006b78132c23e4ab1 Mon Sep 17 00:00:00 2001
From: LuoShijie <rowe_jason@outlook.com>
Date: Mon, 6 Nov 2023 13:33:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=97=E4=B8=96=E6=9D=B0=EF=BC=9Afeat?=
 =?UTF-8?q?=EF=BC=9A=E5=95=86=E9=93=BA=E5=B1=95=E7=A4=BA=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8F=90=E4=BE=9B=E4=B8=A4=E7=A7=8D=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/SearchShopList/SearchShopList.vue  |   3 +
 .../SearchShopListItem/SearchShopListItem.vue |   2 +-
 components/ShowShopList/ShowShopList.vue      |  33 +++++-
 .../ShowShopListItem/ShowShopListItem.vue     | 109 ++++++++++++++----
 static/shoplist/dp_icon_hhhdw.png             | Bin 0 -> 1438 bytes
 static/shoplist/sy_icon_lblhy.png             | Bin 0 -> 1115 bytes
 6 files changed, 122 insertions(+), 25 deletions(-)
 create mode 100644 static/shoplist/dp_icon_hhhdw.png
 create mode 100644 static/shoplist/sy_icon_lblhy.png

diff --git a/components/SearchShopList/SearchShopList.vue b/components/SearchShopList/SearchShopList.vue
index 7b1ff1c..4627a85 100644
--- a/components/SearchShopList/SearchShopList.vue
+++ b/components/SearchShopList/SearchShopList.vue
@@ -2,6 +2,7 @@
 	<view>
 		<SearchShopListItem
 			v-for="item in shopInfoList"
+			:key="searchid"
 			:shopInfo="item"
 		></SearchShopListItem>
 	</view>
@@ -24,6 +25,7 @@
 				default() {
 					return [
 						{
+							searchid: 1,
 							title: '寻找旺铺,200平米左右，寻找旺铺,200平米左右寻找旺铺,200平米左右寻找旺铺,200平米左右',
 							price: 5000,
 							date: '2023-11-02',
@@ -34,6 +36,7 @@
 							sqr: 500
 						},
 						{
+							searchid: 2,
 							title: '寻找旺铺,200平米左右，寻找旺铺,200平米左右寻找旺铺,200平米左右寻找旺铺,200平米左右',
 							price: 7000,
 							date: '2023-11-02',
diff --git a/components/SearchShopListItem/SearchShopListItem.vue b/components/SearchShopListItem/SearchShopListItem.vue
index 2f02032..2665eac 100644
--- a/components/SearchShopListItem/SearchShopListItem.vue
+++ b/components/SearchShopListItem/SearchShopListItem.vue
@@ -88,10 +88,10 @@
 		background-color: #fff;
 		border-radius: 7px;
 		box-shadow: 0 1px 2px 0 rgba(224, 224, 224, 0.50);
+		font-size: 12px;
 		.list-container {
 			display: flex;
 			height: 90px;
-			font-size: 12px;
 		}
 		.text-area {
 			display: flex;
diff --git a/components/ShowShopList/ShowShopList.vue b/components/ShowShopList/ShowShopList.vue
index 8cfa9e8..95f17c1 100644
--- a/components/ShowShopList/ShowShopList.vue
+++ b/components/ShowShopList/ShowShopList.vue
@@ -2,7 +2,10 @@
 	<view>
 		<ShowShopListItem 
 			v-for="item in shopInfoList"
+			:key="shopid"
 			:shopInfo="item"
+			:is-adshow="isADshow"
+			:show-style="showStyle"
 		></ShowShopListItem>
 	</view>
 </template>
@@ -10,6 +13,8 @@
 <script>
 	/**
 	 * @property {Array}    shopInfoList     对象数组，（带图片）需要展示的商铺列表
+	 * @property {Number}   showStyle        展示商铺的样式类型(0为首页默认)
+	 * @property {Boolean}  isADshow         是否显示推广广告
 	 */
 	export default {
 		name:"ShowShopList",
@@ -19,27 +24,51 @@
 			};
 		},
 		props: {
+			showStyle:{
+				type: Number,
+				default() {
+					return 0
+				}
+			},
+			isADshow: {
+				type: Boolean,
+				default() {
+					return true
+				}
+			},
 			shopInfoList: {
 				type: Array,
 				default() {
 					return [
 						{
+							shopid: 1,
 							imageUrl: 'https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg',
 							title: '琴行铺面转让',
 							promotionNum: 23,
 							price: 6000,
 							date: '2023-11-02',
 							pos: '锦江区',
-							sqr: 100
+							exactPos: '锦江区-汇源南路366号',
+							sqr: 100,
+							zrfText: "转让费：20万",
+							category: '餐饮美食',
+							uname: "张先生",
+							phoneNum: 13348946108,
 						},
 						{
+							shopid: 2,
 							imageUrl: 'https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg',
 							title: '琴行铺面转让',
 							promotionNum: 28,
 							price: 5000,
 							date: '2023-11-02',
 							pos: '锦江区',
-							sqr: 200
+							exactPos: '锦江区-汇源南路366号',
+							sqr: 200,
+							zrfText: "转让费：30万",
+							category: '餐饮美食',
+							uname: "王先生",
+							phoneNum: 13348946108,
 						}
 					]
 				}
diff --git a/components/ShowShopListItem/ShowShopListItem.vue b/components/ShowShopListItem/ShowShopListItem.vue
index ae99471..c18883f 100644
--- a/components/ShowShopListItem/ShowShopListItem.vue
+++ b/components/ShowShopListItem/ShowShopListItem.vue
@@ -6,27 +6,62 @@
 			</view>
 			<view class="text-area">
 				<text style="font-weight: 500;">{{shopInfo.title}}</text>
-				<view class="pos-and-sqr">
+				<view v-if="showStyle == 0" class="pos-and-sqr" >
+					<view>
 						<view>
-							<view>
-								<u-image src="/static/shoplist/sy_icon_lbdw.png" width="12px" height="15px"></u-image>
-							</view>
-							<text>{{shopInfo.pos}}</text>
-						</view>
-						<view>
-							<view>
-								<u-image src="/static/shoplist/sy_icon_lbpm.png" width="12px" height="15px"></u-image>
-							</view>
-							<text>{{shopInfo.sqr}}m2</text>
+							<u-image src="/static/shoplist/sy_icon_lbdw.png" width="12px" height="15px"></u-image>
 						</view>
+						<text>{{shopInfo.pos}}</text>
 					</view>
+					<view>
+						<view>
+							<u-image src="/static/shoplist/sy_icon_lbpm.png" width="12px" height="15px"></u-image>
+						</view>
+						<text>{{shopInfo.sqr}}m2</text>
+					</view>
+				</view>
+				<view v-else class="pos-and-sqr pos-only" >
+					<view>
+						<view>
+							<u-image src="/static/shoplist/dp_icon_hhhdw.png" width="12px" height="15px"></u-image>
+						</view>
+						<text>{{shopInfo.exactPos}}</text>
+					</view>
+				</view>
 				<view class="rent-and-date">
 					<text>租金：{{shopInfo.price}}元/月</text>
-					<text>发布日期：{{shopInfo.date}}</text>
+					<text v-if="showStyle==0">发布日期：{{shopInfo.date}}</text>
+					<text v-else="showStyle==1 ">{{shopInfo.zrfText}}</text>
 				</view>
 			</view>
 		</view>
-		<view class="list-ads" style="font-size: 11px;">
+		<view class="cart-and-date" v-if="showStyle==1">
+			<view>
+				<view>
+					<u-image src="/static/shoplist/sy_icon_lbpm.png" width="12px" height="15px"></u-image>
+				</view>
+				<text>{{shopInfo.sqr}}m2</text>
+			</view>
+			<view>
+				<view>
+					<u-image src="/static/shoplist/sy_icon_lblhy.png" width="12px" height="15px"></u-image>
+				</view>
+				<text>{{shopInfo.category}}</text>
+			</view>
+			<view>
+				<view>
+					<u-image src="/static/shoplist/sy_icon_lbxm.png" width="12px" height="15px"></u-image>
+				</view>
+				<text>{{shopInfo.uname}}</text>
+			</view>
+			<view>
+				<view>
+					<u-image src="/static/shoplist/sy_icon_lblxr.png" width="12px" height="15px"></u-image>
+				</view>
+				<text>{{shopInfo.phoneNum}}</text>
+			</view>
+		</view>
+		<view v-if="isADShow" class="list-ads" style="font-size: 11px;">
 			<view>
 				<text>已将该店推给 </text> 
 				<text style="color:#ce3b3b;margin: 0 4px;"> {{shopInfo.promotionNum}} </text> 
@@ -47,17 +82,22 @@
 				type:Object,
 				default(){
 					return {
-						imageUrl: 'https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg',
-						title: '琴行铺面转让',
-						promotionNum: 23,
-						price: 5000,
-						date: '2023-11-02',
-						pos: '锦江区',
-						sqr: 200
+						
 					}
 				}
 			},
-			
+			showStyle:{
+				type: Number,
+				default() {
+					return 1
+				}
+			},
+			isADShow: {
+				type: Boolean,
+				default() {
+					return true
+				}
+			}
 			
 		},
 		data() {
@@ -79,11 +119,11 @@
 		background-color: #fff;
 		border-radius: 7px;
 		box-shadow: 0 1px 2px 0 rgba(224, 224, 224, 0.50);
+		font-size: 12px;
 		.list-container {
 			display: flex;
 			height: 80px;
 			margin-bottom: 10px;			
-			font-size: 12px;
 		}
 		.text-area {
 			margin-left: 10px;
@@ -93,6 +133,7 @@
 			> text {
 				font-size: 14px;
 			}
+			
 			.pos-and-sqr {
 				display: flex;
 				text {
@@ -107,6 +148,11 @@
 					}
 				}
 			}
+			.pos-only {
+				text {
+					color: #A0A0A0;
+				}
+			}
 			.rent-and-date {
 				text {
 					font-weight: 500;
@@ -115,6 +161,25 @@
 				}
 			}
 		}
+		.cart-and-date {
+			display: flex;
+			border-top: 1px solid #f7f7f7;
+			padding-top: 5px;
+			margin-bottom: 6px;
+			justify-content: space-between;
+			font-weight: 500;
+			text {
+				color: #359867;
+				line-height: 12px;
+			}
+			>view {
+				flex:1;
+				display: flex;
+				>view {
+					margin-right: 4px;
+				}
+			}
+		}
 		.list-ads {
 			border-top: 1px solid #f7f7f7;
 			padding-top: 5px;
diff --git a/static/shoplist/dp_icon_hhhdw.png b/static/shoplist/dp_icon_hhhdw.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae0cb2ad861c0a4a0ba87ef88f98fa3c6b44d272
GIT binary patch
literal 1438
zcmV;P1!4M$P)<h;3K|Lk000e1NJLTq000;O0015c1^@s6HZI=f00001b5ch_0Itp)
z=>Px)SV=@dR7gveR$piwMHru%oxR(=y}g?>mkX`tl7_QFQX};Oeeoexii)97)I3-e
zYabMZ))ur6MU5?`{()BeQW5+ElA=+l4^dExiJ;&^&q`|Z(41*<(Ux4!%WigWce}T<
zBXiz`%l49{^EmU(_nYtge!p)%2=1^LV`ySx0wt446bgkPH+Nl^6$%A^U|_(95c=!6
zs9p#z#u(p6Gcz+$P1E)=#-4-_?f?L^*K8LUW0xU>-w{GCba!`~000igg1&A8;4jYQ
za-v}v`+VPj3jmP1Ly&od(A%o2j-=D+N-&~T0Ni;tn^hr%XBcDq@07mAa|q#QjIqO+
zOvY#gSpneACnqOmO6ljm?>~Jv&g-@ap>G61c%iSa&#r@10eH@5XJ^BjrX8e|zPpBV
z1|clf&RY0`n%N10aFh^owyUe_7OzPaV0?TWr&6gcOG`_W0DyQPbcQjWkY)K>Q4|+y
z4@#J(xyN<g-2i}9X@(GLgpddG`TUJtyLNf}5MH`;NyZo-@jUND@KvEu=zJ^|8)1x<
z%H?vGAP7*F<yim#DVNJn*|vQkcn4$rhUa;w`}_NC$U~i)nj((le9ahpq|q25lp}<^
zLMb(tmzR0rch=4?tEzekV;tuDl+x{isDF|q>6xCM9*qOwYuB!|o2L0YV=UQdD2n2_
zSS<E&tv0Jzg%J9R5OT`0tmhraIT8RUM5ED%wr$(C0Iy!X8d4PHo?@~1CjcPQXede2
zQB_sPipAoWjIjp-PX0<H5_?S3eAKq>vw<{Oi9}+1xm^ASPESvVB}wX7SXkf%mKzO2
zq0n(zmPbv~<Z0jqU0DdBUt3#SU($7b&~@E+0swY<dwZYbIP+Bi2w{h=>lYbgodG8o
zTU%QX*|xpIG|h7W0F|FZ2+NA19F%4Gw^FHeic-2KaBnsii|uBN%~w+tiA1)PN~KSN
zMdtlQlBE5LqD*?8*XuaW<D3-XaQH`r&=uEp)3$Ao003~X$eT88I$&AW4ahaHb?eqP
z(==ap9Oum@;xWSE@G(Nj&y-Sy2jKgD*)+|auIqA9lHeUll8#5C(T}cQzrI+dX+EEi
zyRO@}yuAE9V{BES>z5&fISAn&T=>54_W=OzZ>D4jq1DpT@`NA=S5m2zURB}z{JdPL
zR8odv9II3+&#loaHnc5@;uor_o)kqf-_g-wue6HJ&dyd&MP1iNeBWQChYfk=9|%H)
zcs#xjLU?6vZtmZDtEe`+n>TODwr$@_DSgZ^jQ1I1;f*@3G3%D9s;>!x@PjPNe{bHr
znRnFxn;l=g*vVuv77B&BT-SZpwr#G?raxX2U=|LCPfL<?-gVvCLZPtCUta}oFy@pM
zWm#@P2z6_k_NwQ3LmP<#V?0U-`M~%68QZp(dV6~-oD4yLm4CtWyadKLt?T*;&+{H$
z4+LZUOFSOu-7|+VF4q5n74`)$4-XHc!NEZ(kw~;tN_%u&KjZuUea%1+Leueh{IDPh
zQ^jI&VQg&786F;9HD#<dRiMSi#fV`TTL1tVP18PPjI{;Sx=08)1OUjYs(PcXt<7pS
z!mL@u(a}*MlgUIGV;z-BWuROxzt_+VZADRD7e#RbLO7qzX3e3YA=*@U>*bd-E1gcq
zD5ag2W$m>r>ln9>L?S06k;nx>5ax2Z+zMmv8ld)_VnPUKR+nj-FG2``q9~vGzCWvJ
z+ERaiKd0ku1J{~G4!(kmFqg}PFvcx{ASC!XrL^dI-cmZ9cAHIet7^3op4UMD0CjcW
s+KBVpbg&*+ZC<UDg3m~6rlrx(e|AZixW0m}dH?_b07*qoM6N<$f)J*yRsaA1

literal 0
HcmV?d00001

diff --git a/static/shoplist/sy_icon_lblhy.png b/static/shoplist/sy_icon_lblhy.png
new file mode 100644
index 0000000000000000000000000000000000000000..98d58fdf0c83180f7bfdbf92bdcc48651702783e
GIT binary patch
literal 1115
zcmV-h1f=_kP)<h;3K|Lk000e1NJLTq000;O0015c1^@s6HZI=f00001b5ch_0Itp)
z=>Px(6-h)vR7gwhmVanlRTRhHz3;xf{BG8@&5}Mf)`Yg{Y{e{pn1770iG#Vee`K!q
zpMp3=7{yVFL$=jHx7tZzOeRB$t8}m?2;#tP+Cc?Hv<-7<QzKSdXG>_K{gI^UOLB9s
z+{Yr_NJF>Qzx2ZU<Gy#_`J8*t`JQtD$8j8`6a)eR=yW>yy1F_rGcyC&`-dGin~jFU
zVLCZEne+L41OPw*Gad{E(aDLSgMXzH=Lw~i4{Lb+dI-SWPSMbQdiN_|xLhs_{C+=Q
zQ&VGn{riu?gc8eEjOYJ_07kFA*y$V{9Zi6-u`$7HHdh?_^6VW<b33;KAV7X$X#eqN
z=jZ1a6hKKyiFx4HTdg<m-tO5dK;%`69!qWS(T0}?6#zRTkH=%e7+3ploc)dgUXbdq
zyy@Kk6#yX1^E}-w6l2T+8z+R!K?wg)j)(<06bfnedVSU5uX{tx*dDXvLPve`ry7kW
zNh#elK$c~~aa<Z9l!(P*NhQe4;Pmvgn&UXzp_@HFvw3alV?FP=ThAkeRxrl*0T4n!
z5CoV=BzOoRU=RC;5JHVcBavkpPfbl_y<TrlNz*()rBXf7bnSG6&1*`f?laG|_4W7n
zFL!lyF|U+CDTP;lxURnxy560p*%nIaeMtcTx2#6$%dHIux{kQ^CIA4WAfV6=qR}WY
zo6V{t-&}Y<o>_aNSX>M$?S}*Vj&(|sBo_p5fTJAc9!bp%3^^G8yz!(x5{WDo25dHM
zimVH~bi68=OwRplfUEmDt09DU3kP|J^sU`g8K#8f@=gN40SI_><M&`ohGg}{Hi-aC
z4({!6Z3yt}s=ah{_W?gbXf3Y;005+v8czH;_|`8=vj>X-o-|hYdp)ncv*8gvU1~db
z!hQH+DwT?BwOS=j5ke4SY>a18Po4Yev-X*lh3C^GYg`W!AfKu#u?!!pZ|t*}$|pAr
za`leNGw;^>`o_n{mswrEXM~k?wbg1Z%VaVVA*77wc{SS^`<~0?m>^{UK#Y|NK@b);
zOw(dQi$<gBbUJM$gfQ>LJb>wtl?hpv<0g}7#bU8ASYe?R0|bJ@hKqNub+6$}3!$`h
z{Sg5GRy0T)Xshy`YV$V5|5tKRz5fT4{Pr_VLoBbiP056i$6p=(;5MN|yQji&s-vO#
zGHZRTQ*Bwv6B83EjYhNUlgO>+xwSv5+Z!4`)^V!e>~?$do`4wR(Ur_@7H+rOkjv%D
z2qA(X2um2_C5OY2UY{zgWzNpdiU=XSEXz7Vh)S(iD-~ImWy<q>Rush~#yBZSQu-gE
z<*$!ct5sNBT!f-1X6<%+mMwTN7unj8krBSUyd3IuI;9Tf$Li`TiN#_h-|&@fKj5J<
hXSacEXljayzX3#Kv!w?agXRDL002ovPDHLkV1msZ4Z;8b

literal 0
HcmV?d00001