diff --git a/src/components/service-list/commodity-card copy.vue b/src/components/service-list/commodity-card-new.vue
similarity index 100%
rename from src/components/service-list/commodity-card copy.vue
rename to src/components/service-list/commodity-card-new.vue
diff --git a/src/components/service-list/commodity-card.vue b/src/components/service-list/commodity-card-old.vue
similarity index 100%
rename from src/components/service-list/commodity-card.vue
rename to src/components/service-list/commodity-card-old.vue
diff --git a/src/components/service-list/commodity-cell copy.vue b/src/components/service-list/commodity-cell-new.vue
similarity index 100%
rename from src/components/service-list/commodity-cell copy.vue
rename to src/components/service-list/commodity-cell-new.vue
diff --git a/src/components/service-list/commodity-cell.vue b/src/components/service-list/commodity-cell-old.vue
similarity index 100%
rename from src/components/service-list/commodity-cell.vue
rename to src/components/service-list/commodity-cell-old.vue
diff --git a/src/components/service-list/commodity-list copy.vue b/src/components/service-list/commodity-list-new.vue
similarity index 99%
rename from src/components/service-list/commodity-list copy.vue
rename to src/components/service-list/commodity-list-new.vue
index e8238e6af0deedee2f0eef3bc01f7357ca8c1e3c..0cb511161c62ef73a0b93a404d7ee95788112197 100644
--- a/src/components/service-list/commodity-list copy.vue	
+++ b/src/components/service-list/commodity-list-new.vue
@@ -65,8 +65,8 @@
 </template>
 
 <script>
