Merge remote-tracking branch 'origin/master'

portal-manager-ui/admin/src/views/dataAdmin/components/makeRecordReport/recordReportdetails.vue

@@ -28,10 +28,14 @@
                 orderInfo.endtime
               }}
             </p>
+            <p>
+              <span>预约方式：</span>{{ orderInfo.up_type=='phone'?'微官网':orderInfo.up_type=='app'?'自助终端':orderInfo.up_type=='tftb'?'天府通办':'--' }}
+            </p>
           </div>
           <div class="qrcode">
-            <!-- <img src="~@/assets/images/logo.png" alt="" />
-            <p>预约信息二维码</p> -->
+            <!-- <img src="~@/assets/images/logo.png" alt="" /> -->
+            <img :src="baseurl  + '/'+ orderInfo.qrcode" alt="" />
+            <p>预约信息二维码</p>
           </div>
         </div>
         <ul class="bottom">
@@ -145,6 +149,7 @@ export default {
       statusItem,
       style,
       orderInfo: {}, // 预约信息
+      baseurl: process.env.VUE_APP_API_PHP_URL,
     };
   },