Merge remote-tracking branch 'origin/master'

src/projects/business/views/Guest/To/Info.vue

@@ -213,7 +213,8 @@
     <cropper :cwidth="cropperWidth" :cheight="cropperHeight" :visible="cropperVisible" :field="cropperField" :cropper="cropper"
              @cropperFinish="cropperFinish" @cropperCancel="cropperCancel"></cropper>
     <loading :visible="isLoading"></loading>
-    <input type="file" ref="myFile"  style="display: none" class="mui-btn mui-btn-block mui-navigate-right" accept="image/*" @change="uploadPicture($event)"/>
+
+    <input   type="file" ref="myFile"  style="display: none" class="mui-btn mui-btn-block mui-navigate-right" accept="image/*" @change="uploadPicture($event)"/>
     <loading :visible="isLoading"></loading>
 
     <div>
@@ -247,7 +248,7 @@
   import {
     convertCanvasToImage,
     currentTimeStamp,
-    parseUnixTime
+    parseUnixTime,isWeiXin
   } from '$project/utils'
   export default {
     name: 'GuestFromDeviceInfo',
@@ -280,10 +281,7 @@
         isLoading: false,
         visible: false,
         qrCodeImg: '',
-        //隐藏裁剪图片
-        cropperCancel() {
-          this.cropperVisible = false;
-        },
+
         cropperVisible: '',
         cropperField: '',
         cropperWidth: 250,
@@ -301,11 +299,14 @@
           fixed: true,
           // 真实的输出宽高
           infoTrue: true,
-          fixedNumber: [5, 7]
+          fixedNumber: [5, 7],
+
         },
       }
     },
     created() {
+
+
       this.id = this.$route.query.id;
 
       //直接访问本页面 ，直接添加  ，通过list 进来， 需要有返回， 有分享提示
@@ -317,6 +318,10 @@
       this.subForm.id=this.id;
     },
     methods:  {
+        //隐藏裁剪图片
+        cropperCancel() {
+            this.cropperVisible = false;
+        },
       back(){
         this.$router.push({
           name: 'GuestFromList',
@@ -324,12 +329,35 @@
           }
         })
       },
+        chooseImage() {
+            WxJsApi.chooseImage().then(res => {
+                var localData = res.localData;
+
+            if (localData.indexOf('data:image') != 0) {
+                //判断是否有这样的头部
+                localData = 'data:image/jpeg;base64,' + localData
+            }
+            localData = localData.replace(/\r|\n/g, '').replace('data:image/jgp', 'data:image/jpeg')
+            this.imgBase64 = localData;
+            //显示裁剪图片
+             //this.uploadpic();
+            this.showCropper('photo');
+        }).catch(error => {
+                mui.toast(error);
+        })
+        },
       valert(){
         mui.alert("该照片仅用于访客在访问期间，快速识别人脸进入时使用，访问结束后自动清除数据。",'   ',['知道了'])
       },
       clickMyFile(mod){
+
         this.indexModel=mod;
-        this.$refs.myFile.click();
+        if(isWeiXin()){
+            this.chooseImage();
+        }else{
+            this.$refs.myFile.click();
+
+        }
       },
       save(){
         if(this.subForm.list.length){
@@ -477,6 +505,8 @@
     },
     mounted() {
       //获取微信配置
+        WxJsApi.getWxConfig();
+
        this.getDetail();
 
     },

src/projects/pension/views/Master/Hospital/Form.vue

@@ -34,7 +34,7 @@
             <h4>结果图片记录</h4>
             <div class="fyy-upphoto">
                 <div class="mui-col-xs-3 fyy-upphoto-close" v-for="(picture, index) in resultImg" :key="index">
-                    <img v-if="picture" :src="picture + '?x-oss-process=image/resize,m_fill,w_128,h_128'" />
+                    <img v-image-preview  v-if="picture" :src="picture + '?x-oss-process=image/resize,m_fill,w_128,h_128'" />
                     <a class="mui-icon mui-icon-closeempty" @click="delImg('1', index)"></a>
                 </div>
                 <div class="mui-col-xs-3">
@@ -52,7 +52,7 @@
             <h4>药品图片记录</h4>
             <div class="fyy-upphoto">
                 <div class="mui-col-xs-3 fyy-upphoto-close" v-for="(picture, index) in drugsImg" :key="index">
-                    <img v-if="picture" :src="picture + '?x-oss-process=image/resize,m_fill,w_128,h_128'" />
+                    <img v-image-preview  v-if="picture" :src="picture + '?x-oss-process=image/resize,m_fill,w_128,h_128'" />
                     <a class="mui-icon mui-icon-closeempty" @click="delImg('2', index)"></a>
                 </div>
                 <div class="mui-col-xs-3">
@@ -74,7 +74,7 @@
             <h4>诊疗费用图</h4>
             <div class="fyy-upphoto">
                 <div class="mui-col-xs-3 fyy-upphoto-close" v-for="(picture, index) in costImg" :key="index">
-                    <img v-if="picture" :src="picture + '?x-oss-process=image/resize,m_fill,w_128,h_128'" />
+                    <img v-image-preview  v-if="picture" :src="picture + '?x-oss-process=image/resize,m_fill,w_128,h_128'" />
                     <a class="mui-icon mui-icon-closeempty" @click="delImg('3', index)"></a>
                 </div>
                 <div class="mui-col-xs-3">