Merge branch 'ldx' into dev

src/assets/css/index.css

@@ -261,15 +261,15 @@ div {
 }
 
 .el-tabs__item {
-  font-size: 16px;
+  font-size: 14px;
   color: #8890a7;
-  line-height: 24px !important;
+  line-height: 14px !important;
   font-weight: bold;
 }
 
 .el-tabs__nav-scroll .el-tabs__item {
-  line-height: 38px !important;
-  height: 44px !important;
+  line-height: 14px !important;
+  height: 38px !important;
 }
 
 .el-tabs__item:hover {
@@ -499,7 +499,7 @@ border-radius:8px;
   margin-left: 35px;
 } */
 .el-input__inner {
-  border-radius: 8px;
+  border-radius: 6px;
 }
 
 .el-input-group__append,

src/components/general/block-radius.vue

 <template>
-  <div class="block_radius" :style="'border-radius:' + borRadius + 'px'">
+  <div class="block_radius" :style="'border-radius:' + borRadius + 'px;padding:' +  paddingNum + 'px;'">
     <div v-if="show_header" class="block_header">
       <div class="block_header_title">{{ title }}</div>
       <div class="block_header_button_group">
@@ -36,6 +36,10 @@ export default {
     borRadius: {
       type: Number,
       default: 10,
+    },
+    paddingNum: {
+      type: Number,
+      default: 20,
     }
   },
   components: {},

src/components/infoList.vue

@@ -93,10 +93,10 @@ a {
   text-align: center;
   color: #e6ebfe;
   background-color: #515fe7;
-  border-radius: 8px;
+  border-radius: 6px;
   display: inline-block;
   font-size: 14px;
-  margin-left: 20px;
+  margin-left: 8px;
   cursor: pointer;
 }
 </style>

src/components/service-list/commodity-card.vue

