红外线扫码

components/seiminFooterNav/seiminFooterNav.vue

@@ -121,7 +121,8 @@
     @include flex(space-between, center);
 
     .seiminFooterNav_item {
-      color: #dde1e5;
+      color: #333;
+      font-weight: bold;
       @include flex(center, center, column);
 
       &.otherStyle {

components/seiminModel/seiminModel.vue

@@ -2,7 +2,7 @@
  * @Author: 廖明明
  * @Date: 2022-04-01 17:11:19
  * @LastEditors: 廖明明
- * @LastEditTime: 2022-04-21 13:16:48
+ * @LastEditTime: 2022-06-15 09:26:03
  * @Description: 自定义弹窗组件
 -->
 <template>
@@ -28,7 +28,7 @@
       <!-- 加急 -->
       <view class="seiminModel_content urgent" v-else-if="opts.skin === 'urgent'">
         <view class="urgent_txt" v-html="opts.content"></view>
-        <textarea :focus="true" class="urgent_textarea" auto-height :maxlength="100"
+        <textarea :focus="false" class="urgent_textarea" auto-height :maxlength="100"
           :placeholder-style="placeholderStyle" placeholder="请填写加急原因" v-model="urgentTextArea" :adjust-position="false" />
       </view>
       <!-- 评价 -->
@@ -43,7 +43,7 @@
           </view>
           <view class="evaluate_item">
             <text class="evaluate_label">评级：</text>
-            <textarea :focus="true" class="evaluate_textarea" auto-height :maxlength="100"
+            <textarea :focus="false" class="evaluate_textarea" auto-height :maxlength="100"
               :placeholder-style="placeholderStyle" placeholder="请输入..." v-model="evaluateTextArea" :adjust-position="false" />
           </view>
         </view>
@@ -75,7 +75,7 @@
       <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>
+          <uni-easyinput type="password" :focus="false" v-model="pwdOld" placeholder="请输入原始密码"></uni-easyinput>
         </view>
         <view class="changePwd_item">
           <view class="title">新密码</view>

components/seiminScan/seiminScan.vue

@@ -0,0 +1,70 @@
+<template>
+  <view class="content"></view>
+</template>
+
+<script>
+  var main, receiver, filter;
+  var _codeQueryTag = false;
+  export default {
+    name: 'seiminScan',
+    data() {
+      return {
+        scanCode: ''
+      }
+    },
+    created: function(option) {
+      this.initScan()
+      this.startScan();
+    },
+    onHide: function() {
+      this.stopScan();
+    },
+    destroyed: function() {
+      /*页面退出时一定要卸载监听,否则下次进来时会重复，造成扫一次出2个以上的结果*/
+      this.stopScan();
+    },
+    methods: {
+      initScan() {
+        main = plus.android.runtimeMainActivity();
+        let IntentFilter = plus.android.importClass('android.content.IntentFilter');
+        filter = new IntentFilter();
+        filter.addAction("ds");
+        receiver = plus.android.implements('io.dcloud.feature.internal.reflect.BroadcastReceiver', {
+          onReceive: (context, intent) => {
+            plus.android.importClass(intent);
+            let code = intent.getStringExtra("data");
+            this.queryCode(code);
+          }
+        });
+      },
+      startScan() {
+        main.registerReceiver(receiver, filter);
+      },
+      stopScan() {
+        main.unregisterReceiver(receiver);
+      },
+      queryCode: function(code) {
+        //防重复  
+        if (_codeQueryTag) return false;
+        _codeQueryTag = true;
+        setTimeout(function() {
+          _codeQueryTag = false;
+        }, 150);
+        let id = code
+        uni.$emit('scancodedate', {
+          code: id
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  page {
+    background-color: #efeff4;
+  }
+
+  .content {
+    text-align: center;
+  }
+</style>

components/seiminSearch/seiminSearch.vue

@@ -57,7 +57,7 @@
         inputVal: '',
         searchName: '取消',
         isDelShow: false,
-        isFocus: true
+        isFocus: false
       };
     },
     methods: {

main.js

@@ -12,7 +12,7 @@ import {
 Vue.prototype.$request = request
 
 Vue.config.productionTip = false
-console.info('v1.0.0')
+console.info('v1.0.1')
 
 App.mpType = 'app'
 

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/appointmentInspect/appointmentInspect.vue

@@ -225,7 +225,7 @@
       padding: 32rpx 32rpx 0;
       color: #999;
       line-height: 40rpx;
-      font-size: 28rpx;
+      font-size: 32rpx;
       text-align: center;
     }
 
@@ -236,7 +236,7 @@
     .qco_msg2 {
       padding: 16rpx 0;
       line-height: 40rpx;
-      font-size: 28rpx;
+      font-size: 32rpx;
       text-align: center;
       @include border(top);
     }

pages/index/index.vue

@@ -83,13 +83,13 @@
       confirmFontSize="38rpx" confirmFontWeight="500" itemFontSize="32rpx" @onClose="closePicker"
       @onConfirm="confirmPicker" :pickerList="hospitalList">
     </seiminPicker>
+    <seiminScan></seiminScan>
   </view>
 </template>
 
 <script>
   import {
     backPress,
-    getCurrentPagesSeiminAll
   } from '../../utils/index.js';
   import {
     mapState,
@@ -113,6 +113,13 @@
     },
     onShow() {
       this.flag = true;
+      this.searchText = '';
+      uni.$off('scancodedate'); 
+      uni.$on('scancodedate', data => {
+        uni.navigateTo({
+          url: `/pages/search/search?txt=${data.code}`,
+        })
+      })
     },
     watch: {
       // 首页搜索内容
@@ -124,15 +131,10 @@
           })
         }
       },
-      reFresh() {
-        uni.redirectTo({
-          url: `${getCurrentPagesSeiminAll()}`,
-        })
-      }
     },
     data() {
       return {
-        isFocus: true,
+        isFocus: false,
         reFresh: '',
         openSpecimen: false, //标本的开通权限
         searchText: '', //首页搜索内容
@@ -497,7 +499,6 @@
               flex: 2,
               click: () => {
                 this.$refs.seiminModel.close();
-                this.isFocus = true;
               }
             },
             {

pages/patientBuild/patientBuild.vue

@@ -350,7 +350,7 @@
       padding: 32rpx;
       color: #999;
       line-height: 40rpx;
-      font-size: 28rpx;
+      font-size: 32rpx;
       text-align: center;
     }
 

pages/patientBuildConfirm/patientBuildConfirm.vue

@@ -392,7 +392,7 @@
       padding: 32rpx;
       color: #999;
       line-height: 40rpx;
-      font-size: 28rpx;
+      font-size: 32rpx;
       text-align: center;
     }
 

pages/patientList/patientList.vue

@@ -49,7 +49,6 @@
 <script>
   import {
     backPress,
-    getCurrentPagesSeiminAll
   } from '../../utils/index.js';
   import {
     debounce
@@ -86,13 +85,6 @@
         idx: 0, //页码
       };
     },
-    watch: {
-      reFresh() {
-        uni.redirectTo({
-          url: `${getCurrentPagesSeiminAll()}`,
-        })
-      }
-    },
     computed: {
       ...mapState("login", ["loginInfo"]),
       ...mapState('other', ["deptDisplay"]),

pages/personalCenter/personalCenter.vue

@@ -161,7 +161,7 @@
                       content: "退出成功",
                       btns: [{
                         click: () => {
-                          uni.navigateTo({
+                          uni.reLaunch({
                             url: '/pages/login/login'
                           })
                         }

pages/quickCreateOrder/quickCreateOrder.vue

@@ -115,7 +115,7 @@
         //选择院区picker的title
         pickerTitle: '',
         // 工单备注是否获取焦点
-        remarksFocus: true,
+        remarksFocus: false,
         // 工单备注
         workOrderRemark: "",
         // 获取到的数据集合对象(历史输入除外)
@@ -535,7 +535,7 @@
       padding: 32rpx;
       color: #999;
       line-height: 40rpx;
-      font-size: 28rpx;
+      font-size: 32rpx;
       text-align: center;
     }
 

pages/search/search.vue

@@ -91,7 +91,6 @@
 <script>
   import {
     backPress,
-    getCurrentPagesSeiminAll
   } from '../../utils/index.js';
   import {
     debounce
@@ -110,13 +109,6 @@
     onBackPress() {
       backPress();
     },
-    watch: {
-      reFresh() {
-        uni.redirectTo({
-          url: `${getCurrentPagesSeiminAll()}`,
-        })
-      }
-    },
     data() {
       return {
         reFresh: '',

request/config.js

@@ -23,4 +23,5 @@ export function changeIP(ip) {
   baseUrls.development = `${ip}/service`; //开发环境
   baseUrls.production = `${ip}/service`; //生产环境
   config.baseUrl = baseUrls[process.env.NODE_ENV];
+  config.pdaDownloadUrl = `${ip}/getapk`; // PDA下载地址
 }