Merge branch 'master' of http://114.215.101.231:8099/dingling/A6079080424317 into Branch_zhu

@@ -122,7 +122,7 @@ var app = new Vue({
         },
         },
         // 获取疾病类型
         // 获取疾病类型
         getIllness: function () {
         getIllness: function () {
-           
+
             var app=this;
             var app=this;
             var heder = {
             var heder = {
                 "XX-Device-Type": getDevice(),
                 "XX-Device-Type": getDevice(),

@@ -129,22 +129,35 @@
         <span>上传照片或扫描报告</span>
         <span>上传照片或扫描报告</span>
     </div>
     </div>
     <div class="photo_box">
     <div class="photo_box">
-        <div class="photo_item" @click="popupVisible=true">
-            <img v-if='img_report' :src="img_report" alt="">
-            <span v-else class="iconfont icon-jiajianzujianjiahao"></span>
+        <!--<div class="photo_item" @click="popupVisible=true">-->
+            <!--<img v-if='img_report' :src="img_report" alt="">-->
+            <!--<span v-else class="iconfont icon-jiajianzujianjiahao"></span>-->
+        <!--</div>-->
+
+        <div class="photo_item">
+            <!--../img/addimg.png-->
+            <div id="preview">
+                <img id="imghead" border="0" src="" style="width:100%;height:100%" onclick="$('#previewImg').click();">
+            </div>
+            <!--<img src="../img/delet.png" alt="" style="position:absolute;bottom:92px;left:46px" class="deleteimg"/>-->
+            <input type="file" onchange="previewImage(this)" style="display: none;" id="previewImg">
         </div>
         </div>
+
+
+
+
         <div class="photo_item" @click="openQrc">
         <div class="photo_item" @click="openQrc">
             <img v-if='img_sao_yi_sao' :src="img_sao_yi_sao" alt="">
             <img v-if='img_sao_yi_sao' :src="img_sao_yi_sao" alt="">
             <span v-else class="iconfont icon-saoyisao"></span>
             <span v-else class="iconfont icon-saoyisao"></span>
         </div>
         </div>
     </div>
     </div>
-    <mt-popup v-model="popupVisible" position="bottom">
-        <ul class="moreoul">
-            <li @click="choose_pic('camera')">拍照</li>
-            <li @click="choose_pic('album')">从相册中选择</li>
-            <li @click="popupVisible=false" style="border-top: 2px solid #f0f0f0">取消</li>
-        </ul>
-    </mt-popup>
+    <!--<mt-popup v-model="popupVisible" position="bottom">-->
+        <!--<ul class="moreoul">-->
+            <!--<li @click="choose_pic('camera')">拍照</li>-->
+            <!--<li @click="choose_pic('album')">从相册中选择</li>-->
+            <!--<li @click="popupVisible=false" style="border-top: 2px solid #f0f0f0">取消</li>-->
+        <!--</ul>-->
+    <!--</mt-popup>-->
     <div class="save_btn" @click="save_info">保存</div>
     <div class="save_btn" @click="save_info">保存</div>
 </div>
 </div>
 </body>
 </body>