From 05fec0816d14f2e7ab303eebb43443b4bc7f78ca Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期一, 15 十一月 2021 18:04:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
PAMapp/layouts/default.vue | 1
PAMapp/pages/recommendConsultant/result.vue | 106 ++++-------
PAMapp/pages/questionnaire/_agentNo.vue | 6
pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java | 4
PAMapp/pages/recommendConsultant/index.vue | 110 +++++++++++-
PAMapp/assets/ts/api/consultant.ts | 5
pamapi/src/doc/預約單/標記為已聯絡API.txt | 6
PAMapp/components/Ui/UiPagination.vue | 2
PAMapp/package-lock.json | 242 ++++++++++++++++++++++++++
9 files changed, 386 insertions(+), 96 deletions(-)
diff --git a/PAMapp/assets/ts/api/consultant.ts b/PAMapp/assets/ts/api/consultant.ts
index 32789aa..80a4047 100644
--- a/PAMapp/assets/ts/api/consultant.ts
+++ b/PAMapp/assets/ts/api/consultant.ts
@@ -58,7 +58,10 @@
// ����岷���
export function appointmentDemand(data: AppointmentParams) {
- return service.post('/appointment/customer/create', data)
+ const headers = {
+ Authorization: 'Bearer ' + localStorage.getItem('id_token')
+ }
+ return service.post('/appointment/customer/create', data ,{headers})
}
//憿批�底蝝啗���
diff --git a/PAMapp/components/Ui/UiPagination.vue b/PAMapp/components/Ui/UiPagination.vue
index d157b14..4e795bf 100644
--- a/PAMapp/components/Ui/UiPagination.vue
+++ b/PAMapp/components/Ui/UiPagination.vue
@@ -17,7 +17,7 @@
@Component
export default class UiPagination extends Vue {
@Prop() totalList!: Consultants[];
- pageSize = 5;
+ @Prop({default: 5}) pageSize!: number;
currentPage = 1;
pageList: Consultants[] = [];
diff --git a/PAMapp/layouts/default.vue b/PAMapp/layouts/default.vue
index f0ab2d6..3c838af 100644
--- a/PAMapp/layouts/default.vue
+++ b/PAMapp/layouts/default.vue
@@ -91,7 +91,6 @@
.pam-page-container {
width: 700px;
margin: 30px auto 0px auto;
- overflow-x: hidden;
}
.pam-banner__text{
width: 700px;
diff --git a/PAMapp/package-lock.json b/PAMapp/package-lock.json
index 6619e02..abb6a9c 100644
--- a/PAMapp/package-lock.json
+++ b/PAMapp/package-lock.json
@@ -2513,6 +2513,16 @@
"http-proxy-middleware": "^1.0.6"
}
},
+ "@nuxtjs/style-resources": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/@nuxtjs/style-resources/-/style-resources-1.2.1.tgz",
+ "integrity": "sha512-sOp71gCBNuGK2jchybTtVab83yB7jnSr+hw6DAKDgAGX/jrMYUyxRc9tiFxe+8YDSnqghTgQrkEkqPsfS4D4sg==",
+ "requires": {
+ "consola": "^2.15.3",
+ "glob-all": "^3.2.1",
+ "sass-resources-loader": "^2.2.4"
+ }
+ },
"@nuxtjs/youch": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/@nuxtjs/youch/-/youch-4.2.3.tgz",
@@ -2776,6 +2786,12 @@
"integrity": "sha512-62vfe65cMSzYaWmpmhqCMMNl0khen89w57mByPi1OseGfcV/LV03fO8YVrNj7rFQsRWNJo650WWyh6m7p8vZmA==",
"dev": true
},
+ "@types/lodash": {
+ "version": "4.14.176",
+ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.176.tgz",
+ "integrity": "sha512-xZmuPTa3rlZoIbtDUyJKZQimJV3bxCmzMIO2c9Pz9afyDro6kr7R79GwcB6mRhuoPmV2p1Vb66WOJH7F886WKQ==",
+ "dev": true
+ },
"@types/mime": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
@@ -2898,6 +2914,11 @@
"resolved": "https://registry.npmjs.org/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz",
"integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==",
"dev": true
+ },
+ "@types/swiper": {
+ "version": "5.4.3",
+ "resolved": "https://registry.npmjs.org/@types/swiper/-/swiper-5.4.3.tgz",
+ "integrity": "sha512-hJXpVeANf+XQXgbvmuFZdsnaSOKqOEZcaLDnHhZOJDRow+lfboatwubW+Ay9XiHobMGyEomkgpXSYRlDVn4gMQ=="
},
"@types/tapable": {
"version": "1.0.8",
@@ -3549,6 +3570,11 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
"integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
+ },
+ "async": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/async/-/async-3.2.2.tgz",
+ "integrity": "sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g=="
},
"async-each": {
"version": "1.0.3",
@@ -5402,6 +5428,11 @@
"ms": "2.1.2"
}
},
+ "decamelize": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+ "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+ },
"decimal.js": {
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
@@ -5591,6 +5622,14 @@
"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
"integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="
}
+ }
+ },
+ "dom7": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.5.tgz",
+ "integrity": "sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA==",
+ "requires": {
+ "ssr-window": "^2.0.0"
}
},
"domain-browser": {
@@ -6666,8 +6705,7 @@
"get-caller-file": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
- "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
- "dev": true
+ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
},
"get-intrinsic": {
"version": "1.1.1",
@@ -6745,6 +6783,54 @@
"minimatch": "^3.0.4",
"once": "^1.3.0",
"path-is-absolute": "^1.0.0"
+ }
+ },
+ "glob-all": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/glob-all/-/glob-all-3.2.1.tgz",
+ "integrity": "sha512-x877rVkzB3ipid577QOp+eQCR6M5ZyiwrtaYgrX/z3EThaSPFtLDwBXFHc3sH1cG0R0vFYI5SRYeWMMSEyXkUw==",
+ "requires": {
+ "glob": "^7.1.2",
+ "yargs": "^15.3.1"
+ },
+ "dependencies": {
+ "cliui": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+ "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+ "requires": {
+ "string-width": "^4.2.0",
+ "strip-ansi": "^6.0.0",
+ "wrap-ansi": "^6.2.0"
+ }
+ },
+ "yargs": {
+ "version": "15.4.1",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+ "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+ "requires": {
+ "cliui": "^6.0.0",
+ "decamelize": "^1.2.0",
+ "find-up": "^4.1.0",
+ "get-caller-file": "^2.0.1",
+ "require-directory": "^2.1.1",
+ "require-main-filename": "^2.0.0",
+ "set-blocking": "^2.0.0",
+ "string-width": "^4.2.0",
+ "which-module": "^2.0.0",
+ "y18n": "^4.0.0",
+ "yargs-parser": "^18.1.2"
+ }
+ },
+ "yargs-parser": {
+ "version": "18.1.3",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+ "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+ "requires": {
+ "camelcase": "^5.0.0",
+ "decamelize": "^1.2.0"
+ }
+ }
}
},
"glob-parent": {
@@ -11890,8 +11976,12 @@
"require-directory": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
- "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
- "dev": true
+ "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+ },
+ "require-main-filename": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
},
"requires-port": {
"version": "1.0.0",
@@ -12060,13 +12150,115 @@
}
},
"sass-loader": {
- "version": "12.2.0",
- "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.2.0.tgz",
- "integrity": "sha512-qducnp5vSV+8A8MZxuH6zV0MUg4MOVISScl2wDTCAn/2WJX+9Auxh92O/rnkdR2bvi5QxZBafnzkzRrWGZvm7w==",
+ "version": "10.2.0",
+ "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.2.0.tgz",
+ "integrity": "sha512-kUceLzC1gIHz0zNJPpqRsJyisWatGYNFRmv2CKZK2/ngMJgLqxTbXwe/hJ85luyvZkgqU3VlJ33UVF2T/0g6mw==",
"dev": true,
"requires": {
"klona": "^2.0.4",
- "neo-async": "^2.6.2"
+ "loader-utils": "^2.0.0",
+ "neo-async": "^2.6.2",
+ "schema-utils": "^3.0.0",
+ "semver": "^7.3.2"
+ },
+ "dependencies": {
+ "loader-utils": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
+ "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+ "dev": true,
+ "requires": {
+ "big.js": "^5.2.2",
+ "emojis-list": "^3.0.0",
+ "json5": "^2.1.2"
+ }
+ },
+ "schema-utils": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+ "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+ "dev": true,
+ "requires": {
+ "@types/json-schema": "^7.0.8",
+ "ajv": "^6.12.5",
+ "ajv-keywords": "^3.5.2"
+ }
+ },
+ "semver": {
+ "version": "7.3.5",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+ "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+ "dev": true,
+ "requires": {
+ "lru-cache": "^6.0.0"
+ }
+ }
+ }
+ },
+ "sass-resources-loader": {
+ "version": "2.2.4",
+ "resolved": "https://registry.npmjs.org/sass-resources-loader/-/sass-resources-loader-2.2.4.tgz",
+ "integrity": "sha512-hIQhBygYky+rLf+4cuoGYONZ623CEH4Swo1fs1WRJkukbqdvN1VIu2KCL59du6vX92bNELzNkGPLx+NorN73xA==",
+ "requires": {
+ "async": "^3.2.0",
+ "chalk": "^4.1.0",
+ "glob": "^7.1.6",
+ "loader-utils": "^2.0.0"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+ "requires": {
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+ },
+ "loader-utils": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
+ "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+ "requires": {
+ "big.js": "^5.2.2",
+ "emojis-list": "^3.0.0",
+ "json5": "^2.1.2"
+ }
+ },
+ "supports-color": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ }
}
},
"sax": {
@@ -12181,6 +12373,11 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz",
"integrity": "sha1-8Tv5KOQrnD55OD5hzDmYtdFObN0="
+ },
+ "set-blocking": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
},
"set-value": {
"version": "2.0.1",
@@ -12483,6 +12680,11 @@
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
},
+ "ssr-window": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-2.0.0.tgz",
+ "integrity": "sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A=="
+ },
"ssri": {
"version": "8.0.1",
"resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
@@ -12778,6 +12980,15 @@
"stable": "^0.1.8",
"unquote": "~1.1.1",
"util.promisify": "~1.0.0"
+ }
+ },
+ "swiper": {
+ "version": "5.4.5",
+ "resolved": "https://registry.npmjs.org/swiper/-/swiper-5.4.5.tgz",
+ "integrity": "sha512-7QjA0XpdOmiMoClfaZ2lYN6ICHcMm72LXiY+NF4fQLFidigameaofvpjEEiTQuw3xm5eksG5hzkaRsjQX57vtA==",
+ "requires": {
+ "dom7": "^2.1.5",
+ "ssr-window": "^2.0.0"
}
},
"symbol-tree": {
@@ -13579,6 +13790,11 @@
"resolved": "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz",
"integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="
},
+ "vue-awesome-swiper": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/vue-awesome-swiper/-/vue-awesome-swiper-4.1.1.tgz",
+ "integrity": "sha512-50um10t6N+lJaORkpwSi1wWuMmBI1sgFc9Znsi5oUykw2cO5DzLaBHcO2JNX21R+Ue4TGoIJDhhxjBHtkFrTEQ=="
+ },
"vue-class-component": {
"version": "7.2.6",
"resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-7.2.6.tgz",
@@ -13661,6 +13877,11 @@
"version": "3.5.2",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.2.tgz",
"integrity": "sha512-807gn82hTnjCYGrnF3eNmIw/dk7/GE4B5h69BlyCK9KHASwSloD1Sjcn06zg9fVG4fYH2DrsNBZkpLtb25WtaQ=="
+ },
+ "vue-scroll-picker": {
+ "version": "0.8.0",
+ "resolved": "https://registry.npmjs.org/vue-scroll-picker/-/vue-scroll-picker-0.8.0.tgz",
+ "integrity": "sha512-h9EcLxyVeYBm9eUJdG/uCQpSJI8ReNr2F6uVlwGWz2c56hNerySfkPytSymKo13xFAxaSJ132bJhSgJ+hQzoOA=="
},
"vue-server-renderer": {
"version": "2.6.14",
@@ -14519,6 +14740,11 @@
"is-symbol": "^1.0.3"
}
},
+ "which-module": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+ "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
+ },
"widest-line": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
diff --git a/PAMapp/pages/questionnaire/_agentNo.vue b/PAMapp/pages/questionnaire/_agentNo.vue
index 932a570..8ee13b6 100644
--- a/PAMapp/pages/questionnaire/_agentNo.vue
+++ b/PAMapp/pages/questionnaire/_agentNo.vue
@@ -66,7 +66,7 @@
<div class="ques-footer pam-paragraph">
<el-button type="primary"
:disabled=" isInitScheduleDisabled || !isSelected"
- @click="sentDemand">�</el-button>
+ @click.native="sentDemand">�</el-button>
</div>
<PopUpFrame :isOpen.sync="showDrawer" :drawerSize=" '95%' ">
@@ -263,7 +263,7 @@
selected: boolean;
}
</script>
-<style lang="scss">
+<style lang="scss" scoped>
.el-radio-button__orig-radio:checked+.el-radio-button__inner{
background-color: #FFFFFF;
color: black;
@@ -364,6 +364,7 @@
justify-content: center;
margin-bottom: 81px;
color: #ED1B2E;
+ cursor: pointer;
}//drawer��摨���見撘�
.mt-18{
margin-top: 18px;
@@ -433,6 +434,7 @@
display: flex;
justify-content: center;
margin-bottom: 81px;
+ cursor: pointer;
}
.el-button+.el-button{
margin-left: 0;
diff --git a/PAMapp/pages/recommendConsultant/index.vue b/PAMapp/pages/recommendConsultant/index.vue
index d040fd7..3c61391 100644
--- a/PAMapp/pages/recommendConsultant/index.vue
+++ b/PAMapp/pages/recommendConsultant/index.vue
@@ -1,5 +1,5 @@
<template>
- <div>
+ <div class="pam-rec-cosultant-page">
<div class="pb-10 mdTxt">����批</div>
<SingleSelectBtn :singleSelected.sync="strictQueryDto.gender" :options="genderOptions"/>
<div class="pam-paragraph">
@@ -24,11 +24,11 @@
<i class="icon-information text--bold" @click="showDialog = true"></i>�銴
</span>
</div>
- <MultiSelectBtn :mutiSelect.sync="strictQueryDto.requirements" :options="requirementOptions" />
+ <MultiSelectBtn :mutiSelect.sync="strictQueryDto.requirements" :options="requirementOptions" class="rec-multi-select" />
</div>
<div class="pam-paragraph pam-tags">
<div class="pb-10 mdTxt">憿批�僑鞈�</div>
- <SingleSelectBtn :singleSelected.sync="strictQueryDto.seniority" :options="seniorityOptions"/>
+ <SingleSelectBtn :singleSelected.sync="strictQueryDto.seniority" :options="seniorityOptions"/>
</div>
<div class="rate-consultant pam-paragraph">
<div class="pb-10 mdTxt">靽憿批�遛��漲</div>
@@ -42,9 +42,11 @@
<div class="pb-10 mdTxt">���瑼Ｙ揣</div>
<div class="hint text--bold ml-10">�銴</div>
</div>
+ <div class="rec-pop-container">
<MultiSelectBtn :mutiSelect.sync="strictQueryDto.popularTags"
:options="popularOptions"
- :nameOfOtherOption="'#�隞�'" :otherSelect.sync="strictQueryDto.otherPopularTags" />
+ :nameOfOtherOption="'#�隞�'" :otherSelect.sync="strictQueryDto.otherPopularTags" class="rec-pop-options"/>
+ </div>
</div>
<div class="rec-footer pam-paragraph">
<el-button type="primary"
@@ -77,8 +79,9 @@
<script lang="ts">
import {
Vue,
- Component
- } from 'vue-property-decorator';
+ Component,
+ Mutation
+ } from 'nuxt-property-decorator';
import {strictQuery} from '~/assets/ts/api/consultant';
import * as _ from 'lodash';
@Component
@@ -215,10 +218,13 @@
showAddress = false;
elRateColors = ['#ED1B2E', '#ED1B2E', '#ED1B2E'];
+ @Mutation updateStrictQueryList!: (data: any) => void;
+
makePair():void{
strictQuery(this.strictQueryDto).then(res=>{
console.log('resultData',res.data);
- this.$router.push('/recommendConsultant/result');
+ this.updateStrictQueryList(res.data);
+ this.$router.push('/recommendConsultant/result');
});
}
get notFinishByRequireRules():boolean{
@@ -233,7 +239,48 @@
}
</script>
-<style lang="scss">
+<style lang="scss" >
+
+.pam-rec-cosultant-page {
+ .rec-pop-container{
+ width:310px;
+ .rec-pop-options{
+ .el-checkbox-group{
+ display: flex;
+ flex-wrap: wrap;
+ flex-direction: row;
+ .el-checkbox{
+ width:90px;
+ height: 50px;
+ padding:0;
+ .el-checkbox__label{
+ justify-content: center;
+ align-items: center;
+ display: flex;
+ padding:15px 20px;
+ text-align: center;
+ }
+ }
+ .pam-selectAll-btn{
+ margin-top: 60px;
+ margin-left:-203px;
+ height: 50px;
+ width: 90px;
+ padding: 10px;
+ }
+
+ }
+ }
+
+ }
+ .rec-multi-select{
+ .el-checkbox-group {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ }
+ }
+
input:focus,
textarea:focus {
outline: none;
@@ -274,7 +321,7 @@
.qa-dialog {
overflow-y: auto;
- height: auto;
+ height: 500px;
margin-top: 20px;
}
@@ -287,6 +334,7 @@
justify-content: center;
margin-bottom: 81px;
color: #ED1B2E;
+ cursor: pointer;
}
.el-drawer__container ::-webkit-scrollbar {
@@ -426,6 +474,7 @@
position: absolute;
color: #FF0000;
transform: translate(-12px, 0);
+ z-index: 5;
}
}
@@ -436,6 +485,7 @@
.icon-information {
padding: 0 5px;
+ cursor: pointer;
}
}
@@ -457,6 +507,48 @@
margin-left: 10px;
margin-top: -10px;
}
+
+ .rec-pop-container{
+ width:auto;
+ .rec-pop-options{
+ .el-checkbox-group{
+ display: flex;
+ flex-wrap:wrap;
+ flex-direction: none;
+ .el-checkbox{
+ width:90px;
+ height: 50px;
+ padding:0;
+ .el-checkbox__label{
+ justify-content: center;
+ align-items: center;
+ display: flex;
+ padding:15px 20px;
+ text-align: center;
+ }
+ }
+ .pam-selectAll-btn{
+ margin-top:0px;
+ margin-left:0px;
+ height: 50px;
+ width: 90px;
+ padding: 10px;
+ }
+ }
+ }
+
}
+ .rec-multi-select{
+ .el-checkbox-group {
+ display: flex;
+ flex-direction: row;
+ align-items: flex-start;
+ flex-wrap: wrap;
+ }
+ }
+
+ }
+}
+
</style>
diff --git a/PAMapp/pages/recommendConsultant/result.vue b/PAMapp/pages/recommendConsultant/result.vue
index 8792bcc..25a5e55 100644
--- a/PAMapp/pages/recommendConsultant/result.vue
+++ b/PAMapp/pages/recommendConsultant/result.vue
@@ -2,16 +2,18 @@
<div>
<div class="mdTxt pb-10">��憿批��</div>
<ul class="pam-rec-agent__list">
- <li class="pam-rec-agent-card" v-for="(info,index) in pageList" :key="index">
+ <li class="pam-rec-agent-card" v-for="(strictQueryList,index) in pageList" :key="index">
<div class="pam-rec-agent-card__content">
<div class="pam-rec-agent-card__content-header">
<div class="pam-rec-agent-card__avatar">
- <img :src="info.avatar" class="avatar">
+
+
+ <UiAvatar :size="120" :fileName="strictQueryList.img" ></UiAvatar>
</div>
<div class="pam-rec-agent-card__main-info">
- <div class="fz-20 pt-10 rec-desktop-name">{{ info.name }}</div>
- <div class="rec-role">{{ info.role }}</div>
- <span class="rec-detail">閰喟敦鞈��</span>
+ <div class="fz-20 pt-10 rec-desktop-name">{{ strictQueryList.name }}</div>
+ <div class="rec-role">{{ strictQueryList.role }}</div>
+ <span class="rec-detail" @click="showAgentDetail(strictQueryList.agentNo)">閰喟敦鞈��</span>
</div>
</div>
<div class="pam-rec-agent-card__content-body">
@@ -21,20 +23,20 @@
撠����
</div>
<div class="field__content expertieses-container">
- <div class="pr-10 pb-10" v-for="(expert, index) in info.expertises" :key="index">
+ <div class="pr-10 pb-10" v-for="(expert, index) in strictQueryList.expertise" :key="index">
#{{ expert }}
</div>
</div>
</div>
</el-row>
- <el-row type="flex" class="pam-paragraph">
+ <el-row type="flex" class="pam-paragraph">
<el-col :span="12">
<div class="field__label">
����風
</div>
<div class="field__content">
- {{ info.seniority }}
+ {{ strictQueryList.seniority }}
</div>
</el-col>
<el-col :span="12">
@@ -43,7 +45,7 @@
</div>
<div class="field__content">
<i class="icon-star" style="color:#F2C75C"></i>
- {{ info.avgScore }}
+ {{ strictQueryList.avgScore }}
</div>
</el-col>
</el-row>
@@ -58,77 +60,36 @@
<el-button class="btn2" type="primary" style="margin-left: 10px" @click="$router.push('/questionnaire')"
>�脰����</el-button>
</el-row>
+
+ <!-- <AddAndReservedBtns :cusClass=""></AddAndReservedBtns> -->
</div>
</div>
</li>
</ul>
+
<UiPagination
- :totalList="recAgentList"
+ :totalList="strictQueryList"
@changePage="changePage"
+ :pageSize = 6
></UiPagination>
</div>
</template>
<script lang="ts">
-import {Vue,Component} from 'vue-property-decorator';
+import {Vue,Component, State} from 'nuxt-property-decorator';
+import { AgentOfStrictQuery } from '~/assets/ts/api/consultant';
@Component
export default class Reslut extends Vue{
+ @State('strictQueryList') strictQueryList!: AgentOfStrictQuery;
- recAgentList =[
- {
- avatar:'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png',
- name:'�蝢��',
- role:'隡舀��蝬�鈭�',
- expertises: ['鞎∪����', '鞈頧宏', '蝭�蝔�', '璅暑��隡�'],
- seniority:'1撟�2���',
- avgScore:4.8
- },
- {
- avatar:'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png',
- name:'鞈�',
- role:'擙剝��蝬�鈭�',
- expertises: ['鞎∪����', '鞈頧宏', '蝭�蝔�', '璅暑��隡�'],
- seniority:'1撟�2���',
- avgScore:4.8
- },
- {
- avatar:'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png',
- name:'�摰嗅弧',
- role:'���收靽蝬�鈭�',
- expertises: ['鞎∪����', '鞈頧宏', '蝭�蝔�', '璅暑��隡�'],
- seniority:'1撟�2���',
- avgScore:4.8
- },
- {
- avatar:'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png',
- name:'撘萄���',
- role:'擙剝��蝬�鈭�',
- expertises: ['鞎∪����', '鞈頧宏', '蝭�蝔�', '璅暑��隡�'],
- seniority:'1撟�2���',
- avgScore:4.8
- },
- {
- avatar:'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png',
- name:'���戊',
- role:'���收靽蝬�鈭�',
- expertises: ['鞎∪����', '鞈頧宏', '蝭�蝔�', '璅暑��隡�'],
- seniority:'1撟�2���',
- avgScore:4.8
- },
- {
- avatar:'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png',
- name:'�撣亙',
- role:'擙剝��蝬�鈭�',
- expertises: ['鞎∪����', '鞈頧宏', '蝭�蝔�', '璅暑��隡�'],
- seniority:'1撟�2���',
- avgScore:4.8
- }
- ];
pageList: any[] = [];
changePage(pageList: any[]) {
this.pageList = pageList;
+ }
+ showAgentDetail(agentNo: string): void {
+ this.$router.push(`/agentInfo/${agentNo}`);
}
@@ -144,6 +105,7 @@
width: 120px;
height: 47px;
}
+
.pam-rec-agent-card {
margin-bottom: 10px;
border-radius: 10px;
@@ -160,11 +122,7 @@
display: flex;
flex-direction: row;
margin-right: 20px;
- .avatar{
- width: 120px;
- height: 120px;
- border-radius: 50%;
- }
+
}
.pam-rec-agent-card__main-info {
display: flex;
@@ -181,6 +139,7 @@
color:$PRIMARY_RED;
font-weight: bold;
padding-top: 30px;
+ cursor: pointer;
}
}
}
@@ -202,9 +161,22 @@
}
@include desktop{
+.btn{
+ width: 90px;
+ height: 43px;
+ margin-left: 29px;
+ margin-right: 0px
+}
+.btn2{
+ width: 90px;
+ height: 43px;
+}
+ .page-container{}
.pam-rec-agent__list{
display: flex;
flex-wrap: wrap;
+ flex-direction:row;
+ width: auto;
}
.pam-paragraph{
margin-top: 10px;
@@ -222,7 +194,7 @@
margin-left: 10px;
.pam-rec-agent-card__content {
- width: 190px;
+ width: 170px;
.pam-rec-agent-card__content-header {
display: flex;
.pam-rec-agent-card__avatar {
diff --git "a/pamapi/src/doc/\351\240\220\347\264\204\345\226\256/\346\250\231\350\250\230\347\202\272\345\267\262\350\201\257\347\265\241API.txt" "b/pamapi/src/doc/\351\240\220\347\264\204\345\226\256/\346\250\231\350\250\230\347\202\272\345\267\262\350\201\257\347\265\241API.txt"
index 0b2633f..80ef9a6 100644
--- "a/pamapi/src/doc/\351\240\220\347\264\204\345\226\256/\346\250\231\350\250\230\347\202\272\345\267\262\350\201\257\347\265\241API.txt"
+++ "b/pamapi/src/doc/\351\240\220\347\264\204\345\226\256/\346\250\231\350\250\230\347\202\272\345\267\262\350\201\257\347\265\241API.txt"
@@ -1,6 +1,2 @@
http post :
-http://localhost:8080/api/appointment/markAsContacted
-
-request body:
-
-26 // appointment id
\ No newline at end of file
+http://localhost:8080/api/appointment/markAsContacted/{appointmentId}
diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java
index 7fc85ea..7924090 100644
--- a/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java
+++ b/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java
@@ -26,8 +26,8 @@
appointmentService.customerCreateAppointment(appointmentCreateDTO);
}
- @PostMapping("/markAsContacted")
- public void markAsContacted(@RequestBody Long appointmentId) {
+ @PostMapping("/markAsContacted/{appointmentId}")
+ public void markAsContacted(@PathVariable Long appointmentId) {
appointmentService.markAsContacted(appointmentId);
}
--
Gitblit v1.8.0