调整页面样式

pages.json

@@ -222,6 +222,7 @@
 		},
 		{
 			"path": "pages/pay/pay",
+			"name": "Pay",
 			"style": {
 				"navigationBarTitleText": "收银台",
 				"navigationBarBackgroundColor": "#FFFFFF"
@@ -250,8 +251,7 @@
 			"name": "signIndex",
 			"style": {
 				"navigationBarTitleText": "每日签到",
-				"navigationBarBackgroundColor": "#FFFFFF",
+				"navigationBarBackgroundColor": "#FFFFFF"
-				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -259,8 +259,7 @@
 			"name": "menuIndex",
 			"style": {
 				"navigationBarTitleText": "食谱推荐",
-				"navigationBarBackgroundColor": "#FFFFFF",
+				"navigationBarBackgroundColor": "#FFFFFF"
-				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -268,8 +267,7 @@
 			"name": "menuClassify",
 			"style": {
 				"navigationBarTitleText": "食谱推荐",
-				"navigationBarBackgroundColor": "#FFFFFF",
+				"navigationBarBackgroundColor": "#FFFFFF"
-				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -277,8 +275,7 @@
 			"name": "menuDetails",
 			"style": {
 				"navigationBarTitleText": "食谱详情",
-				"navigationBarBackgroundColor": "#FFFFFF",
+				"navigationBarBackgroundColor": "#FFFFFF"
-				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -286,8 +283,7 @@
 			"name": "topicIndex",
 			"style": {
 				"navigationBarTitleText": "话题广场",
-				"navigationBarBackgroundColor": "#FFFFFF",
+				"navigationBarBackgroundColor": "#FFFFFF"
-				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -308,8 +304,7 @@
 			"name": "rankingIndex",
 			"style": {
 				"navigationBarTitleText": "食物排行",
-				"navigationBarBackgroundColor": "#FFFFFF",
+				"navigationBarBackgroundColor": "#FFFFFF"
-				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -317,8 +312,7 @@
 			"name": "rankingList",
 			"style": {
 				"navigationBarTitleText": "食物榜单",
-				"navigationBarBackgroundColor": "#FFFFFF",
+				"navigationBarBackgroundColor": "#FFFFFF"
-				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -326,8 +320,7 @@
 			"name": "rankingDetails",
 			"style": {
 				"navigationBarTitleText": "食物详情",
-				"navigationBarBackgroundColor": "#FFFFFF",
+				"navigationBarBackgroundColor": "#FFFFFF"
-				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -335,8 +328,7 @@
 			"name": "noticeIndex",
 			"style": {
 				"navigationBarTitleText": "消息",
-				"navigationBarBackgroundColor": "#FFFFFF",
+				"navigationBarBackgroundColor": "#FFFFFF"
-				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -344,8 +336,7 @@
 			"name": "noticeList",
 			"style": {
 				"navigationBarTitleText": "消息",
-				"navigationBarBackgroundColor": "#FFFFFF",
+				"navigationBarBackgroundColor": "#FFFFFF"
-				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -353,8 +344,7 @@
 			"name": "noticeDetails",
 			"style": {
 				"navigationBarTitleText": "消息",
-				"navigationBarBackgroundColor": "#FFFFFF",
+				"navigationBarBackgroundColor": "#FFFFFF"
-				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -458,8 +448,7 @@
 			"name": "serviceIndex",
 			"style": {
 				"navigationBarTitleText": "",
-				"navigationStyle": "custom",
+				"navigationStyle": "custom"
-				"enablePullDownRefresh": false
 			}
 		},
 		{

pages/auth/auth.vue

@@ -70,7 +70,7 @@ import userAuth from "@/public/userAuth";
 export default {
     data() {
         return {
-            phone: "14745798066",
+            phone: "",
             code: "",
             smsTime: 60,
             getSms: false,

pages/essentialInfo/index.vue

@@ -531,19 +531,22 @@ export default {
                     days: 1,
                 };
                 recordsHealth(params).then((res) => {
-                    this.$refs.uToast.show({
+					uni.showModal({
-                        type: "success",
+						title: "提示",
-                        title: "创建成功",
+						content: "创建成功",
-                        message: "创建成功啦",
+						showCancel:false,
-                        iconUrl:
+						success: ModalRes => {
-                            "https://cdn.uviewui.com/uview/demo/toast/success.png",
-                        complete() {
 							this.percentplan3 = 100;
 							this.behaviorShow = false; // 关闭运动量页面
 							uni.navigateBack({});
-                        },
+						}
-                    });
+					})
-                });
+                }).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
             }
         },
     },

pages/menu/classify.vue

@@ -88,8 +88,9 @@
 </script>
 
 <style lang="scss" scoped>
-    page {
+    .content {
         background-color: $window-color;
+		min-height: 100vh;
     }
     
     .tabs {

pages/menu/details.vue

@@ -94,8 +94,9 @@
 </script>
 
 <style lang="scss" scoped>
-    page {
+    .content {
         background-color: $window-color;
+		min-height: 100vh;
     }
     .backImg {
         width: 100%;

pages/menu/index.vue

@@ -48,8 +48,9 @@
 </script>
 
 <style lang="scss" scoped>
-    page {
+    .content {
         background-color: $window-color;
+		min-height: 100vh;
     }
     .menu {
         .title {

pages/notice/details.vue

@@ -53,8 +53,9 @@
 </script>
 
 <style lang="scss" scoped>
-    page {
+    .content {
         background-color: $window-color;
+		min-height: 100vh;
     }
     .tips {
         padding: $padding;

pages/notice/index.vue

@@ -45,10 +45,11 @@
 </script>
 
 <style lang="scss" scoped>
-    page {
+    .content {
         padding: $padding;
         box-sizing: border-box;
         background-color: $window-color;
+		min-height: 100vh;
     }
     
     .noticeList {

pages/notice/list.vue

@@ -65,8 +65,9 @@
 </script>
 
 <style lang="scss" scoped>
-    page {
+    .content {
         background-color: $window-color;
+		min-height: 100vh;
     }
     
     .box {

pages/pay/pay.vue

@@ -83,7 +83,6 @@
 						})
 					},
 					fail: payErr =>  {
-						console.log(payErr)
 						if(payErr.errCode == '-100'){
 							uni.showToast({
 								title: '支付被取消',

pages/ranking/details.vue

@@ -177,10 +177,11 @@
 </script>
 
 <style lang="scss" scoped>
-    page {
+    .content {
         background-color: $window-color;
         padding: $padding;
         box-sizing: border-box;
+		min-height: 100vh;
     }
     
     .modular {

pages/record/drink.vue

@@ -227,7 +227,6 @@ export default {
         // 喝水
         drinkWater() {
             drinkWater().then((res) => {
-                console.log(res);
                 this.getWaters();
             });
         },

pages/service/details.vue

@@ -128,9 +128,11 @@
 </script>
 
 <style lang="scss">
-    page {
+    .content {
         background-color: $window-color;
         padding-bottom: $padding;
+		min-height: 100vh;
+		box-sizing: border-box;
     }
     
     /* 图片 */

pages/service/index.vue

@@ -89,10 +89,10 @@
 </script>
 
 <style lang="scss" scoped>
-    page {
+    .content {
-        padding-top: calc(var(--status-bar-height) + 180rpx);
-        overflow: hidden;
         background-color: $window-color;
+		min-height: 100vh;
+		box-sizing: border-box;
     }
     
     .status {