1

app.js

@@ -7,28 +7,6 @@ App({
   },
 
   judge_Land() {
-<<<<<<< HEAD
-    // try {
-    //   const value = wx.getStorageSync('wx_id')
-    //   if (value) {
-    //     // Do something with return value
-    //   }
-    // } catch (e) {
-    //   // Do something when catch error
-    // }
-=======
-    // console.log(wx.getStorageSync('wx_id'))    //已经授权 id
-    // console.log(wx.getStorageSync('access_token'))    //是否注册过
-
-    try {
-      const value = wx.getStorageSync('wx_id')
-      if (value) {
-        // Do something with return value
-      }
-    } catch (e) {
-      // Do something when catch error
-    }
->>>>>>> 465e4a521529b4053bd5916de8135b481ec44d51
 
     try {
       if (wx.getStorageSync('access_token')) {   //是否注册过