Merge branch 'develop' into uat

src/pages/AgreementICBC/account/main.vue

@@ -78,22 +78,23 @@
 </template>
 
 <script>
-	export default {
+export default {
   name: "StudentAttendance",
   data() {
-			return {
-
-			}
+    return {};
   },
-		methods: {
-
-		}
-	}
+  methods: {},
+};
 </script>
 
 <style scoped>
 .container {
-	padding:20rpx;
+  padding: 20rpx;
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: column;
+  width: calc(100% - 20rpx);
+  line-height: 50rpx;
 }
 .title {
   text-align: center;
@@ -102,12 +103,12 @@
   padding: 20rpx 0;
 }
 .paragraph {
-	margin-top:20rpx;
-	font-size:14px;
+  margin-top: 20rpx;
+  font-size: 14px;
 }
 
-.paragraph .t{
-	font-size:16px;
+.paragraph .t {
+  font-size: 16px;
 }
 
 .bold {

src/pages/AgreementICBC/personal/main.vue

@@ -160,22 +160,23 @@
 </template>
 
 <script>
-	export default {
+export default {
   name: "StudentAttendance",
   data() {
-			return {
-
-			}
+    return {};
   },
-		methods: {
-
-		}
-	}
+  methods: {},
+};
 </script>
 
 <style scoped>
 .container {
-	padding:20rpx;
+  padding: 20rpx;
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: column;
+  width: calc(100% - 20rpx);
+  line-height: 50rpx;
 }
 .title {
   text-align: center;
@@ -184,12 +185,12 @@
   padding: 20rpx 0;
 }
 .paragraph {
-	margin-top:20rpx;
-	font-size:14px;
+  margin-top: 20rpx;
+  font-size: 14px;
 }
 
-.paragraph .t{
-	font-size:16px;
+.paragraph .t {
+  font-size: 16px;
 }
 
 .bold {

src/pages/AgreementJSX/agreement/main.vue

@@ -112,48 +112,51 @@
 </template>
 
 <script>
-	export default {
+export default {
   name: "agreement",
   data() {
-			return {
-
-			}
+    return {};
   },
-		onLoad: function(options) {
+  onLoad: function (options) {
     // AppID
   },
   methods: {
     async ToOtherPage(name) {
       uni.navigateTo({
-					url: `../${name}/main`
-				})
-			}
-		}
-	}
+        url: `../${name}/main`,
+      });
+    },
+  },
+};
 </script>
 
 <style scoped>
-	.container {
+.container {
   padding: 20rpx;
-	}
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: column;
+  width: calc(100% - 20rpx);
+  line-height: 50rpx;
+}
 
-	.title {
+.title {
   text-align: center;
   font-weight: bold;
   font-size: 16px;
   padding: 20rpx 0;
-	}
+}
 
-	.paragraph {
+.paragraph {
   margin-top: 20rpx;
   font-size: 14px;
-	}
+}
 
-	.paragraph .t {
+.paragraph .t {
   font-size: 16px;
-	}
+}
 
-	.bold {
+.bold {
   font-weight: bold;
-	}
+}
 </style>

src/pages/AgreementJSX/privacy/main.vue

@@ -95,45 +95,48 @@
 </template>
 
 <script>
-	export default {
+export default {
   name: "privacy",
   data() {
-			return {
-
-			}
+    return {};
   },
   methods: {
     async ToOtherPage(name) {
       uni.navigateTo({
-					url: `../${name}/main`
-				})
-			}
-		}
-	}
+        url: `../${name}/main`,
+      });
+    },
+  },
+};
 </script>
 
 <style scoped>
-	.container {
+.container {
   padding: 20rpx;
-	}
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: column;
+  width: calc(100% - 20rpx);
+  line-height: 50rpx;
+}
 
-	.title {
+.title {
   text-align: center;
   font-weight: bold;
   font-size: 16px;
   padding: 20rpx 0;
-	}
+}
 
-	.paragraph {
+.paragraph {
   margin-top: 20rpx;
   font-size: 14px;
-	}
+}
 
-	.paragraph .t {
+.paragraph .t {
   font-size: 16px;
-	}
+}
 
-	.bold {
+.bold {
   font-weight: bold;
-	}
+}
 </style>

src/pages/AgreementJSX/rule/main.vue

@@ -215,41 +215,42 @@
 </template>
 
 <script>
-	export default {
+export default {
   name: "rule",
   data() {
-			return {
-
-			}
+    return {};
   },
-		methods: {
-
-		}
-	}
+  methods: {},
+};
 </script>
 
 <style scoped>
-	.container {
+.container {
   padding: 20rpx;
-	}
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: column;
+  width: calc(100% - 20rpx);
+  line-height: 50rpx;
+}
 
-	.title {
+.title {
   text-align: center;
   font-weight: bold;
   font-size: 16px;
   padding: 20rpx 0;
-	}
+}
 
