diff --git a/src/assets/imgs/ic_CPU.png b/src/assets/imgs/ic_CPU.png new file mode 100644 index 0000000000000000000000000000000000000000..7065a9d80c2299e7ca70eb306e67dee02ade35cd Binary files /dev/null and b/src/assets/imgs/ic_CPU.png differ diff --git a/src/assets/imgs/ic_neicun.png b/src/assets/imgs/ic_neicun.png new file mode 100644 index 0000000000000000000000000000000000000000..eea715ea170e06bc58158fa92f5dfbdb8a52dcc9 Binary files /dev/null and b/src/assets/imgs/ic_neicun.png differ diff --git a/src/assets/imgs/ic_rongqi.png b/src/assets/imgs/ic_rongqi.png new file mode 100644 index 0000000000000000000000000000000000000000..9774d292b42c132a5cd826e1a4ced3a9d64f728f Binary files /dev/null and b/src/assets/imgs/ic_rongqi.png differ diff --git a/src/components/codes.vue b/src/components/codes.vue index 7a245aabcd1f3f57f125d231b226779fb490221e..f03b4356d9d1e4d5760ac296d0b4abdaff717d61 100644 --- a/src/components/codes.vue +++ b/src/components/codes.vue @@ -69,15 +69,15 @@ export default { } \ No newline at end of file diff --git a/src/components/table-um.vue b/src/components/table-um.vue index 4f03ab9880190ac62bbbf277a891e28bb5c806c7..f89bef2ea70fbf7146325e98f5176c3025506637 100644 --- a/src/components/table-um.vue +++ b/src/components/table-um.vue @@ -149,7 +149,7 @@ :id="scope.row.id" :name="scope.row.name" :rowId="scope.$index" - :type="scope.row.type ? scope.row.type : ''" + :type="scope.row[item.uploadKey] ? scope.row[item.uploadKey] : ''" :typeHead="item.type" :couldNotEdit="couldNotEdit" @changeInputValue="changeInputValue" diff --git a/src/pages/example/example_table.vue b/src/pages/example/example_table.vue index 7b3516f5df6fca0624e7d2d1bfb6ed64a1a721e1..3fdc42b1920c6609e948026f39b432f892ac71a8 100644 --- a/src/pages/example/example_table.vue +++ b/src/pages/example/example_table.vue @@ -118,7 +118,7 @@ export default { ], headers1: [ { label: "服务url", prop: "date", type: "input", align: "left" }, - { label: "服务名称", prop: "ssss", type: "upload", align: "center" }, + { label: "服务名称", prop: "ssss", type: "upload", align: "center", uploadKey: "type" }, { label: "文件类型", prop: "type", @@ -126,8 +126,8 @@ export default { align: "center", width: 100, selectArr: [ - { label: "Text", value: "Text" }, - { label: "File", value: "File" } + { label: "text", value: "text" }, + { label: "file", value: "file" } ] } ], diff --git a/src/pages/service_shop/service_application_successfully.vue b/src/pages/service_shop/service_application_successfully.vue new file mode 100644 index 0000000000000000000000000000000000000000..77ac15fe254b724dc82e2f0a5556cb8eca699207 --- /dev/null +++ b/src/pages/service_shop/service_application_successfully.vue @@ -0,0 +1,112 @@ + + + + \ No newline at end of file diff --git a/src/pages/user/order/order_detail.vue b/src/pages/user/order/order_detail.vue new file mode 100644 index 0000000000000000000000000000000000000000..b181ed2fdb467e872265ea3ec0f52d2e1e95adc9 --- /dev/null +++ b/src/pages/user/order/order_detail.vue @@ -0,0 +1,481 @@ + + + + + \ No newline at end of file diff --git a/src/pages/user/order_list.vue b/src/pages/user/order/order_list.vue similarity index 100% rename from src/pages/user/order_list.vue rename to src/pages/user/order/order_list.vue diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue index 33de0421ebb576a45b6fa2f06e3294e22d7691a5..3ac03d08c4f2196562de58e5c0a729e8457d7951 100644 --- a/src/pages/workbench/fwzc_fwcs.vue +++ b/src/pages/workbench/fwzc_fwcs.vue @@ -461,11 +461,11 @@ export default { align: "center", width: 100, selectArr: [ - { label: "Text", value: "text" }, - { label: "File", value: "file" } + { label: "text", value: "text" }, + { label: "file", value: "file" } ] }, - { label: "请求值", prop: "val", type: "upload", align: "center" }, + { label: "请求值", prop: "val", type: "upload", align: "center", uploadKey: "field_type" }, { label: "操作", type: "Button", @@ -745,7 +745,6 @@ export default { request_fields: this.request_fields, response_fields: this.response_fields }; - let url = `/apaas/service/v3/service/manager`; this.$api.workbench.serviceAdd(query).then(response => { if (response.data.success == 1) { this.$message.success("服务注册成功"); diff --git a/src/request/http.js b/src/request/http.js index edd951683c0917fb3097032d88e785227d192172..440437faaeb8acdeda26b9294ade188f393e448e 100644 --- a/src/request/http.js +++ b/src/request/http.js @@ -30,6 +30,7 @@ const toLogin = () => { const errorHandle = (status, other) => { // 状态码判断 switch (status) { + case 400: tip('请求错误(400)'); break; // 401: 未登录状态，跳转登录页 case 401: toLogin(); @@ -44,12 +45,15 @@ const errorHandle = (status, other) => { toLogin(); }, 1000); break; - // 404请求不存在 - case 404: - tip('请求的资源不存在'); - break; - default: - console.log(other); + case 404: tip('请求的资源不存在'); break; + case 408: tip('请求超时(408)'); + case 500: tip('服务器错误(500)'); + case 501: tip('服务未实现(501)'); + case 502: tip('网络错误(502)'); + case 503: tip('服务不可用(503)'); + case 504: tip('网络超时(504)'); + case 505: tip('HTTP版本不受支持(505)'); + default: tip(`连接出错,${other}`); } } @@ -78,7 +82,7 @@ instance.interceptors.response.use( const { response } = error; if (response) { // 请求已发出，但是不在2xx的范围 - errorHandle(response.status, response.data.message); + errorHandle(response.status, response.data.errmessage); return Promise.reject(response); } }); diff --git a/src/router/index.js b/src/router/index.js index c2df22fd33c9b4eb85dcbb951d9fbdc3719434e1..32914e6c62ba9145b65a062c7b28ff628e128b49 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -142,6 +142,11 @@ export default new Router({ name: "shopCloud", component: () => import("@/pages/service_shop/shop_cloud"), }, + { + path: "/shop/service_application_successfully", // 云资源服务 + name: "shopSuccess", + component: () => import("@/pages/service_shop/service_application_successfully"), + }, { path: "/shop/app_store_list", // 应用商店列表页 name: "shopAppStoreList", @@ -213,7 +218,12 @@ export default new Router({ { path: "/user/order_list", // 订单管理页 name: "orderList", - component: () => import("@/pages/user/order_list"), + component: () => import("@/pages/user/order/order_list"), + }, + { + path: "/user/order_detail/:id", // 订单管理页 + name: "orderDetail", + component: () => import("@/pages/user/order/order_detail"), }, ], }, // 个人中心 diff --git a/static/data.json b/static/data.json index 7220e83ed022d1cd97a2912644b24fa951e0c680..207908056ccd770e47999bfb8a47d07950b56054 100644 --- a/static/data.json +++ b/static/data.json @@ -4,28 +4,28 @@ { "date": "2016-05-02", "name": "王小虎", - "type": "File", + "type": "file", "id": "ssss2722", "state": 0 }, { "date": "2016-05-04", "name": "王小虎", - "type": "Text", + "type": "text", "id": "ssss2224", "state": 0 }, { "date": "2016-05-01", "name": "王小虎", - "type": "Text", + "type": "text", "id": "ssss222", "state": 1 }, { "date": "2016-05-03", "name": "王小虎", - "type": "File", + "type": "file", "id": "ssss22", "state": 2 }