Skip to content

A
az-uniapp-wechat-web
Commit 763748fc authored by 符伟's avatar 符伟
Browse files
Options

修复

parent b4622a42
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
package.json
View file @ 763748fc
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
"dayjs": "^1.10.4", "dayjs": "^1.10.4",
"echarts": "^5.1.0", "echarts": "^5.1.0",
"jweixin-module": "^1.6.0", "jweixin-module": "^1.6.0",
"vant": "^2.12.24",
"vconsole": "^3.7.0" "vconsole": "^3.7.0"
}, },
"devDependencies": {}, "devDependencies": {},
......
pages.json
View file @ 763748fc
...@@ -127,9 +127,6 @@ ...@@ -127,9 +127,6 @@
} }
} }
<<<<<<< Updated upstream
],
=======
,{ ,{
"path" : "pages/AccessControlModular/SchoolAttendance/SchoolAttendance", "path" : "pages/AccessControlModular/SchoolAttendance/SchoolAttendance",
"style" : "style" :
...@@ -206,7 +203,6 @@ ...@@ -206,7 +203,6 @@
} }
], ],
>>>>>>> Stashed changes
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarTitleText": "校智付", "navigationBarTitleText": "校智付",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment