fgit

src/layout/index.vue

@@ -4,13 +4,21 @@
     <router-view />
 
     <!-- 底部导航栏 -->
-    <van-tabbar v-model="active" active-color="#000" inactive-color="#D9DEE4" >
-      <van-tabbar-item
+    <van-tabbar v-model="active" active-color="#000" inactive-color="#D9DEE4">
+      <!-- <van-tabbar-item
         v-for="item in tabbar"
         :key="item.path"
         :icon="item.icon"
         :to="item.path"
-      >{{ item.text }}</van-tabbar-item>
+      >{{ item.text }}</van-tabbar-item>-->
+      <!-- :icon="item.icon.inactive" -->
+
+      <van-tabbar-item v-for="item in tabbar" :key="item.path" :to="item.path">
+        <span>{{ item.text }}</span>
+        <template #icon="props">
+          <img :src="props.active ? item.icon.active : item.icon.inactive" />
+        </template>
+      </van-tabbar-item>
     </van-tabbar>
   </div>
 </template>
@@ -31,17 +39,26 @@ export default {
         {
           path: '/Course',
           text: '培训通知',
-          icon: 'home-o'
+          icon: {
+            active: require('../assets/tabber/class1.png'),
+            inactive: require('../assets/tabber/class.png')
+          }
         },
         {
           path: '/StrongPhoto',
           text: '精彩集锦',
-          icon: 'search'
+          icon: {
+            active: require('../assets/tabber/photo1.png'),
+            inactive: require('../assets/tabber/photo.png')
+          }
         },
         {
           path: '/UserCenter',
           text: '个人中心',
-          icon: 'volume-o'
+          icon: {
+            active: require('../assets/tabber/user1.png'),
+            inactive: require('../assets/tabber/user.png')
+          }
         }
       ]
     }

src/router/index.js

@@ -5,7 +5,7 @@ import Router from 'vue-router'
 
 import Course from '@/views/Course.vue'//课程
 import MyCollection from '@/views/MyCollection.vue'//收藏
-import signIn from '@/views/signIn.vue'//打卡
+import SignIn from '@/views/SignIn.vue'//打卡
 import ClassInfo from '@/views/ClassInfo.vue'//课堂详情
 import StrongPhoto from '@/views/StrongPhoto.vue'//精彩集锦
 import UserCenter from '@/views/UserCenter.vue'//我的页面
