Merge branch 'ldx' into dev

src/components/codes.vue

@@ -69,15 +69,15 @@ export default {
 }
 </style>
 <style>
-.ace-container /deep/ .ace-editor {
+.ace-container .ace-editor {
   width: 100% !important;
   height: 430px !important;
 }
-.ace-container /deep/ .ace_content {
+.ace-container .ace_content {
   /* width: 100% !important; */
   height: 430px !important;
 }
-.ace-container /deep/ .ace_text-layer {
+.ace-container .ace_text-layer {
   /* width: 100% !important; */
   word-break: break-all;
   /* background:yellowgreen; */

src/components/order-list/order-list-cell.vue

@@ -59,7 +59,7 @@
                 v-model="textarea"
                 maxlength="200"
                 show-word-limit
-                :autosize="{ minRows: 4, maxRows: 10 }"
+                :autosize="{ minRows: 6, maxRows: 10 }"
               ></el-input>
             </div>
             <div class="pop_btn_group">
@@ -82,7 +82,7 @@
       </el-col>
       <el-col :span="4" class="cell_option">
         <div>
-          <el-button size="madium" class="cell_option_btn">查看详情</el-button>
+          <el-button size="madium" class="cell_option_btn" @click="viewDetail(cellItem.id)">查看详情</el-button>
           <div class="cell_option_spec">再次申请</div>
         </div>
       </el-col>
@@ -128,6 +128,9 @@ export default {
     addEvaluation() {
       console.log(this.serviceRate, this.textarea);
       this.visible = false;
+    },
+    viewDetail(val) {
+      this.$router.push("/user/order_detail/" + val)
     }
   }
 };

src/components/order-list/order-list-com.vue

@@ -223,7 +223,7 @@ export default {
   padding: 17px 10px;
 }
 .btn_actice {
-  background-color: blue;
+  background-color: #515fe7;
   color: #fff;
 }
 .input_right {

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"

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" }
         ]
       }
     ],

src/pages/service_shop/service_application_successfully.vue

+<template>
+  <div>
+    <block-radius class="success_block">
+      <div class="success_in">
+        <div class="step_block">
+          <div class="success">
+            <i class="el-icon-success"></i>
+          </div>
+          <div class="line"></div>
+          <div class="next"></div>
+        </div>
+        <div class="step_text">
+          <div class="step_text_1">服务申请提交成功</div>
+          <div class="step_text_2">您的申请已提交进入审核，审核通过后即可获取相应服务</div>
+        </div>
+      </div>
+      <div class="btn_footer">
+        <el-button class="cancel" @click="goto('/services_shop')">进入首页</el-button>
+        <el-button class="submit" @click="goto('/user/order_list')">查看订单</el-button>
+      </div>
+    </block-radius>
+  </div>
+</template>
+
+<script>
+import BlockRadius from "@/components/block-radius";
+export default {
+  components: {
+    BlockRadius
+  },
+  data: () => ({}),
+  mounted() {},
+  methods: {
+    goto(url) {
+      this.$router.push(url);
+    }
+  }
+};
+</script>
+<style scoped>
+.success_block {
+  width: 1200px;
+  height: 560px;
+  margin: 130px auto 0;
+}
+.success_in {
+  width: 460px;
+  display: flex;
+  justify-content: space-around;
+  margin: 120px auto 0;
+}
+.step_block {
+  position: relative;
+}
+.success {
+  font-size: 36px;
+  color: #25bdb1;
+}
+.line {
+  height: 100px;
+  width: 2px;
+  background-color: #d3d7e3;
+  position: absolute;
+  left: 17px;
+  top: 36px;
+}
+.line::after {
+  content: "";
+  position: absolute;
+  height: 50px;
+  width: 2px;
+  background-color: #25bdb1;
+  top: 0;
+}
+.next {
+  width: 20px;
+  height: 20px;
+  border-radius: 10px;
+  background-color: #d3d7e3;
+  position: absolute;
+  left: 8px;
+  top: 136px;
+}
+.step_text {
+  width: 380px;
+  height: 150px;
+}
+.step_text_1 {
+  color: #25bdb1;
+  margin-top: 16px;
+  margin-bottom: 102px;
+}
+.step_text_2 {
+  color: #8890a7;
+}
+.btn_footer {
+  width: 460px;
+  margin: 80px auto;
+  display: flex;
+  justify-content: space-between;
+}
+.submit {
+  width: 200px;
+  background-color: #0f2683;
+  color: #f8f9fd;
+}
+.cancel {
+  width: 200px;
+  background-color: #c3caf8;
+  color: #0f2683;
+}
+</style>
\ No newline at end of file

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("服务注册成功");

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);
         }
     });

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"),
             },
           ],
         }, // 个人中心

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
       }