diff --git a/index.html b/index.html
index 2c19e6cbb33a4a3d10c792fcc9a7c0cefc27658d..af2a17a7e168c43d19834694c118165f870ee34e 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
     <title>Beagle aPaaS Platform v3.0</title>
-    <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
+    <!-- <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" /> -->
     <style>
       body{
         background-color: #f6f7fb;
diff --git a/src/assets/imgs/nav-logo.png b/src/assets/imgs/nav-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..a975f6d9805bb8dbb247c0b644dae46e9c35de83
Binary files /dev/null and b/src/assets/imgs/nav-logo.png differ
diff --git a/src/assets/imgs/shop_ic_enter.png b/src/assets/imgs/shop_ic_enter.png
new file mode 100644
index 0000000000000000000000000000000000000000..fcd8422bc5f82c27f707d61f0784ae951b59a401
Binary files /dev/null and b/src/assets/imgs/shop_ic_enter.png differ
diff --git a/src/assets/imgs/shop_ic_yysd.png b/src/assets/imgs/shop_ic_yysd.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fdb2d6905d08480822a3f19b842653464ebc8ee
Binary files /dev/null and b/src/assets/imgs/shop_ic_yysd.png differ
diff --git a/src/assets/imgs/shop_ic_yysd_sel.png b/src/assets/imgs/shop_ic_yysd_sel.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba1d21818d5933cce3b85cad4a5a0ae50ab63249
Binary files /dev/null and b/src/assets/imgs/shop_ic_yysd_sel.png differ
diff --git a/src/assets/imgs/shop_tool_ic_ganzhifw.png b/src/assets/imgs/shop_tool_ic_ganzhifw.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8664289b5ba28e34d86401e3d571f209feb6973
Binary files /dev/null and b/src/assets/imgs/shop_tool_ic_ganzhifw.png differ
diff --git a/src/assets/imgs/shop_tool_ic_ganzhifw_sel.png b/src/assets/imgs/shop_tool_ic_ganzhifw_sel.png
new file mode 100644
index 0000000000000000000000000000000000000000..19e01aabf55cea75c3a365c96038569b729c83e7
Binary files /dev/null and b/src/assets/imgs/shop_tool_ic_ganzhifw_sel.png differ
diff --git a/src/assets/imgs/shop_tool_ic_sjfw.png b/src/assets/imgs/shop_tool_ic_sjfw.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d5a7e9aed04b39597f367d8b410b7df471c0ca2
Binary files /dev/null and b/src/assets/imgs/shop_tool_ic_sjfw.png differ
diff --git a/src/assets/imgs/shop_tool_ic_sjfw_sel.png b/src/assets/imgs/shop_tool_ic_sjfw_sel.png
new file mode 100644
index 0000000000000000000000000000000000000000..2428a8a105ea15a5e6f02573df4f18abda53a168
Binary files /dev/null and b/src/assets/imgs/shop_tool_ic_sjfw_sel.png differ
diff --git a/src/assets/imgs/shop_tool_ic_skfw.png b/src/assets/imgs/shop_tool_ic_skfw.png
new file mode 100644
index 0000000000000000000000000000000000000000..9528f2a990686106b86e33400cb9e29cde4af3ed
Binary files /dev/null and b/src/assets/imgs/shop_tool_ic_skfw.png differ
diff --git a/src/assets/imgs/shop_tool_ic_skfw_sel.png b/src/assets/imgs/shop_tool_ic_skfw_sel.png
new file mode 100644
index 0000000000000000000000000000000000000000..c643720c911af5e37b86246db42cb2cb39eeb0ea
Binary files /dev/null and b/src/assets/imgs/shop_tool_ic_skfw_sel.png differ
diff --git a/src/assets/imgs/shop_tool_ic_spfw.png b/src/assets/imgs/shop_tool_ic_spfw.png
new file mode 100644
index 0000000000000000000000000000000000000000..3951fbfa52c7ce7e884636a8e351116d22024f94
Binary files /dev/null and b/src/assets/imgs/shop_tool_ic_spfw.png differ
diff --git a/src/assets/imgs/shop_tool_ic_spfw_sel.png b/src/assets/imgs/shop_tool_ic_spfw_sel.png
new file mode 100644
index 0000000000000000000000000000000000000000..22f692ce25721a0d14e39af4698bcd7d4d9f5abb
Binary files /dev/null and b/src/assets/imgs/shop_tool_ic_spfw_sel.png differ
diff --git a/src/assets/imgs/shop_tool_ic_yzyfw.png b/src/assets/imgs/shop_tool_ic_yzyfw.png
new file mode 100644
index 0000000000000000000000000000000000000000..c528951740646e5b2ed7e42e9a4e1a5496d1494c
Binary files /dev/null and b/src/assets/imgs/shop_tool_ic_yzyfw.png differ
diff --git a/src/assets/imgs/shop_tool_ic_yzyfw_sel.png b/src/assets/imgs/shop_tool_ic_yzyfw_sel.png
new file mode 100644
index 0000000000000000000000000000000000000000..b85663f86cf1a0606f837fbb841b3b85078ea11a
Binary files /dev/null and b/src/assets/imgs/shop_tool_ic_yzyfw_sel.png differ
diff --git a/src/assets/imgs/shop_tool_ic_zhyyfw.png b/src/assets/imgs/shop_tool_ic_zhyyfw.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa0bf23a9382d2cca574790443ce46b7e3b945f9
Binary files /dev/null and b/src/assets/imgs/shop_tool_ic_zhyyfw.png differ
diff --git a/src/assets/imgs/shop_tool_ic_zhyyfw_sel.png b/src/assets/imgs/shop_tool_ic_zhyyfw_sel.png
new file mode 100644
index 0000000000000000000000000000000000000000..177723b6cb44daac7f4385f48d345bcffa7398dd
Binary files /dev/null and b/src/assets/imgs/shop_tool_ic_zhyyfw_sel.png differ
diff --git a/src/components/card.vue b/src/components/card.vue
index 6241e2b7aeedc44abf48ad30b49804bb0a8e8cb6..7aaa627a6466f94939dfe798adf867932b166235 100644
--- a/src/components/card.vue
+++ b/src/components/card.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="card" :style="flag?{borderRadius: '0px 12px 0px 0px'}:{}">
-        <div class="card_title"><div class="circle"></div>{{title}}</div>
+        <div class="card_title" :style="{backgroundColor:bgc}"><div class="circle"></div>{{title}}</div>
         <div class="card_contain">
             <slot></slot>
         </div>
@@ -9,7 +9,7 @@
 
 <script>
 export default {
-    props: ['title','flag'],
+    props: ['title','flag','bgc'],
     components: {
 
     },
diff --git a/src/components/menu.vue b/src/components/menu.vue
index 817232a9ed191484491d56220514daffbf6955ff..897b056768f2c1cf585130a66296cbe120f53616 100644
--- a/src/components/menu.vue
+++ b/src/components/menu.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="menu">
-    <img src="../assets/imgs/home_img_logo.png" alt class="logo" />
+    <img src="../assets/imgs/nav-logo.png" alt class="logo" />
     <div
       style="float: right; cursor: pointer; position: relative"
       class="user_hover"
@@ -320,7 +320,7 @@ export default {
 }
 .logo {
   float: left;
-  margin: 15px 0 0 40px;
+  margin: 22px 0 0 40px;
   cursor: pointer;
 }
 .user {
diff --git a/src/components/service-info/service-info.vue b/src/components/service-info/service-info.vue
index 5ee4b8a5c7c6252b8569094a51706bf6225923b0..e96404630b1ca4d4f4d594aefc5b495eff98dff2 100644
--- a/src/components/service-info/service-info.vue
+++ b/src/components/service-info/service-info.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="service_info apaas_button" v-if="data">
+  <div class="service_info apaas_button" v-if="data && showItem">
     <div class="service_title">
       <span class="service_name" v-text="data.name"></span>
       <span class="service_type" v-if="data.type" v-text="data.type"></span>
@@ -89,7 +89,13 @@
             class="commodity_text"
             >暂无</span
           >
-          <div v-else class="btn_container">
+          <div
+            v-else-if="
+              data.serviceRequestSpcs.spcs_type_1 &&
+              data.serviceRequestSpcs.spcs_type_1.length != 0
+            "
+            class="btn_container"
+          >
             <el-button
               v-for="(item, index) in data.serviceRequestSpcs.spcs_type_1"
               :key="'spcs_' + index"
@@ -191,6 +197,7 @@ export default {
     specification: {}, // 规格
     duration: 1, // 时长
     showTime: false,
+    showItem: false,
   }),
   computed: {
     actionDisabled() {
@@ -268,10 +275,15 @@ export default {
   mounted() {
     // 初始化购买方式
     if (this.data.serviceRequestSpcs && this.data.serviceRequestSpcs.length) {
+      if (!this.data.serviceRequestSpcs.spcs_type_1) {
+        this.data.serviceRequestSpcs.spcs_type_1 = [];
+      }
+      if (!this.data.serviceRequestSpcs.spcs_type_2) {
+        this.data.serviceRequestSpcs.spcs_type_2 = [];
+      }
       let types = Array.from(
         new Set(this.data.serviceRequestSpcs.map((item) => item.type))
       );
-
       if (types.indexOf(3) > -1) {
         this.types = [
           {
@@ -316,6 +328,7 @@ export default {
     ) {
       this.specification = this.data.serviceRequestSpcs.spcs_type_2[0];
     }
+    this.showItem = true;
   },
 };
 </script>
diff --git a/src/components/service-list/service_shop_menu_copy.vue b/src/components/service-list/service_shop_menu_copy.vue
new file mode 100644
index 0000000000000000000000000000000000000000..85fcbb17607997ab987e398faa6373ca9938e278
--- /dev/null
+++ b/src/components/service-list/service_shop_menu_copy.vue
@@ -0,0 +1,152 @@
+<template>
+  <div class="service_shop_menu">
+    <ul class="service_shop_menu_list">
+      <li v-for="(item, index) in menuList" :key="index" @click="active(item.visit_url)">
+        <img
+          v-if="item.visit_url == actives"
+          :src="item.active != '' ? require('@/assets/imgs/' + item.active + '.png') : ''"
+          class="menu_img"
+        />
+        <img v-else :src="require('@/assets/imgs/' + item.default + '.png')" class="menu_img" />
+        <span
+          :class="item.visit_url == actives ? 'menu_item_active':'menu_item'"
+        >{{ item.menu_name }}</span>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {},
+  data() {
+    return {
+      actives: "",
+      menuList: [],
+    };
+  },
+  computed: {
+    getActive() {
+      return this.$store.state.serviceShopMenu;
+    },
+  },
+  watch: {
+    getActive(newVal) {
+      this.getActiveMenu(newVal);
+    },
+  },
+  mounted() {
+    this.getShopMenu();
+    this.$store.commit("serviceShopMenuAct", this.$route.path);
+    this.actives = this.$store.state.serviceShopMenu;
+  },
+  methods: {
+    active(val) {
+      this.$store.commit("serviceShopMenuAct", val);
+      this.$router.push(val);
+    },
+    getActiveMenu(val) {
+      this.actives = val;
+    },
+    getShopMenu() {
+      this.$api.general.getNowMenu({ teamName: "APAAS3" }).then((response) => {
+        if (response.data.success == 1) {
+          let arr = response.data.data[0].Child;
+          let shopArr = [];
+          let asd = arr.find(item => {
+            return item.visit_url == "/services_shop"
+          })
+          shopArr = asd.Child;
+          if (shopArr && shopArr.length != 0) {
+            Array.from(shopArr).forEach((item) => {
+            let uri = item.visit_url.substring(6);
+            if (uri.indexOf("/") != -1) {
+              uri = uri.substring(0, uri.indexOf("/"));
+            }
+            switch (uri) {
+              case "data_service_list":
+                item.active = "shop_tool_ic_sjfw_sel";
+                item.default = "shop_tool_ic_sjfw";
+                break;
+              case "space_time_service_list":
+                item.active = "shop_tool_ic_skfw_sel";
+                item.default = "shop_tool_ic_skfw";
+                break;
+              case "video_service_list":
+                item.active = "shop_tool_ic_spfw_sel";
+                item.default = "shop_tool_ic_spfw";
+                break;
+              case "perception_service_list":
+                item.active = "shop_tool_ic_ganzhifw_sel";
+                item.default = "shop_tool_ic_ganzhifw";
+                break;
+              case "comprehensive_app_list":
+                item.active = "shop_tool_ic_zhyyfw_sel";
+                item.default = "shop_tool_ic_zhyyfw";
+                break;
+              case "cloud":
+                item.active = "shop_tool_ic_yzyfw_sel";
+                item.default = "shop_tool_ic_yzyfw";
+                break;
+              case "app_store_list":
+                item.active = "shop_ic_yysd_sel";
+                item.default = "shop_ic_yysd";
+                break;
+              default:
+                item.active = "1";
+                item.default = "1";
+                break;
+            }
+          });
+          }
+          this.menuList = shopArr;
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style scoped>
+.service_shop_menu {
+  background-color: #0d1847;
+  position: fixed;
+  top: 76px;
+  left: calc(50% - 600px);
+  width: 180px;
+  padding: 8px;
+	background-color: #ffffff;
+	box-shadow: 0px 3px 6px 0px 
+		rgba(15, 19, 65, 0.04);
+	border-radius: 8px;
+}
+.service_shop_menu_list > li {
+  padding: 16px 10px 8px 22px;
+  font-size: 15px;
+  line-height: 24px;
+  cursor: pointer;
+}
+.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;
+  margin-right: 6px;
+}
+.menu_item {
+  position: relative;
+  font-weight: bold;
+  font-size: 15px;
+  color: #96a0c5;
+  top: -6px;
+}
+.menu_item_active {
+  position: relative;
+  font-weight: bold;
+  font-size: 15px;
+  color: #515fe7;
+  top: -6px;
+}
+</style>
diff --git a/src/components/shop-cloud/shop-cloud.vue b/src/components/shop-cloud/shop-cloud.vue
index 0f3ef5049a778470e298e39989e99dcd595b3a3e..8fa0e6a6a83b54fb17b35dce46a19b3de279c4af 100644
--- a/src/components/shop-cloud/shop-cloud.vue
+++ b/src/components/shop-cloud/shop-cloud.vue
@@ -1062,11 +1062,13 @@ export default {
               let priceObj = this.cpu_memory.find((item) => {
                 return item.cpu == 8 && item.memory == 16;
               });
+              this.eci_single_money = Number(priceObj.price);
               sumCM += Number(priceObj.price);
             } else if (this.formNew.memory == "32") {
               let priceObj = this.cpu_memory.find((item) => {
                 return item.cpu == 8 && item.memory == 32;
               });
+              this.eci_single_money = Number(priceObj.price);
               sumCM += Number(priceObj.price);
             }
           } else if (this.formNew.cpu == "16") {
@@ -1074,11 +1076,13 @@ export default {
               let priceObj = this.cpu_memory.find((item) => {
                 return item.cpu == 16 && item.memory == 32;
               });
+              this.eci_single_money = Number(priceObj.price);
               sumCM += Number(priceObj.price);
             } else if (this.formNew.memory == "64") {
               let priceObj = this.cpu_memory.find((item) => {
                 return item.cpu == 16 && item.memory == 64;
               });
+              this.eci_single_money = Number(priceObj.price);
               sumCM += Number(priceObj.price);
             }
           }
@@ -1090,6 +1094,7 @@ export default {
           this.formNew.appDuration >= 1
         ) {
           if (this.hard_disk && this.hard_disk.length != 0) {
+            this.disk_single_money = Number(this.hard_disk[0].price);
             sumDisk +=
               Number(this.formNew.dataDisk) *
               Number(this.formNew.perDataDisk) *
@@ -1126,11 +1131,13 @@ export default {
               let priceObj = this.cpu_memory.find((item) => {
                 return item.cpu == 8 && item.memory == 16;
               });
+              this.eci_single_money = Number(priceObj.price);
               sumCM += Number(priceObj.price);
             } else if (this.formOld.memory == "32") {
               let priceObj = this.cpu_memory.find((item) => {
                 return item.cpu == 8 && item.memory == 32;
               });
+              this.eci_single_money = Number(priceObj.price);
               sumCM += Number(priceObj.price);
             }
           } else if (this.formOld.cpu == "16") {
@@ -1138,11 +1145,13 @@ export default {
               let priceObj = this.cpu_memory.find((item) => {
                 return item.cpu == 16 && item.memory == 32;
               });
+              this.eci_single_money = Number(priceObj.price);
               sumCM += Number(priceObj.price);
             } else if (this.formOld.memory == "64") {
               let priceObj = this.cpu_memory.find((item) => {
                 return item.cpu == 16 && item.memory == 64;
               });
+              this.eci_single_money = Number(priceObj.price);
               sumCM += Number(priceObj.price);
             }
           }
@@ -1154,6 +1163,7 @@ export default {
           this.formOld.appDuration >= 1
         ) {
           if (this.hard_disk && this.hard_disk.length != 0) {
+            this.disk_single_money = Number(this.hard_disk[0].price);
             sumDisk +=
               Number(this.formOld.dataDisk) *
               Number(this.formOld.perDataDisk) *
diff --git a/src/pages/data-analysis/my-service.vue b/src/pages/data-analysis/my-service.vue
index 0c4afee2900dd677f7c0aa1625582748b376d7bf..da4307e274c4e5b905ce397e9ec5419b13f167a4 100644
--- a/src/pages/data-analysis/my-service.vue
+++ b/src/pages/data-analysis/my-service.vue
@@ -2,14 +2,10 @@
   <div>
     <el-breadcrumb separator="/" class="bread_crumb1">
       <el-breadcrumb-item :to="{ path: '/data_analysis' }">
-        {{
-        $t("lang.data_analysis")
-        }}
+        {{ $t("lang.data_analysis") }}
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        {{
-        $t("lang.service_data_analysis")
-        }}
+        {{ $t("lang.service_data_analysis") }}
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-row v-if="is_general_user" class="in_analysis">
@@ -17,14 +13,26 @@
       <el-col :span="6" class="in_left">
         <el-row>
           <el-col :span="24" class="in_block">
-            <block-radius :show_header="true" title="服务总体概况" class="block">
+            <block-radius
+              :show_header="true"
+              title="服务总体概况"
+              class="block"
+            >
               <div class="left_1">
                 <div ref="left_1_l" class="left_1_l">
-                  <img :src="require('@/assets/imgs/data_img_service.gif')" class="left_1_img" />
+                  <img
+                    :src="require('@/assets/imgs/data_img_service.gif')"
+                    class="left_1_img"
+                  />
                   <div class="left_1_title">服务总数</div>
                   <div class="left_1_num">{{ overview.serviceTotal }}</div>
                 </div>
-                <dashboard ref="left_1_r" :data="das_data" :is_word="true" class="left_1_r"></dashboard>
+                <dashboard
+                  ref="left_1_r"
+                  :data="das_data"
+                  :is_word="true"
+                  class="left_1_r"
+                ></dashboard>
               </div>
             </block-radius>
           </el-col>
@@ -41,14 +49,14 @@
                 class="block-radius-content"
                 :data="mult_data_state"
                 :show_center_data="false"
-                :bar_width="10 "
+                :bar_width="10"
               ></multiple-circle>
               <starlist
                 v-else
                 class="block-radius-content"
                 :options="linelistData"
                 :show_star="false"
-                style="margin-top: 30px;height: calc(100% - 51px);"
+                style="margin-top: 30px; height: calc(100% - 51px)"
               ></starlist>
             </block-radius>
           </el-col>
@@ -60,7 +68,11 @@
               @changeButton="changeServiceTypeBtn"
               class="block"
             >
-              <multiple-circle class="block-radius-content" :data="mult_data" :text="text"></multiple-circle>
+              <multiple-circle
+                class="block-radius-content"
+                :data="mult_data"
+                :text="text"
+              ></multiple-circle>
             </block-radius>
           </el-col>
           <el-col :span="24" class="in_block">
@@ -84,7 +96,11 @@
             </block-radius>
           </el-col>
           <el-col :span="24" class="in_block">
-            <block-radius :show_header="true" title="服务热门搜索" class="block">
+            <block-radius
+              :show_header="true"
+              title="服务热门搜索"
+              class="block"
+            >
               <div class="block-radius-content service-hot-search">
                 <div class="left-content">
                   <div class="hot-line">
@@ -92,20 +108,36 @@
                     <div class="hot-line-chart">
                       <!-- 折线图 -->
                       <p class="sparkline-text">
-                        <span>{{sparkline1.num}}</span>
+                        <span>{{ sparkline1.num }}</span>
                         <span
-                          :style="sparkline1.up>0?{backgroundColor:'#e7fdfc',color:'#25bdb1'}:{backgroundColor:'#fbe8e8',color:'#e15260'}"
+                          :style="
+                            sparkline1.up > 0
+                              ? { backgroundColor: '#e7fdfc', color: '#25bdb1' }
+                              : { backgroundColor: '#fbe8e8', color: '#e15260' }
+                          "
                         >
-                          {{sparkline1.up>0?sparkline1.up:0-sparkline1.up}}%
+                          {{
+                            sparkline1.up > 0
+                              ? sparkline1.up
+                              : 0 - sparkline1.up
+                          }}%
                           <img
-                            v-if="sparkline1.up>0"
+                            v-if="sparkline1.up > 0"
                             src="../../assets/imgs/icon_up.png"
                             alt
                           />
-                          <img v-if="sparkline1.up<0" src="../../assets/imgs/icon_down.png" alt />
+                          <img
+                            v-if="sparkline1.up < 0"
+                            src="../../assets/imgs/icon_down.png"
+                            alt
+                          />
                         </span>
                       </p>
-                      <sparkline :indicatorStyles="spIndicatorStyles1" width="220" height="42">
+                      <sparkline
+                        :indicatorStyles="spIndicatorStyles1"
+                        width="220"
+                        height="42"
+                      >
                         <sparklineCurve
                           :refLineStyles="spRefLineStyles3"
                           :refLineType="false"
@@ -121,20 +153,36 @@
                     <div class="hot-line-chart">
                       <!-- 折线图 -->
                       <p class="sparkline-text sparkline-text-user">
-                        <span>{{sparkline2.num}}</span>
+                        <span>{{ sparkline2.num }}</span>
                         <span
-                          :style="sparkline2.up>0?{backgroundColor:'#e7fdfc',color:'#25bdb1'}:{backgroundColor:'#fbe8e8',color:'#e15260'}"
+                          :style="
+                            sparkline2.up > 0
+                              ? { backgroundColor: '#e7fdfc', color: '#25bdb1' }
+                              : { backgroundColor: '#fbe8e8', color: '#e15260' }
+                          "
                         >
-                          {{sparkline2.up>0?sparkline2.up:0-sparkline2.up}}%
+                          {{
+                            sparkline2.up > 0
+                              ? sparkline2.up
+                              : 0 - sparkline2.up
+                          }}%
                           <img
-                            v-if="sparkline2.up>0"
+                            v-if="sparkline2.up > 0"
                             src="../../assets/imgs/icon_up.png"
                             alt
                           />
-                          <img v-if="sparkline2.up<0" src="../../assets/imgs/icon_down.png" alt />
+                          <img
+                            v-if="sparkline2.up < 0"
+                            src="../../assets/imgs/icon_down.png"
+                            alt
+                          />
                         </span>
                       </p>
-                      <sparkline :indicatorStyles="spIndicatorStyles1" width="220" height="42">
+                      <sparkline
+                        :indicatorStyles="spIndicatorStyles1"
+                        width="220"
+                        height="42"
+                      >
                         <sparklineCurve
                           :refLineStyles="spRefLineStyles3"
                           :refLineType="false"
@@ -165,7 +213,10 @@
               :buttons_arr="['近14天', '近30天']"
               @changeButton="changeServeiceTotalChangeBtn"
             >
-              <line-chart class="block-radius-content" :data="line_data"></line-chart>
+              <line-chart
+                class="block-radius-content"
+                :data="line_data"
+              ></line-chart>
             </block-radius>
           </el-col>
         </el-row>
@@ -206,9 +257,18 @@
               @changeButton="changeOpenessBtnindex"
               class="block"
             >
-              <single-circle class="block-radius-content single-charts" :data="single_data"></single-circle>
-              <single-circle class="block-radius-content single-charts" :data="single_data1"></single-circle>
-              <single-circle class="block-radius-content single-charts" :data="single_data2"></single-circle>
+              <single-circle
+                class="block-radius-content single-charts"
+                :data="single_data"
+              ></single-circle>
+              <single-circle
+                class="block-radius-content single-charts"
+                :data="single_data1"
+              ></single-circle>
+              <single-circle
+                class="block-radius-content single-charts"
+                :data="single_data2"
+              ></single-circle>
             </block-radius>
           </el-col>
           <el-col :span="24" class="in_block">
@@ -229,7 +289,7 @@
                 class="block-radius-content"
                 :options="starlistData"
                 :total="starlistTotal"
-                style="margin-top: 30px;height: calc(100% - 51px);"
+                style="margin-top: 30px; height: calc(100% - 51px)"
               ></starlist>
             </block-radius>
           </el-col>
@@ -237,13 +297,24 @@
       </el-col>
       <!-- 不可横向铺满，一般为最后一行 -->
       <el-col :span="6" class="in_block">
-        <block-radius :show_header="true" title="服务来源机构分析" class="block">
-          <BarChart :data="bar_data_org" :x_router="30" :colors="['#e56600', '#e56600']" />
+        <block-radius
+          :show_header="true"
+          title="服务来源机构分析"
+          class="block"
+        >
+          <BarChart
+            :data="bar_data_org"
+            :x_router="30"
+            :colors="['#e56600', '#e56600']"
+          />
         </block-radius>
       </el-col>
       <el-col :span="18" class="in_block default">
         <block-radius class="block">
-          <img :src="require('@/assets/imgs/data_img_default.gif')" class="default_img" />
+          <img
+            :src="require('@/assets/imgs/data_img_default.gif')"
+            class="default_img"
+          />
         </block-radius>
       </el-col>
     </el-row>
@@ -291,7 +362,12 @@ export default {
     right_2_state: 0,
     right_3_state: 0,
     last_id: 0,
-    mult_data_state: [],
+    mult_data_state: [
+      { name: "健康", value: 0 },
+      { name: "未使用", value: 0 },
+      { name: "故障", value: 0 },
+      { name: "警告", value: 0 },
+    ],
     mult_data: [],
     spIndicatorStyles1: false,
     spRefLineStyles3: {
@@ -547,7 +623,25 @@ export default {
     getServiceHealth() {
       this.$api.dataAnalysis.getServiceHealth().then((response) => {
         if (response.data.success == 1) {
-          this.mult_data_state = response.data.data.seriesData;
+          let data = response.data.data.seriesData;
+          let jk = data.find((item) => {
+            return item.name == "健康";
+          });
+          let wsy = data.find((item) => {
+            return item.name == "未使用";
+          });
+          let gz = data.find((item) => {
+            return item.name == "故障";
+          });
+          let jg = data.find((item) => {
+            return item.name == "警告";
+          });
+          this.mult_data_state = [
+            { name: "健康", value: jk.value },
+            { name: "未使用", value: wsy.value },
+            { name: "故障", value: gz.value },
+            { name: "警告", value: jg.value },
+          ];
         }
       });
     },
diff --git a/src/pages/data-analysis/org-service.vue b/src/pages/data-analysis/org-service.vue
index 404ed72fe44db56500a95f048a543a300e01a922..4726d33a53550388a38f4748cb12ab29e888a272 100644
--- a/src/pages/data-analysis/org-service.vue
+++ b/src/pages/data-analysis/org-service.vue
@@ -315,10 +315,10 @@ export default {
     right_3_state: 0,
     last_id: 0,
     mult_data_state: [
-      { name: "正常", value: 0 },
-      { name: "警告", value: 0 },
-      { name: "错误", value: 0 },
+      { name: "健康", value: 0 },
       { name: "未使用", value: 0 },
+      { name: "故障", value: 0 },
+      { name: "警告", value: 0 },
     ],
     mult_data: [
       { name: "数据服务", value: 0 },
@@ -535,7 +535,25 @@ export default {
     getServiceHealth() {
       this.$api.dataAnalysis.getServiceHealth().then((response) => {
         if (response.data.success == 1) {
-          this.mult_data_state = response.data.data.seriesData;
+          let data = response.data.data.seriesData;
+          let jk = data.find((item) => {
+            return item.name == "健康";
+          });
+          let wsy = data.find((item) => {
+            return item.name == "未使用";
+          });
+          let gz = data.find((item) => {
+            return item.name == "故障";
+          });
+          let jg = data.find((item) => {
+            return item.name == "警告";
+          });
+          this.mult_data_state = [
+            { name: "健康", value: jk.value },
+            { name: "未使用", value: wsy.value },
+            { name: "故障", value: gz.value },
+            { name: "警告", value: jg.value },
+          ];
         }
       });
     },
diff --git a/src/pages/data-analysis/super-service.vue b/src/pages/data-analysis/super-service.vue
index eeb050685305410bdf3bfb78a925319d31cbf3c4..111a25dc385f821dc529e5dc8f1dfbb45dc84c13 100644
--- a/src/pages/data-analysis/super-service.vue
+++ b/src/pages/data-analysis/super-service.vue
@@ -309,10 +309,10 @@ export default {
     right_3_state: 0,
     last_id: 0,
     mult_data_state: [
-      { name: "正常", value: 0 },
-      { name: "警告", value: 0 },
-      { name: "错误", value: 0 },
+      { name: "健康", value: 0 },
       { name: "未使用", value: 0 },
+      { name: "故障", value: 0 },
+      { name: "警告", value: 0 },
     ],
     mult_data: [
       { name: "数据服务", value: 0 },
@@ -529,7 +529,25 @@ export default {
     getServiceHealth() {
       this.$api.dataAnalysis.getServiceHealth().then((response) => {
         if (response.data.success == 1) {
-          this.mult_data_state = response.data.data.seriesData;
+          let data = response.data.data.seriesData;
+          let jk = data.find((item) => {
+            return item.name == "健康";
+          });
+          let wsy = data.find((item) => {
+            return item.name == "未使用";
+          });
+          let gz = data.find((item) => {
+            return item.name == "故障";
+          });
+          let jg = data.find((item) => {
+            return item.name == "警告";
+          });
+          this.mult_data_state = [
+            { name: "健康", value: jk.value },
+            { name: "未使用", value: wsy.value },
+            { name: "故障", value: gz.value },
+            { name: "警告", value: jg.value },
+          ];
         }
       });
     },
diff --git a/src/pages/service_shop/gzfwDetail.vue b/src/pages/service_shop/gzfwDetail.vue
index 38c4a0c6d96afc1996f5d65e3e3dd037bc7bcbfe..7097cd811d44f47ab4099700ba407b2ea12ae73b 100644
--- a/src/pages/service_shop/gzfwDetail.vue
+++ b/src/pages/service_shop/gzfwDetail.vue
@@ -4,7 +4,7 @@
       <el-breadcrumb separator="/">
         <el-breadcrumb-item to="/shop">服务超市</el-breadcrumb-item>
         <el-breadcrumb-item to="/shop/data_service_list/5">
-          数据服务
+          感知服务
         </el-breadcrumb-item>
         <el-breadcrumb-item>服务详情信息</el-breadcrumb-item>
       </el-breadcrumb>
@@ -14,7 +14,6 @@
 
     <service-tabs
       :detail-data="detailData"
-      :specification-data="specificationData"
       :provider-data="providerData"
       :comments-data="commentsData"
       :comments-url="commentsUrl"
@@ -34,7 +33,6 @@ export default {
   data: () => ({
     baseInfo: null,
     detailData: null,
-    specificationData: null,
     providerData: null,
     commentsData: null,
   }),
@@ -56,18 +54,6 @@ export default {
         })
         .then(({ data }) => {
           let datas = data.data;
-          let specificationData =
-            (datas.serviceRequestSpcs &&
-              datas.serviceRequestSpcs.map((item) => ({
-                id: item.id,
-                type: item.type,
-                pv: item.pv,
-                count: item.count,
-                name: `访问次数：${item.pv}次/日 访问量：${item.count}次/日`,
-                descript: item.des,
-              }))) ||
-            [];
-
           this.baseInfo = {
             service_id: this.id,
             app_id: 0,
@@ -87,7 +73,7 @@ export default {
               datas.data_service_type3_name,
             ],
             descript: datas.descript,
-            serviceRequestSpcs: specificationData,
+            serviceRequestSpcs: datas.serviceRequestSpcs,
             scoreDetail: datas.scoreDetail,
             month_sale: data.month_sale,
           };
@@ -186,7 +172,6 @@ export default {
               },
             },
           ];
-          this.specificationData = specificationData;
           this.providerData = {
             organization_name: datas.organization_name,
             picture_path: datas.organization_picture,
diff --git a/src/pages/service_shop/shop_list.vue b/src/pages/service_shop/shop_list.vue
index 06b951e9b055e89f8a453f105c7fcaad7343c586..b1132acabc1e0b060a978b7fca4b6801faf00433 100644
--- a/src/pages/service_shop/shop_list.vue
+++ b/src/pages/service_shop/shop_list.vue
@@ -1,4 +1,5 @@
 <template>
+  <!-- <div class="shop_list_cont"> -->
   <div>
     <el-container>
       <el-aside width="180px">
@@ -55,7 +56,7 @@ export default {
         case "video_service_list":
           this.name = "视频服务";
           this.urlFilter = "7";
-          this.url = "";
+          this.url = "/shop/spfwDetail";
           this.filterNames = ["", "服务领域", "服务来源组织"];
           break;
         case "perception_service_list":
@@ -123,4 +124,9 @@ export default {
   background: url("~@/assets/imgs/img_default_quesheng.png") no-repeat center
     center;
 }
+.shop_list_cont {
+  width: 1200px;
+  margin: 0 auto;
+  position: relative;
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/service_shop/skfwDetail.vue b/src/pages/service_shop/skfwDetail.vue
index ead5ccfa65646d466962ebb4bf13e991b331128e..b83905f7bb0def015d43e4ba171a200ffbe34d28 100644
--- a/src/pages/service_shop/skfwDetail.vue
+++ b/src/pages/service_shop/skfwDetail.vue
@@ -14,7 +14,6 @@
 
     <service-tabs
       :detail-data="detailData"
-      :specification-data="specificationData"
       :provider-data="providerData"
       :comments-data="commentsData"
       :comments-url="commentsUrl"
@@ -34,7 +33,6 @@ export default {
   data: () => ({
     baseInfo: null,
     detailData: null,
-    specificationData: null,
     providerData: null,
     commentsData: null,
   }),
@@ -61,17 +59,6 @@ export default {
         })
         .then(({ data }) => {
           let datas = data.data;
-          let specificationData =
-            (datas.serviceRequestSpcs &&
-              datas.serviceRequestSpcs.map((item) => ({
-                id: item.id,
-                type: item.type,
-                pv: item.pv,
-                count: item.count,
-                name: `访问次数：${item.pv}次/日 访问量：${item.count}次/日`,
-                descript: item.des,
-              }))) ||
-            [];
 
           this.baseInfo = {
             portal_id: datas.portal_id || "", // 时空服务id
@@ -93,9 +80,9 @@ export default {
               datas.data_service_type3_name,
             ],
             descript: datas.descript,
-            serviceRequestSpcs: specificationData,
             scoreDetail: datas.scoreDetail,
             month_sale: data.month_sale,
+            serviceRequestSpcs: datas.serviceRequestSpcs,
           };
 
           this.detailData = [
@@ -145,7 +132,6 @@ export default {
               ],
             }, */
           ];
-          this.specificationData = specificationData;
           this.providerData = {
             organization_name: datas.organization_name,
             picture_path: datas.organization_picture,
diff --git a/src/pages/service_shop/spfwDetail.vue b/src/pages/service_shop/spfwDetail.vue
new file mode 100644
index 0000000000000000000000000000000000000000..363d2489cf311f96e03b454f2af8d0218216f974
--- /dev/null
+++ b/src/pages/service_shop/spfwDetail.vue
@@ -0,0 +1,210 @@
+<template>
+  <div class="sevice_detail">
+    <div class="apass_breadcrumb">
+      <el-breadcrumb separator="/">
+        <el-breadcrumb-item to="/shop">服务超市</el-breadcrumb-item>
+        <el-breadcrumb-item to="/shop/data_service_list/5">
+          视频服务
+        </el-breadcrumb-item>
+        <el-breadcrumb-item>服务详情信息</el-breadcrumb-item>
+      </el-breadcrumb>
+    </div>
+
+    <service-info :data="baseInfo" v-if="baseInfo"></service-info>
+
+    <service-tabs
+      :detail-data="detailData"
+      :provider-data="providerData"
+      :comments-data="commentsData"
+      :comments-url="commentsUrl"
+    ></service-tabs>
+  </div>
+</template>
+
+<script>
+import serviceInfo from "@/components/service-info/service-info";
+import serviceTabs from "@/components/service-tabs/service-tabs";
+
+export default {
+  components: {
+    serviceInfo,
+    serviceTabs,
+  },
+  data: () => ({
+    baseInfo: null,
+    detailData: null,
+    providerData: null,
+    commentsData: null,
+  }),
+  computed: {
+    id() {
+      return this.$route.params.id;
+    },
+    commentsUrl() {
+      return `/apaas/serviceapp/v3/servicemarket/estimates?serviceId=${this.id}`;
+    },
+  },
+  methods: {
+    init() {
+      this.$http
+        .get("/apaas/serviceapp/v3/servicemarket/detail", {
+          params: {
+            serviceId: this.id,
+          },
+        })
+        .then(({ data }) => {
+          let datas = data.data;
+          this.baseInfo = {
+            service_id: this.id,
+            app_id: 0,
+            name: datas.name,
+            // type: "",
+            openness: datas.openness,
+            view_count: datas.view_count,
+            apply_count: datas.apply_count,
+            cover: datas.cover,
+            organization_name: datas.organization_name,
+            create_time: datas.create_time,
+            update_date: datas.update_date,
+            sectors_name: datas.sectors_name,
+            data_service_type: [
+              datas.data_service_type1_name,
+              datas.data_service_type2_name,
+              datas.data_service_type3_name,
+            ],
+            descript: datas.descript,
+            serviceRequestSpcs: datas.serviceRequestSpcs,
+            scoreDetail: datas.scoreDetail,
+            month_sale: data.month_sale,
+          };
+
+          this.detailData = [
+            {
+              name: "获取流程",
+              type: "step",
+              value: ["服务申请", "信息填写", "审核确认", "服务获取"],
+            },
+            {
+              name: "服务描述",
+              type: "text",
+              value: datas.descript,
+            },
+            {
+              name: "请求方式",
+              type: "text",
+              value: ["-", "GET", "POST", "PUT", "DELETE"][datas.req_type || 0],
+            },
+            {
+              name: "编码格式",
+              type: "text",
+              value: datas.encode_method,
+            },
+            {
+              name: "请求参数",
+              type: "table",
+              value: {
+                datas: this.getTableData(datas.req_fields),
+                columns: [
+                  {
+                    prop: "name",
+                    label: "字段编码",
+                    width: 240,
+                  },
+                  {
+                    prop: "label",
+                    label: "字段名称",
+                    align: "center",
+                    width: 180,
+                  },
+                  {
+                    prop: "field_type",
+                    label: "字段类型",
+                    align: "center",
+                    width: 180,
+                  },
+                  {
+                    prop: "descript",
+                    label: "字段说明",
+                  },
+                  {
+                    prop: "is_must",
+                    label: "是否必须",
+                    align: "center",
+                    width: 180,
+                  },
+                  {
+                    prop: "example",
+                    label: "示例值",
+                    align: "center",
+                    width: 180,
+                  },
+                ],
+              },
+            },
+            {
+              name: "响应参数",
+              type: "table",
+              value: {
+                datas: this.getTableData(datas.res_fields),
+                columns: [
+                  {
+                    prop: "name",
+                    label: "字段编码",
+                    width: 240,
+                  },
+                  {
+                    prop: "label",
+                    label: "字段名称",
+                    align: "center",
+                    width: 180,
+                  },
+                  {
+                    prop: "field_type",
+                    label: "字段类型",
+                    align: "center",
+                    width: 180,
+                  },
+                  {
+                    prop: "descript",
+                    label: "字段说明",
+                  },
+                ],
+              },
+            },
+          ];
+          this.providerData = {
+            organization_name: datas.organization_name,
+            picture_path: datas.organization_picture,
+            user_name: datas.register_user_info.user_name,
+            phone: datas.register_user_info.phone,
+          };
+          this.commentsData = datas.scoreDetail;
+        })
+        .catch(function(error) {
+          console.log(error);
+        });
+    },
+    getTableData(tableStr) {
+      let tabledata = (tableStr && JSON.parse(tableStr)) || [];
+      let addRowId = (data, baseId = "") => {
+        data.forEach((item, index) => {
+          let rowId = baseId + (index + 1) + "";
+
+          item.rowId = rowId;
+
+          if (item.children && item.children.length) {
+            addRowId(item.children, rowId);
+          }
+        });
+      };
+
+      addRowId(tabledata);
+
+      return tabledata;
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
diff --git a/src/pages/service_shop/zhfwDetail.vue b/src/pages/service_shop/zhfwDetail.vue
index dc0a036846e346b9765971399a98034ce4502e63..575ada852fc7401543780479c1ebbbe3823f249a 100644
--- a/src/pages/service_shop/zhfwDetail.vue
+++ b/src/pages/service_shop/zhfwDetail.vue
@@ -14,7 +14,6 @@
 
     <service-tabs
       :detail-data="detailData"
-      :specification-data="specificationData"
       :provider-data="providerData"
       :comments-data="commentsData"
       :comments-url="commentsUrl"
@@ -34,7 +33,6 @@ export default {
   data: () => ({
     baseInfo: null,
     detailData: null,
-    specificationData: null,
     providerData: null,
     commentsData: null,
   }),
@@ -56,18 +54,6 @@ export default {
         })
         .then(({ data }) => {
           let datas = data.data;
-          let specificationData =
-            (datas.serviceRequestSpcs &&
-              datas.serviceRequestSpcs.map((item) => ({
-                id: item.id,
-                type: item.type,
-                pv: item.pv,
-                count: item.count,
-                name: `访问次数：${item.pv}次/日 访问量：${item.count}次/日`,
-                descript: item.des,
-              }))) ||
-            [];
-
           this.baseInfo = {
             service_id: this.id,
             app_id: 0,
@@ -88,7 +74,7 @@ export default {
               datas.data_service_type3_name,
             ],
             descript: datas.descript,
-            serviceRequestSpcs: specificationData,
+            serviceRequestSpcs: datas.serviceRequestSpcs,
             scoreDetail: datas.scoreDetail,
             month_sale: data.month_sale,
           };
@@ -141,7 +127,6 @@ export default {
               value: datas.workflows_id,
             });
           }
-          this.specificationData = specificationData;
           this.providerData = {
             organization_name: datas.organization_name,
             picture_path: datas.organization_picture,
diff --git a/src/pages/user/questions-answers/community.vue b/src/pages/user/questions-answers/community.vue
index 56e0c27453638fa09052bdb550c5f84562712c1d..b8cba5218cc4e166b6776c58b65276ac278e6177 100644
--- a/src/pages/user/questions-answers/community.vue
+++ b/src/pages/user/questions-answers/community.vue
@@ -226,12 +226,19 @@ export default {
       this.diaDel = true;
     },
     getQList() {
+      console.log(this.search_date);
       let query = {
         search: this.search_ask,
         style: 3,
         create_user: this.search_user,
-        start: this.search_date.length != 0 ? this.search_date[0] : "",
-        end: this.search_date.length != 0 ? this.search_date[1] : "",
+        start:
+          this.search_date && this.search_date.length != 0
+            ? this.search_date[0]
+            : "",
+        end:
+          this.search_date && this.search_date.length != 0
+            ? this.search_date[1]
+            : "",
         limit: this.currentlimit,
         page: this.currentPage,
         order: "created",
@@ -244,12 +251,19 @@ export default {
       });
     },
     getAList() {
+      console.log(this.search_date);
       let query = {
         search: this.search_ask,
         style: 3,
         create_user: this.search_user,
-        start: this.search_date.length != 0 ? this.search_date[0] : "",
-        end: this.search_date.length != 0 ? this.search_date[1] : "",
+        start:
+          this.search_date && this.search_date.length != 0
+            ? this.search_date[0]
+            : "",
+        end:
+          this.search_date && this.search_date.length != 0
+            ? this.search_date[1]
+            : "",
         limit: this.currentlimit,
         page: this.currentPage,
       };
diff --git a/src/pages/workbench/fwgl/apply_service_detail.vue b/src/pages/workbench/fwgl/apply_service_detail.vue
index 13130d28abe90fa1ed8304a9e2b9490283df9442..d370dca1148afaf691045c59a4c062c2cb485abd 100644
--- a/src/pages/workbench/fwgl/apply_service_detail.vue
+++ b/src/pages/workbench/fwgl/apply_service_detail.vue
@@ -727,7 +727,7 @@ export default {
               : "#e15260"
           );
           
-          this.$set(this.service_header_arr["second"][0], "text", data.req_url);
+          this.$set(this.service_header_arr["second"][0], "text", data.service_apply_info.urls[0].req_url);
           this.$set(this.service_header_arr, "url", data.cover);
 
           //判断是否是服务注册出来的流程服务
diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue
index fa4f415ebc01a6c307a44cb068d6172638475b6e..269a5c6a016227be270a9e54059e23562a27f231 100644
--- a/src/pages/workbench/fwgl/serviceDetail.vue
+++ b/src/pages/workbench/fwgl/serviceDetail.vue
@@ -1146,7 +1146,7 @@ export default {
     },
     iconChange (val) {
       // el-select实际上是两层div包裹的input
-      this.port_select = val;
+      this.port_select_server = val;
       // 获取当前el-select标签第一层div
       const dom = this.$refs['select_icon'].$el;
       if(dom.children[0].children[0].tagName == 'SPAN'){
@@ -1308,7 +1308,7 @@ export default {
             this.$set(
               this.service_header_arr["second"][0],
               "text",
-              data.req_url
+              data.urls[0].req_url
             );
             this.$set(this.service_header_arr, "url", data.cover);
             if (this.now_user == 1) {
@@ -1466,6 +1466,7 @@ export default {
             e.time = '按月'
             e.descript = '每月不限调用次数'
           }
+          
         
       });
       this.size_arr_down = val;
@@ -1482,16 +1483,30 @@ export default {
           var temp = data.data||[]
           temp.forEach((e,idx) => {
               e.index = idx+1
+              // if(e.spcs_type==1){
+              //   e.gg = e.money+'/'+e.spcs_count
+              //   e.time = '不限时长'
+              //   e.pv = e.spcs_count
+              //   e.d_price = ''
+              // }else if(e.spcs_type==1){
+              //   e.gg = e.money+'/月'
+              //   e.time = '1个月'
+              //   e.pv = '不限次数'
+              //   e.d_price = '-'
+              // }
+
               if(e.spcs_type==1){
-                e.gg = e.money+'/'+e.spcs_count
+                e.gg = e.money+'金币/'+e.spcs_count+'次'
                 e.time = '不限时长'
                 e.pv = e.spcs_count
-                e.d_price = ''
-              }else if(e.spcs_type==1){
-                e.gg = e.money+'/月'
+                e.d_price = e.money/e.spcs_count+'金币/次'
+                e.spcs_type_name = '计次收费'
+              }else if(e.spcs_type==2){
+                e.gg = e.money+'金币/月'
                 e.time = '1个月'
                 e.pv = '不限次数'
                 e.d_price = '-'
+                e.spcs_type_name = '计时收费'
               }
             });
           this.service_size_data = temp;
diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue
index 7c9dea7537ee48730713015e0bde461894e4bb0f..b7626cf4dee6ec944b0b348d1faa9b1b0838736f 100644
--- a/src/pages/workbench/fwzc_fwcs.vue
+++ b/src/pages/workbench/fwzc_fwcs.vue
@@ -636,8 +636,9 @@
                 "
                 class="next_one"
                 @click="nextOne"
-                >下一步</el-button
               >
+                下一步
+              </el-button>
             </div>
           </div>
         </block-radius>
@@ -719,20 +720,20 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item v-if="is_map != 0" class="btn_footer">
-              <el-button class="previous" @click="goBack('map')">{{
-                is_map == 1 ? "返回智能制图" : "返回Web应用程序"
-              }}</el-button>
-              <el-button class="registe" @click="registeMap"
-                >服务发布</el-button
-              >
+              <el-button class="previous" @click="goBack('map')">
+                {{ is_map == 1 ? "返回智能制图" : "返回Web应用程序" }}
+              </el-button>
+              <el-button class="registe" @click="registeMap">
+                服务发布
+              </el-button>
             </el-form-item>
             <el-form-item v-else-if="process_id != ''" class="btn_footer">
-              <el-button class="previous" @click="goBack('process')"
-                >返回流程管理</el-button
-              >
-              <el-button class="registe" @click="registeProcess"
-                >服务发布</el-button
-              >
+              <el-button class="previous" @click="goBack('process')">
+                返回流程管理
+              </el-button>
+              <el-button class="registe" @click="registeProcess">
+                服务发布
+              </el-button>
             </el-form-item>
             <el-form-item v-else class="btn_footer">
               <el-button class="previous" @click="previous">上一步</el-button>
@@ -1428,7 +1429,7 @@ export default {
     registePt() {
       this.$refs.form.validate((valid) => {
         if (valid) {
-          if (this.activeBtn == 3 && this.jkwds.length == 0) {
+          if ((this.activeBtn == 2 && this.jkwds.length == 0) || (this.activeBtn == 3 && this.jkwds.length == 0)) {
             this.$message.error("请上传接口文档");
           } else {
             if (this.cover.length != 0) {
@@ -1436,7 +1437,7 @@ export default {
               if (this.activeBtn == 1 && !this.is_portal) {
                 this.addPortalItem();
               } else {
-                if (this.activeBtn == 0 || this.activeBtn == 3) {
+                if (this.activeBtn == 0 || this.activeBtn == 2 || this.activeBtn == 3) {
                   contentType = this.sjfwQqt;
                 } else if (this.activeBtn == 4) {
                   if (this.activeZh == "1") {
diff --git a/src/pages/workbench/yygl/deploy_app_detail.vue b/src/pages/workbench/yygl/deploy_app_detail.vue
index d2ec1b6e0df99583356125c1458c3bcfcc2578c1..86672114c193515fb17d4d54d45340683d071d32 100644
--- a/src/pages/workbench/yygl/deploy_app_detail.vue
+++ b/src/pages/workbench/yygl/deploy_app_detail.vue
@@ -68,7 +68,7 @@
           </div>
 
           <!-- <div v-if="now_service == 1&&image_arr.length"> -->
-          <div v-if="now_service == 1">
+          <div v-show="now_service == 1">
             <p class="service_title">
               <span></span>应用概况
             </p>
@@ -107,75 +107,93 @@
             </div>
             <p class="service_title" style="margin-top:20px;">
               <span></span>微服务
+              <el-select v-model="now_micor_service" ref="select_icon" @change="iconChange" placeholder="请选择">
+                <el-option v-for="item in service_list_arr" :key="item.service" :label="item.service" :value="item.index">
+                  <span v-if="item.is_unhealth" :style="{display:'inline-block',marginRight:'8px',width:'36px',height:'18px',marginLeft:'-10px',borderRadius:'4px',backgroundColor:'#e15260',lineHeight:'18px',textAlign:'center'}">故障</span>
+                  <span v-else :style="{display:'inline-block',marginRight:'8px',width:'36px',height:'18px',borderRadius:'4px',marginLeft:'-10px',}"></span>
+                  {{item.service}}
+                </el-option>
+              </el-select>
             </p>
             <div style="overflow:hidden;height:700px;" class="limit-elscroll">
-              <el-scrollbar class="service_list">
+              <!-- <el-scrollbar class="service_list">
                 <div class="service_box" @click="change_micor(index)" :style="now_micor_service==index?{paddingLeft:'30px',borderLeft:'8px solid #515fe7',backgroundColor:'#fbfcfe'}:''" v-for="(item,index) in service_list_arr" :key="index+60000">{{item.service}}
                   <span v-if="item.is_unhealth" class="service_tips">故障</span>
                 </div>
-              </el-scrollbar>
+              </el-scrollbar> -->
+              <div class="service_type_ab">
+                <div v-for="item in mesh_options"  @click="mesh_value=item.value" :key="item.value" :style="mesh_value==item.value?{backgroundColor:'#515fe7',color:'#f4f7fc',}:''">
+                  {{item.label}}
+                </div>
+              </div>
               <div class="service_detail">
-                <nor-card title="服务概况" flag="true">
-                  <template>
-                    <div style="overflow:hidden;height:160px;padding-top:10px;">
-                      <div style="height:115px;padding-top:10px;" class="service_card_box">
-                        <p style="color: #707693;font-size: 16px;text-align:center;">服务状态</p>
+                <div class="service_title_card">
+                  <nor-card title="服务状态" class="service_card" bgc="#e4f4fb">
+                    <template>
+                      <div style="height:125px;padding-top:10px;">
                         <waveIcon :state="micor_state.state=='running'?'运行中':'停止'" style="margin:10px auto;"></waveIcon>
                         <p style="color: #58617a;font-size: 16px;text-align:center;">{{ micor_state.state=='running'?'运行中':'停止' }}</p>
                       </div>
-
-                      <div style="height:115px;" class="service_num service_card_box">
-                        <span style="color: #707693;font-size: 16px;text-align:center;margin-bottom:26px;display:inline-block;">服务平均响应时间</span>
+                    </template>
+                  </nor-card>
+                  <nor-card title="服务平均响应时间" class="service_card" bgc="#e4f4fb">
+                    <template>
+                      <div style="height:125px;padding-top:20px;" class="service_num">
                         <p>{{ micor_state.averageTime }}ms</p>
                         <p>最大响应时间：{{ micor_state.maxTime }}ms</p>
                       </div>
-
-                      <div style="height:115px;" class="service_num service_card_box">
-                        <span style="color: #707693;font-size: 16px;text-align:center;margin-bottom:26px;display:inline-block;">吞吐率</span>
+                    </template>
+                  </nor-card>
+                  <nor-card title="吞吐率" class="service_card" bgc="#e4f4fb">
+                    <template>
+                      <div style="height:125px;padding-top:20px;" class="service_num">
                         <p>{{ micor_state.averageTraffic }}dps</p>
                         <p>最大吞吐率：{{ micor_state.maxTraffic }}dps</p>
                       </div>
-
-                      <div style="height:115px;padding-top:30px;" class="service_num service_card_box">
-                        <span style="color: #707693;font-size: 16px;text-align:center;margin-bottom:26px;display:inline-block;">内存使用</span>
+                    </template>
+                  </nor-card>
+                  <nor-card title="内存使用" class="service_card" bgc="#e4f4fb">
+                    <template>
+                      <div style="height:125px;padding-top:40px;" class="service_num">
                         <p>{{ micor_state.memory }}MB</p>
                       </div>
+                    </template>
+                  </nor-card>
+                </div>
 
-                    </div>
-                  </template>
-                </nor-card>
-
-                <nor-card title="服务设置" flag="true" v-show="is_current_user">
-                  <div class="addimage">
+                <!-- <nor-card title="服务设置" flag="true" v-show="is_current_user"> -->
+                  <!-- <div class="addimage">
                     <el-select v-model="mesh_value" placeholder="请选择">
                       <el-option v-for="item in mesh_options" :key="item.value" :label="item.label" :value="item.value">
                       </el-option>
                     </el-select>
-                  </div>
-                  <p class="imagebox">
-                    <span @click="image_select = index;getImageInfo()" :style="
-                        image_select == index
-                          ? { backgroundColor: '#8390ee', color: '#f8f9fd' }
-                          : {}
-                      " v-for="(item, index) in image_arr" :key="index + 6000">{{ item.name }}</span>
-                  </p>
-                  <el-table :data="image_arr[index].data" v-for="(item, index) in image_arr" :key="index+7000" v-show="image_select == index" stripe height="376" style="width: 100%">
-                    <el-table-column prop="tag" align="center" label="版本号">
-                    </el-table-column>
-                    <el-table-column prop="date" align="center" label="在线日期">
-                    </el-table-column>
-                    <el-table-column label="操作" align="center" width="300">
-                      <template slot-scope="scope">
-                        <el-button @click="update(scope.row)" type="text" size="small" :disabled="up_flag" v-if="(!scope.row.subsets)&&scope.$index<Math.min(...now_image_version)">升级</el-button>
-                        <el-button @click="update(scope.row)" type="text" size="small" :disabled="up_flag" v-if="(!scope.row.subsets)&&scope.$index>Math.max(...now_image_version)">回滚</el-button>
-                        <el-button @click="together(scope.row)" type="text" size="small" :disabled="up_flag" v-if="(!scope.row.subsets)&&scope.$index<Math.min(...now_image_version)">蓝绿发布</el-button>
-                        <el-button type="text" size="small" :disabled="true" v-if="scope.row.subsets">当前版本</el-button>
-                        <el-button @click="delete_ver(scope.row)" style="color:#830f53;font-weight:600;" type="text" size="small" :disabled="up_flag" v-if="scope.row.subsets&&now_image_version.length>=2">删除</el-button>
-                      </template>
-                    </el-table-column>
+                  </div> -->
+                  <div v-show="is_current_user" class="tag_ox">
+                    <p class="imagebox">
+                      <span @click="image_select = index;getImageInfo()" :style="
+                          image_select == index
+                            ? { backgroundColor: '#8390ee', color: '#f8f9fd' }
+                            : {}
+                        " v-for="(item, index) in image_arr" :key="index + 6000">{{ item.name }}</span>
+                    </p>
+                    <el-table :data="image_arr[index].data" v-for="(item, index) in image_arr" :key="index+7000" v-show="image_select == index" stripe height="376" style="width: 100%">
+                      <el-table-column prop="tag" align="center" label="版本号">
+                      </el-table-column>
+                      <el-table-column prop="date" align="center" label="在线日期">
+                      </el-table-column>
+                      <el-table-column label="操作" align="center" width="300">
+                        <template slot-scope="scope">
+                          <el-button @click="update(scope.row)" type="text" size="small" :disabled="up_flag" v-if="(!scope.row.subsets)&&scope.$index<Math.min(...now_image_version)">升级</el-button>
+                          <el-button @click="update(scope.row)" type="text" size="small" :disabled="up_flag" v-if="(!scope.row.subsets)&&scope.$index>Math.max(...now_image_version)">回滚</el-button>
+                          <el-button @click="together(scope.row)" type="text" size="small" :disabled="up_flag" v-if="(!scope.row.subsets)&&scope.$index<Math.min(...now_image_version)">蓝绿发布</el-button>
+                          <el-button type="text" size="small" :disabled="true" v-if="scope.row.subsets">当前版本</el-button>
+                          <el-button @click="delete_ver(scope.row)" style="color:#830f53;font-weight:600;" type="text" size="small" :disabled="up_flag" v-if="scope.row.subsets&&now_image_version.length>=2">删除</el-button>
+                        </template>
+                      </el-table-column>
 
-                  </el-table>
-                </nor-card>
+                    </el-table>
+                  </div>
+                <!-- </nor-card> -->
               </div>
             </div>
           </div>
@@ -292,7 +310,7 @@ export default {
         memory: ""
       },
       public_flag: false,
-      now_micor_service: 0,
+      now_micor_service: '',
       image_arr: [],
       area_arr: [],
       now_image_version: [],
@@ -499,6 +517,30 @@ export default {
   },
   mounted() {},
   methods: {
+    iconChange(val){
+      this.now_micor_service = val
+      // 获取当前el-select标签第一层div
+      const dom = this.$refs['select_icon'].$el;
+      if(dom.children[0].children[0].tagName == 'SPAN'){
+        dom.children[0].children[0].remove()
+      }
+      // 创建需要添加到其中的标签 并填充内容
+      const svgDom = document.createElement('span'); // ('<svg-icon ref="iconRef" icon-class="' + val + '" style="float: left;width: 3%;height: 30px;border: 1px solid #dcdfe6;border-right:none;" />');
+      svgDom.setAttribute('class', 'el-input__prefix');
+      if(this.service_list_arr[val].is_unhealth==0){
+        svgDom.innerHTML = '<span class="el-input__prefix-inner" style="margin-top:15px;margin-left:10px;display:inline-block;width:0px;height:18px;border-radius:4px;"></span>';
+      }else{
+        svgDom.innerHTML = '<span class="el-input__prefix-inner" style="margin-top:10px;margin-left:10px;display:inline-block;width:36px;color:#fff;height:18px;line-height:18px;border-radius:4px;background-color:#e15260;">故障</span>';
+      }
+      // 将创建的标签添加到父节点(第二层div)
+      dom.children[0].appendChild(svgDom);
+      // 得到el-select中的input标签
+      const inputDom = dom.children[0].children[0];
+      inputDom.setAttribute('style', 'padding-left: 60px;');
+      // 将添加的标签放到input前面
+      dom.children[0].insertBefore(svgDom, inputDom);
+      this.get_micro_service();
+    },
     get_service_arae() {
       this.$http
         .get("/apaas/service/v3/service/manager/servarea")
@@ -938,10 +980,20 @@ export default {
         .get(`/apaas/hubApi/market/services/${this.$route.params.deploy_id}`)
         .then(response => {
           if (response.data.success) {
-            this.service_list_arr = response.data.data;
-            if (this.service_list_arr && this.service_list_arr.length) {
-              this.get_micro_service();
-            }
+            var temp = []
+            response.data.data.forEach((e,idx) => {
+              temp.push({
+                ...e,
+                index:idx
+              })
+            });
+            this.service_list_arr = temp;
+            setTimeout(()=>{
+              this.iconChange(0)
+            },2000)
+            // if (this.service_list_arr && this.service_list_arr.length) {
+            //   this.get_micro_service();
+            // }
           }
         });
     }
@@ -1016,8 +1068,19 @@ export default {
 .addimage .el-input__icon {
   line-height: 28px;
 }
+.service_title .el-input__inner{
+  background-color: #f7f8f9;
+  height: 32px;
+  line-height: 32px;
+}
+.tag_ox .el-table thead{
+  color: #1a2236;
+}
 </style>
 <style scoped>
+.service_title .el-select{
+  margin-left: 10px;
+}
 .info_contain >>> .apass_dialog .el-dialog__footer {
   padding-top: 0;
 }
@@ -1189,6 +1252,7 @@ export default {
   overflow: hidden;
   margin-bottom: 20px;
   padding-left: 40px;
+  margin-top: 20px;
 }
 .imagebox span {
   height: 34px;
@@ -1244,7 +1308,8 @@ export default {
 .service_detail {
   float: left;
   height: 270px;
-  width: calc(100% - 425px);
+  width: 100%;
+  /* width: calc(100% - 425px); */
 }
 .service_card_box {
   float: left;
@@ -1265,4 +1330,25 @@ export default {
 .dialog-content .formname:nth-of-type(1) {
   margin-top: 0px;
 }
+.service_type_ab{
+  height: 48px;
+  width: 300px;
+  background-color: #f6f7fb;
+	border-radius: 8px;
+  overflow: hidden;
+  margin: 0px 0 10px 0px;
+  padding: 6px;
+  box-sizing: border-box;
+}
+.service_type_ab div{
+  float: left;
+  height: 36px;
+  width: 33.3%;
+  line-height: 36px;
+  text-align: center;
+  color: #58617a;
+  cursor: pointer;
+  font-weight: 600;
+  border-radius: 6px;
+}
 </style>
diff --git a/src/router/index.js b/src/router/index.js
index 51832ac1b039608558452a6dcf38669e770dbd65..f3425bee96bb05b40f21762aea45185b11265829 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -338,6 +338,16 @@ export default new Router({
           name: "skfwDetail",
           component: () => import("@/pages/service_shop/skfwDetail"),
         }, // 服务超市 - 时空服务详情
+        {
+          path: "/shop/spfwDetail/:id",
+          name: "spfwDetail",
+          component: () => import("@/pages/service_shop/spfwDetail"),
+        }, // 服务超市 - 视频服务详情
+        {
+          path: "/shop/gzfwDetail/:id",
+          name: "sjfwDetail",
+          component: () => import("@/pages/service_shop/gzfwDetail"),
+        }, // 服务超市 - 感知服务详情
         {
           path: "/shop/zhfwDetail/:id",
           name: "zhfwDetail",