From b7a4fad4f68978b36722e1e6466330426fd44f8e Mon Sep 17 00:00:00 2001
From: LuoShijie <rowe_jason@outlook.com>
Date: Tue, 7 Nov 2023 00:17:38 +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=E5=88=A0=E9=99=A4=E5=92=8C=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/ShowShopList/ShowShopList.vue      |  13 +++-
 .../ShowShopListItem/ShowShopListItem.vue     |  67 +++++++++++++++---
 static/shoplist/dp_icon_pj.png                | Bin 0 -> 1459 bytes
 static/shoplist/dp_icon_sc.png                | Bin 0 -> 1292 bytes
 4 files changed, 68 insertions(+), 12 deletions(-)
 create mode 100644 static/shoplist/dp_icon_pj.png
 create mode 100644 static/shoplist/dp_icon_sc.png

diff --git a/components/ShowShopList/ShowShopList.vue b/components/ShowShopList/ShowShopList.vue
index 95f17c1..c8294a0 100644
--- a/components/ShowShopList/ShowShopList.vue
+++ b/components/ShowShopList/ShowShopList.vue
@@ -6,6 +6,7 @@
 			:shopInfo="item"
 			:is-adshow="isADshow"
 			:show-style="showStyle"
+			@delItem="handleDel"
 		></ShowShopListItem>
 	</view>
 </template>
@@ -15,6 +16,7 @@
 	 * @property {Array}    shopInfoList     对象数组，（带图片）需要展示的商铺列表
 	 * @property {Number}   showStyle        展示商铺的样式类型(0为首页默认)
 	 * @property {Boolean}  isADshow         是否显示推广广告
+	 * @property {Boolean}  isEdit           是否显示编辑和删除
 	 */
 	export default {
 		name:"ShowShopList",
@@ -27,7 +29,7 @@
 			showStyle:{
 				type: Number,
 				default() {
-					return 0
+					return 1
 				}
 			},
 			isADshow: {
@@ -76,6 +78,15 @@
 		},
 		computed: {
 			
+		},
+		methods: {
+			handleDel(shopid){
+				console.log("删除了商铺", shopid);
+				// const delindex = this.shopInfoList.findIndex((item,index)=> item.shopid === shopid)
+				// TODO：不能直接修改
+				// if(delindex !== -1)  this.shopInfoList = this.shopInfoList.slice(delindex,1)
+				// console.log(this.shopInfoList);
+			}
 		}
 	}
 </script>
diff --git a/components/ShowShopListItem/ShowShopListItem.vue b/components/ShowShopListItem/ShowShopListItem.vue
index c18883f..c08d77e 100644
--- a/components/ShowShopListItem/ShowShopListItem.vue
+++ b/components/ShowShopListItem/ShowShopListItem.vue
@@ -35,7 +35,8 @@
 				</view>
 			</view>
 		</view>
-		<view class="cart-and-date" v-if="showStyle==1">
+		
+		<view class="cart-and-date bottom-common" v-if="showStyle==1">
 			<view>
 				<view>
 					<u-image src="/static/shoplist/sy_icon_lbpm.png" width="12px" height="15px"></u-image>
@@ -61,14 +62,26 @@
 				<text>{{shopInfo.phoneNum}}</text>
 			</view>
 		</view>
-		<view v-if="isADShow" class="list-ads" style="font-size: 11px;">
+		
+		<view v-if="isADShow" class="list-ads bottom-common" style="font-size: 11px;">
 			<view>
-				<text>已将该店推给 </text> 
+				<text>已将该店推给</text> 
 				<text style="color:#ce3b3b;margin: 0 4px;"> {{shopInfo.promotionNum}} </text> 
 				<text> 位潜在客户</text>
 			</view>
 			<text style="color:#ce3b3b">我也要推广>></text>
 		</view>
