diff --git a/src/App.vue b/src/App.vue index 78bd20c..d920756 100644 --- a/src/App.vue +++ b/src/App.vue @@ -14,17 +14,17 @@ const tabbar = [ auth: ["zhezhengding", "shihua"], }, { - pagePath: "pages/tabbar/shop", - text: "超市", - iconPath: "/static/tabbar/shop.png", - selectedIconPath: "/static/tabbar/shop-select.png", + pagePath: "pages/tabbar/selfMerchant", + text: "自营商家", + iconPath: "/static/tabbar/selfMerchant.png", + selectedIconPath: "/static/tabbar/selfMerchant-select.png", auth: ["zhezhengding", "shihua"], }, { - pagePath: "pages/tabbar/coopShop", + pagePath: "pages/tabbar/coopMerchant", text: "合作商家", - iconPath: "/static/tabbar/coopShop.png", - selectedIconPath: "/static/tabbar/coopShop-select.png", + iconPath: "/static/tabbar/coopMerchant.png", + selectedIconPath: "/static/tabbar/coopMerchant-select.png", auth: ["zhezhengding"], }, { diff --git a/src/pages.json b/src/pages.json index 23690ce..afb6bee 100644 --- a/src/pages.json +++ b/src/pages.json @@ -17,14 +17,14 @@ } }, { - "path": "pages/tabbar/shop", + "path": "pages/tabbar/selfMerchant", "style": { - "navigationBarTitleText": "超市", + "navigationBarTitleText": "自营商家", "disableScroll": true } }, { - "path": "pages/tabbar/coopShop", + "path": "pages/tabbar/coopMerchant", "style": { "navigationBarTitleText": "合作商家", "disableScroll": true @@ -356,16 +356,16 @@ // "selectedIconPath": "static/tabbar/canteen-select.png" // }, // { - // "pagePath": "pages/tabbar/shop", - // "text": "超市", - // "iconPath": "static/tabbar/shop.png", - // "selectedIconPath": "static/tabbar/shop-select.png" + // "pagePath": "pages/tabbar/selfMerchant", + // "text": "自营商家", + // "iconPath": "static/tabbar/selfMerchant.png", + // "selectedIconPath": "static/tabbar/selfMerchant-select.png" // }, // { - // pagePath: "pages/tabbar/coopShop", + // pagePath: "pages/tabbar/coopMerchant", // text: "合作商家", - // iconPath: "static/tabbar/coopShop.png", - // selectedIconPath: "static/tabbar/coopShop-select.png", + // iconPath: "static/tabbar/coopMerchant.png", + // selectedIconPath: "static/tabbar/coopMerchant-select.png", // }, // { // "pagePath": "pages/tabbar/order", diff --git a/src/pages/tabbar/coopShop.vue b/src/pages/tabbar/coopMerchant.vue similarity index 100% rename from src/pages/tabbar/coopShop.vue rename to src/pages/tabbar/coopMerchant.vue diff --git a/src/pages/tabbar/shop.vue b/src/pages/tabbar/selfMerchant.vue similarity index 100% rename from src/pages/tabbar/shop.vue rename to src/pages/tabbar/selfMerchant.vue diff --git a/src/static/tabbar/coopShop-select.png b/src/static/tabbar/coopMerchant-select.png similarity index 100% rename from src/static/tabbar/coopShop-select.png rename to src/static/tabbar/coopMerchant-select.png diff --git a/src/static/tabbar/coopShop.png b/src/static/tabbar/coopMerchant.png similarity index 100% rename from src/static/tabbar/coopShop.png rename to src/static/tabbar/coopMerchant.png diff --git a/src/static/tabbar/shop-select.png b/src/static/tabbar/selfMerchant-select.png similarity index 100% rename from src/static/tabbar/shop-select.png rename to src/static/tabbar/selfMerchant-select.png diff --git a/src/static/tabbar/shop.png b/src/static/tabbar/selfMerchant.png similarity index 100% rename from src/static/tabbar/shop.png rename to src/static/tabbar/selfMerchant.png