http请求修改

pages/mine/mine.js

@@ -1,8 +1,6 @@
 // pages/mine/mine.js
 import UserApi from '../../assets/js/http/userApi'
-import {
-  isLogin
-} from '../../assets/js/common'
+import {isLogin} from '../../assets/js/common'
 Page({
 
   /**
@@ -34,7 +32,6 @@ Page({
   unBind() {
     isLogin(() => {
       wx.showModal({
-        cancelColor: '取消',
         content: '确定解绑并退出登录？',
         confirmColor: '#069F99',
         success(res) {
@@ -59,38 +56,34 @@ Page({
   },
   // 扫码签到
   scanCode() {
-    // isLogin(() => {
-      // wx.scanCode({
-      //   onlyFromCamera: false,
-      //   scanType: [],
-      //   success: (result) => {
-      //     console.log(result)
-      //   },
-      //   fail: (res) => {
-      //     console.log(result)
-      //   },
-      //   complete: (res) => {
-      //     console.log(result)
-      //   },
-      // })
-      // 成功扫码的回调 1448213074467938306,1448107789464113154
-      UserApi.scanCode({
-        meetingId: '1448213074467938306'
-      }).then(res => {
-        if (res.success) {
-          let result = JSON.stringify(res.result)
-          wx.navigateTo({
-            url: `../scanSign/scanSign?signed=1&meeting=${result}`,
-          })
-        } else {
-          let result = JSON.stringify(res.result)
-          // 未查到报名信息
-          wx.navigateTo({
-            url: `../scanSign/scanSign?signed=0&meeting=${result}`,
+    isLogin(() => {
+      wx.scanCode({
+        onlyFromCamera: false,
+        scanType: [],
+        success: (result) => {
+          console.log(result)
+          let meetingId = result.result // 会议Id
+          // 成功扫码的回调
+          UserApi.scanCode({
+            meetingId
+          }).then(res => {
+            console.log(res)
+            if (res.success) {
+              let result = JSON.stringify(res.result)
+              wx.navigateTo({ // 已报名
+                url: `../scanSign/scanSign?signed=1&meeting=${result}`,
+              })
+            } else {
+              // let result = JSON.stringify(res.result)
+              // 未查到报名信息
+              wx.navigateTo({ // 未报名
+                url: `../scanSign/scanSign?signed=0&meeting=${1}`,
+              })
+            }
           })
         }
       })
-    // })
+    })
   },
   // 我的资料
   mineData() {
@@ -98,7 +91,7 @@ Page({
       wx.navigateTo({
         url: '../mineData/mineData',
       })
-    })
+    }) 
   },
   // 我的合同
   mineContract() {