-import CommodityCell from "@/components/service-list/commodity-cell.vue";
-import CommodityCard from "@/components/service-list/commodity-card.vue";
+import CommodityCell from "@/components/service-list/commodity-cell-new.vue";
+import CommodityCard from "@/components/service-list/commodity-card-new.vue";
 export default {
   components: {
     "commodity-cell": CommodityCell,
diff --git a/src/components/service-list/commodity-list.vue b/src/components/service-list/commodity-list-old.vue
similarity index 100%
rename from src/components/service-list/commodity-list.vue
rename to src/components/service-list/commodity-list-old.vue
diff --git a/src/components/service-list/service_list copy.vue b/src/components/service-list/service_list-new.vue
similarity index 99%
rename from src/components/service-list/service_list copy.vue
rename to src/components/service-list/service_list-new.vue
index 3bf7b06393c3f7575cb9f38f506bbbc3106bd0bc..eaef673c07dbe8a34e5d6a000895fdb7846baa79 100644
--- a/src/components/service-list/service_list copy.vue	
+++ b/src/components/service-list/service_list-new.vue
@@ -210,7 +210,7 @@
 </template>
 
 <script>
-import CommodityList from "@/components/service-list/commodity-list.vue";
+import CommodityList from "@/components/service-list/commodity-list-new.vue";
 import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
diff --git a/src/components/service-list/service_list.vue b/src/components/service-list/service_list-old.vue
similarity index 99%
rename from src/components/service-list/service_list.vue
rename to src/components/service-list/service_list-old.vue
index 980050bb77484fc0f4310d111765c46b204db673..6f7a9b3633c2c686515c001bea9f4bf5f3999577 100644
--- a/src/components/service-list/service_list.vue
+++ b/src/components/service-list/service_list-old.vue
@@ -190,7 +190,7 @@
 </template>
 
 <script>
-import CommodityList from "@/components/service-list/commodity-list.vue";
+import CommodityList from "@/components/service-list/commodity-list-new.vue";
 import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
diff --git a/src/components/service-list/service_shop_menu_copy.vue b/src/components/service-list/service_shop_menu-new.vue
similarity index 100%
rename from src/components/service-list/service_shop_menu_copy.vue
rename to src/components/service-list/service_shop_menu-new.vue
diff --git a/src/components/service-list/service_shop_menu.vue b/src/components/service-list/service_shop_menu-old.vue
similarity index 100%
rename from src/components/service-list/service_shop_menu.vue
rename to src/components/service-list/service_shop_menu-old.vue
diff --git a/src/components/shop-cloud/shop-cloud copy.vue b/src/components/shop-cloud/shop-cloud-new.vue
similarity index 100%
rename from src/components/shop-cloud/shop-cloud copy.vue
rename to src/components/shop-cloud/shop-cloud-new.vue
diff --git a/src/components/shop-cloud/shop-cloud.vue b/src/components/shop-cloud/shop-cloud-old.vue
similarity index 100%
rename from src/components/shop-cloud/shop-cloud.vue
rename to src/components/shop-cloud/shop-cloud-old.vue
diff --git a/src/pages/example/example_com_list.vue b/src/pages/example/example_com_list.vue
index 32ece6592e24ef25f1cf554506a2fb3f1765ecec..9ed0b57e44aea5bcf9d5093141146210d998212c 100644
--- a/src/pages/example/example_com_list.vue
+++ b/src/pages/example/example_com_list.vue
@@ -9,7 +9,7 @@
 
 <script>
 // @ is an alias to /src
-import CommodityList from "@/components/service-list/commodity-list.vue";
+import CommodityList from "@/components/service-list/commodity-list-new.vue";
 import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
diff --git a/src/pages/service_shop/shop_cloud copy.vue b/src/pages/service_shop/shop_cloud-new.vue
similarity index 88%
rename from src/pages/service_shop/shop_cloud copy.vue
rename to src/pages/service_shop/shop_cloud-new.vue
index 3533b7fbb07eb723f28545e4e21bd6a101355295..d7ccfb1db842dfbb87f994fe601aaf839b6b01c6 100644
--- a/src/pages/service_shop/shop_cloud copy.vue	
+++ b/src/pages/service_shop/shop_cloud-new.vue
@@ -12,8 +12,8 @@
 </template>
 
 <script>
-import ServiceShopMenu from "@/components/service-list/service_shop_menu";
-import ShopCloud from "@/components/shop-cloud/shop-cloud";
+import ServiceShopMenu from "@/components/service-list/service_shop_menu-new";
+import ShopCloud from "@/components/shop-cloud/shop-cloud-new";
 export default {
   components: {
     ServiceShopMenu,
diff --git a/src/pages/service_shop/shop_cloud.vue b/src/pages/service_shop/shop_cloud-old.vue
similarity index 100%
rename from src/pages/service_shop/shop_cloud.vue
rename to src/pages/service_shop/shop_cloud-old.vue
diff --git a/src/pages/service_shop/shop_list copy.vue b/src/pages/service_shop/shop_list-new.vue
similarity index 97%
rename from src/pages/service_shop/shop_list copy.vue
rename to src/pages/service_shop/shop_list-new.vue
index c87d0ed1b3deb28afeb30a002e85408b0671f393..231364c4f3fbba042fe2dad0e148169a486aca9e 100644
--- a/src/pages/service_shop/shop_list copy.vue	
+++ b/src/pages/service_shop/shop_list-new.vue
@@ -17,8 +17,8 @@
 </template>
 
 <script>
-import ServiceShopMenu from "@/components/service-list/service_shop_menu";
-import ServiceList from "@/components/service-list/service_list";
+import ServiceShopMenu from "@/components/service-list/service_shop_menu-new";
+import ServiceList from "@/components/service-list/service_list-new";
 import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
diff --git a/src/pages/service_shop/shop_list.vue b/src/pages/service_shop/shop_list-old.vue
similarity index 100%
rename from src/pages/service_shop/shop_list.vue
rename to src/pages/service_shop/shop_list-old.vue
diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue
index 628801c74c33eb700bbe111444dc1434de7329c8..448b696ec6df9482a72cbbd0bc15c3671e9bf496 100644
--- a/src/pages/workbench/fwzc_fwcs.vue
+++ b/src/pages/workbench/fwzc_fwcs.vue
@@ -1004,6 +1004,7 @@ export default {
       gz_fhsjgs: "JSON",
       code_1_index: 0,
       code_2_index: 0,
+      user_id: "",
     };
   },
   computed: {},
@@ -1328,17 +1329,39 @@ export default {
       this.jkwds[0] = val[0].url;
     },
     getOrganization() {
-      let query = {
-        id: this.$store.state.userInfo.user_id,
-      };
-      this.$api.user.getUserDetail(query).then((request) => {
-        if (request.data.success == 1) {
-          this.form.origin = request.data.data.department;
-          this.oid = request.data.data.department_id;
-        } else {
-          console.log(response.data.errMsg);
-        }
-      });
+      if (this.$store.state.userInfo && this.$store.state.userInfo.user_id) {
+        let query = {
+          id: this.$store.state.userInfo.user_id,
+        };
+        this.$api.user.getUserDetail(query).then((request) => {
+          if (request.data.success == 1) {
+            this.form.origin = request.data.data.department;
+            this.oid = request.data.data.department_id;
+          } else {
+            console.log(response.data.errMsg);
+          }
+        });
+      } else {
+        let self = this;
+        self.$api.user.getNowUser().then(({ data }) => {
+          if (data.success == 1) {
+            self.$store.commit("userInfofun", data.data);
+            let query = {
+              id: self.$store.state.userInfo.user_id,
+            };
+            self.$api.user.getUserDetail(query).then((request) => {
+              if (request.data.success == 1) {
+                self.form.origin = request.data.data.department;
+                self.oid = request.data.data.department_id;
+              } else {
+                console.log(response.data.errMsg);
+              }
+            });
+          } else {
+            console.log(data.errMsg);
+          }
+        });
+      }
     },
     registeMap() {
       this.$refs.form.validate((valid) => {
diff --git a/src/router/index.js b/src/router/index.js
index 4f844dd0e1be681ff2a3e54cedbf284be8849111..283d1a5657cf2566e27528275df547c1208160a0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -281,32 +281,32 @@ export default new Router({
             {
               path: "/shop/data_service_list/:id", // 数据服务列表页
               name: "shopDataList",
-              component: () => import("@/pages/service_shop/shop_list"),
+              component: () => import("@/pages/service_shop/shop_list-new"),
             },
             {
               path: "/shop/space_time_service_list/:id", // 时空服务列表页
               name: "shopSpaceTimeList",
-              component: () => import("@/pages/service_shop/shop_list"),
+              component: () => import("@/pages/service_shop/shop_list-new"),
             },
             {
               path: "/shop/video_service_list/:id", // 视频服务列表页
               name: "shopVideoList",
-              component: () => import("@/pages/service_shop/shop_list"),
+              component: () => import("@/pages/service_shop/shop_list-new"),
             },
             {
               path: "/shop/perception_service_list/:id", // 感知服务列表页
               name: "shopPerceptionList",
-              component: () => import("@/pages/service_shop/shop_list"),
+              component: () => import("@/pages/service_shop/shop_list-new"),
             },
             {
               path: "/shop/comprehensive_app_list/:id", // 综合应用列表页
               name: "shopComAppList",
-              component: () => import("@/pages/service_shop/shop_list"),
+              component: () => import("@/pages/service_shop/shop_list-new"),
             },
             {
               path: "/shop/cloud", // 云资源服务
               name: "shopCloud",
-              component: () => import("@/pages/service_shop/shop_cloud"),
+              component: () => import("@/pages/service_shop/shop_cloud-new"),
             },
             {
               path: "/shop/service_application_successfully", // 申请服务成功
@@ -317,7 +317,7 @@ export default new Router({
             {
               path: "/shop/app_store_list/:id", // 应用商店列表页
               name: "shopAppStoreList",
-              component: () => import("@/pages/service_shop/shop_list"),
+              component: () => import("@/pages/service_shop/shop_list-new"),
             },
             {
               path: "/shop/shopping_cart", // 购物车页