代码提交

App.vue

@@ -9,7 +9,8 @@ export default {
       "pages/login/login",
       "pages/register/index",
       "pages/register/registerSuccess",
-      "pages/login/authInfo"
+      "pages/login/authInfo",
+      "pages/login/forgotPassword"
     ];
 
     const value = uni.getStorageSync("token");
@@ -52,9 +53,9 @@ export default {
         "addressLon": 120.4732160947301,
         "addressLat": 36.17767397801995
       }
-      this.$u.api.updatePosition(query).then(res => {
+      // this.$u.api.updatePosition(query).then(res => {
 
-      })
+      // })
       //   },
       //   fail: (err) => {
       //     this.error = err;

manifest.json

@@ -112,7 +112,12 @@
     "mp-weixin" : {
         "appid" : "wx81368cd255de5182",
         "setting" : {
-            "urlCheck" : true
+            "urlCheck" : true,
+            "minified" : true
+        },
+        "lazyCodeLoading" : "requiredComponents",
+        "optimization" : {
+            "subPackages" : true
         },
         "permission" : {}
     },

pages.json

@@ -148,36 +148,10 @@
         {
             "path": "pages/inspection/quest",
             "style": {
-              "navigationStyle": "custom",
+                "navigationStyle": "custom",
                 "navigationBarTextStyle": "white"
             }
         },
-        
-        {
-            "path": "pages/inspection/questDetails",
-            "style": {
-                "navigationBarTitleText": "巡检任务单",
-                "enablePullDownRefresh": false,
-                "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "#F8F8F8",
-                "app-plus": {
-                    "titleNView": {}
-                }
-            }
-        },
-    
-        {
-            "path": "pages/inspection/questOrder",
-            "style": {
-                "navigationBarTitleText": "巡检任务单",
-                "enablePullDownRefresh": false,
-                "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "#F8F8F8",
-                "app-plus": {
-                    "titleNView": {}
-                }
-            }
-        },
         {
             "path": "pages/inspection/plan",
             "style": {
@@ -190,18 +164,60 @@
                 }
             }
         },
