diff --git a/index.html b/index.html index bb0d9d3..e930e67 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ - cereshop商城 + Thee商城
diff --git a/src/api/nav.js b/src/api/nav.js index f452271..67c838e 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://ceres.zkthink.com/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/util/server.js b/src/util/server.js index f599a1c..9106074 100644 --- a/src/util/server.js +++ b/src/util/server.js @@ -7,11 +7,11 @@ import store from '@/store/index' import Cookie from 'js-cookie' promise.polyfill() -export const baseURL = (process.env.NODE_ENV === 'production') ? 'http://122.9.152.120/ceres-app-api' : '/api' -export const uploadURL = 'http://122.9.152.120/ceres-app-api/api' +// export const baseURL = (process.env.NODE_ENV === 'production') ? 'http://122.9.152.120/ceres-app-api' : '/api' +// export const uploadURL = 'http://122.9.152.120/ceres-app-api/api' -// export const baseURL = (process.env.NODE_ENV === 'production') ? 'http://14.22.116.132:81/ceres-app-api' : '/api' -// export const uploadURL = 'http://14.22.116.132:81/ceres-app-api/api' +export const baseURL = (process.env.NODE_ENV === 'production') ? 'https://wechat.hnthee.com/ceres-app-api' : '/api' +export const uploadURL = 'https://wechat.hnthee.com/ceres-app-api/api' const service = axios.create({ baseURL, diff --git a/src/views/product/productDetailSlot.vue b/src/views/product/productDetailSlot.vue index db02289..0b5c449 100644 --- a/src/views/product/productDetailSlot.vue +++ b/src/views/product/productDetailSlot.vue @@ -320,6 +320,15 @@ export default { .detailPage{ max-width: 1250px; margin: auto; + + >>>img { + max-width: 100%; + display:block; + float: none; + margin: 0; + padding: 0; + } + .top{ margin-bottom: 30px; padding: 40px 45px; @@ -487,6 +496,7 @@ export default { cursor: pointer; } } + .activityLabel:last-child{ margin-bottom: 0; } diff --git a/static/cereshop.ico b/static/cereshop.ico index a45af3e..6c8cf22 100644 Binary files a/static/cereshop.ico and b/static/cereshop.ico differ diff --git a/static/image/nav-logo.png b/static/image/nav-logo.png index 1581ca8..2f36674 100644 Binary files a/static/image/nav-logo.png and b/static/image/nav-logo.png differ