Commit cf510d26 authored by 刘殿昕's avatar 刘殿昕

logo可点,收银-订单,首页推荐,优化超市列表展开,云资源一堆,普通用户页面ok

parent 901e98c6
<template> <template>
<div class="menu"> <div class="menu">
<img src="../assets/imgs/home_img_logo.png" alt class="logo" /> <img @click="gotopage('/services_shop')" src="../assets/imgs/home_img_logo.png" alt class="logo" />
<div style="float:right;cursor: pointer;position:relative;" class="user_hover"> <div style="float:right;cursor: pointer;position:relative;" class="user_hover">
<span <span
v-if="userInfo.user_name && userInfo.user_name != ''" v-if="userInfo.user_name && userInfo.user_name != ''"
...@@ -94,7 +94,7 @@ export default { ...@@ -94,7 +94,7 @@ export default {
user_arr: [ user_arr: [
{ name: "个人档案", path: "/user/user_info" }, { name: "个人档案", path: "/user/user_info" },
{ name: "消息通知", path: "/user/message" }, { name: "消息通知", path: "/user/message" },
{ name: "收银中心", path: "" }, { name: "订单管理", path: "/user/order_list" },
{ name: "关于BD-aPaaS", path: "" }, { name: "关于BD-aPaaS", path: "" },
{ name: "退出登录", path: "logout" } { name: "退出登录", path: "logout" }
], ],
...@@ -209,6 +209,7 @@ export default { ...@@ -209,6 +209,7 @@ export default {
.logo { .logo {
float: left; float: left;
margin: 30px 0 0 40px; margin: 30px 0 0 40px;
cursor: pointer;
} }
.user { .user {
float: right; float: right;
......
...@@ -216,7 +216,12 @@ export default { ...@@ -216,7 +216,12 @@ export default {
], ],
page: 1, page: 1,
limit: 10, limit: 10,
couldTwice: false couldTwice: false,
refresh_app_1: false,
refresh_app_2: false,
refresh_app_3: false,
time_app: null,
times: null
}), }),
mounted() {}, mounted() {},
watch: { watch: {
...@@ -327,6 +332,12 @@ export default { ...@@ -327,6 +332,12 @@ export default {
this.getAppType(); this.getAppType();
this.getAppOrg(); this.getAppOrg();
this.getShopList(); this.getShopList();
this.time_app = setInterval(() => {
if (this.refresh_app_1 && this.refresh_app_2 && this.refresh_app_3) {
this.judgeHeight();
clearInterval(this.time_app)
}
}, 50);
} else { } else {
let query = { let query = {
type: this.urlFilter type: this.urlFilter
...@@ -356,12 +367,14 @@ export default { ...@@ -356,12 +367,14 @@ export default {
judgeHeight() { judgeHeight() {
let list = this.filterLists; let list = this.filterLists;
for (let i = 0; i < list.length; i++) { for (let i = 0; i < list.length; i++) {
let offHeight = document.getElementById(list[i].id).offsetHeight; if (list[i].childDomains.length != 0) {
if (offHeight > 60) { let offHeight = document.getElementById(list[i].id).offsetHeight;
list[i].showOpen = true; if (offHeight > 60) {
this.openList[i] = "up"; list[i].showOpen = true;
} else { this.openList[i] = "up";
list[i].showOpen = false; } else {
list[i].showOpen = false;
}
} }
} }
this.$set((this.filterLists = list)); this.$set((this.filterLists = list));
...@@ -459,6 +472,7 @@ export default { ...@@ -459,6 +472,7 @@ export default {
this.$api.serviceShop.getAppArea().then(response => { this.$api.serviceShop.getAppArea().then(response => {
if (response.data.success == 1) { if (response.data.success == 1) {
this.filterLists[1].childDomains = response.data.data; this.filterLists[1].childDomains = response.data.data;
this.refresh_app_1 = true;
} else { } else {
console.log(response.data.errMsg); console.log(response.data.errMsg);
} }
...@@ -468,6 +482,7 @@ export default { ...@@ -468,6 +482,7 @@ export default {
this.$api.serviceShop.getAppType().then(response => { this.$api.serviceShop.getAppType().then(response => {
if (response.data.success == 1) { if (response.data.success == 1) {
this.filterLists[2].childDomains = response.data.data; this.filterLists[2].childDomains = response.data.data;
this.refresh_app_2 = true;
} else { } else {
console.log(response.data.errMsg); console.log(response.data.errMsg);
} }
...@@ -477,6 +492,7 @@ export default { ...@@ -477,6 +492,7 @@ export default {
this.$api.serviceShop.getAppOrg().then(response => { this.$api.serviceShop.getAppOrg().then(response => {
if (response.data.success == 1) { if (response.data.success == 1) {
this.filterLists[3].childDomains = response.data.data; this.filterLists[3].childDomains = response.data.data;
this.refresh_app_3 = true;
} else { } else {
console.log(response.data.errMsg); console.log(response.data.errMsg);
} }
......
<template> <template>
<div class="shop_card"> <div class="shop_card" @click="intoDetail">
<div class="shop_car-img" v-if="showImg" @click="intoDetail"> <div class="shop_car-img" v-if="showImg">
<img :src="data.cover" width="100%" /> <img :src="data.cover" width="100%" />
</div> </div>
<div class="shop_card-top"> <div class="shop_card-top">
<p <p class="shop_card-title text_clip_2" v-text="data.name" :title="data.name"></p>
class="shop_card-title text_clip_2"
v-text="data.name"
:title="data.name"
@click="intoDetail"
></p>
<p class="shop_card-text under_text"> <p class="shop_card-text under_text">
<span class="text_clip" v-text="data.department_name" :title="data.department_name"></span> <span class="text_clip" v-text="data.department_name" :title="data.department_name"></span>
<span> <span>
...@@ -87,6 +82,7 @@ export default { ...@@ -87,6 +82,7 @@ export default {
border: 1px solid #ededed; border: 1px solid #ededed;
border-radius: 10px; border-radius: 10px;
box-sizing: border-box; box-sizing: border-box;
cursor: pointer;
} }
.shop_car-img { .shop_car-img {
cursor: pointer; cursor: pointer;
......
...@@ -262,7 +262,7 @@ export default { ...@@ -262,7 +262,7 @@ export default {
type: "image", type: "image",
img: "./static/topology_ic_zonghefw.svg", img: "./static/topology_ic_zonghefw.svg",
size: [15, 15], size: [15, 15],
label: "综合服务" label: "综合应用"
} }
] ]
}; };
......
...@@ -161,22 +161,22 @@ export default { ...@@ -161,22 +161,22 @@ export default {
{ {
name: "服务类型", name: "服务类型",
prop: "fwlx", prop: "fwlx",
data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合服务"] data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合应用"]
}, },
{ {
name: "服务领域", name: "服务领域",
prop: "fwly", prop: "fwly",
data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合服务"] data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合应用"]
}, },
{ {
name: "开放程度", name: "开放程度",
prop: "kfcd", prop: "kfcd",
data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合服务"] data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合应用"]
}, },
{ {
name: "服务状态", name: "服务状态",
prop: "fwzt", prop: "fwzt",
data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合服务"] data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合应用"]
} }
], ],
params: { params: {
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<!-- 热门数据 --> <!-- 热门数据 -->
<shop-list <shop-list
name="热门数据" name="热门数据"
to="/shop/data_service_list" to="/shop/data_service_list/5"
detail-path="/shop/sjfwDetail/" detail-path="/shop/sjfwDetail/"
:data="hot_datas" :data="hot_datas"
:showImg="false" :showImg="false"
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<!-- 精品地图 --> <!-- 精品地图 -->
<shop-list <shop-list
name="精品地图" name="精品地图"
to="/shop/space_time_service_list" to="/shop/space_time_service_list/6"
detail-path="/shop/skfwDetail/" detail-path="/shop/skfwDetail/"
:data="map_datas" :data="map_datas"
:showImg="true" :showImg="true"
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<!-- 综合应用 --> <!-- 综合应用 -->
<shop-list <shop-list
name="综合应用" name="综合应用"
to="/shop/comprehensive_app_list" to="/shop/comprehensive_app_list/21"
detail-path="/shop/zhfwDetail/" detail-path="/shop/zhfwDetail/"
:data="comprehensive_datas" :data="comprehensive_datas"
:showImg="true" :showImg="true"
......
...@@ -58,7 +58,7 @@ export default { ...@@ -58,7 +58,7 @@ export default {
this.filterNames = []; this.filterNames = [];
break; break;
case "comprehensive_app_list": case "comprehensive_app_list":
this.name = "综合服务"; this.name = "综合应用";
this.urlFilter = "21"; this.urlFilter = "21";
this.url = "/shop/zhfwDetail"; this.url = "/shop/zhfwDetail";
this.filterNames = ["服务类型", "应用领域", "服务来源组织"]; this.filterNames = ["服务类型", "应用领域", "服务来源组织"];
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<el-breadcrumb separator="/"> <el-breadcrumb separator="/">
<el-breadcrumb-item to="/shop">服务超市</el-breadcrumb-item> <el-breadcrumb-item to="/shop">服务超市</el-breadcrumb-item>
<el-breadcrumb-item to="/shop/comprehensive_app_list/11"> <el-breadcrumb-item to="/shop/comprehensive_app_list/11">
综合服务 综合应用
</el-breadcrumb-item> </el-breadcrumb-item>
<el-breadcrumb-item>服务详情信息</el-breadcrumb-item> <el-breadcrumb-item>服务详情信息</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
......
This diff is collapsed.
...@@ -378,7 +378,7 @@ export default { ...@@ -378,7 +378,7 @@ export default {
"时空服务", "时空服务",
"视频服务", "视频服务",
"感知服务", "感知服务",
"综合服务" "综合应用"
], ],
scrvice_area_arr: [ scrvice_area_arr: [
"经济建设", "经济建设",
......
...@@ -206,7 +206,7 @@ export default new Router({ ...@@ -206,7 +206,7 @@ export default new Router({
path: "/shop/zhfwDetail/:id", path: "/shop/zhfwDetail/:id",
name: "zhfwDetail", name: "zhfwDetail",
component: () => import("@/pages/service_shop/zhfwDetail"), component: () => import("@/pages/service_shop/zhfwDetail"),
}, // 服务超市 - 综合服务详情 }, // 服务超市 - 综合应用详情
{ {
path: "/shop/yysdDetail/:id", path: "/shop/yysdDetail/:id",
name: "yysdDetail", name: "yysdDetail",
......
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
"publishTime": "2020-03-12 18:31:12", "publishTime": "2020-03-12 18:31:12",
"updatedTime": "2020-03-12 18:31:12", "updatedTime": "2020-03-12 18:31:12",
"dataField": "经济建设", "dataField": "经济建设",
"serviceType": "综合服务", "serviceType": "综合应用",
"resourceSummary": "提供视频监控的空间分布展示和视频监控直播的服务,MOUMOU监控服务和直播服务的新服务。", "resourceSummary": "提供视频监控的空间分布展示和视频监控直播的服务,MOUMOU监控服务和直播服务的新服务。",
"specifications": [ "specifications": [
{ {
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
"providedBy": "北京比格数据", "providedBy": "北京比格数据",
"publishTime": "2020-03-12 18:31:12", "publishTime": "2020-03-12 18:31:12",
"acquireCount": "9999", "acquireCount": "9999",
"serviceType": "综合服务", "serviceType": "综合应用",
"dataField": "经济建设", "dataField": "经济建设",
"specifications": [ "specifications": [
{ {
......
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
"value": 50 "value": 50
}, },
{ {
"name": "综合服务", "name": "综合应用",
"value": 0 "value": 0
} }
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment