首页修改

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>

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="title">
-				<view class="shopList" v-for="(item,index) in options1">
+					<image src="@/static/img/home/title-logo.png"></image>
-					<view class="shopManagement">
+					<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 class="dizhiIcon" src="../../static/img/home/dizhi.png"></image>
-									style="width: 28rpx;padding-right: 10rpx;" mode="widthFix"></image>
+							<text>{{item.merchantAddress}}</text>
-								<span>{{item.merchantAddress}}</span>
-							</view>
 						</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,38 +746,55 @@
 					}
 				}
 			}
-
-			.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 {
+	.shop-list-box{
-							font-size: 28rpx;
+		width: 686rpx;
-							color: #999999;
+		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;
 			}
 		}
 	}