Merge branch 'master' of http://49.232.154.205:10100/liujingchao/klp-mono

- 将hand-factory的基础URL从本地IP更改为公网IP
- 修复L2日志页面分页组件的v-model语法问题
- 调整hand-factory页面配置中登录页面的顺序

apps/hand-factory/config.js

@@ -1,6 +1,7 @@
 // 应用全局配置
 module.exports = {
-  baseUrl: 'http://192.168.31.116:8080',
+  // baseUrl: 'http://192.168.31.116:8080',
+	baseUrl: 'http://140.143.206.120:8080',
   // baseUrl: 'http://localhost:8080',
   // 应用信息
   appInfo: {

apps/hand-factory/pages.json

@@ -1,11 +1,5 @@
 {
   "pages": [
-		{
-		  "path": "pages/login",
-		  "style": {
-		    "navigationBarTitleText": "登录"
-		  }
-		}, 
 		{
 		  "path": "pages/index",
 		  "style": {
@@ -13,6 +7,13 @@
 				"navigationStyle": "custom"
 		  }
 		},
+		{
+		  "path": "pages/login",
+		  "style": {
+		    "navigationBarTitleText": "登录"
+		  }
+		}, 
+		
 	{
     "path": "pages/mine/index",
     "style": {

apps/l2/src/views/l2/log/index.vue

@@ -93,8 +93,8 @@
       <Pagination
         v-show="total>0"
         :total="total"
-        v-model:page="queryForm.pageNum"
-        v-model:limit="queryForm.pageSize"
+        :page.sync="queryForm.pageNum"
+        :limit.sync="queryForm.pageSize"
         @pagination="getLogData"
       />