From 22c039a8eb658cea9b57939c1a51c1d4c0f5e022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E6=80=AA?= <690927457@qq.com>
Date: Wed, 1 Nov 2023 00:33:57 +0800
Subject: [PATCH] =?UTF-8?q?2023.11.1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                        |  13 +++-
 api/index.js                   |  13 ++--
 api/request.js                 |  12 +++-
 components/mySwiper.vue        |   4 +-
 config/index.js                |   2 +-
 pages.json                     |  21 +++++++
 pages/index/done.vue           |  84 +++++++++++++++++++++++++
 pages/index/index.vue          | 108 +++++++++++++++++++++------------
 pages/index/todo.vue           |  84 +++++++++++++++++++++++++
 pages/index/visionList.vue     | 104 +++++++++++++++++++++++++++++++
 pages/index/visionTest.vue     |  17 +++++-
 pages/user/index.vue           |  13 +++-
 pages/user/star.vue            |  22 ++++++-
 pages/wikipedia/detail.vue     |  42 +++++++++++--
 pages/wikipedia/index.vue      |  45 ++++++--------
 static/default_icon.png        | Bin 0 -> 7641 bytes
 static/default_search_icon.png | Bin 0 -> 16401 bytes
 store/index.js                 |   1 +
 18 files changed, 497 insertions(+), 88 deletions(-)
 create mode 100644 pages/index/done.vue
 create mode 100644 pages/index/todo.vue
 create mode 100644 pages/index/visionList.vue
 create mode 100644 static/default_icon.png
 create mode 100644 static/default_search_icon.png

diff --git a/App.vue b/App.vue
index 0fe4984..e8346d4 100644
--- a/App.vue
+++ b/App.vue
@@ -20,10 +20,13 @@
 	onLaunch((e) => {
 		 console.log('App onLaunch')
 		 let userInfo = uni.getStorageSync('userInfo')
+		 let operation_info = uni.getStorageSync('operation_info')
 		 if(userInfo) { // 已经登录过
-			
 			 store.userInfo = userInfo
 		 }
+		 if(operation_info) {
+			 store.operation_info = operation_info
+		 }
 	})
 </script>
 <style lang="scss">
@@ -50,6 +53,14 @@
 	  -webkit-box-orient: vertical;
 	  /* min-height: 38rpx; */
 	}
