feats

project.private.config.json

@@ -0,0 +1,30 @@
+{
+  "setting": {},
+  "condition": {
+    "plugin": {
+      "list": []
+    },
+    "game": {
+      "list": []
+    },
+    "gamePlugin": {
+      "list": []
+    },
+    "miniprogram": {
+      "list": [
+        {
+          "name": "pages/Index/BookAnswer/index",
+          "pathName": "pages/Index/BookAnswer/index",
+          "query": "id=087bf13fec3d74e93890f175ec867780",
+          "scene": null
+        },
+        {
+          "name": "pages/Mine/MyInfo/index",
+          "pathName": "pages/Mine/MyInfo/index",
+          "query": "",
+          "scene": null
+        }
+      ]
+    }
+  }
+}

src/components/Picker/index.vue

@@ -0,0 +1,47 @@
+<template>
+  <picker @change="handleChange" :value="index" :range="range" :range-key="labelKey">
+    <slot></slot>
+  </picker>
+</template>
+
+<script>
+export default {
+  props: {
+    value: undefined,
+    range: {
+      type: Array,
+      default: () => [],
+    },
+    labelKey: {
+      type: String,
+      default: 'label',
+    },
+    valueKey: {
+      type: String,
+      default: 'value',
+    },
+  },
+
+  data () {
+    return {
+      index: undefined,
+    }
+  },
+
+  methods: {
+    handleChange (e) {
+      if (e?.detail?.value) {
+        this.index = e.detail.value - 0
+        this.emitChange(this.range[this.index])
+      }
+    },
+
+    emitChange (item) {
+      // input 事件返回 id
+      this.$emit('input', item[this.valueKey])
+      // change 事件返回整个对象
+      this.$emit('change', item)
+    }
+  }
+}
+</script>

src/pages/Index/BookAnswer/index.vue

@@ -4,22 +4,22 @@
       <view class="page">
         <scroll-view :scroll-y="true" :enhanced="true" :show-scrollbar="false" style="height: 100%;">
           <view class="QuestionList" v-if="ArticleInfo.postTestList && ArticleInfo.postTestList !== null && ArticleInfo.postTestList.length">
-            <view v-for="(item, index) in ArticleInfo.postTestList" :key="index">
+            <view class="QuestionItem" v-for="(item, index) in ArticleInfo.postTestList" :key="index">
               <view class="Title">
-                <text>{{item.title}}</text>
+                <text>{{getQuestionTitle(item, index)}}</text>
               </view>
 
               <checkbox-group @change="CheckboxChange(item, index, $event)" v-if="item.answerType === 'checkbox'" style="padding-top: 10px;">
-                <label class="checkbox">
+                <label>
                   <checkbox value="A" :checked="false" />{{item.optionA}}
                 </label>
-                <label class="checkbox">
+                <label>
                   <checkbox value="B" :checked="false" />{{item.optionB}}
                 </label>
-                <label class="checkbox">
+                <label>
                   <checkbox value="C" :checked="false" />{{item.optionC}}
                 </label>
-                <label class="checkbox">
+                <label>
                   <checkbox value="D" :checked="false" />{{item.optionD}}
                 </label>
               </checkbox-group>
@@ -102,12 +102,6 @@ export default {
     MainPage,
     PageBottom
   },
-  created () {
-  },
-  mounted () {
-    this.$nextTick(() => {
-    })
-  },
   methods: {
     ...mapUserActions([
       'GetArticleDetail'
@@ -162,6 +156,18 @@ export default {
           }
         }
       }
+    },
+    getQuestionTitle (item, index) {
+      let qType = '判断';
+      if (item.answerType === 'radio') {
+        qType = '单选';
+      } else if (item.answerType === 'checkbox') {
+        qType = '多选';
+      }
+
+      const qIndex = index + 1
+
+      return `${qIndex}、[${qType}] ${item.title}`
     }
   }
 }

src/pages/Index/BookAnswer/page.scss

