修复

763748fc · 符伟 · b4622a42 · 763748fc · 763748fc
Commit 763748fc authored Jul 23, 2021 by 符伟
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

package.json package.json +1 -0

pages.json pages.json +0 -4

No files found.
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
    "dayjs": "^1.10.4",
    "echarts": "^5.1.0",
    "jweixin-module": "^1.6.0",
+    "vant": "^2.12.24",
    "vconsole": "^3.7.0"
  },
  "devDependencies": {},

--- a/pages.json
+++ b/pages.json
@@ -127,9 +127,6 @@
 			}

 		}
-<<<<<<< Updated upstream
-	],
-=======
 	    ,{
            "path" : "pages/AccessControlModular/SchoolAttendance/SchoolAttendance",
            "style" :                                                                                    
@@ -206,7 +203,6 @@
            
        }
    ],
->>>>>>> Stashed changes
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "校智付",