+	.text-ellipsis-2{ /*超出部分省略号 双行*/
+	  overflow:hidden;
+	  text-overflow: ellipsis;
+	  -webkit-line-clamp: 2;
+	  display: -webkit-box;
+	  -webkit-box-orient: vertical;
+	  /* min-height: 38rpx; */
+	}
 	.icon-custom{
 		width: 32rpx;
 		height: 32rpx;
diff --git a/api/index.js b/api/index.js
index 1a55f8d..d4da87a 100644
--- a/api/index.js
+++ b/api/index.js
@@ -3,19 +3,22 @@ import net from './request.js';
 // import store from '../store';
 const API = {
 	//微信登录
-	getToken: data => net.POST('/login/token',data), // 获取token
+	getToken: data => net.POST('/login/token',data,true,{"Content-Type":"application/x-www-form-urlencoded"}), // 获取token
 	wx_login: (data,userId) => net.POST('/user/binding/wechat',data,true,{"userId":userId}), // 微信登录
 	// upload: (data) => net.POST('/user/upload',data), // 文件上传
-	userinfoUpdae:data => net.PUT('/user/info',data), // 更新用户信息
+	userinfoUpdae:data => net.PUT('/user/info',data,true,{"Content-Type":"application/x-www-form-urlencoded"}), // 更新用户信息
 	// 首页
 	getHospitalList:data => net.GET('/hospital/list',data), // 获取医院信息
 	saveVision:data => net.POST("/vision",data),// 保存视力测试结果
 	getLbtList:data => net.GET("/banner/list",data),// 获取轮播图
 	hospital:data => net.PUT("/user/hospital",data),// 修改医院信息
+	getTodoist:data => net.GET("/user/todo",data),// 获取待办事项
+	getVisionList:data => net.GET("/vision",data),// 获取测试记录
 	// 百科
 	getArticleList:data => net.GET("/article/list",data),// 百科列表
-	getArticleDetail:data => net.GET("/article/"+data.id),// 百科列表
-	
+	getArticleDetail:data => net.GET("/article/"+data.id),// 文章详情
+	// 我的
+	getStarList:data => net.GET("/favorite/list",data),// 收藏列表
 	/* 
 	 首页信息
 	 */
@@ -407,7 +410,7 @@ const API = {
 	transfer: data => net.POST('/api/v1/wxpay/transfer', data),
 	
 	// 获取我的收藏分页列表
-	getStarList: data => net.POST('/api/v1/favorite/get', data),
+	// getStarList: data => net.POST('/api/v1/favorite/get', data),
 	// 取消收藏
 	cancelStar: data => net.DELETE('/api/v1/favorite',data),
 	//添加收藏
diff --git a/api/request.js b/api/request.js
index 7dc2c7b..aa920fb 100644
--- a/api/request.js
+++ b/api/request.js
@@ -19,21 +19,27 @@ export default {
 		let token = uni.getStorageSync('access_token') || 'Basic ZGV2OmRldjEyMw==';
 		const headers = {
 			// "Content-Type": "application/json",
-			"Content-Type": "application/x-www-form-urlencoded",
+			// "Content-Type": "application/x-www-form-urlencoded",
 			"Authorization": token,
 			"x-token": token,
 			"token":token,
 			// "X-Forwarded-For":'client_ip'
 			// 'Referer':'twzxjy.com'
 		}
+		if(!header) {
+			headers["Content-Type"] = "application/json"
+		}
+		if(header && !header["Content-Type"]) {
+			header["Content-Type"] = "application/x-www-form-urlencoded"
+		}
 		var pages = getCurrentPages();
 		var page = pages[pages.length - 1];
 		return uni.request({
 			url: config.baseUrl + url,
 			method,
 			header: {
-				...header,
-				...headers
+				...headers,
+				...header
 			},
 			data
 		}).then(res => {
diff --git a/components/mySwiper.vue b/components/mySwiper.vue
index c1811ce..3f426ca 100644
--- a/components/mySwiper.vue
+++ b/components/mySwiper.vue
@@ -21,7 +21,7 @@
 	function lbtFunc(item) {
 		// 新版数据结构的跳转形式
 		uni.navigateTo({
-			url:item.url
+			url:item.link
 		});
 		return
 		
@@ -47,7 +47,7 @@
 				<swiper-item @click="lbtFunc(item)" v-for="(item,i) in lbt_list">
 					<view class="swiper-item uni-bg-red">
 						<!-- <img style="width: 100%;" :src="item.url" alt=""> -->
-						<image :src="item.image" style="width: 100%;" mode="widthFix"></image>
+						<image :src="item.imgUrl" style="width: 100%;" mode="widthFix"></image>
 					</view>
 				</swiper-item>
 			</swiper>
diff --git a/config/index.js b/config/index.js
index 37bd06b..c0cbb82 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,6 +1,6 @@
 // isdev 为 true 表示开发环境 false 表示发布环境
 const isdev = true;
-const baseUrl = isdev ? 'http://f968894.r2.cpolar.top' : 'http://eb467b6.r19.cpolar.top';// 办公室接口 & 测试环境
+const baseUrl = isdev ? 'http://410fed99.r6.cpolar.top' : 'http://eb467b6.r19.cpolar.top';// 办公室接口 & 测试环境
 // const baseUrl = isdev ? 'http://192.168.1.133:8899' : 'https://api.gwkjxb.com';// 办公室接口 & 正式环境
 // const baseUrl = 'https://api.gwkjxb.com';// 正式环境（由于本地测试后台没有启动，暂时通用正式服）
 
diff --git a/pages.json b/pages.json
index 964c938..71c2f7e 100644
--- a/pages.json
+++ b/pages.json
@@ -60,6 +60,27 @@
 			"style": {
 				"navigationBarTitleText": "视力测试"
 			}
+		},
+		{
+			"path": "pages/index/todo",
+			"style": {
+				"navigationBarTitleText": "待办事项",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/index/done",
+			"style": {
+				"navigationBarTitleText": "完成事项",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/index/visionList",
+			"style": {
+				"navigationBarTitleText": "测试记录",
+				"enablePullDownRefresh": true
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/index/done.vue b/pages/index/done.vue
new file mode 100644
index 0000000..8e43edf
--- /dev/null
+++ b/pages/index/done.vue
@@ -0,0 +1,84 @@
+<script setup>
+	// 引入依赖
+	import uniDatetimePicker from '@/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue' 
+	import uniEasyinput from '@/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue' 
+	import { onLoad,onPullDownRefresh,onReachBottom } from "@dcloudio/uni-app"
+	// import mySwiper from "@/components/mySwiper.vue"
+	import {ref,onMounted,nextTick,watch} from "vue"
+	import api from '@/api/index.js'
+	import util from "@/utils/index.js"
+	import {useStore} from '@/store/index.js'
+	// import uniIcons from '@/uni_modules/uni-icons/components/uni-icons/uni-icons.vue' 
+	const store = useStore()
+	// 生命周期
+	onLoad((e) => {
+		getList()
+	})
+	onPullDownRefresh(()=> { // 下拉刷新
+		init()
+		getList()
+	})
+	onReachBottom(() => { // 上滑触底
+		queryParams.value.page++	
+		getList()
+	})
+	// 变量
+	const list = ref([])
+	const queryParams = ref({
+		page:1,
+		pageSize:10,
+		isFinish:1
+	})
+	// 函数
+	function init(){
+		list.value = []
+		queryParams.value.page = 1
+		queryParams.value.pageSize = 10
+	}
+	async function getList() {
+		const res = await api.getTodoist(queryParams.value)
+		if(res.code === 0) {
+			if(res.data && res.data.length > 0) {
+				list.value.push(...res.data)
+			}
+			else{
+				queryParams.value.page--
+			}
+		}
+		else{
+			uni.showToast({
+				title:"获取失败",
+				icon:"error",
+				duration:2000
+			})
+		}
+	}
+</script>
+<template>
+	<view class="todoBox page-box">
+		<view class="td-item" v-for="(item,i) in list">
+			<view class="td-content text-ellipsis-2">
+				{{item.content}}
+			</view>
+			<view class="td-info small-text">
+				{{util.timestampToDate(item.CreatedAt)}}
+			</view>
+		</view>
+	</view>
+</template>
+<style scoped lang="scss">
+	.todoBox{
+		padding: 20rpx;
+		.td-item{
+			padding: 20rpx 0;
+			border-bottom: 2rpx solid #eaeaea;
+			margin-bottom: 20rpx;
+			.td-content{
+				padding-bottom:20rpx;
+			}
+			.td-info{
+				text-align: right;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1755bab..716d171 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -14,7 +14,6 @@
 		if(store.userInfo && !store.operation_info) { //登录过 且 未填写手术信息
 			// getHospitalList()		
 			setTimeout(()=>{
-				// console.log(inputDialog.value)
 				inputDialog.value.open()
 			},0)
 		}
@@ -29,40 +28,22 @@
 	const blur_h = ref(0)
 	const surgery_time = ref(null) // 手术时间
 	const isSurgery = ref(-1) //是否已经手术 0为手术，1已经手术
-	const lbt_list = ref([
-		{
-			banner_name: "首页轮播2",
-			createtime: 1694851490,
-			deletetime: null,
-			id: 6,
-			image: "http://niunai.zhitou1688.com/uploads/20230922/ea3b3348df5d2b41eb49ddbf86b83516.png",
-			is_show: 1,
-			type: "index",
-			url: "",
-			weigh: 6,
-		},{
-			banner_name: "首页轮播2",
-			createtime: 1694851490,
-			deletetime: null,
-			id: 6,
-			image: "/static/vip2.png",
-			is_show: 1,
-			type: "index",
-			url: "",
-			weigh: 6,
-		}
-	])
+	const lbt_list = ref([])
 	// 失去焦点的监听
 	// watch(blur_h,(val1,val2) => {
 	// 	// hospitals.value = null
-	// 	console.log('监听 ',choosed_h.value)
 	// 	if(!choosed_h) { // 未选择值
 			
 	// 	}
 	// })
+	const h_queryParams = ref({
+		page:1,
+		pageSize:1000,
+		key:''
+	})
 	// 函数
 	async function getHospitalList() {
-		const res = await api.getHospitalList()
+		const res = await api.getHospitalList(h_queryParams.value)
 		if(res.code == 0) {
 			hospitals.value = res.data.list
 		}
@@ -70,24 +51,24 @@
 	async function getLbtList() { // 获取轮播图
 		const res = await api.getLbtList()
 		if(res.code == 0) {
-			
+			if(res.data.list) {
+				lbt_list.value = res.data.list
+			}
 		}
 	}
 	function toClose() {
 		inputDialog.value.close()
 	}
 	function radioChange(e) {
-		console.log(e)
 		isSurgery.value = e.detail.value
 	}
 	const single = ref('')
 	function maskClick(e){
-		console.log('maskClick事件:', e);
 	}
 	const hValue = ref('') // 医院
 	const hValueId = ref('') // 医院id
 	function onClickH(e) {
-		// console.log(hValue.value)
+		h_queryParams.value.key = hValue.value
 		getHospitalList()
 		
 	}
@@ -97,7 +78,6 @@
 		})
 	}
 	function toChooseH(item) {
-		console.log(item)
 		choosed_h.value = item
 		hValue.value = item.name
 		hospitals.value = null
@@ -105,28 +85,62 @@
 	// function blurFunc() {
 	// 	blur_h.value = 1
 	// 	hospitals.value = null
-	// 	// console.log('blurFunc!!',blur_h.value)
 	// }
 	function focusFunc() {
 		// blur_h.value = 0
-		console.log('focusFunc')
 	}
 	function toBlur(){
-		// console.log('toBlur')
 		hospitals.value = null
 	}
 	async function toSave() {
+		if(isSurgery.value == -1) {
+			return
+		}
+		if(!surgery_time.value) {
+			return
+		}
+		if(!choosed_h.value || !choosed_h.value.ID) {
+			return
+		}
 		let user_info = JSON.parse(uni.getStorageSync('userInfo'))
-		const res = await api.hospital({
+		let h_query = {
 			isSurgery:isSurgery.value,
 			surgery_time:surgery_time.value,
 			userId:user_info.userId,
 			hospitalId:choosed_h.value?.ID
-		})
-		console.log(res)
+		}
+		const res = await api.hospital(h_query)
 		if(res.code == 0) {
+			uni.showToast({
+				title:"保存成功",
+				icon:"success",
+				duration:2000
+			})
+			uni.setStorageSync('operation_info',JSON.stringify(h_query))
+			store.operation_info = JSON.stringify(h_query)
 			toClose()
 		}
+		else{
+			uni.showToast({
+				title:"操作失败",
+				icon:"error",
+				duration:2000
+			})
+		}
+	}
+	function todoFunc(state) {
+		let url = '/pages/index/todo'
+		if(state === 2) {
+			url = '/pages/index/done'
+		}
+		uni.navigateTo({
+			url
+		})
+	}
+	function toVisionList() {
+		uni.navigateTo({
+			url:"/pages/index/visionList"
+		})
 	}
 </script>
 <template>
@@ -139,12 +153,28 @@
 				<uni-icons type="forward" color="#9bc027" size="20"></uni-icons>
 			</view>
 		</view>
+		<view class="attention-card">
+			<view class="part-title">
+				测试记录
+			</view>
+			<view class="ac-parts">
+				<view @tap="toVisionList" class="ac-part" style="color: gray;" >
+					视力测试记录
+					<uni-icons type="forward" color="gray" size="20"></uni-icons>
+				</view>
+			</view>
+		</view>
+		<view class="attention-card">
+			<view class="part-title">
+				事务处理
+			</view>
+		</view>
 		<view class="main-cards">
-			<view class="mc-part" style="margin-left: 0;">
+			<view @tap="todoFunc(2)" class="mc-part" style="margin-left: 0;">
 				<view class="mc-part-text">已完成事项</view>
 				<image src="../../static/done.png" mode="widthFix"></image>
 			</view>
-			<view class="mc-part mc-part2" style="margin-right: 0;">
+			<view @tap="todoFunc(1)" class="mc-part mc-part2" style="margin-right: 0;">
 				<view class="mc-part-text">待完成事项</view>
 				<image style="transform: rotate(0deg);" src="../../static/undone.png" mode="widthFix"></image>
 			</view>
diff --git a/pages/index/todo.vue b/pages/index/todo.vue
new file mode 100644
index 0000000..fe3dea4
--- /dev/null
+++ b/pages/index/todo.vue
@@ -0,0 +1,84 @@
+<script setup>
+	// 引入依赖
+	import uniDatetimePicker from '@/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue' 
+	import uniEasyinput from '@/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue' 
+	import { onLoad,onPullDownRefresh,onReachBottom } from "@dcloudio/uni-app"
+	// import mySwiper from "@/components/mySwiper.vue"
+	import {ref,onMounted,nextTick,watch} from "vue"
+	import api from '@/api/index.js'
+	import util from "@/utils/index.js"
+	import {useStore} from '@/store/index.js'
+	// import uniIcons from '@/uni_modules/uni-icons/components/uni-icons/uni-icons.vue' 
+	const store = useStore()
+	// 生命周期
+	onLoad((e) => {
+		getList()
+	})
+	onPullDownRefresh(()=> { // 下拉刷新
+		init()
+		getList()
+	})
+	onReachBottom(() => { // 上滑触底
+		queryParams.value.page++	
+		getList()
+	})
+	// 变量
+	const list = ref([])
+	const queryParams = ref({
+		page:1,
+		pageSize:10,
+		isFinish:0
+	})
+	// 函数
+	function init(){
+		list.value = []
+		queryParams.value.page = 1
+		queryParams.value.pageSize = 10
+	}
+	async function getList() {
+		const res = await api.getTodoist(queryParams.value)
+		if(res.code === 0) {
+			if(res.data && res.data.length > 0) {
+				list.value.push(...res.data)
+			}
+			else{
+				queryParams.value.page--
+			}
+		}
+		else{
+			uni.showToast({
+				title:"获取失败",
+				icon:"error",
+				duration:2000
+			})
+		}
+	}
+</script>
+<template>
+	<view class="todoBox page-box">
+		<view class="td-item" v-for="(item,i) in list">
+			<view class="td-content text-ellipsis-2">
+				{{item.content}}
+			</view>
+			<view class="td-info small-text">
+				{{util.timestampToDate(item.CreatedAt)}}
+			</view>
+		</view>
+	</view>
+</template>
+<style scoped lang="scss">
+	.todoBox{
+		padding: 20rpx;
+		.td-item{
+			padding: 20rpx 0;
+			border-bottom: 2rpx solid #eaeaea;
+			margin-bottom: 20rpx;
+			.td-content{
+				padding-bottom:20rpx;
+			}
+			.td-info{
+				text-align: right;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/visionList.vue b/pages/index/visionList.vue
new file mode 100644
index 0000000..f9f92b7
--- /dev/null
+++ b/pages/index/visionList.vue
@@ -0,0 +1,104 @@
+<script setup>
+	// 引入依赖
+	import uniDatetimePicker from '@/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue' 
+	import uniEasyinput from '@/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue' 
+	import { onLoad,onPullDownRefresh,onReachBottom } from "@dcloudio/uni-app"
+	import emptyCard from "@/components/emptyCard.vue"
+	import {ref,onMounted,nextTick,watch} from "vue"
+	import api from '@/api/index.js'
+	import util from "@/utils/index.js"
+	import {useStore} from '@/store/index.js'
+	// import uniIcons from '@/uni_modules/uni-icons/components/uni-icons/uni-icons.vue' 
+	const store = useStore()
+	// 生命周期
+	onLoad((e) => {
+		if(store.userInfo){
+			let user_info = JSON.parse(store.userInfo)
+			queryParams.value.userId = user_info.userId
+		}
+		getList()
+	})
+	onPullDownRefresh(()=> { // 下拉刷新
+		init()
+		getList()
+	})
+	onReachBottom(() => { // 上滑触底
+		queryParams.value.page++	
+		getList()
+	})
+	// 变量
+	const list = ref([])
+	const queryParams = ref({
+		page:1,
+		pageSize:10,
+		userId:0
+	})
+	// 函数
+	function init(){
+		list.value = []
+		queryParams.value.page = 1
+		queryParams.value.pageSize = 10
+	}
+	async function getList() {
+		const res = await api.getVisionList(queryParams.value)
+		if(res.code === 0) {
+			if(res.data.list && res.data.list.length > 0) {
+				list.value.push(...res.data.list)
+			}
+			else{
+				queryParams.value.page--
+			}
+		}
+		else{
+			uni.showToast({
+				title:"获取失败",
+				icon:"error",
+				duration:2000
+			})
+		}
+	}
+</script>
+<template>
+	<view class="visinoListBox page-box">
+		<view class="vl-item-box" v-if="list.length > 0">
+			<view class="vl-item" v-for="(item,i) in list">
+				<view class="vl-title">{{util.timestampToDate(item.CreatedAt)}}</view>
+				<view class="vl-row-box">
+					<view class="vl-row">
+						<view class="vlr-left">右眼</view>
+						<view class="vlr-left">{{item.rightEyeVision}}</view>
+					</view>
+					<view class="vl-row">
+						<view class="vlr-left">左眼</view>
+						<view class="vlr-left">{{item.leftEyeVision}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<emptyCard v-else></emptyCard>
+	</view>
+</template>
+<style scoped lang="scss">
+	.visinoListBox{
+		.vl-item-box{
+			padding: 20rpx;
+			.vl-item{
+				.vl-title{
+					border-left: 4rpx solid red;
+				}
+				.vl-row-box{
+					.vl-row{
+						display: flex;
+						align-items: center;
+						.vlr-left{
+							
+						}
+						.vlr-right{
+							margin-left: 20rpx;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/visionTest.vue b/pages/index/visionTest.vue
index ec01011..ce90e14 100644
--- a/pages/index/visionTest.vue
+++ b/pages/index/visionTest.vue
@@ -138,14 +138,25 @@
 	}
 	async function okFunc() { // 结束测试
 		// inputDialog3.value.open()
+		uni.showLoading({
+			mask:true
+		})
 		const res = await api.saveVision({
-			leftEyeVision:vision_info.value.left,
-			rightEyeVision:vision_info.value.right,
+			leftEyeVision:vision_info.value.left+'',
+			rightEyeVision:vision_info.value.right+'',
 			userId:userInfo.value.userId
 		})
+		uni.hideLoading()
 		if(res.code == 0) {
+			uni.showToast({
+				title:"保存成功",
+				icon:"success",
+				duration:2000,
+				success: function (res){
+					uni.navigateBack()
+				}
+			})
 			
-			uni.navigateBack()
 		}
 	}
 </script>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 96ae389..4606910 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -21,6 +21,7 @@
 	// 函数
 	function getInfo(){
 		is_login.value = custom.checkLogin()
+		// store.checkLogin()
 		// console.log(is_login.value)
 		if(is_login.value) {
 			avatar.value = uni.getStorageSync('avatarUrl')
@@ -65,7 +66,7 @@
 	}
 	function getPhoneNumber (e) {
 		// tel_code.value = e.detail.code
-		// console.log(e)
+		console.log(e)
 		getAccess_token({code:e.detail.code})
 		// console.log(e.detail.code)  // 动态令牌
 		// console.log(e.detail.errMsg) // 回调信息（成功失败都会返回）
@@ -99,7 +100,7 @@
 				uni.setStorageSync('access_token','Bearer '+res.data.access_token);// token单独缓存一次
 				let res2=await api.wx_login({code:res_p.code},userId);
 				if(res2.code === 0) {
-					
+					store.checkLogin()
 					toLogin(encodeURIComponent(JSON.stringify(res.data)))
 				}
 			}
@@ -112,6 +113,13 @@
 				wx_login(userId)
 			}
 		}
+		else{
+			uni.showToast({
+				icon:"error",
+				title:res.msg,
+				duration:2000
+			})
+		}
 	}
 	async function wx_login(userId){
 		let res=await new Promise(resolve=>{
@@ -127,6 +135,7 @@
 		if(res2.code === 0) {
 			uni.setStorageSync('userInfo',JSON.stringify(res_form.value))
 			// is_login.value = custom.checkLogin()
+			store.checkLogin()
 			getInfo()
 			// if(newUser.value) {
 			// 	toLogin()
diff --git a/pages/user/star.vue b/pages/user/star.vue
index 346b70c..e1e335a 100644
--- a/pages/user/star.vue
+++ b/pages/user/star.vue
@@ -4,14 +4,23 @@
 	import {ref,onMounted,nextTick} from "vue"
 	import {useStore} from '@/store/index.js'
 	import api from "@/api/index.js"
+	const store = useStore()
 	// 生命周期
-	onPullDownRefresh(()=> { // 下拉刷新
+	onLoad((e) => {
+		let userinfo = JSON.parse(store.userInfo)
+		// console.log(userinfo)
+		queryParams.value.userId = userinfo.userId
 		
+		getList()
+	})
+	onPullDownRefresh(()=> { // 下拉刷新
+		getList()
 	})
 	onReachBottom(() => { // 上滑触底
-		
+		getList()
 	})
 	// 变量
+	// const user_info = ref(null)
 	const list = ref([
 		{
 			id:1,
@@ -36,7 +45,16 @@
 			`
 		}
 	])
+	const queryParams = ref({
+		page:1,
+		pageSize:10,
+		userId:0
+	})
 	// 方法
+	async function getList() {
+		const res = await api.getStarList(queryParams.value)
+		
+	}
 	function toDetail(item) {
 		let info = encodeURIComponent(JSON.stringify(item))
 		// console.log(info)
diff --git a/pages/wikipedia/detail.vue b/pages/wikipedia/detail.vue
index db77796..3f72111 100644
--- a/pages/wikipedia/detail.vue
+++ b/pages/wikipedia/detail.vue
@@ -7,16 +7,17 @@
 	import {ref,onMounted,nextTick} from "vue"
 	import {useStore} from '@/store/index.js'
 	import api from "@/api/index.js"
+	import util from "@/utils"
 	onLoad((e) => {
-		console.log(e)
-		a_info.value = JSON.parse(decodeURIComponent(e.info))
+		// console.log(e)
+		// a_info.value = JSON.parse(decodeURIComponent(e.info))
 		if(!e.id) {
 			uni.showToast({
 				icon:"error",
 				title:"错误",
 				duration:2000
 			})
-			a_info.value = null
+			// a_info.value = null
 			return 
 		}
 		getDetail(e.id)
@@ -27,6 +28,19 @@
 	// 函数
 	async function getDetail(id) {
 		const res = await api.getArticleDetail({id})
+		if(res.code == 0) {
+			a_info.value = res.data
+		}
+		else{
+			uni.showToast({
+				title:'获取失败',
+				icon:"error",
+				duration:2000
+			})
+		}
+	}
+	async function starFunc(type) { // 点击收藏
+		a_info.value.isStar = type
 	}
 </script>
 <template>
@@ -34,11 +48,31 @@
 		<view class="title">
 			{{a_info?.title}}
 		</view>
-		<view class="more-info small-text">2023-10-5</view>
+		<view v-if="a_info" class="more-info small-text">{{util.timestampToDate(a_info?.CreatedAt)}}</view>
 		<view class="d-content" v-html="a_info?.content"></view>
+		<view class="action-box" v-if="a_info">
+			<view class="ab-item">
+				<uni-icons color="gray" type="eye" size="30"></uni-icons>	
+				<view style="color: gray;">{{a_info?.reading_num}}</view>
+			</view>
+			<view class="ab-item">
+				<uni-icons color="#26758d" @tap="starFunc(0)" v-if="a_info?.isStar" type="star-filled" size="30"></uni-icons>
+				<uni-icons color="gray" @tap="starFunc(1)" v-else type="star" size="30"></uni-icons>
+			</view>
+		</view>
 	</view>
 </template>
 <style scoped lang="scss"> 
+.action-box{
+	margin-top: 20px;
+	display: flex;
+	justify-content: flex-end;
+	.ab-item{
+		display: flex;
+		align-items: center;
+		margin: 0 20rpx;
+	}
+}
 .detailBox{
 	.more-info{
 		text-align: right;
diff --git a/pages/wikipedia/index.vue b/pages/wikipedia/index.vue
index 707ffe7..4bae67f 100644
--- a/pages/wikipedia/index.vue
+++ b/pages/wikipedia/index.vue
@@ -29,43 +29,36 @@
 		page:1,
 		pageSize:10
 	})
-	const list = ref([
-		{
-			id:1,
-			cover_img:'https://gwjxb.oss-cn-chengdu.aliyuncs.com/logo.png',
-			title:'金秋相逢 共叙合作',
-			reading_num:100,
-			content:`
-			新华社北京10月18日电 金秋时节，北京再迎盛会：第三届“一带一路”国际合作高峰论坛隆重举行。
-			春发其华，秋收其实。
-			共建“一带一路”走过了第一个蓬勃十年，正值风华正茂，务当昂扬奋进，奔向下一个金色十年！
-			`
-		},
-		{
-			id:2,
-			cover_img:'https://ms.bdimg.com/pacific/0/pic/1083217647_-478899572.png?x=0&y=0&h=340&w=510&vh=340.00&vw=510.00&oh=340.00&ow=510.00',
-			title:'金秋相逢 共叙合作',
-			reading_num:100,
-			content:`
-			新华社北京10月18日电 金秋时节，北京再迎盛会：第三届“一带一路”国际合作高峰论坛隆重举行。
-			春发其华，秋收其实。
-			共建“一带一路”走过了第一个蓬勃十年，正值风华正茂，务当昂扬奋进，奔向下一个金色十年！
-			`
-		}
-	])
+	const list = ref([])
 	// 方法
 	function init() {
 		queryParams.page = 1
 		queryParams.pageSize = 10
+		list.value = []
 	}
 	async function getList(){
 		const res = await api.getArticleList(queryParams.value)
+		if(res.code == 0) {
+			if( res.data.list.length>0) {
+				list.value.push(...res.data.list) 
+			}
+			else{
+				queryParams.page-=1
+			}
+		}
+		else{
+			uni.showToast({
+				title:'获取失败',
+				icon:"error",
+				duration:2000
+			})
+		}
 	}
 	function toDetail(item) {
 		let info = encodeURIComponent(JSON.stringify(item))
 		// console.log(info)
 		uni.navigateTo({
-			url:"./detail?info="+info+"&id="+item.id
+			url:"./detail?id="+item.ID
 		})
 	}
 </script>
@@ -81,7 +74,7 @@
 				</view>
 				<view class="lb-right">
 					<view class="lb-title">{{item.title}}</view>
-					<view class="lb-content text-ellipsis-1 small-text">{{item.content}}</view>
+					<view class="lb-content text-ellipsis-1 small-text" v-html="item.content"></view>
 				</view>
 			</view>
 		</view>
diff --git a/static/default_icon.png b/static/default_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c30bfd3d278905cca4237354c1622f1e1b7727e
GIT binary patch
literal 7641
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

literal 0
HcmV?d00001

diff --git a/static/default_search_icon.png b/static/default_search_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b416b5411a40ba3974d0f76c6bdc674daf2279f5
GIT binary patch
literal 16401
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
CJY6IJ

literal 0
HcmV?d00001

diff --git a/store/index.js b/store/index.js
index f4a96aa..cc55c75 100644
--- a/store/index.js
+++ b/store/index.js
@@ -62,6 +62,7 @@ export const useStore = defineStore('main2', {
 			if(access_token) {
 				this.access_token = access_token
 				this.isLogin = true
+				this.userInfo = uni.getStorageSync('userInfo')
 				// this.getUserInfo()
 			}
 			// else{