danak/asan-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Mr Swift
2023-12-09 21:31:05 +03:30
parent 54e43a2d8a
commit e628cf6156
7 changed files with 391 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/agents/EnrollRepresentationForm.vue
+2 -4
View File
@@ -240,11 +240,9 @@
<span>تلفن همراه:</span> <span>تلفن همراه:</span>
<input <input
id="mobile_number" id="mobile_number"
v-model=" formData.mobile_number "
type="text" type="text"
name="mobile_number" name="mobile_number"
disabled
:title="disabledFieldTitle"
:value="isAdmin ? formData.mobile_number : user.mobile_number"
autocomplete="false" autocomplete="false"
/> />
</label> </label>
@@ -1001,7 +999,7 @@ export default {
data.province_id = this.user.province_id data.province_id = this.user.province_id
data.city_name = this.user.city_name data.city_name = this.user.city_name
data.city_id = this.user.city_id data.city_id = this.user.city_id
data.mobile_number = this.user.mobile_number
this.$axios this.$axios
.post(`/api/user/representation`, data) .post(`/api/user/representation`, data)
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "asan-service", "name": "asan-service",
"version": "2.0.0", "version": "1.0.0",
"private": true, "private": true,
"scripts": { "scripts": {
"nodemon": "nodemon --watch server --exec \"nuxt start\"", "nodemon": "nodemon --watch server --exec \"nuxt start\"",
pages/account/agents/announcements/index.vue
+139 -5
View File
@@ -4,14 +4,39 @@
<el-collapse :key="item._id + 'co_parent'" accordion @change="seeAnnouncement"> <el-collapse :key="item._id + 'co_parent'" accordion @change="seeAnnouncement">
<el-collapse-item :key="item._id + 'co_item'" :name="item._id"> <el-collapse-item :key="item._id + 'co_item'" :name="item._id">
<template slot="title"> <template slot="title">
<h3>{{ item.title }}</h3> <h3>{{ item.title }}</h3>
</template> </template>
<div> <div v-if="!item.image" class="col-12">
<p>{{ item.caption }}</p> <p>{{ item.caption }}</p>
</div>
<div v-if="item.image" class="row">
<div class="col-md-5 col-sm-12">
<p>{{ item.caption }}</p>
</div>
<div class="col-md-7 col-sm-12">
<p>برای نمایش بهتر کلیک کنید</p>
<div @click="openModal('/uploads/images/announcement/' + item.image)" class="fr-image">
<img id="myImg" :src="'/uploads/images/announcement/'+item.image" alt="">
</div>
</div>
</div> </div>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
</div> </div>
<!-- The Modal -->
<div v-if="modalVisible" id="myModal" class="modal">
<!-- The Close Button -->
<span @click="closeModal" class="close">&times;</span>
<!-- Modal Content (The Image) -->
<img id="img01" class="modal-content" :src="modalImageUrl">
</div>
<h3 v-if="!agentAnnouncements.length" style="text-align: center; margin-top: 50px">هیچ اطلاعیه ای موجود نیست</h3> <h3 v-if="!agentAnnouncements.length" style="text-align: center; margin-top: 50px">هیچ اطلاعیه ای موجود نیست</h3>
</user-dashboard-container> </user-dashboard-container>
</template> </template>
@@ -21,7 +46,10 @@ export default {
name: 'AccountAgentAnnouncements', name: 'AccountAgentAnnouncements',
layout: 'user', layout: 'user',
data() { data() {
return {} return {
modalVisible:false,
modalImageUrl:''
}
}, },
computed: { computed: {
agentAnnouncements() { agentAnnouncements() {
@@ -29,6 +57,14 @@ export default {
} }
}, },
methods: { methods: {
openModal(image) {
this.modalVisible = true;
this.modalImageUrl = image;
},
closeModal() {
this.modalVisible = false;
},
seeAnnouncement(id) { seeAnnouncement(id) {
if (!id) return if (!id) return
const item = this.agentAnnouncements.find(item => item._id === id) const item = this.agentAnnouncements.find(item => item._id === id)
@@ -37,3 +73,101 @@ export default {
} }
} }
</script> </script>
<style lang="scss" scoped>
.fr-image{
height: 17rem;
margin: auto;
img{
width: 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%;
}
}
</style>
pages/account/announcements/index.vue
+127 -13
View File
@@ -2,22 +2,24 @@
<user-dashboard-container page-class="announcements" panel-title="اعلانات"> <user-dashboard-container page-class="announcements" panel-title="اعلانات">
<div v-for="item in userAnnouncements" :key="item._id" class="item" :class="!item.seen && 'unread'"> <div v-for="item in userAnnouncements" :key="item._id" class="item" :class="!item.seen && 'unread'">
<el-collapse :key="item._id + 'co_parent'" accordion @change="seeAnnouncement"> <el-collapse :key="item._id + 'co_parent'" accordion @change="seeAnnouncement">
<el-collapse-item :key="item._id + 'co_item'" :name="item._id" > <el-collapse-item :key="item._id + 'co_item'" :name="item._id">
<template slot="title"> <template slot="title">
<h3>{{ item.title }}</h3> <h3>{{ item.title }}</h3>
</template> </template>
<div v-if="!item.image" class="col-12"> <div v-if="!item.image" class="col-12">
<p>{{ item.caption }}</p> <p>{{ item.caption }}</p>
</div> </div>
<div v-if="item.image" class="row"> <div v-if="item.image" class="row">
<div class="col-md-6 col-sm-12"> <div class="col-md-6 col-sm-12">
<p>{{ item.caption }}</p> <p>{{ item.caption }}</p>
</div> </div>
<div class="col-md-6 col-sm-12"> <div class="col-md-6 col-sm-12">
<div class="fr-image"> <p>برای نمایش بهتر کلیک کنید</p>
<img :src="'/uploads/images/announcement/'+item.image" alt=""> <div @click="openModal('/uploads/images/announcement/' + item.image)" class="fr-image">
<img id="myImg" :src="'/uploads/images/announcement/' + item.image" alt="">
</div> </div>
</div> </div>
@@ -26,8 +28,20 @@
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
</div> </div>
<!-- The Modal -->
<div v-if="modalVisible" id="myModal" class="modal">
<!-- The Close Button -->
<span @click="closeModal" class="close">&times;</span>
<!-- Modal Content (The Image) -->
<img id="img01" class="modal-content" :src="modalImageUrl">
</div>
<h3 v-if="!userAnnouncements.length" style="text-align: center; margin-top: 50px">هیچ اعلانی موجود نیست</h3> <h3 v-if="!userAnnouncements.length" style="text-align: center; margin-top: 50px">هیچ اعلانی موجود نیست</h3>
</user-dashboard-container> </user-dashboard-container>
</template> </template>
<script> <script>
@@ -35,32 +49,132 @@ export default {
name: 'AccountUserAnnouncements', name: 'AccountUserAnnouncements',
layout: 'user', layout: 'user',
data() { data() {
return {} return {
modalVisible:false,
modalImageUrl:''
}
}, },
computed: { computed: {
userAnnouncements() { userAnnouncements() {
return this.$store.state.front.userAnnouncements return this.$store.state.front.userAnnouncements
} }
}, },
methods: { methods: {
openModal(image) {
this.modalVisible = true;
this.modalImageUrl = image;
},
closeModal() {
this.modalVisible = false;
},
seeAnnouncement(id) { seeAnnouncement(id) {
if (!id) return if (!id) return
const item = this.userAnnouncements.find(item => item._id === id) const item = this.userAnnouncements.find(item => item._id === id)
if (!item.seen) this.$userSocket.emit('user:updateAnnouncement', id) if (!item.seen) this.$userSocket.emit('user:updateAnnouncement', id)
} }
} },
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.fr-image{ .fr-image {
width: 17rem;
height: 11rem; height: 17rem;
margin: auto; margin: auto;
img{
img {
width: 100%; width: 100%;
height:100%; height: 17rem;
object-fit: cover; object-fit: cover;
border-radius: .5rem; 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%;
}
}
</style> </style>
pages/admin/tickets/index.vue
+3 -6
View File
@@ -20,7 +20,7 @@
<el-input <el-input
v-model="filterText" v-model="filterText"
clearable clearable
placeholder="عنوان - کد مشتری - شماره سفارش" placeholder="عنوان - شماره سفارش"
style="display: inline-block; max-width: 500px; margin-top: 8px" style="display: inline-block; max-width: 500px; margin-top: 8px"
></el-input> ></el-input>
</CCol> </CCol>
@@ -113,11 +113,8 @@ export default {
return this.tickets.filter(item => { return this.tickets.filter(item => {
return ( return (
item.title.includes(filterText) || item.title.includes(filterText) ||
item.user_id.first_name.includes(filterText) || item.transaction_id.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)
) )
}) })
} }
pages/announcements/index.vue
+116 -7
View File
@@ -12,13 +12,14 @@
</div> </div>
<div v-if="item.image" class="row"> <div v-if="item.image" class="row">
<div class="col-md-6 col-sm-12"> <div class="col-md-5 col-sm-12">
<p>{{ item.caption }}</p> <p>{{ item.caption }}</p>
</div> </div>
<div class="col-md-6 col-sm-12"> <div class="col-md-7 col-sm-12">
<p>برای نمایش بهتر کلیک کنید</p>
<div class="fr-image"> <div class="fr-image">
<img :src="'/uploads/images/announcement/'+item.image" alt=""> <img id="myImg" :src="'/uploads/images/announcement/'+item.image" alt="">
</div> </div>
</div> </div>
@@ -27,6 +28,17 @@
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
</div> </div>
<!-- The Modal -->
<div v-if="modalVisible" id="myModal" class="modal">
<!-- The Close Button -->
<span @click="closeModal" class="close">&times;</span>
<!-- Modal Content (The Image) -->
<img id="img01" class="modal-content" :src="modalImageUrl">
</div>
<h3 v-if="!userAnnouncements.length" style="text-align: center; margin-top: 50px">هیچ اعلانی موجود نیست</h3> <h3 v-if="!userAnnouncements.length" style="text-align: center; margin-top: 50px">هیچ اعلانی موجود نیست</h3>
</user-dashboard-container> </user-dashboard-container>
</div> </div>
@@ -38,7 +50,9 @@
data() { data() {
return { return {
userAnnouncements:'' userAnnouncements:'',
modalVisible:false,
modalImageUrl:''
} }
}, },
mounted(){ mounted(){
@@ -47,6 +61,16 @@
this.userAnnouncements = res.data this.userAnnouncements = res.data
}) })
},
methods:{
openModal(image) {
this.modalVisible = true;
this.modalImageUrl = image;
},
closeModal() {
this.modalVisible = false;
},
} }
} }
</script> </script>
@@ -64,15 +88,100 @@
width: 80% !important; width: 80% !important;
} }
.fr-image{ .fr-image{
width: 17rem;
height: 11rem; height: 17rem;
margin: auto; margin: auto;
img{ img{
width: 100%; width: 100%;
height:100%; height: 17rem;
object-fit: cover; object-fit: cover;
border-radius: .5rem; 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%;
}
}
</style> </style>
server/index.js
+2
View File
@@ -24,6 +24,7 @@ function init() {
app.use(express.json()) app.use(express.json())
app.use(express.urlencoded({ extended: true })) app.use(express.urlencoded({ extended: true }))
app.use(fileUpload()) app.use(fileUpload())
console.log('🟢 ~ Node Server is running ')
// load plugins // load plugins
// getVerityToken() // getVerityToken()
@@ -50,6 +51,7 @@ function init() {
app.use(isDev ? '/api' : '', router) app.use(isDev ? '/api' : '', router)
return app return app
} }