Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into test

WXD-SEASON\season
2 parents f0c7454c 21d09ab2
Showing 1 changed file with 14 additions and 7 deletions
app.json
@@ -60,8 +60,7 @@
         "pages/user/assistance/friend_assistance",
         "pages/user/assistance/assistance_success",
         "pages/user/assistance/assistance",
-        "pages/store/index",
-        "pages/cart/cart2_inte/cart2_inte",
+        "pages/store/index",       
         "pages/giftpack/festival/festival",
         "pages/team/team_more/team_more",
@@ -121,9 +120,7 @@
 								"pages/serviceCard_pd/team_show/team_show",
 								"pages/serviceCard_pd/cart/cart",
                "pages/serviceCard_pd/team_success/team_success"
-            ],
-
-            "plugins":{"live-player-plugin":{"version":"1.3.5","provider":"wx2b03c6e691cd7370"}}
+            ]
         },
         {
             "root": "packageB/",
@@ -226,9 +223,19 @@
                "pages/user/monthgiftbag/monthgiftbag",
                "pages/user/monthgiftbag/giftpacklist/giftpacklist",
                "pages/user/monthgiftbag/giftpackinfo/giftpackinfo",
-               "pages/user/monthgiftbag/giftpackbuy/giftpackbuy"
+               "pages/user/monthgiftbag/giftpackbuy/giftpackbuy",
+               "pages/cart/cart2_inte/cart2_inte"
+               
             ]
-        }
+        },
+        {
+          "root": "packageF/",
+          "name": "pack6",
+          "pages": [
+              "pages/wuliu/wuliu"
+          ]
+          
+      }
     ],