diff --git a/components/agents/EnrollRepresentationForm.vue b/components/agents/EnrollRepresentationForm.vue index ce3332b..54aee60 100644 --- a/components/agents/EnrollRepresentationForm.vue +++ b/components/agents/EnrollRepresentationForm.vue @@ -240,11 +240,9 @@ تلفن همراه: @@ -1001,7 +999,7 @@ export default { data.province_id = this.user.province_id data.city_name = this.user.city_name data.city_id = this.user.city_id - data.mobile_number = this.user.mobile_number + this.$axios .post(`/api/user/representation`, data) diff --git a/package.json b/package.json index c96e90a..6fd096e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "asan-service", - "version": "2.0.0", + "version": "1.0.0", "private": true, "scripts": { "nodemon": "nodemon --watch server --exec \"nuxt start\"", diff --git a/pages/account/agents/announcements/index.vue b/pages/account/agents/announcements/index.vue index cbb2e01..ed425ca 100644 --- a/pages/account/agents/announcements/index.vue +++ b/pages/account/agents/announcements/index.vue @@ -4,14 +4,39 @@ -
-

{{ item.caption }}

+

{{ item.title }}

+ +
+

{{ item.caption }}

+ +
+
+
+

{{ item.caption }}

+ +
+
+

برای نمایش بهتر کلیک کنید

+
+ + +
+
+ +

هیچ اطلاعیه ای موجود نیست

@@ -21,7 +46,10 @@ export default { name: 'AccountAgentAnnouncements', layout: 'user', data() { - return {} + return { + modalVisible:false, + modalImageUrl:'' + } }, computed: { agentAnnouncements() { @@ -29,6 +57,14 @@ export default { } }, methods: { + openModal(image) { + this.modalVisible = true; + this.modalImageUrl = image; + + }, + closeModal() { + this.modalVisible = false; + }, seeAnnouncement(id) { if (!id) return const item = this.agentAnnouncements.find(item => item._id === id) @@ -37,3 +73,101 @@ export default { } } + \ No newline at end of file diff --git a/pages/account/announcements/index.vue b/pages/account/announcements/index.vue index 2b62ff5..6bde0f3 100644 --- a/pages/account/announcements/index.vue +++ b/pages/account/announcements/index.vue @@ -2,32 +2,46 @@
- + -
-

{{ item.caption }}

+
+

{{ item.caption }}

-
+

{{ item.caption }}

-
- +

برای نمایش بهتر کلیک کنید

+
+ +
- +
+ +

هیچ اعلانی موجود نیست

+ diff --git a/pages/admin/tickets/index.vue b/pages/admin/tickets/index.vue index b049a6d..e397b52 100644 --- a/pages/admin/tickets/index.vue +++ b/pages/admin/tickets/index.vue @@ -20,7 +20,7 @@ @@ -113,11 +113,8 @@ export default { return this.tickets.filter(item => { return ( item.title.includes(filterText) || - item.user_id.first_name.includes(filterText) || - item.user_id.last_name.includes(filterText) || - item.user_id.verity_businessCode?.includes(filterText) || - item.user_id.panatech_businessCode?.includes(filterText) || - (item.user_id.first_name + ' ' + item.user_id.last_name).includes(filterText) + item.transaction_id.includes(filterText) + ) }) } diff --git a/pages/announcements/index.vue b/pages/announcements/index.vue index 19c1ece..7d6c9c9 100644 --- a/pages/announcements/index.vue +++ b/pages/announcements/index.vue @@ -12,13 +12,14 @@
-
+

{{ item.caption }}

-
+
+

برای نمایش بهتر کلیک کنید

- +
@@ -27,6 +28,17 @@
+ +

هیچ اعلانی موجود نیست

@@ -38,7 +50,9 @@ data() { return { - userAnnouncements:'' + userAnnouncements:'', + modalVisible:false, + modalImageUrl:'' } }, mounted(){ @@ -47,6 +61,16 @@ this.userAnnouncements = res.data }) + }, + methods:{ + openModal(image) { + this.modalVisible = true; + this.modalImageUrl = image; + + }, + closeModal() { + this.modalVisible = false; + }, } } @@ -64,15 +88,100 @@ width: 80% !important; } .fr-image{ - width: 17rem; - height: 11rem; + + height: 17rem; margin: auto; img{ width: 100%; - height:100%; + height: 17rem; object-fit: cover; border-radius: .5rem; } } + /* Style the Image Used to Trigger the Modal */ +#myImg { + border-radius: 5px; + cursor: pointer; + transition: 0.3s; +} + +#myImg:hover { + opacity: 0.7; +} + +/* The Modal (background) */ +.modal { + + /* Hidden by default */ + position: fixed; + /* Stay in place */ + z-index: 50; + /* Sit on top */ + padding-top: 100px; + /* Location of the box */ + left: 0; + top: 0; + width: 100%; + /* Full width */ + height: 100%; + /* Full height */ + overflow: auto; + /* Enable scroll if needed */ + background-color: rgb(0, 0, 0); + /* Fallback color */ + background-color: rgba(0, 0, 0, 0.3); + /* Black w/ opacity */ +} + +/* Modal Content (Image) */ +.modal-content { + margin: auto; + display: block; + width: 80%; + max-width: 700px; +} + + + +/* Add Animation - Zoom in the Modal */ +.modal-content { + animation-name: zoom; + animation-duration: 0.6s; +} + +@keyframes zoom { + from { + transform: scale(0) + } + + to { + transform: scale(1) + } +} + +/* The Close Button */ +.close { + position: absolute; + top: 15px; + right: 35px; + color: #f1f1f1; + font-size: 40px; + font-weight: bold; + transition: 0.3s; +} + +.close:hover, +.close:focus { + color: #bbb; + text-decoration: none; + cursor: pointer; +} + +/* 100% Image Width on Smaller Screens */ +@media only screen and (max-width: 700px) { + .modal-content { + width: 100%; + } +} \ No newline at end of file diff --git a/server/index.js b/server/index.js index 673e553..348ca8b 100644 --- a/server/index.js +++ b/server/index.js @@ -24,6 +24,7 @@ function init() { app.use(express.json()) app.use(express.urlencoded({ extended: true })) app.use(fileUpload()) + console.log('🟢 ~ Node Server is running ') // load plugins // getVerityToken() @@ -50,6 +51,7 @@ function init() { app.use(isDev ? '/api' : '', router) + return app }