+		
+		<view v-if="isEdit" class="del-and-edit bottom-common">
+			<view class="edit" @click="handleEdit(shopInfo.shopid)">
+				<u-image src="/static/shoplist/dp_icon_pj.png" width="12px" height="15px"></u-image>
+				<text>编辑</text>
+			</view>
+			<view class="del" @click="handleDel(shopInfo.shopid)">
+				<u-image src="/static/shoplist/dp_icon_sc.png" width="12px" height="15px"></u-image>
+				<text>删除</text>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -89,7 +102,7 @@
 			showStyle:{
 				type: Number,
 				default() {
-					return 1
+					return 0
 				}
 			},
 			isADShow: {
@@ -97,17 +110,33 @@
 				default() {
 					return true
 				}
+			},
+			isEdit: {
+				type: Boolean,
+				default() {
+					return false
+				}
 			}
 			
 		},
 		data() {
 			return {
-				
+				delshopid: 0,
 			}
 			
 		},
 		computed: {
 			
+		},
+		methods: {
+			handleEdit(shopid) {
+				// TODO 完成页面跳转
+				console.log("edit clicked");
+				console.log(shopid);
+			},
+			handleDel(shopid) {
+				this.$emit('delItem', shopid)
+			}
 		}
 	}
 </script>
@@ -161,10 +190,16 @@
 				}
 			}
 		}
-		.cart-and-date {
-			display: flex;
+		
+		.bottom-common {
 			border-top: 1px solid #f7f7f7;
 			padding-top: 5px;
+			display: flex;
+			> view {
+				display: flex;
+			}
+		}
+		.cart-and-date {
 			margin-bottom: 6px;
 			justify-content: space-between;
 			font-weight: 500;
@@ -174,17 +209,27 @@
 			}
 			>view {
 				flex:1;
-				display: flex;
 				>view {
 					margin-right: 4px;
 				}
 			}
 		}
+		.del-and-edit{
+			margin-top: 6px;
+			justify-content: flex-end;
+			>view{
+				margin-left: 38rpx;
+			}
+			text {
+				margin-left: 4px;
+				color: #666666;
+			}
+		}
 		.list-ads {
-			border-top: 1px solid #f7f7f7;
-			padding-top: 5px;
-			display: flex;
 			justify-content: space-between;
+			text {
+				color: #359867;
+			}
 		}
 	}
 	
