diff --git a/web/.env b/web/.env index 5c85cbc..a5719e4 100644 --- a/web/.env +++ b/web/.env @@ -1,3 +1,3 @@ -VITE_TITLE = 'Vue FastAPI Admin' +VITE_TITLE = '成都文化产权交易所' VITE_PORT = 3100 \ No newline at end of file diff --git a/web/.env.development b/web/.env.development index d4aa8df..44f415e 100644 --- a/web/.env.development +++ b/web/.env.development @@ -5,4 +5,4 @@ VITE_PUBLIC_PATH = '/' VITE_USE_PROXY = true # base api -VITE_BASE_API = '/api/v1' +VITE_BASE_API = 'https://value.cdcee.net/api/v1' diff --git a/web/.env.production b/web/.env.production index 326f1e3..ad3ea55 100644 --- a/web/.env.production +++ b/web/.env.production @@ -2,7 +2,7 @@ VITE_PUBLIC_PATH = '/' # base api -VITE_BASE_API = '/api/v1' +VITE_BASE_API = 'https://value.cdcee.net/api/v1' # 是否启用压缩 VITE_USE_COMPRESS = true diff --git a/web/src/api/index.js b/web/src/api/index.js index e9040b9..48bf84d 100644 --- a/web/src/api/index.js +++ b/web/src/api/index.js @@ -10,8 +10,9 @@ export default { loginPhone: (data) => request.post('/app-user/login', data, { noNeedToken: true }), // pages getIndustryList: () => request.get('/industry/list'), - getHistoryList: (params) => request.get('/app-valuations', { params }), - valuations: (data = {}) => request.post('/app-valuations', data), + getHistoryList: (params) => request.get('/app-valuations/', { params }), + valuations: (data = {}) => request.post('/app-valuations/', data), + deleteValuations: (params = {}) => request.delete(`/app-valuations/${params.id}`), // profile updatePassword: (data = {}) => request.post('/base/update_password', data), // users diff --git a/web/src/utils/http/interceptors.js b/web/src/utils/http/interceptors.js index e782eba..ae587c2 100644 --- a/web/src/utils/http/interceptors.js +++ b/web/src/utils/http/interceptors.js @@ -26,7 +26,10 @@ export function resResolve(response) { const code = data?.code ?? status /** 根据code处理对应的操作,并返回处理后的message */ const message = resolveResError(code, data?.msg ?? statusText) - window.$message?.error(message, { keepAliveOnHover: true }) + console.log(message,'message') + if(message){ + window.$message?.error(message, { keepAliveOnHover: true }) + } return Promise.reject({ code, message, error: data || response }) } return Promise.resolve(data) @@ -37,7 +40,10 @@ export async function resReject(error) { const code = error?.code /** 根据code处理对应的操作,并返回处理后的message */ const message = resolveResError(code, error.message) - window.$message?.error(message) + console.log(message,'message') + if(message){ + window.$message?.error(message) + } return Promise.reject({ code, message, error }) } const { data, status } = error.response @@ -54,6 +60,9 @@ export async function resReject(error) { // 后端返回的response数据 const code = data?.code ?? status const message = resolveResError(code, data?.msg ?? error.message) - window.$message?.error(message, { keepAliveOnHover: true }) + console.log(message,'message') + if(message){ + window.$message?.error(message, { keepAliveOnHover: true }) + } return Promise.reject({ code, message, error: error.response?.data || error.response }) } diff --git a/web/src/views/pages/index.vue b/web/src/views/pages/index.vue index 165ca2a..ff006f8 100644 --- a/web/src/views/pages/index.vue +++ b/web/src/views/pages/index.vue @@ -5,7 +5,7 @@
+
+ 重新评估
+
+ 重新评估
+
@@ -537,7 +546,7 @@ import type { FormInst, FormItemRule, FormRules } from 'naive-ui'
import StepProgressBar from './components/StepProgressBar.vue';
import api from '@/api'
import { ref, reactive, onMounted } from 'vue'
-import { useMessage } from 'naive-ui'
+import { useMessage, useDialog } from 'naive-ui'
import backgroundImg from '@/assets/images/background.png';
import backgroundImg1 from '@/assets/images/bgc.png';
import backgroundImg2 from '@/assets/images/bgy.png';
@@ -553,7 +562,8 @@ const steps = [
{ title: '非遗应用与推广' },
{ title: '非遗资产衍生商品信息' }
];
-const actionUrl = 'http://124.222.245.240:8080/api/v1/upload/image'
+const loading = ref(false)
+const actionUrl = 'https://value.cdcee.net/api/v1/upload/image'
const currentStep = ref(0)
const historyList = ref([])
const modalForm = reactive({
@@ -1003,11 +1013,15 @@ const delete3 = (file) => {
console.log(modalForm.inheritor_certificates)
}
const previousStep = () => {
+ console.log(modalForm)
currentStep.value --
}
const nextStep = () => {
console.log(modalForm)
+ if(loading.value){
+ return
+ }
modalFormRef.value?.validate((errors) => {
if (!errors) {
if(currentStep.value != 4){
@@ -1018,7 +1032,6 @@ const nextStep = () => {
}
}
else {
- console.log(errors)
message.error('请完善表单')
}
})
@@ -1043,7 +1056,7 @@ const submit = () => {
pattern_images: modalForm.pattern_images.map(item => item.url),
implementation_stage: maturityOptions.find(item => item.value === modalForm.application_maturity).label,
coverage_area: coverageOptions.find(item => item.value === modalForm.application_coverage).label,
- collaboration_type: depthOptions.find(item => item.value === modalForm.cooperation_depth).label,
+ collaboration_type: depthOptions.find(item => item.value === modalForm.cooperation_depth)?.label,
scarcity_level: circulationOptions.find(item => item.value === modalForm.circulation).label,
market_activity_time: activityOptions.find(item => item.value === modalForm.last_market_activity).label,
price_fluctuation: [modalForm.price_fluctuation[0]-0,modalForm.price_fluctuation[1]-0],
@@ -1088,14 +1101,13 @@ const submit = () => {
}
}
data.inheritor_age_count = data.inheritor_ages
+ message.success('正在评估中,请前往历史记录查看')
+ loading.value = true
api.valuations(data).then(res=>{
- message.success('评估中,请前往历史记录查看')
+ loading.value = false
getHistoryList()
- setTimeout(() => {
- window.location.reload()
- }, 1000);
+ window.location.reload()
})
- console.log('data',data)
}
const getHistoryList = () => {
const params = {
@@ -1106,15 +1118,36 @@ const getHistoryList = () => {
historyList.value = res.data
})
}
+const selectedObj = ref({
+ calculation_result: '',
+})
const selectTimeBox = (item) => {
isSelected.value = item.id
status.value = item.status
+ selectedObj.value = item
}
const retry = () => {
status.value = 'create'
}
+const dialog = useDialog()
+const deleteValuations = (item) => {
+ dialog.warning({
+ title: '确认删除',
+ content: '是否确认删除记录?',
+ positiveText: '确定',
+ negativeText: '取消',
+ draggable: true,
+ onPositiveClick: () => {
+ api.deleteValuations(item).then(()=>{
+ message.success('删除成功')
+ getHistoryList()
+ status.value = 'create'
+ })
+ },
+ })
+}
onMounted(async () => {
const params = {