Merge branch 'ldx' into dev

src/components/menu.vue

@@ -103,23 +103,23 @@ export default {
           children: [
             {
               name: "数据服务",
-              path: "/shop/service/5"
+              path: "/shop/data_service_list/5"
             },
             {
               name: "时空服务",
-              path: "/shop/service/6"
+              path: "/shop/space_time_service_list/6"
             },
             {
               name: "视频服务",
-              path: "/shop/service/7"
+              path: "/shop/video_service_list/7"
             },
             {
               name: "感知服务",
-              path: "/shop/service/10"
+              path: "/shop/perception_service_list/10"
             },
             {
               name: "综合应用",
-              path: "/shop/service/11"
+              path: "/shop/comprehensive_app_list/11"
             },
             {
               name: "云资源服务",
@@ -127,7 +127,7 @@ export default {
             },
             {
               name: "应用商店",
-              path: "/shop/service/12"
+              path: "/shop/app_store_list/12"
             }
           ]
         }
@@ -195,7 +195,7 @@ export default {
       this.$api.serviceShop.getShoppingCart().then(response => {
         if (response.data.success == "1") {
           console.log(response.data.data);
-          this.shopping_list = response.data.data.valid.slice(0, 3);
+          this.shopping_list = response.data.data.valid ? response.data.data.valid.slice(0, 3):[];
         } else {
           console.log(response.data.message);
         }

src/components/service-list/service_list.vue

@@ -2,7 +2,6 @@
   <!-- 
     name: page type
     url: detail page url
-    urlList: get list data from this url
     urlFilter: get filter data from this url
     author: dixin
     This component only for service shop list, so the explanation only look by me
@@ -13,7 +12,7 @@
         <el-breadcrumb-item :to="{ path: '/shop' }">{{ $t('lang.serviceShop') }}</el-breadcrumb-item>
         <el-breadcrumb-item>{{ name }}</el-breadcrumb-item>
       </el-breadcrumb>
-      <div v-if="urlList" class="input_right">
+      <div class="input_right">
         <el-input
           v-model="search"
           prefix-icon="el-icon-search"
@@ -22,7 +21,7 @@
         ></el-input>
       </div>
     </div>
-    <block-radius v-if="urlList">
+    <block-radius>
       <!-- filter -->
       <div v-if="urlFilter" class="classification">
         <div v-for="(item, index) in filterLists" :key="'cd' + index" class="classification_line">
@@ -140,10 +139,6 @@ export default {
     BlockRadius
   },
   props: {
-    urlList: {
-      type: String,
-      default: ""
-    },
     urlFilter: {
       type: String,
       default: ""
@@ -201,9 +196,15 @@ export default {
     page: 1,
     limit: 10
   }),
-  mounted() {
-    this.getShopList();
-    this.getShopFilter();
+  mounted() {},
+  watch: {
+    urlFilter: {
+      handler(val) {
+        if (val) {
+          this.getShopFilter();
+        }
+      }
+    }
   },
   methods: {
     getShopList() {
@@ -219,7 +220,7 @@ export default {
         Size: this.limit
       };
       this.$api.serviceShop.getServiceShopList(query).then(response => {
-        if (response.data.message == "success") {
+        if (response.data.success == "1") {
           this.lists = response.data.data;
         } else {
           console.log(response.data.message);
@@ -242,9 +243,11 @@ export default {
           this.filterLists[2].childDomains = data.organizations
             ? data.organizations
             : [];
+          console.log(this.filterLists);
           setTimeout(() => {
             this.judgeHeight();
           }, 0);
+          this.getShopList();
         } else {
           console.log(response.data.errMsg);
         }
@@ -287,6 +290,7 @@ export default {
           });
         }
       }
+      console.log(this.activeOptions);
       this.getFilterValue();
     },
     clickItemChild(index, indexs, items) {
@@ -346,7 +350,6 @@ export default {
       this.getShopList();
     },
     clickAll(item) {
-      console.log(item);
       this.activeOptions[item] = [];
       this.activeChildOptions[item] = [];
     }

src/components/service_shop_menu.vue

@@ -24,35 +24,35 @@ export default {
         {
           id: 0,
           label: "数据服务",
-          router: "/shop/service/5",
+          router: "/shop/data_service_list/5",
           active: "tool_ic_shujufw_sel",
           default: "tool_ic_shujufw"
         },
         {
           id: 1,
           label: "时空服务",
-          router: "/shop/service/6",
+          router: "/shop/space_time_service_list/6",
           active: "tool_ic_shikongfw_sel",
           default: "tool_ic_shikongfw"
         },
         {
           id: 2,
           label: "视频服务",
-          router: "/shop/service/7",
+          router: "/shop/video_service_list/7",
           active: "tool_ic_shipinfw_sel",
           default: "tool_ic_shipinfw"
         },
         {
           id: 3,
           label: "感知服务",
-          router: "/shop/service/10",
+          router: "/shop/perception_service_list/10",
           active: "tool_ic_ganzhifw_sel",
           default: "tool_ic_ganzhifw"
         },
         {
           id: 4,
           label: "综合服务",
-          router: "/shop/service/11",
+          router: "/shop/comprehensive_app_list/11",
           active: "tool_ic_zongheyyfw_sel",
           default: "tool_ic_zongheyyfw"
         },
@@ -66,7 +66,7 @@ export default {
         {
           id: 6,
           label: "应用商店",
-          router: "/shop/service/12",
+          router: "/shop/app_store_list/12",
           active: "tool_ic_yingyongsd_sel",
           default: "tool_ic_yingyongsd"
         }

src/pages/service_shop/shop_list.vue

@@ -5,7 +5,7 @@
         <service-shop-menu></service-shop-menu>
       </el-aside>
       <el-main>
-        <service-list :name="name" :url="url" :urlList="urlList" :urlFilter="urlFilter"></service-list>
+        <service-list :name="name" :url="url" :urlFilter="urlFilter"></service-list>
       </el-main>
     </el-container>
   </div>
@@ -22,7 +22,6 @@ export default {
   data: () => ({
     urlFilter: "",
     url: "",
-    urlList: "2222",
     name: ""
   }),
   mounted() {
@@ -30,34 +29,44 @@ export default {
   },
   methods: {
     getVal(val) {
-      switch (val) {
-        case "/shop/data_service_list":
+      let uri = val.substring(6);
+      uri = uri.substring(0, uri.indexOf("/"));
+      console.log(uri);
+      switch (uri) {
+        case "data_service_list":
           this.name = "数据服务";
           this.urlFilter = "5";
+          this.url = "/shop/sjfwDetail";
           break;
-        case "/shop/space_time_service_list":
+        case "space_time_service_list":
           this.name = "时空服务";
           this.urlFilter = "6";
+          this.url = "/shop/skfwDetail";
           break;
-        case "/shop/video_service_list":
+        case "video_service_list":
           this.name = "视频服务";
           this.urlFilter = "7";
+          this.url = "";
           break;
-        case "/shop/perception_service_list":
+        case "perception_service_list":
           this.name = "感知服务";
           this.urlFilter = "10";
+          this.url = "";
           break;
-        case "/shop/comprehensive_app_list":
+        case "comprehensive_app_list":
           this.name = "综合服务";
           this.urlFilter = "";
+          this.url = "/shop/zhfwDetail";
           break;
-        case "/shop/app_store_list":
+        case "app_store_list":
           this.name = "应用商店";
           this.urlFilter = "";
+          this.url = "/shop/yysdDetail";
           break;
         default:
           this.name = "";
           this.urlFilter = "";
+          this.url = "";
           break;
       }
     }

src/pages/user/user.vue

@@ -17,7 +17,7 @@ export default {
   data: () => ({
     userNav: [
       {
-        name: "个人档案",
+        name: "哪来的我个人档案",
         path: `/user/user_info`
       },
       {

src/pages/user/user_info.vue

@@ -5,24 +5,28 @@
       <el-breadcrumb-item>{{ $t("lang.profile") }}</el-breadcrumb-item>
     </el-breadcrumb>
     <block-radius class="info_block">
-      <el-tabs v-model="activeName" @tab-click="changeTab">
+      <el-tabs
+        v-if="user_data.is_admin == 3 || user_data.is_admin == 4"
+        v-model="activeName"
+        @tab-click="changeTab"
+      >
         <el-tab-pane label="个人信息详情" name="0"></el-tab-pane>
         <el-tab-pane label="业务系统详情" name="1"></el-tab-pane>
       </el-tabs>
       <div v-if="activeName == '0'">
-        <el-form ref="form" :model="form">
+        <el-form ref="form" :model="user_data">
           <el-form-item class="info_item">
             <p>账号：</p>
-            <el-input v-model="form.accountNo"></el-input>
+            <el-input v-model="user_data.accountNo"></el-input>
           </el-form-item>
           <el-form-item class="info_item info_item_right_btn">
             <p>密码：</p>
-            <el-input v-model="form.password"></el-input>
+            <el-input type="password" v-model="user_data.password" :disabled="true"></el-input>
             <el-button class="option_btn" @click="changePassword">修改密码</el-button>
           </el-form-item>
           <el-form-item class="info_item">
             <p>昵称：</p>
-            <el-input v-model="form.nickname"></el-input>
+            <el-input v-model="user_data.nickname"></el-input>
           </el-form-item>
           <el-form-item class="info_item">
             <p>头像：</p>
@@ -37,23 +41,30 @@
           </el-form-item>
           <el-form-item class="info_item">
             <p>联系人：</p>
-            <el-input v-model="form.contactPerson"></el-input>
+            <el-input v-model="user_data.contactPerson"></el-input>
           </el-form-item>
           <el-form-item class="info_item">
             <p>手机号：</p>
-            <el-input v-model="form.phone"></el-input>
+            <el-input v-model="user_data.phone"></el-input>
           </el-form-item>
           <el-form-item class="info_item">
             <p>邮箱：</p>
-            <el-input v-model="form.email"></el-input>
+            <el-input v-model="user_data.email"></el-input>
           </el-form-item>
           <el-form-item class="info_item">
             <p>组织机构：</p>
-            <el-input v-model="form.organization"></el-input>
+            <el-input v-model="user_data.organization"></el-input>
           </el-form-item>
           <el-form-item class="info_item info_item_right_btn">
-            <p>当前角色：</p>
-            <el-input v-model="form.role"></el-input>
+            <p>当前用户类型：</p>
+            <el-select v-model="user_data.userType" :disabled="true">
+              <el-option
+                v-for="item in userTypeOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
             <el-button class="option_btn" @click="upLevel">升级为开发者</el-button>
           </el-form-item>
         </el-form>
@@ -126,15 +137,15 @@
           <el-form ref="form" :model="form">
             <el-form-item class="dia_item">
               <p>旧密码：</p>
-              <el-input v-model="form.accountNo"></el-input>
+              <el-input v-model="form.passwordOld"></el-input>
             </el-form-item>
             <el-form-item class="dia_item">
               <p>新密码：</p>
-              <el-input v-model="form.password"></el-input>
+              <el-input v-model="form.passwordNew"></el-input>
             </el-form-item>
             <el-form-item class="dia_item">
               <p>请再次输入密码：</p>
-              <el-input v-model="form.nickname"></el-input>
+              <el-input v-model="form.nextname"></el-input>
             </el-form-item>
           </el-form>
         </div>
@@ -157,15 +168,20 @@ export default {
   },
   data: () => ({
     activeName: "0",
-    form: {
+    user_data: {
       accountNo: "",
-      password: "",
+      password: "12345678",
       nickname: "",
       contactPerson: "",
       phone: "",
       email: "",
       organization: "",
-      role: ""
+      userType: ""
+    },
+    form: {
+      passwordOld: "",
+      passwordNew: "",
+      nextname: ""
     },
     imgList: [],
     formBusiness: {
@@ -194,14 +210,51 @@ export default {
     blackAddShow: false,
     newIpWhite: "",
     newIpBlack: "",
-    diaPassWord: false
+    diaPassWord: false,
+    userTypeOptions: [
+      { value: 1, label: "超级管理员" },
+      { value: 2, label: "组织管理员" },
+      { value: 3, label: "普通用户" },
+      { value: 4, label: "普通用户开发者" }
+    ]
   }),
   mounted() {
-    this.imgList.push(
-      "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
-    );
+    // this.imgList.push(
+    //   "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
+    // );
+    this.getCurrentUser();
   },
   methods: {
+    getCurrentUser() {
+      this.$api.user.getNowUser().then(response => {
+        if (response.data.success == 1) {
+          this.getUserInfo(response.data.data.user_id);
+        } else {
+          console.log(response.data.errMsg);
+        }
+      });
+    },
+    getUserInfo(id) {
+      this.$api.user.getUserDetail({ id: id }).then(response => {
+        if (response.data.success == 1) {
+          let data = response.data.data;
+          this.user_data.accountNo = data.user_id;
+          this.user_data.nickname = data.user_name;
+          this.user_data.contactPerson = data.link_man;
+          this.user_data.phone = data.user_id;
+          this.user_data.email = data.user_id;
+          this.user_data.organization = data.department;
+          this.user_data.userType = data.is_admin;
+          this.imgList.push(data.picture_path);
+          this.formBusiness.businessSystemName = data.system_name;
+          this.formBusiness.domainName = data.domain_name;
+          this.formBusiness.ip_white = data.ip_whitelist;
+          this.formBusiness.ip_black = data.ip_blacklist;
+          this.formBusiness.key = data.key;
+          this.formBusiness.description = data.description;
+        }
+      });
+    },
     changeTab() {},
     getNewList(val) {
       console.log(val);
@@ -214,10 +267,23 @@ export default {
     cancelChangePwd() {
       this.diaPassWord = false;
     },
-    submitChangePwd() {},
-    upLevel() {
-      this.diaPassWord = true;
+    submitChangePwd() {
+      this.$api.user.editUserPassword(query).then(response => {
+        if (response.data.success == 1) {
+          this.$message({
+            message: "修改密码成功",
+            type: "success"
+          });
+          this.diaPassWord = false;
+        } else {
+          this.$message({
+            message: "修改密码失败",
+            type: "error"
+          });
+        }
+      });
     },
+    upLevel() {},
     copyKey() {
       this.$refs.keys.select();
       document.execCommand("Copy");
@@ -373,6 +439,13 @@ export default {
   width: calc(100% - 140px);
   margin-right: 10px;
 }
+.info_item_right_btn .el-select {
+  width: calc(100% - 140px);
+  margin-right: 10px;
+}
+.info_item_right_btn .el-select .el-input {
+  width: 100%;
+}
 .info_item_right_btn_2 .el-input {
   width: calc(100% - 280px);
   margin-right: 10px;

src/request/api/authority.js

@@ -20,7 +20,9 @@ const authority = {
     },
     editMenu(params) {
         return axios.put(`/apaas/backmgt/menu`, params);
-    }
+    },
+
+    // 
 }
 
 export default authority;

src/request/api/user.js

@@ -2,9 +2,21 @@ import axios from '@/request/http'; // 导入http中创建的axios实例
 import qs from 'qs'; // 根据需求是否导入qs模块
 
 const user = {
+    // order
     orderList(params) {
         return axios.get(`/apaas/serviceapp/v3/order/list?serviceName=${params.select}&orderStatus=${params.status}&serviceTypes=${params.types.join(',')}&Page=${params.page}&Size=${params.limit}`);
     },
+
+    // user info
+    getNowUser() {
+        return axios.get(`/apaas/backmgt/user/getCurrentUser`);
+    },
+    getUserDetail(params) {
+        return axios.get(`/apaas/backmgt/user/detail/${params.id}`);
+    },
+    editUserPassword(params) {
+        return axios.post(`/apaas/backmgt/user/password/${params.id}`, params.form);
+    },
 }
 
 export default user;

src/router/index.js

@@ -114,12 +114,32 @@ export default new Router({
         {
           path: "/shop", // 服务超市
           name: "shop",
-          redirect: "/shop/service",
+          redirect: "/shop/data_service_list/5",
           component: () => import("@/pages/service_shop/shop"),
           children: [
             {
-              path: "/shop/service/:id", // 数据服务、时空、视频、感知、综合、应用列表页
-              name: "shopList",
+              path: "/shop/data_service_list/:id", // 数据服务列表页
+              name: "shopDataList",
+              component: () => import("@/pages/service_shop/shop_list"),
+            },
+            {
+              path: "/shop/space_time_service_list/:id", // 时空服务列表页
+              name: "shopSpaceTimeList",
+              component: () => import("@/pages/service_shop/shop_list"),
+            },
+            {
+              path: "/shop/video_service_list/:id", // 视频服务列表页
+              name: "shopVideoList",
+              component: () => import("@/pages/service_shop/shop_list"),
+            },
+            {
+              path: "/shop/perception_service_list/:id", // 感知服务列表页
+              name: "shopPerceptionList",
+              component: () => import("@/pages/service_shop/shop_list"),
+            },
+            {
+              path: "/shop/comprehensive_app_list/:id", // 综合应用列表页
+              name: "shopComAppList",
               component: () => import("@/pages/service_shop/shop_list"),
             },
             {
@@ -133,6 +153,11 @@ export default new Router({
               component: () =>
                 import("@/pages/service_shop/service_application_successfully"),
             },
+            {
+              path: "/shop/app_store_list/:id", // 应用商店列表页
+              name: "shopAppStoreList",
+              component: () => import("@/pages/service_shop/shop_list"),
+            },
             {
               path: "/shop/shopping_cart", // 购物车页
               name: "shoppingCart",