diff --git a/.stylelintrc.json b/.stylelintrc.json index 03ce231..856b1ab 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -25,12 +25,8 @@ "keyframes-name-pattern": null, "no-descending-specificity": null, "no-empty-source": null, - "unit-no-unknown": [ - true, - { - "ignoreUnits": ["rpx"] - } - ], + "declaration-property-value-no-unknown": null, + "unit-no-unknown": null, "selector-type-no-unknown": [ true, { diff --git a/src/App.vue b/src/App.vue index 220abd9..3f5185a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -21,13 +21,24 @@ onHide(() => { diff --git a/src/manifest.json b/src/manifest.json index c38e717..9421bd5 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -50,7 +50,7 @@ "quickapp": {}, /* 小程序特有相关 */ "mp-weixin": { - "appid": "", + "appid": "wx99a151dc43d2637b", "setting": { "urlCheck": false }, diff --git a/src/pages/login/complete-profile.vue b/src/pages/login/complete-profile.vue deleted file mode 100644 index ceac9f7..0000000 --- a/src/pages/login/complete-profile.vue +++ /dev/null @@ -1,487 +0,0 @@ - - - - - diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 5275fcd..9cc3613 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -35,11 +35,17 @@ - + @@ -94,6 +100,7 @@ const loginFormRef = ref(); const toast = useToast(); const loading = ref(false); const userStore = useUserStore(); +const showPassword = ref(false); // 登录表单数据 const loginFormData = ref({ diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue index b76ea6e..af41cae 100644 --- a/src/pages/mine/index.vue +++ b/src/pages/mine/index.vue @@ -10,9 +10,6 @@ :src="isLogin ? userInfo!.avatar : defaultAvatar" mode="aspectFill" /> - - - @@ -21,7 +18,12 @@ - @@ -31,7 +33,7 @@ - + 2 @@ -56,53 +58,6 @@ - - - - - - 我的订单 - - - 全部订单 - - - - - - - - 2 - - 待付款 - - - - - - 待发货 - - - - - - 待收货 - - - - - - 待评价 - - - - - - 售后 - - - - @@ -114,22 +69,11 @@ - + 个人资料 - - - - - 收货地址 - - - - - - 待办事项 - + @@ -148,18 +92,6 @@ 关于我们 - - - - - 设置 - - - - - - 我的钱包 - @@ -174,8 +106,8 @@ - - + + 会员中心 @@ -187,7 +119,7 @@ - + 优惠券 @@ -212,7 +144,7 @@ - 退出登录 + 退出登录 @@ -314,6 +246,7 @@ const navigateToSection = (section: string, subSection?: string) => { + + diff --git a/src/pages/mine/settings/index.vue b/src/pages/mine/settings/index.vue index e07dcf6..b7bb99b 100644 --- a/src/pages/mine/settings/index.vue +++ b/src/pages/mine/settings/index.vue @@ -1,10 +1,12 @@