From 035ed7a28dc571b638e193223927ddef1b0ffec5 Mon Sep 17 00:00:00 2001
From: ihzero <ihzero@163.com>
Date: Mon, 24 Jun 2024 08:00:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/xinjiang_guess.js                     |  4 ++
 src/components/quiz/item-new.vue              | 56 ++++++++++++++++++
 .../components => components/quiz}/item.vue   |  0
 src/pages.json                                |  5 ++
 src/pages/index/index.vue                     | 30 +++++++++-
 src/pages/quiz/log.vue                        |  3 -
 src/pages/quiz/logs.vue                       | 57 +++++++++++++++++++
 7 files changed, 149 insertions(+), 6 deletions(-)
 create mode 100644 src/components/quiz/item-new.vue
 rename src/{pages/quiz/components => components/quiz}/item.vue (100%)
 delete mode 100644 src/pages/quiz/log.vue
 create mode 100644 src/pages/quiz/logs.vue

diff --git a/src/api/xinjiang_guess.js b/src/api/xinjiang_guess.js
index 6715f4f..ea90b1c 100644
--- a/src/api/xinjiang_guess.js
+++ b/src/api/xinjiang_guess.js
@@ -150,4 +150,8 @@ export const submitUploadAvatar = (params, config = {}) => {
 // 用户-更新个人资料
 export const submitUploadUserInfo = (params, config = {}) => {
 	return http.post(`/api/miniprogram/user/update-info`, params, { ...config });
+}
+// 最新竞猜记录
+export const getLatestGameLogs = () => {
+	return http.get(`/api/miniprogram/latest-game-logs`);
 }
\ No newline at end of file
diff --git a/src/components/quiz/item-new.vue b/src/components/quiz/item-new.vue
new file mode 100644
index 0000000..86e240a
--- /dev/null
+++ b/src/components/quiz/item-new.vue
@@ -0,0 +1,56 @@
+<template>
+  <view>
+    <view class="flex items-center py-2" @click="$goToPage({url:'pages/quiz/logs', params: { activity_id: data.activity_id,user_id: data.user_id}})">
+      <view class="w-84rpx h-84rpx rounded-full flex-none">
+        <up-avatar size="84rpx" mode="aspectFit" :src="data.avatar"></up-avatar>
+      </view>
+      <view class="ml-10rpx flex-1">
+        <view class="flex-1 flex justify-between items-center">
+          <view class="text-28rpx text-primary">{{ data.nick_name }}</view>
+          <view class="text-xs text-hex-999">{{ data.history }}</view>
+        </view>
+        <view class="flex items-center text-sm">
+          <view class="flex items-center flex-1">
+            <view>猜</view>
+            <view class="px-3">
+              {{ data.game_home_field }} VS {{ data.game_away }}
+            </view>
+            <view>{{ data.score }}</view>
+          </view>
+          <view :style="{color:currentStatus.color}">{{ currentStatus.label }}</view>
+        </view>
+      </view>
+    </view>
+    <up-line dashed></up-line>
+  </view>
+</template>
+<script setup>
+import { computed } from 'vue'
+const props = defineProps({
+  data: {
+    item: Object,
+  },
+})
+
+const status = [
+  {
+    value: 0,
+    label: '未公布',
+    color: '#1b2f85',
+  },
+  {
+    value: 1,
+    label: '猜中了',
+    color: '#e91f35',
+  },
+  {
+    value: 2,
+    label: '未猜中',
+    color: '#808080',
+  },
+]
+
+const currentStatus = computed(() =>
+  status.find((e) => e.value == props.data.status)
+)
+</script>
diff --git a/src/pages/quiz/components/item.vue b/src/components/quiz/item.vue
similarity index 100%
rename from src/pages/quiz/components/item.vue
rename to src/components/quiz/item.vue
diff --git a/src/pages.json b/src/pages.json
index 932b998..34d73e5 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -43,6 +43,11 @@
       "style": {
         "navigationBarTitleText": ""
       }
+    },{
+      "path":"pages/quiz/logs",
+      "style": {
+        "navigationBarTitleText": "活动详情"
+      }
     }
   ],
   "subPackages": [
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index ffda6c4..bd2bfc6 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -9,7 +9,7 @@
 				<up-swiper class="bg" :radius="0" height="200" :list="homeBannerList"
 					:displayMultipleItems="displayMultipleItems" keyName="url" @click="clickHomeBanner"></up-swiper>
 			</view>
-			<view class="home-content" v-if="gameInfo || articleList.length">
+			<view class="home-content" v-if="gameInfo || articleList.length ||  gameLogs.length">
 				<image class="bg" mode="widthFix" :src="`${config.baseUrl}/images/mini-bg.jpg`"></image>
 
 				<view class="today-guess-box" v-if="gameInfo">
@@ -75,6 +75,17 @@
 						</view>
 					</view>
 				</view>
+
+				<view class="news-box">
+					<view class="news-title-box">
+						<text class="title">最新竞猜</text>
+						<!-- <text class="more" @click="$goToPage('pages/news/news', true)">查看更多</text> -->
+					</view>
+					<view v-for="(item,i) in gameLogs" :key="i"> 
+						<QuizItem :data="item"></QuizItem>
+					</view>
+				</view>
+
 			</view>
 
 			<view class="guess-model" v-if="gameInfo">
@@ -203,9 +214,10 @@
 <script setup>
 import { ref, getCurrentInstance } from 'vue';
 import config from '@/common/config'
-import { queryAds, queryLatestgame, queryRecommendArticles, submitGuess } from '@/api/xinjiang_guess';
+import { queryAds, queryLatestgame, queryRecommendArticles, submitGuess ,getLatestGameLogs} from '@/api/xinjiang_guess';
 import useAuthUser from '@/utils/hooks/useAuthUser';
 import jumpFun from '@/utils/jump.js'
+import QuizItem from '@/components/quiz/item-new.vue' 
 const vm = getCurrentInstance();
 
 const loading = ref(false);
@@ -224,6 +236,8 @@ const submitGuessLoading = ref(false);
 const articleListLoading = ref(false);
 const articleList = ref([]);
 
+const gameLogs = ref([])
+
 function clickHomeBanner(index) {
 	// if (!homeBannerList.value.length) {
 	// 	return;
@@ -334,6 +348,15 @@ async function getRecommendArticles(params) {
 	}
 }
 
+async function getNewQuiz(){
+	try {
+		const resData = await getLatestGameLogs()
+		gameLogs.value = resData.data?.list || [];
+	} catch (error) {
+		console.error(error);
+	}
+}
+
 async function submitGuessResult() {
 	try {
 		uni.showLoading({
@@ -370,7 +393,8 @@ function getData(page = 1, per_page = 10) {
 			setTimeout(async () => {
 				await getHomeBanner();
 				await getLatestGuess();
-				await getRecommendArticles();
+				// await getRecommendArticles();
+				getNewQuiz()
 				resolve();
 			}, 1500);
 		} catch (err) {
diff --git a/src/pages/quiz/log.vue b/src/pages/quiz/log.vue
deleted file mode 100644
index 5dc0348..0000000
--- a/src/pages/quiz/log.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-  <view></view>
-</template>
\ No newline at end of file
diff --git a/src/pages/quiz/logs.vue b/src/pages/quiz/logs.vue
new file mode 100644
index 0000000..7b7d69d
--- /dev/null
+++ b/src/pages/quiz/logs.vue
@@ -0,0 +1,57 @@
+<template>
+  <view class="">
+    <mescroll-body
+      @init="mescrollInit"
+      @down="downCallback"
+      @up="upCallback"
+      :up="{
+        empty: {
+          use: false,
+        },
+      }"
+    >
+    <view>
+      <view class="h-188px w-full" v-if="detail.cover">
+        <image class="w-full" mode="aspectFill" :src="detail.cover" />
+      </view>
+      <view class="min-h-screen relative bg-hex-1b2f85 p-3">
+        <image class="absolute left-0 w-full top-0" mode="widthFix" :src="`${config.baseUrl}/images/mini-bg.jpg`"></image>
+        <view class="bg-white rounded-12px relative">
+            1111
+        </view>
+      </view>
+    </view>
+    </mescroll-body>
+  </view>
+</template>
+<script setup>
+import { onPageScroll, onReachBottom, onLoad } from '@dcloudio/uni-app'
+import useMescroll from '@/uni_modules/mescroll-uni/hooks/useMescroll.js'
+import { queryActivitiesDetail } from '@/api/xinjiang_guess'
+import config from '@/common/config'
+import { ref } from 'vue'
+const activityId = ref(null)
+const userId = ref(null)
+const detail = ref({})
+const { mescrollInit, downCallback, getMescroll } = useMescroll(
+  onPageScroll,
+  onReachBottom
+)
+
+onLoad((query) => {
+  activityId.value = query.activity_id
+  userId.value = query.user_id
+})
+
+const upCallback = (mescroll) => {
+  const { size, num } = mescroll
+  if (num === 1) getActiveDetail()
+}
+
+const getActiveDetail = async () => {
+  try {
+    const resData = await queryActivitiesDetail({ id: activityId.value })
+    detail.value = resData.data
+  } catch (error) {}
+}
+</script>