From 26d8cbe9320f294dcc4cd049a31b79186be73135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=B1=AA?= <781521347@qq.com>
Date: Fri, 12 Nov 2021 14:49:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/index.vue       |   2 +-
 pages/index/shopIndex.vue      | 115 ++++++++++++++++++++-------------
 static/img/home/title-logo.png | Bin 0 -> 1392 bytes
 3 files changed, 71 insertions(+), 46 deletions(-)
 create mode 100644 static/img/home/title-logo.png

diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index 1f71fce..b3369d6 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -3,7 +3,7 @@
 		<view class="header">
 			<view class="shopName">
 				<!-- <view class=""  @tap="shopBtn()">小曲奇的店铺 <image class="icons" src="../../static/img/home/down.png" mode="widthFix"></image></view>	 -->
-				<u-dropdown :active-color="colors" title-size='34' style="position: absolute;width: 120px;left: 35rpx;top:15px">
+				<u-dropdown :active-color="colors" title-size='34' style="position: absolute;width: 70%;left: 35rpx;top:15px">
 					<u-dropdown-item v-model="value1" height='600rpx' :title="title" :options="options1"
 						@change="changes">
 					</u-dropdown-item>
diff --git a/pages/index/shopIndex.vue b/pages/index/shopIndex.vue
index 1562970..fd46dcf 100644
--- a/pages/index/shopIndex.vue
+++ b/pages/index/shopIndex.vue
@@ -33,7 +33,7 @@
 			<view style="display: flex;">
 				<view class="top">
 					<view style="font-size: 12px;">报名数量</view>
-					<view style="font-size: 24px;margin-top: 5px;">111</view>
+					<view style="font-size: 24px;margin-top: 5px;">{{baoMingCount}}</view>
 				</view>
 				<view class="picture">
 					<image src="../../static/img/home/money.png" style="width: 128px;height: 104.09px;"></image>
@@ -42,15 +42,15 @@
 			<view style="display: flex;color: #FFFFFF;" class="bottom">
 				<view class="item">
 					<view style="margin-bottom: 5px;">提交任务数</view>
-					<view>111</view>
+					<view>0</view>
 				</view>
 				<view class="item">
 					<view style="margin-bottom: 5px;">审核通过订单</view>
-					<view>111</view>
+					<view>{{shenHeCount}}</view>
 				</view>
 				<view class="item">
 					<view style="margin-bottom: 5px;">返利金额</view>
-					<view>111</view>
+					<view>{{fanLiMoney}}</view>
 				</view>
 			</view>
 			</view>
@@ -96,17 +96,17 @@
 				</view>
 			</view> --> 
 			<view class="shop-list-box" v-if="options1.length > 0">
-				<view class="title">店铺管理</view>
-				<view class="shopList" v-for="(item,index) in options1">
-					<view class="shopManagement">
-						<image class="shopLoge" :src="item.merchantLogo"></image>
-						<view class="shop_r">
-							<view class="shop_name">{{item.merchantName}}</view>
-							<view class="shuoDz">
-								<image class="dizhiIcon" src="../../static/img/home/dizhi.png"
-									style="width: 28rpx;padding-right: 10rpx;" mode="widthFix"></image>
-								<span>{{item.merchantAddress}}</span>
-							</view>
+				<view class="title">
+					<image src="@/static/img/home/title-logo.png"></image>
+					<text>店铺管理</text>
+				</view>
+				<view class="shop-item" v-for="(item,index) in options1">
+					<image class="shopLoge" :src="item.merchantLogo"></image>
+					<view class="shop_r">
+						<view class="shop_name">{{item.merchantName}}</view>
+						<view class="shuoDz">
+							<image class="dizhiIcon" src="../../static/img/home/dizhi.png"></image>
+							<text>{{item.merchantAddress}}</text>
 						</view>
 					</view>
 				</view>
@@ -127,6 +127,10 @@
 			return {
 				colors: '#FF4701',
 				merchantLogo: 'https://download.cyjyyjy.com/fq-logo.jpg',
+				baoMingCount: 0, //报名数量
+				shenHeCount: 0, //审核通过数量
+				fanLiMoney: 0, //返利金额
+				
 				merchantId: 0,
 				startDate: 0,
 				endDate: 0,
@@ -395,6 +399,10 @@
 						this.zhangdanData[0].num = res.dayMoney ? res.dayMoney : 0;
 						this.zhangdanData[1].num = res.yiMoney ? res.yiMoney : 0;
 						this.zhangdanData[2].num = res.weiMoney ? res.weiMoney : 0;
+						
+						this.baoMingCount = res.baoMingCount
+						this.fanLiMoney = res.fanLiMoney
+						this.shenHeCount = res.shenHeCount
 					}
 				});
 			},
@@ -738,39 +746,56 @@
 					}
 				}
 			}
+		}
+	}
 
