From 56edb338d1ae1f899a642ca760c96e9fe6b8b34f Mon Sep 17 00:00:00 2001 From: sa0ChunLuyu Date: Tue, 15 Aug 2023 20:51:24 +0800 Subject: [PATCH] =?UTF-8?q?1.=20uniapp=20=E6=B7=BB=E5=8A=A0=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E6=A0=B7=E5=BC=8F=202.=20uniapp=20=20config=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=203.=20uniapp=20=E4=BB=A3=E7=90=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=204.=20uniapp=20=E8=B7=AF=E5=BE=84=E4=BC=98=E5=8C=96?= =?UTF-8?q?=205.=20uniapp=20=E5=BC=80=E5=8F=91=E8=80=85=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uniapp/App.vue | 22 ++ uniapp/api/index.js | 22 +- uniapp/components/dev/dev.vue | 160 +++++++++++ uniapp/config.js | 39 ++- uniapp/pages.json | 17 +- .../{package => dev}/example/Api/Api.vue | 0 .../example/Navbar/Navbar.vue | 0 .../example/PayTest/PayTest.vue | 0 .../{package => dev}/example/Pinia/Pinia.vue | 0 .../example/RouterPush/RouterPush.vue | 0 .../example/RouterQuery/RouterQuery.vue | 0 .../example/SonFather/Father.vue | 0 .../example/SonFather/Son.vue | 0 .../example/UserAvatar/UserAvatar.vue | 0 .../example/UserCode/UserCode.vue | 0 .../example/UserGzh/UserGzh.vue | 0 .../example/UserInfo/UserInfo.vue | 0 .../example/UserNickname/UserNickname.vue | 0 .../example/UserPhone/UserPhone.vue | 0 .../{package => dev}/example/example.vue | 13 +- uniapp/pages/dev/proxy/proxy.vue | 258 ++++++++++++++++++ .../gzh_auth.vue => gzh/login/login.vue} | 10 +- uniapp/pages/main/index/index.vue | 14 +- 23 files changed, 512 insertions(+), 43 deletions(-) create mode 100644 uniapp/components/dev/dev.vue rename uniapp/pages/{package => dev}/example/Api/Api.vue (100%) rename uniapp/pages/{package => dev}/example/Navbar/Navbar.vue (100%) rename uniapp/pages/{package => dev}/example/PayTest/PayTest.vue (100%) rename uniapp/pages/{package => dev}/example/Pinia/Pinia.vue (100%) rename uniapp/pages/{package => dev}/example/RouterPush/RouterPush.vue (100%) rename uniapp/pages/{package => dev}/example/RouterQuery/RouterQuery.vue (100%) rename uniapp/pages/{package => dev}/example/SonFather/Father.vue (100%) rename uniapp/pages/{package => dev}/example/SonFather/Son.vue (100%) rename uniapp/pages/{package => dev}/example/UserAvatar/UserAvatar.vue (100%) rename uniapp/pages/{package => dev}/example/UserCode/UserCode.vue (100%) rename uniapp/pages/{package => dev}/example/UserGzh/UserGzh.vue (100%) rename uniapp/pages/{package => dev}/example/UserInfo/UserInfo.vue (100%) rename uniapp/pages/{package => dev}/example/UserNickname/UserNickname.vue (100%) rename uniapp/pages/{package => dev}/example/UserPhone/UserPhone.vue (100%) rename uniapp/pages/{package => dev}/example/example.vue (93%) create mode 100644 uniapp/pages/dev/proxy/proxy.vue rename uniapp/pages/{package/gzh_auth/gzh_auth.vue => gzh/login/login.vue} (67%) diff --git a/uniapp/App.vue b/uniapp/App.vue index 0875fea..48141ea 100644 --- a/uniapp/App.vue +++ b/uniapp/App.vue @@ -36,4 +36,26 @@ .navbar_blank_wrapper { height: calc(100rpx + var(--safe-area-inset-top)); } + + .input_line_wrapper { + display: flex; + align-items: center; + flex-wrap: wrap; + justify-content: space-between; + } + + .input_line_tag_wrapper { + width: 200rpx; + height: 60rpx; + line-height: 60rpx; + text-align: center; + background: #f9f9f9; + font-size: 26rpx; + font-weight: bold; + border-radius: 6rpx; + } + + .input_line_input_wrapper { + width: 500rpx; + } \ No newline at end of file diff --git a/uniapp/api/index.js b/uniapp/api/index.js index 1be8372..a2ef314 100644 --- a/uniapp/api/index.js +++ b/uniapp/api/index.js @@ -3,17 +3,31 @@ import { } from '@/lu/axios.js' import $config from '@/config.js' const app_path = 'App' -export const OpenGzhAuthUrl = `${$config.url}/open/Gzh/auth` +let url = '' +const urlPick = () => { + if ($config.config.length > 0) { + url = $config.config[0].url + for (let i in $config.config) { + if (!!$config.config[i].active) { + url = $config.config[i].url + break + } + } + } +} +urlPick() + +export const OpenGzhAuthUrl = `${url}/open/Gzh/auth` export const WeChatPayPayTestAction = async (data) => await $post({ - url: `${$config.url}/api/Test/WeChatPay/pay_test`, + url: `${url}/api/Test/WeChatPay/pay_test`, data }) export const WeChatLoginTestAction = async (data) => await $post({ - url: `${$config.url}/api/Test/WeChat/login_test`, + url: `${url}/api/Test/WeChat/login_test`, data }) export const yo = async (data) => await $post({ - url: `${$config.url}/api/yo`, + url: `${url}/api/yo`, data }) diff --git a/uniapp/components/dev/dev.vue b/uniapp/components/dev/dev.vue new file mode 100644 index 0000000..157396b --- /dev/null +++ b/uniapp/components/dev/dev.vue @@ -0,0 +1,160 @@ + + + \ No newline at end of file diff --git a/uniapp/config.js b/uniapp/config.js index c94b61e..3b00d3c 100644 --- a/uniapp/config.js +++ b/uniapp/config.js @@ -1,20 +1,29 @@ -let url = 'http://lucode3.sa0.online' -let login = 'http://127.0.0.1:5173/h5/#/pages/package/gzh_auth/gzh_auth?' -let env = 'online' -if (process.env.NODE_ENV == 'development') { - env = 'dev' -} -// env = 'online' -// env = 'dev' -if (env === 'dev') { - url = 'http://127.0.0.1:8000' - login = 'http://127.0.0.1:5173/h5/#/pages/package/gzh_auth/gzh_auth?' +const config = [{ + active: true, + url: 'http://lucode3.sa0.online', + gzh: { + id: 'wx526430047d34c85c', + jump: 'http://node/h5/#/pages/package/gzh_auth/gzh_auth?' + }, +}, { + active: false, + url: 'http://127.0.0.1:8000', + gzh: { + id: 'wx526430047d34c85c', + jump: 'http://127.0.0.1:5173/h5/#/pages/gzh/login/login?' + }, +}] +uni.$config = JSON.parse(JSON.stringify(config)) +const config_str_key = "CONFIG_STR" +let config_str = uni.getStorageSync(config_str_key) +if (!config_str) { + config_str = JSON.stringify(config) + uni.setStorageSync(config_str_key, config_str) } +const config_data = JSON.parse(config_str) export default { title: '鹿和开发套件', app_id: 'wx0d92d2990ec16a55', - gzh_id: 'wx526430047d34c85c', - login, - token: '0995452A-0D59-44B6-B6CA-88D8B1E257A0', - url, + config: config_data, + token: '0995452A-0D59-44B6-B6CA-88D8B1E257A0' } \ No newline at end of file diff --git a/uniapp/pages.json b/uniapp/pages.json index 286d4aa..8296ae5 100644 --- a/uniapp/pages.json +++ b/uniapp/pages.json @@ -11,7 +11,7 @@ } }], "subPackages": [{ - "root": "pages/package", + "root": "pages/dev", "pages": [{ "path": "example/example", "style": { @@ -20,12 +20,23 @@ "navigationStyle": "custom" } }, { - "path": "gzh_auth/gzh_auth", + "path": "proxy/proxy", "style": { - "navigationBarTitleText": "", + "navigationBarTitleText": "代理设置", "enablePullDownRefresh": false } + }] + }, { + "root": "pages/gzh", + "pages": [{ + "path": "login/login", + "style": { + "navigationBarTitleText": "公众号登录跳转", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }] }], "tabBar": { diff --git a/uniapp/pages/package/example/Api/Api.vue b/uniapp/pages/dev/example/Api/Api.vue similarity index 100% rename from uniapp/pages/package/example/Api/Api.vue rename to uniapp/pages/dev/example/Api/Api.vue diff --git a/uniapp/pages/package/example/Navbar/Navbar.vue b/uniapp/pages/dev/example/Navbar/Navbar.vue similarity index 100% rename from uniapp/pages/package/example/Navbar/Navbar.vue rename to uniapp/pages/dev/example/Navbar/Navbar.vue diff --git a/uniapp/pages/package/example/PayTest/PayTest.vue b/uniapp/pages/dev/example/PayTest/PayTest.vue similarity index 100% rename from uniapp/pages/package/example/PayTest/PayTest.vue rename to uniapp/pages/dev/example/PayTest/PayTest.vue diff --git a/uniapp/pages/package/example/Pinia/Pinia.vue b/uniapp/pages/dev/example/Pinia/Pinia.vue similarity index 100% rename from uniapp/pages/package/example/Pinia/Pinia.vue rename to uniapp/pages/dev/example/Pinia/Pinia.vue diff --git a/uniapp/pages/package/example/RouterPush/RouterPush.vue b/uniapp/pages/dev/example/RouterPush/RouterPush.vue similarity index 100% rename from uniapp/pages/package/example/RouterPush/RouterPush.vue rename to uniapp/pages/dev/example/RouterPush/RouterPush.vue diff --git a/uniapp/pages/package/example/RouterQuery/RouterQuery.vue b/uniapp/pages/dev/example/RouterQuery/RouterQuery.vue similarity index 100% rename from uniapp/pages/package/example/RouterQuery/RouterQuery.vue rename to uniapp/pages/dev/example/RouterQuery/RouterQuery.vue diff --git a/uniapp/pages/package/example/SonFather/Father.vue b/uniapp/pages/dev/example/SonFather/Father.vue similarity index 100% rename from uniapp/pages/package/example/SonFather/Father.vue rename to uniapp/pages/dev/example/SonFather/Father.vue diff --git a/uniapp/pages/package/example/SonFather/Son.vue b/uniapp/pages/dev/example/SonFather/Son.vue similarity index 100% rename from uniapp/pages/package/example/SonFather/Son.vue rename to uniapp/pages/dev/example/SonFather/Son.vue diff --git a/uniapp/pages/package/example/UserAvatar/UserAvatar.vue b/uniapp/pages/dev/example/UserAvatar/UserAvatar.vue similarity index 100% rename from uniapp/pages/package/example/UserAvatar/UserAvatar.vue rename to uniapp/pages/dev/example/UserAvatar/UserAvatar.vue diff --git a/uniapp/pages/package/example/UserCode/UserCode.vue b/uniapp/pages/dev/example/UserCode/UserCode.vue similarity index 100% rename from uniapp/pages/package/example/UserCode/UserCode.vue rename to uniapp/pages/dev/example/UserCode/UserCode.vue diff --git a/uniapp/pages/package/example/UserGzh/UserGzh.vue b/uniapp/pages/dev/example/UserGzh/UserGzh.vue similarity index 100% rename from uniapp/pages/package/example/UserGzh/UserGzh.vue rename to uniapp/pages/dev/example/UserGzh/UserGzh.vue diff --git a/uniapp/pages/package/example/UserInfo/UserInfo.vue b/uniapp/pages/dev/example/UserInfo/UserInfo.vue similarity index 100% rename from uniapp/pages/package/example/UserInfo/UserInfo.vue rename to uniapp/pages/dev/example/UserInfo/UserInfo.vue diff --git a/uniapp/pages/package/example/UserNickname/UserNickname.vue b/uniapp/pages/dev/example/UserNickname/UserNickname.vue similarity index 100% rename from uniapp/pages/package/example/UserNickname/UserNickname.vue rename to uniapp/pages/dev/example/UserNickname/UserNickname.vue diff --git a/uniapp/pages/package/example/UserPhone/UserPhone.vue b/uniapp/pages/dev/example/UserPhone/UserPhone.vue similarity index 100% rename from uniapp/pages/package/example/UserPhone/UserPhone.vue rename to uniapp/pages/dev/example/UserPhone/UserPhone.vue diff --git a/uniapp/pages/package/example/example.vue b/uniapp/pages/dev/example/example.vue similarity index 93% rename from uniapp/pages/package/example/example.vue rename to uniapp/pages/dev/example/example.vue index a19858b..6e28974 100644 --- a/uniapp/pages/package/example/example.vue +++ b/uniapp/pages/dev/example/example.vue @@ -10,14 +10,17 @@ import PiniaComponent from './Pinia/Pinia.vue' // Pinia import RouterPushComponent from './RouterPush/RouterPush.vue' // 路由跳转 import FatherComponent from './SonFather/Father.vue' // 子父组件 + // #ifdef MP-WEIXIN import UserAvatarComponent from './UserAvatar/UserAvatar.vue' // 用户头像 import UserNicknameComponent from './UserNickname/UserNickname.vue' // 用户昵称 import UserInfoComponent from './UserInfo/UserInfo.vue' // 用户信息 import UserCodeComponent from './UserCode/UserCode.vue' // 用户授权 - import UserGzhComponent from './UserGzh/UserGzh.vue' // 用户公众号授权 import UserPhoneComponent from './UserPhone/UserPhone.vue' // 用户手机号 import PayTestComponent from './PayTest/PayTest.vue' // 支付测试 - + // #endif + // #ifdef H5 + import UserGzhComponent from './UserGzh/UserGzh.vue' // 用户公众号授权 + // #endif // 路由参数 // 平台特殊性 下层组件 URL 参数只能从最高层下传 const $props = defineProps({ @@ -35,13 +38,17 @@ + - + + + + + \ No newline at end of file diff --git a/uniapp/pages/package/gzh_auth/gzh_auth.vue b/uniapp/pages/gzh/login/login.vue similarity index 67% rename from uniapp/pages/package/gzh_auth/gzh_auth.vue rename to uniapp/pages/gzh/login/login.vue index c6b101a..623c416 100644 --- a/uniapp/pages/package/gzh_auth/gzh_auth.vue +++ b/uniapp/pages/gzh/login/login.vue @@ -2,7 +2,7 @@ /** * name: * user:sa0ChunLuyu - * date:2023年8月13日 23:56:28 + * date:2023年8月14日 06:41:42 */ import { ref @@ -13,16 +13,10 @@ import { onShow } from '@dcloudio/uni-app' - const $props = defineProps({ - code: { - type: String, - default: '' - } - }); diff --git a/uniapp/pages/main/index/index.vue b/uniapp/pages/main/index/index.vue index 5b3b5ab..4bc6464 100644 --- a/uniapp/pages/main/index/index.vue +++ b/uniapp/pages/main/index/index.vue @@ -13,21 +13,15 @@ import { onShow } from '@dcloudio/uni-app' + import dev from '@/components/dev/dev.vue' const title = uni.$lu.config.title - const toExample = () => { - uni.navigateTo({ - url: '/pages/package/example/example?name=yo' - }) - }