diff --git a/static/shoplist/dp_icon_pj.png b/static/shoplist/dp_icon_pj.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7e9d377b1d655d05b8a9756dc14857e93ba88df
GIT binary patch
literal 1459
zcmV;k1x)&hP)<h;3K|Lk000e1NJLTq000;O000^Y1^@s6t-qY}00001b5ch_0Itp)
z=>Px)ZAnByR7gv$mS0R$R~*OhIrmR{xj?DfB65w60U;D2Sl?V0cu>MZAnK4zAY^Yo
zG|m87;@swv&P>)NbXlrwk%e|9M#&Oqz$NMf4~vUg`k+#`*hZan2rZSi^w0fs?mf#X
zl;8pzB)dtI-t_kOIrn_Ozwhq=>VLd2#$bGW99k?E(A3nV0|0cewm!xf`u%>|WHLd9
zVP5-fy>%dja5x;+nwpw4ilTtu?>CN(ja@(pwVpkDwq6uPIah>`1AzeR^?Ex}snkcB
zrr9WpVmI@09LIe%Ffj0mEX%CN<MGI{+-o+Q-42JtDT-nu2bi9o=6pV1*W%)$R}h40
ztJV4ogi!hq07eKYWo2cz8yXt^@cDdSOOo`iD2m^9cXwZ87$$uG{{1Ale*HRKQ&UrX
z>C&ZNIgZm#ojUaaP19*j(-6Zj`bH3pG1fFqO(YW9*w~mWo6WXXR8)Any1IT~S@ti4
zP;Bqsy)wWUv!PI^)a7zL-?eL(x3{;~4Izw5lB5<E7UGQnnM?*oB9Y?p@$v5@NouaD
zs&XGWa^%NQD3lOI@lTu0mdS}63<eDpMTst#E3|Xx&TmefIB_ABN<}9oCWvtBUgyr8
zgEw#9+<xcIookAsyj4?E<7#hjpYVFUM<bEQdrqgb+G4RR1D-v5X4G|k_t4PLlhV>s
zcTZ2x`ReNGS48`%sVUlGu|R{tu<EGF%1S*P4l~2U!yl&8>5pq`YtOf}wM_y5k|QG{
zr{nQ>@0l}aDr2!&?7)EoY7W3K%x<UC`NV3q4xc=E^8CGf_u`$MowUQ@7(xj30<c^k
zV@v@677rdg*eZ&mabaQMO}pLxTvgQtp69X0<N0(2P^YTuY*kg2ye^=;ygVKV1o&IG
zZnY+p$rhTX*%gSUY1;hp<Hs)wf}p6X$_RoWVT?1fEEiqAeAyX~$9o0`2ODN)X2Q+Q
z&C-T|moHx$(&_Xznx?lg3}ZkD0SF<|G;N9FxY*3hOt!eVSc^uZdNdlvjg5`lMn^|K
z-z;EpYHEtKypd&D@}U6$K+`mxWm%PFS$TGLR(<;PsovSyNvsS)q0sg%0Z3$AxpJjf
zQIvL4oD>0oxO&;SD_`b1Iywe8j*~@EG;akEfB5jB@#@v9r_<^5Q3xT-3!V2Z0RRBz
z+S=OQFDWT`Wipvcwgi};pEqW+Sqp@4J3@$Gd5c_qnx?U?>xiPLcqWsHV2o1+gTb_E
z0I_LpZ7t37JWtbf0n4(CEX#21>UCY$d7jU{c=3WbNZsld<wU-F_wN35I{h|H)2qev
z5M9^FF3k-O4_~7wN(+TTTXIp{@An&gKHo)2lKM7^3;;mv@ZrPz_UzfSuw@NMqZJhu
zSs{cLS(Xcki}E0bVTi!0q9}_9p*hkU|Ej@C7X7|s$BvP{zP`^MJb19!*x1PMJYT3N
zN+HX#tfDBdO*n>OG+oy-$z*a#RaK?Dyu8Hic7K^jB#sRZ4(`Vo&*Y*apQdiN`!<9y
z<#0IOSz20(*zI;b5D3tMAmqm9{QUfDfYQ=Z{OHjmBD6*VQBjn#(b3V{G)>F>{rw%Q
zS(Kj#larI(j~_q&f@Rs?IF9>C*Y(t9MkaX%LRc)z@-c+azWVz5{zHcj{YVy>OVj*B
zGn>ugjT<-GgTY{*EX!|TjG4^>0078nGzM)p+xIOkEk7fK!W9)2ORJ{}GLtdJ=7NF(
zD@9QzlAfC_o_`JippeGnI4%;4#S(ROb>x288TnI%AP5Brp+b)1I1&&46m~r*$8n^q
zbxD%sOeT|NSvF&{*;JBStAI5fx}|eb{(t0rlt?6WyWOslZCSgJzX3!Pkw$!5(}Ms2
N002ovPDHLkV1nZ2#-9KH

literal 0
HcmV?d00001

diff --git a/static/shoplist/dp_icon_sc.png b/static/shoplist/dp_icon_sc.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9a4159ffde455200654e81d778dc27330dc4087
GIT binary patch
literal 1292
zcmV+n1@roeP)<h;3K|Lk000e1NJLTq000;O000^Y1^@s6t-qY}00001b5ch_0Itp)
z=>Px(#z{m$R7gwhR$oY4R~SF%+#Bz_=}nB9XjA9Zi8$;eg}C`3QYY#dt~1?Kgh^vu
z5oFLluX~W;3KM6wNV`!j+k<1q2hm9&E?rAHMRf5Gc)Pj9EQLtI=3+WcuSw3mXB;sd
zuDW)QgMM(}@||<OKfn8Z-|s+hgb+fI$KzqNS}kH(79MsiFE5XXqDV?gN-%_w008JZ
zActP;>gq!E_4Uu)xN&2K5Mnwih<$yetgP&1tyUXsYHE_7$^jvS2?PS#!NI}HvMiTE
z2oV6_pTQ7CQE0@QXU?4ItgNgIK?oB^Iv|8l1A9g&G+9|$f}$wd5W<W^BEhjNd*Cj{
z7$Afagpdf&^TDjFtOx)A?;j%jkO4>ykByC~+-~=KilXF08ZJVRVHk#G*%XFh=sFZi
zS(b?`%UG7>7{(aWjHn=leyyym9BOQAOhCKc&YU`RN<A<z;Ghl;f#M0j;IZvJ2Ny0}
zcw=d4DM~Y7{C>Xx0HAQ_2q7sLW5}}XUPaLFq=|piCC@+z<Ajhc06=JAVPPB6im9!w
z<qQUcKnM}sZg){_ZS60TBq{V#YHBKSxm-o%<>g+U=W#3+qu8U_+1VFOCewYbRvS<1
z=H}*J$j!|S8jZ$Hj^nn6hlgW((NWj}fdF^?`t>(AH#bL%i;G{auC5m8p3~_xdA;86
zv$M0$HZ?VUySuxq`2GIu>FMd8)6&u|+HAHj)oL}~+1cUy`}=)7&ktIy*2|@(r4oct
zNv01&p%8!V+O>B>q0nb1PoAu^SS)v`1H0W`y|%XY&508yYz++!c8x|O&&|!fbo=)0
z#q{*_53N?~Rg7^=qtRq`cX!_x1mW|}&dy5(1qFZ7N=jw`eLkONbaeEb-|rtVo6T=E
zG&Fn{4u|2bTes>~R#wIe3JN;UpFckmi^cH#{JhEGaLgP(e*7bw&DOuMv9YVy>y5p=
zy+7%6x|?lnZI_CQio%aFprz{f`?Yqv-MYTMe#LAypS4&lu1F*TT`t$_OG`_mg@uLh
z*VNREs8lNK^Z86uQ&V@1Mq_t-d;1jtfE16%b9#Du?&);8FWTGNKPW6L{NtH}XAu40
zs%Uw6S?hE<&-r}5ezV#9j>Te`{x5wHjYf0(`ufC-jEtK$o9)tLeGm?Zh4Jz6y7~Ee
zyTM@iq@$ywhmLrs(^<E;xcD_~wC3jKuOvyrUa!|QIXUSz8jT;fw6ydigyIf|qh1un
zk(`_y+TB-&hK9Dfy1M?JMJp>Syk4(=zPGn`I2w(<!g1U<!!QAsW%C|9cwi9(!Ko<9
zJph2BQmG7)NTikL`5A^`en=z|LM#?*WLb8*wYBway<Y$0fmuX{+Un|R3LRL%V6b>%
zV&dY~*4AsXEUTY}Z72r_g5asDs`|8~q-2p063oxf-=%jSkqI5yqA2oewK|g!Vn7HT
zBZR0FMNuJyScDLz#00}Il<ZZ65S9?4P@>=GW=WRi-vI!>c|4w-<O|~f*HZedsHor`
zK74qLVHlno;y4b*<8hdhl0qo4P~kWZBz2U7B}tMo#!_Zx=C&w`yH!<HN%DW}DMHBy
z-nny!(d+d{tya_L$`b`+Oag&`eERfhn$aE;Cgm?&<FU$Gc$Ve>0000<MNUMnLSTYG
C2YqD#

literal 0
HcmV?d00001