0926

web/view/addDevice/scanCodeAdd.html

@@ -24,7 +24,7 @@
             <v-touch tag="span" class="header-left icon" v-on:tap="onBackTap">&#xe611;</v-touch>
             <p>{{ $t('title.scanCodeAdd') }}</p>
         </div>
-        <div class="content">   
+        <div class="content" id="bcid" style="width: 100%; height: 560px; margin-top: 40px;">   
         </div>  
         <u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog>
         <u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading>

web/view/device/alarmInfo.html

@@ -24,8 +24,7 @@
             <v-touch tag="span" class="header-left icon" v-on:tap="onBackTap">&#xe611;</v-touch>           
             <p>{{ $t('title.alarmInfo') }}</p>
         </div>
-        <timeline :init-param="componentsConfig.alarmInfoList.initParam"></timeline>
-        <div class="footer">{{ $t('footer.recordList') }}</div>
+        <u-list ref="ulist" :init-param="componentsConfig.alarmInfoList.initParam"></u-list>
         <u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog>
         <u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading>
     </div>

web/view/device/hijackRecord.html

@@ -24,8 +24,7 @@
             <v-touch tag="span" class="header-left icon" v-on:tap="onBackTap">&#xe611;</v-touch>           
             <p>{{ $t('title.hijackRecord') }}</p>
         </div>
-        <timeline :init-param="componentsConfig.hijackRecordList.initParam"></timeline>
-        <div class="footer">{{ $t('footer.recordList') }}</div>
+        <u-list ref="ulist" :init-param="componentsConfig.hijackRecordList.initParam"></u-list>
         <u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog>
         <u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading>
     </div>

web/view/device/opendoorRecord.html

@@ -24,8 +24,7 @@
             <v-touch tag="span" class="header-left icon" v-on:tap="onBackTap">&#xe611;</v-touch>           
             <p>{{ $t('title.opendoorRecord') }}</p>
         </div>
-        <timeline :init-param="componentsConfig.opendoorRecordList.initParam"></timeline>
-        <div class="footer">{{ $t('footer.recordList') }}</div>
+        <u-list ref="ulist" :init-param="componentsConfig.opendoorRecordList.initParam"></u-list>
         <u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog>
         <u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading>
     </div>

web/view/doorlockManage/qrcode.html

@@ -32,7 +32,9 @@
                 <li>{{ $t('qrcode.helpCont3') }}</li>
                 <li>{{ $t('qrcode.helpCont4') }}</li>
                 <li>
-                    <p></p>
+                    <p>
+                    	<canvas ref="qrcode"></canvas>
+                    </p>
                 </li>
             </ul>
             <u-button :init-param="componentsConfig.qrcodeButton.initParam" v-on:u-button-tap="onQRcodeButtonTap"></u-button>