From 2cf5b995a169939f27046ce198d9df0fcad83978 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Fri, 19 Jan 2024 18:14:25 +0800
Subject: [PATCH] change relative 750

---
 uniapp_project_code/.hbuilderx/launch.json         | 16 ++++++++++++
 .../src/components/login/button.vue                |  9 ++++---
 uniapp_project_code/src/components/login/form.vue  | 18 ++++++-------
 uniapp_project_code/src/components/login/logo.vue  |  4 +--
 .../src/components/login/pads_picker.vue           | 19 +++++++-------
 .../src/components/login/setting_mask.vue          | 30 +++++++++++-----------
 uniapp_project_code/src/pages.json                 |  4 +--
 uniapp_project_code/src/pages/login/index.vue      | 18 ++++++-------
 uniapp_project_code/src/pages/login/success.vue    | 20 +++++++--------
 uniapp_project_code/src/uni.scss                   |  2 +-
 10 files changed, 79 insertions(+), 61 deletions(-)
 create mode 100644 uniapp_project_code/.hbuilderx/launch.json

diff --git a/uniapp_project_code/.hbuilderx/launch.json b/uniapp_project_code/.hbuilderx/launch.json
new file mode 100644
index 0000000..582561b
--- /dev/null
+++ b/uniapp_project_code/.hbuilderx/launch.json
@@ -0,0 +1,16 @@
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+     	"app-plus" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
+    ]
+}
diff --git a/uniapp_project_code/src/components/login/button.vue b/uniapp_project_code/src/components/login/button.vue
index 69bee73..7f48e8f 100644
--- a/uniapp_project_code/src/components/login/button.vue
+++ b/uniapp_project_code/src/components/login/button.vue
@@ -10,15 +10,16 @@
 
 <style lang="scss">
     .btn-box{
+        padding: 0 165upx;
         @include ctf(center);
     }
     .login-button{
         @include clearBtn;
-        width: 1290upx;
-        height: 200upx;
-        border-radius: 100upx;
+        width: 100%;
+        height: 69.38upx;
+        border-radius: 35upx;
         background-image: linear-gradient(180deg, #FCDA9E 12%, #F7B23E 100%);
-        @include flcw(72upx, 200upx, #fff, 500);
+        @include flcw(26.39upx, 69.38upx, #fff, 500);
 
     }
 </style>
\ No newline at end of file
diff --git a/uniapp_project_code/src/components/login/form.vue b/uniapp_project_code/src/components/login/form.vue
index 8d4dac8..a919c6b 100644
--- a/uniapp_project_code/src/components/login/form.vue
+++ b/uniapp_project_code/src/components/login/form.vue
@@ -23,25 +23,25 @@
         @include ctf(center);
     }
     .login-form{
-        width: 1230upx;
-        border-radius: 11upx;
+        width: 420upx;
+        border-radius: 3.75upx;
         background: #fff;
         .lf-item{
-            padding: 0 50upx;
-            height: 200upx;
+            padding: 0 16.88upx;
+            height: 68.62upx;
             @include ctf;
             &.lf-item{
-                border-top: 2px solid #F2F2F7;
+                border-top: 1px solid #F2F2F7;
             }
             .li-icon{
-                margin-right: 50upx;
-                width: 76upx;
-                height: 76upx;
+                margin-right: 18.6upx;
+                width: 26.4upx;
+                height: 26.4upx;
             }
             .li-ipt{
                 flex-grow: 1;
                 height: 100%;
-                @include flcw;
+                @include flcw(16.67upx, 21upx);
             }
         }
     }
diff --git a/uniapp_project_code/src/components/login/logo.vue b/uniapp_project_code/src/components/login/logo.vue
index 5b36337..80054e9 100644
--- a/uniapp_project_code/src/components/login/logo.vue
+++ b/uniapp_project_code/src/components/login/logo.vue
@@ -14,8 +14,8 @@ export default {
     .logo-box{
         @include ctf(center);
         .lb-img{
-            width: 486upx;
-            height: 486upx;
+            width: 168.75upx;
+            height: 168.75upx;
             border-radius: 50%;
             background: skyblue;
         }
diff --git a/uniapp_project_code/src/components/login/pads_picker.vue b/uniapp_project_code/src/components/login/pads_picker.vue
index f6f369a..b78e6da 100644
--- a/uniapp_project_code/src/components/login/pads_picker.vue
+++ b/uniapp_project_code/src/components/login/pads_picker.vue
@@ -23,28 +23,29 @@ export default {
 
 <style lang="scss">
     .pads-picker{
+        padding: 0 165upx;
         @include ctf(center);
         .pp-content{
-            width: 1210upx;
+            width: 100%;
             .pc-text{
-                @include flcw(48upx, 76upx, #fff);
+                @include flcw(16.67upx, 26.25upx, #fff);
             }
             .pc-frame{
-                margin-top: 46upx;
+                margin-top: 15.8upx;
                 .pp-box{
-                    padding: 0 40upx;
-                    height: 183upx;
-                    border-radius: 8upx;
+                    padding: 0 14upx;
+                    height: 63.75upx;
+                    border-radius: 2.8upx;
                     background: #fff;
                     @include ctf(space-between);
                     .pb-text{
                         flex-grow: 1;
-                        @include flcw;
+                        @include flcw(16.67upx, 22.92upx, #181818);
                     }
                     .pt-icon{
                         flex-shrink: 0;
-                        width: 54upx;   
-                        height: 27upx;
+                        width: 18.75upx;   
+                        height: 9.38upx;
                     }
                 }
             }
diff --git a/uniapp_project_code/src/components/login/setting_mask.vue b/uniapp_project_code/src/components/login/setting_mask.vue
index 0f6a57e..60259c9 100644
--- a/uniapp_project_code/src/components/login/setting_mask.vue
+++ b/uniapp_project_code/src/components/login/setting_mask.vue
@@ -32,42 +32,42 @@
             position: absolute;
             top: 0;
             right: 0;
-            padding-top: 200upx;
-            width: 1610upx;
+            padding-top: 69.4upx;
+            width: 559upx;
             height: 100%;
             background: #fff;
             .sc-close{
                 position: absolute;
-                right: 80upx;
-                top: 54upx;
-                width: 100upx;
-                height: 100upx;
+                right: 28.33upx;
+                top: 18.76upx;
+                width: 34.51upx;
+                height: 34.51upx;
             }
             .sc-title{
                 text-align: center;
-                @include flcw(65upx, 90upx, #1B1B1B, 500);
+                @include flcw(22.5upx, 31.25upx, #1B1B1B, 500);
             }
             .sc-container{
-                margin-top: 150upx;
-                padding: 0 60upx;
+                margin-top: 52.22upx;
+                padding: 0 20.39upx;
                 .sc-line{
                     @include ctf;
                     &+.sc-line{
-                        margin-top: 19upx;
+                        margin-top: 6.57upx;
                     }
                     .sl-desc{
-                        @include flcw(48upx, 68upx, #1B1B1B, 500);
+                        @include flcw(16.88upx, 23.61upx, #1B1B1B, 500);
                         @include tHide;
                     }
                     .sd-btn{
                         @include clearBtn;
                         flex-shrink: 0;
-                        margin-left: 75upx;
+                        margin-left: 26upx;
                         text-align: center;
-                        width: 346upx;
+                        width: 120upx;
                         background: $mColor;
-                        border-radius: 18upx;
-                        @include flcw(48upx, 120upx, #fff, 500);
+                        border-radius: 6.56upx;
+                        @include flcw(16.88upx, 41.26upx, #fff, 500);
                     }
                 }
             }
diff --git a/uniapp_project_code/src/pages.json b/uniapp_project_code/src/pages.json
index ddbf2e3..e6b3f76 100644
--- a/uniapp_project_code/src/pages.json
+++ b/uniapp_project_code/src/pages.json
@@ -1,13 +1,13 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-			"path": "pages/login/success",
+			"path": "pages/login/index",
 			"style": {
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path": "pages/login/index",
+			"path": "pages/login/success",
 			"style": {
 				"navigationStyle": "custom"
 			}
diff --git a/uniapp_project_code/src/pages/login/index.vue b/uniapp_project_code/src/pages/login/index.vue
index f73344c..92ffe7c 100644
--- a/uniapp_project_code/src/pages/login/index.vue
+++ b/uniapp_project_code/src/pages/login/index.vue
@@ -27,25 +27,25 @@
 
 <style lang="scss">
     .login-index{
-        padding-top: 666upx;
+        padding-top: 231upx;
     }
     .li-name{
-        padding: 0 476upx;
-        margin-top: 60upx;
+        padding: 0 187.85upx;
+        margin-top: 20.83upx;
         text-align: center;
-        @include flcw(72upx, 100upx, #fff);
+        @include flcw(25upx, 34.72upx, #fff);
         @include tHide(2);
     }
     .li-from{
-        margin-top: 166upx;
+        margin-top: 57.78upx;
     }
     .li-tip{
-        padding: 0 476upx;
-        margin-top: 54upx;
-        @include flcw(48upx, 76upx, #fff);
+        padding: 0 165.28upx;
+        margin-top: 18.75upx;
+        @include flcw(16.67upx, 26.25upx, #fff);
         @include tHide(2);
     }
     .li-btn{
-        margin-top: 286upx;
+        margin-top: 99.38upx;
     }
 </style>
\ No newline at end of file
diff --git a/uniapp_project_code/src/pages/login/success.vue b/uniapp_project_code/src/pages/login/success.vue
index 7dd62e1..14764c1 100644
--- a/uniapp_project_code/src/pages/login/success.vue
+++ b/uniapp_project_code/src/pages/login/success.vue
@@ -17,7 +17,7 @@
                 <view class="ll-item">设置</view>
             </view>
         </view>
-        <setting-mask v-if="false"></setting-mask>
+        <setting-mask v-if="true"></setting-mask>
     </login-background>
 </template>
 
@@ -31,32 +31,32 @@ import settingMask from '@/components/login/setting_mask.vue';
 
 <style lang="scss">
     .login-success{
-        padding-top: 800upx;
+        padding-top: 277upx;
     }
     .ls-desc{
-        margin-top: 283upx;
-        padding: 0 476upx;
+        margin-top: 98.44upx;
+        padding: 0 165upx;
         .ld-line{
-            @include flcw(48upx, 76upx, #fff);
+            @include flcw(16.67upx, 26.25upx, #fff);
             @include tHide(1);
             &+.ld-line{
-                margin-top: 10upx;
+                margin-top: 3.61upx;
             }
         }
     }
     .ls-pads{
-        margin-top: 108upx;
+        margin-top: 37upx;
     }
     .ls-botton{
         margin-top: 266upx;
     }
     .ls-links{
-        margin-top: 133upx;
-        padding: 0 544upx;
+        margin-top: 46upx;
+        padding: 0 189upx;
         @include ctf(space-between);
         .ll-item{
             text-decoration: underline;
-            @include flcw(72upx, 76upx, #fff);
+            @include flcw(25upx, 26.25upx, #fff);
         }
     }
 </style>
\ No newline at end of file
diff --git a/uniapp_project_code/src/uni.scss b/uniapp_project_code/src/uni.scss
index 5ea3cd5..11598ca 100644
--- a/uniapp_project_code/src/uni.scss
+++ b/uniapp_project_code/src/uni.scss
@@ -23,7 +23,7 @@ $mColor: #009874;
 }
 
 /* 文字样式 */
-@mixin flcw($size: 48upx, $height: 66upx, $color: #333, $weight: 400){
+@mixin flcw($size: 16.67upx, $height: 22.92upx, $color: #333, $weight: 400){
     font-size: $size;
     line-height: $height;
     color: $color;