@@ -6,18 +6,25 @@
   .QuestionList {
     position: relative;
     overflow: hidden;
-    padding: 0 30px;
-    > view {
+
+    > .QuestionItem {
       position: relative;
       overflow: hidden;
       border-bottom: 2px solid #eee;
-      padding: 30px 0;
+      padding: 1em;
+      background: #fff;
+      line-height: 1.6em;
+
+      & + .QuestionItem {
+        margin-top: 1.6em;
+      }
+
       > .Title {
         position: relative;
         overflow: hidden;
         > text {
           font-size: 28px;
-          line-height: 40px;
+          // line-height: 40px;
           display: block;
         }
       }
@@ -35,18 +42,19 @@
       > radio-group {
         position: relative;
         overflow: hidden;
-        > label {
-          display: block;
-          position: relative;
-          overflow: hidden;
+      }
+
+      label {
+        display: block;
+        position: relative;
+        overflow: hidden;
+        font-size: 28px;
+        white-space: nowrap;
+        margin-top: 20px;
+        > view {
+          display: inline-block;
+          vertical-align: middle;
           font-size: 28px;
-          white-space: nowrap;
-          margin-top: 20px;
-          > view {
-            display: inline-block;
-            vertical-align: middle;
-            font-size: 28px;
-          }
         }
       }
     }

src/pages/Mine/MyInfo/index.vue

@@ -49,7 +49,17 @@
           <view class="flex-h">
             <view><text class="Point">*</text>学校</view>
             <view class="flex-item">
-              <input placeholder="请输入学校" v-model="Form.schoolName" />
+              <Picker v-model="Form.schoolId" :range="schoolList" @change="handleSchoolChange" label-key="name" value-key="schoolId">
+                <text>{{ Form.schoolName || '请选择学校' }}</text>
+              </Picker>
+            </view>
+          </view>
+          <view class="flex-h">
+            <view><text class="Point">*</text>专业</view>
+            <view class="flex-item">
+              <Picker v-model="Form.specialtyId" :range="specialtyList" @change="handleSpecialtyChange" label-key="name" value-key="specialtyId">
+                <text>{{ Form.specialtyName || '请选择专业' }}</text>
+              </Picker>
             </view>
           </view>
           <view class="flex-h">
@@ -74,9 +84,14 @@
 </template>
 
 <script>
-import MainPage from '../../../components/MainPage'
+import MainPage from '@/components/MainPage'
+import Picker from '@/components/Picker'
 import { createNamespacedHelpers } from 'vuex'
+import ToolClass from '@/util/PublicMethod'
+import Api from '@/util/Api'
+
 const { mapState: mapUserState, mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
+
 export default {
   name: 'MyInfo',
   data () {
@@ -94,10 +109,15 @@ export default {
         sex: null,
         phone: null,
         email: null,
+        schoolId: null,
         schoolName: null,
         schoolBatch: null,
+        specialtyId: null,
+        specialtyName: null,
         studentId: null
-      }
+      },
+      schoolList: [],
+      specialtyList: [],
     }
   },
   computed: {
@@ -106,9 +126,11 @@ export default {
     })
   },
   components: {
-    MainPage
+    MainPage,
+    Picker,
   },
   created () {
+    this.getSchoolList()
   },
   mounted () {
     this.$nextTick(() => {
@@ -150,6 +172,7 @@ export default {
             duration: 2000
           })
           this.DataLock = false
+          Taro.navigateBack({ delta: 1 })
         }).catch(() => {
           this.DataLock = false
         })
@@ -160,6 +183,32 @@ export default {
       window.setTimeout(() => {
         this.IsPull = false
       }, 1000)
+    },
+    getSchoolList () {
+      ToolClass.ToolRequest({
+        ...Api.GetSchoolList,
+        success: (res) => {
+          this.schoolList = res.data.data
+        }
+      })
+    },
+    getSpecialtyList (schoolId) {
+      ToolClass.ToolRequest({
+        ...Api.GetSpecialtyList,
+        queryData: { schoolId },
+        success: (res) => {
+          this.specialtyList = res.data.data
+        }
+      })
+    },
+    handleSchoolChange (school) {
+      this.Form.schoolName = school.name
+      this.Form.specialtyId = null
+      this.Form.specialtyName = null
+      this.getSpecialtyList(school.schoolId)
+    },
+    handleSpecialtyChange (specialty) {
+      this.Form.specialtyName = specialty.name
     }
   }
 }

src/util/Api/index.js

@@ -73,7 +73,13 @@ const Api = {
   // GetMyBodyCheckList: { // 获取我的体检记录
   //   method: 'get',
   //   url: `${prefix}/ma/medical-log`
-  // }
+  // },
+  GetSchoolList: {
+    url: `${prefix}/ma/school`
+  },
+  GetSpecialtyList: {
+    url: `${prefix}/ma/specialty`
+  },
 }
 
 export default Api