Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main.js

src/main.js

@@ -15,7 +15,7 @@ import store from "./store";
 // import { Cell, CellGroup } from "vant";
 import { Form, Field, Uploader,DatetimePicker,Calendar } from "vant";
 // import { Picker } from "vant";
-// import { Popup } from "vant";
+import { Popup } from "vant";
 // import { Toast } from "vant";
 // import { Empty } from "vant";
 // import { Dialog } from "vant";
@@ -60,7 +60,7 @@ app
   // .use(CellGroup)
   // .use(Form)
   // .use(Picker)
-  // .use(Popup)
+  .use(Popup)
   // .use(Field)
   // .use(Uploader)
   // .use(Toast)

src/service/studentCourseSelection.js

@@ -4,16 +4,29 @@
 
 import axios from "../utils/axios";
 
+//学生选课信息查询
+export function getStudentInfo(id) {
+    return axios.get(`/wx/course/getCourseInfo/${id}`);
+}
+//获取数据字典
+export function getDicts(type) {
+    let url = `/system/dict/data/type/${type}`;
+    let result = axios.get(url);
+    return result;
+}
+
 //查询个人成绩信息
 export function getPersonGrade(id) {
-    return axios.get('/wx/course/achievement/' + id );
+    return axios.get(`/wx/course/achievement/${id}` );
 }
 
 //根据学生3门选课查询
 export function getSelectGrade(data) {
-    return axios.post('/wx/course/studenttypeview' ,{
-        ...data
-    } );
+    return axios.get('/wx/course/studenttypeview' ,{
+        params:data
+    }
+
+ );
 }
 
 //保存选课信息

src/views/login/login.vue

@@ -224,7 +224,7 @@ export default {
       console.log("asdasd",result);
       if (result.data) {
         console.log(router);
-        router.push({
+        router.replace({
           path: "/main",
         });
       }
@@ -316,7 +316,7 @@ export default {
         setParentTelephone(state.parentTelephone);
         setTotyp(state.loginType);
 
-        router.push({
+        router.replace({
           path: "/main",
           query: {
             studentName: state.studentName,

src/views/tabbar/main/index.vue

@@ -184,7 +184,7 @@
           />
           <span class="item_text">教师信息</span>
         </van-grid-item>
-        <van-grid-item icon="photo-o" text="学生选课" url=" #/studentCourseSelection">
+        <van-grid-item icon="photo-o" text="学生选课"  url=" #/studentCourseSelection">
           <van-image
               style="width: 48px"
               :src="require('@/assets/index/rkls.png')"
@@ -533,6 +533,7 @@ export default {
     const getpic = (img) => {
       return axios.defaults.baseURL + img;
     };
+
     const loadData = async () => {
       console.log("加载数据", store);
       goCalendar();