fix:微信登录以及域名更换

.gitignore

@@ -4,3 +4,4 @@ deploy_versions/
 .rn_temp/
 node_modules/
 .DS_Store
+.idea/

project.config.json

@@ -7,9 +7,9 @@
         "urlCheck": false,
         "es6": false,
         "enhance": false,
-        "postcss": true,
+        "postcss": false,
         "preloadBackgroundData": false,
-        "minified": true,
+        "minified": false,
         "newFeature": true,
         "coverView": true,
         "nodeModules": false,
@@ -36,13 +36,15 @@
         "userConfirmedBundleSwitch": false,
         "packNpmManually": false,
         "packNpmRelationList": [],
-        "minifyWXSS": true,
+        "minifyWXSS": false,
         "lazyloadPlaceholderEnable": false,
         "useStaticServer": true,
         "showES6CompileOption": false,
         "disableUseStrict": false,
         "useCompilerPlugins": false,
-        "minifyWXML": true
+        "minifyWXML": false,
+        "condition": false,
+        "ignoreUploadUnusedFiles": false
     },
     "compileType": "miniprogram",
     "simulatorType": "wechat",

project.private.config.json

@@ -1,6 +1,8 @@
 {
     "setting": {
-        "compileHotReLoad": true
+        "compileHotReLoad": false,
+        "useIsolateContext": false,
+        "bigPackageSizeSupport": true
     },
     "condition": {
         "miniprogram": {

src/api/report.ts

@@ -15,7 +15,7 @@ type reportAddType = {
 
 export const addReport = (data: reportAddType) => {
   return request({
-    url: `report/add`,
+    url: `/report/add`,
     method: 'POST',
     data
   })

src/api/test.ts

@@ -2,7 +2,7 @@ import { request } from '../service/request'
 
 export const text = () => {
     return request({
-        baseUrl: 'https://open.luojigou.vip',
+        baseUrl: 'https://open.api.luojigou.vip',
         url: '/forum/index/adv'
     })
 }

src/api/user.ts

@@ -1,7 +1,7 @@
 import { request } from '../service/request'
 
 /**
- * 
+ *
  * token 失效 刷新token使用
  * @param { string } code  Taro.login 的返回值
  */
@@ -12,25 +12,30 @@ export const reloadlogin = (code: string) => {
     })
 }
 
+// export const getUserPhoneNumber = (params: getUserPhoneType) => {
+//     const {code, encryptedData, iv } = params
+//     console.log(params);
+//
+//     return request({
+//         url: `/verify/bindPhoneNumberV3/${code}`,
+//         method: 'POST',
+//         data: {
+//             encryptedData,
+//             iv
+//         }
+//     })
+// }
 
-// 获取用户手机号
-export type getUserPhoneType = {
-    code: string,
-    encryptedData: string,
-    iv: string
-}
-
-export const getUserPhoneNumber = (params: getUserPhoneType) => {
-    const {code, encryptedData, iv } = params
-    console.log(params);
-    
+/**
+ * @description 获取用户手机号
+ * @param code{string} wx.login获取的code
+ * @author 朱波
+ * @date 2023/5/6
+*/
+export const getUserPhoneNumber = (code:string) => {
     return request({
-        url: `/verify/bindPhoneNumberV3/${code}`,
+        url: `/verify/wechat/mini-program/login/${code}`,
         method: 'POST',
-        data: {
-            encryptedData,
-            iv
-        }
     })
 }
 

src/pages/index/index.tsx

@@ -37,7 +37,7 @@ const Index: React.FC = () => {
           resolve(1)
         },
         fail: async res => {
-
+          console.log('fail:', res);
           // session_key 已经失效，需要重新执行登录流程
           const r = await Taro.login() //重新登录
           setCode(r.code)
@@ -54,9 +54,11 @@ const Index: React.FC = () => {
 
     await checkSession()
 
-    console.log(code, '获取用户手机号');
+    console.log(code,item, e, '获取用户手机号');
+
+    const data = await getUserPhoneNumber(code)
 
-    const data = await getUserPhoneNumber({ ...e.detail, code })
+    console.log(data,'getUserPhoneNumber')
 
     Tip.loaded()
 
@@ -93,16 +95,16 @@ const Index: React.FC = () => {
   const RenderItem = (item: number) => {
 
     const noHasPhoneEle = (
-      <Button
+      <View
         className='button'
         open-type='getPhoneNumber'
-        onGetPhoneNumber={(e) => Getphonenumber(item, e)}
+        onClick={(e) => Getphonenumber(item, e)}
       >
         <Image
           className='item-img'
           src={require(`../../assets/home/home${item}.png`)}
         />
-      </Button>
+      </View>
     )
 
     const hasPhoneELe = (

src/service/config.ts

@@ -31,10 +31,12 @@ export let baseUrl = '2'
 if (process.env.NODE_ENV === 'development') {
   // baseUrl = 'http://verify.test.luojigou.vip:8899'
   // baseUrl = 'http://192.168.1.15:8091/'
-  baseUrl = 'https://verify.luojigou.vip/'
+  // baseUrl = 'https://verify.luojigou.vip/'
   // baseUrl = 'http://192.168.1.21:8091'
+  baseUrl = 'https://open.test.luojigou.vip/verify'
 } else {
-  baseUrl = 'http://192.168.1.21:8091'
+  // baseUrl = 'http://192.168.1.21:8091'
+  baseUrl = 'https://open.api.luojigou.vip/verify'
 }