From ce4c8d29e995c5abc18eedc08a1b6abeee8128b9 Mon Sep 17 00:00:00 2001 From: liudianxin Date: Wed, 27 May 2020 19:05:06 +0800 Subject: [PATCH] fix --- src/assets/imgs/ic_CPU.png | Bin 0 -> 1210 bytes src/assets/imgs/ic_neicun.png | Bin 0 -> 1132 bytes src/assets/imgs/ic_rongqi.png | Bin 0 -> 1230 bytes src/assets/imgs/ic_shijian.png | Bin 0 -> 1219 bytes src/components/codes.vue | 6 +- src/components/order-list/order-list-cell.vue | 7 +- src/components/order-list/order-list-com.vue | 2 +- src/components/shop-cloud/shop-cloud.vue | 1066 ++++++++++++++--- src/components/table-um.vue | 2 +- src/pages/example/example_table.vue | 6 +- .../service_application_successfully.vue | 112 ++ src/pages/user/order/order_detail.vue | 481 ++++++++ src/pages/user/{ => order}/order_list.vue | 0 src/pages/workbench/fwzc_fwcs.vue | 7 +- src/request/http.js | 18 +- src/router/index.js | 12 +- static/data.json | 8 +- 17 files changed, 1538 insertions(+), 189 deletions(-) create mode 100644 src/assets/imgs/ic_CPU.png create mode 100644 src/assets/imgs/ic_neicun.png create mode 100644 src/assets/imgs/ic_rongqi.png create mode 100644 src/assets/imgs/ic_shijian.png create mode 100644 src/pages/service_shop/service_application_successfully.vue create mode 100644 src/pages/user/order/order_detail.vue rename src/pages/user/{ => order}/order_list.vue (100%) diff --git a/src/assets/imgs/ic_CPU.png b/src/assets/imgs/ic_CPU.png new file mode 100644 index 0000000000000000000000000000000000000000..7065a9d80c2299e7ca70eb306e67dee02ade35cd GIT binary patch literal 1210 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8JrcYiMR=Vqj%tqyPmhm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0H{644~kr*$c704QxJ#=Pr5)3Jn^UI0aJVtFljS+IjS)*Flu?a zIEGZ*YMHd(i`h}2UH_p2_tu__R3TAUktVT&UP)`$Cn(!B=0BA7nCIlZacYB?iy*6K zQgTz~5&Mp?*XAFhCHsWyKge$0Y`nX8bMTFu_FhI&OvPba-yJZ!^J~GCo2;zY7c#B> z6#nG*HN}JKQI`x&9&pD!aH&p{KcF$^)i(j*=Ly1IALc#DW}25MCZ|()bE?qfWr<$j z7=C?NHiLJ!ZK!hEgV4tAf_0aDCvRZ;9wmP$d7{5$Sd6FXj-bV>Hf87CPda_n{-3(a z{}WzsQ@wIuxAkdneOt6nS3R`)b=J<8e9ww!32$ZB_1@FyFVSfDBOt*(`0kFRH@dq& z%I+@WF=eRiV!rTsa`M?5O{@{^%jO*@VccD?Or7&)B=0Z#*I$HVPUV+*SMUENn82{5 W%w4$W^Ggd*Y2xYX=d#Wzp$Pzx8=wjR literal 0 HcmV?d00001 diff --git a/src/assets/imgs/ic_neicun.png b/src/assets/imgs/ic_neicun.png new file mode 100644 index 0000000000000000000000000000000000000000..eea715ea170e06bc58158fa92f5dfbdb8a52dcc9 GIT binary patch literal 1132 zcmaJ=TWAwm7@lZ}p`tCKqV>XIT8afTm!wHELt~R>QjI#@k_IgJ;$-Hu8SBg$XHLze zD6~~D)(SrCgRm+n6;wooeRN@E&7uo^SoUGvT^14X^58=iMe`ukGqtHc7zfUr3*Yzs zm-C%71O2<#G`2KS6tyO^N6LD$Hv)e0w_iOwPNvN`J%k6*FfJ-Kq>>uSLy$3)5txOF zRyz6z?53!d?Rstq56SyQ6&Z};VHnr22%Dn1dt6IVMiDQCXmrmm(Cvyuz<^i*u5rY4L^n<^>WXCT9kVo8gy7LQ{W+;2 zc>tu44MBv7235W@0=fi-kA^!1VJ8T2e2nE{EFTW?QL&Q~Lm{yA(IlF!4U1W+Zz&ep z#pwdZmdLWjVv#9^8Dx*JydVfH7h*%9AVCD3l8F^JXgaMm1qnK;ty@?}Ch!!MJQ~As znq>O91jAaEHJzn4k%qCZVzE5Kc_r0=viyChVJxE^oP}TV{id*!D_M}uLI;i6D!I7f zRxgw#rfjHSWakh%QtRSC0b%46kOfjHuWJI>aX>dURCGEPIkGHfOb08b3NuoiCMt}s zYhq_I9ph46T|$aW^L#oPy${|S`ePF!dzZ<}!a8@GrP)rRKz6;E$~!3&eso|Q+R^voUJR9*Eve6>S6 zHGTim+*Dg>Yq>O0ZEapit{a)0KKX3y&&W1^ejoVz!P8r36UW#6)b77t$@FedJ!)wD z@%O~e>9+SRWp%R3GV;v8ht>3%6T6$XZY*%WH6(pcPCtM%ocwY!wxMNq;dSBA)Xlqr ozt%VHZAo-rDnE>`s$?jipTbw#-~I4B=kwlwCfzUH?maa13B1R2r~m)} literal 0 HcmV?d00001 diff --git a/src/assets/imgs/ic_rongqi.png b/src/assets/imgs/ic_rongqi.png new file mode 100644 index 0000000000000000000000000000000000000000..9774d292b42c132a5cd826e1a4ced3a9d64f728f GIT binary patch literal 1230 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8JrcYiMR=Vqj%tqyPmhm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0z*Q}aq-dQ%X3&2j1lC5PMspv^9+MVV!(DQ-pixe8!!TV>*Q ziwREipn6kqyTufzUVWfr^g)q}6xlE#UT_zQA2RcYSwcLMcrpO@l;2+)IU8`rM|)M>0E`b@RW^RZCQ=~zBaMi znzQQ`c-I~lD9UhTy0$m}EGyf$1+t$d969^Bq{5e1YkO}!BOP(5Kj)$ULBraug4VA- z>|(V$aM*B`$c9ei62(^TzkJ?Sol98DR_uxWdpuh8WpL;>n-0U!4Q<->{qJ8KF;HWg zHRFiJqaPn;Kh~T*capV>!GiDetg@p|EMDVQ8I~1wcE+)-=blYJwf)HSierpvTi%P# uzHxm)hW-S{?fd3kk8vw@?dAW^D#36m)4k01&Vo0f62{Zj&t;ucLK6U~7_*)L literal 0 HcmV?d00001 diff --git a/src/assets/imgs/ic_shijian.png b/src/assets/imgs/ic_shijian.png new file mode 100644 index 0000000000000000000000000000000000000000..01b7ebb040c7d3015e6b122131d718dd4b1a9186 GIT binary patch literal 1219 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8JrcYiMR=Vqj%tqyPmhm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0z*Q}aq-dQ%X3Eph4vC5PMspv^9+MVV!(DQ-pixe8!!TV>*Q ziy2Pypn6kqyTu%*UVWfr^g)q}6xlE#UUJwO$uHq>NyjQg6=h?IF_BcaVg?LN@G&~ z!E^Il?M)T)8yp}1zViM`;p~D}!N$++_7|Vqd)~7r{d=r|ltFXdmW+2?>^BZ<*6(S$ zAh2$tE9dG@Ev|PGZiruJS!g>aN$C5#=NZSu$_$&D-bS?Nw*G3mz~uJzci{OoYW;59 zev8F|HQ0BTD2o31e}rYyjI9q8{0g4`ljFD8)}MaRY|ifg{oGsJ_KVcK-0^kePp*5) zUso>nD&XUcQ4&70{dRWbg**o--;E3Q7ONL&eaqeG+9eiqe0J2Np4PYCdWn&?_m8k& z)A_M#S^49D)w{IB56t_zB3HG(m}{3{*_vpXm#;%h&TJ`@KkQfWwB`rTX9 \ No newline at end of file diff --git a/src/components/table-um.vue b/src/components/table-um.vue index 438836e..dc9c9ca 100644 --- a/src/components/table-um.vue +++ b/src/components/table-um.vue @@ -150,7 +150,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 7b3516f..3fdc42b 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 0000000..77ac15f --- /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 0000000..b181ed2 --- /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 33de042..3ac03d0 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 edd9516..440437f 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 493d651..40f9ede 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 7220e83..2079080 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 } -- 2.26.0