-	.paragraph {
+.paragraph {
   margin-top: 20rpx;
   font-size: 14px;
-	}
+}
 
-	.paragraph .t {
+.paragraph .t {
   font-size: 16px;
-	}
+}
 
-	.bold {
+.bold {
   font-weight: bold;
-	}
+}
 </style>

src/pages/AgreementSZXY/agreement/main.vue

@@ -100,49 +100,51 @@
 </template>
 
 <script>
-	export default {
+export default {
   name: "StudentAttendance",
   data() {
-			return {
-
-			}
+    return {};
   },
-		onLoad: function(options) {
+  onLoad: function (options) {
     // AppID
   },
   methods: {
     async ToOtherPage(name) {
       uni.navigateTo({
-					url: `../${name}/main`
-				})
-			}
-
-		}
-	}
+        url: `../${name}/main`,
+      });
+    },
+  },
+};
 </script>
 
 <style scoped>
-	.container {
+.container {
   padding: 20rpx;
-	}
-
-	.title {
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: column;
+  width: calc(100% - 20rpx);
+  line-height: 50rpx;
+}
+
+.title {
   text-align: center;
   font-weight: bold;
   font-size: 16px;
   padding: 20rpx 0;
-	}
+}
 
-	.paragraph {
+.paragraph {
   margin-top: 20rpx;
   font-size: 14px;
-	}
+}
 
-	.paragraph .t {
+.paragraph .t {
   font-size: 16px;
-	}
+}
 
-	.bold {
+.bold {
   font-weight: bold;
-	}
+}
 </style>

src/pages/AgreementSZXY/privacy/main.vue

@@ -71,22 +71,23 @@
 </template>
 
 <script>
-	export default {
+export default {
   name: "StudentAttendance",
   data() {
-			return {
-
-			}
+    return {};
   },
-		methods: {
-
-		}
-	}
+  methods: {},
+};
 </script>
 
 <style scoped>
 .container {
-	padding:20rpx;
+  padding: 20rpx;
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: column;
+  width: calc(100% - 20rpx);
+  line-height: 50rpx;
 }
 .title {
   text-align: center;
@@ -95,12 +96,12 @@
   padding: 20rpx 0;
 }
 .paragraph {
-	margin-top:20rpx;
-	font-size:14px;
+  margin-top: 20rpx;
+  font-size: 14px;
 }
 
