fix: bugFixed 2022-10-22-10

pages/aboutUs/aboutUs.wxml

@@ -1,6 +1,6 @@
 <!--pages/aboutUs/aboutUs.wxml-->
 <view class="about">
   <view class="aboutimg">
-    <image class="imgitem" src="{{imgUrl}}"></image>
+    <image mode="widthFix" class="imgitem" src="{{imgUrl}}"></image>
   </view>
 </view>

pages/appointment/appointment.wxml

@@ -61,7 +61,7 @@
             <view class="week-body-item backup-week-body-item {{item.disabled ? 'week-body-item-disabled' : ''}} {{item.date == '约满' ? 'week-body-item-full' : ''}}" wx:for="{{backupWeekList}}" wx:key="index">
               <view class="date">{{item.date}}</view>
             </view>
-            <view class="week-body-item {{item.disabled ? 'week-body-item-disabled' : ''}} {{item.active ? 'week-body-item-active' : ''}} {{item.date == '约满' ? 'week-body-item-full' : ''}}" wx:for="{{weekList}}" wx:key="index">
+            <view class="week-body-item {{item.disabled ? 'week-body-item-disabled' : ''}} {{item.active ? 'week-body-item-active' : ''}} {{item.date == '约满' ? 'week-body-item-full' : ''}} {{item.busy ? 'week-body-item-active-busy-dot' : ''}}" wx:for="{{weekList}}" wx:key="index">
               <view class="date" data-date="{{item.dateStr}}" data-disabled="{{item.disabled}}" data-index="{{index}}" bindtap="handleSelectDate">{{item.date}}</view>
               <view wx:if="{{item.busy}}" class="week-body-item-active-busy-dot"></view>
             </view>

pages/exchange/exchange.wxml

@@ -18,7 +18,7 @@
     <view class="itt-btn confirm btn" bindtap="handleComfirm">确定</view>
   </view>
   <view class="shuoming ittflex">
-    <image class="shuomingitem" src="{{imgUrl}}"></image>
+    <image mode="widthFix" class="shuomingitem" src="{{imgUrl}}"></image>
   </view>
   <van-overlay show="{{ overlayShow }}">
     <view class="wrapper ittflex">

pages/index/index.js

