修改活动列表

pages/home/components/activity.vue

@@ -6,19 +6,43 @@
 		<view class="second">
 			<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
 				<view class="list-scroll-view">
-					<view class="list" v-for="(item, index) in list" :key="index" @tap="toInfo(item)">
-						<view class="list_1">
-							<view class="left">
-								<image class="image" mode="aspectFill" :src="item.logo||config.logoUrl"></image>
+					<view class="other">
+						<view class="other_1">
+							<view class="drop" v-for="(item, index) in list" :key="index">
+								.
+								<view class="line"></view>
 							</view>
-							<view class="right">
-								<view class="name">
-									{{item.name||'暂无名称'}}
-									<text class="label"
-										:class="[item.user_type=='0'?'label_1':'label_2']">{{item.label||'成员'}}</text>
+						</view>
+						<view class="other_2">
+							<view class="list" v-for="(item, index) in list" :key="index" @tap="toInfo(item)">
+								<view class="list_1">
+									<view class="date">{{item.date||'暂无日期'}}</view>
+									<view class="status"
+										:class="[item.status=='0'?'status0':item.status=='1'?'status1':'status2']">
+										{{item.status_name||'暂无状态'}}
+									</view>
 								</view>
-								<view class="other">
-									{{item.activity||'暂无活动'}}
+								<view class="list_2">
+									<view class="name">{{item.name||'暂无活动名称'}}</view>
+									<view class="score">
+										<view class="red">
+											<view class="red_name">{{item.red_name||'暂无红方名称'}}</view>
+											<view class="red_image">
+												<image class="image" mode="aspectFill"
+													:src="item.red_logo||config.logoUrl"></image>
+											</view>
+											<view class="red_score">{{item.red_score||0}}</view>
+										</view>
+										<view class="center">:</view>
+										<view class="blue">
+											<view class="blue_score">{{item.blue_score||0}}</view>
+											<view class="blue_image">
+												<image class="image" mode="aspectFill"
+													:src="item.blue_logo||config.logoUrl"></image>
+											</view>
+											<view class="blue_name">{{item.blue_name||'暂无蓝方名称'}}</view>
+										</view>
+									</view>
 								</view>
 							</view>
 						</view>
@@ -38,10 +62,15 @@
 	import { onShow } from "@dcloudio/uni-app";
 	interface PropsItem {
 		name ?: string,
-		activity ?: string,
-		logo ?: string,
-		label ?: string,
-		user_type ?: string,
+		date ?: string,
+		red_name ?: string,
+		red_score ?: number,
+		red_logo ?: string,
+		blue_name ?: string,
+		blue_score ?: number,
+		blue_logo ?: string,
+		status ?: string,
+		status_name?: string,
 	};
 	// 基本信息
 	const config = ref({ bottomTitle: '', logoUrl: '' });
@@ -135,51 +164,125 @@
 			position: relative;
 			flex-grow: 1;
 
