检测更新

manifest.json

@@ -2,8 +2,8 @@
     "name" : "医疗服务中心转运系统",
     "appid" : "__UNI__FEB1B1E",
     "description" : "医疗服务中心转运系统",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionName" : "1.0.1",
+    "versionCode" : 101,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages.json

@@ -140,6 +140,17 @@
         "enablePullDownRefresh": true
       }
 
+    }, {
+      "path": "pages/search/search",
+      "style": {
+        "h5": {
+          "titleNView": false
+        },
+        "navigationBarTitleText": "搜索",
+        "navigationBarBackgroundColor": "#2C2D31",
+        "enablePullDownRefresh": true
+      }
+
     }
   ],
   "globalStyle": {

pages/index/index.vue

@@ -5,7 +5,8 @@
       <!-- 头部搜索 -->
       <view class="search">
         <view class="search_wrap">
-          <input focus placeholder="请输入标本编码/检查单号/请…" :placeholder-style="placeholderStyle" confirm-type="search" />
+          <input focus placeholder="请输入标本编码/检查单号/请…" :placeholder-style="placeholderStyle" confirm-type="search"
+            v-model="searchText" />
           <view class="searchBtn"> 搜索 </view>
         </view>
         <view class="icon-saoma">
@@ -103,8 +104,17 @@
     ASSOCIATION_TYPES
   } from "../../utils/enum.association_types.js";
   export default {
+    watch: {
+      // 首页搜索内容
+      searchText(newVal) {
+        uni.navigateTo({
+          url: `/pages/search/search?txt=${newVal}`
+        })
+      }
+    },
     data() {
       return {
+        searchText: '', //首页搜索内容
         placeholderStyle: "color:#999;font-size:30rpx;line-height:66rpx;",
         urgentNum: 0, //急标数量
         ordinaryNum: 0, //普标数量

pages/patientBuild/patientBuild.vue

@@ -227,7 +227,12 @@
         }
         //判断预约建单按钮
         console.log(this.patientBuildTrip)
-        if (this.hasYYtimeChecks.length && this.patientTaskType.appointmentSwitch == 1) {
+        if (
+          (this.patientTaskType.associationType.value === this.ASSOCIATION_TYPES['患者陪检业务'] &&
+            this.hasYYtimeChecks.length && this.patientTaskType.appointmentSwitch == 1) ||
+          (this.patientTaskType.associationType.value === this.ASSOCIATION_TYPES['患者其他服务业务'] &&
+            this.patientTaskType.appointmentOtherSwitch == 1)
+        ) {
           //选中的检查数组都有预约时间并且允许预约建单
           this.isYYBuild = true;
           this.allowUrgentChange(this.isUrgent);
@@ -244,12 +249,12 @@
           this.timestamp = new Date().getTime();
           this.yyInspectChange();
         }
-
         // 底部按钮展示
         this.showBtns(this.isYYBuild);
       },
       // 底部按钮展示
       showBtns(flag) {
+        console.log(flag)
         if (flag) {
           //患者陪检业务或患者其他服务业务，并且预约建单开关打开的情况下
           this.btns = [{

pages/personalCenter/personalCenter.vue

@@ -29,6 +29,7 @@
     </view>
     <view class="changeDept">
       <button type="primary" @click="showDeptModel">切换科室</button>
+      <button type="primary" @click="checkUpdate">检测更新</button>
       <button type="primary" @click="changePwd">修改密码</button>
       <button type="primary" @click="logout">退出登录</button>
     </view>
@@ -42,6 +43,7 @@
 </template>
 
 <script>
+  import config from "../../request/config.js";
   import {
     mapState,
     mapMutations
@@ -49,6 +51,7 @@
   import {
     reqLogout2,
     reqUppwd,
+    reqFetchDataList,
   } from "../../request/api.js";
   export default {
     data() {
@@ -220,6 +223,99 @@
           }, ],
         })
       },
+      // 检测更新
+      checkUpdate() {
+        uni.showLoading({
+          mask: true,
+          title: '加载中'
+        })
+        let postData = {
+          "idx": 0,
+          "sum": 1,
+          "systemConfiguration": {
+            "keyconfig": "pdaVersion"
+          }
+        };
+        reqFetchDataList('simple/data', 'systemConfiguration', postData)
+          .then((data) => {
+            uni.hideLoading();
+            if (data.status == 200) {
+              const version = data.list[0].valueconfig;
+              // #ifdef APP-PLUS
+              plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
+                console.log(wgtinfo.version); //应用版本号
+                if (wgtinfo.version === version) {
+                  this.$refs.seiminModel.show({
+                    skin: "toast",
+                    icon: "success",
+                    content: "您所使用的已是最新版本",
+                  });
+                } else {
+                  this.$refs.seiminModel.show({
+                    icon: 'warn',
+                    content: `发现新版本Version ${version}`,
+                    btns: [{},
+                      {
+                        name: '立即下载更新',
+                        click: () => {
+                          this.downloadUrl(`${config.pdaDownloadUrl}/pda-v${version}.apk`);
+                        }
+                      }
+                    ]
+                  });
+                }
+              })
+              // #endif
+              // #ifndef APP-PLUS
+              this.$refs.seiminModel.show({
+                skin: "toast",
+                icon: "error",
+                content: "当前不是APP端",
+              });
+              // #endif
+            } else {
+              this.$refs.seiminModel.show({
+                skin: "toast",
+                icon: "error",
+                content: data.error || "获取版本失败",
+              });
+            }
+          });
+      },
+      // 下载更新
+      downloadUrl(Url = '') {
+        uni.showLoading({
+          title: '更新中……',
+          mask: true,
+        })
+        const downloadTask = uni.downloadFile({ //执行下载
+          url: Url, //下载地址
+          timeout: 1000 * 30, //30秒超时时间
+          success: downloadResult => { //下载成功
+            console.log(downloadResult)
+            uni.hideLoading();
+            if (downloadResult.statusCode == 200) {
+              plus.runtime.install( //安装软件
+                downloadResult.tempFilePath, {
+                  force: true
+                },
+                function(res) {
+                  plus.runtime.restart();
+                }
+              );
+            }
+          },
+          fail: err => {
+            uni.hideLoading();
+            this.$refs.seiminModel.show({
+              skin: "toast",
+              icon: "error",
+              content: "更新失败",
+            });
+            console.log(err)
+          },
+        });
+      },
     }
   }
 </script>

pages/search/search.vue

@@ -0,0 +1,22 @@
+<template>
+  <view>
+
+  </view>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+
+      };
+    },
+    onLoad() {
+
+    },
+  }
+</script>
+
+<style lang="scss">
+
+</style>

request/config.js

@@ -5,15 +5,16 @@
  * @LastEditTime: 2022-04-02 14:29:15
  * @Description: 后端服务配置文件
  */
+const host = 'http://192.168.3.108';
 //配置项
 const config = {
   baseUrl: "", // 后端服务地址
+  pdaDownloadUrl: `${host}/assets/downloads`, // PDA下载地址
 };
 // 后端服务地址
 const baseUrls = {
   development: "http://192.168.3.108/service", //开发环境
-  // development: "http://localhost/service", //开发环境
-  production: "http://192.168.3.108/service", //生产环境
+  production: `${host}/service`, //生产环境
 };
 config.baseUrl = baseUrls[process.env.NODE_ENV];
 export default config;