@@ -226,8 +226,8 @@ Page({
       mask: true
     })
     bindBaseInfo(data).then(res => {
-      const _headImg = that.data.confirmAvatarUrl
-      const _userName = that.data.confirmNickname
+      const _headImg = that.data.avatarUrl
+      const _userName = that.data.nickname
       app.globalData.userInfo.login = true
       app.globalData.userInfo.headImg = _headImg
       app.globalData.userInfo.userName = _userName

pages/my/my.wxml

@@ -32,7 +32,7 @@
   <view class="bottom-actions" wx:if="{{imageList.length !== 0}}">
     <view class="b-title">小课堂</view>
     <view class="images">
-      <image class="imageitem" wx:for="{{imageList}}" wx:key="index" src="{{item.imgUrl}}"></image>
+      <image mode="widthFix" class="imageitem" wx:for="{{imageList}}" wx:key="index" src="{{item.imgUrl}}"></image>
     </view>
   </view>
 </view>

pages/my/my.wxss

@@ -3,7 +3,7 @@
   width: 100%;
   height: 100%;
   background-color: #f7f7f7;
-  padding-bottom: 80rpx;
+  padding-bottom: 100rpx;
   overflow-y: auto;
 }
 .my-info {

pages/myAppointment/myAppointment.wxml

@@ -13,7 +13,12 @@
   <block wx:else>
     <view wx:for="{{appointmentList}}" wx:key="index" class="data-item">
       <view class="top date ittflex-jcb">
-        <text class="top-date">{{item.appointmentTimeStr}}</text>
+        <text class="top-date">
+          <text class="app-str">{{item.appointmentTimeStr}}</text>
+          <text wx:if="{{item.duration == 1}}">8:00-12:00</text>
+          <text wx:if="{{item.duration == 2}}">13:00-18:00</text>
+          <text wx:if="{{item.duration == 3}}">18:00-21:00</text>
+        </text>
         <!-- status 1 待服务，2，3 已取消  4: 已完成 5.超时 -->
         <text class="status s-wait" wx:if="{{item.status == 1}}">待服务</text>
         <text class="status s-done" wx:if="{{item.status == 4}}">已完成</text>
@@ -35,8 +40,8 @@
         </view>
       </view>
       <view class="bototm actions" wx:if="{{item.status == 1}}">
-        <view class="submit-btn itt-btn ittflex" bindtap="handleScanCode">去核销</view>
-        <view class="cancel-button ittflex" bindtap="handleCancel" data-id="{{item.id}}">取消</view>
+        <button class="action-btn submit-btn itt-btn" bindtap="handleScanCode">去核销</button>
+        <button class="action-btn cancels-btn" bindtap="handleCancel" data-id="{{item.id}}">取消</button>
       </view>
     </view>
   </block>

pages/myAppointment/myAppointment.wxss

@@ -58,6 +58,9 @@
   color: #333333;
   margin-left: 20rpx;
 }
+.app-str {
+  margin-right: 20rpx;
+}
 .status {
   font-size: 26rpx;
   font-weight: 400;
@@ -82,25 +85,25 @@ s-done {
   margin-top: 20rpx;
   display: flex;
   justify-content: flex-end;
+  align-items: center;
 }
 .cancel-button { 
-  width: 144rpx;
-  height: 60rpx;
   margin-right: 20rpx;
   background: #FFFFFF;
-  border-radius: 10rpx;
-  border: 1rpx solid #333333;
-  font-size: 26rpx;
-  font-weight: 400;
   color: #333333;
-  box-sizing: border-box;
 }
-.submit-btn {
+
+.action-btn {
   width: 144rpx;
   height: 60rpx;
-  margin-right: 20rpx;
-  border-radius: 10rpx;
   font-size: 26rpx;
+  margin: 0;
+}
+.submit-btn {
+  margin-right: 20rpx;
+}
+.cancels-btn {
+  margin-right: 20rpx;
 }
 .wrapper {
   height: 100%;

pages/report/report.wxml

@@ -19,8 +19,8 @@
               <image class="imagereport" src="../../imaes/baogao@2x.png"></image>
             </view>
             <view class="reposttime">
-              <text>{{innerItem.addTime}}</text>
-              <text> 报告</text>
+              <view>{{innerItem.addTime}}</view>
+              <view>报告</view>
             </view>
           </view>
         </view>

pages/reportDetail/reportDetail.js

@@ -52,8 +52,8 @@ Page({
     })
     getReport(data).then(res => {
       wx.hideLoading()
-      if (that.data.name == 'ReportTotal' || that.data.name == '情绪表格') {
-        console.log(that.data.name == '情绪表格');
+      console.log(that.data.name);
+      if (that.data.name == 'ReportTotal' || that.data.name == '精神及心理') {
         that.setData({
           summaryList: res.data || []
         })
@@ -131,7 +131,7 @@ Page({
           name: 'ReportTotal'
         })
       } else {
-        if (navName == '情绪表格') {
+        if (navName == '情绪压力') {
           navName = '精神及心理'
         }
         if (navName == '泌尿系统') {

pages/reportDetail/reportDetail.wxml

@@ -20,7 +20,7 @@
       <view class="appraise-title b-item suppose-item">建议</view>
       <view class="b-item b-item-xunhaun ittflex-jcb">
         <text class="light-text">循环系统</text>
-        <text class="deep-text">营养与代谢</text>
+        <text class="deep-text">营养代谢</text>
       </view>
       <view class="b-item b-item-huxi ittflex-jcb">
         <text class="light-text">呼吸系统</text>
@@ -31,7 +31,7 @@
         <text class="deep-text">免疫系统</text>
       </view>
       <view class="b-item b-item-miniao ittflex-jcb">
-        <text class="light-text">泌尿</text>
+        <text class="light-text">泌尿系统</text>
         <text class="deep-text">运动系统</text>
       </view>
       <view class="b-item b-item-xuexie ittflex-jcb">

pages/reportDetail/reportDetail.wxss

@@ -88,6 +88,8 @@
 }
 .suppose-item {
   text-align: left;
+  font-weight: 400;
+  color: #333;
 }
 .standard {
   padding: 30rpx;
@@ -211,7 +213,7 @@
   font-size: 26rpx;
   font-weight: 400;
   color: #333333;
-  background-color: rgba(69,166,181,.5);
+  background-color: rgba(69,166,181,.2);
 }
 .sys-content-item {
   width: 100%;
@@ -224,10 +226,12 @@
   width: 350rpx;
   font-size: 26rpx;
   font-weight: 400;
+  padding-left: 20rpx;
   color: #333333;
   height: 100%;
-  text-indent: 30rpx;
-  line-height: 88rpx;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
   border-bottom: 1rpx solid #ddd;
   box-sizing: border-box;
 }