Merge branch '3.3.5&3.3.6-qiPingDingWei' into dbdx-web

src/views/hazardManagement/gasBottleManage/beaconList/index.vue

@@ -84,7 +84,7 @@
           <p>最后一次绑定时间：</p>
           <p>{{ parseTime(dialogForm.bindingTime,'{y}-{m}-{d} {h}:{i}') }}</p>
         </div>
-        <vue-qr style="display: block;height:100px;width:100px;margin:auto;" :text="dialogForm.qrCodeUrl" :size="300"></vue-qr>
+        <vue-qr style="display: block;height:100px;width:100px;margin:auto;" :text="dialogForm.beaconTag" :size="300"></vue-qr>
         <p class="text-p">{{dialogForm.beaconTag}}</p>
         <p class="text-p">信标</p>
       </div>