diff --git a/.env.dev b/.env.dev
index bb781b0..a2c2612 100644
--- a/.env.dev
+++ b/.env.dev
@@ -12,8 +12,8 @@ VITE_ROUTER_BASE=/
VITE_ROUTER_HISTORY=hash
# api
-VITE_API_BASIC=https://api.hailin-keji.com
-#VITE_API_BASIC=http://10.10.1.6:8060
+# VITE_API_BASIC=https://api.hailin-keji.com
+VITE_API_BASIC=http://10.10.1.6:8060
VITE_API_HTTP=/api/v1/
# storage
VITE_STORAGE_NAMESPACE = gin-admin_local_
diff --git a/src/apis/modules/companyInfo.js b/src/apis/modules/companyInfo.js
new file mode 100644
index 0000000..3608174
--- /dev/null
+++ b/src/apis/modules/companyInfo.js
@@ -0,0 +1,10 @@
+/**
+ * 海邻动态接口
+ */
+import request from '@/utils/request'
+// 获取公司动态列表
+export const getDataList = () => request.basic.get('/api/v1/companies')
+
+// 更新动态
+export const updateItem = (id, params) => request.basic.put(`/api/v1/companies/${id}`, params)
+
diff --git a/src/views/AboutY/Profile/index.vue b/src/views/AboutY/Profile/index.vue
index cab1273..1c514e3 100644
--- a/src/views/AboutY/Profile/index.vue
+++ b/src/views/AboutY/Profile/index.vue
@@ -1,126 +1,61 @@
-
-
-
-
-
-
- 750*500px,图片大小不超过150kb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 106*106px,图片大小不超过50kb
-
- 删除
-
+
+
+
-
- 新增社交媒体
-
+
+
+ 750*500px,图片大小不超过150kb
-
-
-
- 保存
+
+
+
+ 保存
+
diff --git a/src/views/productType/index.vue b/src/views/productType/index.vue
deleted file mode 100644
index 34cb519..0000000
--- a/src/views/productType/index.vue
+++ /dev/null
@@ -1,154 +0,0 @@
-
-
-
-
-
-
-
-
-
- 新增分类
-
-
-
-
-
- 启用
- 停用
-
-
-
-
-
-
- {{ $t('pages.system.delete') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/productY/productCentre/components/EditDialog.vue b/src/views/productY/productCentre/components/EditDialog.vue
index d67e9e8..cb89d3c 100644
--- a/src/views/productY/productCentre/components/EditDialog.vue
+++ b/src/views/productY/productCentre/components/EditDialog.vue
@@ -100,6 +100,9 @@
+
+
+
@@ -203,6 +206,7 @@ function handleCreate() {
images: [''],
sequence: null,
status: 'enabled',
+ imageLabel:''
}
initData()
}
@@ -280,6 +284,7 @@ function handleOk() {
}],
feature: formData.value.feature,
images: formData.value.mainImage ? formData.value.mainImage.map(item => spliceUrl(item)) : [''],
+ imageLabel:formData.value.imageLabel
}
console.log(params)
let result = null
diff --git a/src/views/productY/productClassify/components/EditDialog.vue b/src/views/productY/productClassify/components/EditDialog.vue
index b3f0dca..03ef0c7 100644
--- a/src/views/productY/productClassify/components/EditDialog.vue
+++ b/src/views/productY/productClassify/components/EditDialog.vue
@@ -19,7 +19,11 @@
-
+
+
+
+
+
@@ -46,16 +50,16 @@ const { formRecord, formData, formRef, formRules, resetForm } = useForm()
const { spining, showSpining, hideSpining } = useSpining()
const cancelText = ref(t('button.cancel'))
const okText = ref(t('button.confirm'))
-const treeData=ref([])
+const treeData = ref([])
formRules.value = {
label: { required: true, message: '请输入产品类别名称' },
+ sequence:{required: true, message: '请输入排序'}
}
-
const initData = async () => {
const { success, data, total } = await apis.categorys
.getDataList({
- pageSize:99,
+ pageSize: 99,
page: 1,
})
.catch(() => {
@@ -79,7 +83,23 @@ function handleCreate() {
initData()
}
-
+/**
+ * 编辑
+ */
+async function handleEdit(record = {}) {
+ initData()
+ console.log(record)
+ showModal({
+ type: 'edit',
+ title: '编辑分类',
+ })
+ const { data, success } = await apis.categorys.getItem(record.value).catch()
+ if (!success) {
+ hideModal()
+ return
+ }
+ formData.value = { ...data }
+}
/**
* 确定
*/
@@ -89,7 +109,7 @@ function handleOk() {
showLoading()
const params = {
...values,
- parentID:formData.value.parentID?formData.value.parentID:0
+ parentID: formData.value.parentID ? formData.value.parentID : 0
}
let result = null
switch (modal.value.type) {
@@ -99,7 +119,7 @@ function handleOk() {
})
break
case 'edit':
- result = await apis.products.updateProductsItem(formData.value.id, params).catch(() => {
+ result = await apis.categorys.updateProductsItem(formData.value.id, params).catch(() => {
throw new Error(error)
})
break
@@ -138,6 +158,7 @@ function onAfterClose() {
defineExpose({
handleCreate,
+ handleEdit,
})
diff --git a/src/views/productY/productClassify/index.vue b/src/views/productY/productClassify/index.vue
index 3503447..368510b 100644
--- a/src/views/productY/productClassify/index.vue
+++ b/src/views/productY/productClassify/index.vue
@@ -19,8 +19,11 @@
-
-
+
+
+ 编辑分类
+
+
{{ $t('pages.system.delete') }}
@@ -48,11 +51,12 @@ import { PlusOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons-vu
import { useI18n } from 'vue-i18n'
import { delProductsItem, getProductsList } from '@/apis/modules/products'
defineOptions({
- name: 'productClassify',
+ name: 'productType',
})
const { t } = useI18n() // 解构出t方法
const columns = [
{ title: '分类名称', dataIndex: 'label' },
+ { title: '分类排序', dataIndex: 'sequence' },
// { title: '状态', dataIndex: 'status', width: 120, align: 'center' },
{ title: t('button.action'), key: 'action', fixed: 'right', width: 100, align: 'center' },
]
diff --git a/src/views/technologyCenter/team/components/EditDialog.vue b/src/views/technologyCenter/team/components/EditDialog.vue
index 3ba834c..96dc061 100644
--- a/src/views/technologyCenter/team/components/EditDialog.vue
+++ b/src/views/technologyCenter/team/components/EditDialog.vue
@@ -21,7 +21,7 @@
-
+
+
+
@@ -77,7 +80,7 @@ const roles = ref([])
const img = ref('')
formRules.value = {
name: { required: true, message: '请输入名称' },
- rank: { required: true, message: '请输入人物简介' },
+ rank: { required: false, message: '请输入人物简介' },
status: [{ required: true, message: '请选择状态', trigger: 'change' }],
sequence: [{ required: true, message: '请选择顺序', trigger: 'change' }],
img: [{ required: true, message: '请上传图片', trigger: 'change' }],
@@ -110,7 +113,7 @@ async function handleEdit(record = {}) {
showModal({
type: 'edit',
// 80对应about
- title: t('pages.system.user.edit'),
+ title: '编辑',
})
const { data, success } = await apis.team.getMenu(record.id).catch()
if (!success) {
@@ -138,7 +141,7 @@ function handleOk() {
rank: formData.value.rank,
}
let result = null
- console.log(modal.value.type)
+ console.log(params)
switch (modal.value.type) {
case 'create':
result = await apis.team.createMenu(params).catch(() => {
diff --git a/src/views/technologyCenter/team/index.vue b/src/views/technologyCenter/team/index.vue
index 5f83b73..ca096d2 100644
--- a/src/views/technologyCenter/team/index.vue
+++ b/src/views/technologyCenter/team/index.vue
@@ -43,7 +43,7 @@
+ :pagination="paginationState" :scroll="{ x: 1000 }" @change="onTableChange">
@@ -54,23 +54,22 @@
{{ record.name }}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -146,7 +145,7 @@ async function getPageList() {
const { success, data, total } = await apis.team
.getDataList({
pageSize,
- current:current,
+ current: current,
...searchFormData.value,
})
.catch(() => {
diff --git a/src/views/websiteRelated/contactUs/index.vue b/src/views/websiteRelated/contactUs/index.vue
index 06c0da4..fdfd0fb 100644
--- a/src/views/websiteRelated/contactUs/index.vue
+++ b/src/views/websiteRelated/contactUs/index.vue
@@ -63,7 +63,9 @@
+
+
保存