修改密码-退出登录-修改BUG

App.vue

@@ -2,6 +2,10 @@
   export default {
     onLaunch: function() {
       console.log("App Launch");
+      // #ifdef APP-PLUS
+      // 禁止横屏
+      plus.screen.lockOrientation("portrait-primary")
+      // #endif
     },
     onShow: function() {
       console.log("App Show");

components/seiminModel/seiminModel.vue

@@ -71,6 +71,21 @@
           下一日
         </view>
       </view>
+      <!-- 修改密码 -->
+      <view class="seiminModel_content changePwd" v-else-if="opts.skin === 'changePwd'">
+        <view class="changePwd_item">
+          <view class="title">原始密码</view>
+          <uni-easyinput type="password" focus v-model="pwdOld" placeholder="请输入原始密码"></uni-easyinput>
+        </view>
+        <view class="changePwd_item">
+          <view class="title">新密码</view>
+          <uni-easyinput type="password" v-model="newPwd" placeholder="请输入新密码"></uni-easyinput>
+        </view>
+        <view class="changePwd_item">
+          <view class="title">确认新密码</view>
+          <uni-easyinput type="password" v-model="newPwd2" placeholder="请输入新密码"></uni-easyinput>
+        </view>
+      </view>
       <!-- 正常弹窗 -->
       <view class="seiminModel_content" v-else>
         <!-- 图标 -->
@@ -121,7 +136,7 @@
     },
     data() {
       return {
-        isCheckDept:false,//是否是切换科室
+        isCheckDept: false, //是否是切换科室
         dateOptions: [
           [],
           [],
@@ -155,6 +170,12 @@
         stars: [],
         // 评价内容
         evaluateTextArea: '',
+        // 原始密码
+        pwdOld: '',
+        // 新密码
+        newPwd: '',
+        // 确认新密码
+        newPwd2: '',
       };
     },
     onUnload() {
@@ -424,6 +445,11 @@
           }
           // 日期时间的可选范围
           this.dateTimeScope();
+        } else if (this.opts.skin === 'changePwd') {
+          // 如果是修改密码,则清空数据
+          this.pwdOld = '';
+          this.newPwd = '';
+          this.newPwd2 = '';
         }
       },
       // 关闭弹窗
@@ -706,6 +732,30 @@
               text-align: left;
             }
           }
