Merge branch 'release' of http://git.elinkit.com.cn:7070/r/epdc-office-mp-yushan into release

pages/index/index.js

@@ -238,6 +238,11 @@ Page({
           this.toPointList()
         }
         break
+      case 'tmp-9':
+        if (navCode == '10091') {
+          this.toFamily()
+        }
+        break
       default:
         let c_childNav = [];
         for (let i = 0; i < this.data.panel.length; i++) {
@@ -529,7 +534,7 @@ Page({
         // 接口调用结束
         console.log(res)
       }
-    });
+    })
   },
   getUserinfobycode() {
     let para = {
@@ -554,5 +559,34 @@ Page({
     wx.navigateTo({
       url: '/subpages/pointManagement/pages/pointList/pointList'
     })
+  },
+  // 一户一码 前往 家庭
+  toFamily () {
+    wx.scanCode({
+      onlyFromCamera: false,
+      scanType: ['barCode', 'qrCode', 'datamatrix', 'pdf417'],
+      success: res => {
+        if (res.errMsg == 'scanCode:ok') {
+          if (res.result) {
+            const arr = decodeURIComponent(res.result).split('/')
+            const roomCode = arr[arr.length - 1]
+            wx.navigateTo({
+              url: `?roomCode=${roomCode}`
+            })
+          }
         }
+      },
+      fail: res => {
+        // 接口调用失败
+        // wx.showToast({
+        //   icon: 'none',
+        //   title: '接口调用失败！'
+        // })
+      },
+      complete: res => {
+        // 接口调用结束
+        console.log(res)
+      }
+    })
+  },
 })