From ee494f059fbb6552fcf82b994025c57463249b8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=AE=BF=E6=98=95?= <liudianxin@bd-apaas.com>
Date: Thu, 12 Nov 2020 17:22:31 +0800
Subject: [PATCH] add more and more and more and more...

---
 ...y-card copy.vue => commodity-card-new.vue} |  0
 ...modity-card.vue => commodity-card-old.vue} |  0
 ...y-cell copy.vue => commodity-cell-new.vue} |  0
 ...modity-cell.vue => commodity-cell-old.vue} |  0
 ...y-list copy.vue => commodity-list-new.vue} |  4 +-
 ...modity-list.vue => commodity-list-old.vue} |  0
 ...ice_list copy.vue => service_list-new.vue} |  2 +-
 ...{service_list.vue => service_list-old.vue} |  2 +-
 ...enu_copy.vue => service_shop_menu-new.vue} |  0
 ...hop_menu.vue => service_shop_menu-old.vue} |  0
 ...shop-cloud copy.vue => shop-cloud-new.vue} |  0
 .../{shop-cloud.vue => shop-cloud-old.vue}    |  0
 src/pages/example/example_com_list.vue        |  2 +-
 ...shop_cloud copy.vue => shop_cloud-new.vue} |  4 +-
 .../{shop_cloud.vue => shop_cloud-old.vue}    |  0
 .../{shop_list copy.vue => shop_list-new.vue} |  4 +-
 .../{shop_list.vue => shop_list-old.vue}      |  0
 src/pages/workbench/fwzc_fwcs.vue             | 45 ++++++++++++++-----
 src/router/index.js                           | 14 +++---
 19 files changed, 50 insertions(+), 27 deletions(-)
 rename src/components/service-list/{commodity-card copy.vue => commodity-card-new.vue} (100%)
 rename src/components/service-list/{commodity-card.vue => commodity-card-old.vue} (100%)
 rename src/components/service-list/{commodity-cell copy.vue => commodity-cell-new.vue} (100%)
 rename src/components/service-list/{commodity-cell.vue => commodity-cell-old.vue} (100%)
 rename src/components/service-list/{commodity-list copy.vue => commodity-list-new.vue} (99%)
 rename src/components/service-list/{commodity-list.vue => commodity-list-old.vue} (100%)
 rename src/components/service-list/{service_list copy.vue => service_list-new.vue} (99%)
 rename src/components/service-list/{service_list.vue => service_list-old.vue} (99%)
 rename src/components/service-list/{service_shop_menu_copy.vue => service_shop_menu-new.vue} (100%)
 rename src/components/service-list/{service_shop_menu.vue => service_shop_menu-old.vue} (100%)
 rename src/components/shop-cloud/{shop-cloud copy.vue => shop-cloud-new.vue} (100%)
 rename src/components/shop-cloud/{shop-cloud.vue => shop-cloud-old.vue} (100%)
 rename src/pages/service_shop/{shop_cloud copy.vue => shop_cloud-new.vue} (88%)
 rename src/pages/service_shop/{shop_cloud.vue => shop_cloud-old.vue} (100%)
 rename src/pages/service_shop/{shop_list copy.vue => shop_list-new.vue} (97%)
 rename src/pages/service_shop/{shop_list.vue => shop_list-old.vue} (100%)

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 e8238e6..0cb5111 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 3bf7b06..eaef673 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 980050b..6f7a9b3 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 32ece65..9ed0b57 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 3533b7f..d7ccfb1 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 c87d0ed..231364c 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 628801c..448b696 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 4f844dd..283d1a5 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", // 购物车页
-- 
2.26.0