-       
         {
-            "path": "pages/inspection/planDetails",
+            "root": "pages",
-            "style": {
+            "pages": [
-               "navigationBarTitleText": "巡检计划详情",
+                {
-                "enablePullDownRefresh": false,
+                    "path": "pages/inspection/questOrder",
-                "navigationBarTextStyle": "black",
+                    "style": {
-                "navigationBarBackgroundColor": "#F8F8F8",
+                        "navigationBarTitleText": "巡检任务单",
-                "app-plus": {
+                        "enablePullDownRefresh": false,
-                    "titleNView": {}
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8",
+                        "app-plus": {
+                            "titleNView": {}
+                        }
+                    }
                 }
-            }
+            ]
+        }
+    ],
+    "subPackages": [
+        {
+            "root": "pages",
+            "pages": [
+                {
+                    "path": "inspection/planDetails",
+                    "style": {
+                        "navigationBarTitleText": "巡检计划详情",
+                        "enablePullDownRefresh": false,
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8",
+                        "app-plus": {
+                            "titleNView": {}
+                        }
+                    }
+                },
+                {
+                    "path": "inspection/questDetails",
+                    "style": {
+                        "navigationBarTitleText": "巡检任务单",
+                        "enablePullDownRefresh": false,
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8",
+                        "app-plus": {
+                            "titleNView": {}
+                        }
+                    }
+                },
+                {
+                    "path": "login/forgotPassword",
+                    "style": {
+                        "navigationStyle": "custom",
+                        "navigationBarTextStyle": "white"
+                    }
+                }
+            ]
         }
     ],
     "globalStyle": {

pages/inspection/planDetails.vue

@@ -62,8 +62,7 @@
 </template>
 <script>
 export default {
-    components: {
+
-    },
     computed: {
         dataTypes() {
             return this.$store.state.dataType

pages/inspection/questDetails.vue

@@ -92,8 +92,7 @@
 </template>
 <script>
 export default {
-    components: {
+
-    },
     computed: {
         dataTypes() {
             return this.$store.state.dataType

pages/inspection/questOrder.vue

@@ -250,8 +250,7 @@
 import website from '@/utils/website'
 import { dateFormat } from '@/utils/util.js'
 export default {
-    components: {
+
-    },
     computed: {
         dataTypes() {
             return this.$store.state.dataType

pages/login/forgotPassword.vue

@@ -0,0 +1,65 @@
+<template>
+    <view class="page_css">
+        <view class="container">
+            <betone-header-top :title="title" />
+            <u-form labelPosition="left" :model="forgotInfo" :rules="rules" ref="registerForm">
+                <u-form-item prop="businessName" :border-bottom="false" label-position="top" label="手机号">
+                    <u-input v-model="forgotInfo.mobile" :border="true" placeholder="请输入" />
+                </u-form-item>
+                <u-form-item prop="businessName" :border-bottom="false" label-position="top" label="验证码">
+
+                </u-form-item>
+                <u-form-item prop="businessName" :border-bottom="false" label-position="top" label="密码">
+                    <u-input v-model="forgotInfo.password" type="password" :border="true" :password-icon="true" />
+                </u-form-item>
+                <u-form-item prop="businessName" :border-bottom="false" label-position="top" label="确认密码">
+                    <u-input v-model="forgotInfo.confirmPassword" type="password" :border="true" :password-icon="true" />
+                </u-form-item>
+            </u-form>
+            <!-- <u-button @click="submit">确定</u-button> -->
+        </view>
+    </view>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            title: "忘记密码",
+            forgotInfo: {
+                mobile: '',
+                verificationCode:'',//验证码
+                password:"",//密码
+                confirmPassword:'',//确认密码
+            },
+            rules: {
+                mobile: [
+                    {
+                        required: true,
+                        message: '请输入手机号',
+                        trigger: ['change', 'blur'],
+                    },
+                    {
+                        // 自定义验证函数，见上说明
+                        validator: (rule, value, callback) => {
+                            // 上面有说，返回true表示校验通过，返回false表示不通过
+                            // this.$u.test.mobile()就是返回true或者false的
+                            return this.$u.test.mobile(value);
+                        },
+                        message: '手机号码不正确',
+                        // 触发器可以同时用blur和change
+                        trigger: ['change', 'blur'],
+                    }
+                ]
+            },
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.page_css {
+    .container {
+        padding: 32rpx 64rpx 32rpx 64rpx;
+
+    }
+}
+</style>

pages/login/login.vue

@@ -3,10 +3,12 @@
     <view class="container">
       <view class="title">科研医疗建筑运维平台</view>
       <view class="sp-login-form">
-        <betone-new-input :value="userInfo.username" placeholder="请输入用户名" icon="account-fill"
+        <u-input v-model="userInfo.username" :border="true" placeholder="请输入手机号" style="margin-bottom: 32rpx" prefix-icon="search" />
+        <u-input v-model="userInfo.pwd" type="password" :border="true" :password-icon="true" placeholder="请输入密码" style="margin-bottom: 32rpx" />
+        <!-- <betone-new-input :value="userInfo.username" placeholder="请输入用户名" icon="account-fill"
           style="margin-bottom: 32rpx" @changevalue="userInfo.username = $event" />
         <betone-new-input style="margin-bottom: 32rpx" v-model="userInfo.pwd" placeholder="请输入密码" :type="'password'"
-          icon="lock-fill" @changevalue="userInfo.pwd = $event" />
+          icon="lock-fill" @changevalue="userInfo.pwd = $event" /> -->
         <u-checkbox-group>
           <u-checkbox @change="rememberPwdChange" v-model="rememberPwd" key="index" name="记住密码">记住密码</u-checkbox>
         </u-checkbox-group>
@@ -15,7 +17,7 @@
         </u-button>
         <view class="footer">
           <span @click="linkRegister()">注册账号</span>
-          <!-- <span>忘记密码</span> -->
+          <span @click="forgotPassword()">忘记密码</span>
         </view>
       </view>
     </view>
@@ -159,6 +161,11 @@ export default {
         url: "/pages/register/index",
       });
     },
+    forgotPassword(){
+      uni.navigateTo({
+        url: "/pages/login/forgotPassword",
+      });
+    },
   },
 };
 </script>

pages/register/index.vue

@@ -53,9 +53,6 @@
 <script>
 import addrList from "@/utils/addr.js";
 export default {
-  components: {
-
-  },
   data() {
     return {
       title: "注册",

uni_modules/uview-ui/components/u-button/u-button.vue

@@ -212,7 +212,7 @@ export default {
 		// 节流，一定时间内只能触发一次
 		throttleTime: {
 			type: [String, Number],
-			default: 1000
+			default: 3000
 		},
 		// 按住后多久出现点击态，单位毫秒
 		hoverStartTime: {
@@ -248,12 +248,21 @@ export default {
 			rippleTop: 0, // 水波纹的起点Y坐标到按钮上边界的距离
 			rippleLeft: 0, // 水波纹起点X坐标到按钮左边界的距离
 			fields: {}, // 波纹按钮节点信息
-			waveActive: false // 激活水波纹
+			waveActive: false ,// 激活水波纹
+			lock: false,
 		};
 	},
 	methods: {
 		// 按钮点击
 		click(e) {
+			if(this.lock) return;
+			
+			this.$emit('click', e);
+			this.lock = true;
+			clearTimeout(this.timer);
+			this.timer = setTimeout(() => {
+				this.lock = false;
+			}, this.throttleTime);
 			// 进行节流控制，每this.throttle毫秒内，只在开始处执行
 			this.$u.throttle(() => {
 				// 如果按钮时disabled和loading状态，不触发水波纹效果
@@ -266,7 +275,7 @@ export default {
 						this.getWaveQuery(e);
 					});
 				}
-				this.$emit('click', e);
+				
 			}, this.throttleTime);
 		},
 		// 查询按钮的节点信息

uni_modules/uview-ui/components/u-loadmore/u-loadmore.vue

@@ -151,12 +151,14 @@
 				else text = this.loadText.nomore || this.loadTextCom.nomore
 				return text;
 			},
-
+      tComULoadmore() {
+        return this.$t('tComULoadmore')
+      },
       loadTextCom() {
         return {
-          loadmore : '加载更多',
+          loadmore : this.$t('tComULoadmore.text1'),
-          loading : '正在加载...',
+          loading : this.$t('tComULoadmore.text2'),
-          nomore : '没有更多了'
+          nomore : this.$t('tComULoadmore.text3')
         }
       }
 		},

uni_modules/uview-ui/components/u-number-box/u-number-box.vue

@@ -10,7 +10,7 @@
 		</view>
 		<input :disabled="disabledInput || disabled" :cursor-spacing="getCursorSpacing" :class="{ 'u-input-disabled': disabled }"
 		    v-model="inputVal" class="u-number-input" @blur="onBlur" @focus="onFocus"
-		    type="digit" :style="{
+		    type="number" :style="{
 				color: color,
 				fontSize: size + 'rpx',
 				background: bgColor,