修复统一报错，对部分接口格式，写一点个人档案，+i18n

src/components/menu.vue

@@ -132,7 +132,7 @@ export default {
       user_arr: [
         { name: "个人档案", path: "/user/user_info" },
         { name: "消息通知", path: "/user/message" },
-        { name: "收银中心", path: "" },
+        { name: "收银中心", path: "/authority" },
         { name: "关于BD-aPaaS", path: "" },
         { name: "退出登录", path: "" }
       ],
@@ -194,6 +194,9 @@ export default {
       if (v.path) {
         if (v.path == "/fwgl/" || v.path == "/yygl/") {
           this.$router.push(v.path + this.$store.state.role);
+        } else if (parent == 2) {
+          this.$router.push(v.path);
+          this.$store.commit("serviceShopMenuAct", v.path);
         } else {
           this.$router.push(v.path);
         }

src/components/order-list/order-list-cell.vue

  <template>
   <div class="order_cell">
     <div class="order_cell_head">
-      <div class="application_time">申请时间：{{ helper.dateFormat(cellItem.add_time) }}</div>
-      <div class="order_number">订单编号：{{ cellItem.orderNumber }}</div>
-      <div class="cell_del_btn">删除</div>
+      <div class="application_time">申请时间：{{ helper.dateFormat(cellItem.applytime) }}</div>
+      <div class="order_number">订单编号：{{ cellItem.orderid }}</div>
+      <div class="cell_del_btn" @click="delOrder(cellItem.orderid)">删除</div>
     </div>
     <el-row class="cell_row">
       <el-col :span="10" class="cell_msg">
@@ -15,20 +15,20 @@
           <div class="cell_name">
             <span>{{ cellItem.name }}</span>
             <span v-if="cellItem.mapService" class="tags map_service">mapService</span>
-            <span v-if="cellItem.state == 1" class="tags shared">共享</span>
-            <span v-else-if="cellItem.state ==  2" class="tags restricted">受限</span>
+            <span v-if="cellItem.openness == 1" class="tags shared">共享</span>
+            <span v-else-if="cellItem.openness ==  2" class="tags restricted">受限</span>
             <span v-else class="tags sensitive">敏感</span>
           </div>
           <div class="cell_msg_other">
-            <div class="cell_type">{{ cellItem.type }}</div>
-            <div class="cell_creator">{{ cellItem.creator }}</div>
+            <div class="cell_type">{{ cellItem.sectors }}</div>
+            <div class="cell_creator">{{ cellItem.organization }}</div>
           </div>
         </div>
       </el-col>
       <el-col :span="6" class="cell_specification">
         <div>
-          <div>规格：访问次数：200/日，访问量：10000/日</div>
-          <div class="cell_specification_type">申请方式：按月</div>
+          <div>规格：访问次数：{{ cellItem.pv }}，访问量：{{ cellItem.count }}</div>
+          <div class="cell_specification_type">申请方式：{{ cellItem.durationunit == 1 ? $t('lang.byYear') : $t('lang.byMonth') }}</div>
         </div>
       </el-col>
       <el-col :span="4" class="approval_status">
@@ -132,6 +132,9 @@ export default {
     },
     viewDetail(val) {
       this.$router.push("/user/order_detail/" + val)
+    },
+    delOrder() {
+
     }
   }
 };
@@ -164,6 +167,7 @@ export default {
   display: flex;
   float: right;
   margin-right: 40px;
+  cursor: pointer;
 }
 .cell_row {
 }

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

@@ -8,33 +8,33 @@
     </div>
     <div class="com_cell_message">
       <div class="com_cell_msg_title">
-        {{ cellData.title }}
+        {{ cellData.name }}
         <span v-if="cellData.mapService" class="tags map_service">mapService</span>
-        <span v-if="cellData.state == 1" class="tags shared">共享</span>
-        <span v-else-if="cellData.state ==  2" class="tags restricted">受限</span>
+        <span v-if="cellData.openness == 1" class="tags shared">共享</span>
+        <span v-else-if="cellData.openness ==  2" class="tags restricted">受限</span>
         <span v-else class="tags sensitive">敏感</span>
       </div>
       <div class="com_cell_item">
         <span class="com_cell_item_title">资源摘要：</span>
-        <span
-          class="com_cell_data"
-        >{{ cellData.resourceSummary }}</span>
+        <span class="com_cell_data">{{ cellData.descript }}</span>
       </div>
       <div class="com_cell_item">
         <span class="com_cell_item_title">提供机构：</span>
-        <span class="com_cell_data">{{ cellData.provider }}</span>
+        <span class="com_cell_data">{{ cellData.organization_name }}</span>
       </div>
       <div class="com_cell_item">
         <span class="com_cell_item_title">数据领域：</span>
-        <span class="com_cell_data">{{ cellData.dataField }}</span>
+        <span class="com_cell_data">{{ cellData.sectors_name }}</span>
       </div>
       <div class="com_cell_item">
         <span class="com_cell_item_title">服务类型：</span>
-        <span class="com_cell_data">{{ cellData.serviceType }}</span>
+        <span
+          class="com_cell_data"
+        >{{ cellData.data_service_type1_str }}&nbsp;&nbsp;{{ cellData.data_service_type2_str }}&nbsp;&nbsp;{{ cellData.data_service_type3_str }}</span>
       </div>
       <div class="com_cell_item">
         <span class="com_cell_item_title">更新时间：</span>
-        <span class="com_cell_data">{{ cellData.updateTime }}</span>
+        <span class="com_cell_data">{{ cellData.update_date }}</span>
       </div>
     </div>
     <div class="com_cell_right">
@@ -47,7 +47,7 @@
       ></el-rate>
       <div class="com_cell_right_text">
         <span class="com_cell_right_time_tit">本月获取次数：</span>
-        <span class="com_cell_right_time">{{ cellData.numberOfMonth }}次</span>
+        <span class="com_cell_right_time">{{ cellData.apply_num }}次</span>
       </div>
       <el-button class="com_cell_right_btn" @click="goUrl(cellData.id)">查看详情</el-button>
     </div>
@@ -155,8 +155,8 @@ export default {
   top: -2px;
 }
 .map_service {
-  background-color: #626DE9;
-  border: solid 1px #626DE9;
+  background-color: #626de9;
+  border: solid 1px #626de9;
   color: #fff;
 }
 .shared {

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

@@ -60,8 +60,8 @@
 </template>
 
 <script>
-import CommodityCell from "@/components/commodity-cell.vue";
-import CommodityCard from "@/components/commodity-card.vue";
+import CommodityCell from "@/components/service-list/commodity-cell.vue";
+import CommodityCard from "@/components/service-list/commodity-card.vue";
 export default {
   components: {
     "commodity-cell": CommodityCell,

src/components/service_list.vue → src/components/service-list/service_list.vue

@@ -26,7 +26,7 @@
       <!-- filter -->
       <div v-if="urlFilter" class="classification">
         <div v-for="(item, index) in filterLists" :key="'cd' + index" class="classification_line">
-          <div v-if="item.childDomains && item.childDomains.length != 0">
+          <div class="classification_line_if" v-if="item.childDomains">
             <div class="classification_line_title">{{ item.name }}：</div>
             <div
               :class="index == filterLists.length - 1 ? 'classification_line_items':'classification_line_items classification_line_items_border'"
@@ -35,6 +35,17 @@
                 :class="openList[index] == 'up' ? 'classification_line_hid':'classification_line_show'"
               >
                 <ul :id="item.id" class="classification_line_items_ul">
+                  <li
+                    class="classification_line_items_li"
+                    :key="'cda' + index"
+                  >
+                    <div class="classification_span">
+                      <span
+                        @click="clickAll(index)"
+                        :class="activeOptions[index].length == 0 ? 'classification_act':''"
+                      >全部</span>
+                    </div>
+                  </li>
                   <li
                     v-for="(items, indexs) in item.childDomains"
                     :class="items.childDomains && openChildren[index].state == true && openChildren[index].index == items.id ? 'classification_line_items_li_act classification_line_items_li':'classification_line_items_li'"
@@ -124,7 +135,7 @@
 </template>
 
 <script>
-import CommodityList from "@/components/commodity-list.vue";
+import CommodityList from "@/components/service-list/commodity-list.vue";
 import BlockRadius from "@/components/block-radius";
 export default {
   components: {
@@ -168,73 +179,8 @@ export default {
         name: "最好好评"
       }
     ],
-    activeBtn: null,
+    activeBtn: 0,
     lists: [
-      {
-        id: 0,
-        title: "水路货物周转量情况水路货物周转量情况",
-        state: 0,
-        resourceSummary:
-          "提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务",
-        provider: "提供机构提供机构提供机构",
-        dataField: "经济建设",
-        serviceType: "数据服务 专题数据服务 企业专题数据服务",
-        updateTime: "2020-03-12 18:31:12",
-        numberOfMonth: "2698755",
-        rate: 3,
-        mapService: 1,
-        version: 2.888,
-        onlineTime: "2019-04-11 12:50:30",
-        num: 66666
-      },
-      {
-        id: 1,
-        title: "水路货物周转量情况",
-        state: 2,
-        resourceSummary:
-          "提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务",
-        provider: "提供机构提供机构提供机构",
-        dataField: "经济建设",
-        serviceType: "数据服务 专题数据服务 企业专题数据服务",
-        updateTime: "2020-03-12 18:31:12",
-        numberOfMonth: "2698745",
-        rate: 3.4,
-        version: 2.888,
-        onlineTime: "2019-04-11 12:50:30",
-        num: 66666
-      },
-      {
-        id: 2,
-        title: "水路货物周转量情况",
-        state: 1,
-        resourceSummary:
-          "提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务",
-        provider: "提供机构提供机构提供机构",
-        dataField: "经济建设",
-        serviceType: "数据服务 专题数据服务 企业专题数据服务",
-        updateTime: "2020-03-12 18:31:12",
-        numberOfMonth: "2698455",
-        rate: 2.5,
-        version: 2.888,
-        onlineTime: "2019-04-11 12:50:30",
-        num: 66666
-      },
-      {
-        id: 3,
-        title: "水路货物周转量情况",
-        state: 0,
-        resourceSummary:
-          "提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务",
-        provider: "提供机构提供机构提供机构",
-        dataField: "经济建设",
-        serviceType: "数据服务 专题数据服务 企业专题数据服务",
-        updateTime: "2020-03-12 18:31:12",
-        numberOfMonth: "267455",
-        rate: 3.7,
-        version: 2.888,
-        onlineTime: "2019-04-11 12:50:30",
-        num: 66666
-      }
     ],
     filterLists: [
       {
@@ -245,13 +191,13 @@ export default {
       },
       {
         id: 11,
-        name: "数据服务类型",
+        name: "数据领域",
         prop: "serviceDomain",
         childDomains: []
       },
       {
         id: 100,
-        name: "数据服务类型",
+        name: "数据来源机构",
         prop: "organizations",
         childDomains: []
       }
@@ -267,8 +213,9 @@ export default {
     getShopList() {
       let query = {
         serviceName: this.search,
-        serviceType1: this.activeOptions[0].join(","),
-        serviceType2s: this.activeChildOptions[0].join(","),
+        serviceType1: this.urlFilter,
+        serviceType2s: this.activeOptions[0].join(","),
+        serviceType3s: this.activeChildOptions[0].join(","),
         dataDomains: this.activeOptions[1].join(","),
         organizeIds: this.activeOptions[2].join(","),
         orderBy: this.activeBtn,
@@ -277,7 +224,7 @@ export default {
       };
       this.$api.serviceShop.getServiceShopList(query).then(response => {
         if (response.data.message == "success") {
-          this.list = response.data.data;
+          this.lists = response.data.data;
         } else {
           console.log(response.data.message);
         }
@@ -289,7 +236,10 @@ export default {
       };
       this.$api.serviceShop.getServiceShopFilter(query).then(response => {
         if (response.data.success == 1) {
-          this.filterLists = response.data;
+          let data = response.data.data;
+          this.filterLists[0].childDomains = data.serviceTypeInfo ? data.serviceTypeInfo : [];
+          this.filterLists[1].childDomains = data.serviceDomain ? data.serviceDomain : [];
+          this.filterLists[2].childDomains = data.organizations ? data.organizations : [];
           setTimeout(() => {
             this.judgeHeight();
           }, 0);
@@ -392,6 +342,11 @@ export default {
       this.page = val.page;
       this.limit = val.rowsPerPage;
       this.getShopList();
+    },
+    clickAll(item) {
+      console.log(item)
+      this.activeOptions[item] = [];
+      this.activeChildOptions[item] = [];
     }
   }
 };
@@ -417,6 +372,9 @@ export default {
 }
 .classification_line {
   width: 100%;
+}
+.classification_line_if {
+  width: 100%;
   display: flex;
   align-items: flex-start;
 }
@@ -428,7 +386,7 @@ export default {
   color: #8890a7;
 }
 .classification_line_items {
-  width: calc(100% - 100px);
+  width: calc(100% - 130px);
 }
 .classification_line_items_border {
   border-bottom: 1px #e9ecf3 solid;

src/components/shopping-cart/shopping-cart-cell.vue

@@ -39,7 +39,7 @@
             >规格：{{ specificationBtns[cellItems.specification] }}</div>
             <div
               class="shopping_cell_specification_val_type"
-            >申请方式：{{ specificationApplicationBtns[cellItems.specificationApplication] }}</div>
+            >申请方式：{{ specificationApplicationBtns[cellItems.specificationApplication - 1] }}</div>
             <div class="shopping_cell_specification_edit">
               <el-popover
                 placement="right-start"

src/components/shopping-cart/shopping-cart-com.vue

@@ -52,7 +52,11 @@
               :disabled="true"
               class="shopping_cart_options_cell_btn"
             >一键申请</el-button>
-            <el-button v-else @click="oneClickApplication" class="shopping_cart_options_cell_btn_act">一键申请</el-button>
+            <el-button
+              v-else
+              @click="oneClickApplication"
+              class="shopping_cart_options_cell_btn_act"
+            >一键申请</el-button>
           </el-col>
         </el-row>
       </div>
@@ -108,7 +112,9 @@ export default {
       }
     ]
   }),
-  mounted() {},
+  mounted() {
+    this.getList();
+  },
   computed: {
     getNum() {
       let num = this.checkList.reduce(
@@ -119,6 +125,16 @@ export default {
     }
   },
   methods: {
+    getList() {
+      this.$api.serviceShop.getShoppingCart().then(response => {
+        if (response.data.success == "1") {
+          console.log(response.data.data)
+          this.list = response.data.data;
+        } else {
+          console.log(response.data.message);
+        }
+      });
+    },
     checkAll(val) {
       this.$refs.shoppingList.setAllState(val);
     },

src/i18n/language-zh.js

+export const lang={
+    // bread crunbs
+    // .
+    // .
+    // .
+    // part personal center
+    personalCenter: "个人中心",
+    profile: "个人档案",
+    messageCenter: "消息中心",
+
+    // unit of purchase duration
+    byYear: "按年",
+    byMonth: "按月",
+}
\ No newline at end of file

src/main.js

@@ -19,9 +19,15 @@ import "@/icons"
 import "./assets/css/index.css";
 
 import VueI18n from 'vue-i18n'
-
 Vue.use(VueI18n)
 
+const i18n = new VueI18n({
+  locale: 'zh',
+  messages: {
+    'zh': require('@/i18n/language-zh')
+  }
+})
+
 import api from './request/api'
 Vue.prototype.$api = api;
 
@@ -29,6 +35,7 @@ new Vue({
   el: "#app",
   router,
   store,
+  i18n,
   components: { App },
   template: "<App/>"
 });

src/pages/example/example_com_list.vue

@@ -9,7 +9,7 @@
 
 <script>
 // @ is an alias to /src
-import CommodityList from "@/components/commodity-list.vue";
+import CommodityList from "@/components/service-list/commodity-list.vue";
 import BlockRadius from "@/components/block-radius";
 export default {
   components: {

src/pages/example/example_commodity.vue

@@ -10,7 +10,7 @@
 
 <script>
 // @ is an alias to /src
-import Commodity from "@/components/commodity.vue";
+import Commodity from "@/components/service-list/commodity.vue";
 import BlockRadius from "@/components/block-radius";
 export default {
   components: {

src/pages/service_shop/shop_list.vue

@@ -13,7 +13,7 @@
 
 <script>
 import ServiceShopMenu from "@/components/service_shop_menu";
-import ServiceList from "@/components/service_list";
+import ServiceList from "@/components/service-list/service_list";
 export default {
   components: {
     ServiceShopMenu,

src/pages/user/message.vue

 <template>
   <div>
-    <el-breadcrumb separator="/" class="bread_crumb1">
-      <el-breadcrumb-item>个人中心</el-breadcrumb-item>
-      <el-breadcrumb-item>消息管理</el-breadcrumb-item>
+    <el-breadcrumb separator="/" class="bread_crumb1 bread_left">
+      <el-breadcrumb-item :to="{ path: '/user' }">{{ $t("lang.personalCenter") }}</el-breadcrumb-item>
+      <el-breadcrumb-item>{{ $t("lang.messageCenter") }}</el-breadcrumb-item>
     </el-breadcrumb>
     <block-radius class="message_block">
       <ces-table

src/pages/user/user_info.vue

 <template>
   <div>
-      info
+    <el-breadcrumb separator="/" class="bread_crumb1 bread_left">
+      <el-breadcrumb-item :to="{ path: '/user' }">{{ $t("lang.personalCenter") }}</el-breadcrumb-item>
+      <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-tab-pane label="个人信息详情" name="0"></el-tab-pane>
+        <el-tab-pane label="业务系统详情" name="1"></el-tab-pane>
+      </el-tabs>
+    </block-radius>
   </div>
 </template>
 
 <script>
+import BlockRadius from "@/components/block-radius";
 export default {
+  components: {
+    BlockRadius
+  },
   data: () => ({
+    activeName: "0"
   }),
   mounted() {},
-  methods: {}
+  methods: {
+    changeTab() {
+
+    }
+  }
 };
 </script>
 <style scoped>
+.info_block {
+  margin: 0 20px;
+}
 </style>
\ No newline at end of file

src/pages/workbench/fwzc_fwcs.vue

@@ -944,4 +944,13 @@ export default {
 .fwcs_tabs .el-tabs__header {
   margin: 20px 0;
 }
+.zhyy_select .el-input__prefix, .el-input__suffix {
+    position: absolute;
+    top: 0;
+    right: 10px;
+    -webkit-transition: all .3s;
+    height: 100%;
+    color: #C0C4CC;
+    text-align: right;
+}
 </style>

src/request/http.js

@@ -48,13 +48,13 @@ const errorHandle = (status, other) => {
             }, 1000);
             break;
         case 404: tip('请求的资源不存在'); break;
-        case 408: tip('请求超时(408)');
-        case 500: tip('服务器错误(500)');
-        case 501: tip('服务未实现(501)');
-        case 502: tip('网络错误(502)');
-        case 503: tip('服务不可用(503)');
-        case 504: tip('网络超时(504)');
-        case 505: tip('HTTP版本不受支持(505)');
+        case 408: tip('请求超时(408)'); break;
+        case 500: tip('服务器错误(500)'); break;
+        case 501: tip('服务未实现(501)'); break;
+        case 502: tip('网络错误(502)'); break;
+        case 503: tip('服务不可用(503)'); break;
+        case 504: tip('网络超时(504)'); break;
+        case 505: tip('HTTP版本不受支持(505)'); break;
         default: tip(`连接出错,${other}`);
     }
 }

src/store/index.js

@@ -5,7 +5,7 @@ Vue.use(Vuex);
 const store = new Vuex.Store({
   state: {
     role: 2, // 0：普通用户，1：组织管理员，2：超级管理员
-    serviceShopMenu: "shopDataList", // 服务超市侧边栏
+    serviceShopMenu: "/shop/data_service_list", // 服务超市侧边栏
     fwglNav: [
       ["注册发布的服务", "申请的服务", "云资源服务"], // 普通用户
       ["组织服务管理", "服务审批管理", "云资源管理"], // 组织管理员