Browse Source

修改友谊赛

zs 1 năm trước cách đây
mục cha
commit
a5b76e8f95

+ 27 - 9
pagesHome/activity/info.vue

@@ -6,19 +6,22 @@
 			</view>
 			<view class="one_2">
 				<view class="left">
-					<image class="image" mode="aspectFill" :src="info.red_logo||config.logoUrl">
+					<image class="image" mode="aspectFill" :src="info?.redInfo?.logo||config.logoUrl">
 					</image>
-					<view class="name">{{info.red_name||'暂无红方名称'}}</view>
+					<view class="name">{{info?.redInfo?.name||'暂无红方名称'}}</view>
 				</view>
-				<view class="center">{{info.red_score||0}} : {{info.blue_score||0}}</view>
+				<view class="center">{{info.redScore||0}} : {{info.blueScore||0}}</view>
 				<view class="right">
-					<image class="image" mode="aspectFill" :src="info.blue_logo||config.logoUrl">
+					<image class="image" mode="aspectFill" :src="info?.blueInfo?.logo||config.logoUrl">
 					</image>
-					<view class="name">{{info.blue_name||'暂无蓝方名称'}}</view>
+					<view class="name">{{info?.blueInfo?.name||'暂无蓝方名称'}}</view>
 				</view>
 			</view>
-			<view class="one_3"> <text>{{getDayOfWeek(info.time)}}</text> {{info.time||'暂无时间'}} </view>
-			<view class="one_4"> <text>{{info.address||'暂无地点'}}</text> </view>
+			<view class="one_3">
+				<text>{{getDayOfWeek(info.startTime)}}</text>
+				{{info.time||'暂无时间'}}
+			</view>
+			<view class="one_4 textOne"><text>{{info?.matchInfo?.address||'暂无地点'}}</text> </view>
 		</view>
 		<view class="position">
 			<view class="two">
@@ -38,6 +41,7 @@
 </template>
 
 <script setup lang="ts">
+	import moment from 'moment';
 	import { getCurrentInstance, ref } from 'vue';
 	//该依赖已内置不需要单独安装
 	import { onLoad } from "@dcloudio/uni-app";
@@ -65,7 +69,21 @@
 	// 查询
 	const search = async () => {
 		if (id.value) {
-			console.log(id.value);
+			const res = await $api(`game/${id.value}`, 'GET', {});
+			if (res.code === 200) {
+				if (res.data) {
+					const date1 = moment(res.data.startTime).format('YYYY-MM-DD')
+					const date2 = moment(res.data.endTime).format('YYYY-MM-DD')
+					if (moment(date1).isSame(date2)) res.data.time = moment(res.data.startTime).format('MM-DD') + ' ' + moment(res.data.startTime).format('HH:mm') + '-' + moment(res.data.endTime).format('HH:mm');
+					else res.data.time = moment(res.data.startTime).format('MM-DD') + '/' + moment(res.data.endTime).format('MM-DD')
+					info.value = res.data
+				}
+			} else {
+				uni.showToast({
+					title: res.msg || '',
+					icon: 'error',
+				});
+			}
 		}
 	};
 	// 点击分页器
