Merge branch 'dev' of https://cloud.wodcloud.com/git/apaas/apaas-v3-ui into dev

src/pages/technical-support/answer-center/index.vue

@@ -246,8 +246,9 @@ export default {
 }
 .list_img {
   flex-shrink: 0;
+  width: 26px;
   height: 26px;
-  border-radius: 13px;
+  border-radius: 50%;
 }
 .list_text {
   flex-grow: 1;

src/pages/technical-support/answer-center/list.vue

@@ -124,6 +124,11 @@ export default {
         });
     },
     selectSortType(type) {
+      /* if (this.sortType === type) {
+        return;
+      } */
+
+      this.currentPage = 1;
       this.sortType = type;
       this.getAnwerList();
     },
@@ -158,7 +163,7 @@ export default {
     },
     getContentText(content) {
       let text = content.replace(/<img[^>]+>/g, "【图片】");
-      
+
       text = text.replace(/<iframe(([\s\S])*?)<\/iframe>/g, "【视频】");
       text = text.replace(/<pre(([\s\S])*?)<\/pre>/g, "【代码】");
       text = text.replace(/<\/?.+?>/g, "");

src/pages/technical-support/doc-manage/detail.vue

@@ -8,7 +8,8 @@
         <el-breadcrumb-item to="/technical_support/doc_manage">
           开发文档
         </el-breadcrumb-item>
-        <el-breadcrumb-item> 文档编辑 - {{ title }} </el-breadcrumb-item>
+        <el-breadcrumb-item> 文档编辑 </el-breadcrumb-item>
+        <el-breadcrumb-item> {{ title }} </el-breadcrumb-item>
       </el-breadcrumb>
     </div>
 

src/pages/technical-support/doc/detail.vue

@@ -5,7 +5,7 @@
         <el-breadcrumb-item to="/technical_support">
           技术支持
         </el-breadcrumb-item>
-        <el-breadcrumb-item to="/technical_support/doc">
+        <el-breadcrumb-item :to="parentPath">
           开发文档
         </el-breadcrumb-item>
         <el-breadcrumb-item>
@@ -31,6 +31,12 @@ export default {
   components: {
     DocWidthNav,
   },
+  props: {
+    parentPath: {
+      type: String,
+      default: "",
+    },
+  },
   data() {
     return {
       title: "",
@@ -60,6 +66,7 @@ export default {
     },
   },
   created() {
+    this.title = this.typeText;
     this.getContent();
   },
   methods: {

src/pages/technical-support/doc/index.vue

@@ -4,11 +4,11 @@
       title="开发文档"
       imgSrc="tool_ic_kaifawendang"
       :nav-list="navList"
-      :title-path="navList[0] && navList[0].path"
+      :title-path="activePath"
       style="width: 250px;"
     ></side-nav-bar>
     <div class="main_container">
-      <router-view :key="$route.params.type + $route.params.id" />
+      <router-view :parent-path="activePath" :key="$route.params.type + $route.params.id" />
     </div>
   </div>
 </template>

src/pages/technical-support/sdk-manage/example/detail.vue

@@ -9,7 +9,10 @@
           SDK管理
         </el-breadcrumb-item>
         <el-breadcrumb-item>
-          SDK示例编辑 - {{ detail.example_name }}
+          SDK示例编辑
+        </el-breadcrumb-item>
+        <el-breadcrumb-item>
+          {{ detail.example_name }}
         </el-breadcrumb-item>
       </el-breadcrumb>
     </div>
@@ -61,7 +64,7 @@ export default {
   },
   methods: {
     cancelAction() {
-      this.$router.push("/technical_support/sdk_manage");
+      this.$router.push("/technical_support/sdk_manage/example");
     },
     submitAction() {
       this.$http

src/pages/technical-support/sdk-manage/example/index.vue

@@ -330,16 +330,17 @@ export default {
         let ids = [];
 
         this.selection.forEach((item) => {
-          names.push(item.example_name);
+          names.push("《" + item.example_name + "》");
           ids.push(item.id);
         });
 
-        this.deleteDialogInfo.msg = `您确认要删除${names.join("，")}吗？`;
+        this.deleteDialogInfo.msg = `您确认要删除${names.join("、")}吗？`;
         this.deleteDialogInfo.submit = () => {
           this.deleteRequest(ids);
         };
         this.$refs.deleteDialog.show();
       } else {
+        this.$message.closeAll();
         this.$message.warning("您尚未选中任何SDK示例");
       }
     },
@@ -370,7 +371,7 @@ export default {
       this.$refs.detailDialog.show();
     },
     deleteItem(item) {
-      this.deleteDialogInfo.msg = `确认删除${item.example_name}吗？`;
+      this.deleteDialogInfo.msg = `确认删除《${item.example_name}》吗？`;
       this.deleteDialogInfo.submit = () => {
         this.deleteRequest([item.id]);
       };

src/pages/technical-support/sdk-manage/type/index.vue

@@ -287,12 +287,13 @@ export default {
           ids.push(item.id);
         });
 
-        this.deleteDialogInfo.msg = `您确认要删除${names.join("，")}吗？`;
+        this.deleteDialogInfo.msg = `您确认要删除${names.join("、")}吗？`;
         this.deleteDialogInfo.submit = () => {
           this.deleteRequest(ids);
         };
         this.$refs.deleteDialog.show();
       } else {
+        this.$message.closeAll();
         this.$message.warning("您尚未选中任何SDK类型");
       }
     },

src/pages/technical-support/sdk/index.vue

@@ -8,7 +8,7 @@
       style="width: 250px;"
     ></side-nav-bar>
     <div class="main_container">
-      <router-view :key="$route.params.type + $route.params.id" />
+      <router-view :parent-path="activePath" :key="$route.params.type + $route.params.id" />
     </div>
   </div>
 </template>