Merge branch 'dev' into 'master'

Dev

See merge request apaas-v3/apaas-ui!2

src/pages/workbench/fwgl/apply_service_detail.vue

@@ -948,7 +948,7 @@ export default {
             this.$set(
               this.service_header_arr["first"][2],
               "text",
-              data.service_apply_info.service_end_time
+              data.service_apply_info.request_end_time
                 .replace(/T|Z/g, " ")
                 .split("+")[0]
             );
@@ -1123,6 +1123,15 @@ export default {
           if (data.data_service_type1_name != "数据服务") {
             this.servicead_arr = this.servicead_arr.slice(0, 4);
           }
+
+          if(data.service_apply_info.approval_status == 3){
+            //审批通过
+            this.servicead_arr.unshift({
+              title: "Authorization：",
+              info: data.service_apply_info.apaas_token,
+            })
+          }
+
           console.log(data.service_apply_info);
           if (data.service_apply_info.approval_process) {
             data.service_apply_info.approval_process.forEach((e) => {