1

src/api/activity.js

 import request from '../utils/request.js'
-
+let JHdata = uni.getStorageSync("userInfo");
 /**
  * 获取活动类型列表
  * @param {JSON参数} data 
@@ -8,7 +8,17 @@ export function getActivityTypeList(data) {
     return request({
         url: '/AppletEducation/GetActivityTypeList',
         method: 'post',
-        data
+        data: {
+            msg: data,
+            MallBaseId: JHdata.JHMallBaseId,
+            UserId: JHdata.JHMallUserId,
+            TenantId: JHdata.JHTenantId,
+            StudentId: JHdata.Id,
+            OpenId: JHdata.JHMallUserOpenId,
+            SmallShopsId: 0,
+            MiniAppId: "wx38e054ee42b054f4",
+            token: JHdata.MallToken
+        }
     })
 }
 
@@ -20,6 +30,16 @@ export function getActivityList(data) {
     return request({
         url: '/AppletEducation/GetActivityPageJXH',
         method: 'post',
-        data
+        data: {
+            msg: data,
+            MallBaseId: JHdata.JHMallBaseId,
+            UserId: JHdata.JHMallUserId,
+            TenantId: JHdata.JHTenantId,
+            StudentId: JHdata.Id,
+            OpenId: JHdata.JHMallUserOpenId,
+            SmallShopsId: 0,
+            MiniAppId: "wx38e054ee42b054f4",
+            token: JHdata.MallToken
+        }
     })
 }
\ No newline at end of file

src/api/exam.js

@@ -8,7 +8,7 @@ export function getPaperList(data) {
     return request({
         url: '/AppletIndex/GetGuestExaminationPublishPage',
         method: 'post',
-        data
+        data: { msg: data }
     })
 }
 
@@ -20,7 +20,7 @@ export function getPaperDetail(data) {
     return request({
         url: '/appletindex/GetPaperDetails',
         method: 'post',
-        data
+        data: { msg: data }
     })
 }
 
@@ -32,6 +32,6 @@ export function submitPaper(data) {
     return request({
         url: '/AppletIndex/StuSubmitExamPaper',
         method: 'post',
-        data
+        data: { msg: data }
     })
 }
\ No newline at end of file

src/api/index.js

@@ -8,7 +8,7 @@ export function login(data) {
     return request({
         url: '/AppletLogin/Login',
         method: 'post',
-        data
+        data: { msg: data }
     })
 }
 
@@ -20,7 +20,7 @@ export function getIndexInfo(data) {
     return request({
         url: '/AppletIndex/GetIndexInfo',
         method: 'post',
-        data
+        data: { msg: data }
     })
 }
 
@@ -32,7 +32,7 @@ export function getStundentPlanStatistical(data) {
     return request({
         url: '/AppletIndex/GetStundentPlanStatistical',
         method: 'post',
-        data
+        data: { msg: data }
     })
 }
 
@@ -44,7 +44,7 @@ export function getCourse(data) {
     return request({
         url: '/AppletIndex/GetChapterTree',
         method: 'post',
-        data
+        data: { msg: data }
     })
 }
 
@@ -56,7 +56,7 @@ export function getContract(data) {
     return request({
         url: '/AppletIndex/GetContractList',
         method: 'post',
-        data
+        data: { msg: data }
     })
 }
 
@@ -68,7 +68,7 @@ export function getProgress(data) {
     return request({
         url: '/AppletIndex/GetStundentScheduleList',
         method: 'post',
-        data
+        data: { msg: data }
     })
 }
 
@@ -80,7 +80,7 @@ export function getStundentSurplus(data) {
     return request({
         url: '/AppletIndex/GetStundentSurplus',
         method: 'post',
-        data
+        data: { msg: data }
     })
 }
 
@@ -92,7 +92,7 @@ export function setStudentLeave(data) {
     return request({
         url: '/LeaveStudent/SetStudentLeave',
         method: 'post',
-        data
+        data: { msg: data }
     })
 }
 
@@ -104,7 +104,7 @@ export function getStudentLeaveList(data) {
     return request({
         url: '/AppletIndex/GetEducationReceiptPage',
         method: 'post',
-        data
+        data: { msg: data }
     })
 }
 /**
@@ -115,7 +115,7 @@ export function invalidReceiptInfo(data) {
     return request({
         url: '/AppletIndex/InvalidReceipt',
         method: 'post',
-        data
+        data: { msg: data }
     })
 }
 /**
@@ -126,6 +126,6 @@ export function getEduReceiptInfo(data) {
     return request({
         url: "/AppletIndex/GetEduReceiptInfo",
         method: 'post',
-        data
+        data: { msg: data }
     })
 }
\ No newline at end of file

src/pages/activity/activityList.vue

@@ -183,7 +183,7 @@
     </view>
 
     <view v-show="current == 2" style="height: calc(100vh - 50px)">
-      <signUp ref="children"></signUp>
+      <SignUp ref="children"></SignUp>
     </view>
 
     <auth
@@ -191,7 +191,13 @@
       @changeuserinfo="reloadUserinfo"
       @gbAuth="gbAuth"
     ></auth>
-    <van-popup :show="show" closeable position="bottom" @close="show = false">
+    <van-popup
+      :show="show"
+      closeable
+      round
+      position="bottom"
+      @close="show = false"
+    >
       <view class="pubox">
         <view class="pubox-top">
           <text>选择活动类型</text>
@@ -236,13 +242,16 @@ import {
   onMounted,
 } from "vue";
 import Loadmore from "../../components/loadmore.vue";
+import SignUp from "../../components/signUp.vue";
 import { getActivityTypeList, getActivityList } from "../../api/activity";
 export default {
   components: {
     Loadmore,
+    SignUp,
   },
   setup() {
-    let JHdata = uni.getStorageSync("userInfo");
+    let i = getCurrentInstance();
+    console.log(252, i);
     let data = reactive({
       show: false,
       pageState: "more",

src/pages/progress/progress.vue

@@ -17,7 +17,7 @@
     </view>
     <van-empty description="暂无数据" v-if="data.length === 0" />
     <view v-for="(item, index) in data" :key="index" v-if="data.length > 0">
-      <view class="chapter" @click="openLayer">
+      <view class="chapter">
         <view class="flex flex_between_center">
           <view class="flex flex_between_center">
             <view class="dot"></view>
@@ -65,7 +65,6 @@ import { getIndexInfo } from "../../api/index";
 export default {
   setup() {
     let data = reactive({
-      showLayer: false,
       msg: {
         ClassId: 0,
       },
@@ -73,16 +72,9 @@ export default {
       CourseName: "",
     });
     let methods = {
-      openLayer() {
-        data.showLayer = true;
-      },
-      closeLayer() {
-        data.showLayer = false;
-      },
       async getData() {
         let res = await getProgress(data.msg);
         data.data = res.Data;
-        console.log(113, data);
       },
       async getIndexdata() {
         let res = await getIndexInfo();

src/utils/request.js

 let host = 'http://192.168.20.17:8017/api'
 if (process.env.NODE_ENV === "development") {
-	host = 'http://192.168.20.17:8017/api'
-	// host = 'http://192.168.20.24:8300/api'
+	// host = 'http://192.168.20.17:8017/api'
+	host = 'http://192.168.20.24:8300/api'
 } else {
 	host = 'https://eduapi.oytour.com/api'
 }
@@ -18,8 +18,7 @@ let request = (param) => {
 				'token': token || ""
 			},
 			data: {
-				msg: param.data,
-				// ...param.data.activityMsg
+				...param.data,
 			},
 			success: res => {
 				if (res.data.Code === 1) {