xsh_1997 il y a 1 semaine
Parent
commit
d2dfab4cf4

+ 1 - 1
ruoyi-ui/.env.development

@@ -1,5 +1,5 @@
1 1
 # 页面标题
2
-VUE_APP_TITLE = 巴青商城
2
+VUE_APP_TITLE = 农资商城
3 3
 
4 4
 # 开发环境配置
5 5
 ENV = 'development'

+ 2 - 2
ruoyi-ui/.env.production

@@ -1,8 +1,8 @@
1 1
 # 页面标题
2
-VUE_APP_TITLE = 巴青商城
2
+VUE_APP_TITLE = 农资商城
3 3
 
4 4
 # 生产环境配置
5 5
 ENV = 'production'
6 6
 
7 7
 # 巴青商城/生产环境
8
-VUE_APP_BASE_API = '/prod-api'
8
+VUE_APP_BASE_API = '/shop-api'

+ 1 - 0
ruoyi-ui/src/router/index.js

@@ -184,6 +184,7 @@ Router.prototype.replace = function push(location) {
184 184
 
185 185
 export default new Router({
186 186
   mode: 'history', // 去掉url中的#
187
+  base: '/shopClient',
187 188
   scrollBehavior: () => ({ y: 0 }),
188 189
   routes: constantRoutes
189 190
 })

+ 2 - 2
shop-app/.env.development

@@ -1,5 +1,5 @@
1 1
 # 开发环境(对齐 ruoyi-ui/.env.development)
2
-VITE_APP_TITLE=掌上巴青
2
+VITE_APP_TITLE=农资商城
3 3
 VITE_APP_BASE_API=/dev-api
4 4
 # H5 直连后端时使用(与 ruoyi-ui/vue.config.js baseUrl 一致)
5
-VITE_APP_API_HOST=http://192.168.1.6:8010
5
+VITE_APP_API_HOST=http://192.168.1.6:8020

+ 3 - 3
shop-app/.env.production

@@ -1,11 +1,11 @@
1 1
 # 页面标题(对齐 ruoyi-ui/.env.production)
2
-VITE_APP_TITLE=掌上巴青
2
+VITE_APP_TITLE=农资商城
3 3
 
4 4
 # 生产环境
5 5
 ENV=production
6 6
 
7 7
 # 若依后端 API(与 ruoyi-ui 一致,由 Nginx 反代到真实后端)
8
-VITE_APP_BASE_API=/prod-api
8
+VITE_APP_BASE_API=/shop-api
9 9
 
10 10
 # H5 部署子路径(须与 manifest.json h5.router.base 一致,如 /bqH5/)
11
-VITE_APP_PUBLIC_PATH=bqH5
11
+VITE_APP_PUBLIC_PATH=bqShop

+ 1 - 1
shop-app/config/index.js

@@ -21,7 +21,7 @@ export const H5_USE_PROXY = true
21 21
 
22 22
 function resolveBaseApi() {
23 23
   if (import.meta.env.PROD) {
24
-    return envBaseApi || '/prod-api'
24
+    return envBaseApi || '/shop-api'
25 25
   }
26 26
   const devBase = envBaseApi || '/dev-api'
27 27
   // #ifdef H5

+ 2 - 2
shop-app/manifest.json

@@ -71,8 +71,8 @@
71 71
     "vueVersion" : "3",
72 72
     "h5" : {
73 73
         "router" : {
74
-            "mode" : "hash",
75
-            "base" : ""
74
+            "mode" : "history",
75
+            "base" : "/bqShop/"
76 76
         },
77 77
         "title" : "农资商城"
78 78
     }

+ 3 - 3
shop-app/pages/login/index.vue

@@ -10,7 +10,7 @@
10 10
 		<view class="auth-body">
11 11
 			<view class="auth-card">
12 12
 				<text class="auth-card__title">会员登录</text>
13
-				<text class="auth-card__sub">可使用手机号或会员名称(会员 ID)登录</text>
13
+				<text class="auth-card__sub">可使用手机号登录</text>
14 14
 
15 15
 				<view class="auth-field">
16 16
 					<view class="auth-field__box">
@@ -19,7 +19,7 @@
19 19
 							v-model="form.account"
20 20
 							class="auth-field__input"
21 21
 							type="text"
22
-							placeholder="手机号或会员名称(会员 ID)"
22
+							placeholder="手机号"
23 23
 							placeholder-class="auth-field__placeholder"
24 24
 							confirm-type="next"
25 25
 						/>
@@ -71,7 +71,7 @@
71 71
 				</view>
72 72
 			</view>
73 73
 
74
-			<text class="auth-footer">巴青农资商城</text>
74
+			<text class="auth-footer">农资商城</text>
75 75
 		</view>
76 76
 	</view>
77 77
 </template>

+ 2 - 2
shop-app/subpackage/account/register.vue

@@ -57,7 +57,7 @@
57 57
 						</view>
58 58
 					</view>
59 59
 
60
-					<view class="auth-field">
60
+					<!-- <view class="auth-field">
61 61
 						<view class="auth-field__box">
62 62
 							<u-icon name="account" color="#6b7f72" size="22" />
63 63
 							<input
@@ -68,7 +68,7 @@
68 68
 								placeholder-class="auth-field__placeholder"
69 69
 							/>
70 70
 						</view>
71
-					</view>
71
+					</view> -->
72 72
 
73 73
 					<agreement-block
74 74
 						v-model="form.agreementAccepted"