Merge branch 'main' of http://git.ycjcjy.com/medical-plat/wechat-yiyao into main

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    SERVER_API: '"https://api.medical.p.njyunzhi.com"'
-    // SERVER_API: '"http://127.0.0.1:8080"'
+    // SERVER_API: '"https://api.medical.p.njyunzhi.com"'
+    SERVER_API: '"http://127.0.0.1:8081"'
   },
   mini: {},
   h5: {}

src/components/BodyCheckItem/index.vue

@@ -4,7 +4,8 @@
       <text>{{Data.name}}</text>
       <text>{{ToolClass.DateFormat(Data.createDate)}}</text>
     </view>
-    <navigator url="" hover-class="none">查看报告</navigator>
+    <view>{{Data.attchment}}</view>
+    <!-- <navigator url="" hover-class="none">查看报告</navigator> -->
   </view>
 </template>
 

src/components/BookItem/page.scss

@@ -28,8 +28,8 @@
     }
     > .Desc {
       > text {
-        font-size: 28px;
-        line-height: 40px;
+        font-size: 26px;
+        line-height: 1.8em;
         overflow: hidden;
         text-overflow: ellipsis;
         display: -webkit-box;

src/components/MainPage/index.vue

@@ -105,7 +105,7 @@ export default {
             _that.WxLogin({ queryData: { code: res.code } }).then((res) => {
               wx.setStorageSync('token', res.data.data.token)
               wx.setStorageSync('tokentime', Date.now())
-              if (CurrentPageRoute !== 'pages/Index/index') { // 非首页
+              if (_that.isAuthPage()) { // 非首页
                 // if (CurrentPageRoute !== '') { // 非首页
                 if (!_that.UserInfo.avatar) { // 未授权头像
                   _that.ShowUserIconAuthPopup = true
@@ -121,7 +121,7 @@ export default {
           }
         })
       } else {
-        if (CurrentPageRoute !== 'pages/Index/index') { // 非首页
+        if (this.isAuthPage()) { // 非首页
           // if (CurrentPageRoute !== '') { // 非首页
           if (!_that.UserInfo.avatar) { // 未授权头像
             _that.ShowUserIconAuthPopup = true
@@ -195,6 +195,17 @@ export default {
           this.$emit('UserInfoChange')
         }
       })
+    },
+    isAuthPage() {
+      const whiteList = [
+        'pages/Index/index',
+        'pages/Study/index',
+      ]
+
+      const current = Taro.getCurrentPages()[Taro.getCurrentPages().length - 1].route
+      const exists = whiteList.filter((it) => current.indexOf(it) > -1)
+
+      return exists.length < 1
     }
   }
 }

src/pages/Index/BookAnswer/index.vue

@@ -120,14 +120,16 @@ export default {
       })
       if (Bool && !this.DataLock) {
         this.DataLock = true
-        this.PostArticleAnswer({ data: { data: this.ArticleInfo.postTestList } }).then(() => {
+        this.PostArticleAnswer({ data: { data: this.ArticleInfo.postTestList } }).then((res) => {
           wx.showToast({
-            title: '提交成功',
+            title: res.data.data,
             icon: 'none',
             duration: 2000
           })
           this.DataLock = false
-          wx.navigateBack({ changed: true })
+          window.setTimeout(() => {
+            wx.navigateBack({ changed: true })
+          }, 2000)
         }).catch(() => {
           this.DataLock = false
         })

src/pages/Index/BookDetail/index.vue

@@ -8,20 +8,22 @@
 
             <!-- 封面内容 -->
             <view class="FrontInfo">
-              <view class="Like" @tap="TriggerSave">
+              <!-- <view class="Like" @tap="TriggerSave">
                 <text class="iconfont iconshoucang1" :class="{'active': ArticleInfo.isSaved}"></text>
-                <!-- <text>收藏</text> -->
-              </view>
+              </view> -->
               <view class="Img">
                 <view>
                   <image mode="aspectFit" :src="ArticleInfo.poster" class="centerLabel"></image>
                 </view>
               </view>
               <view class="SubInfo">
-                <view class="Tag">
+                <view class="Tag flex-h">
                   <text class="iconfont iconbiaoqian"></text>
                   <text>分类：</text>
                   <text class="active">{{ArticleInfo.typeName}}</text>
+                  <view class="flex-item"></view>
+                  <!-- <text class="iconfont iconfenxiang" @tap="ShareArticle"></text> -->
+                  <!-- <button open-type="share" class="ShareBtn">分享</button> -->
                 </view>
                 <view class="flex-h">
                   <view class="flex-item flex-h" style="flex: 3; -webkit-flex: 3;">
@@ -30,7 +32,7 @@
                   </view>
                   <view class="flex-item flex-h" style="flex: 1; -webkit-flex: 1;">
                     <text>阅读量：</text>
-                    <text class="flex-item">{{ArticleInfo.answerNum}}</text>
+                    <text class="flex-item">{{ArticleInfo.postData ? ArticleInfo.postData.pv : 0}}</text>
                   </view>
                 </view>
                 <view class="flex-h">
@@ -66,8 +68,9 @@
         </view>
 
         <!-- 底部 -->
-        <!-- <view class="flex-h Bottom">
-          <view class="Share" @tap="ShareArticle">
+        <view class="flex-h Bottom">
+          <button open-type="share" class="ShareBtn">分享</button>
+          <view class="Share">
             <text class="iconfont iconfenxiang"></text>
             <text>分享</text>
           </view>
@@ -76,10 +79,10 @@
             <text>收藏</text>
           </view>
           <view class="flex-item"></view>
-          <view class="Answer">
+          <view class="Answer" v-if="ArticleInfo.postTestList && ArticleInfo.postTestList.length">
             <navigator :url="`/pages/Index/BookAnswer/index?id=${ArticleInfo.postId}`" hover-class="none">去答题</navigator>
           </view>
-        </view> -->
+        </view>
       </view>
     </MainPage>
   </view>

src/pages/Index/BookDetail/page.scss

@@ -17,6 +17,7 @@
       > .FrontInfo {
         position: relative;
         overflow: hidden;
+        > .Share,
         > .Like {
           display: inline-block;
           position: absolute;
@@ -39,6 +40,9 @@
             }
           }
         }
+        > .Share {
+          top: 120px;
+        }
         > .Img {
           padding: 30px 120px;
           position: relative;
@@ -81,6 +85,14 @@
                 border-radius: 6px;
               }
             }
+            > .ShareBtn {
+              opacity: 0;
+              width: 40px;
+              position: absolute;
+              z-index: 3;
+              right: 30px;
+              top: 0;
+            }
           }
           > .flex-h {
             align-items: center;
@@ -151,6 +163,15 @@
     padding-left: 30px;
     z-index: 2;
     box-shadow: 0 0 10px 10px rgba(0, 0, 0, 0.05);
+    min-height: 100px;
+    > .ShareBtn {
+      width: 92px;
+      opacity: 0;
+      position: absolute;
+      left: 30px;
+      top: 10px;
+      z-index: 2;
+    }
     > .Share,
     .Like {
       font-size: 0;
@@ -175,6 +196,7 @@
       overflow: hidden;
       padding: 10px 0;
       margin-right: 20px;
+      height: 100px;
       > navigator {
         display: block;
         width: 240px;

src/pages/Index/index.vue

@@ -57,7 +57,7 @@
                     <text>最新文章</text>
                   </view>
                   <view class="ListContainer">
-                    <view class="ArticleItem flex-h" v-for="(item, index) in NewestArticleList">
+                    <view class="ArticleItem flex-h" v-for="(item, index) in NewestArticleList" :key="index">
                       <BookItem :Data="item"></BookItem>
                     </view>
                   </view>
@@ -102,8 +102,8 @@ export default {
     BookItem,
     PageBottom
   },
-  created () {
-  },
+  onShareAppMessage() {},
+  onShareTimeline() {},
   mounted () {
     this.$nextTick(() => {
     })

src/pages/Index/page.scss

@@ -14,11 +14,11 @@
     > view {
       position: relative;
       overflow: hidden;
-      background: #fff;
+      background: #fafafa;
       border-radius: 20px;
       align-items: center;
       box-sizing: border-box;
-      border: 2px solid #333;
+      border: 1px solid rgba(0, 0, 0, 0.05);
       > text {
         font-size: 32px;
         color: #333;
@@ -86,7 +86,8 @@
               display: block;
               font-size: 32px;
               font-weight: bold;
-              line-height: 60px;
+              line-height: 1.8em;
+              padding: 0.5em 0;
             }
           }
           > .ListContainer {
@@ -120,7 +121,7 @@
                     margin-top: 6px;
                     display: block;
                     font-size: 28px;
-                    line-height: 40px;
+                    line-height: 1.8em;
                     white-space: nowrap;
                     overflow: hidden;
                     text-overflow: ellipsis;
@@ -142,7 +143,8 @@
               display: block;
               font-size: 32px;
               font-weight: bold;
-              line-height: 60px;
+              line-height: 1.8em;
+              padding: 0.5em 0;
             }
           }
           > .ListContainer {
@@ -184,8 +186,8 @@
                 }
                 > .Desc {
                   > text {
-                    font-size: 28px;
-                    line-height: 40px;
+                    font-size: 24px;
+                    line-height: 28px;
                     overflow: hidden;
                     text-overflow: ellipsis;
                     display: -webkit-box;

src/pages/Mine/MyBodyCheck/index.vue

@@ -2,7 +2,7 @@
   <view class="page">
     <MainPage ref="MainPage" @UserInfoChange="Init">
       <view class="page flex-v">
-        <view class="UserInfo">
+        <view class="UserInfo" v-if="UserInfo.studentId">
           <view class="flex-h">
             <view class="flex-h flex-item">
               <text>姓名：</text>

src/pages/Mine/MyInfo/index.vue

@@ -7,7 +7,7 @@
             <view>头像</view>
             <view class="flex-item">
               <view class="UserIcon">
-                <image mode="aspectFill" :src="UserInfo.avatar" class="centerLabel"></image>
+                <image mode="aspectFill" :src="UserInfo.avatar" class="centerLabel" style="height: 100%"></image>
               </view>
             </view>
           </view>
@@ -19,7 +19,7 @@
             </view>
           </view>
           <view class="flex-h">
-            <view>姓名</view>
+            <view><text class="Point">*</text>姓名</view>
             <view class="flex-item">
               <input placeholder="请输入姓名" v-model="Form.name" />
               <!-- <input placeholder="请输入姓名" /> -->
@@ -84,6 +84,7 @@
 </template>
 
 <script>
+import Taro from '@tarojs/taro'
 import MainPage from '@/components/MainPage'
 import Picker from '@/components/Picker'
 import { createNamespacedHelpers } from 'vuex'
@@ -188,7 +189,9 @@ export default {
           })
           this.DataLock = false
           Taro.navigateBack({ delta: 1 })
-        }).catch(() => {
+          console.log('--------navigateBack------')
+        }).catch((err) => {
+          console.error(err)
           this.DataLock = false
         })
       }