+
+          // 修改密码
+          &.changePwd {
+            .changePwd_item {
+              text-align: left;
+              margin-bottom: 24rpx;
+
+              .title {
+                font-size: 34rpx;
+                color: #666;
+                height: 60rpx;
+              }
+
+              .uni-easyinput {
+                color: #999;
+                background-color: #fff;
+
+                .uni-easyinput__placeholder-class {
+                  font-size: 28rpx !important;
+                  margin-top: 10rpx;
+                }
+              }
+            }
+          }
         }
 
         .seiminModel_footer {

manifest.json

@@ -18,6 +18,10 @@
         "modules" : {},
         /* 模块配置 */
         "distribute" : {
+            /* 重力感应、横竖屏配置 */
+            "distribute" : {
+                "orientation" : [ "portrait-primary" ]
+            },
             /* 应用发布信息 */
             "android" : {
                 /* android打包配置 */

pages/index/index.vue

@@ -628,6 +628,7 @@
           color: #fff;
           font-size: 32rpx;
           line-height: 88rpx;
+          @include clamp;
 
           &::after {
             border: none;

pages/orderDetail/orderDetail.vue

@@ -2,12 +2,10 @@
   <view class="orderDetail">
     <!-- 头部 -->
     <view class="orderDetail_header">
-      <block v-if="tabs.length">
-        <view class="orderDetail_header_item" v-for="tab in tabs" :key="tab.id" :class="{active:tab.id === selectedTab}"
-          @click="debouncedChangeTab(tab.id)">
-          {{tab.name}}
-        </view>
-      </block>
+      <view class="orderDetail_header_item" v-for="tab in tabs" :key="tab.id" :class="{active:tab.id === selectedTab}"
+        @click="debouncedChangeTab(tab.id)">
+        {{tab.name}}
+      </view>
     </view>
     <!-- tab -->
     <!-- 工单信息 -->
@@ -132,27 +130,25 @@
           </view>
         </view>
         <view class="orderDetail_infoItem_item process">
-          <block v-if="logList.length">
-            <view class="orderDetail_process_item" v-for="(step,i) in logList" :key="i">
-              <view class="step_infoStart">
-                <view class="step_name">{{step.operationName}}</view>
-                <view class="step_time" v-if="step.record && step.record[0]">
-                  {{step.record[0].operationTime|formatDate('MM-dd HH:mm')}}
-                </view>
+          <view class="orderDetail_process_item" v-for="(step,i) in logList" :key="i">
+            <view class="step_infoStart">
+              <view class="step_name">{{step.operationName}}</view>
+              <view class="step_time" v-if="step.record && step.record[0]">
+                {{step.record[0].operationTime|formatDate('MM-dd HH:mm')}}
               </view>
-              <view class="step_icon pda pda-icon_liucheng"
-                :class="{'active':(step.record&&step.record[0]&&step.record[0].operationTime)}"></view>
-              <view class="step_infoEnd">
-                <view class="step_overtime" v-if="i!=0&&step.record&&step.record.length">
-                  耗时{{filterTime(step.record)}}
-                </view>
-                <view class="step_dept" v-if="step.record&&step.record.length&&step.record[0]&&step.record[0].dept">
-                  <text v-for="(dept,index) in step.record"
-                    :key="index">{{dept?(deptDisplay == 2?dept.deptalias:dept.dept)+',':''}}</text>
-                </view>
+            </view>
+            <view class="step_icon pda pda-icon_liucheng"
+              :class="{'active':(step.record&&step.record[0]&&step.record[0].operationTime)}"></view>
+            <view class="step_infoEnd">
+              <view class="step_overtime" v-if="i!=0&&step.record&&step.record.length">
+                耗时{{filterTime(step.record)}}
+              </view>
+              <view class="step_dept" v-if="step.record&&step.record.length&&step.record[0]&&step.record[0].dept">
+                <text v-for="(dept,index) in step.record"
+                  :key="index">{{dept?(deptDisplay == 2?dept.deptalias:dept.dept)+',':''}}</text>
               </view>
             </view>
-          </block>
+          </view>
         </view>
       </scroll-view>
     </view>
@@ -235,24 +231,22 @@
                 <uni-th align="center" width="71">科室</uni-th>
               </uni-tr>
               <!-- 表格数据行 -->
-              <block v-if="orderInfo.specimenSet.length">
-                <uni-tr v-for="data in orderInfo.specimenSet" :key="data.id"
-                  @click.native="toDetail(data.id,'specimen',data.scode)">
-                  <uni-td align="center">{{data.stype?data.stype.name:'暂无'}}</uni-td>
-                  <uni-td align="center">{{data.scode || '暂无'}}</uni-td>
-                  <uni-td align="center">{{data.speState?data.speState.name:'暂无'}}</uni-td>
-                  <uni-td align="center" class="td" v-if="data.checkDept">
-                    {{deptDisplay==2?data.checkDept.deptalias:data.checkDept.dept}}
-                    <image class="urgent" v-if="data.urgent == 1" src="../../static/imgs/icon_ji.png" mode="widthFix">
-                    </image>
-                  </uni-td>
-                  <uni-td align="center" class="td" v-else>
-                    暂无
-                    <image class="urgent" v-if="data.urgent == 1" src="../../static/imgs/icon_ji.png" mode="widthFix">
-                    </image>
-                  </uni-td>
-                </uni-tr>
-              </block>
+              <uni-tr v-for="data in orderInfo.specimenSet" :key="data.id"
+                @click.native="toDetail(data.id,'specimen',data.scode)">
+                <uni-td align="center">{{data.stype?data.stype.name:'暂无'}}</uni-td>
+                <uni-td align="center">{{data.scode || '暂无'}}</uni-td>
+                <uni-td align="center">{{data.speState?data.speState.name:'暂无'}}</uni-td>
+                <uni-td align="center" class="td" v-if="data.checkDept">
+                  {{deptDisplay==2?data.checkDept.deptalias:data.checkDept.dept}}
+                  <image class="urgent" v-if="data.urgent == 1" src="../../static/imgs/icon_ji.png" mode="widthFix">
+                  </image>
+                </uni-td>
+                <uni-td align="center" class="td" v-else>
+                  暂无
+                  <image class="urgent" v-if="data.urgent == 1" src="../../static/imgs/icon_ji.png" mode="widthFix">
+                  </image>
+                </uni-td>
+              </uni-tr>
             </uni-table>
           </view>
         </view>
@@ -385,12 +379,12 @@
         this.changeTab(1);
       },
       // 跳转详情
-      toDetail(id, associationType,scode) {
-        if(scode){
+      toDetail(id, associationType, scode) {
+        if (scode) {
           uni.navigateTo({
             url: `/pages/detail/detail?id=${id}&associationType=${associationType}&scode=${scode}`
           })
-        }else{
+        } else {
           uni.navigateTo({
             url: `/pages/detail/detail?id=${id}&associationType=${associationType}`
           })

pages/patientDetail/patientDetail.vue

@@ -9,7 +9,7 @@
     </view>
     <!-- tab -->
     <!-- 患者信息 -->
-    <view class="orderDetail_info" v-show="selectedTab === 1">
+    <view class="orderDetail_info" v-if="selectedTab === 1">
       <scroll-view scroll-y class="orderDetail_infoItem" v-if="info.id">
         <view class="orderDetail_infoItem_header">
           <view class="orderDetail_infoItem_header_title">
@@ -37,7 +37,7 @@
       </scroll-view>
     </view>
     <!-- 患者标本 -->
-    <view class="orderDetail_info" v-show="selectedTab ===2">
+    <view class="orderDetail_info" v-if="selectedTab ===2">
       <scroll-view scroll-y class="orderDetail_infoItem">
         <view class="orderDetail_infoItem_header">
           <view class="orderDetail_infoItem_header_title">
@@ -80,7 +80,7 @@
       </scroll-view>
     </view>
     <!-- 患者检查 -->
-    <view class="orderDetail_info" v-show="selectedTab === 3">
+    <view class="orderDetail_info" v-if="selectedTab === 3">
       <scroll-view scroll-y class="orderDetail_infoItem">
         <view class="orderDetail_infoItem_header">
           <view class="orderDetail_infoItem_header_title">

pages/personalCenter/personalCenter.vue

@@ -29,6 +29,8 @@
     </view>
     <view class="changeDept">
       <button type="primary" @click="showDeptModel">切换科室</button>
+      <button type="primary" @click="changePwd">修改密码</button>
+      <button type="primary" @click="logout">退出登录</button>
     </view>
     <seiminFooterNav></seiminFooterNav>
     <seiminModel ref="seiminModel"></seiminModel>
@@ -44,6 +46,10 @@
     mapState,
     mapMutations
   } from "vuex";
+  import {
+    reqLogout2,
+    reqUppwd,
+  } from "../../request/api.js";
   export default {
     data() {
       return {
@@ -119,6 +125,101 @@
           url: "/pages/searchDept/searchDept",
         });
       },
+      // 退出登录
+      logout() {
+        this.$refs.seiminModel.show({
+          icon: "warn",
+          content: '确定退出登录？',
+          btns: [{
+            click: () => {
+              this.$refs.seiminModel.close();
+            },
+          }, {
+            click: () => {
+              uni.showLoading({
+                mask: true,
+                title: '加载中'
+              })
+              reqLogout2()
+                .then((data) => {
+                  uni.hideLoading();
+                  if (data.status == 200) {
+                    this.$refs.seiminModel.close();
+                    this.$refs.seiminModel.show({
+                      skin: "toast",
+                      icon: "success",
+                      content: "退出成功",
+                      btns: [{
+                        click: () => {
+                          uni.navigateTo({
+                            url: '/pages/login/login'
+                          })
+                        }
+                      }]
+                    });
+                  } else {
+                    this.$refs.seiminModel.show({
+                      skin: "toast",
+                      icon: "error",
+                      content: data.error || "退出失败",
+                    });
+                  }
+                });
+            },
+          }, ],
+        })
+      },
+      // 修改密码
+      changePwd() {
+        this.$refs.seiminModel.show({
+          skin: 'changePwd',
+          title: '修改密码',
+          btns: [{
+            click: () => {
+              this.$refs.seiminModel.close();
+            },
+          }, {
+            click: () => {
+              uni.showLoading({
+                mask: true,
+                title: '加载中'
+              })
+              console.log(this)
+              let postData = {
+                "userid": this.loginInfo.user.id,
+                "pwdOld": this.$refs.seiminModel.pwdOld,
+                "newPwd": this.$refs.seiminModel.newPwd,
+                "newPwd2": this.$refs.seiminModel.newPwd2,
+              };
+              reqUppwd(postData)
+                .then((data) => {
+                  uni.hideLoading();
+                  if (data.status == 200) {
+                    this.$refs.seiminModel.close();
+                    this.$refs.seiminModel.show({
+                      skin: "toast",
+                      icon: "success",
+                      content: "修改密码成功",
+                      btns: [{
+                        click: () => {
+                          uni.navigateTo({
+                            url: '/pages/login/login'
+                          })
+                        }
+                      }]
+                    });
+                  } else {
+                    this.$refs.seiminModel.show({
+                      skin: "toast",
+                      icon: "error",
+                      content: data.error || "修改密码失败",
+                    });
+                  }
+                });
+            },
+          }, ],
+        })
+      },
     }
   }
 </script>
@@ -139,6 +240,10 @@
 
     .changeDept {
       margin: 24rpx 24rpx 0;
+
+      button {
+        margin-bottom: 16rpx;
+      }
     }
 
     .orderDetail_info {
@@ -146,7 +251,7 @@
 
       .orderDetail_infoItem {
         width: 702rpx;
-        height: 30vh;
+        height: 25vh;
         background-color: #fff;
         border-radius: 8rpx;
         position: relative;

pages/specimenList/specimenList.vue

@@ -19,23 +19,21 @@
             <uni-th align="center" width="71">科室</uni-th>
           </uni-tr>
           <!-- 表格数据行 -->
-          <block v-for="data in speList" :key="data.id">
-            <uni-tr @click.native="toDetail(data.id,'specimen',data.scode)">
-              <uni-td align="center">{{data.stype?data.stype.name:'暂无'}}</uni-td>
-              <uni-td align="center">{{data.scode || '暂无'}}</uni-td>
-              <uni-td align="center">{{data.speState?data.speState.name:'暂无'}}</uni-td>
-              <uni-td align="center" class="td" v-if="data.checkDept">
-                {{deptDisplay==2?data.checkDept.deptalias:data.checkDept.dept}}
-                <image class="urgent" v-if="data.urgent == 1" src="../../static/imgs/icon_ji.png" mode="widthFix">
-                </image>
-              </uni-td>
-              <uni-td align="center" class="td" v-else>
-                暂无
-                <image class="urgent" v-if="data.urgent == 1" src="../../static/imgs/icon_ji.png" mode="widthFix">
-                </image>
-              </uni-td>
-            </uni-tr>
-          </block>
+          <uni-tr v-for="data in speList" :key="data.id" @click.native="toDetail(data.id,'specimen',data.scode)">
+            <uni-td align="center">{{data.stype?data.stype.name:'暂无'}}</uni-td>
+            <uni-td align="center">{{data.scode || '暂无'}}</uni-td>
+            <uni-td align="center">{{data.speState?data.speState.name:'暂无'}}</uni-td>
+            <uni-td align="center" class="td" v-if="data.checkDept">
+              {{deptDisplay==2?data.checkDept.deptalias:data.checkDept.dept}}
+              <image class="urgent" v-if="data.urgent == 1" src="../../static/imgs/icon_ji.png" mode="widthFix">
+              </image>
+            </uni-td>
+            <uni-td align="center" class="td" v-else>
+              暂无
+              <image class="urgent" v-if="data.urgent == 1" src="../../static/imgs/icon_ji.png" mode="widthFix">
+              </image>
+            </uni-td>
+          </uni-tr>
         </uni-table>
       </view>
     </view>

request/api.js

@@ -167,3 +167,18 @@ export const reqGetSpecimenWorkOrderDetails = (postData) =>
     data: postData,
     method: 'POST'
   });
+
+// 退出登录
+export const reqLogout2 = () =>
+  request({
+    url: `/auth/logout2`,
+    method: 'DELETE'
+  });
+
+// 修改密码
+export const reqUppwd = (postData) =>
+  request({
+    url: `/auth/uppwd`,
+    data: postData,
+    method: 'POST'
+  });

store/modules/system.js

@@ -23,14 +23,17 @@ const actions = {
     commit,
     state
   }, args) {
-    if (state.systemInfo[args.systemConfiguration.keyconfig]) {
+    const excludeArr = ['updateTipsForNurses']; //无需缓存的keyconfig
+    const keyconfig = args.systemConfiguration.keyconfig;
+    if (state.systemInfo[keyconfig] && !excludeArr.includes(args.systemConfiguration
+        .keyconfig)) {
       //如果存在
-      return await Promise.resolve(state.systemInfo[args.systemConfiguration.keyconfig]);
+      return await Promise.resolve(state.systemInfo[keyconfig]);
     } else {
       let result = await reqFetchDataList('simple/data', 'systemConfiguration', args);
       if (result.status == 200) {
         commit("vxSystem", {
-          key: args.systemConfiguration.keyconfig,
+          key: keyconfig,
           data: result
         });
       }