first commit

src/app.config.js

@@ -4,6 +4,7 @@ export default {
     'pages/Index/index', // 首页
     'pages/Index/Search/index', // 搜索页
     'pages/Index/BookDetail/index', // 详情
+    'pages/Index/BookAnswer/index', // 答题
 
     'pages/Study/index', // 学习天地
 

src/components/MainPage/index.vue

@@ -76,7 +76,7 @@ export default {
     ...mapUserActions([
       'WxGetPhoneAuth',
       'WxLogin',
-      'UpdateUserInfo'
+      'PutUserInfo'
     ]),
     ...mapUserMutations([
       'EditUserInfo'
@@ -122,7 +122,7 @@ export default {
     },
     GetUserIcon (e) {
       if (e.detail.userInfo.avatarUrl) {
-        this.UpdateUserInfo({ data: { data: { avatar: e.detail.userInfo.avatarUrl, personId: this.UserInfo.personId } } }).then(() => {
+        this.PutUserInfo({ data: { data: { avatar: e.detail.userInfo.avatarUrl, personId: this.UserInfo.personId } } }).then(() => {
           this.EditUserInfo({ name: 'avatar', value: e.detail.userInfo.avatarUrl })
           this.ShowUserIconAuthPopup = false
           if (!this.UserInfo.phone) {
@@ -141,7 +141,7 @@ export default {
       }
       this.WxGetPhoneAuth({ data: { data: { ...this.WxInfoData, sessionKey: this.UserInfo.sessionKey } } }).then((res) => {
         if (res.data.data.phone) {
-          this.UpdateUserInfo({ data: { data: { phone: res.data.data.phone, personId: this.UserInfo.personId } } }).then(() => {
+          this.PutUserInfo({ data: { data: { phone: res.data.data.phone, personId: this.UserInfo.personId } } }).then(() => {
             this.EditUserInfo({ name: 'phone', value: res.data.data.phone })
             this.ShowPhoneAuthPopup = false
             this.$emit('UserInfoChange')

src/components/ReadedItem/index.vue

@@ -14,7 +14,7 @@
         <text>类型：{{Data.tags && Data.tags.length ? Data.tags[0] : '-'}}</text>
       </view>
     </view>
-    <view class="ProgressContainer">
+    <!-- <view class="ProgressContainer">
       <view class="centerLabel">
         <view class="Progress">
           <view class="Sector"></view>
@@ -26,7 +26,7 @@
         <text class="Length">总时长</text>
         <text class="Length">1小时25分钟36秒</text>
       </view>
-    </view>
+    </view> -->
   </navigator>
 </template>
 

src/pages/Index/BookAnswer/index.config.js

@@ -0,0 +1,4 @@
+export default {
+  // navigationStyle: 'custom',
+  navigationBarTitleText: '答题'
+}

src/pages/Index/BookAnswer/index.vue

@@ -0,0 +1,62 @@
+<template>
+  <view class="page">
+    <MainPage ref="MainPage" @UserInfoChange="Init">
+      <view class="page">
+        <PageBottom></PageBottom>
+      </view>
+    </MainPage>
+  </view>
+</template>
+
+<script>
+import Taro from '@tarojs/taro'
+import MainPage from '../../../components/MainPage'
+import PageBottom from '../../../components/PageBottom'
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapUserState, mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
+export default {
+  name: 'BookDetail',
+  data () {
+    return {
+      ArticleInfo: {},
+      DataLock: false
+    }
+  },
+  computed: {
+    ...mapUserState({
+      UserInfo: x => x.UserInfo // 用户信息
+    })
+  },
+  components: {
+    MainPage,
+    PageBottom
+  },
+  created () {
+  },
+  mounted () {
+    this.$nextTick(() => {
+    })
+  },
+  methods: {
+    ...mapUserActions([
+      'GetArticleDetail'
+    ]),
+    ...mapUserMutations([
+    ]),
+    Init () {
+      if (this.UserInfo !== null) {
+        this.GetArticleDetail({ urlData: { id: Taro.getCurrentInstance().router.params.id } }).then((res) => {
+          this.ArticleInfo = res.data.data || {}
+        })
+        if (this.UserInfo.studentId === null || this.UserInfo.studentId === '') {
+          this.$refs.MainPage.ShowStudentIdPopup = true
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+@import "page.scss";
+</style>

src/pages/Index/BookAnswer/page.scss

@@ -0,0 +1,188 @@
+.page {
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  background: #f8f8f8;
+  > .flex-item {
+    position: relative;
+    overflow: hidden;
+    > view {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 0;
+      bottom: 0;
+      overflow-y: scroll;
+      -webkit-overflow-scrolling: touch;
+      > .FrontInfo {
+        position: relative;
+        overflow: hidden;
+        > .Img {
+          padding: 30px 120px;
+          > view {
+            width: 100%;
+            padding-bottom: 120%;
+            position: relative;
+            overflow: hidden;
+            > image {
+              width: 100%;
+              height: 100%;
+            }
+          }
+        }
+        > .SubInfo {
+          position: relative;
+          overflow: hidden;
+          > .Tag {
+            font-size: 0;
+            white-space: nowrap;
+            padding: 0 30px;
+            > text {
+              display: inline-block;
+              vertical-align: middle;
+              font-size: 28px;
+              font-weight: bold;
+              line-height: 60px;
+              margin-right: 10px;
+              &.iconfont {
+                font-weight: normal;
+                font-size: 40px;
+              }
+            }
+          }
+          > .flex-h {
+            align-items: center;
+            padding: 0 30px;
+            > view {
+              align-items: center;
+              > text {
+                font-size: 28px;
+                line-height: 40px;
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                color: #999;
+                &:first-child {
+                  margin-right: 10px;
+                }
+              }
+            }
+          }
+          > .Desc {
+            padding: 0 30px;
+            position: relative;
+            overflow: hidden;
+            > text {
+              width: 100%;
+              display: block;
+              font-size: 28px;
+              line-height: 40px;
+              color: #999;
+            }
+          }
+        }
+        > .Article {
+          position: relative;
+          overflow: hidden;
+          border-top: 2px solid #eee;
+          padding: 30px;
+          margin-top: 30px;
+        }
+        > .ToAnswer {
+          padding: 30px;
+          position: relative;
+          overflow: hidden;
+          > navigator {
+            display: block;
+            text-align: center;
+            font-size: 28px;
+            background: #f4c819;
+            line-height: 80px;
+            border-radius: 40px;
+            color: #333;
+          }
+        }
+      }
+    }
+  }
+  > .Bottom {
+    position: relative;
+    overflow: hidden;
+    background: #fff;
+    align-items: center;
+    padding-left: 30px;
+    z-index: 2;
+    box-shadow: 0 0 10px 10px rgba(0, 0, 0, 0.05);
+    > .Share,
+    .Like {
+      font-size: 0;
+      white-space: nowrap;
+      margin-right: 30px;
+      > text {
+        display: inline-block;
+        vertical-align: middle;
+        font-size: 28px;
+        color: #333;
+        line-height: 40px;
+        &:first-child {
+          font-size: 36px;
+          &.active {
+            color: #f4c819;
+          }
+        }
+      }
+    }
+    > .Answer {
+      position: relative;
+      overflow: hidden;
+      > navigator {
+        display: block;
+        width: 180px;
+        text-align: center;
+        line-height: 100px;
+        background: #f4c819;
+        color: #333;
+        font-size: 28px;
+      }
+    }
+    > .ReadInfo {
+      position: relative;
+      overflow: hidden;
+      > text {
+        display: block;
+        white-space: nowrap;
+        font-size: 26px;
+        color: #333;
+        line-height: 32px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        text-align: right;
+      }
+      > .Progress {
+        align-items: center;
+        margin-top: 10px;
+        > .flex-item {
+          height: 10px;
+          background: rgba(41, 141, 248, 0.5);
+          border-radius: 10px;
+          position: relative;
+          overflow: hidden;
+          margin-right: 20px;
+          > view {
+            width: 0;
+            height: 100%;
+            position: absolute;
+            left: 0;
+            top: 0;
+            background: rgba(41, 141, 248, 1);
+          }
+        }
+        > text {
+          font-size: 26px;
+          color: #333;
+          line-height: 32px;
+        }
+      }
+    }
+  }
+}

src/pages/Index/BookDetail/index.vue

@@ -49,6 +49,11 @@
                 <rich-text :nodes="ArticleInfo.content"></rich-text>
               </view>
 
+              <!-- 去答题 -->
+              <view class="ToAnswer">
+                <navigator :url="`/pages/Index/BookAnswer/index?id=${ArticleInfo.postId}`" hover-class="none">去答题</navigator>
+              </view>
+
             </view>
 
             <PageBottom></PageBottom>
@@ -66,7 +71,10 @@
             <text>收藏</text>
           </view>
           <view class="flex-item"></view>
-          <view class="ReadInfo">
+          <view class="Answer">
+            <navigator :url="`/pages/Index/BookAnswer/index?id=${ArticleInfo.postId}`" hover-class="none">去答题</navigator>
+          </view>
+          <!-- <view class="ReadInfo">
             <text>阅读时长：1小时22分钟22秒</text>
             <view class="Progress flex-h">
               <view class="flex-item">
@@ -74,7 +82,7 @@
               </view>
               <text>完成进度</text>
             </view>
-          </view>
+          </view> -->
         </view>
       </view>
     </MainPage>

src/pages/Index/BookDetail/page.scss

@@ -88,6 +88,20 @@
           padding: 30px;
           margin-top: 30px;
         }
+        > .ToAnswer {
+          padding: 30px;
+          position: relative;
+          overflow: hidden;
+          > navigator {
+            display: block;
+            text-align: center;
+            font-size: 28px;
+            background: #f4c819;
+            line-height: 80px;
+            border-radius: 40px;
+            color: #333;
+          }
+        }
       }
     }
   }
@@ -95,8 +109,8 @@
     position: relative;
     overflow: hidden;
     background: #fff;
-    padding: 20px 30px;
     align-items: center;
+    padding-left: 30px;
     z-index: 2;
     box-shadow: 0 0 10px 10px rgba(0, 0, 0, 0.05);
     > .Share,
@@ -118,6 +132,19 @@
         }
       }
     }
+    > .Answer {
+      position: relative;
+      overflow: hidden;
+      > navigator {
+        display: block;
+        width: 180px;
+        text-align: center;
+        line-height: 100px;
+        background: #f4c819;
+        color: #333;
+        font-size: 28px;
+      }
+    }
     > .ReadInfo {
       position: relative;
       overflow: hidden;

src/pages/Mine/MyInfo/index.vue

@@ -21,7 +21,7 @@
           <view class="flex-h">
             <view>姓名</view>
             <view class="flex-item">
-              <text>{{UserInfo.name}}</text>
+              <input placeholder="请输入姓名" v-model="Form.name" />
               <!-- <input placeholder="请输入姓名" /> -->
             </view>
           </view>
@@ -89,6 +89,8 @@ export default {
       IsPull: false,
       DataLock: false,
       Form: {
+        name: null,
+        personId: null,
         sex: null,
         phone: null,
         email: null,
@@ -114,9 +116,10 @@ export default {
   },
   methods: {
     ...mapUserActions([
-      'UpdateUserInfo'
+      'PutUserInfo'
     ]),
     ...mapUserMutations([
+      'UpdateUserInfo'
     ]),
     Init () {
       if (this.UserInfo !== null) {
@@ -138,7 +141,14 @@ export default {
             Data[key] = this.Form[key]
           }
         }
-        this.UpdateUserInfo({ data: { data: { ...Data } } }).then(() => {
+        this.PutUserInfo({ data: { data: { ...Data } } }).then((res) => {
+          console.log(res.data.data)
+          this.UpdateUserInfo({ ...res.data.data })
+          wx.showToast({
+            title: '保存成功',
+            icon: 'none',
+            duration: 2000
+          })
           this.DataLock = false
         }).catch(() => {
           this.DataLock = false

src/store/user/index.js

@@ -29,7 +29,7 @@ export default {
         ToolClass.ToolRequest({ url: Api.WxLogin.url, method: Api.WxLogin.method, ...payload, success (res) { context.commit('UpdateUserInfo', { ...res.data.data.person, sessionKey: res.data.data.sessionKey }); resolve(res) }, error (res) { reject(res) } })
       })
     },
-    UpdateUserInfo (context, payload) { // 更新用户信息
+    PutUserInfo (context, payload) { // 更新用户信息
       return new Promise((resolve, reject) => {
         ToolClass.ToolRequest({ url: Api.UpdateUserInfo.url, method: Api.UpdateUserInfo.method, ...payload, success (res) { context.commit('UpdateUserInfo', res.data.data.person); resolve(res) }, error (res) { reject(res) } })
       })