fix bug

config/dev.js

@@ -4,8 +4,8 @@ module.exports = {
   },
   defineConstants: {
     // HOST: '"https://xlk.njyz.tech"',
-    // HOST: '"https://www.newhousehold.cn"',
-    HOST: '"http://192.168.89.147:8081"',
+    HOST: '"https://www.newhousehold.cn"',
+    // HOST: '"http://192.168.89.147:8081"',
 
     // WSS_HOST: '"wss://www.newhousehold.cn"',
     WSS_HOST: '"wss://xlk.njyz.tech"',

config/prod.js

@@ -3,14 +3,14 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"http://192.168.89.147:8081"', //正式
-    // WSS_HOST: '"wss://www.newhousehold.cn"',
+    HOST: '"https://www.newhousehold.cn"', //正式
+    WSS_HOST: '"wss://www.newhousehold.cn"',
     // HOST: '"https://xlk.njyz.tech"',
-    WSS_HOST: '"wss://xlk.njyz.tech"',
+    // WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
-    Version: '"V0.0.81-20211118"'
+    Version: '"V0.0.83-20211130"'
   },
   mini: {},
   h5: {

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "miniapp",
 	"description": "",
-	"appid": "wxe44244d1a5ea3364",
+	"appid": "wxc96058d57e77f373",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/app.config.js

@@ -45,9 +45,6 @@ export default {
   permission: {
     "scope.userLocation": {
       desc: "你的位置信息将用于显示当前区域信息"
-    },
-    "scope.userInfo": {
-      desc: "你的信息将用于页面展示"
     }
   },
 }

src/app.jsx

@@ -2,7 +2,7 @@ import { Component } from 'react'
 import { Provider } from 'react-redux'
 import Taro from '@tarojs/taro'
 import { getLocation } from '@/utils/tools'
-import login from '@/utils/login'
+import login, { mockLogin } from '@/utils/login'
 import im from '@/utils/im'
 import trackUserSource from '@/utils/tracking/userSource'
 import store from './store'

src/utils/login.js

@@ -45,21 +45,28 @@ function loginRemote (params) {
 
 function getCodeAndLogin (params) {
   return new Promise((resolve, reject) => {
-    Taro.login({
-      success: ({ code }) => {
-        params.code = code
-  
-        // login
-        loginRemote(params).then((res) => {
-          const { person } = res
-          resolve(person)
-        })
-      },
-      fail: (err) => {
-        console.error(err)
-        reject(err)
-      }
-    })
+    if (params.singleMode) {
+      loginRemote(params).then((res) => {
+        const { person } = res
+        resolve(person)
+      })
+    } else {
+      Taro.login({
+        success: ({ code }) => {
+          params.code = code
+    
+          // login
+          loginRemote(params).then((res) => {
+            const { person } = res
+            resolve(person)
+          })
+        },
+        fail: (err) => {
+          console.error(err)
+          reject(err)
+        }
+      })
+    }
   })
 }