git

src/components/Course.vue

@@ -2,8 +2,8 @@
   <div class="Course-box">
     <div>
       <van-swipe :autoplay="3000">
-        <van-swipe-item v-for="(image, index) in images" :key="index">
-          <van-image width="100%" height="25vh" :src="image" />
+        <van-swipe-item v-for="(image, index) in HomeBannerImages" :key="index">
+          <van-image width="100%" height="25vh" :src="image.thumb" />
         </van-swipe-item>
       </van-swipe>
     </div>
@@ -42,11 +42,7 @@ export default {
         { name: '课程阿斯好友和用户运营达四方' },
         { name: '毛概' }
       ],
-      images: [
-        'https://img.yzcdn.cn/vant/apple-1.jpg',
-        'https://img.yzcdn.cn/vant/apple-2.jpg',
-        'https://img.yzcdn.cn/vant/cat.jpeg'
-      ]
+      HomeBannerImages: []
     }
   },
   mounted() {
@@ -57,7 +53,8 @@ export default {
       this.$router.push('/ClockIn')
     },
     onBanner() {
-      getBanner({ position: 'Training' }).then((e) => {
+      getBanner('Training').then((e) => {
+        this.HomeBannerImages = e.records
         console.log(e)
       })
     }

src/components/StrongPhoto.vue

@@ -3,8 +3,8 @@
   <div class="Photo-box">
     <div>
       <van-swipe :autoplay="3000">
-        <van-swipe-item v-for="(image, index) in title.imageList" :key="index">
-          <van-image width="100%" height="25vh" :src="image.a" />
+        <van-swipe-item v-for="(image, index) in photoBannerImages" :key="index">
+          <van-image width="100%" height="25vh" :src="image.thumb" />
         </van-swipe-item>
       </van-swipe>
     </div>
@@ -44,6 +44,8 @@
 </template>
 
 <script>
+import { getBanner } from '../util/api'
+
 export default {
   data() {
     return {
@@ -60,6 +62,7 @@ export default {
         '四期2啊啊',
         '四期0啊啊'
       ],
+      photoBannerImages: [],
       title: {
         name: '2022年02月22日',
         imageList: [
@@ -74,6 +77,8 @@ export default {
     }
   },
   mounted() {
+    this.onBanner()
+
     if (this.buttList.length >= 5) {
       this.iconShow = true
     } else {
@@ -85,9 +90,14 @@ export default {
       this.classStyle = !this.classStyle
     },
     SeePhotos(i) {
-      console.log('🚀 ~ file: StrongPhoto.vue ~ line 64 ~ SeePhotos ~ i', i)
       this.activeNum = i
       // this.clickStyle = !this.clickStyle
+    },
+    onBanner() {
+      getBanner('Wonderful').then((e) => {
+        this.photoBannerImages = e.records
+        console.log(e)
+      })
     }
   }
 }

src/components/UserCenter.vue

@@ -2,13 +2,13 @@
   <div class="User-box">
     <!-- <h1>UserCenter 个人中心</h1> -->
     <div class="user-info">
-      <img src="../assets/userImag/user.png" />
+      <img src="../assets/userImag/userImag.jpg" />
       <div class="info-name">
         <div>
-          <span>旺旺旺</span>
+          <span>{{name}}</span>
         </div>
         <div>
-          <span>18888888888</span>
+          <span>{{phone}}</span>
         </div>
       </div>
       <van-icon name="arrow" @click="handLogin()" />
@@ -26,83 +26,26 @@
 </template>
 
 <script>
+// import {SetUser} from '../util/api'
 export default {
   data() {
     return {
       register: require('../assets/icon/register.svg'),
-      code: '' // 前端获取 code 传给后端调用相应接口
+      name: '',
+      phone: ''
     }
   },
-  created() {
-    // 从 window.location.href 中截取 code 并且赋值
-    if (window.location.href.indexOf('Code_state') !== -1) {
-      this.code = window.location.href.split('?')[1].split('=')[1].split('&')[0]
-      this.$store.commit('SET_USER_INFO', { code: this.code })
-    }
-
-    if (this.$store.state.user.code) {
-      // 存在 code 直接调用接口
-      this.handGetUserInfo(this.code)
-    }
+  mounted() {
+    this.name = this.$store.state.user.name
+    this.phone = this.$store.state.user.phone
   },
   methods: {
     handLogin() {
       this.$router.push('/SetUser')
       // this.$store.commit('SET_USER_INFO', { code: this.code })
-
-      // 重定向地址重定到当前页面，在路径获取 code
-      if (process.env.NODE_ENV === 'development') {
-        console.log(222)
-        return
-      }
-      /**
-       * 获取 code
-       * @returns
-       */
-      // function getCode() {
-      //   const matched = /[?&]*code=([^&]+)/.exec(location.search)
-      //   if (matched) {
-      //     return decodeURIComponent(matched[1])
-      //   }
-      // }
-
-      const hrefUrl = window.location.href
-
-      // const originCode = localStorage.getItem('wxcode')
-      // const queryCode = getCode()
-      // localStorage.setItem('wxcode', queryCode)
-      // const local = encodeURIComponent(location.origin + location.pathname)
-
-      if (this.code === '') {
-        window.location.href = `
-						https://open.weixin.qq.com/connect/oauth2/authorize
-						?appid=${this.$store.state.user.appid}
-						&redirect_uri=${encodeURIComponent(hrefUrl)}
-						&response_type=code
-						&scope=snsapi_userinfo
-						&state=Code_state#wechat_redirect
-					`
-      }
     },
-    handGetUserInfo(code) {
-      console.log(
-        '🚀 ~ file: UserCenter.vue ~ line 44 ~ handGetUserInfo ~ code',
-        code
-      )
-      // 调用后端接口，参数为 code
-      // wxLogin({
-      //   data: {
-      //     code: code
-      //   },
-      //   method: 'GET'
-      // }).then((res) => {
-      //   console.log(
-      //     '🚀 ~ file: UserCenter.vue ~ line 47 ~ handGetUserInfo ~ res',
-      //     res
-      //   )
-      //   // res => 登陆成功！
-      // })
-    }
+
+    handGetUserInfo() {}
   }
 }
 </script>

src/components/userPages/SetUser.vue

@@ -4,8 +4,8 @@
       <van-nav-bar title="修改个人信息" left-text="返回" left-arrow @click-left="onClickLeft" />
       <van-form @submit="onSubmit">
         <van-field
-          v-model="username"
-          name="username"
+          v-model="name"
+          name="name"
           label="姓名"
           placeholder="姓名"
           :rules="[{ required: true, message: '请填写姓名' }]"
@@ -19,6 +19,61 @@
           placeholder="手机号"
           :rules="[{ required: true, message: '请填写手机号码' }]"
         />
+        <van-field
+          readonly
+          clickable
+          name="sex"
+          :value="sex"
+          label="性别"
+          placeholder="点击选择性别"
+          @click="onClickPicker(1)"
+        />
+        <van-popup v-model="sexShowPicker" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="sexArry"
+            @confirm="onConfirmSex"
+            @cancel="sexShowPicker = false"
+          />
+        </van-popup>
+
+        <van-field
+          readonly
+          clickable
+          name="Semester"
+          :value="Semester"
+          label="学期"
+          placeholder="点击选择学期"
+          @click="onClickPicker(2)"
+        />
+        <van-popup v-model="SemesterShowPicker" position="bottom">
+          <van-picker
+            show-toolbar
+            value-key="name"
+            :columns="SemesterArry"
+            @confirm="onConfirmSemester"
+            @cancel="SemesterShowPicker = false"
+          />
+        </van-popup>
+
+        <van-field
+          readonly
+          clickable
+          name="Classs"
+          :value="Classs"
+          label="班级"
+          placeholder="点击选择班级"
+          @click="ClasssShowPicker = true"
+        />
+        <van-popup v-model="ClasssShowPicker" position="bottom">
+          <van-picker
+            show-toolbar
+            value-key="name"
+            :columns="ClasssArry"
+            @confirm="onConfirmClasss"
+            @cancel="onClickPicker(3)"
+          />
+        </van-popup>
         <div style="margin: 20px; margin-top:3em;">
           <van-button round block type="info" native-type="submit">提交</van-button>
         </div>
@@ -28,20 +83,145 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
+import { SetUser, getSchoolterm, getSchoolClass } from '../../util/api'
 export default {
   data() {
     return {
-      username: '',
-      phone: ''
+      name: '',
+      phone: '',
+      sexArry: ['男', '女'],
+      SemesterArry: [],
+      ClasssArry: [],
+      sexShowPicker: false,
+      SemesterShowPicker: false,
+      ClasssShowPicker: false,
+      sex: '',
+      sexNumber: null,
+      Semester: '',
+      Classs: '',
+      termId: '',
+      classId: ''
     }
   },
+  computed: {
+    ...mapState({
+      user: (state) => state.user
+    })
+  },
+  watch: {
+    user: {
+      handler(nw) {
+        if (nw) {
+          this.name = nw.name
+          this.phone = nw.phone
+          this.Classs = nw.Classs
+          this.Semester = nw.Semester
+          this.sex = nw.sex
+        }
+      },
+      immediate: true
+    }
+  },
+  mounted() {
+    this.getSemester()
+    // if (this.ClasssShowPicker) {
+    //   this.getClass()
+    // }
+  },
   methods: {
+    // 获取学期班级 star
+    getSemester() {
+      getSchoolterm({ pageSize: 999 }).then((e) => {
+        console.log('获取学期', e)
+        this.SemesterArry = e.records
+      })
+    },
+
+    getClass(termId) {
+      getSchoolClass(termId, { pageSize: 999 }).then((e) => {
+        console.log('获取班级', e)
+        this.ClasssArry = e.records
+      })
+    },
+    // 获取学期班级 end
     onClickLeft() {
       this.$router.go(-1)
     },
+    onConfirmSex(e) {
+      if (e == '男') {
+        this.sexNumber = 1
+        this.sex = e
+      } else {
+        this.sexNumber = 2
+
+        this.sex = e
+      }
+
+      this.sexShowPicker = false
+    },
+    //学期区------------------------
+
+    onConfirmSemester(e, x) {
+      const { name, termId } = e
+      this.Semester = name
+      this.getClass(termId)
+      this.termId = termId
+      console.log('🚀 ~值，下标 ', e, x)
+      this.SemesterShowPicker = false
+    },
+    //班级区------------------------
+    onConfirmClasss(e) {
+      const { name, classId } = e
+      this.Classs = name
+      this.classId = classId
+
+      this.ClasssShowPicker = false
+    },
+    // this.showPicker = false
+
+    onClickPicker(e) {
+      switch (e) {
+        case 1:
+          this.sexShowPicker = true
+
+          break
+        case 2:
+          this.SemesterShowPicker = true
+          this.Classs = ''
+
+          break
+        case 3:
+          this.ClasssShowPicker = true
+
+          break
+        default:
+          break
+      }
+    },
     onSubmit(values) {
       console.log('submit', values)
-      this.$toast.success('提示文案')
+
+      this.$toast.success('修改成功！')
+      SetUser(this.$store.state.user.personId, {
+        classId: this.classId,
+        name: this.name,
+        personId: this.$store.state.user.personId,
+        phone: this.phone,
+        sex: this.sexNumber,
+        termId: this.termId
+      }).then((e) => {
+        console.log(e)
+        this.$store.commit('SET_USER_INFO', { name: this.name })
+        this.$store.commit('SET_USER_INFO', { phone: values.phone })
+        this.$store.commit('SET_USER_INFO', { sexNumber: this.sexNumber })
+        this.$store.commit('SET_USER_INFO', { termId: this.termId })
+        this.$store.commit('SET_USER_INFO', { classId: this.classId })
+        this.$store.commit('SET_USER_INFO', { Classs: this.Classs })
+        this.$store.commit('SET_USER_INFO', { Semester: this.Semester })
+        this.$store.commit('SET_USER_INFO', { sex: this.sex })
+        this.$router.go(-1)
+      })
     }
   }
 }
@@ -63,7 +243,7 @@ export default {
     // border-bottom-right-radius: 20px;
     .van-form {
       position: relative;
-      top: 25vh;
+      top: 4vh;
       .van-field {
         margin-bottom: 2em;
         font-size: 17px;

src/main.js

@@ -19,8 +19,10 @@ import {
   Toast,
   Card,
   NavBar,
-  Image, SwipeItem, Tag, Swipe, Divider
+  Image, SwipeItem, Tag, Swipe, Divider, Picker, Popup
 } from 'vant';
+Vue.use(Popup);
+Vue.use(Picker);
 Vue.use(Divider);
 Vue.use(Swipe);
 Vue.use(Tag);
@@ -43,7 +45,7 @@ Vue.use(animated)
 
 // Vue.use(Tabbar);
 // Vue.use(TabbarItem);
-// Login()
+Login()
 
 Vue.config.productionTip = false
 

src/store/index.js

@@ -4,19 +4,27 @@ import Vuex from 'vuex'
 
 
 Vue.use(Vuex)
-
 const store = new Vuex.Store({
 
   // state 中存放的就是全局共享的数据
   state: {
     user: {
-
       appid: 'wxd3bab568bc42d1de',
       token: '',
       code: '123',
-
+      name: '用户',
+      phone: '',
+      personId: '',
+      classId: '',
+      sexNumber: null,
+      Semester: '',
+      sex: '',
+      termId: '',
+      Classs: ''
     }
   },
+
+
   // Mutation 用户变更Store数据
   mutations: {
     SET_USER_INFO (state, value) {

src/util/api.js

@@ -6,7 +6,7 @@ import request from "./request";
  *
  */
 //  /api/wx/login
-export const getBanner = (params, data,) => request(`/api/wx/banner`, data, 'GET')
+export const getBanner = (params, data,) => request(`/api/wx/banner?position=${params}`, data, 'GET')
 
 
 
@@ -19,3 +19,33 @@ export const getBanner = (params, data,) => request(`/api/wx/banner`, data, 'GET
 export const UserLogin = (code) => request(`/api/wx/login?code=${code}`, { method: 'post' })
 
 
+
+/**
+ * 修改个人信息
+ * @param 修改个人信息
+ * @returns 
+ * loginParam
+ */
+export const SetUser = (id, data) => request(`/api/wx/person/${id}`, { method: 'put', data })
+
+
+
+
+
+/**
+ * 获取学期
+ * @param 
+ * @returns 
+ * loginParam
+ */
+export const getSchoolterm = (id) => request(`/api/wx/school-term`, { method: 'get' })
+
+
+/**
+ * 获取班级
+ * @param 
+ * @returns 
+ * loginParam
+ */
+export const getSchoolClass = (params) => request(`/api/wx/school-class?termId=${params}`, { method: 'get' })
+

src/util/initial.js

@@ -1,13 +1,75 @@
 /**
  * 登陆
  */
+import Vue from 'vue'
+
+import Vuex from 'vuex'
+import store from '../store'
+
 import { UserLogin } from './api'
 
+
+// Vue.use(Vuex)
+
 export function Login () {
+  console.log(store);
+
   UserLogin('123',).then(e => {
     console.log(e);
-    console.log(22222222222222222222222);
-    let tokens = e.token
-    this.$store.commit('SET_USER_INFO', { token: tokens })
+    let userInfo = {
+      token: e.token,
+      name: e.person.name,
+      phone: e.person.phone,
+      personId: e.person.personId,
+
+
+    }
+    store.commit('SET_USER_INFO', userInfo)
   })
-}
+
+}
+
+// export function GetCode () {
+
+//   // 从 window.location.href 中截取 code 并且赋值
+//   if (window.location.href.indexOf('Code_state') !== -1) {
+//     this.code = window.location.href.split('?')[1].split('=')[1].split('&')[0]
+//     store.commit('SET_USER_INFO', { code: this.code })
+//   }
+
+//   if (this.$store.state.user.code) {
+//     // 存在 code 直接调用接口
+//     this.handGetUserInfo(this.code)
+//   }
+
+
+//   // 重定向地址重定到当前页面，在路径获取 code
+//   if (process.env.NODE_ENV === 'development') {
+//     console.log(222)
+//     return
+//   }
+//   /**
+//    * 获取 code
+//    * @returns
+//    */
+//   function getCode () {
+//     const matched = /[?&]*code=([^&]+)/.exec(location.search)
+//     if (matched) {
+//       return decodeURIComponent(matched[1])
+//     }
+//   }
+
+//   const hrefUrl = window.location.href
+
+
+//   if (this.code === '') {
+//     window.location.href = `
+// 						https://open.weixin.qq.com/connect/oauth2/authorize
+// 						?appid=${this.$store.state.user.appid}
+// 						&redirect_uri=${encodeURIComponent(hrefUrl)}
+// 						&response_type=code
+// 						&scope=snsapi_userinfo
+// 						&state=Code_state#wechat_redirect
+// 					`
+//   }
+// }

src/util/request.js

@@ -1,46 +1,66 @@
-import axios from "axios";
+
+
+
+import axios from 'axios'
+
 import store from '../store'
 
-// import { getQueryString } from ".";
 
-export default (url, options) => {
+
+
+export default function (url, options) {
   const { params, header, ...leftOptions } = options || {}
-  // const queryStr = getQueryString(params)
-  const { code, token } = store.state.user
 
-  const authToken = token
+  return new Promise((resolve, reject) => {
+    const { code, token } = store.state.user
 
-  const tokenHeader = authToken ? { 'X-Authorization-JWT': authToken } : {}
 
-  const nwHeader = {
-    ...(header || {}),
-    ...tokenHeader,
+    let header = {
+      'X-Authorization-JWT': token,
+    }
 
-  }
 
-  return new Promise((resolve, reject) => {
     axios.request({
       ...leftOptions,
       url: url,
-      header: nwHeader,
-      success: (res) => {
-        const { code, message, data, token } = res.data
-        if (token || data?.token) {
-          axios.setStorage({ key: 'token', data: token || data?.token })
-        }
-        if (code === 1000) {
-          resolve(data)
-        } else {
-          console.error(res)
-          reject(message?.indexOf('java') > -1 ? '系统内部错误' : message)
+      // header: header,
+      headers: header,
+    }).then(res => {
+      const { code, data, } = res.data
+
+      if (code === 1000) {
+        resolve(data)
+      } else {
+        // Message.error(message)
+
+        if (code === 1001) {
+          // Message.error('请重新登陆')
+
+          // routerfrom.push('../Login.vue')
+
+          // this.$router.replace('../Login.vue') //replace  不记录页面 ，无法返回
         }
-      },
-      fail: (err) => {
-        const message = err.message || err.errMsg || err
+      }
+
+
+
+    }).catch(err => {
+      const message = err.message || err.errMsg || err
+      console.error("🚀 错误~ err", err)
+      // Message.error('请求错误', err)
+
+
+
+
 
-        reject(message)
+      if (err.message.includes('timeout')) {
+        // 请求超时
+        // Message.error('请求超时')
       }
+      reject(message)
+    }).finally(() => {
+      // 请求结束
     })
   })
+}
 
-}