diff --git a/src/api/nav.js b/src/api/nav.js index 67c838e..ae1f057 100644 --- a/src/api/nav.js +++ b/src/api/nav.js @@ -1,7 +1,7 @@ import request from '@/util/server.js' -export const settled = 'https://wechat.hnthee.com/ceres-settled-merchant/#/' // 商家入驻地址 -// export const settled = 'http://122.9.152.120/ceres-settled-merchant/#/' // 商家入驻地址 +// export const settled = 'https://wechat.hnthee.com/ceres-settled-merchant/#/' // 商家入驻地址 +export const settled = 'http://122.9.152.120/ceres-settled-merchant/#/' // 商家入驻地址 // 获取首页导航栏分类 export function getCategory () { diff --git a/src/api/user/express.js b/src/api/user/express.js index 15a563a..edda745 100644 --- a/src/api/user/express.js +++ b/src/api/user/express.js @@ -12,7 +12,7 @@ export function getExpressData (params) { // 所有物流公司字典查询 export function getExpressCompany () { return request({ - url: '/order/getExpressSelect', + url: '/order/getExpressSelectNew', method: 'get' }) } diff --git a/src/assets/svg/logo.svg b/src/assets/svg/logo.svg index 47323f4..d87eca9 100644 --- a/src/assets/svg/logo.svg +++ b/src/assets/svg/logo.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/components/base/secondNav.vue b/src/components/base/secondNav.vue index 487c025..caa26f5 100644 --- a/src/components/base/secondNav.vue +++ b/src/components/base/secondNav.vue @@ -5,8 +5,9 @@
@@ -74,6 +75,15 @@ export default { align-items: center; .logo{ font-size: 60px; + .router-back{ + display: flex; + align-items: center; + .dark-icon{ + width: 106px; + height: 20px; + } + } + } .search{ width: 394px; diff --git a/src/views/canvasGoods/index.vue b/src/views/canvasGoods/index.vue index 8e4f76f..5fe5c4b 100644 --- a/src/views/canvasGoods/index.vue +++ b/src/views/canvasGoods/index.vue @@ -186,7 +186,7 @@ export default { } } .banner{ - width: 100%; + width: 1252px; height: 356px; margin-bottom: 25px; } diff --git a/static/image/logo-dark.png b/static/image/logo-dark.png new file mode 100644 index 0000000..ea22860 Binary files /dev/null and b/static/image/logo-dark.png differ