云服务、购物车、流程编辑

src/assets/i18n/language-zh.js

@@ -39,6 +39,7 @@ export const lang = {
     process_design: "流程设计",
     process_management: "流程管理",
     new: "新建",
+    edit: "编辑",
 
     // technical-support
     technical_support: "技术支持"

src/components/shopping-cart/shopping-cart-com.vue

@@ -75,7 +75,7 @@
 import ShoppingCartList from "@/components/shopping-cart/shopping-cart-list";
 export default {
   components: {
-    ShoppingCartList
+    ShoppingCartList,
   },
   props: {},
   data: () => ({
@@ -83,7 +83,7 @@ export default {
     checkList: [],
     checkListIn: [],
     list: [],
-    listIn: []
+    listIn: [],
   }),
   mounted() {
     this.getList();
@@ -95,14 +95,14 @@ export default {
         0
       );
       return num;
-    }
+    },
   },
   methods: {
     getList() {
-      this.$api.serviceShop.getShoppingCart().then(response => {
+      this.$api.serviceShop.getShoppingCart().then((response) => {
         if (response.data.success == "1") {
-          this.list = response.data.data.valid;
-          this.listIn = response.data.data.invalid;
+          this.list = response.data.data.valid || [];
+          this.listIn = response.data.data.invalid || [];
           this.checkList = [];
           this.checkListIn = [];
           for (let index in this.list) {
@@ -135,7 +135,7 @@ export default {
           query.push(this.list[index].id);
         }
       });
-      this.$api.serviceShop.delShoppingCart(query).then(response => {
+      this.$api.serviceShop.delShoppingCart(query).then((response) => {
         console.log(response);
         this.$store.commit("setMenuCartState");
         this.getList();
@@ -147,7 +147,7 @@ export default {
     deleteItem(val) {
       console.log(val);
       let query = [val.data.id];
-      this.$api.serviceShop.delShoppingCart(query).then(response => {
+      this.$api.serviceShop.delShoppingCart(query).then((response) => {
         console.log(response);
         this.$store.commit("setMenuCartState");
         this.getList();
@@ -168,8 +168,8 @@ export default {
     updateList() {
       this.$store.commit("setMenuCartState");
       this.getList();
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped>

src/pages/service_shop/shop_car_apply.vue

@@ -287,6 +287,7 @@ export default {
         .then(response => {
           console.log(response);
           if (response.data.success) {
+            this.$store.commit("setMenuCartState");
             this.$message.success("申请成功");
             this.$router.replace("/shop/service_application_successfully");
           } else {

src/pages/workbench/component-center/process-management/process-design/edit.vue

@@ -4,17 +4,10 @@
       <el-breadcrumb-item :to="{ path: '/workplace' }">{{ $t("lang.online_component_tool") }}</el-breadcrumb-item>
       <el-breadcrumb-item :to="{ path: '/progress/designer' }">{{ $t("lang.process_design") }}</el-breadcrumb-item>
       <el-breadcrumb-item :to="{ path: '/progress/designer' }">{{ $t("lang.process_management") }}</el-breadcrumb-item>
-      <el-breadcrumb-item>{{ $t("lang.new") }}</el-breadcrumb-item>
+      <el-breadcrumb-item>{{ $t("lang.edit") }}</el-breadcrumb-item>
     </el-breadcrumb>
     <BlockRadius class="block_item">
-      <steps
-        :active-step="step"
-        :done="done"
-        :show-done="true"
-        done-title="保存成功"
-        done-sub-title="可返回流程管理列表查看该流程，并进行流程的部署和发布。"
-        class="apaas_steps"
-      >
+      <steps :active-step="step" :show-done="true" class="apaas_steps">
         <step
           title="基本信息"
           :step="0"
@@ -65,13 +58,7 @@
           class="apaas_step"
         >
           <div class="step_in">
-            <WorkFlow
-              ref="workFlow"
-              :node_list="node_list"
-              :link_list="link_list"
-              :node_params_list="node_params_list"
-              class="work_flow"
-            />
+            <WorkFlow ref="workFlow" class="work_flow" />
             <div class="btn_footer">
               <el-button class="cancel" @click="cancel">取消</el-button>
               <div>
@@ -87,11 +74,27 @@
           :step="2"
           :active-icon="require('@/assets/imgs/progress_ic_wancheng.png')"
           class="apaas_step"
-        ></step>
-
-        <template slot="action">
-          <el-button type="primary" @click="backToList">返回列表</el-button>
-        </template>
+        >
+          <div class="steps_container steps_done">
+            <div class="steps_done_info">
+              <div class="left_container">
+                <img :src="require('@/assets/imgs/steps_done.png')" width="100%" />
+              </div>
+              <div class="right_container">
+                <p>保存成功</p>
+                <p>可返回流程管理列表查看该流程，并进行流程的部署和发布。</p>
+              </div>
+            </div>
+            <div class="done_action apaas_button">
+              <slot name="action"></slot>
+            </div>
+            <div class="btn_footer_1">
+              <div>
+                <el-button class="next" @click="backToList">返回列表</el-button>
+              </div>
+            </div>
+          </div>
+        </step>
       </steps>
     </BlockRadius>
   </div>
@@ -264,6 +267,10 @@ export default {
         .getProcessDetail({ id: this.$route.params.id })
         .then((response) => {
           if (response.data.success == 1) {
+            let data = response.data.data;
+            this.basic_form.name = data.name;
+            this.basic_form.workplace = data.workarea;
+            this.basic_form.desc = data.describe;
             this.node_list = [];
             this.link_list = [];
             this.node_params_list = [];

src/request/api/service-shop.js

@@ -43,6 +43,9 @@ businessArea=${params.businessArea}&developable=${params.developable}&orgSource=
     updateCloud(params) {
         return axios.post(`/apaas/serviceapp/v3/resource/apply/up`, params)
     },
+    checkNameSpaceCouldUse(params) {
+        return axios.get(`/apaas/service/v3/resource/apply/checkNs?namespace=${params.id}`)
+    },
 
     // shopping cart
     addShoppingCart(params) {