Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

src/App.vue

 <template>
   <div id="app">
-    <bd-menu class="outmenu"></bd-menu>
+    <bd-menu v-if="this.$route.path != '/login'" class="outmenu"></bd-menu>
     <router-view />
   </div>
 </template>

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">申请时间：{{ cellItem.applicationTime }}</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">
@@ -107,6 +107,7 @@
 </template>
 
 <script>
+import helper from "@/services/helper";
 export default {
   props: {
     cellItem: {
@@ -131,6 +132,9 @@ export default {
     },
     viewDetail(val) {
       this.$router.push("/user/order_detail/" + val)
+    },
+    delOrder() {
+
     }
   }
 };
@@ -163,6 +167,7 @@ export default {
   display: flex;
   float: right;
   margin-right: 40px;
+  cursor: pointer;
 }
 .cell_row {
 }

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

@@ -4,8 +4,8 @@
       <el-tab-pane
         v-for="(item, index) in stateList"
         :key="'state' + index"
-        :label="item"
-        :name="item"
+        :label="item.label"
+        :name="item.value"
       ></el-tab-pane>
     </el-tabs>
     <div class="list_options">
@@ -85,17 +85,24 @@ export default {
     OrderList
   },
   data: () => ({
-    stateList: ["全部订单", "待审核", "审核中", "已获取", "未通过", "已取消"],
-    activeName: "全部订单",
+    stateList: [
+      { value: "0", label: "全部订单" },
+      { value: "1", label: "待审核" },
+      { value: "2", label: "审核中" },
+      { value: "3", label: "已获取" },
+      { value: "4", label: "未通过" },
+      { value: "5", label: "已取消" }
+    ],
+    activeName: "0",
     buttonList: [
-      { label: "全部", state: false },
-      { label: "数据服务", state: false },
-      { label: "时空服务", state: false },
-      { label: "视频服务", state: false },
-      { label: "感知服务", state: false },
-      { label: "综合服务", state: false },
-      { label: "云资源", state: false },
-      { label: "应用镜像", state: false }
+      { value: 0, label: "全部", state: false },
+      { value: 1, label: "数据服务", state: false },
+      { value: 2, label: "时空服务", state: false },
+      { value: 3, label: "视频服务", state: false },
+      { value: 4, label: "感知服务", state: false },
+      { value: 5, label: "综合服务", state: false },
+      { value: 6, label: "云资源", state: false },
+      { value: 7, label: "应用镜像", state: false }
     ],
     search: "",
     pagination: {
@@ -117,64 +124,15 @@ export default {
         label: "50"
       }
     ],
-    datas: [
-      {
-        id: 0,
-        name: "水路货物周转量情况",
-        type: "基础数据服务",
-        creator: "贵州省交通运输厅0",
-        state: 1,
-        mapService: 1,
-        num: 2,
-        checkedSubscription: false,
-        specification: 1,
-        specificationApplication: 2,
-        evaluationText: "这条服条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用。这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用。",
-        evaluationRate: 4.7,
-        applicationTime: "2021-04-24 15:02:00",
-        orderNumber: "2020042422222222000001",
-        getStatus: 2
-      },
-      {
-        id: 1,
-        name: "水路货物周转量情况水路货物周水路货物周转量情况水路货物周",
-        type: "基础数据服务",
-        creator: "贵州省交通运输厅1",
-        state: 1,
-        num: 2,
-        checkedSubscription: false,
-        specification: 1,
-        specificationApplication: 2,
-        evaluationText: "这条服务非常好务非常好非常实用这非常实用这条服务非常好非常实用。",
-        evaluationRate: 3.7,
-        applicationTime: "2020-04-24 15:02:00",
-        orderNumber: "202004241502000001",
-        getStatus: 3
-      },
-      {
-        id: 2,
-        name: "水路货物周转量情况水路货物周转量情况路货物周转量情况",
-        type: "基础数据服务",
-        creator: "贵州省交通运输厅2",
-        state: 1,
-        mapService: 1,
-        num: 2,
-        checkedSubscription: true,
-        specification: 1,
-        specificationApplication: 2,
-        evaluationText: "这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用。这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用。",
-        evaluationRate: 3.7,
-        applicationTime: "2020-04-24 15:02:00",
-        orderNumber: "202004241502000001",
-        getStatus: 1
-      }
-    ]
+    datas: []
   }),
   mounted() {
-    this.getTotal();
+    this.getData();
   },
   methods: {
-    tabClick() {},
+    tabClick() {
+      this.getData();
+    },
     btnClick(index) {
       if (index != 0) {
         this.buttonList[0].state = false;
@@ -185,24 +143,42 @@ export default {
         }
         this.buttonList[0].state = !this.buttonList[0].state;
       }
+      this.getData();
     },
     // search debonce 500ms
     searchVal() {
       if (this.times !== null) clearTimeout(this.times);
       this.times = setTimeout(() => {
-        this.getShopList();
+        this.getData();
       }, 500);
     },
-    getTotal() {
-      this.pagination.total = this.datas.length;
+    getData() {
+      let arr = [];
+      this.buttonList.forEach(item => {
+        if (item.state == true) {
+          arr.push(item.value);
+        }
+      });
+      let params = {
+        select: this.search,
+        page: this.pagination.page,
+        limit: this.pagination.rowsPerPage,
+        status: this.activeName,
+        types: arr
+      };
+      this.$api.user.orderList(params).then(response => {
+        console.log(response);
+        this.datas = response.data.data;
+        this.pagination.total = response.data.total;
+      });
     },
     handleSizeChange(val) {
       this.pagination.rowsPerPage = val;
-      this.$emit("refresh", this.pagination);
+      this.getData();
     },
     handleCurrentChange(val) {
       this.pagination.page += val;
-      this.$emit("refresh", this.pagination);
+      this.getData();
     }
   }
 };

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/shop-cloud/shop-cloud.vue

@@ -91,7 +91,7 @@
                   <el-input-number
                     v-model="formNew.containerGroup"
                     controls-position="right"
-                    :min="1"
+                    :min="0"
                     :max="10"
                     placeholder="取值范围[0，24]"
                   ></el-input-number>
@@ -104,7 +104,7 @@
                   <el-input-number
                     v-model="formNew.dataDisk"
                     controls-position="right"
-                    :min="1"
+                    :min="0"
                     :max="10"
                     placeholder="请选择数量"
                   ></el-input-number>
@@ -117,7 +117,7 @@
                   <el-input-number
                     v-model="formNew.perDataDisk"
                     controls-position="right"
-                    :min="1"
+                    :min="0"
                     :max="10"
                     placeholder="请选择容量"
                   ></el-input-number>
@@ -136,7 +136,7 @@
                   <el-input-number
                     v-model="formNew.perCPUs"
                     controls-position="right"
-                    :min="1"
+                    :min="0"
                     :max="10"
                     placeholder="请选择CPU最高使用量"
                   ></el-input-number>
@@ -149,7 +149,7 @@
                   <el-input-number
                     v-model="formNew.perCPU"
                     controls-position="right"
-                    :min="1"
+                    :min="0"
                     :max="10"
                     placeholder="请选择CPU默认使用量"
                   ></el-input-number>
@@ -165,7 +165,7 @@
                   <el-input-number
                     v-model="formNew.perRAMs"
                     controls-position="right"
-                    :min="1"
+                    :min="0"
                     :max="10"
                     placeholder="请选择内存最高使用量"
                   ></el-input-number>
@@ -178,7 +178,7 @@
                   <el-input-number
                     v-model="formNew.perRAM"
                     controls-position="right"
-                    :min="1"
+                    :min="0"
                     :max="10"
                     placeholder="请选择内存默认使用量"
                   ></el-input-number>
@@ -194,7 +194,7 @@
                   <el-input-number
                     v-model="formNew.appDuration"
                     controls-position="right"
-                    :min="1"
+                    :min="0"
                     :max="10"
                   ></el-input-number>
                   <el-select
@@ -302,7 +302,7 @@
                     <el-input-number
                       v-model="formOld.containerGroup"
                       controls-position="right"
-                      :min="1"
+                      :min="0"
                       :max="10"
                       placeholder="取值范围[0，24]"
                     ></el-input-number>
@@ -315,7 +315,7 @@
                     <el-input-number
                       v-model="formOld.dataDisk"
                       controls-position="right"
-                      :min="1"
+                      :min="0"
                       :max="10"
                     ></el-input-number>
                     <div class="input_right">块</div>
@@ -327,7 +327,7 @@
                     <el-input-number
                       v-model="formOld.perDataDisk"
                       controls-position="right"
-                      :min="1"
+                      :min="0"
                       :max="10"
                     ></el-input-number>
                     <div class="input_right">GB</div>
@@ -366,7 +366,7 @@
                     <el-input-number
                       v-model="formOld.perCPUs"
                       controls-position="right"
-                      :min="1"
+                      :min="0"
                       :max="10"
                       placeholder="请设置CPU最高使用量"
                     ></el-input-number>
@@ -379,7 +379,7 @@
                     <el-input-number
                       v-model="formOld.perCPU"
                       controls-position="right"
-                      :min="1"
+                      :min="0"
                       :max="10"
                       placeholder="请设置CPU默认使用量"
                     ></el-input-number>
@@ -395,7 +395,7 @@
                     <el-input-number
                       v-model="formOld.perRAMs"
                       controls-position="right"
-                      :min="1"
+                      :min="0"
                       :max="10"
                       placeholder="请设置内存最高使用量"
                     ></el-input-number>
@@ -408,7 +408,7 @@
                     <el-input-number
                       v-model="formOld.perRAM"
                       controls-position="right"
-                      :min="1"
+                      :min="0"
                       :max="10"
                       placeholder="请设置内存默认使用量"
                     ></el-input-number>
@@ -437,7 +437,7 @@
                     <el-input-number
                       v-model="formOld.appDuration"
                       controls-position="right"
-                      :min="1"
+                      :min="0"
                       :max="10"
                     ></el-input-number>
                     <el-select
@@ -675,6 +675,9 @@ export default {
     getForm(val) {
       if (val != "") {
         this.formShow = true;
+        Object.keys(this.formOld).forEach(item => {
+          this.formOld[item] = "";
+        });
       } else {
         this.formShow = false;
       }
@@ -916,6 +919,7 @@ export default {
 <style>
 .form_block .el-input .el-input__inner {
   background-color: #f7f8f9;
+  color: #242c43;
 }
 .cloud_form .el-input {
   width: 100%;
@@ -929,12 +933,14 @@ export default {
 }
 .cloud_form .input_has_left_right .el-input__inner {
   border-radius: 0;
+  color: #242c43;
 }
 .cloud_form .el-select {
   width: 100%;
 }
 .cloud_form .el-input .el-input__inner {
   background-color: #f7f8f9;
+  color: #242c43;
 }
 .cloud_form .el-input-number {
   width: calc(100% - 60px);
@@ -948,6 +954,7 @@ export default {
 }
 .cloud_form .el-input-number .el-input__inner {
   text-align: left;
+  color: #242c43;
 }
 .cloud_form .el-textarea {
   width: 100%;
@@ -955,6 +962,7 @@ export default {
 .cloud_form .el-textarea .el-textarea__inner {
   background-color: #f7f8f9;
   border-radius: 8px;
+  color: #242c43;
 }
 .form_item .el-form-item__content {
   width: 100%;
@@ -964,6 +972,7 @@ export default {
 }
 .input_has_right .el-input__inner {
   border-radius: 8px 0 0 8px;
+  color: #242c43;
 }
 .cloud_form .input_has_right_select .el-input-number {
   width: calc(100% - 100px);
@@ -979,6 +988,7 @@ export default {
 }
 .input_has_right_select .el-input__inner {
   border-radius: 8px 0 0 8px;
+  color: #242c43;
 }
 .input_has_right_select .input_right_select.el-select .el-input {
   width: 100px;
@@ -995,6 +1005,7 @@ export default {
 }
 .input_right_select .el-input .el-input__inner {
   background-color: #0f2683;
+  color: #242c43;
 }
 .cloud_form .el-input-number .el-input-number__increase,
 .cloud_form .el-input-number .el-input-number__decrease {

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/components/shopping-cart/shopping-cart-list.vue

@@ -42,7 +42,6 @@ export default {
     checkList: {
       immediate: true, // 这句重要
       handler(val) {
-        console.log("ss")
         this.checkLists = 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/authority/roles.vue

@@ -50,6 +50,12 @@ export default {
     showDialog() {
       this.$refs.dialog.show();
     },
+    editItem(item) {
+      this.$router.push(`/authority/roles/edit/${item.id}`);
+    },
+    allotItem(item) {
+      this.$router.push(`/authority/roles/allot/${item.id}`);
+    },
     deleteItem(item) {
       this.dialogInfo.title = "";
       this.dialogInfo.msg = "确认删除当前角色";
@@ -67,9 +73,7 @@ export default {
         label: "角色类型",
         prop: "name",
         type: "button",
-        callback(item) {
-          console.log("查看详情 - " + item.name);
-        },
+        callback: this.editItem,
       },
       {
         label: "创建人",
@@ -91,9 +95,7 @@ export default {
         actionList: [
           {
             label: "分配权限",
-            callback(item) {
-              console.log("分配权限 - " + item.name);
-            },
+            callback: this.allotItem,
           },
           {
             label: "删除",

src/pages/authority/users.vue

 <template>
   <div class="users_list">
     <apass-list
-      @list-action="listAction"
       search-placeholder="请输入关键字"
       :list-total="listTotal"
+      @list-action="initDatas"
     >
       <el-breadcrumb separator="/" slot="breadcrumb">
         <el-breadcrumb-item to="/authority">权限管理</el-breadcrumb-item>
@@ -185,8 +185,29 @@ export default {
     showDialog: false,
   }),
   methods: {
-    listAction(value) {
-      console.log(value);
+    initDatas(filter) {
+      // console.log(filter);
+
+      this.$http
+        .get("/apaas/backmgt/user/list", {
+          params: {
+            keyword: filter.keyword,
+            limit: filter.page,
+            page: filter.size,
+            user_id: "ym",
+            user_name: "",
+            department_id: "",
+            state: 1,
+          },
+        })
+        .then(({ data }) => {
+          console.log(data);
+          // this.listTotal = data.data.total;
+          // this.listData = data.data.data;
+        })
+        .catch((error) => {
+          console.log(error);
+        });
     },
     setRole(item) {
       console.log("setRole " + item.name);

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

+<template>
+  <div>
+    <el-container>
+      <el-aside width="180px">
+        <service-shop-menu></service-shop-menu>
+      </el-aside>
+      <el-main>
+        <service-list :name="name" :url="url" :urlList="urlList" :urlFilter="urlFilter"></service-list>
+      </el-main>
+    </el-container>
+  </div>
+</template>
+
+<script>
+import ServiceShopMenu from "@/components/service_shop_menu";
+import ServiceList from "@/components/service-list/service_list";
+export default {
+  components: {
+    ServiceShopMenu,
+    ServiceList
+  },
+  data: () => ({
+    urlFilter: "",
+    url: "",
+    urlList: "2222",
+    name: ""
+  }),
+  mounted() {
+    this.getVal(this.$route.path);
+  },
+  methods: {
+    getVal(val) {
+      switch (val) {
+        case "/shop/data_service_list":
+          this.name = "数据服务";
+          this.urlFilter = "5";
+          break;
+        case "/shop/space_time_service_list":
+          this.name = "时空服务";
+          this.urlFilter = "6";
+          break;
+        case "/shop/video_service_list":
+          this.name = "视频服务";
+          this.urlFilter = "7";
+          break;
+        case "/shop/perception_service_list":
+          this.name = "感知服务";
+          this.urlFilter = "10";
+          break;
+        case "/shop/comprehensive_app_list":
+          this.name = "综合服务";
+          this.urlFilter = "";
+          break;
+        case "/shop/app_store_list":
+          this.name = "应用商店";
+          this.urlFilter = "";
+          break;
+        default:
+          this.name = "";
+          this.urlFilter = "";
+          break;
+      }
+    }
+  },
+  watch: {
+    "$route.path": {
+      handler(val) {
+        this.getVal(val);
+      }
+    }
+  }
+};
+</script>
+<style scoped>
+</style>
\ No newline at end of file

src/pages/service_shop/shop_list_app_store.vue

-<template>
-  <div>
-    <el-container>
-      <el-aside width="180px">
-        <service-shop-menu></service-shop-menu>
-      </el-aside>
-      <el-main>
-        <service-list name="应用商店" url="yysdDetail" urlList="url1sss" urlFilter="urldwad2222"></service-list>
-      </el-main>
-    </el-container>
-  </div>
-</template>
-
-<script>
-import ServiceShopMenu from "@/components/service_shop_menu";
-import ServiceList from "@/components/service_list";
-export default {
-  components: {
-    ServiceShopMenu,
-    ServiceList
-  },
-  data: () => ({}),
-  mounted() {},
-  methods: {}
-};
-</script>
-<style scoped>
-</style>
\ No newline at end of file

src/pages/service_shop/shop_list_comprehensive_app.vue

-<template>
-  <div>
-    <el-container>
-      <el-aside width="180px">
-        <service-shop-menu></service-shop-menu>
-      </el-aside>
-      <el-main>
-        <service-list name="综合应用" url="zhfwDetail" urlList="url1sss" urlFilter="urldwad2222"></service-list>
-      </el-main>
-    </el-container>
-  </div>
-</template>
-
-<script>
-import ServiceShopMenu from "@/components/service_shop_menu";
-import ServiceList from "@/components/service_list";
-export default {
-  components: {
-    ServiceShopMenu,
-    ServiceList
-  },
-  data: () => ({}),
-  mounted() {},
-  methods: {}
-};
-</script>
-<style scoped>
-</style>
\ No newline at end of file

src/pages/service_shop/shop_list_data.vue

-<template>
-  <div>
-    <el-container>
-      <el-aside width="180px">
-        <service-shop-menu></service-shop-menu>
-      </el-aside>
-      <el-main>
-        <service-list name="数据服务" url="sjfwDetail" urlList="url1sss" urlFilter="urldwad2222"></service-list>
-      </el-main>
-    </el-container>
-  </div>
-</template>
-
-<script>
-import ServiceShopMenu from "@/components/service_shop_menu";
-import ServiceList from "@/components/service_list";
-export default {
-  components: {
-    ServiceShopMenu,
-    ServiceList
-  },
-  data: () => ({}),
-  mounted() {},
-  methods: {}
-};
-</script>
-<style scoped>
-</style>
\ No newline at end of file

src/pages/service_shop/shop_list_perception.vue

-<template>
-  <div>
-    <el-container>
-      <el-aside width="180px">
-        <service-shop-menu></service-shop-menu>
-      </el-aside>
-      <el-main>
-        <service-list name="感知服务"></service-list>
-      </el-main>
-    </el-container>
-  </div>
-</template>
-
-<script>
-import ServiceShopMenu from "@/components/service_shop_menu";
-import ServiceList from "@/components/service_list";
-export default {
-  components: {
-    ServiceShopMenu,
-    ServiceList
-  },
-  data: () => ({}),
-  mounted() {},
-  methods: {}
-};
-</script>
-<style scoped>
-</style>
\ No newline at end of file

src/pages/service_shop/shop_list_space_time.vue

-<template>
-  <div>
-    <el-container>
-      <el-aside width="180px">
-        <service-shop-menu></service-shop-menu>
-      </el-aside>
-      <el-main>
-        <service-list name="时空服务" url="skfwDetail" urlList="url1sss" urlFilter="urldwad2222"></service-list>
-      </el-main>
-    </el-container>
-  </div>
-</template>
-
-<script>
-import ServiceShopMenu from "@/components/service_shop_menu";
-import ServiceList from "@/components/service_list";
-export default {
-  components: {
-    ServiceShopMenu,
-    ServiceList
-  },
-  data: () => ({}),
-  mounted() {},
-  methods: {}
-};
-</script>
-<style scoped>
-</style>
\ No newline at end of file

src/pages/service_shop/shop_list_video.vue

-<template>
-  <div>
-    <el-container>
-      <el-aside width="180px">
-        <service-shop-menu></service-shop-menu>
-      </el-aside>
-      <el-main>
-        <service-list name="视频服务"></service-list>
-      </el-main>
-    </el-container>
-  </div>
-</template>
-
-<script>
-import ServiceShopMenu from "@/components/service_shop_menu";
-import ServiceList from "@/components/service_list";
-export default {
-  components: {
-    ServiceShopMenu,
-    ServiceList
-  },
-  data: () => ({}),
-  mounted() {},
-  methods: {}
-};
-</script>
-<style scoped>
-</style>
\ No newline at end of file

src/pages/service_shop/shopping_cart.vue

@@ -25,7 +25,7 @@ export default {
   margin: 0 auto;
 }
 .shopping_title {
-  height: 40px;
-  line-height: 40px;
+  height: 45px;
+  line-height: 45px;
 }
 </style>
\ No newline at end of file

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/api.js

 import workbench from '@/request/api/workbench';
 import serviceShop from '@/request/api/service_shop';
 import user from '@/request/api/user';
+import authority from '@/request/api/authority';
 
 export default {
     workbench,
     serviceShop,
-    user
+    user,
+    authority
 }
\ No newline at end of file

src/request/api/authority.js

+import axios from '@/request/http'; // 导入http中创建的axios实例
+import qs from 'qs'; // 根据需求是否导入qs模块
+
+const authority = {
+    // Menu
+    getMenuList() {
+        return axios.get(`/apaas/backmgt/menu/list`);
+    },
+    addMenu(params) {
+        return axios.post(`/apaas/backmgt/menu`, params);
+    },
+    delMenu(params) {
+        return axios.delete(`/apaas/backmgt/menu/id/${params.id}`);
+    },
+    getMenu(params) {
+        return axios.get(`/apaas/backmgt/menu/id/${params.id}`);
+    },
+    positionMenu(params) {
+        return axios.post(`/apaas/backmgt/menu/menuOrder`, params);
+    },
+    editMenu(params) {
+        return axios.put(`/apaas/backmgt/menu`, params);
+    }
+}
+
+export default authority;

src/request/api/service_shop.js

@@ -3,6 +3,42 @@ import qs from 'qs'; // 根据需求是否导入qs模块
 
 const serviceShop = {
 
+    // service list
+    getServiceShopFilter(params) {
+        // 5:数据   6:时空  7:视频  10:感知
+        return axios.get(`/apaas/serviceapp/v3/servicemarket/profileInfo?serviceType=${params.type}`);
+    },
+    getServiceShopList(params) {
+        return axios.get(`/apaas/serviceapp/v3/servicemarket/list?
+serviceName=${params.serviceName}&serviceType1=${params.serviceType1}&
+serviceType2s=${params.serviceType2s}&dataDomains=${params.dataDomains}&
+organizeIds=${params.organizeIds}&orderBy=${params.orderBy}&
+Page=${params.Page}&Size=${params.Size}`);
+    },
+    getServiceShopDetail(params) {
+        return axios.get(`/apaas/serviceapp/v3/servicemarket/detail?serviceId=`)
+    },
+
+    // shopping cart
+    addShoppingCart(params) {
+        return axios.post(`/apaas/serviceapp/v3/shopcart/add`, params);
+    },
+    delShoppingCart(params) {
+        // note: if parans is empty, it will delete all data.
+        return axios.post(`/apaas/serviceapp/v3/shopcart/del`, params);
+    },
+    getShoppingCart() {
+        return axios.get(`/apaas/serviceapp/v3/shopcart/list`);
+    },
+    updateShoppingCart(params) {
+        return axios.post(`/apaas/serviceapp/v3/shopcart/update`, params);
+    },
+    getSystemList() {
+        return axios.get(`/apaas/serviceapp/v3/shopcart/systems`);
+    },
+    submitShoppingCart() {
+        return axios.post(`/apaas/serviceapp/v3/shopcart/apply`, params);
+    },
 }
 
 export default serviceShop;

src/request/api/user.js

@@ -2,7 +2,9 @@ import axios from '@/request/http'; // 导入http中创建的axios实例
 import qs from 'qs'; // 根据需求是否导入qs模块
 
 const user = {
-
+    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}`);
+    },
 }
 
 export default user;

src/request/http.js

@@ -5,9 +5,11 @@
 import axios from 'axios';
 import router from '../router';
 import store from '../store/index';
+import ElementUI from 'element-ui';
 
 const tip = msg => {
-    console.log(msg)
+    console.log(msg);
+    ElementUI.Message.error(msg);
 }
 
 /** 
@@ -46,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}`);
     }
 }
@@ -67,8 +69,8 @@ instance.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlenco
  */
 instance.interceptors.request.use(
     config => {
-        const token = store.state.token;
-        token && (config.headers.Authorization = token);
+        // const token = store.state.token;
+        // token && (config.headers.Authorization = token);
         return config;
     },
     error => Promise.error(error))

src/router/index.js

@@ -16,6 +16,11 @@ export default new Router({
       path: "/",
       redirect: "/index",
     },
+    {
+      path: "/login", // 登录注册
+      name: "login",
+      component: () => import("@/pages/login"),
+    },
     {
       path: "/index",
       name: "index",
@@ -120,30 +125,27 @@ export default new Router({
             {
               path: "/shop/data_service_list", // 数据服务列表页
               name: "shopDataList",
-              component: () => import("@/pages/service_shop/shop_list_data"),
+              component: () => import("@/pages/service_shop/shop_list"),
             },
             {
               path: "/shop/space_time_service_list", // 时空服务列表页
               name: "shopSpaceTimeList",
-              component: () =>
-                import("@/pages/service_shop/shop_list_space_time"),
+              component: () => import("@/pages/service_shop/shop_list"),
             },
             {
               path: "/shop/video_service_list", // 视频服务列表页
               name: "shopVideoList",
-              component: () => import("@/pages/service_shop/shop_list_video"),
+              component: () => import("@/pages/service_shop/shop_list"),
             },
             {
               path: "/shop/perception_service_list", // 感知服务列表页
               name: "shopPerceptionList",
-              component: () =>
-                import("@/pages/service_shop/shop_list_perception"),
+              component: () => import("@/pages/service_shop/shop_list"),
             },
             {
               path: "/shop/comprehensive_app_list", // 综合应用列表页
               name: "shopComAppList",
-              component: () =>
-                import("@/pages/service_shop/shop_list_comprehensive_app"),
+              component: () => import("@/pages/service_shop/shop_list"),
             },
             {
               path: "/shop/cloud", // 云资源服务
@@ -159,8 +161,7 @@ export default new Router({
             {
               path: "/shop/app_store_list", // 应用商店列表页
               name: "shopAppStoreList",
-              component: () =>
-                import("@/pages/service_shop/shop_list_app_store"),
+              component: () => import("@/pages/service_shop/shop_list"),
             },
             {
               path: "/shop/shopping_cart", // 购物车页

src/services/cookie.js

+
+// 取得cookie
+function getCookie(name) {
+    var nameEQ = name + '='
+    var ca = document.cookie.split(';') // 把cookie分割成组
+    for (var i = 0; i < ca.length; i++) {
+      var c = ca[i] // 取得字符串
+      while (c.charAt(0) == ' ') { // 判断一下字符串有没有前导空格
+        c = c.substring(1, c.length) // 有的话，从第二位开始取
+      }
+      if (c.indexOf(nameEQ) == 0) { // 如果含有我们要的name
+        return unescape(c.substring(nameEQ.length, c.length)) // 解码并截取我们要值
+      }
+    }
+    return false
+  }
+
+  // 清除cookie
+function clearCookie(name) {
+    setCookie(name, "", -1);
+}
+
+// 设置cookie
+function setCookie(name, value, seconds) {
+    seconds = seconds || 0;   //seconds有值就直接赋值，没有为0，这个根php不一样。
+    var expires = "";
+    if (seconds != 0 ) {      //设置cookie生存时间
+      var date = new Date();
+      date.setTime(date.getTime()+(seconds*1000));
+      expires = "; expires="+date.toGMTString();
+    }
+    document.cookie = name+"="+escape(value)+expires+"; path=/";   //转码并赋值
+  }
+
+
+export {
+    getCookie,
+    clearCookie,
+    setCookie,
+}

src/services/helper.js

@@ -14,28 +14,6 @@ module.exports.GetProperty = function (obj, prop) {
   return res;
 }
 
-module.exports.ymhdateFormat = function (timestamp) {
-  let date = new Date(timestamp);
-  let ret;
-  const opt = {
-    "Y+": date.getFullYear().toString(),        // 年
-    "m+": (date.getMonth() + 1).toString(),     // 月
-    "d+": date.getDate().toString(),            // 日
-    "H+": date.getHours().toString(),           // 时
-    "M+": date.getMinutes().toString(),         // 分
-    "S+": date.getSeconds().toString()          // 秒
-    // 有其他格式化字符需求可以继续添加，必须转化成字符串
-  };
-  var fmt="YYYY-mm-dd HH:MM:SS"
-  for (let k in opt) {
-    ret = new RegExp("(" + k + ")").exec(fmt);
-    if (ret) {
-      fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
-    };
-  };
-  return fmt;
-}
-
 module.exports.dateFormat = function (fmt, timestamp) {
   let date = new Date(timestamp);
   let ret;
@@ -55,4 +33,4 @@ module.exports.dateFormat = function (fmt, timestamp) {
     };
   };
   return fmt;
-}
\ No newline at end of file
+}

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: [
       ["注册发布的服务", "申请的服务", "云资源服务"], // 普通用户
       ["组织服务管理", "服务审批管理", "云资源管理"], // 组织管理员