Merge branch 'main' of https://gitee.com/mrf/agri-app

src/api/model/userInfo.ts

@@ -6,6 +6,8 @@ enum Api {
     sysLogin = '/sys/mLogin', // 登陆
     dictList = '/sys/dict/queryAllDictItems', // 获取字典数据
     location = '/tianditu/geocode', // 根据经纬度获取地址
+    sysSmsCode = '/app/user/getSmsCode', // 短信验证码
+    sysRegister = '/app/user/register', // 注册
 }
 /**
  * @param params 请求参数
@@ -64,3 +66,27 @@ export function location(params = {}) {
         },
     })
 }
+
+/**
+ * @param params 请求参数
+ * @description: 注册
+ */
+export function sysRegister(params = {}) {
+    return otherHttp.post({
+        url: Api.sysRegister,
+        params,
+    })
+}
+/**
+ * @param params 请求参数
+ * @description: 短信验证码
+ */
+export function sysSmsCode(params = {}) {
+    return otherHttp.get({
+        url: Api.sysSmsCode,
+        params,
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+        },
+    })
+}

src/pages.json

 {
-
     "pages": [
         {
             "path": "pages/login/login",
@@ -14,6 +13,18 @@
             }
         },
         {
+            "path": "pages/login/register",
+            "style": {
+                "navigationStyle": "custom",
+                "transparentTitle": "auto",
+                "backgroundColor": "#FFFFFF",
+                "enablePullDownRefresh": false,
+                "app-plus": {
+                    "titleNView": {}
+                }
+            }
+        },
+        {
             "path": "pages/shouye/shouye",
             "style": {
                 "navigationBarTitleText": "",
@@ -277,7 +288,7 @@
                                 "fontSrc": "/static/uni.ttf",
                                 "color": "#fff",
                                 "fontSize": "28rpx",
-								"width":"auto"
+                                "width": "auto"
                             }
                         ]
                     }
@@ -383,7 +394,7 @@
                                 "fontSrc": "/static/uni.ttf",
                                 "color": "#fff",
                                 "fontSize": "28rpx",
-								"width":"auto"
+                                "width": "auto"
                             }
                         ]
                     }
@@ -407,7 +418,7 @@
                                 "fontSrc": "/static/uni.ttf",
                                 "color": "#fff",
                                 "fontSize": "28rpx",
-								"width":"auto"
+                                "width": "auto"
                             }
                         ]
                     }

src/pages/login/login.vue

@@ -151,6 +151,14 @@
         })
     }
 
+    /**
+     * 跳转到注册页面
+     */
+    function goRegister() {
+        uni.reLaunch({
+            url: '/pages/login/register',
+        })
+    }
     // 添加欢迎登录的文字打字动态效果
     let loop = null
     let direction = 'right'
@@ -272,6 +280,7 @@
                     :loading="model.loading"
                 />
             </view>
+            <view class="flex-center p-32rpx box-border btn-register" @click="goRegister"> 立即注册 </view>
         </fui-form>
         <!-- </view> -->
         <fui-checkbox-group class="checkbox" name="checkbox">
@@ -455,4 +464,7 @@
     :deep(.fui-input__border-bottom) {
         right: 32rpx !important;
     }
+    .btn-register {
+        color: cadetblue;
+    }
 </style>