style

src/components/ClassInfo.vue

@@ -8,9 +8,12 @@
           <div
             class="class-box-body-top-Info-Time"
           >课程时间：{{parseTime(ClassContent.startDate,'{m}月{d}日 {h}:{i}')}}~{{parseTime(ClassContent.endDate,'{m}月{d}日 {h}:{i}')}}</div>
-          <div class="class-box-body-top-Info-Shoucang">
-            <img src="../assets/Collection/off.png" alt />
-            <span>已收藏</span>
+          <div
+            class="class-box-body-top-Info-Shoucang"
+            @click="ClassContent.isFavored==null? collectionHande():deleteColl()"
+          >
+            <img :src="ClassContent.isFavored?on:off" alt />
+            <span>{{ClassContent.isFavored?'已收藏':'收藏'}}</span>
           </div>
         </div>
       </div>
@@ -23,24 +26,56 @@
 </template>
 
 <script>
-import { getCourseInfof } from '../util/api'
+import { getCourseInfof, addCollection, deleteCollection } from '../util/api'
 import { parseTime, SignInTime } from '../util/formattingData'
 
 export default {
   data() {
     return {
-      ClassContent: null
+      ClassContent: null,
+      isShoucang: false,
+      courseIds: '',
+
+      on: require('../assets/Collection/on.png'),
+      off: require('../assets/Collection/off.png')
     }
   },
   mounted() {
     this.onloadClass()
+    this.courseIds = this.$route.params.courseId
   },
   methods: {
     parseTime,
     onloadClass() {
       getCourseInfof(this.$route.params.courseId).then((e) => {
         this.ClassContent = e
+        if (e.isFavored) {
+          this.isShoucang = true
+        }
+
+        console.log(e)
+      })
+    },
+    collectionHande() {
+      addCollection({
+        targetId: this.$route.params.courseId,
+        targetName: this.ClassContent.title,
+        targetType: 'course'
+      }).then((e) => {
+        console.log(e)
+        this.$toast('收藏成功')
+        this.onloadClass()
+      })
+    },
+    deleteColl() {
+      deleteCollection({
+        targetId: this.$route.params.courseId,
+        targetName: this.ClassContent.title,
+        targetType: 'course'
+      }).then((e) => {
         console.log(e)
+        this.$toast('取消收藏成功')
+        this.onloadClass()
       })
     }
   }
@@ -53,7 +88,6 @@ export default {
   height: 100%;
   &-body {
     width: 99%;
-    border: 1px solid red;
     border-radius: 30px;
     background-color: #fff;
     position: absolute;

src/components/Course.vue

@@ -54,8 +54,8 @@ export default {
 
   methods: {
     goQuestion(courseId) {
-      this.$router.push({ name: 'ClassInfo', params: { courseId: courseId } })
-      // this.$router.push('/signIn')
+      // this.$router.push({ name: 'ClassInfo', params: { courseId: courseId } })
+      this.$router.push('/Questionnaire')
     },
     parseTime, //时间格式化
 
@@ -113,7 +113,7 @@ export default {
     border-radius: 10px;
     margin: 10px auto;
     box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.2);
-
+    margin-bottom: 2em;
     height: 33vh;
     .van-swipe-item {
     }
@@ -123,10 +123,10 @@ export default {
   }
 
   .Card-box {
-    width: 95%;
+    width: 93%;
     border-radius: 10px;
     background-color: #fff;
-    margin: 1.8em auto 1em auto;
+    margin: 1em auto 0.4em auto;
     box-shadow: 0 0 15px rgb(214, 214, 214);
 
     .Card-box-top {

src/components/MyCollection.vue

@@ -1,26 +1,103 @@
 <template>
-  <h1>2</h1>
+  <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+    <div class="Card-box" v-for="(item, index) in shoucangList" :key="index">
+      <div>
+        <div class="Card-box-top">
+          <!-- <img :src="item.content" alt /> -->
+          <div class="Card-box-top-box">
+            <div class="Card-box-top-title">{{item.targetName}}</div>
+            <div
+              class="Card-box-top-time"
+            >收藏时间：{{parseTime(item.createDate, '{y}年{m}月{d}日 {h}:{i}')}}</div>
+          </div>
+        </div>
+        <div class="Card-box-botton" @click="goQuestion(item.targetId)">
+          <div>查看详情</div>
+          <van-icon name="arrow" />
+        </div>
+      </div>
+    </div>
+  </van-list>
 </template>
 
 <script>
 import { getCollection, deleteCollection } from '../util/api'
+import { parseTime } from '../util/formattingData'
 
 export default {
   data() {
-    return {}
+    return {
+      loading: false,
+      finished: true,
+      shoucangList: []
+    }
   },
   mounted() {
     this.onLoadCollertion()
   },
   methods: {
+    parseTime,
     onLoadCollertion() {
       getCollection().then((e) => {
+        this.shoucangList = e.records
         console.log('收藏列表', e)
       })
-    }
+    },
+    onLoad() {}
   }
 }
 </script>
 
 <style lang="less" scoped>
+.Card-box {
+  width: 93%;
+  border-radius: 10px;
+  background-color: #fff;
+  margin: 1em auto 0.4em auto;
+  box-shadow: 0 0 15px rgb(214, 214, 214);
+  .Card-box-top {
+    display: flex;
+    align-items: center;
+    padding: 0.8em 0 0.6em 0.4em;
+    > img {
+      width: 65px;
+      height: 65px;
+      border-radius: 50%;
+
+      // padding: 20px;
+    }
+    &-box {
+      // width: 63vw;
+    }
+
+    &-title {
+      font-size: 16px;
+      font-weight: 700;
+      letter-spacing: 1px;
+      padding: 0 0 12px 10px;
+    }
+    &-time {
+      font-size: 12px;
+      color: rgb(133, 133, 133);
+      padding: 0px 0 0px 10px;
+    }
+  }
+  .Card-box-botton {
+    width: 90%;
+    margin: 0 auto;
+    border-top: 1px solid rgb(238, 238, 238);
+    display: flex;
+    color: rgb(133, 133, 133);
+    justify-content: space-between;
+    font-size: 10px;
+
+    > div {
+      padding: 10px 0 10px 0;
+    }
+    .van-icon {
+      position: relative;
+      top: 1.9vh;
+    }
+  }
+}
 </style>

src/components/Question/TextAreas.vue

@@ -0,0 +1,14 @@
+<template>
+  <div>
+    <textarea>
+      asdsadas
+    </textarea>
+  </div>
+</template>
+
+<script>
+export default {}
+</script>
+
+<style>
+</style>

src/components/Question/Title.vue

@@ -25,12 +25,14 @@ export default {
   methods: {
     formatType(typ) {
       switch (typ) {
-        case 'single':
+        case 'radio':
           return '单选'
-        case 'many':
+        case 'checkBox':
           return '多选'
-        case 'judgment':
+        case 'switch':
           return '判断'
+        case 'textarea':
+          return '简答题'
         default:
           return '未知题型'
       }

src/components/Question/index.vue

@@ -3,14 +3,16 @@
     <q-title v-bind="qTitleContent"></q-title>
     <div style="margin-top:3em;">
       <div class="scroll">
-        <answer
-          v-for="answer in question.answerList"
-          :key="answer.answerId"
-          :active="values.includes(answer.option)"
-          :option="answer.option"
-          :label="answer.content"
-          @click="handleAnswer(answer.option)"
-        ></answer>
+        <div v-for="answer in question.answerList" :key="answer.answerId">
+          <TextAreas v-if="answer.questionType=='textarea'" />
+          <answer
+            v-else
+            :active="values.includes(answer.optCode)"
+            :option="answer.optCode"
+            :label="answer.content"
+            @click="handleAnswer(answer.optCode)"
+          ></answer>
+        </div>
       </div>
     </div>
   </div>
@@ -21,7 +23,8 @@ export default {
   name: 'Question',
   components: {
     Answer: () => import('./Answer.vue'),
-    QTitle: () => import('./Title.vue')
+    QTitle: () => import('./Title.vue'),
+    TextAreas: () => import('./TextAreas.vue')
   },
   props: {
     value: {
@@ -37,6 +40,9 @@ export default {
     serialNo: {
       type: Number,
       required: true
+    },
+    types: {
+      type: String
     }
   },
   data() {
@@ -44,25 +50,29 @@ export default {
       answerValues: {}
     }
   },
+
   computed: {
     qTitleContent() {
       return {
-        serialNo: this.serialNo,
-        title: this.question.title,
-        qType: this.question.optType
+        serialNo: this.question.sortNo + 1,
+        title: this.question.content,
+        qType: this.question.questionType
       }
     },
+
     values() {
       // 为了便捷处理, 不同的问题类型。所有的答案统一处理为数组
       return Array.isArray(this.value) ? this.value : [this.value]
     }
   },
+
   methods: {
     handleAnswer(opt) {
+      console.log('🚀 ~ file: index.vue ~ line 68 ~ handleAnswer ~ opt', opt)
       const isChecked = this.values.includes(opt)
 
       // 如果是多选
-      if (this.question.optType === 'many') {
+      if (this.question.optType === 'checkBox') {
         if (isChecked) {
           this.$emit(
             'input',
@@ -84,7 +94,7 @@ export default {
   width: 80vw;
   margin: 0 auto;
   position: relative;
-  top: -15vh;
+  top: 5vh;
   left: -4%;
   background: white;
   box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);

src/components/QuestionnHome.vue

@@ -0,0 +1,65 @@
+<template>
+  <div :class="{'QuestionnHome-box':true,'actveBox':isActve}">
+    <h1>{{Content.name||''}}</h1>
+    <div @click="goTop">点我消失</div>
+  </div>
+</template>
+
+<script>
+import { getQuestionnaire } from '../util/api'
+
+export default {
+  name: 'QuestionnHome',
+  props: {
+    active: Boolean
+  },
+  data() {
+    return {
+      isActve: false,
+      Content: null
+    }
+  },
+  mounted() {
+    this.onLoadQuestionn()
+  },
+  methods: {
+    goTop() {
+      if (this.Content.isAnswered) {
+        this.$toast('您已回答过此问卷！')
+      } else {
+        this.isActve = true
+      }
+    },
+    onLoadQuestionn() {
+      getQuestionnaire('f5a47d178019bda33a370d7a6ed1e4c3').then((e) => {
+        this.Content = e
+      })
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.QuestionnHome-box {
+  width: 100vw;
+  height: 100vh;
+  z-index: 5000;
+  background-color: aquamarine;
+  display: flex;
+  position: absolute;
+  flex-direction: column;
+  top: 0;
+  transition: top 1.4s ease;
+
+  align-items: center;
+  & > div {
+    width: 100px;
+    height: 100px;
+    border: 1px solid red;
+    margin: 0 auto;
+  }
+}
+.actveBox {
+  top: -250vh;
+}
+</style>

src/components/Questionnaire.vue

@@ -1,5 +1,6 @@
 <template>
   <div>
+    <QuestionnHome />
     <!-- <img :src="backgeImg" class="ImagStyle" /> -->
     <popup
       :show="showPopup"
@@ -15,36 +16,37 @@
     </popup>
 
     <!-- 页面标题 -->
-    <div class="VSTD_box" v-if="question.length > 0">
+    <div class="VSTD_box" v-if="questionList.length > 0">
       <!-- 题的表单 -->
       <!-- 绑定表单的数据 ruleForm -->
       <!-- 绑定题的数组 ruleForm.resource[index] -->
 
-      <el-form class="demo-ruleForm">
+      <van-form class="demo-ruleForm">
         <!-- 循环后端  的所有题 -->
         <div class="VSTD_box_item">
           <question
+            :types="questionList[netx].questionType"
             :question="currentQuestion"
             :serial-no="netx + 1"
             v-model="currentQuestion.rightAnswer"
           ></question>
 
           <div class="but-box">
-            <el-form-item class="but-box-form-item">
-              <el-button class="butsize" v-show="ButPrevious" @click="PreviousBut">上一题</el-button>
-              <el-button
-                type="primary"
+            <van-form class="but-box-form-item">
+              <van-button class="butsize" v-show="ButPrevious" @click="PreviousBut">上一题</van-button>
+              <van-button
+                type="info"
                 class="butsize"
                 v-show="Butnetx"
                 @click="netxBut(currentQuestion.rightAnswer)"
-              >下一题</el-button>
-              <el-button type="primary" class="butsize" v-show="Butsubmit" @click="firstSubmit">提交</el-button>
-            </el-form-item>
+              >下一题</van-button>
+              <van-button type="info" class="butsize" v-show="Butsubmit" @click="firstSubmit">提交</van-button>
+            </van-form>
           </div>
         </div>
 
         <!-- 提交函数  -->
-      </el-form>
+      </van-form>
     </div>
 
     <!-- 如果没题就提示没题 -->
@@ -59,15 +61,17 @@
 </template>
 
 <script>
-// import { getQuestionList, submitAnswer } from '@/util/api'
-// import query from '../util/query'
+import { getQuestion, getQuestionInfo, getQuestionAnswer } from '../util/api'
+import query from '../util/query'
 
 export default {
-  name: 'Questionnaire',
+  name: 'HelloWorld',
   components: {
     Question: () => import('./Question'),
-    Popup: () => import('./Questionnaire/Popup.vue')
+    Popup: () => import('./Questionnaire/Popup.vue'),
+    QuestionnHome: () => import('./QuestionnHome.vue')
   },
+  props: {},
   data() {
     return {
       showPopup: false,
@@ -83,126 +87,116 @@ export default {
       indexSum: 0, //第indexSum题
       // questionId: '', //试题的id
       title: '', //返回的题目信息
-      question: [], //答题保存的数组
+      questionList: [], //答题保存的数组
 
       DSQ: null, //定时器，到时间自动提交
       DSQTime: 0 //后端返回的结束时间
     }
+  },
+  computed: {
+    currentQuestion: {
+      get: function () {
+        return this.questionList[this.netx]
+      },
+      set: function (val) {
+        this.$set(this.questionList, this.netx, val)
+      }
+    }
+  },
+  created() {
+    // findIndex 用来获取数组中第一个满足条件的元素下标
+    var v = this.questionList.findIndex((value, index, arr) => {
+      return value.a == '2'
+    })
+  },
+
+  mounted() {
+    this.onSearch()
+  },
+
+  methods: {
+    cancelForm() {
+      this.showPopup = false
+      console.log('点击了取消')
+    },
+
+    onSearch() {
+      getQuestion('f5a47d178019bda33a370d7a6ed1e4c3').then((res) => {
+        console.log('题目列表', res)
+        const { records, total } = res
+        this.questionList = records || []
+      })
+      // let sum = 0
+    },
+    firstSubmit() {
+      this.showPopup = true
+    },
+    submitForm(e) {
+      this.LoadingShowAAA = true
+      console.log('🚀 ~ f e', e)
+      // const { questionId, rightAnswer } = this.question
+      console.log(this.questionList)
+
+      let NEW_ARR = this.questionList.map((obj) => {
+        if (Array.isArray(obj.rightAnswer)) {
+          let sliceArray = obj.rightAnswer.slice(1)
+          let stringArray = sliceArray.sort().toLocaleString()
+
+          return { questionId: obj.questionId, answer: stringArray }
+        } else {
+          return { questionId: obj.questionId, answer: obj.rightAnswer }
+        }
+      })
+      console.log(NEW_ARR)
+
+      getQuestionAnswer(
+        this.$store.state.user.appid,
+        query('gameId'),
+        NEW_ARR
+      ).then((e) => {
+        console.log(e.score, e)
+        this.$store.commit('SET_USER_INFO', { scoreNumb: e.result.score })
+        this.$store.commit('SET_USER_INFO', { resultInfo: e.result.resultId })
+        this.LoadingShowAAA = false
+        this.showPopup = false
+
+        this.$router.replace('/Leaderboard') //replace  不记录页面 ，无法返回
+      })
+    },
+
+    netxBut(e) {
+      if (e !== null) {
+        if (this.netx >= this.questionList.length - 2) {
+          this.Butnetx = false
+          this.Butsubmit = true
+        }
+        if (this.netx <= this.questionList.length - 2) {
+          this.netx = this.netx + 1
+          this.ButPrevious = this.ButPrevious = true
+          this.indexSum = this.indexSum + 1
+        }
+      } else {
+        this.$message.warning('请选择至少一项')
+      }
+    },
+
+    PreviousBut() {
+      if (this.netx >= 1) {
+        this.Butnetx = true
+        this.Butsubmit = false
+      }
+      if (this.netx <= 1) {
+        this.ButPrevious = this.ButPrevious = false
+        this.Butnetx = true
+      }
+      if (this.netx <= 0) {
+        console.log('???', this.netx, this.questionList.length)
+      } else {
+        this.netx = this.netx - 1
+        this.indexSum = this.indexSum - 1
+      }
+    }
   }
-  //   computed: {
-  //     currentQuestion: {
-  //       get: function () {
-  //         return this.question[this.netx]
-  //       },
-  //       set: function (val) {
-  //         this.$set(this.question, this.netx, val)
-  //       }
-  //     }
-  //   },
-  //   created() {
-  //     // findIndex 用来获取数组中第一个满足条件的元素下标
-  //     var v = this.question.findIndex((value, index, arr) => {
-  //       return value.a == '2'
-  //     })
-  //   },
-
-  //   mounted() {
-  //     this.onSearch()
-  //   },
-
-  //   methods: {
-  //     cancelForm() {
-  //       this.showPopup = false
-  //       console.log('点击了取消')
-  //     },
-
-  //     onSearch() {
-  //       getQuestionList(this.$store.state.user.appid, query('gameId')).then(
-  //         (res) => {
-  //           console.log('题目列表', res)
-  //           const { questionId, title, optType } = res
-  //           this.question = res
-  //           this.questionId = questionId
-  //           this.title = title
-  //           let NBMMSSD = res.map((obj) => {
-  //             let start = 0
-  //             let sum = obj.score
-  //             start += sum
-  //             return start
-  //           })
-  //           let oversum = eval(NBMMSSD.join('+'))
-  //           this.$store.commit('SET_USER_INFO', { totalScore: oversum })
-  //         }
-  //       )
-  //       // let sum = 0
-  //     },
-  //     firstSubmit() {
-  //       this.showPopup = true
-  //     },
-  //     submitForm(e) {
-  //       this.LoadingShowAAA = true
-  //       console.log('🚀 ~ f e', e)
-  //       // const { questionId, rightAnswer } = this.question
-  //       console.log(this.question)
-
-  //       let NEW_ARR = this.question.map((obj) => {
-  //         if (Array.isArray(obj.rightAnswer)) {
-  //           let sliceArray = obj.rightAnswer.slice(1)
-  //           let stringArray = sliceArray.sort().toLocaleString()
-
-  //           return { questionId: obj.questionId, answer: stringArray }
-  //         } else {
-  //           return { questionId: obj.questionId, answer: obj.rightAnswer }
-  //         }
-  //       })
-  //       console.log(NEW_ARR)
-
-  //       submitAnswer(this.$store.state.user.appid, query('gameId'), NEW_ARR).then(
-  //         (e) => {
-  //           console.log(e.score, e)
-  //           this.$store.commit('SET_USER_INFO', { scoreNumb: e.result.score })
-  //           this.$store.commit('SET_USER_INFO', { resultInfo: e.result.resultId })
-  //           this.LoadingShowAAA = false
-  //           this.showPopup = false
-
-  //           this.$router.replace('/Leaderboard') //replace  不记录页面 ，无法返回
-  //         }
-  //       )
-  //     },
-
-  //     netxBut(e) {
-  //       if (e !== null) {
-  //         if (this.netx >= this.question.length - 2) {
-  //           this.Butnetx = false
-  //           this.Butsubmit = true
-  //         }
-  //         if (this.netx <= this.question.length - 2) {
-  //           this.netx = this.netx + 1
-  //           this.ButPrevious = this.ButPrevious = true
-  //           this.indexSum = this.indexSum + 1
-  //         }
-  //       } else {
-  //         this.$message.warning('请选择至少一项')
-  //       }
-  //     },
-
-  //     PreviousBut() {
-  //       if (this.netx >= 1) {
-  //         this.Butnetx = true
-  //         this.Butsubmit = false
-  //       }
-  //       if (this.netx <= 1) {
-  //         this.ButPrevious = this.ButPrevious = false
-  //         this.Butnetx = true
-  //       }
-  //       if (this.netx <= 0) {
-  //         console.log('???', this.netx, this.question.length)
-  //       } else {
-  //         this.netx = this.netx - 1
-  //         this.indexSum = this.indexSum - 1
-  //       }
-  //     }
-  //   }
 }
 </script>
 
@@ -218,16 +212,25 @@ export default {
   .demo-ruleForm {
     width: 80%;
     display: flex;
-    margin: auto;
+    margin: 0 auto;
     .VSTD_box_item {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+
       .but-box {
-        position: absolute;
-        width: 80%;
-        align-items: center;
-        bottom: 10px;
-        margin: auto;
+        width: 62vw;
+        .but-box-form-item {
+          text-align: center;
+
+          width: 100%;
+          margin: 0 auto;
+          top: -5vh;
+          position: relative;
+        }
         .butsize {
           height: 43px;
+          margin: 0 10px;
         }
       }
     }

src/components/Questionnaire/Many.vue

@@ -10,9 +10,9 @@
         <span>（多选）</span>
       </p>
     </div>
-    <!-- v-model="ruleForm.ManyVal" -->
+    <!-- v-model="ruleForm.checkboxVal" -->
     <div class="group-box">
-      <el-form-item label=" " class="Single-radio">
+      <van-form label=" " class="Single-radio">
         <el-checkbox-group :change="changeVaal" style="display:grid">
           <el-checkbox
             :class="`Single-elradio animate__animated animate__bounceInUp `"
@@ -22,14 +22,14 @@
           >{{ item.option }}：{{item.content}}</el-checkbox>
           <!-- <el-checkbox label="F">{{ item.stSelectf }}</el-checkbox> -->
         </el-checkbox-group>
-      </el-form-item>
+      </van-form>
     </div>
   </div>
 </template>
 
 <script>
 export default {
-  name: 'Many', //多选题
+  name: 'checkbox', //多选题
   props: {
     item: {
       type: Object
@@ -54,7 +54,7 @@ export default {
         e,
         v
       )
-      console.log('🚀 ~ file: Many.vue ~ line 18 ~ ruleForm', this.ruleForm)
+      console.log('🚀 ~ file: checkbox.vue ~ line 18 ~ ruleForm', this.ruleForm)
     }
   }
 }

src/components/Questionnaire/index.js

@@ -8,7 +8,7 @@ import Loading from './Loading.vue'//单选
 const compoents = [
   PlayGame,
   // UserScore,
-  // Many,
+  // checkbox,
   Loading,
 ]
 

src/components/StrongPhoto.vue

@@ -8,18 +8,17 @@
         </van-swipe-item>
       </van-swipe>
     </div>
-    <div style="display: flex; aline-itme:center;margin-top: 30px;padding-left: 15px;
-    ">
+    <div style="display: flex; aline-itme:center;margin-top: 30px;padding-left: 15px; ">
       <!-- <div :class="`${classStyle?'Zhedie-box Donghua':'Zhedie-box'}`"> -->
       <div :class="{'Zhedie-box': true, 'expand': classStyle}">
         <!-- :class="`${clickStyle?'clickStyle':''}`" -->
 
         <div
           v-for="(item,i) in buttList"
-          :key="item"
-          @click="SeePhotos(i)"
+          :key="i"
+          @click="SeePhotos(i,item.packId)"
           :class="activeNum === i ? 'clickStyle':''"
-        >{{item}}</div>
+        >{{item.name}}</div>
       </div>
       <van-icon
         v-show="iconShow"
@@ -32,11 +31,11 @@
     <div class="PhotoList-box">
       <div class="PhotoList-box-text">
         <div></div>
-        <span>{{title.name}}</span>
+        <span>1122222</span>
       </div>
       <div class="PhotoList-box-images">
-        <span v-for="(image, index) in title.imageList" :key="index">
-          <van-image width="31vw" :src="image.a" style="padding:0 3px 0 2px" />
+        <span v-for="(image, index) in imageList" :key="index">
+          <van-image width="31vw" :src="image.url" style="padding:0 3px 0 2px" />
         </span>
       </div>
     </div>
@@ -44,6 +43,8 @@
 </template>
 
 <script>
+import { getPhotoSotr, getPhotos } from '../util/api'
+
 import { getBanner } from '../util/api'
 
 export default {
@@ -51,46 +52,40 @@ export default {
     return {
       classStyle: false,
       clickStyle: false,
-      iconShow: false,
+      iconShow: true,
       activeNum: 0, //下标
-      buttList: [
-        '一期培训',
-        '二期培训',
-        '三期培训',
-        '四期345啊啊',
-        '四期44啊啊',
-        '四期2啊啊',
-        '四期0啊啊'
-      ],
+      buttList: [],
       photoBannerImages: [],
-      title: {
-        name: '2022年02月22日',
-        imageList: [
-          { a: 'https://img.yzcdn.cn/vant/cat.jpeg' },
-          { a: 'https://img.yzcdn.cn/vant/cat.jpeg' },
-          { a: 'https://img.yzcdn.cn/vant/cat.jpeg' },
-          { a: 'https://img.yzcdn.cn/vant/cat.jpeg' },
-          { a: 'https://img.yzcdn.cn/vant/cat.jpeg' }
-          // { a: 'https://img.yzcdn.cn/vant/cat.jpeg' }
-        ]
-      }
+
+      imageList: []
     }
   },
   mounted() {
     this.onBanner()
+    this.onLoadSort()
 
-    if (this.buttList.length >= 5) {
-      this.iconShow = true
-    } else {
-      this.iconShow = false
-    }
+    // if (this.buttList.length >= 2) {
+    //   this.iconShow = true
+    // } else {
+    //   this.iconShow = false
+    // }
   },
   methods: {
+    onLoadSort() {
+      getPhotoSotr().then((e) => {
+        this.buttList = e.records
+        console.log(e.records)
+      })
+    },
     animations() {
       this.classStyle = !this.classStyle
     },
-    SeePhotos(i) {
+    SeePhotos(i, id) {
+      console.log('🚀 ~ file: StrongPhoto.vue ~ line 94 ~ SeePhotos ~ id', id)
       this.activeNum = i
+      getPhotos(id).then((e) => {
+        this.imageList = e.records
+      })
       // this.clickStyle = !this.clickStyle
     },
     onBanner() {
@@ -122,15 +117,14 @@ export default {
     display: flex;
     align-items: center;
     flex-wrap: wrap;
-    height: 30px;
+    height: 35px;
     transition: height 0.2s ease;
     &.expand {
       height: 50vh;
     }
 
     > div {
-      width: 75px;
-      height: 30px;
+      padding: 2px 10px;
       color: rgb(128, 128, 128);
       line-height: 28px;
       text-align: center;
@@ -149,6 +143,8 @@ export default {
   }
   .PhotoList-box {
     width: 100%;
+    height: auto;
+    background-color: #fff;
 
     .PhotoList-box-text {
       display: flex;
@@ -170,6 +166,7 @@ export default {
     .PhotoList-box-images {
       width: 97%;
       margin: 0 auto;
+      padding-bottom: 10vh;
     }
   }
 }

src/util/api.js

@@ -126,4 +126,84 @@ export const addCollection = (data) => request(`/api/wx/favorite`, { method: 'po
 * @returns 
 * 
 */
-export const deleteCollection = (id) => request(`/api/wx/favorite/${id}`, { method: 'delete' })
+export const deleteCollection = (data) => request(`/api/wx/favorite`, { method: 'delete', data })
+
+
+
+
+
+
+
+
+
+
+
+
+/**
+* 照片分类
+* @param
+* @returns 
+* /api/{client}/attchPack
+*/
+export const getPhotoSotr = (data) => request(`/api/wx/attchPack`, { method: 'get', data })
+
+
+
+/**
+* 照片墙
+* @param
+* @returns 
+* /api/{client}/attachment
+*/
+export const getPhotos = (id, data) => request(`/api/wx/attachment?packId=${id}&pageSize=99999`, { method: 'get', data })
+
+
+
+
+
+
+
+
+
+
+
+
+/**
+* 问卷
+* @param
+* @returns 
+* 
+*/
+export const getQuestionnaire = (id, data) => request(`/api/wx/questionnaire/${id}`, { method: 'get', data })
+
+
+/**
+* 问卷列表
+* @param
+* @returns 
+* 
+*/
+export const getQuestion = (id, data) => request(`/api/wx/question?queId=${id}&pageSize=99999`, { method: 'get', data })
+
+
+
+
+/**
+* 问卷详情
+* @param
+* @returns 
+* 
+*/
+export const getQuestionInfo = (id, data) => request(`/api/wx/question/${id}`, { method: 'get', data })
+
+
+
+
+/**
+* 问卷提交
+* @param
+* @returns 
+* 
+*/
+export const getQuestionAnswer = (id, data) => request(`/api/wx/questionnaire/${id}/answer`, { method: 'post', data })
+