@@ -87,14 +87,14 @@ export default {
   height: 208px;
   background-color: #ffffff;
   box-shadow: 0px 3px 6px 0px rgba(15, 19, 65, 0.04);
-  border-radius: 12px 12px 8px 8px;
+  border-radius: 8px;
   border: solid 1px #e3e4ef;
-  margin-bottom: 16px;
+  margin-bottom: 24px;
 }
 .com_cell_up {
   height: 88px;
   background-color: #f9fafc;
-  border-radius: 12px 12px 0px 0px;
+  border-radius: 8px 8px 0px 0px;
   padding: 16px;
   display: flex;
   position: relative;
@@ -186,7 +186,7 @@ export default {
   color: #e15260;
 }
 .com_cell_down {
-  padding: 12px 16px 16px;
+  padding: 12px 16px 0 16px;
 }
 .com_detail {
   color: #8890a7;

src/components/service-list/commodity-cell.vue

@@ -100,7 +100,7 @@ export default {
   box-shadow: 0px 3px 6px 0px rgba(15, 19, 65, 0.04);
   border-radius: 12px 12px 8px 8px;
   border: solid 1px #e3e4ef;
-  margin-bottom: 16px;
+  margin-bottom: 24px;
 }
 .com_cell_up {
   height: 88px;
@@ -197,7 +197,7 @@ export default {
   color: #e15260;
 }
 .com_cell_down {
-  padding: 12px 16px 16px;
+  padding: 12px 16px 0 16px;
 }
 .com_detail {
   color: #8890a7;

src/components/service-list/service_list.vue

@@ -35,7 +35,7 @@
             class="classification_line_if"
             v-if="item.childDomains && item.childDomains.length != 0"
           >
-            <div class="classification_line_title">{{ item.name }}：</div>
+            <div class="classification_line_title">{{ item.name }}<span class="maohao">：</span></div>
             <!-- <div
               :class="
                 index == filterLists.length - 1
@@ -120,7 +120,7 @@
                   @click="clickOpen(index)"
                 >
                   <span v-if="openList[index] == 'down'">收起</span>
-                  <span v-if="openList[index] == 'up'">展开</span>
+                  <span v-if="openList[index] == 'up'">更多</span>
                   <i
                     v-if="openList[index] == 'down'"
                     class="el-icon-caret-top"
@@ -666,10 +666,11 @@ export default {
 }
 .classification_line_title {
   display: inline-block;
-  width: 130px;
+  width: 90px;
   padding: 15px 0;
-  text-align: right;
+  text-align: left;
   color: #8890a7;
+  font-size: 12px;
 }
 .classification_line_items {
   width: calc(100% - 130px);
@@ -678,7 +679,7 @@ export default {
   border-bottom: 1px #e9ecf3 solid;
 }
 .classification_line_hid {
-  height: 50px;
+  height: 46px;
   width: 100%;
   overflow: hidden;
   display: inline-flex;
@@ -697,7 +698,7 @@ export default {
 .classification_line_items_li {
   display: inline-block;
   padding: 15px 20px;
-  font-size: 14px;
+  font-size: 12px;
 }
 .classification_line_items_li_act {
   background-color: #fbfbfb;
@@ -730,6 +731,7 @@ export default {
   width: 60px;
   padding: 15px 0;
   cursor: pointer;
+  font-size: 12px;
 }
 .classification_children_ul {
   display: inline-block;

src/components/service-list/service_shop_menu.vue

@@ -121,18 +121,24 @@ export default {
 	border-radius: 8px;
 }
 .service_shop_menu_list > li {
-  padding: 16px 10px 8px 22px;
+  box-sizing: border-box;
+  height: 40px;
+  padding: 8px 0 0 22px;
+  margin-bottom: 16px;
   font-size: 15px;
   line-height: 24px;
   cursor: pointer;
 }
+.service_shop_menu_list > li:nth-last-child(1) {
+  margin-bottom: 0;
+}
 .service_shop_menu_list > li:hover,
 .service_shop_menu_list > li.current {
   background-color: rgba(242, 246, 253, 0.4);
   color: #515fe7;
 }
 .menu_img {
-  width: 25px;
+  width: 24px;
   margin-right: 6px;
 }
 .menu_item {

src/pages/service_shop/shop_cloud.vue

 <template>
-  <div>
+  <div class="shop_list_cont">
     <el-container>
-      <el-aside width="180px">
+      <el-aside width="176px">
         <service-shop-menu></service-shop-menu>
       </el-aside>
-      <el-main>
+      <el-main class="main_init">
         <shop-cloud name="云资源服务"></shop-cloud>
       </el-main>
     </el-container>
@@ -25,4 +25,12 @@ export default {
 };
 </script>
 <style scoped>
+.shop_list_cont {
+  width: 1200px;
+  margin: 0 auto;
+  position: relative;
+}
+.main_init {
+  padding: 2px 0 16px 16px;
+}
 </style>
\ No newline at end of file

src/pages/workbench/fwzc_fwcs.vue

@@ -417,14 +417,16 @@
             class="reset"
             v-if="activeBtn == 0 && resSuccess"
             @click="resetSjfw"
-            >重置</el-button
           >
+            重置
+          </el-button>
           <el-button
             :disabled="!resSuccess"
             :class="resSuccess ? 'next' : ''"
             @click="nextJcxx"
-            >下一步</el-button
           >
+            下一步
+          </el-button>
         </div>
       </block-radius>
       <div v-if="activeBtn == 4 && zhyyVal == 24">
@@ -1058,7 +1060,7 @@ export default {
       this.jkwds = [];
     },
     getUrl(enUrl) {
-      enUrl = enUrl.replace(/\s*/g,"");
+      enUrl = enUrl.replace(/\s*/g, "");
       let url = decodeURI(enUrl);
       let arr = [];
       if (url.indexOf("?") != -1) {
@@ -1227,6 +1229,15 @@ export default {
         ) {
           if (this.jkwds.length == 0) {
             this.$message.error("请上传接口文档");
+          } else {
+            if (
+              this.activeBtn == 2 ||
+              (this.activeBtn == 4 && this.zhyyVal == 22)
+            ) {
+              this.request_fields = [];
+              this.response_fields = [];
+              this.jcxxtx = true;
+              this.getOrganization();
             } else {
               let requestData = this.$refs.fwcs_sjfw_qqcs.getTableData();
               let responseData = this.$refs.fwcs_sjfw_fhcs.getTableData();
@@ -1245,6 +1256,7 @@ export default {
                 this.$message.error("请完善返回参数信息中的字段名称");
               }
             }
+          }
         } else {
           let requestData = this.$refs.fwcs_sjfw_qqcs.getTableData();
           let responseData = this.$refs.fwcs_sjfw_fhcs.getTableData();
@@ -1865,7 +1877,7 @@ export default {
       });
     },
     getUrlOne(enUrl, indexOne) {
-      enUrl = enUrl.replace(/\s*/g,"");
+      enUrl = enUrl.replace(/\s*/g, "");
       let url = decodeURI(enUrl);
       let arr = [];
       if (url.indexOf("?") != -1) {