Skip to content

A
apaas-ui
Commit ba66cb7b authored by 徐一鸣's avatar 徐一鸣
Browse files
Options

menu报错的问题

parent 85c67c0f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 827 additions and 38 deletions
src/components/image-bugs.vue 0 → 100644
View file @ ba66cb7b
This diff is collapsed.
src/components/image-detail.vue 0 → 100644
View file @ ba66cb7b
This diff is collapsed.
src/components/menu.vue
View file @ ba66cb7b
<template>
<div class="menu">
<img 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
v-if="userInfo.user_name && userInfo.user_name !=''"
v-if="userInfo.user_name && userInfo.user_name != ''"
class="user"
>{{ userInfo.user_name }}</span>
>{{ userInfo.user_name }}</span
>
<span v-else @click="gotopage('login')" class="user">请登录</span>
<img
:class="userInfo.picture_path ? 'user_pic': 'user_default'"
:class="userInfo.picture_path ? 'user_pic' : 'user_default'"
:src="
userInfo.picture_path || require('../assets/imgs/home_ic_user.png')
"
/>
<div v-if="userInfo.user_name && userInfo.user_name !=''" class="user_menu">
<div
v-if="userInfo.user_name && userInfo.user_name != ''"
class="user_menu"
>
<div
v-for="(item, index) in user_arr"
:key="index + 700"
@click="gotopage(item.path)"
>{{ item.name }}</div>
>
{{ item.name }}
</div>
</div>
<div v-if="userInfo.user_name && userInfo.user_name !=''" class="sj"></div>
<div
v-if="userInfo.user_name && userInfo.user_name != ''"
class="sj"
></div>
</div>
<div
style="float:right;cursor: pointer;position:relative;"
......@@ -28,10 +40,18 @@
@click="gotopage('/shop/shopping_cart')"
>
<div class="car">
<el-badge v-if="menuCartNum != 0" :value="menuCartNum" :max="99" class="number"></el-badge>
<el-badge
v-if="menuCartNum != 0"
:value="menuCartNum"
:max="99"
class="number"
></el-badge>
<img src="../assets/imgs/home_ic_shop.png" alt class="car_img" />
</div>
<div v-if="userInfo.user_name && userInfo.user_name !=''" class="shop_menu">
<div
v-if="userInfo.user_name && userInfo.user_name != ''"
class="shop_menu"
>
<div class="shop_list_title">最近加入的服务：</div>
<div
v-for="(item, index) in shopping_list"
......@@ -42,35 +62,44 @@
<div class="shop_cell_msgs">
<p @click="getDetail(item.id)" class="shop_cell_name over_one">
{{
item.service_id == 0
? item.application.app_name
: item.service.name
item.service_id == 0
? item.application.app_name
: item.service.name
}}
</p>
<p class="shop_cell_msg bover_one">
{{
item.service_id == 0
? item.application.ywly
: item.service.sectors_name
item.service_id == 0
? item.application.ywly
: item.service.sectors_name
}}
</p>
<p class="shop_cell_msg over_one">
{{
item.service_id == 0
? item.application.org
: item.service.organization_name
item.service_id == 0
? item.application.org
: item.service.organization_name
}}
</p>
</div>
<div>
<img @click.stop="deleteItem(item.id)" src="../assets/imgs/ic_delete.png" alt />
<img
@click.stop="deleteItem(item.id)"
src="../assets/imgs/ic_delete.png"
alt
/>
</div>
</div>
<div class="shop_footer">
<el-button @click="settlement" size="small" class="shop_settlement">去购物车申请结算</el-button>
<el-button @click="settlement" size="small" class="shop_settlement"
>去购物车申请结算</el-button
>
</div>
</div>
<div v-if="userInfo.user_name && userInfo.user_name !=''" class="shop_sj"></div>
<div
v-if="userInfo.user_name && userInfo.user_name != ''"
class="shop_sj"
></div>
</div>
<div style="float:right">
......@@ -82,14 +111,24 @@
:style="{ color: now_menu == item.visit_url ? '#fff' : '' }"
>
{{ item.menu_name }}
<div class="user_menu" v-if="item.Child && item.Child.length" style="left: 30px;">
<div
class="user_menu"
v-if="item.Child && item.Child.length"
style="left: 30px;"
>
<div
v-for="(v, indexs) in item.Child"
:key="indexs + 700"
@click.stop="gotoChildPage(v, item.visit_url)"
>{{ v.menu_name }}</div>
>
{{ v.menu_name }}
</div>
</div>
<div class="sj" v-if="item.Child && item.Child.length" style="left: 60px;"></div>
<div
class="sj"
v-if="item.Child && item.Child.length"
style="left: 60px;"
></div>
<div class="bottom_show" v-if="now_menu == item.visit_url"></div>
</div>
</div>
......@@ -107,10 +146,10 @@ export default {
{ name: "消息通知", path: "/user/message" },
{ name: "收银中心", path: "" },
{ name: "关于BD-aPaaS", path: "" },
{ name: "退出登录", path: "logout" }
{ name: "退出登录", path: "logout" },
],
shopping_list: [],
menuCartNum: 0
menuCartNum: 0,
};
},
mounted() {
......@@ -123,12 +162,12 @@ export default {
},
userInfo() {
return this.$store.state.userInfo || {};
}
},
},
watch: {
getMenuCartState(newVal) {
this.getList();
}
},
},
methods: {
gotopage(n) {
......@@ -146,7 +185,7 @@ export default {
},
deleteItem(id) {
let query = [id];
this.$api.serviceShop.delShoppingCart(query).then(response => {
this.$api.serviceShop.delShoppingCart(query).then((response) => {
this.getList();
});
},
......@@ -175,7 +214,7 @@ export default {
}
},
getList() {
this.$api.serviceShop.getShoppingCart().then(response => {
this.$api.serviceShop.getShoppingCart().then((response) => {
if (response.data.success == "1") {
this.menuCartNum = response.data.data.valid
? response.data.data.valid.length
......@@ -194,14 +233,15 @@ export default {
this.now_menu = visit_url ? visit_url : "/services_shop";
},
getNowMenu() {
this.$api.general.getNowMenu({ teamName: "APAAS3" }).then(response => {
this.$api.general.getNowMenu({ teamName: "APAAS3" }).then((response) => {
if (response.data.success == 1) {
this.menu_arr = response.data.data[0].Child;
this.menu_arr =
(response.data.data[0] && response.data.data[0].Child) || [];
this.getMenuIndex();
}
});
}
}
},
},
};
</script>
......@@ -415,4 +455,4 @@ export default {
line-height: 18px;
padding: 0 7px;
}
</style>
\ No newline at end of file
</style>
src/pages/workbench/app_build.vue
View file @ ba66cb7b
......@@ -94,6 +94,7 @@
下一步
</el-button>
</div>
<image-detail ref="imageDetail" :image="selectedImage"></image-detail>
</app-build-step>
<app-build-step
title="上传部署文件"
......@@ -282,6 +283,7 @@ import appBuildStep from "@/components/app-build-steps/app-build-step";
import apassTable from "@/components/apass-table";
import uploadFile from "@/components/general/upload_file";
import apassDialog from "@/components/apass-dialog";
import imageDetail from "@/components/image-detail";
export default {
components: {
......@@ -290,6 +292,7 @@ export default {
apassTable,
uploadFile,
apassDialog,
imageDetail,
},
data: () => ({
step: 0,
......@@ -357,6 +360,7 @@ export default {
msg: "",
submit: null,
},
selectedImage: null,
}),
methods: {
preStep() {
......@@ -570,8 +574,9 @@ export default {
return "";
}
},
showDetail(item) {
console.log(item);
showImageDetail(item) {
this.selectedImage = item;
this.$refs.imageDetail.showDialog();
},
},
mounted() {
......@@ -581,7 +586,7 @@ export default {
prop: "name",
align: "left",
type: "button",
callback: this.showDetail,
callback: this.showImageDetail,
},
{
label: "版本号",
......
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