diff --git a/src/api/hwWeb.js b/src/api/hwWeb.js index 86c9ada..7963d5d 100644 --- a/src/api/hwWeb.js +++ b/src/api/hwWeb.js @@ -8,6 +8,13 @@ export function listHwWeb(query) { params: query }) } +export function listHwWeb1(query) { + return request({ + url: '/portal/hwWeb1/list', + method: 'get', + params: query + }) +} // 查询haiwei官网json详细 export function getHwWeb(webId) { @@ -34,6 +41,13 @@ export function updateHwWeb(data) { data: data }) } +export function updateHwWeb1(data) { + return request({ + url: '/portal/hwWeb1', + method: 'put', + data: data + }) +} // 删除haiwei官网json export function delHwWeb(webId) { diff --git a/src/components/editEl/uploadEl.vue b/src/components/editEl/uploadEl.vue index 67744ef..84171e5 100644 --- a/src/components/editEl/uploadEl.vue +++ b/src/components/editEl/uploadEl.vue @@ -7,14 +7,15 @@ :show-file-list="false" :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload"> - + + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index d8026c4..4b9b08f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -24,9 +24,14 @@ export default new Router({ }, { path: 'productCenter', component: () => import('@/views/productCenter/index.vue'), - }, { + }, + { path: 'productCenter/edit', component: () => import('@/views/productCenter/edit/index.vue'), - }, { + }, + { + path: 'productCenter/detail', component: () => import('@/views/productCenter/detail.vue'), + }, + { path: 'productCenter/detail/edit', component: () => import('@/views/productCenter/edit/detail.vue'), }, { diff --git a/src/utils/request.js b/src/utils/request.js index e0e1d42..aa22d74 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -6,7 +6,7 @@ const TokenKey = 'Admin-Token' const service = axios.create({ baseURL: '/dev-api', // baseURL: 'http://124.223.15.102:8888', - timeout: 10000, + timeout: 10000000, }); function getToken() { return Cookies.get(TokenKey) diff --git a/src/views/productCenter/detail.vue b/src/views/productCenter/detail.vue new file mode 100644 index 0000000..cccb789 --- /dev/null +++ b/src/views/productCenter/detail.vue @@ -0,0 +1,543 @@ + + + + + diff --git a/src/views/productCenter/detail1.vue b/src/views/productCenter/detail1.vue index 6c1d599..ccaa23e 100644 --- a/src/views/productCenter/detail1.vue +++ b/src/views/productCenter/detail1.vue @@ -2,13 +2,13 @@
@@ -25,11 +25,11 @@
@@ -148,7 +148,7 @@ export default { { name: "产品重量", value: "约288g" }, { name: "外壳材料", value: "铝合金+PC" }, { name: "外壳颜色", value: "黑色、银色" }, - { name: "工作温度", value: "-25℃~60℃" }, + { name: "工作温度", value: "-25℃~60℃" }, { name: "存储温度", value: "-40℃~85℃" }, { name: "工作湿度", value: "5%~95%RH 无冷凝" }, { name: "IP等级", value: "IP54" }, @@ -326,7 +326,7 @@ export default { cursor: pointer; &:nth-child(2n){ margin-left: 5%; - } + } &:hover{ .itemTitle { diff --git a/src/views/productCenter/edit/detail.vue b/src/views/productCenter/edit/detail.vue index 103e327..c7ef6ae 100644 --- a/src/views/productCenter/edit/detail.vue +++ b/src/views/productCenter/edit/detail.vue @@ -1,14 +1,13 @@