chongtu

pages.json

@@ -677,6 +677,23 @@
 			}
 		},
 		{
+			"path": "pages/merchant/onlineOrder",
+			"style": {
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black",
+				"navigationBarTitleText": "在线下单",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/wallet/openMember",
+			"style": {
+				"navigationBarBackgroundColor": "#363533",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "开通会员",
+				"enablePullDownRefresh": false
+			}
+		}, {
 			"path": "pages/merchant/storeData",
 			"style": {
 				"navigationBarBackgroundColor": "#72E3B4",
@@ -710,7 +727,6 @@
 				"text": "分类"
 			},
 			{
-<<<<<<< HEAD
 				"pagePath": "pages/cart/cart",
 				"iconPath": "static/tabBar/tab-cart.png",
 				"selectedIconPath": "static/tabBar/tab-cart-current.png",
@@ -724,70 +740,4 @@
 			}
 		]
 	}
-=======
-				"navigationBarBackgroundColor":"#72E3B4",
-				"navigationBarTextStyle":"white",
-			    "navigationBarTitleText": "店铺数据",
-			    "enablePullDownRefresh": false
-			}
-		},
-		{
-			"path" : "pages/merchant/onlineOrder",
-			"style" :                                                                                    
-			{
-				"navigationBarBackgroundColor":"#ffffff",
-				"navigationBarTextStyle":"black",
-			    "navigationBarTitleText": "在线下单",
-			    "enablePullDownRefresh": false
-			}
-		},
-		{
-			"path" : "pages/wallet/openMember",
-			"style" :                                                                                    
-			{
-				"navigationBarBackgroundColor":"#363533",
-				"navigationBarTextStyle":"white",
-			    "navigationBarTitleText": "开通会员",
-			    "enablePullDownRefresh": false
-			}
-		}
-    ],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#FFFFFF",
-		"backgroundColor": "#f8f8f8"
-	},
-	"tabBar": {
-		"color": "#C0C4CC",
-		"selectedColor": "#5DBC7C",
-		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
-		"list": [{
-				"pagePath": "pages/index/index",
-				"iconPath": "static/tabBar/tab-home.png",
-				"selectedIconPath": "static/tabBar/tab-home-current.png",
-				"text": "首页"
-			},
-			{
-				"pagePath": "pages/category/category",
-				"iconPath": "static/tabBar/tab-cate.png",
-				"selectedIconPath": "static/tabBar/tab-cate-current.png",
-				"text": "分类"
-			},
-			{
-				"pagePath": "pages/cart/cart",
-				"iconPath": "static/tabBar/tab-cart.png",
-				"selectedIconPath": "static/tabBar/tab-cart-current.png",
-				"text": "购物车"
-			},
-			{
-				"pagePath": "pages/user/user",
-				"iconPath": "static/tabBar/tab-my.png",
-				"selectedIconPath": "static/tabBar/tab-my-current.png",
-				"text": "我的"
-			}
-		]
-	}
->>>>>>> 5705ae03169c285084ea64fbe08c99a47a08f826
 }

pages/merchant/merchant.vue

@@ -33,15 +33,11 @@
 					<view class="bottom"><image src="../../static/merchant/shop.png" mode=""></image></view>
 					商品管理
 				</view>
-<<<<<<< HEAD
-				<view class="userInfoList-bottom">
-					<view class="bottom"><image src="../../static/merchant/xiadan.png" mode=""></image></view>
-=======
+				
 				<view class="userInfoList-bottom" @click="navTo('/pages/merchant/onlineOrder')">
 					<view class="bottom">
 						<image src="../../static/merchant/xiadan.png" mode=""></image>
 					</view>
->>>>>>> 5705ae03169c285084ea64fbe08c99a47a08f826
 					在线下单
 				</view>
 				<view class="userInfoList-bottom" @click="navTo('/pages/merchant/vipDetail')">