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

Fix bug and update

Browse Source
This commit is contained in:
Swift
2023-11-29 22:59:52 +03:30
parent bce43bda11
commit a6a8d6ad5a
25 changed files with 12654 additions and 15098 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/account/announcements/index.vue
+30 -3
View File
@@ -2,13 +2,27 @@
<user-dashboard-container page-class="announcements" panel-title="اعلانات">
<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-item :key="item._id + 'co_item'" :name="item._id">
<el-collapse-item :key="item._id + 'co_item'" :name="item._id" >
<template slot="title">
<h3>{{ item.title }}</h3>
</template>
<div>
<p>{{ item.caption }}</p>
<div v-if="!item.image" class="col-12">
<p>{{ item.caption }}</p>
</div>
<div v-if="item.image" class="row">
<div class="col-md-6 col-sm-12">
<p>{{ item.caption }}</p>
</div>
<div class="col-md-6 col-sm-12">
<div class="fr-image">
<img :src="'/uploads/images/announcement/'+item.image" alt="">
</div>
</div>
</div>
</el-collapse-item>
</el-collapse>
</div>
@@ -37,3 +51,16 @@ export default {
}
}
</script>
<style lang="scss" scoped>
.fr-image{
width: 17rem;
height: 11rem;
margin: auto;
img{
width: 100%;
height:100%;
object-fit: cover;
border-radius: .5rem;
}
}
</style>
pages/admin/announcements/_item.vue
+59 -33
View File
@@ -14,23 +14,28 @@
<h6>متن اعلان:</h6>
<el-divider></el-divider>
<CForm>
<CInput
v-model="announcement.title"
label="عنوان"
horizontal
:class="validation.title && 'err'"
:disabled="!isNew"
:description="validation.title && validation.title.msg"
/>
<CTextarea
v-model="announcement.caption"
label="متن"
horizontal
rows="5"
:class="validation.caption && 'err'"
:disabled="!isNew"
:description="validation.caption && validation.caption.msg"
/>
<CInput v-model="announcement.title" label="عنوان" horizontal :class="validation.title && 'err'"
:disabled="!isNew" :description="validation.title && validation.title.msg" />
<CTextarea v-model="announcement.caption" label="متن" horizontal rows="5"
:class="validation.caption && 'err'" :disabled="!isNew"
:description="validation.caption && validation.caption.msg" />
<div class="row">
<div class="col-12">
<label class="fl-r"> تصویر : </label>
<label for="file" class="btn-upload">آپلود تصویر</label>
<input id="file" ref="myFiles" style="display: none;" type="file" @change="setData" />
</div>
<div v-if="type === 'user'" class="col-12 mt-4 mr-3">
<input id="flexCheckDefault" v-model="announcement.publicx" class="form-check-input" type="checkbox" />
<label class="form-check-label" for="flexCheckDefault">
عمومی
</label>
</div>
</div>
</CForm>
<el-divider></el-divider>
<h6>تاریخ منقضی شدن اعلان:</h6>
@@ -40,15 +45,8 @@
<p v-if="type === 'agent'" class="mb-4" style="font-size: 12px; color: gray">
*زمانی که اعلان منقضی شود از لیست حذف نخواهد شد و فقط در پنل نمایندگان قابل مشاهده نخواهد بود.
</p>
<persian-date-picker
v-model="expireDate"
display-format="jYYYY/jMM/jDD"
:min="today"
format="x"
:disabled="!isNew"
placeholder="تاریخ را انتخاب کنید"
color="#065495"
/>
<persian-date-picker v-model="expireDate" display-format="jYYYY/jMM/jDD" :min="today" format="x"
:disabled="!isNew" placeholder="تاریخ را انتخاب کنید" color="#065495" />
<p v-if="validation.expireDate" style="color: red">{{ validation.expireDate.msg }}</p>
</CCardBody>
@@ -61,12 +59,8 @@
<h6>وضعیت بازدید اعلان:</h6>
<el-divider></el-divider>
<div class="progressBar">
<el-progress
:text-inside="true"
:stroke-width="26"
:color="customColors"
:percentage="seenPercentage"
></el-progress>
<el-progress :text-inside="true" :stroke-width="26" :color="customColors"
:percentage="seenPercentage"></el-progress>
</div>
</CCardBody>
</CCard>
@@ -76,9 +70,14 @@
</template>
<script>
import axiosUploadProcess from '@/mixins/axiosUploadProcess'
export default {
name: 'AdminAnnouncementDetails',
mixins: [axiosUploadProcess],
layout: 'admin',
async asyncData({ $axios, params, query, error }) {
try {
if (params.item !== 'new') {
@@ -93,6 +92,8 @@ export default {
} else {
return {
announcement: {
publicx: false,
image: '',
title: '',
caption: '',
expireDate: '',
@@ -160,10 +161,22 @@ export default {
}
},
methods: {
setData(event) {
this.announcement.image = this.$refs.myFiles.files[0];
console.log(event)
},
post() {
this.validation = {}
const data = new FormData()
data.append('title', this.announcement.title)
data.append('caption', this.announcement.caption)
data.append('isForAgents', this.announcement.isForAgents)
data.append('publicx', this.announcement.publicx)
data.append('expireDate', this.announcement.expireDate)
data.append('image', this.$refs.myFiles.files[0])
this.$axios
.post('/api/admin/announcements', this.announcement)
.post('/api/admin/announcements', data, this.axiosConfig)
.then(res => {
this.$message({
type: 'success',
@@ -223,4 +236,17 @@ export default {
text-align: left;
}
}
.btn-upload {
background-color: cornflowerblue;
padding: .5rem 1rem;
border-radius: .5rem;
cursor: pointer;
color: white;
float: left;
}
.space {
margin: 5rem;
}
</style>
pages/admin/customers/_customer.vue
+30 -22
View File
@@ -120,37 +120,31 @@
</CCard>
</CCol>
<CCol lg="6">
<CCol lg="12">
<CCard>
<CCardBody>
<h6>اطلاعات مشتری:</h6>
<el-divider></el-divider>
<CForm>
<CInput label="نام مشتری" horizontal disabled :value="user.first_name + ' ' + user.last_name" />
<CInput label="کد ملی" horizontal disabled :value="user.national_code" />
<CInput label="شماره تلفن" horizontal disabled :value="user.tel_number" />
<CInput label="شماره موبایل" horizontal disabled :value="user.mobile_number" />
<CInput label="ایمیل" horizontal disabled :value="user.email" />
<CInput label="نام فروشگاه" horizontal disabled :value="user.store_name" />
<CForm class="row" style="justify-content: center;">
<CInput v-model="user.first_name" class="col-6 col-sm-12" label="نام" horizontal :value="user.first_name" />
<CInput v-model="user.last_name" class="col-6 col-sm-12" label="نام خانوادگی" horizontal :value=" user.last_name" />
<CInput v-model="user.national_code" class="col-6 col-sm-12" label="کد ملی" horizontal :value="user.national_code" />
<CInput v-model="user.tel_number" class="col-6 col-sm-12" label="شماره تلفن" horizontal :value="user.tel_number" />
<CInput v-model="user.mobile_number" class="col-6 col-sm-12" label="شماره موبایل" horizontal :value="user.mobile_number" />
<CInput v-model="user.email" class="col-6 col-sm-12" label="ایمیل" horizontal :value="user.email" />
<CInput v-model="user.store_name" class="col-6 col-sm-12" label="نام فروشگاه" horizontal :value="user.store_name" />
<CInput v-model="user.province_name" class="col-6 col-sm-12" label="استان" horizontal :value="user.province_name" />
<CInput v-model="user.city_name" class="col-6 col-sm-12" label="شهر" horizontal :value="user.city_name" />
<CTextarea v-model="user.address" class="col-6 col-sm-12" label="آدرس" horizontal rows="5" :value="user.address" />
<CInput v-model="user.postal_code" class="col-6 col-sm-12" label="کد پستی" horizontal :value="user.postal_code" />
<CButton color="success" style="width: 10%; " @click="update" >بروزرسانی</CButton>
</CForm>
</CCardBody>
</CCard>
</CCol>
<CCol lg="6">
<CCard>
<CCardBody>
<h6>آدرس مشتری</h6>
<el-divider></el-divider>
<CForm>
<CInput label="استان" horizontal disabled :value="user.province_name" />
<CInput label="شهر" horizontal disabled :value="user.city_name" />
<CTextarea label="آدرس" horizontal disabled rows="5" :value="user.address" />
<CInput label="کد پستی" horizontal disabled :value="user.postal_code" />
</CForm>
</CCardBody>
</CCard>
</CCol>
</CRow>
</div>
</template>
@@ -190,6 +184,20 @@ export default {
}
},
methods: {
update(){
this.$axios.put(`/api/admin/user/update/${this.user._id}`,this.user).then((res)=>{
this.$message({
type: 'success',
message: 'اطالاعات جدید در سیستم ثبت شد'
})
this.$nuxt.refresh()
}).catch((err) =>{
if (err.response.status === 422) this.validation = err.response.data.validation
else console.log(err)
})
},
updateVerityInfo() {
this.validation = {}
this.$confirm(
pages/admin/tickets/index.vue
+1 -1
View File
@@ -91,7 +91,7 @@ export default {
tickets: tickets.data
}
} catch (err) {
error({ status: 404, message: 'There is a problem here' })
error({ status: 404, message: 'There is a problem here', log: err })
}
},
data() {
pages/announcements/index.vue
+78
View File
@@ -0,0 +1,78 @@
<template>
<div class="bg-img-in" >
<user-dashboard-container page-class="announcements" panel-title="اعلانات" class="panelx">
<div v-for="item in userAnnouncements" :key="item._id" class="item" >
<el-collapse :key="item._id + 'co_parent'" accordion >
<el-collapse-item :key="item._id + 'co_item'" :name="item._id" >
<template slot="title">
<h3>{{ item.title }}</h3>
</template>
<div v-if="!item.image" class="col-12">
<p>{{ item.caption }}</p>
</div>
<div v-if="item.image" class="row">
<div class="col-md-6 col-sm-12">
<p>{{ item.caption }}</p>
</div>
<div class="col-md-6 col-sm-12">
<div class="fr-image">
<img :src="'/uploads/images/announcement/'+item.image" alt="">
</div>
</div>
</div>
</el-collapse-item>
</el-collapse>
</div>
<h3 v-if="!userAnnouncements.length" style="text-align: center; margin-top: 50px">هیچ اعلانی موجود نیست</h3>
</user-dashboard-container>
</div>
</template>
<script>
export default {
name: 'PublicAnnouncements',
data() {
return {
userAnnouncements:''
}
},
mounted(){
this.$axios.get('/api/public/announcement').then((res)=>{
this.userAnnouncements = res.data
})
}
}
</script>
<style lang="scss" scoped>
.bg-img-in{
background: url(@/static/assets/img/home/bg2.jpg);
background-size: cover;
background-repeat: no-repeat;
border-top: groove;
}
.panelx{
margin-top: 20%;
margin-left: auto;
margin-right: auto;
width: 80% !important;
}
.fr-image{
width: 17rem;
height: 11rem;
margin: auto;
img{
width: 100%;
height:100%;
object-fit: cover;
border-radius: .5rem;
}
}
</style>
pages/index.vue
+1
View File
@@ -114,6 +114,7 @@ export default {
}
},
methods: {
checkSerial() {
// validation
if (this.checkingSerial) {