-			.list {
-				border-bottom: 1px solid var(--f5Color);
-				padding: 3vw;
-
-				.list_1 {
-					display: flex;
-					align-items: center;
+			.other {
+				display: flex;
 
-					.left {
-						width: 15vw;
+				.other_1 {
+					padding: 2vw 2vw 2vw 5vw;
+					font-size: 20px;
+					font-weight: bold;
 
-						.image {
-							width: 15vw;
-							height: 15vw;
-							border-radius: 20vw;
-						}
+					.line {
+						height: 18vh;
+						margin: 0 0 0 2px;
+						border-left: 1px dashed var(--f99Color);
 					}
 
-					.right {
-						width: 75vw;
-						margin: 0 0 0 2vw;
+				}
 
-						.name {
-							font-size: var(--font16Size);
+				.other_2 {
+					width: 90%;
 
-							.label {
-								padding: 3px 6px;
-								font-size: 10px;
-								color: var(--mainColor);
-								border-radius: 2px;
+					.list {
+						.list_1 {
+							display: flex;
+							align-items: center;
+							padding: 4vw 2vw 2vw 2vw;
+
+							.date {
+								font-size: var(--font16Size);
+								font-weight: bold;
 							}
 
-							.label_1 {
+							.status {
+								font-size: var(--font12Size);
+								margin: 0 1vw;
+								padding: 1px 5px;
+							}
+
+							.status0 {
+								color: var(--mainColor);
 								background-color: var(--fF0Color);
 							}
 
-							.label_2 {
+							.status1 {
+								color: var(--mainColor);
 								background-color: var(--fFFColor);
 							}
+
+							.status2 {
+								color: var(--f99Color);
+								background-color: var(--f9Color);
+							}
 						}
 
-						.other {
-							margin: 1vw 0 0 0;
-							font-size: var(--font14Size);
-							color: var(--f85Color);
+						.list_2 {
+							border: 1px solid var(--f5Color);
+							padding: 2vw;
+							border-radius: 2px;
+
+							.name {
+								font-size: var(--font16Size);
+								font-weight: bold;
+								margin: 2vw;
+							}
+
+							.score {
+								display: flex;
+								align-items: center;
+								justify-content: center;
+								font-size: var(--font14Size);
+								background-color: var(--f9Color);
+								border-radius: 5vw;
+								padding: 1vw 0;
+
+								.red {
+									display: flex;
+									align-items: center;
+									margin: 0 1vw 0 0;
+
+									.red_image {
+										margin: 0 1vw;
+
+										.image {
+											width: 8vw;
+											height: 8vw;
+											border-radius: 8vw;
+										}
+									}
+
+									.red_score {
+										font-size: var(--font16Size);
+										color: var(--fF0Color);
+									}
+								}
+
+								.center {
+									font-size: var(--font16Size);
+									color: var(--fF0Color);
+								}
+
+								.blue {
+									display: flex;
+									align-items: center;
+									margin: 0 0 0 1vw;
+
+									.blue_image {
+										margin: 0 1vw;
+
+										.image {
+											width: 8vw;
+											height: 8vw;
+											border-radius: 8vw;
+										}
+									}
+
+									.blue_score {
+										font-size: var(--font16Size);
+										color: var(--fF0Color);
+									}
+								}
+							}
 						}
 					}
 				}

pages/home/components/team.vue

@@ -15,7 +15,7 @@
 								<view class="name">
 									{{item.name||'暂无名称'}}
 									<text class="label"
-										:class="[item.user_type=='0'?'label_1':'label_2']">{{item.label||'成员'}}</text>
+										:class="[item.user_type=='0'?'label_1':'label_2']">{{item.label||'队长'}}</text>
 								</view>
 								<view class="other">
 									{{item.activity||'暂无活动'}}
@@ -168,11 +168,11 @@
 							}
 
 							.label_1 {
-								background-color: var(--fF0Color);
+								background-color: var(--fFFColor);
 							}
 
 							.label_2 {
-								background-color: var(--fFFColor);
+								background-color: var(--fF0Color);
 							}
 						}
 

pagesMy/basic/index.vue

@@ -197,6 +197,8 @@
 	.content {
 		display: flex;
 		flex-direction: column;
+		width: 100vw;
+		height: 100vh;
 		background-color: var(--footColor);
 
 		.one {

unpackage/dist/dev/mp-weixin/pages/home/components/activity.js

@@ -64,21 +64,31 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         b: searchInfo.value.name,
         c: common_vendor.f(list.value, (item, index, i0) => {
           return {
-            a: item.logo || config.value.logoUrl,
-            b: common_vendor.t(item.name || "暂无名称"),
-            c: common_vendor.t(item.label || "成员"),
-            d: common_vendor.n(item.user_type == "0" ? "label_1" : "label_2"),
-            e: common_vendor.t(item.activity || "暂无活动"),
-            f: index,
-            g: common_vendor.o(($event) => toInfo(item), index)
+            a: index
           };
         }),
-        d: is_bottom.value
+        d: common_vendor.f(list.value, (item, index, i0) => {
+          return {
+            a: common_vendor.t(item.date || "暂无日期"),
+            b: common_vendor.t(item.status_name || "暂无状态"),
+            c: common_vendor.n(item.status == "0" ? "status0" : item.status == "1" ? "status1" : "status2"),
+            d: common_vendor.t(item.name || "暂无活动名称"),
+            e: common_vendor.t(item.red_name || "暂无红方名称"),
+            f: item.red_logo || config.value.logoUrl,
+            g: common_vendor.t(item.red_score || 0),
+            h: common_vendor.t(item.blue_score || 0),
+            i: item.blue_logo || config.value.logoUrl,
+            j: common_vendor.t(item.blue_name || "暂无蓝方名称"),
+            k: index,
+            l: common_vendor.o(($event) => toInfo(item), index)
+          };
+        }),
+        e: is_bottom.value
       }, is_bottom.value ? {
-        e: common_vendor.t(config.value.bottomTitle || "到底了！")
+        f: common_vendor.t(config.value.bottomTitle || "到底了！")
       } : {}, {
-        f: common_vendor.o(toPage),
-        g: common_vendor.o(toScroll)
+        g: common_vendor.o(toPage),
+        h: common_vendor.o(toScroll)
       });
     };
   }

unpackage/dist/dev/mp-weixin/pages/home/components/activity.wxss

@@ -24,45 +24,104 @@
   position: relative;
   flex-grow: 1;
 }
-.main .second .list.data-v-8f22acf3 {
-  border-bottom: 1px solid var(--f5Color);
-  padding: 3vw;
-}
-.main .second .list .list_1.data-v-8f22acf3 {
+.main .second .other.data-v-8f22acf3 {
   display: flex;
-  align-items: center;
 }
-.main .second .list .list_1 .left.data-v-8f22acf3 {
-  width: 15vw;
+.main .second .other .other_1.data-v-8f22acf3 {
+  padding: 2vw 2vw 2vw 5vw;
+  font-size: 20px;
+  font-weight: bold;
 }
-.main .second .list .list_1 .left .image.data-v-8f22acf3 {
-  width: 15vw;
-  height: 15vw;
-  border-radius: 20vw;
+.main .second .other .other_1 .line.data-v-8f22acf3 {
+  height: 18vh;
+  margin: 0 0 0 2px;
+  border-left: 1px dashed var(--f99Color);
 }
-.main .second .list .list_1 .right.data-v-8f22acf3 {
-  width: 75vw;
-  margin: 0 0 0 2vw;
+.main .second .other .other_2.data-v-8f22acf3 {
+  width: 90%;
 }
-.main .second .list .list_1 .right .name.data-v-8f22acf3 {
+.main .second .other .other_2 .list .list_1.data-v-8f22acf3 {
+  display: flex;
+  align-items: center;
+  padding: 4vw 2vw 2vw 2vw;
+}
+.main .second .other .other_2 .list .list_1 .date.data-v-8f22acf3 {
   font-size: var(--font16Size);
+  font-weight: bold;
 }
-.main .second .list .list_1 .right .name .label.data-v-8f22acf3 {
-  padding: 3px 6px;
-  font-size: 10px;
-  color: var(--mainColor);
-  border-radius: 2px;
+.main .second .other .other_2 .list .list_1 .status.data-v-8f22acf3 {
+  font-size: var(--font12Size);
+  margin: 0 1vw;
+  padding: 1px 5px;
 }
-.main .second .list .list_1 .right .name .label_1.data-v-8f22acf3 {
+.main .second .other .other_2 .list .list_1 .status0.data-v-8f22acf3 {
+  color: var(--mainColor);
   background-color: var(--fF0Color);
 }
-.main .second .list .list_1 .right .name .label_2.data-v-8f22acf3 {
+.main .second .other .other_2 .list .list_1 .status1.data-v-8f22acf3 {
+  color: var(--mainColor);
   background-color: var(--fFFColor);
 }
-.main .second .list .list_1 .right .other.data-v-8f22acf3 {
-  margin: 1vw 0 0 0;
+.main .second .other .other_2 .list .list_1 .status2.data-v-8f22acf3 {
+  color: var(--f99Color);
+  background-color: var(--f9Color);
+}
+.main .second .other .other_2 .list .list_2.data-v-8f22acf3 {
+  border: 1px solid var(--f5Color);
+  padding: 2vw;
+  border-radius: 2px;
+}
+.main .second .other .other_2 .list .list_2 .name.data-v-8f22acf3 {
+  font-size: var(--font16Size);
+  font-weight: bold;
+  margin: 2vw;
+}
+.main .second .other .other_2 .list .list_2 .score.data-v-8f22acf3 {
+  display: flex;
+  align-items: center;
+  justify-content: center;
   font-size: var(--font14Size);
-  color: var(--f85Color);
+  background-color: var(--f9Color);
+  border-radius: 5vw;
+  padding: 1vw 0;
+}
+.main .second .other .other_2 .list .list_2 .score .red.data-v-8f22acf3 {
+  display: flex;
+  align-items: center;
+  margin: 0 1vw 0 0;
+}
+.main .second .other .other_2 .list .list_2 .score .red .red_image.data-v-8f22acf3 {
+  margin: 0 1vw;
+}
+.main .second .other .other_2 .list .list_2 .score .red .red_image .image.data-v-8f22acf3 {
+  width: 8vw;
+  height: 8vw;
+  border-radius: 8vw;
+}
+.main .second .other .other_2 .list .list_2 .score .red .red_score.data-v-8f22acf3 {
+  font-size: var(--font16Size);
+  color: var(--fF0Color);
+}
+.main .second .other .other_2 .list .list_2 .score .center.data-v-8f22acf3 {
+  font-size: var(--font16Size);
+  color: var(--fF0Color);
+}
+.main .second .other .other_2 .list .list_2 .score .blue.data-v-8f22acf3 {
+  display: flex;
+  align-items: center;
+  margin: 0 0 0 1vw;
+}
+.main .second .other .other_2 .list .list_2 .score .blue .blue_image.data-v-8f22acf3 {
+  margin: 0 1vw;
+}
+.main .second .other .other_2 .list .list_2 .score .blue .blue_image .image.data-v-8f22acf3 {
+  width: 8vw;
+  height: 8vw;
+  border-radius: 8vw;
+}
+.main .second .other .other_2 .list .list_2 .score .blue .blue_score.data-v-8f22acf3 {
+  font-size: var(--font16Size);
+  color: var(--fF0Color);
 }
 .scroll-view.data-v-8f22acf3 {
   position: absolute;

unpackage/dist/dev/mp-weixin/pages/home/components/team.js

@@ -66,7 +66,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
           return {
             a: item.logo || config.value.logoUrl,
             b: common_vendor.t(item.name || "暂无名称"),
-            c: common_vendor.t(item.label || "成员"),
+            c: common_vendor.t(item.label || "队长"),
             d: common_vendor.n(item.user_type == "0" ? "label_1" : "label_2"),
             e: common_vendor.t(item.activity || "暂无活动"),
             f: index,

unpackage/dist/dev/mp-weixin/pages/home/components/team.wxss

@@ -54,10 +54,10 @@
   border-radius: 2px;
 }
 .main .second .list .list_1 .right .name .label_1.data-v-47929ca4 {
-  background-color: var(--fF0Color);
+  background-color: var(--fFFColor);
 }
 .main .second .list .list_1 .right .name .label_2.data-v-47929ca4 {
-  background-color: var(--fFFColor);
+  background-color: var(--fF0Color);
 }
 .main .second .list .list_1 .right .other.data-v-47929ca4 {
   margin: 1vw 0 0 0;

unpackage/dist/dev/mp-weixin/pagesMy/basic/index.wxss

@@ -3,6 +3,8 @@
 .content.data-v-bf1a7b85 {
   display: flex;
   flex-direction: column;
+  width: 100vw;
+  height: 100vh;
   background-color: var(--footColor);
 }
 .content .one .icon.data-v-bf1a7b85 {