xsh_1997 1 주 전
부모
커밋
215879c107
3개의 변경된 파일73개의 추가작업 그리고 13개의 파일을 삭제
  1. 2 2
      ruoyi-ui/src/views/login.vue
  2. 13 4
      shop-app/pages/mine/index.vue
  3. 58 7
      shop-app/styles/mine.scss

+ 2 - 2
ruoyi-ui/src/views/login.vue

@@ -75,8 +75,8 @@ export default {
75 75
       footerContent: defaultSettings.footerContent,
76 76
       codeUrl: "",
77 77
       loginForm: {
78
-        username: "admin",
79
-        password: "admin123",
78
+        username: "",
79
+        password: "",
80 80
         rememberMe: false,
81 81
         code: "",
82 82
         uuid: ""

+ 13 - 4
shop-app/pages/mine/index.vue

@@ -15,11 +15,19 @@
15 15
 		<scroll-view class="mine-scroll" scroll-y :style="{ height: scrollHeight }">
16 16
 			<view class="mine-body">
17 17
 			<view v-if="!loggedIn" class="mine-guest">
18
-				<text class="mine-guest__title">登录后享受完整购物服务</text>
19
-				<text class="mine-guest__tip">下单、加购需登录会员账号</text>
18
+				<view class="mine-guest__hero">
19
+					<view class="mine-guest__icon-ring">
20
+						<u-icon name="account" color="#2e7d32" size="44" />
21
+					</view>
22
+					<text class="mine-guest__title">登录后享受完整购物服务</text>
23
+					<text class="mine-guest__tip">下单、加购、查订单,一站式农资采购</text>
24
+				</view>
20 25
 				<view class="mine-guest__btns">
21
-					<button class="mine-btn-primary" @click="goLogin">登录</button>
22
-					<button class="mine-btn-outline" @click="goRegister">注册会员</button>
26
+					<button class="mine-btn-primary mine-guest__btn-login" @click="goLogin">立即登录</button>
27
+					<view class="mine-guest__register" @click="goRegister">
28
+						<text class="mine-guest__register-text">还没有账号?</text>
29
+						<text class="mine-guest__register-link">注册会员</text>
30
+					</view>
23 31
 				</view>
24 32
 			</view>
25 33
 
@@ -110,6 +118,7 @@ const avatarUrl = ref('/static/logo.png')
110 118
 
111 119
 const userStore = useUserStore()
112 120
 const orderShortcuts = ORDER_MINE_SHORTCUTS
121
+
113 122
 const orderBadges = ref({
114 123
   pendingPayCount: 0,
115 124
   pendingShipCount: 0,

+ 58 - 7
shop-app/styles/mine.scss

@@ -181,15 +181,35 @@
181 181
 }
182 182
 
183 183
 .mine-guest {
184
-  margin: 24rpx;
185
-  padding: 48rpx 32rpx;
186
-  text-align: center;
184
+  margin-bottom: 24rpx;
185
+  overflow: hidden;
187 186
   background: #fff;
188 187
   border-radius: 20rpx;
188
+  box-shadow: 0 4rpx 20rpx rgba(74, 69, 66, 0.06);
189
+}
190
+
191
+.mine-guest__hero {
192
+  padding: 40rpx 32rpx 8rpx;
193
+  text-align: center;
194
+  background: linear-gradient(180deg, #ecfdf3 0%, #fff 100%);
195
+}
196
+
197
+.mine-guest__icon-ring {
198
+  width: 120rpx;
199
+  height: 120rpx;
200
+  margin: 0 auto;
201
+  display: flex;
202
+  align-items: center;
203
+  justify-content: center;
204
+  border-radius: 50%;
205
+  background: linear-gradient(145deg, #dcfce7 0%, #bbf7d0 100%);
206
+  box-shadow: 0 8rpx 24rpx rgba(46, 125, 50, 0.15);
189 207
 }
190 208
 
191 209
 .mine-guest__title {
192
-  font-size: 32rpx;
210
+  display: block;
211
+  margin-top: 28rpx;
212
+  font-size: 34rpx;
193 213
   font-weight: 600;
194 214
   color: $morandi-text;
195 215
 }
@@ -199,13 +219,40 @@
199 219
   margin-top: 12rpx;
200 220
   font-size: 26rpx;
201 221
   color: $morandi-text-muted;
222
+  line-height: 1.5;
202 223
 }
203 224
 
204 225
 .mine-guest__btns {
205
-  margin-top: 40rpx;
226
+  padding: 32rpx 32rpx 40rpx;
227
+}
228
+
229
+.mine-guest__btn-login {
230
+  width: 100%;
231
+  background: linear-gradient(135deg, #43a047 0%, #2e7d32 100%);
232
+  box-shadow: 0 8rpx 20rpx rgba(46, 125, 50, 0.25);
233
+}
234
+
235
+.mine-guest__btn-login::after {
236
+  border: none;
237
+}
238
+
239
+.mine-guest__register {
240
+  margin-top: 24rpx;
206 241
   display: flex;
207
-  flex-direction: column;
208
-  gap: 20rpx;
242
+  align-items: center;
243
+  justify-content: center;
244
+  gap: 8rpx;
245
+}
246
+
247
+.mine-guest__register-text {
248
+  font-size: 26rpx;
249
+  color: $morandi-text-muted;
250
+}
251
+
252
+.mine-guest__register-link {
253
+  font-size: 26rpx;
254
+  color: #2e7d32;
255
+  font-weight: 600;
209 256
 }
210 257
 
211 258
 .mine-btn-primary {
@@ -218,6 +265,10 @@
218 265
   border: none;
219 266
 }
220 267
 
268
+.mine-btn-primary::after {
269
+  border: none;
270
+}
271
+
221 272
 .mine-btn-outline {
222 273
   height: 80rpx;
223 274
   line-height: 80rpx;