diff --git a/env/.env b/env/.env index 255a2b3..f266882 100644 --- a/env/.env +++ b/env/.env @@ -2,7 +2,7 @@ VITE_APP_TITLE = 'unibest' VITE_APP_PORT = 9000 VITE_UNI_APPID = '__UNI__D1E5001' -VITE_WX_APPID = 'wxe2428e8fe6767e45' +VITE_WX_APPID = 'wxdee751952c8c2027' # h5部署网站的base,配置到 manifest.config.ts 里的 h5.router.base VITE_APP_PUBLIC_BASE=/ @@ -13,7 +13,8 @@ VITE_LOGIN_URL = '/pages/login/index' VITE_SERVER_BASEURL = 'https://test.shop.lihaink.cn/' VITE_UPLOAD_BASEURL = 'https://test.shop.lihaink.cn//upload' -VITE_CRMEB_SERVER_BASEURL = 'https://shop.lihaink.cn' + +VITE_CRMEB_SERVER_BASEURL = 'https://test.shop.lihaink.cn/pages/user/login' # 有些同学可能需要在微信小程序里面根据 develop、trial、release 分别设置上传地址,参考代码如下。 # 下面的变量如果没有设置,会默认使用 VITE_SERVER_BASEURL or VITE_UPLOAD_BASEURL diff --git a/src/api/login.ts b/src/api/login.ts index ad5b26d..3cd5e12 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -1,4 +1,10 @@ -import type { ICaptcha, IUpdateInfo, IUpdatePassword, IUserInfoVo, IUserLogin } from './login.typings' +import type { + ICaptcha, + IUpdateInfo, + IUpdatePassword, + IUserInfoVo, + IUserLogin, +} from './login.typings' import { http } from '@/utils/http' /** @@ -63,8 +69,8 @@ export function getWxCode() { return new Promise((resolve, reject) => { uni.login({ provider: 'weixin', - success: res => resolve(res), - fail: err => reject(new Error(err)), + success: (res) => resolve(res), + fail: (err) => reject(new Error(err)), }) }) } @@ -79,5 +85,10 @@ export function getWxCode() { * @returns Promise 包含登录结果 */ export function wxLogin(data: { code: string }) { - return http.post('/user/wxLogin', data) + // return http.post('/user/wxLogin', data) + return http.post('/api/auth/routineLogin', data) } + +// export function routineLoginApi(data: { code: string }) { +// return http.post('/api/auth/routineLogin', data) +// } diff --git a/src/components/fly-login/fly-login.vue b/src/components/fly-login/fly-login.vue index 27e0fd9..7017f24 100644 --- a/src/components/fly-login/fly-login.vue +++ b/src/components/fly-login/fly-login.vue @@ -98,8 +98,8 @@ const onSubmit = () => { emit('update:modelValue', false) console.log('保存用户信息') - userStore.setUserInfo({ nickname: nickname.value, avatar: avatarUrl.value }) - // userStore.wxLogin() + // userStore.setUserInfo({ nickname: nickname.value, avatar: avatarUrl.value }) + userStore.wxLogin() } diff --git a/src/manifest.json b/src/manifest.json index 3ae77af..80c0869 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -83,7 +83,7 @@ }, "quickapp": {}, "mp-weixin": { - "appid": "wxe2428e8fe6767e45", + "appid": "wxdee751952c8c2027", "setting": { "urlCheck": false, "es6": true, diff --git a/src/pages/about/index.vue b/src/pages/about/index.vue index d8bea08..c8e08e0 100644 --- a/src/pages/about/index.vue +++ b/src/pages/about/index.vue @@ -188,7 +188,7 @@ function goToShop() { // if (this.isLogin) { let urls = 'https://shop.lihaink.cn/' uni.navigateTo({ - url: `/pages/web_view/index?local_url=${urls}&title=区域特产`, + url: `/pages/web_view/index?target=${urls}&title=区域特产`, }) // } else { // this.openAuto() diff --git a/src/pages/index/home.vue b/src/pages/index/home.vue index 6699560..67bee6b 100644 --- a/src/pages/index/home.vue +++ b/src/pages/index/home.vue @@ -361,7 +361,7 @@ function goToShop() { // if (this.isLogin) { let urls = 'https://shop.lihaink.cn/' uni.navigateTo({ - url: `/pages/web_view/index?local_url=${urls}&title=区域特产`, + url: `/pages/web_view/index?target=${urls}&title=区域特产`, }) // } else { // this.openAuto() diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index b6f893d..db12388 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -105,15 +105,15 @@ - + {{ item.store_name }} - 我们这里的食物很新鲜 + {{ item.store_info }} @@ -121,7 +121,7 @@ // import { toLogin } from '@/libs/login.js' -import { getProductAPI } from '@/service/crmeb/product' +import { getProductAPI } from '@/service/crmeb/product.ts' onLoad(() => { getProduct(30) @@ -476,7 +476,7 @@ function moreTourism() { } function more(item) { uni.navigateTo({ - url: `/pages/web_view/index?local_url=${item.url}&title=${item.name}`, + url: `/pages/web_view/index?target=${item.url}&title=${item.name}`, }) } // function more() { @@ -487,9 +487,11 @@ function more(item) { // } function goToShop() { // if (this.isLogin) { - let urls = ' ' + // const target = encodeURIComponent('/pages/goods_cate/goods_cate') + const target = '/pages/goods_cate/goods_cate' + // let urls = 'https://test.shop.lihaink.cn/pages/user/login' uni.navigateTo({ - url: `/pages/web_view/index?local_url=${urls}&title=区域特产`, + url: `/pages/web_view/index?target=${target}&title=区域特产`, }) // } else { // this.openAuto() diff --git a/src/pages/my/components/wx-login.vue b/src/pages/my/components/wx-login.vue index 4d97b3f..13c1d5d 100644 --- a/src/pages/my/components/wx-login.vue +++ b/src/pages/my/components/wx-login.vue @@ -5,8 +5,8 @@