Merge branch 'dev' of http://gitlab.dui88.com/fh/20250528_FHQ1 into dev

components/renwu/TaskPerson.vue

@@ -564,8 +564,6 @@ const checkAndUpdateTaskResult = async () => {
     globalStore.taskCompletePoints = integralStore.queryTodoResult.data[0]?.actualCredits;
     globalStore.taskCompleteTitle = integralStore.queryTodoResult.data[0]?.taskName;
   }
-
-  await integralStore.getSigninAndTaskInfoJSON();//刷新任务接口
 };
 
 const handleClose = () => {

pages/index/index.vue

@@ -284,6 +284,8 @@ const handleTaskComplete = async (taskIdParam) => {
   }else{
     console.info('taskCompleteJSON res error:', integralStore.queryTodoResult);
   }
+
+  await integralStore.getSigninAndTaskInfo();//刷新任务接口
 };
 
 onShow(async () => {
@@ -508,9 +510,10 @@ const handleTaskClick = async (data) => {
       const extra3 = JSON.parse(data?.task?.taskTodoExtra?.extra);
 
       if (extra3.length > 0) {
+        const idx = Math.floor(Math.random() * extra3.length);
         let url =
           'subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_north';
-        url = url.replace('{productId}', extra3[0].itemId).replace('{skuId}', extra3[0].skuId);
+        url = url.replace('{productId}', extra3[idx].itemId).replace('{skuId}', extra3[idx].skuId);
         jump({
           type: JumpType.MINI,
           url: url,

views/Integral.vue

@@ -3071,13 +3071,13 @@ const handleViewBenefits = () => {
 };
 
 // 任务按钮点击事件
-const handleTaskButtonClick = () => {
+const handleTaskButtonClick = async () => {
   // jump({
   // 	type: JumpType.INNER,
   // 	url: '/activities/1015/home'
   // })
   // return
-
+  await integralStore.getSigninAndTaskInfo();//刷新任务接口
   console.log('任务按钮点击');
   console.log('taskTodo数据:', integralStore?.signinAndTaskInfo?.data?.taskTodo);
   globalStore.showTaskPop(integralStore?.signinAndTaskInfo?.data?.taskTodo);