@@ -60,9 +60,9 @@ const router = new Router({
     },
     //打卡页面
     {
-      path: '/signIn',
-      name: 'signIn',
-      component: signIn,
+      path: '/SignIn',
+      name: 'SignIn',
+      component: SignIn,
     },
     //课程详情页面
     {

src/views/Course.vue

@@ -5,6 +5,9 @@
     </div>
 
     <!-- list -->
+    <!-- 
+    <h1 @click="wen">问卷</h1>
+    <h1 @click="qian">签到</h1>-->
     <van-list
       class="mglr-10 course-list"
       v-model="loading"
@@ -49,6 +52,18 @@ export default {
   },
 
   methods: {
+    wen() {
+      this.$router.push({
+        name: 'Questionnaire',
+        params: { id: 'f5a47d178019bda33a370d7a6ed1e4c3' }
+      })
+    },
+    qian() {
+      this.$router.push({
+        name: 'SignIn',
+        params: { signId: '4ed7a69dc0df0e9132679d58a58fbf5a' }
+      })
+    },
     goQuestion(courseId) {
       this.$router.push({ name: 'ClassInfo', params: { courseId: courseId } })
       // this.$router.push('/Questionnaire')

src/views/Questionnaire.vue

@@ -1,13 +1,12 @@
 <template>
   <div class="question-wrapper">
-    <QuestionnHome :show="showFirstScreen" :content="questionnaireContent" @confirm="showFirstScreen = false" />
-
-    <van-dialog
-      v-model="showPopup"
-      title="确定提交答案吗"
-      show-cancel-button
-      @confirm="submitForm()"
-    >
+    <QuestionnHome
+      :show="showFirstScreen"
+      :content="questionnaireContent"
+      @confirm="showFirstScreen = false"
+    />
+
+    <van-dialog v-model="showPopup" title="确定提交答案吗" show-cancel-button @confirm="submitForm()">
       <p style="margin: 2em">确定要提交答案吗？</p>
     </van-dialog>
 
@@ -44,7 +43,7 @@
 </template>
 
 <script>
-import { Toast } from 'vant';
+import { Toast } from 'vant'
 import { getQuestionnaire, getQuestion, answerQuestionnaire } from '@/util/api'
 
 export default {
@@ -79,7 +78,7 @@ export default {
   watch: {
     '$route.query.id': {
       handler(v) {
-        this.loadData(v)
+        this.loadData('f5a47d178019bda33a370d7a6ed1e4c3')
       },
       immediate: true
     }
@@ -100,23 +99,25 @@ export default {
       })
       // let sum = 0
     },
-  
+
     submitForm(e) {
       const toast = Toast.loading({
         duration: 0, // 持续展示 toast
         forbidClick: true,
-        message: '请稍后...',
-      });
-      answerQuestionnaire(this.$route.query.id, this.questionList).then(e => {
-        toast.clear();
-        Toast.success('感谢您的参与');
-        this.questionnaireContent.isAnswered = true
-        this.showFirstScreen = true
-      }).catch(e => {
-        toast.clear();
-        Toast.fail(e.message);
+        message: '请稍后...'
       })
-    },
+      answerQuestionnaire(this.$route.query.id, this.questionList)
+        .then((e) => {
+          toast.clear()
+          Toast.success('感谢您的参与')
+          this.questionnaireContent.isAnswered = true
+          this.showFirstScreen = true
+        })
+        .catch((e) => {
+          toast.clear()
+          Toast.fail(e.message)
+        })
+    }
   }
 }
 </script>
@@ -125,7 +126,6 @@ export default {
 
 
 <style lang="less" scoped>
-
 .question-wrapper {
   background-image: url('~@/assets/userImag/backImag.png');
   background-size: 100%;

src/views/StrongPhoto.vue

@@ -31,6 +31,7 @@
           v-for="(image, index) in item.res"
           :key="index"
           width="31vw"
+          height="13vh"
           :src="image.url"
           style="padding:0 3px 0 2px"
           @click="showBig(image.url)"
@@ -49,7 +50,7 @@ import { getBanner } from '@/util/api'
 
 export default {
   components: {
-    BannerSwipe: () => import('./components/BannerSwipe.vue'),
+    BannerSwipe: () => import('./components/BannerSwipe.vue')
   },
   data() {
     return {
@@ -122,7 +123,7 @@ export default {
       this.newArrImageList = newArr
     },
     onLoadSort() {
-      getPhotoSotr().then((e) => {
+      getPhotoSotr({ pageSize: 2000 }).then((e) => {
         this.buttList = e.records
       })
     },
@@ -144,7 +145,7 @@ export default {
     },
     onBanner() {
       getBanner('Wonderful').then((e) => {
-        this.photoBannerImages = (e.records || []).map(x => x.thumb)
+        this.photoBannerImages = (e.records || []).map((x) => x.thumb)
         // console.log(e)
       })
     }
@@ -162,13 +163,11 @@ export default {
   .Zhedie-box {
     padding: 0 4vw;
     overflow: hidden;
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
     height: 7vw;
     transition: height 0.2s ease;
     &.expand {
-      height: 50vh;
+      height: 40vh;
+      overflow: scroll;
     }
 
     > div {
@@ -178,6 +177,7 @@ export default {
       margin-bottom: 1vw;
       text-align: center;
       font-size: 10px;
+      display: inline-block;
     }
     .clickStyle {
       color: #12a89f;

src/views/UserCenter.vue

@@ -4,18 +4,18 @@
       <div class="profile flex" v-if="divShow">
         <avatar />
         <div class="info-name flex-1">
-          <div class="title">
-            {{person.name}}
-          </div>
-          <div class="subtitle">
-            {{person.phone}}
-          </div>
+          <div class="title">{{person.name}}</div>
+          <div class="subtitle">{{person.phone}}</div>
           <div class="userInfo-button">一期架空线路工1班</div>
         </div>
       </div>
 
       <div v-else class="userInfo-button-zhuce" @click="seeUserInfo()">
-        <van-button round type="info" size="small">&nbsp;&nbsp;注&nbsp;&nbsp;&nbsp;&nbsp;册&nbsp;&nbsp;</van-button>
+        <van-button
+          round
+          type="info"
+          size="small"
+        >&nbsp;&nbsp;注&nbsp;&nbsp;&nbsp;&nbsp;册&nbsp;&nbsp;</van-button>
       </div>
     </div>
 
@@ -32,7 +32,6 @@
         />
       </van-cell-group>
     </div>
-
   </div>
 </template>
 
@@ -49,29 +48,29 @@ export default {
         {
           icon: require('@/assets/userImag/userInfo.png'),
           title: '我的信息',
-          path: '/SetUser',
+          path: '/SetUser'
         },
         {
           icon: require('@/assets/userImag/wenjuan.png'),
           title: '我的收藏',
-          path: '/MyCollection',
-        },
-        {
-          icon: require('@/assets/userImag/shoucang.png'),
-          title: '我的问卷',
-          path: '',
+          path: '/MyCollection'
         }
+        // {
+        //   icon: require('@/assets/userImag/shoucang.png'),
+        //   title: '我的问卷',
+        //   path: '',
+        // }
       ]
     }
   },
   computed: {
     ...mapState({
-      person: s => s.user,
+      person: (s) => s.user
     }),
     divShow() {
       return !!this.person?.phone
     }
-  },
+  }
 }
 </script>
 
@@ -127,9 +126,7 @@ export default {
           letter-spacing: 1px;
           background-color: #2cb698;
         }
-
       }
-
     }
     .userInfo-button-zhuce {
       margin: 0 auto;
@@ -162,7 +159,7 @@ export default {
 
     .van-icon {
       font-size: 20px;
-      
+
       & > img {
         padding-top: 2px;
       }

src/views/signIn.vue

@@ -38,10 +38,10 @@ export default {
   },
   computed: {
     ...mapState({
-      person: s => s.user
+      person: (s) => s.user
     }),
     endTimeStr() {
-      if (!this.signInfo.endTime) return '未知';
+      if (!this.signInfo.endTime) return '未知'
 
       return parseTime(this.signInfo.endTime, '{y}年{m}月{d}日 {h}:{i}')
     },
@@ -68,14 +68,16 @@ export default {
     }, 1000)
   },
   mounted() {
-    const {phone} = this.person || {}
+    const { phone } = this.person || {}
 
     if (!phone) {
-      this.$dialog.alert({
-        message: '请先维护您的个人信息',
-      }).then(() => {
-        this.$router.push({ name: 'SetUser' })
-      })
+      this.$dialog
+        .alert({
+          message: '请先维护您的个人信息'
+        })
+        .then(() => {
+          this.$router.push({ name: 'SetUser' })
+        })
     }
   },
   beforeDestroy() {
@@ -89,57 +91,62 @@ export default {
     //首先判断他有没有资格
     //  this.$toast.success('修改成功！')
     onLoadSinInfo(id) {
-      getSignInInfo(id).then((e) => {
-        this.signInfo = e
-        
-        // 必须属于签到池人员
-        if (!this.signInfo.canSign) {
-          this.canSign = false;
-          this.noSignErr = '当前活动您未参与';
-          this.shortErr = '未参与';
-          return;
-        }
-
-        if (this.signInfo.isSigned) {
-          this.canSign = false;
-          this.noSignErr = '您已签到';
-          this.shortErr = '已签到';
-          return;
-        }
-
-        // 必须是签到时间
-        const isGtStart = (this.now - new Date(this.signInfo.startTime)) > 0
-        const isLtEnd = (this.now - new Date(this.signInfo.endTime)) < 0
-        if (!isGtStart) {
-          this.canSign = false;
-          this.noSignErr = '签到未开始';
-          this.shortErr = '未开始';
-          return;
-        }
-
-        if (!isLtEnd) {
-          this.canSign = false;
-          this.noSignErr = '签到已结束';
-          this.shortErr = '已结束';
-          return;
-        }
-
-        this.canSign = true;
-        this.noSignErr = '';
-        this.shortErr = '';
-
-      }).catch(e => {
-        this.$toast(e.message)
-      })
+      getSignInInfo(id)
+        .then((e) => {
+          this.signInfo = e
+
+          // 必须属于签到池人员
+          if (!this.signInfo.canSign) {
+            this.canSign = false
+            this.noSignErr = '当前活动您未参与'
+            this.shortErr = '未参与'
+            return
+          }
+
+          if (this.signInfo.isSigned) {
+            this.canSign = false
+            this.noSignErr = '您已签到'
+            this.shortErr = '已签到'
+            return
+          }
+
+          // 必须是签到时间
+          const isGtStart = this.now - new Date(this.signInfo.startTime) > 0
+          const isLtEnd = this.now - new Date(this.signInfo.endTime) < 0
+          if (!isGtStart) {
+            this.canSign = false
+            this.noSignErr = '签到未开始'
+            this.shortErr = '未开始'
+            return
+          }
+
+          if (!isLtEnd) {
+            this.canSign = false
+            this.noSignErr = '签到已结束'
+            this.shortErr = '已结束'
+            return
+          }
+
+          this.canSign = true
+          this.noSignErr = ''
+          this.shortErr = ''
+        })
+        .catch((e) => {
+          this.$toast(e.message)
+        })
     },
     goSign() {
       if (!this.canSign) {
-        this.$toast(this.noSignErr);
-        return;
+        this.$toast(this.noSignErr)
+        return
       }
 
       postSignIn(this.$route.query.signId).then((e) => {
         console.log(e)
+        this.canSign = false
+        this.signInfo.isSigned = true
+        this.noSignErr = '您已签到'
+        this.shortErr = '已签到'
         this.$toast('签到成功')
       })
     }

src/views/userPages/SetUser.vue

@@ -97,11 +97,7 @@ export default {
     user: {
       handler(nw) {
         if (nw) {
-          this.personInfo.name = nw.name
-          this.personInfo.phone = nw.phone
-          this.personInfo.classId = nw.classId
-          this.personInfo.termId = nw.termId
-          this.personInfo.sex = nw.sex
+          this.personInfo = { ...nw }
           // this.personInfo.age = nw.age
         }
       },