-			.shopList {
-				.shopManagement {
-					background: #FFF6F2;
-					border-radius: 15rpx;
-					padding: 20rpx;
-
-					.shopLoge {
-						width: 120rpx;
-						height: 120rpx;
-						float: left;
-						margin-right: 15rpx;
-					}
-
-					.shop_r {
-						height: 120rpx;
-
-						.shop_name {
-							padding-left: 20rpx;
-							font-size: 30rpx;
-							color: #333333;
-							font-weight: 600;
-							line-height: 60rpx;
-						}
-
-						.shuoDz {
-							font-size: 28rpx;
-							color: #999999;
-
-						}
-					}
+	.shop-list-box{
+		width: 686rpx;
+		border-radius: 16rpx;
+		background: #fff;
+		margin: 0 auto;
+		.title{
+			width: 100%;
+			height: 96rpx;
+			display: flex;
+			align-items: center;
+			padding: 0 32rpx;
+			image{
+				width: 32rpx;
+				height: 32rpx;
+				margin-right: 8rpx;
+			}
+		}
+		.shop-item{
+			width: 100%;
+			padding: 32rpx;
+			display: flex;
+			border-top: 2rpx solid #E8E8E8;;
+			image{
+				width: 112rpx;
+				height: 112rpx;
+				margin-right: 32rpx;
+				border-radius: 16rpx;
+			}
+			.shop_r{
+				width: calc(100% - 160rpx);
+				font-size: 22rpx;
+				color: #333;
+				.shop_name{
+					width: 100%;
+					overflow:hidden;
+					text-overflow:ellipsis;
+					white-space:nowrap;
+					font-size: 28rpx;
+					font-weight: 500;
+					margin-bottom: 20rpx;
 				}
 			}
+			.dizhiIcon{
+				width: 16rpx;
+				height: 19rpx;
+				margin-right: 10rpx;
+			}
 		}
 	}
 
diff --git a/static/img/home/title-logo.png b/static/img/home/title-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..d34d21b2ef8fec53566040c5b26afc32dc18e3e4
GIT binary patch
literal 1392
zcmV-$1&{iPP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px)DoI2^R9M5cmuqNTRS?I2bMCpj+dLZ6Y?6((32LAArJ+*6N1#-+RT060XjM?#
z4=QS@s6}d51zS<{lb{k5K}D=zN)hV|6jSh7wZ5yZwwNg0*rs_kd+*&lez=?L-ehZI
zjRS{!9&=~@GiT16Il?4K*W=RAcqzgfgvF>dBBY~5dJ)Z`e1o!`zjE)&^Z1jID<@UF
zskQ-`wh7T&K~9?_+&<7wTyLvn`;VLw00rT}^ahYEAk#S&QauLxD3A3%C7_cApc`w`
zBvUUVav4)Xx{L7mO|o?`cTxblDcymQS3u5SN=dsZ=vvv<`@snT=>7GrSobr9CT6xH
zjkEu|+G9O%plft^SOWiidHm?12>|r=#u}Z$hZwh=Yo10HT|ITS@Bav1Uk~08pnJs9
zA=%s@fEi^9)AA5v+BxS6Wd14$yeVtawj3_L3q(Lndl;ApM)ev1%{FF4%$*p4ndgD;
zO?i_uF9IWA1aahU%{FELEI^2}86(pGM4Slul#`%lY{zR<oz1`<R<k5RN7jyoLs<BK
z02KVl10`CkSvJ_fX<1>!loCxC{C@zX9Dqy@oR$^V7;|-OVW0<seEjFYgV2LSO+31X
zb4XR=#Hb(cMXJ*Ax&EH<9>CzNvg*i^@^qj-@5HoSf>bw;rc?B<??FQ(y=cq|4MrgM
zEjnW!GOeUc2Y!daZgAScaf=4z3BT-|004BE#h6TN&L2R3dmCCiz$Cys1_U6WeLq5?
z4zvLIK1kNUP&euifK7ov4E`XvDfHM+5wAGt!4Kf*z6t;&V-d+r@S$5(WcDFZ1yq&q
zN93?n-8f@>urAp8_?1QgHZgAh$0%bl5>x^psR}o5UpGw8fN}m^CLA+p0tHr${0YRa
zTS-(wvdlvNICMP&``&|<o8at@e|G{BRpmLLoc^>#0OrQSGYL-7?R|$}*Je2KYc&4u
zP5Aw*5^u|5m~}q-!w$mQBxd#+IC2n8T1?%XlDtX)M0+g49*|373!x9eNYwxIg_3fB
zKlVm#jJE&{v!VM7G+hm?t6<;{2og{|t0b>-418q~*@?(KaR6Qv(Et~$0}Ww+@fx4A
z5}Fs3cxzk0O~Jg?n3M})h}34lnv#srtLy<~r?o1(eMkCZaS(WrA1W~}UkB;Auy;GO
zE{EoGCVI1_J<2A54~g2SKPn^eD#bv*d-#_wD|h{p_nw{e8p!$*fP5SPz|3V)D;GRj
z3i6eb(5sTgvjA?v-xAp5^$Im50E2P<+NKljV|3ni^xT*AwOEH%HzG~v0*dy22U-|%
z1MlHjMdWwRe>hYg0&p5G#Hn8v*Rf<Z)HFaCMwu`yHVup4Li{_vUmW|p??Xm<A8~K{
zam!de0FW#6Ki**Lt_0dOpPT4`-#&-a=S>hu82qEc(m065gnMlN;I@iI>F{%Bwc14L
zQ<Y@1t-Bl%TUxBkAn7yyK|%RAsJtHLNAgEMT$s9{>%a-ia__|j7lg*_bevgf$IdS;
zoYsUSlj8&yK!b5}K^%yN(YE1xnB!N;b#J_L(uc|M&IN5I;p`CVmpWk^Vylpp8{c;=
zl!R-s#R4+wD+-MK?91@A$(!HbJNc*CGYf0-weo}rx0tX#0p<jctI_DMIPa<WFS(B1
zD{DXLKc&a%@C%D(S(l9nH>%2vNtK^UE`(Q-ntxJm-q-z~UdLm$WHG_q#mmEx)u=8-
yX%mswsA$qd2nP}Qx}f^jwEf?HELp<I$o(7mt)YgKcdpX_0000<MNUMnLSTY9G?_#I

literal 0
HcmV?d00001