Merge branch 'master' of http://git.sjzkeji.com/panghu/school_webUser

package-lock.json

@@ -5,17 +5,17 @@
   "packages": {
     "": {
       "dependencies": {
-        "js-base64": "^3.7.2",
-        "jweixin-module": "^1.2.0",
-        "uni-read-pages": "^1.0.5",
-        "uni-simple-router": "^2.0.7",
-        "uploading-oss": "^1.0.3",
-        "wecomjsdk": "^1.0.2"
+        "js-base64": "3.7.2",
+        "jweixin-module": "^1.6.0",
+        "uni-read-pages": "1.0.5",
+        "uni-simple-router": "2.0.7",
+        "uploading-oss": "1.0.3",
+        "wecomjsdk": "1.0.2"
       },
       "devDependencies": {
-        "@types/html5plus": "^1.0.2",
-        "@types/uni-app": "^1.4.4",
-        "vue-waterfall-easy": "^2.4.4"
+        "@types/html5plus": "1.0.2",
+        "@types/uni-app": "1.4.4",
+        "vue-waterfall-easy": "2.4.4"
       }
     },
     "node_modules/@babel/parser": {
@@ -68,13 +68,13 @@
       "dev": true
     },
     "node_modules/js-base64": {
-      "version": "3.7.5",
-      "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.5.tgz",
-      "integrity": "sha512-3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA=="
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.2.tgz",
+      "integrity": "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ=="
     },
     "node_modules/jweixin-module": {
       "version": "1.6.0",
-      "resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz",
       "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
     },
     "node_modules/nanoid": {
@@ -223,13 +223,13 @@
       "dev": true
     },
     "js-base64": {
-      "version": "3.7.5",
-      "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.5.tgz",
-      "integrity": "sha512-3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA=="
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.2.tgz",
+      "integrity": "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ=="
     },
     "jweixin-module": {
       "version": "1.6.0",
-      "resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz",
       "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
     },
     "nanoid": {

package.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "js-base64": "3.7.2",
-    "jweixin-module": "1.2.0",
+    "jweixin-module": "^1.6.0",
     "uni-read-pages": "1.0.5",
     "uni-simple-router": "2.0.7",
     "uploading-oss": "1.0.3",

pages.json

@@ -1,32 +1,70 @@
 {
-  "pages": [
-    {
-      "path": "pages/index/index",
-      "style": {
-        "navigationBarTitleText": "首页"
-      }
-    },
-    {
-      "path": "pages/login/index",
-      "style": {
-        "navigationBarTitleText": "登陆"
-      }
-    }
-  ],
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "uni-app",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8",
-    "navigationStyle": "custom"
-  },
-  "condition": {
-    "current": 0,
-    "list": [
-      {
-        "name": "列表调试",
-        "path": "pages/text/index",
-        "query": ""
+	"tabBar": {
+		"backgroundColor": "#fff",
+		"selectedColor": "#41ABF5",
+		"color": "#666",
+		"borderStyle": "white",
+		"fontSize": "20rpx",
+		"iconWidth": "48rpx",
+		"height": "48rpx",
+		"list": [{
+				"pagePath": "pages/index/index",
+				"iconPath": "static/img/tabBar/business.png",
+				"selectedIconPath": "static/img/tabBar/business-highlight.png",
+				"text": "首页"
+			},
+			{
+				"pagePath": "pages/order/index",
+				"iconPath": "static/img/tabBar/home.png",
+				"selectedIconPath": "static/img/tabBar/home-highlight.png",
+				"text": "订单"
+			},
+			{
+				"pagePath": "pages/me/index",
+				"iconPath": "static/img/tabBar/my.png",
+				"selectedIconPath": "static/img/tabBar/my-highlight.png",
+				"text": "我"
+			}
+		]
+	},
+	"pages": [{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "首页"
+			}
+		},
+		{
+			"path": "pages/login/index",
+			"style": {
+				"navigationBarTitleText": "登陆"
+			}
+		},
+		{
+			"path": "pages/me/index",
+			"style": {
+				"navigationBarTitleText": "我的"
+			}
+		},
+		{
+			"path": "pages/order/index",
+			"style": {
+				"navigationBarTitleText": "订单"
+			}
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "uni-app",
+		"navigationBarBackgroundColor": "#F8F8F8",
+		"backgroundColor": "#F8F8F8",
+		"navigationStyle": "custom"
+	},
+	"condition": {
+		"current": 0,
+		"list": [{
+			"name": "列表调试",
+			"path": "pages/text/index",
+			"query": ""
 		}]
 	}
-}
+}

pages/order/index.vue

@@ -0,0 +1,27 @@
+<template>
+	<view class="flex-common-css">
+		<Nav title="" leftIconColor="#333" titleColor="#333"></Nav>
+		<scroll-view :scroll-y="true" class="scroll-view-css" @scrolltolower="scrolltolower">
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		data() {
+			return {};
+		},
+		onLoad(data) {},
+		mounted() {},
+		methods: {
+			scrolltolower() {
+				console.log('触底');
+			},
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

yarn.lock

@@ -7,12 +7,12 @@
   "resolved" "https://registry.npmjs.org/@babel/parser/-/parser-7.19.0.tgz"
   "version" "7.19.0"
 
-"@types/html5plus@^1.0.2":
+"@types/html5plus@1.0.2":
   "integrity" "sha512-OklP5lrmLq8/6TUOLgWc0LndUVvAiTWX5dnyoCFhIUtFW9opWsnCtG/UxPgeuC28Rv2XNbFfft/hEEI39P/4Ag=="
   "resolved" "https://registry.npmjs.org/@types/html5plus/-/html5plus-1.0.2.tgz"
   "version" "1.0.2"
 
-"@types/uni-app@^1.4.4":
+"@types/uni-app@1.4.4":
   "integrity" "sha512-ZTXnrCTblZyoLIoKbTv1Whz1nxrTcM7vg0qGXzDpXP8m9MqdjKt48N3FffQT1IsJWNkxbvJ1Eg5UHDaq+k+oBQ=="
   "resolved" "https://registry.npmjs.org/@types/uni-app/-/uni-app-1.4.4.tgz"
   "version" "1.4.4"
@@ -43,14 +43,14 @@
   "resolved" "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz"
   "version" "2.6.4"
 
-"js-base64@^3.7.2":
-  "integrity" "sha512-3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA=="
-  "resolved" "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.5.tgz"
-  "version" "3.7.5"
+"js-base64@3.7.2":
+  "integrity" "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ=="
+  "resolved" "https://registry.npmjs.org/js-base64/-/js-base64-3.7.2.tgz"
+  "version" "3.7.2"
 
-"jweixin-module@^1.2.0":
+"jweixin-module@^1.6.0":
   "integrity" "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
-  "resolved" "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz"
+  "resolved" "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz"
   "version" "1.6.0"
 
 "nanoid@^3.3.4":
@@ -82,17 +82,17 @@
   "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
   "version" "0.6.1"
 
-"uni-read-pages@^1.0.5":
+"uni-read-pages@1.0.5":
   "integrity" "sha512-GkrrZ0LX0vn9R5k6RKEi0Ez3Q3e2vUpjXQ8Z6/K/d28KudI9ajqgt8WEjQFlG5EPm1K6uTArN8LlqmZTEixDUA=="
   "resolved" "https://registry.npmmirror.com/uni-read-pages/-/uni-read-pages-1.0.5.tgz"
   "version" "1.0.5"
 
-"uni-simple-router@^2.0.7":
+"uni-simple-router@2.0.7":
   "integrity" "sha512-8FKv5dw7Eoonm0gkO8udprrxzin0fNUI0+AvIphFkFRH5ZmP5ZWJ2pvnWzb2NiiqQSECTSU5VSB7HhvOSwD5eA=="
   "resolved" "https://registry.npmmirror.com/uni-simple-router/-/uni-simple-router-2.0.7.tgz"
   "version" "2.0.7"
 
-"uploading-oss@^1.0.3":
+"uploading-oss@1.0.3":
   "integrity" "sha512-aqHh5NCOBcrA4d8yCIKR7B9GrKzH88X7gL8BSvIw18pi79AgWnhDkCoyjQmDqzTvjQqYfKwyFTEgnafzMx/GbQ=="
   "resolved" "https://registry.npmjs.org/uploading-oss/-/uploading-oss-1.0.3.tgz"
   "version" "1.0.3"
@@ -100,7 +100,7 @@
     "crypto-js" "^4.1.1"
     "js-base64" "^2.6.4"
 
-"vue-waterfall-easy@^2.4.4":
+"vue-waterfall-easy@2.4.4":
   "integrity" "sha512-5OkpT2FPNC3rHBy858zk/nmJxqdPaGmj/KVbmA6dgcvtsovKMa+zuf/Z7F+S2NnObeavpIBztTWgcH3S42ZD+g=="
   "resolved" "https://registry.npmjs.org/vue-waterfall-easy/-/vue-waterfall-easy-2.4.4.tgz"
   "version" "2.4.4"
@@ -113,7 +113,7 @@
     "@vue/compiler-sfc" "2.7.10"
     "csstype" "^3.1.0"
 
-"wecomjsdk@^1.0.2":
+"wecomjsdk@1.0.2":
   "integrity" "sha512-nPbrTcA5P8IOY/gQJJ3/AtXE2zSqJIQB156RUAQ2+RvwvJmcR66p7hpZtCjbtKefvyDO0LJBdEFqfjRR72zjIw=="
   "resolved" "https://registry.npmmirror.com/wecomjsdk/-/wecomjsdk-1.0.2.tgz"
   "version" "1.0.2"