@@ -158,7 +176,7 @@
 
 			.one_4 {
 				text-align: center;
-				padding: 2vw;
+				margin: 2vw;
 
 				text {
 					font-size: var(--font14Size);

+ 18 - 6
pagesHome/create/components/match.vue

@@ -106,6 +106,7 @@
 </template>
 
 <script setup lang="ts">
+	import moment from 'moment';
 	import { ref, toRefs, getCurrentInstance, defineExpose } from 'vue';
 	//该依赖已内置不需要单独安装
 	import { onShow } from "@dcloudio/uni-app";
@@ -113,13 +114,13 @@
 	const $api = getCurrentInstance()?.appContext.config.globalProperties.$api;
 	const $apifile = getCurrentInstance()?.appContext.config.globalProperties.$apifile;
 	// 信息
-	const form = ref({ file: [], number: '5', type: '0', duration: '3', is_open: 'Y' });
+	const form = ref({ file: [], number: '5', type: '0', duration: '2.0', is_open: 'Y' });
 	// 对手名称
 	const opponent_name = ref('');
 	// 类型
 	const type_name = ref('足球');
 	// 人数
-	const number_name = ref('人制');
+	const number_name = ref('5人制');
 	// 是否公开
 	const open_name = ref('');
 	// 时长
@@ -182,7 +183,7 @@
 	};
 	// 是否公开选择器
 	const openChange = (e) => {
-		const data = numberList.value[e.detail.value]
+		const data = openList.value[e.detail.value]
 		if (data) {
 			open_name.value = data.dictLabel
 			form.value.is_open = data.dictValue
@@ -247,9 +248,20 @@
 			form.value.teamId = id.value
 			const arr = await $api(`friendship`, 'POST', form.value);
 			if (arr.code === 200) {
-				uni.navigateTo({
-					url: `/pagesHome/activity/info?id=${arr.data.id}`,
-				})
+				const data = {
+					matchId: arr.id,
+					type: '0',
+					red: form.value.teamId,
+					blue: form.value.opponent,
+					startTime: moment(form.value.date + ' ' + form.value.time).format("YYYY-MM-DD HH:mm"),
+					endTime: moment(form.value.startTime).add(form.value.duration, 'hours').format("YYYY-MM-DD HH:mm"),
+				}
+				const res = await $api(`game`, 'POST', data);
+				if (res.code === 200) {
+					uni.navigateTo({
+						url: `/pagesHome/activity/info?id=${res.id}`,
+					})
+				}
 			} else {
 				uni.showToast({
 					title: arr.msg,

+ 1 - 1
pagesHome/create/person.vue

@@ -17,7 +17,7 @@
 									{{item.name||'暂无名称'}}
 								</view>
 								<view class="other">
-									<view class="other_1">{{item.address||'未入驻'}}</view>
+									<view class="other_1">{{item.city||'未入驻'}}</view>
 									<view class="other_2">胜{{item.win||0}},平{{item.flat||0}},负{{item.burden||0}}</view>
 								</view>
 							</view>

+ 55 - 17
pagesHome/team/info.vue

@@ -40,7 +40,7 @@
 				</view>
 				<view class="thr_2">
 					<view class="fraction">
-						<view class="top">{{info.score||0}}</view>
+						<view class="top">{{total||0}}</view>
 						<view class="bottom">总比赛</view>
 					</view>
 					<view class="circle">
@@ -74,31 +74,37 @@
 				<view class="four_2">
 					<view class="list" v-for="(item, index) in list" :key="index" @tap="toActivity(item)">
 						<view class="list_1">
-							<view class="date">{{item.date||'暂无日期'}}</view>
+							<view class="date">
+								{{moment(item.startTime).format('MM-DD')||'暂无日期'}}
+								{{getDayOfWeek(item.startTime)}}
+							</view>
 							<view class="status"
-								:class="[item.status=='0'?'status0':item.status=='1'?'status1':'status2']">
-								{{item.status_name||'暂无状态'}}
+								:class="[item.status=='0'?'status0':item.status=='1'?'status1':item.status=='2'?'status2':'status3']">
+								{{getStatus(item.status)}}
 							</view>
 						</view>
 						<view class="list_2">
-							<view class="name">{{item.name||'暂无活动名称'}}</view>
+							<view class="name" v-if="item.type=='0'">{{item?.matchInfo?.title||'友谊赛'}}</view>
+							<view class="name" v-else>{{item?.leagueInfo?.title||'联赛'}}</view>
 							<view class="score">
 								<view class="red">
-									<view class="red_name">{{item.red_name||'暂无红方名称'}}</view>
+									<view class="red_name">{{item?.redInfo?.name||'暂无红方名称'}}</view>
 									<view class="red_image">
-										<image class="image" mode="aspectFill" :src="item.red_logo||config.logoUrl">
+										<image class="image" mode="aspectFill"
+											:src="item?.redInfo?.logo||config.logoUrl">
 										</image>
 									</view>
-									<view class="red_score">{{item.red_score||0}}</view>
+									<view class="red_score">{{item.redScore||0}}</view>
 								</view>
 								<view class="center">:</view>
 								<view class="blue">
-									<view class="blue_score">{{item.blue_score||0}}</view>
+									<view class="blue_score">{{item.blueScore||0}}</view>
 									<view class="blue_image">
-										<image class="image" mode="aspectFill" :src="item.blue_logo||config.logoUrl">
+										<image class="image" mode="aspectFill"
+											:src="item?.blueInfo?.logo||config.logoUrl">
 										</image>
 									</view>
-									<view class="blue_name">{{item.blue_name||'暂无蓝方名称'}}</view>
+									<view class="blue_name">{{item?.blueInfo?.name||'暂无蓝方名称'}}</view>
 								</view>
 							</view>
 						</view>
@@ -110,6 +116,7 @@
 </template>
 
 <script setup lang="ts">
+	import moment from 'moment';
 	import { getCurrentInstance, ref } from 'vue';
 	import circle from './components/circle.vue';
 	//该依赖已内置不需要单独安装
@@ -139,16 +146,26 @@
 	const id = ref('');
 	// 基本信息
 	const config = ref({ logoUrl: '' });
+	// 字典表
+	const statusList = ref([]);
 	onLoad(async (options) => {
 		id.value = options && options.id
 		await searchConfig();
-		await search();
 		await searchOther();
+		await search();
+		await searchGame()
 	})
 	// config信息
 	const searchConfig = async () => {
 		config.value = uni.getStorageSync('config');
 	};
+	// 查询其他信息
+	const searchOther = async () => {
+		let res;
+		// 比赛状态
+		res = await $api(`dict/data/list`, 'GET', { dictType: 'sys_game_status', status: '0' });
+		if (res.code === 200 && res.total > 0) statusList.value = res.rows
+	};
 	// 查询
 	const search = async () => {
 		if (id.value) {
@@ -164,10 +181,10 @@
 		}
 	};
 	// 查询
-	const searchOther = async () => {
+	const searchGame = async () => {
 		if (id.value) {
-			const res = await $api('friendship/list', 'GET', {
-				teamId: id.value
+			const res = await $api('game/list', 'GET', {
+				// teamId: id.value
 			});
 			if (res.code === 200) {
 				list.value = res.rows
@@ -202,7 +219,7 @@
 	// 活动详情
 	const toActivity = (item : any) => {
 		uni.navigateTo({
-			url: `/pagesHome/activity/info?id=${item._id || item.id}&name=${item.name}`,
+			url: `/pagesHome/activity/info?id=${item._id || item.id}&name=${item.name || ''}`,
 		})
 	};
 	// 创建
@@ -211,6 +228,22 @@
 			url: `/pagesHome/create/index?id=${id.value}`,
 		})
 	};
+	// 日期换算星期几
+	const getDayOfWeek = (dateString) => {
+		if (dateString) {
+			const date = new Date(dateString);
+			const dayOfWeek = date.getDay();
+			const weekdays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
+			return weekdays[dayOfWeek];
+		} else return '暂无日期';
+	};
+	// 换算状态
+	const getStatus = (value) => {
+		if (value) {
+			const data = statusList.value.find(i => i.dictValue == value)
+			if (data) return data.dictLabel
+		} else return '暂无状态';
+	};
 </script>
 <style lang="scss" scoped>
 	.content {
@@ -414,7 +447,7 @@
 
 							.status0 {
 								color: var(--mainColor);
-								background-color: var(--fF0Color);
+								background-color: var(--f35BColor);
 							}
 
 							.status1 {
@@ -423,6 +456,11 @@
 							}
 
 							.status2 {
+								color: var(--mainColor);
+								background-color: var(--fF0Color);
+							}
+
+							.status3 {
 								color: var(--f99Color);
 								background-color: var(--f9Color);
 							}

+ 1 - 1
uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat.vue

@@ -26,7 +26,7 @@
 			},
 			locale: {
 				type: String,
-				default: 'zh',
+				default: 'zh-cn',
 			},
 			threshold: {
 				type: Array,

+ 27 - 10
unpackage/dist/dev/mp-weixin/pagesHome/activity/info.js

@@ -12,7 +12,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "info",
   setup(__props) {
     var _a;
-    (_a = common_vendor.getCurrentInstance()) == null ? void 0 : _a.appContext.config.globalProperties.$api;
+    const $api = (_a = common_vendor.getCurrentInstance()) == null ? void 0 : _a.appContext.config.globalProperties.$api;
     const config = common_vendor.ref({ logoUrl: "" });
     const info = common_vendor.ref({});
     const list = common_vendor.ref(["出勤报名", "数据统计"]);
@@ -31,7 +31,23 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     };
     const search = async () => {
       if (id.value) {
-        console.log(id.value);
+        const res = await $api(`game/${id.value}`, "GET", {});
+        if (res.code === 200) {
+          if (res.data) {
+            const date1 = common_vendor.hooks(res.data.startTime).format("YYYY-MM-DD");
+            const date2 = common_vendor.hooks(res.data.endTime).format("YYYY-MM-DD");
+            if (common_vendor.hooks(date1).isSame(date2))
+              res.data.time = common_vendor.hooks(res.data.startTime).format("MM-DD") + " " + common_vendor.hooks(res.data.startTime).format("HH:mm") + "-" + common_vendor.hooks(res.data.endTime).format("HH:mm");
+            else
+              res.data.time = common_vendor.hooks(res.data.startTime).format("MM-DD") + "/" + common_vendor.hooks(res.data.endTime).format("MM-DD");
+            info.value = res.data;
+          }
+        } else {
+          common_vendor.index.showToast({
+            title: res.msg || "",
+            icon: "error"
+          });
+        }
       }
     };
     const onClickItem = (e) => {
@@ -48,18 +64,19 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         return "暂无日期";
     };
     return (_ctx, _cache) => {
+      var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j;
       return {
         a: common_vendor.t(info.value.number || 0),
         b: common_vendor.t(info.value.wheel || 0),
-        c: info.value.red_logo || config.value.logoUrl,
-        d: common_vendor.t(info.value.red_name || "暂无红方名称"),
-        e: common_vendor.t(info.value.red_score || 0),
-        f: common_vendor.t(info.value.blue_score || 0),
-        g: info.value.blue_logo || config.value.logoUrl,
-        h: common_vendor.t(info.value.blue_name || "暂无蓝方名称"),
-        i: common_vendor.t(getDayOfWeek(info.value.time)),
+        c: ((_b = (_a2 = info.value) == null ? void 0 : _a2.redInfo) == null ? void 0 : _b.logo) || config.value.logoUrl,
+        d: common_vendor.t(((_d = (_c = info.value) == null ? void 0 : _c.redInfo) == null ? void 0 : _d.name) || "暂无红方名称"),
+        e: common_vendor.t(info.value.redScore || 0),
+        f: common_vendor.t(info.value.blueScore || 0),
+        g: ((_f = (_e = info.value) == null ? void 0 : _e.blueInfo) == null ? void 0 : _f.logo) || config.value.logoUrl,
+        h: common_vendor.t(((_h = (_g = info.value) == null ? void 0 : _g.blueInfo) == null ? void 0 : _h.name) || "暂无蓝方名称"),
+        i: common_vendor.t(getDayOfWeek(info.value.startTime)),
         j: common_vendor.t(info.value.time || "暂无时间"),
-        k: common_vendor.t(info.value.address || "暂无地点"),
+        k: common_vendor.t(((_j = (_i = info.value) == null ? void 0 : _i.matchInfo) == null ? void 0 : _j.address) || "暂无地点"),
         l: common_vendor.o(onClickItem),
         m: common_vendor.p({
           current: current.value,

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesHome/activity/info.wxml


+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesHome/activity/info.wxss

@@ -64,7 +64,7 @@
 }
 .content .one .one_4.data-v-24c37ea1 {
   text-align: center;
-  padding: 2vw;
+  margin: 2vw;
 }
 .content .one .one_4 text.data-v-24c37ea1 {
   font-size: var(--font14Size);

+ 17 - 6
unpackage/dist/dev/mp-weixin/pagesHome/create/components/match.js

@@ -24,10 +24,10 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     const props = __props;
     const $api = (_a = common_vendor.getCurrentInstance()) == null ? void 0 : _a.appContext.config.globalProperties.$api;
     const $apifile = (_b = common_vendor.getCurrentInstance()) == null ? void 0 : _b.appContext.config.globalProperties.$apifile;
-    const form = common_vendor.ref({ file: [], number: "5", type: "0", duration: "3", is_open: "Y" });
+    const form = common_vendor.ref({ file: [], number: "5", type: "0", duration: "2.0", is_open: "Y" });
     const opponent_name = common_vendor.ref("");
     const type_name = common_vendor.ref("足球");
-    const number_name = common_vendor.ref("人制");
+    const number_name = common_vendor.ref("5人制");
     const open_name = common_vendor.ref("");
     const duration_name = common_vendor.ref("2.0小时");
     common_vendor.ref({
@@ -75,7 +75,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       }
     };
     const openChange = (e) => {
-      const data = numberList.value[e.detail.value];
+      const data = openList.value[e.detail.value];
       if (data) {
         open_name.value = data.dictLabel;
         form.value.is_open = data.dictValue;
@@ -139,9 +139,20 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         form.value.teamId = id.value;
         const arr = await $api(`friendship`, "POST", form.value);
         if (arr.code === 200) {
-          common_vendor.index.navigateTo({
-            url: `/pagesHome/activity/info?id=${arr.data.id}`
-          });
+          const data = {
+            matchId: arr.id,
+            type: "0",
+            red: form.value.teamId,
+            blue: form.value.opponent,
+            startTime: common_vendor.hooks(form.value.date + " " + form.value.time).format("YYYY-MM-DD HH:mm"),
+            endTime: common_vendor.hooks(form.value.startTime).add(form.value.duration, "hours").format("YYYY-MM-DD HH:mm")
+          };
+          const res = await $api(`game`, "POST", data);
+          if (res.code === 200) {
+            common_vendor.index.navigateTo({
+              url: `/pagesHome/activity/info?id=${res.id}`
+            });
+          }
         } else {
           common_vendor.index.showToast({
             title: arr.msg,

+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesHome/create/person.js

@@ -109,7 +109,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.address || "未入驻"),
+            c: common_vendor.t(item.city || "未入驻"),
             d: common_vendor.t(item.win || 0),
             e: common_vendor.t(item.flat || 0),
             f: common_vendor.t(item.burden || 0),

+ 52 - 20
unpackage/dist/dev/mp-weixin/pagesHome/team/info.js

@@ -19,15 +19,23 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     const info = common_vendor.ref({});
     const id = common_vendor.ref("");
     const config = common_vendor.ref({ logoUrl: "" });
+    const statusList = common_vendor.ref([]);
     common_vendor.onLoad(async (options) => {
       id.value = options && options.id;
       await searchConfig();
-      await search();
       await searchOther();
+      await search();
+      await searchGame();
     });
     const searchConfig = async () => {
       config.value = common_vendor.index.getStorageSync("config");
     };
+    const searchOther = async () => {
+      let res;
+      res = await $api(`dict/data/list`, "GET", { dictType: "sys_game_status", status: "0" });
+      if (res.code === 200 && res.total > 0)
+        statusList.value = res.rows;
+    };
     const search = async () => {
       if (id.value) {
         const res = await $api(`team/${id.value}`, "GET", {});
@@ -42,10 +50,10 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         }
       }
     };
-    const searchOther = async () => {
+    const searchGame = async () => {
       if (id.value) {
-        const res = await $api("friendship/list", "GET", {
-          teamId: id.value
+        const res = await $api("game/list", "GET", {
+          // teamId: id.value
         });
         if (res.code === 200) {
           list.value = res.rows;
@@ -76,7 +84,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     };
     const toActivity = (item) => {
       common_vendor.index.navigateTo({
-        url: `/pagesHome/activity/info?id=${item._id || item.id}&name=${item.name}`
+        url: `/pagesHome/activity/info?id=${item._id || item.id}&name=${item.name || ""}`
       });
     };
     const toSave = () => {
@@ -84,6 +92,23 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         url: `/pagesHome/create/index?id=${id.value}`
       });
     };
+    const getDayOfWeek = (dateString) => {
+      if (dateString) {
+        const date = new Date(dateString);
+        const dayOfWeek = date.getDay();
+        const weekdays = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
+        return weekdays[dayOfWeek];
+      } else
+        return "暂无日期";
+    };
+    const getStatus = (value) => {
+      if (value) {
+        const data = statusList.value.find((i) => i.dictValue == value);
+        if (data)
+          return data.dictLabel;
+      } else
+        return "暂无状态";
+    };
     return (_ctx, _cache) => {
       return {
         a: info.value.logo || "/static/qiudui.png",
@@ -118,7 +143,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             e: common_vendor.o(($event) => toInfo(item), index)
           };
         }),
-        k: common_vendor.t(info.value.score || 0),
+        k: common_vendor.t(total.value || 0),
         l: common_vendor.p({
           pro: 16 / 100,
           border_back_color: "#f1f1f1",
@@ -152,20 +177,27 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
           route: "/pagesHome/team/album"
         })),
         r: 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) => toActivity(item), index)
-          };
+          var _a2, _b, _c, _d, _e, _f;
+          return common_vendor.e({
+            a: common_vendor.t(common_vendor.unref(common_vendor.hooks)(item.startTime).format("MM-DD") || "暂无日期"),
+            b: common_vendor.t(getDayOfWeek(item.startTime)),
+            c: common_vendor.t(getStatus(item.status)),
+            d: common_vendor.n(item.status == "0" ? "status0" : item.status == "1" ? "status1" : item.status == "2" ? "status2" : "status3"),
+            e: item.type == "0"
+          }, item.type == "0" ? {
+            f: common_vendor.t(((_a2 = item == null ? void 0 : item.matchInfo) == null ? void 0 : _a2.title) || "友谊赛")
+          } : {
+            g: common_vendor.t(((_b = item == null ? void 0 : item.leagueInfo) == null ? void 0 : _b.title) || "联赛")
+          }, {
+            h: common_vendor.t(((_c = item == null ? void 0 : item.redInfo) == null ? void 0 : _c.name) || "暂无红方名称"),
+            i: ((_d = item == null ? void 0 : item.redInfo) == null ? void 0 : _d.logo) || config.value.logoUrl,
+            j: common_vendor.t(item.redScore || 0),
+            k: common_vendor.t(item.blueScore || 0),
+            l: ((_e = item == null ? void 0 : item.blueInfo) == null ? void 0 : _e.logo) || config.value.logoUrl,
+            m: common_vendor.t(((_f = item == null ? void 0 : item.blueInfo) == null ? void 0 : _f.name) || "暂无蓝方名称"),
+            n: index,
+            o: common_vendor.o(($event) => toActivity(item), index)
+          });
         })
       };
     };

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesHome/team/info.wxml


+ 5 - 1
unpackage/dist/dev/mp-weixin/pagesHome/team/info.wxss

@@ -168,13 +168,17 @@
 }
 .content .position .four .four_2 .list .list_1 .status0.data-v-b14ffc51 {
   color: var(--mainColor);
-  background-color: var(--fF0Color);
+  background-color: var(--f35BColor);
 }
 .content .position .four .four_2 .list .list_1 .status1.data-v-b14ffc51 {
   color: var(--mainColor);
   background-color: var(--fFFColor);
 }
 .content .position .four .four_2 .list .list_1 .status2.data-v-b14ffc51 {
+  color: var(--mainColor);
+  background-color: var(--fF0Color);
+}
+.content .position .four .four_2 .list .list_1 .status3.data-v-b14ffc51 {
   color: var(--f99Color);
   background-color: var(--f9Color);
 }