From d31059a2cfbb36c1467f43781caec41790b88b7c Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Sat, 30 Aug 2025 17:12:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E7=99=BB=E5=BD=95=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?appid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/.env                     |  2 +-
 src/api/login.ts             | 16 +++++++++++++---
 src/manifest.json            |  2 +-
 src/pages/index/index.vue    |  9 +++++----
 src/pages/web_view/index.vue |  3 ++-
 5 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/env/.env b/env/.env
index fbfe786..e719d4e 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=/
diff --git a/src/api/login.ts b/src/api/login.ts
index ad5b26d..069ba64 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<UniApp.LoginRes>((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)),
     })
   })
 }
@@ -81,3 +87,7 @@ export function getWxCode() {
 export function wxLogin(data: { code: string }) {
   return http.post<IUserLogin>('/user/wxLogin', data)
 }
+
+export function routineLoginApi(data: { code: string }) {
+  return http.post('/api/auth/routineLogin', data)
+}
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/index/index.vue b/src/pages/index/index.vue
index 9e95928..460227a 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -101,7 +101,7 @@
         <view
           class="p-1"
           style="display: inline-block; width: 300rpx"
-          @click="goToShop('https://shop.lihaink.cn/')"
+          @click="goToShop()"
           v-for="item in product_30.list"
         >
           <wd-card custom-class="card-content">
@@ -426,7 +426,7 @@
 
 <script lang="ts" setup>
 // import { toLogin } from '@/libs/login.js'
-import { getProductAPI } from '@/service/crmeb/product'
+import { getProductAPI } from '@/service/crmeb/product.ts'
 
 onLoad(() => {
   getProduct(30)
@@ -478,9 +478,10 @@ function more() {
 }
 function goToShop() {
   // if (this.isLogin) {
-  let urls = 'https://shop.lihaink.cn/'
+	const target = encodeURIComponent('/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?local_url=${urls}&title=区域特产&target=${target}`,
   })
   // } else {
   //   this.openAuto()
diff --git a/src/pages/web_view/index.vue b/src/pages/web_view/index.vue
index 43db812..3f301d0 100644
--- a/src/pages/web_view/index.vue
+++ b/src/pages/web_view/index.vue
@@ -44,7 +44,8 @@ export default defineComponent({
     },
   },
   onLoad(option) {
-    this.local_url = decodeURIComponent(getUrlCrmeb() + option.local_url)
+    // this.local_url = decodeURIComponent(getUrlCrmeb() + option.local_url)
+    this.local_url = option.local_url + '?target=' + option.target
     this.title = option.title || ''
     uni.setNavigationBarTitle({
       title: this.title, // 运行时修改标题