updte

parent 9bd612c3
...@@ -7,16 +7,17 @@ ...@@ -7,16 +7,17 @@
"private": true, "private": true,
"scripts": { "scripts": {
"lint": "eslint --ext .js,.ts,.vue ./", "lint": "eslint --ext .js,.ts,.vue ./",
"test": "echo \"No test specified\" && exit 0" "test": "echo \"No test specified\" && exit 0",
"fix--lint": "eslint --fix --ext .js,.jsx ."
}, },
"dependencies": { "dependencies": {
"@quasar/extras": "^1.0.0", "@quasar/extras": "^1.14.0",
"@vue/runtime-core": "^3.2.33", "@vue/runtime-core": "^3.2.33",
"axios": "^0.21.1", "axios": "^0.21.1",
"core-js": "^3.6.5", "core-js": "^3.6.5",
"http-status-codes": "^2.1.4", "http-status-codes": "^2.1.4",
"moment": "^2.29.1", "moment": "^2.29.1",
"quasar": "^2.0.0-beta.1", "quasar": "^2.7.1",
"secure-ls": "^1.2.6", "secure-ls": "^1.2.6",
"vue": "^3.0.11", "vue": "^3.0.11",
"vue-i18n": "^9.0.0-beta.0", "vue-i18n": "^9.0.0-beta.0",
...@@ -24,7 +25,7 @@ ...@@ -24,7 +25,7 @@
"vuex-persistedstate": "^4.0.0-beta.3" "vuex-persistedstate": "^4.0.0-beta.3"
}, },
"devDependencies": { "devDependencies": {
"@quasar/app": "^3.0.0-beta.1", "@quasar/app-webpack": "^3.5.3",
"@quasar/cli": "^1.1.3", "@quasar/cli": "^1.1.3",
"@types/node": "^10.17.15", "@types/node": "^10.17.15",
"@typescript-eslint/eslint-plugin": "^4.16.1", "@typescript-eslint/eslint-plugin": "^4.16.1",
......
...@@ -3,8 +3,8 @@ export const config = { ...@@ -3,8 +3,8 @@ export const config = {
// API_ENDPOINT: 'https://cms.vab.vn/api/', // API_ENDPOINT: 'https://cms.vab.vn/api/',
// API_IMAGE_ENDPOINT: 'https://cms.vab.vn/file/upload/', // API_IMAGE_ENDPOINT: 'https://cms.vab.vn/file/upload/',
// dev // dev
API_ENDPOINT: 'https://cms.vab.xteldev.com/api/', API_ENDPOINT: 'https://103.147.34.20:10700/api/',
API_IMAGE_ENDPOINT: 'https://cms.vab.xteldev.com/file/upload/', API_IMAGE_ENDPOINT: 'https://103.147.34.20:10705/file/upload/',
API_RES_CODE: { API_RES_CODE: {
OK: { OK: {
...@@ -121,4 +121,7 @@ export enum API_PATHS { ...@@ -121,4 +121,7 @@ export enum API_PATHS {
updateConfigHotProduct = 'config/home/product/update/salient', updateConfigHotProduct = 'config/home/product/update/salient',
addConfigHotProduct = 'config/home/product/add/salient', addConfigHotProduct = 'config/home/product/add/salient',
deleteConfigHotProduct = 'config/home/product/delete/salient', deleteConfigHotProduct = 'config/home/product/delete/salient',
getLitCustomerWaiting = 'customer/listRegister',
detailCustomerWaiting = 'customer/detailRegister',
accountCustomerBrowsing = 'customer/accountCustomerBrowsing'
} }
This diff is collapsed.
...@@ -462,7 +462,7 @@ export default defineComponent({ ...@@ -462,7 +462,7 @@ export default defineComponent({
const response = (await api({ const response = (await api({
headers: { 'Content-Type': 'multipart/form-data' }, headers: { 'Content-Type': 'multipart/form-data' },
// url: 'https://cms.vab.vn/file/upload/', // pro // url: 'https://cms.vab.vn/file/upload/', // pro
url: 'https://cms.vab.xteldev.com/file/upload/', // test url: 'https://103.147.34.20:10705/file/upload/', // test
method: 'POST', method: 'POST',
data: bodyFormData, data: bodyFormData,
......
...@@ -401,7 +401,7 @@ export default defineComponent({ ...@@ -401,7 +401,7 @@ export default defineComponent({
const response = (await api({ const response = (await api({
headers: { 'Content-Type': 'multipart/form-data' }, headers: { 'Content-Type': 'multipart/form-data' },
// url: 'https://cms.vab.vn/file/upload/', // pro // url: 'https://cms.vab.vn/file/upload/', // pro
url: 'https://cms.vab.xteldev.com/file/upload/', // test url: 'https://103.147.34.20:10705/file/upload/', // test
method: 'POST', method: 'POST',
data: bodyFormData, data: bodyFormData,
......
...@@ -409,7 +409,7 @@ export default defineComponent({ ...@@ -409,7 +409,7 @@ export default defineComponent({
const response = (await api({ const response = (await api({
headers: { 'Content-Type': 'multipart/form-data' }, headers: { 'Content-Type': 'multipart/form-data' },
// url: 'https://cms.vab.vn/file/upload/', // pro // url: 'https://cms.vab.vn/file/upload/', // pro
url: 'https://cms.vab.xteldev.com/file/upload/', // test url: 'https://103.147.34.20:10705/file/upload/', // test
method: 'POST', method: 'POST',
data: bodyFormData, data: bodyFormData,
......
...@@ -469,7 +469,7 @@ export default defineComponent({ ...@@ -469,7 +469,7 @@ export default defineComponent({
const response = (await api({ const response = (await api({
headers: { 'Content-Type': 'multipart/form-data' }, headers: { 'Content-Type': 'multipart/form-data' },
// url: 'https://cms.vab.vn/file/upload/', // pro // url: 'https://cms.vab.vn/file/upload/', // pro
url: 'https://cms.vab.xteldev.com/file/upload/', // test url: 'https://103.147.34.20:10705/file/upload/', // test
method: 'POST', method: 'POST',
data: bodyFormData, data: bodyFormData,
......
...@@ -414,7 +414,7 @@ export default defineComponent({ ...@@ -414,7 +414,7 @@ export default defineComponent({
const response = (await api({ const response = (await api({
headers: { 'Content-Type': 'multipart/form-data' }, headers: { 'Content-Type': 'multipart/form-data' },
// url: 'https://cms.vab.vn/file/upload/', // pro // url: 'https://cms.vab.vn/file/upload/', // pro
url: 'https://cms.vab.xteldev.com/file/upload/', // test url: 'https://103.147.34.20:10705/file/upload/', // test
method: 'POST', method: 'POST',
data: bodyFormData, data: bodyFormData,
})) as AxiosResponse<BaseResponseBody<FileUploadType>>; })) as AxiosResponse<BaseResponseBody<FileUploadType>>;
......
This diff is collapsed.
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
$t('customer.toolTipMessage.updateCustomerInfo') $t('customer.toolTipMessage.updateCustomerInfo')
}}</q-tooltip> }}</q-tooltip>
</q-btn> </q-btn>
<q-btn <!-- <q-btn
flat flat
round round
color="primary" color="primary"
...@@ -97,8 +97,8 @@ ...@@ -97,8 +97,8 @@
@click="confirmBrowserCustomer(rowData.row.id)" @click="confirmBrowserCustomer(rowData.row.id)"
> >
<q-tooltip :offset="[20, 10]">Duyệt tài khoản</q-tooltip> <q-tooltip :offset="[20, 10]">Duyệt tài khoản</q-tooltip>
</q-btn> </q-btn> -->
<q-btn <!-- <q-btn
flat flat
round round
color="primary" color="primary"
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
@click="confirmRefusedBrowserCustomer(rowData.row.id)" @click="confirmRefusedBrowserCustomer(rowData.row.id)"
> >
<q-tooltip :offset="[10, 10]">Từ chối duyệt</q-tooltip> <q-tooltip :offset="[10, 10]">Từ chối duyệt</q-tooltip>
</q-btn> </q-btn> -->
<q-btn <q-btn
flat flat
round round
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-approvalStatus="rowData"> <!-- <template v-slot:body-cell-approvalStatus="rowData">
<q-td> <q-td>
<div align="center"> <div align="center">
<q-chip <q-chip
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
</q-chip> </q-chip>
</div> </div>
</q-td> </q-td>
</template> </template> -->
</q-table> </q-table>
<div class="col-12 q-mt-sm"> <div class="col-12 q-mt-sm">
<Pagination <Pagination
...@@ -181,13 +181,13 @@ ...@@ -181,13 +181,13 @@
@editCustomer="updateCustomer" @editCustomer="updateCustomer"
></UpdateNewCustomerDialogComponent> ></UpdateNewCustomerDialogComponent>
<RefusedBrowserCustomer <!-- <RefusedBrowserCustomer
:customer-id="customerId" :customer-id="customerId"
v-model:open-dialog-refused-browser="openDialogRefusedBrowser" v-model:open-dialog-refused-browser="openDialogRefusedBrowser"
@click:CloseBtn="openDialogRefusedBrowser = false" @click:CloseBtn="openDialogRefusedBrowser = false"
@editReCustomer="getListCustomers" @editReCustomer="getListCustomers"
> >
</RefusedBrowserCustomer> </RefusedBrowserCustomer> -->
</div> </div>
</div> </div>
...@@ -200,7 +200,7 @@ import { defineComponent, onMounted, Ref, ref } from 'vue'; ...@@ -200,7 +200,7 @@ import { defineComponent, onMounted, Ref, ref } from 'vue';
import Pagination from 'components/pagination/index.vue'; import Pagination from 'components/pagination/index.vue';
import AddNewCustomerDialogComponent from '../../components/customer/add-new-customer-dialog/index.vue'; import AddNewCustomerDialogComponent from '../../components/customer/add-new-customer-dialog/index.vue';
import UpdateNewCustomerDialogComponent from '../../components/customer/update-new-customer-dialog/index.vue'; import UpdateNewCustomerDialogComponent from '../../components/customer/update-new-customer-dialog/index.vue';
import RefusedBrowserCustomer from '../../components/customer/openDialogRefusedBrowser.vue' // import RefusedBrowserCustomer from '../../components/customer/openDialogRefusedBrowser.vue'
import { API_PATHS, config } from 'src/assets/configurations.example'; import { API_PATHS, config } from 'src/assets/configurations.example';
import { AxiosResponse } from 'axios'; import { AxiosResponse } from 'axios';
import { api, BaseResponseBody } from 'src/boot/axios'; import { api, BaseResponseBody } from 'src/boot/axios';
...@@ -214,7 +214,7 @@ export default defineComponent({ ...@@ -214,7 +214,7 @@ export default defineComponent({
components: { components: {
AddNewCustomerDialogComponent, AddNewCustomerDialogComponent,
UpdateNewCustomerDialogComponent, UpdateNewCustomerDialogComponent,
RefusedBrowserCustomer, // RefusedBrowserCustomer,
Pagination, Pagination,
}, },
setup() { setup() {
......
...@@ -285,7 +285,7 @@ export default defineComponent({ ...@@ -285,7 +285,7 @@ export default defineComponent({
const response = (await api({ const response = (await api({
headers: { 'Content-Type': 'multipart/form-data' }, headers: { 'Content-Type': 'multipart/form-data' },
// url: 'https://cms.vab.vn/file/upload/', // pro // url: 'https://cms.vab.vn/file/upload/', // pro
url: 'https://cms.vab.xteldev.com/file/upload/', // test url: 'https://103.147.34.20:10705/file/upload/', // test
method: 'POST', method: 'POST',
data: bodyFormData, data: bodyFormData,
})) as AxiosResponse<BaseResponseBody<FileUploadType>>; })) as AxiosResponse<BaseResponseBody<FileUploadType>>;
......
...@@ -10,6 +10,7 @@ export enum Pages { ...@@ -10,6 +10,7 @@ export enum Pages {
informationArtist = 'cap-nhat-thong-tin-nghe-sy', informationArtist = 'cap-nhat-thong-tin-nghe-sy',
customer = 'khach-hang', customer = 'khach-hang',
customerWaiting = 'khach-hang-cho-duyet',
addArtist = 'them-nghe-sy', addArtist = 'them-nghe-sy',
customerRank = 'xep-hang-khach-hang', customerRank = 'xep-hang-khach-hang',
artistRank = 'Xep-hang-nghi-sy', artistRank = 'Xep-hang-nghi-sy',
...@@ -82,6 +83,11 @@ const routes: RouteRecordRaw[] = [ ...@@ -82,6 +83,11 @@ const routes: RouteRecordRaw[] = [
component: () => import('pages/khach-hang/index.vue'), component: () => import('pages/khach-hang/index.vue'),
name: Pages.customer, name: Pages.customer,
}, },
{
path: '/khach-hang-cho-duyet',
component: () => import('pages/khach-hang-cho-duyet/index.vue'),
name: Pages.customerWaiting,
},
{ {
path: 'xep-hang-khach-hang', path: 'xep-hang-khach-hang',
component: () => import('pages/xep-hang-khach-hang/index.vue'), component: () => import('pages/xep-hang-khach-hang/index.vue'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment