Merge branch 'test' of https://e.coding.net/g-cphe0354/duanju/new_app into ymf

pages.json

@@ -50,7 +50,8 @@
 			"path": "pages/me/index",
 			"style": {
 				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
 			}
 		}, {
 			"path": "pages/me/contact",
@@ -171,33 +172,29 @@
 			}
 		},
 		{
-			"path" : "pages/task/prizeList",
-			"style" : 
-			{
-				"navigationBarTitleText" : "任务"
-				
+			"path": "pages/task/prizeList",
+			"style": {
+				"navigationBarTitleText": "任务"
+
 			}
 		},
 		{
-			"path" : "pages/task/receiveMember",
-			"style" : 
-			{
-				"navigationBarTitleText" : "",
+			"path": "pages/task/receiveMember",
+			"style": {
+				"navigationBarTitleText": "",
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/me/prizeDraw",
-			"style" : 
-			{
-				"navigationBarTitleText" : "抽奖"
+			"path": "pages/me/prizeDraw",
+			"style": {
+				"navigationBarTitleText": "抽奖"
 			}
 		},
 		{
-			"path" : "pages/pays/pays",
-			"style" : 
-			{
-				"navigationBarTitleText" : ""
+			"path": "pages/pays/pays",
+			"style": {
+				"navigationBarTitleText": ""
 			}
 		}
 	],

pages/me/index.vue

@@ -111,7 +111,7 @@
 
 <script setup>
 import { ref, reactive } from 'vue';
-import { onLoad, onShow } from '@dcloudio/uni-app';
+import { onLoad, onPullDownRefresh } from '@dcloudio/uni-app';
 import { selectByUserId, collectVideoSummary, selectUserMoney } from '@/api/me/me.js';
 import { linkTo } from '@/utils/app.js';
 
@@ -162,8 +162,17 @@ function toTask() {
 	});
 }
 
-onLoad(() => {});
-onShow(() => {
+onPullDownRefresh(async () => {
+	await selectByUserIdAjax();
+	await collectVideoSummaryAjax();
+	await selectUserMoneyAjax();
+	userInfo.value = uni.getStorageSync('userInfo');
+	setTimeout(() => {
+		uni.stopPullDownRefresh();
+	}, 500);
+});
+
+onLoad(() => {
 	selectByUserIdAjax();
 	collectVideoSummaryAjax();
 	selectUserMoneyAjax();