-.paragraph .t{
-	font-size:16px;
+.paragraph .t {
+  font-size: 16px;
 }
 
 .bold {

src/pages/AgreementSZXY/rule/main.vue

@@ -195,22 +195,23 @@
 </template>
 
 <script>
-	export default {
+export default {
   name: "StudentAttendance",
   data() {
-			return {
-
-			}
+    return {};
   },
-		methods: {
-
-		}
-	}
+  methods: {},
+};
 </script>
 
 <style scoped>
 .container {
-	padding:20rpx;
+  padding: 20rpx;
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: column;
+  width: calc(100% - 20rpx);
+  line-height: 50rpx;
 }
 .title {
   text-align: center;
@@ -219,12 +220,12 @@
   padding: 20rpx 0;
 }
 .paragraph {
-	margin-top:20rpx;
-	font-size:14px;
+  margin-top: 20rpx;
+  font-size: 14px;
 }
 
-.paragraph .t{
-	font-size:16px;
+.paragraph .t {
+  font-size: 16px;
 }
 
 .bold {

src/pages/AgreementXL/agreement/main.vue

@@ -112,48 +112,51 @@
 </template>
 
 <script>
-	export default {
+export default {
   name: "StudentAttendance",
   data() {
-			return {
-
-			}
+    return {};
   },
-		onLoad: function(options) {
+  onLoad: function (options) {
     // AppID
   },
   methods: {
     async ToOtherPage(name) {
       uni.navigateTo({
-					url: `../${name}/main`
-				})
-			}
-		}
-	}
+        url: `../${name}/main`,
+      });
+    },
+  },
+};
 </script>
 
 <style scoped>
-	.container {
+.container {
   padding: 20rpx;
-	}
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: column;
+  width: calc(100% - 20rpx);
+  line-height: 50rpx;
+}
 
-	.title {
+.title {
   text-align: center;
   font-weight: bold;
   font-size: 16px;
   padding: 20rpx 0;
-	}
+}
 
-	.paragraph {
+.paragraph {
   margin-top: 20rpx;
   font-size: 14px;
-	}
+}
 
-	.paragraph .t {
+.paragraph .t {
   font-size: 16px;
-	}
+}
 
-	.bold {
+.bold {
   font-weight: bold;
-	}
+}
 </style>

src/pages/AgreementXL/privacy/main.vue

@@ -82,22 +82,23 @@
 </template>
 
 <script>
-	export default {
+export default {
   name: "StudentAttendance",
   data() {
-			return {
-
-			}
+    return {};
   },
-		methods: {
-
-		}
-	}
+  methods: {},
+};
 </script>
 
 <style scoped>
 .container {
-	padding:20rpx;
+  padding: 20rpx;
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: column;
+  width: calc(100% - 20rpx);
+  line-height: 50rpx;
 }
 .title {
   text-align: center;
@@ -106,12 +107,12 @@
   padding: 20rpx 0;
 }
 .paragraph {
-	margin-top:20rpx;
-	font-size:14px;
+  margin-top: 20rpx;
+  font-size: 14px;
 }
 
-.paragraph .t{
-	font-size:16px;
+.paragraph .t {
+  font-size: 16px;
 }
 
 .bold {

src/pages/AgreementXL/rule/main.vue

@@ -185,22 +185,23 @@
 </template>
 
 <script>
-	export default {
+export default {
   name: "StudentAttendance",
   data() {
-			return {
-
-			}
+    return {};
   },
-		methods: {
-
-		}
-	}
+  methods: {},
+};
 </script>
 
 <style scoped>
 .container {
-	padding:20rpx;
+  padding: 20rpx;
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: column;
+  width: calc(100% - 20rpx);
+  line-height: 50rpx;
 }
 .title {
   text-align: center;
@@ -209,12 +210,12 @@
   padding: 20rpx 0;
 }
 .paragraph {
-	margin-top:20rpx;
-	font-size:14px;
+  margin-top: 20rpx;
+  font-size: 14px;
 }
 
-.paragraph .t{
-	font-size:16px;
+.paragraph .t {
+  font-size: 16px;
 }
 
 .bold {

src/pages/AgreementXZF/agreement/main.vue

@@ -101,49 +101,51 @@
 </template>
 
 <script>
-	export default {
+export default {
   name: "StudentAttendance",
   data() {
-			return {
-
-			}
+    return {};
   },
-		onLoad: function(options) {
+  onLoad: function (options) {
     // AppID
   },
   methods: {
     async ToOtherPage(name) {
       uni.navigateTo({
-					url: `../${name}/main`
-				})
-			}
-
-		}
-	}
+        url: `../${name}/main`,
+      });
+    },
+  },
+};
 </script>
 
 <style scoped>
-	.container {
+.container {
   padding: 20rpx;
-	}
-
-	.title {
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: column;
+  width: calc(100% - 20rpx);
+  line-height: 50rpx;
+}
+
+.title {
   text-align: center;
   font-weight: bold;
   font-size: 16px;
   padding: 20rpx 0;
-	}
+}
 
-	.paragraph {
+.paragraph {
   margin-top: 20rpx;
   font-size: 14px;
-	}
+}
 
-	.paragraph .t {
+.paragraph .t {
   font-size: 16px;
-	}
+}
 
-	.bold {
+.bold {
   font-weight: bold;
-	}
+}
 </style>

src/pages/AgreementXZF/privacy/main.vue

@@ -71,22 +71,23 @@
 </template>
 
 <script>
-	export default {
+export default {
   name: "StudentAttendance",
   data() {
-			return {
-
-			}
+    return {};
   },
-		methods: {
-
-		}
-	}
+  methods: {},
+};
 </script>
 
 <style scoped>
 .container {
-	padding:20rpx;
+  padding: 20rpx;
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: column;
+  width: calc(100% - 20rpx);
+  line-height: 50rpx;
 }
 .title {
   text-align: center;
@@ -95,12 +96,12 @@
   padding: 20rpx 0;
 }
 .paragraph {
-	margin-top:20rpx;
-	font-size:14px;
+  margin-top: 20rpx;
+  font-size: 14px;
 }
 
-.paragraph .t{
-	font-size:16px;
+.paragraph .t {
+  font-size: 16px;
 }
 
 .bold {

src/pages/AgreementXZF/rule/main.vue

@@ -191,22 +191,23 @@
 </template>
 
 <script>
-	export default {
+export default {
   name: "StudentAttendance",
   data() {
-			return {
-
-			}
+    return {};
   },
-		methods: {
-
-		}
-	}
+  methods: {},
+};
 </script>
 
 <style scoped>
 .container {
-	padding:20rpx;
+  padding: 20rpx;
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: column;
+  width: calc(100% - 20rpx);
+  line-height: 50rpx;
 }
 .title {
   text-align: center;
@@ -215,12 +216,12 @@
   padding: 20rpx 0;
 }
 .paragraph {
-	margin-top:20rpx;
-	font-size:14px;
+  margin-top: 20rpx;
+  font-size: 14px;
 }
 
-.paragraph .t{
-	font-size:16px;
+.paragraph .t {
+  font-size: 16px;
 }
 
 .bold {