Browse Source

解决冲突

Limengbo 6 years ago
parent
commit
174180c887
2 changed files with 1 additions and 5 deletions
  1. 1 3
      app.json
  2. 0 2
      app.wxss

+ 1 - 3
app.json

@@ -5,10 +5,8 @@
     "pages/main/class/class",
     "pages/main/books/books",
     "pages/main/reading/reading",
-    "pages/social/works/works",
     "pages/user/myEdit/myEdit",
-    "pages/discount-group/discount-group",
-    "pages/user/myEdit/myEdit"
+    "pages/discount-group/discount-group"
   ],
   "window": {
     "backgroundTextStyle": "light",

+ 0 - 2
app.wxss

@@ -13,8 +13,6 @@ page {
   padding-top: 80rpx;
   box-sizing: border-box;
 } 
-  /* background: #f0f1f5 */
-} 
 ::-webkit-scrollbar{
   width: 0;
   height: 0;