diff --git a/src/assets/images/qyimage.png b/src/assets/images/qyimage.png new file mode 100644 index 0000000000000000000000000000000000000000..b905ddfb5b445f586e29938f22de48b5b7531285 Binary files /dev/null and b/src/assets/images/qyimage.png differ diff --git a/src/components/common/Tatle.vue b/src/components/common/Tatle.vue index dcd9514b7eb4f9dae6b50f574f9c0dd9e127554d..9fe14ac82070904f2ebd7b438ce533118ce77650 100644 --- a/src/components/common/Tatle.vue +++ b/src/components/common/Tatle.vue @@ -13,7 +13,8 @@ {{tatle}} - + + diff --git a/src/router/index.ts b/src/router/index.ts index 28a46b61730aff0afe3d022415ff00a7db520aeb..fdd2f296b39d02972d602aace99cd5edab0003fa 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -31,6 +31,7 @@ const routes: Array = [ { path: "/login", component: () => import(/* webpackChunkName: "login" */ "@/views/authentication/LoginView.vue"), + //component: () => import(/* webpackChunkName: "login" */ "@/components/common/Tool.vue"), meta: { keepAlive: true, requiresAuth: true }, }, //...mainRoutes, diff --git a/src/router/workbench.routing.ts b/src/router/workbench.routing.ts index 7fc69835d54f64446db1c7b9088f99989ed1894e..cefdb5856040df162c97dccae34a357c83850fa2 100644 --- a/src/router/workbench.routing.ts +++ b/src/router/workbench.routing.ts @@ -24,8 +24,20 @@ const workbenchRoutes = [ component: () => import(/* webpackChunkName: "customer-mgt" */ "@/views/workbench/Accommodation.vue"), props: propsConvert, meta: { keepAlive: false, requiresAuth: true, name: "贷款信息" }, - } - - + }, + { + path: `/CooperationBusiness`, + name: 'CooperationBusiness', + component: () => import(/* webpackChunkName: "customer-mgt" */ "@/views/workbench/CooperationBusiness.vue"), + props: propsConvert, + meta: { keepAlive: false, requiresAuth: true, name: "合作企业" }, + }, + { + path: `/ExchangeRecord`, + name: 'ExchangeRecord', + component: () => import(/* webpackChunkName: "customer-mgt" */ "@/views/workbench/ExchangeRecord.vue"), + props: propsConvert, + meta: { keepAlive: false, requiresAuth: true, name: "兑换记录" }, + }, ]; export default workbenchRoutes; diff --git a/src/services/component-vue.service.ts b/src/services/component-vue.service.ts index 170ceec5a4249ba95e818e347b419f746d0c5649..e6a2a58b6da92c2c02f5fb2680a8d408b7e20bc0 100644 --- a/src/services/component-vue.service.ts +++ b/src/services/component-vue.service.ts @@ -32,10 +32,11 @@ import CardUnLogin from "@/components/common/CardUnLogin.vue"; import ProductDetail from "@/components/common/ProductDetail.vue"; import PicketAcced from "@/components/common/PicketAcced.vue"; import ProductCard from "@/components/common/ProductCard.vue"; +import CompanyCard from "@/views/workbench/CompanyCard.vue"; -ProductCard +//ProductCard declare module "vue/types/vue" { interface Vue { $message: any; @@ -99,7 +100,7 @@ class ComponentVueService { Vue.component("base-list", BaseList); Vue.component("anchor-nav", AnchorNav); Vue.component("tatle-bar", Tatle); - Vue.component("picket-bar", picket); Tool + Vue.component("picket-bar", picket); Vue.component("tools-bar", Tool); Vue.component("bottom-bar", Bottom); Vue.component("person-bar", Person); @@ -109,7 +110,7 @@ class ComponentVueService { Vue.component("product-detail", ProductDetail); Vue.component("product-card", ProductCard); Vue.component("picket-acced", PicketAcced); - + Vue.component("company-card",CompanyCard); } } const componentService = new ComponentVueService(); diff --git a/src/views/MyView/MyPage.vue b/src/views/MyView/MyPage.vue index bf33fd4e49f63ca2fdfee9e6e49746c320ebbe50..6776b8edf9e5efb198f0adcad00702dafd976adb 100644 --- a/src/views/MyView/MyPage.vue +++ b/src/views/MyView/MyPage.vue @@ -66,12 +66,14 @@ export default class MyPage extends Vue { { productname: "兑换记录", //图片信息 - img: "#icon-a-duihuanjilu16x16px" + img: "#icon-a-duihuanjilu16x16px", + flag: "ExchangeRecord", }, { productname: "合作企业", //图片信息 - img: "#icon-a-hezuoqiye16x16px" + img: "#icon-a-hezuoqiye16x16px", + flag: "CooperationBusiness", }] //点击事件 @@ -87,6 +89,14 @@ export default class MyPage extends Vue { name: "Accommodation" //参数 }) + } else if ( item.flag === "ExchangeRecord") { + this.$router.push({ + name: "ExchangeRecord" + }) + } else if ( item.flag === "CooperationBusiness") { + this.$router.push({ + name: "CooperationBusiness" + }) } } } diff --git a/src/views/workbench/CompanyCard.vue b/src/views/workbench/CompanyCard.vue new file mode 100644 index 0000000000000000000000000000000000000000..91fd896c329d8f24af5b983594b558f6538bb1b4 --- /dev/null +++ b/src/views/workbench/CompanyCard.vue @@ -0,0 +1,83 @@ + + + + + diff --git a/src/views/workbench/CooperationBusiness.vue b/src/views/workbench/CooperationBusiness.vue new file mode 100644 index 0000000000000000000000000000000000000000..e0b2682ed1da4c4f2dce9e9f33ca2b1acfd3c1b3 --- /dev/null +++ b/src/views/workbench/CooperationBusiness.vue @@ -0,0 +1,39 @@ + + + + + diff --git a/src/views/workbench/ExchangeRecord.vue b/src/views/workbench/ExchangeRecord.vue new file mode 100644 index 0000000000000000000000000000000000000000..ef6a7a19b30802d556f74e8736e670ce71a096cf --- /dev/null +++ b/src/views/workbench/ExchangeRecord.vue @@ -0,0 +1,110 @@ + + + + +