Compare commits

..

No commits in common. "4f06cb9c78733df6f80dbbc6a347fab0f0bc13ee" and "1f6fb8db7a3d80e12565194eee04ea01f34b10b4" have entirely different histories.

2 changed files with 13 additions and 18 deletions

View File

@ -12,7 +12,7 @@ VITE_ROUTER_BASE=/
VITE_ROUTER_HISTORY=hash VITE_ROUTER_HISTORY=hash
# api # api
# VITE_API_BASIC=http://10.10.1.6:8071 VITE_API_BASIC=http://10.10.1.6:8071
VITE_API_HTTP=/api/v1/ VITE_API_HTTP=/api/v1/
# storage # storage
VITE_STORAGE_NAMESPACE = gin-admin_local_ VITE_STORAGE_NAMESPACE = gin-admin_local_

View File

@ -31,11 +31,6 @@
<a-input :placeholder="'请输入营业时间'" v-model:value="formData.openAt"></a-input> <a-input :placeholder="'请输入营业时间'" v-model:value="formData.openAt"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24">
<a-form-item :label="'联系电话'" name="openAt">
<a-input :placeholder="'请输入联系电话'" v-model:value="formData.concatPhone"></a-input>
</a-form-item>
</a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-item :label="'标签'" name="labels"> <a-form-item :label="'标签'" name="labels">
<a-select v-model:value="formData.labels" mode="tags" style="width: 100%" <a-select v-model:value="formData.labels" mode="tags" style="width: 100%"
@ -44,13 +39,13 @@
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-item :label="'状态'" name="status"> <a-form-item :label="'状态'" name="status">
<a-radio-group v-model:value="formData.status" :options="storeStatus.getAll()" <a-radio-group v-model:value="formData.status"
disabled></a-radio-group> :options="storeStatus.getAll()" disabled></a-radio-group>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-item :label="'店铺描述'" name="content"> <a-form-item :label="'店铺描述'" name="content">
<a-textarea :placeholder="'请输入店铺描述'" v-model:value="formData.content" <a-textarea :placeholder="'请输入店铺描述'" v-model:value="content"
:auto-size="{ minRows: 2, maxRows: 5 }"></a-textarea> :auto-size="{ minRows: 2, maxRows: 5 }"></a-textarea>
</a-form-item> </a-form-item>
</a-col> </a-col>
@ -61,9 +56,9 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item :label="'详情图片'" name="imgs"> <a-form-item :label="'详情图片'" name="img">
<gx-upload v-model="formData.img" accept-types=".jpg,.png,.webp" <gx-upload v-model="formData.img" accept-types=".jpg,.png,.webp"
:fileNumber="10" /> :fileNumber="1" />
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
@ -127,6 +122,7 @@ formRules.value = {
typeId: [{ required: true, message: '请选择产品类别名称', trigger: 'change' }], typeId: [{ required: true, message: '请选择产品类别名称', trigger: 'change' }],
sequence: { required: true, message: '请输入排序' }, sequence: { required: true, message: '请输入排序' },
storeName: { required: true, message: '请输入门店名称' }, storeName: { required: true, message: '请输入门店名称' },
openAt: { required: true, message: '请输入营业时间' },
longitude: { required: true, message: '请输入经度' }, longitude: { required: true, message: '请输入经度' },
latitude: { required: true, message: '请输入纬度' }, latitude: { required: true, message: '请输入纬度' },
storeAddress: { required: true, message: '请输入门店地址' }, storeAddress: { required: true, message: '请输入门店地址' },
@ -171,7 +167,7 @@ async function handleEdit(record = {}) {
} }
formData.value = { ...data } formData.value = { ...data }
formData.value.storeCover=data.storeCover?[config('http.apiBasic')+data.storeCover]:[] formData.value.storeCover=data.storeCover?[config('http.apiBasic')+data.storeCover]:[]
formData.value.img = data.imgs?.map(url => config('http.apiBasic') + url) || [] formData.value.img=data.img?[config('http.apiBasic')+data.img]:[]
initData() initData()
} }
/** /**
@ -185,12 +181,11 @@ function handleOk() {
const params = { const params = {
...values, ...values,
storeCover: formData.value.storeCover ? spliceUrl(formData.value.storeCover[0]) : '', storeCover: formData.value.storeCover ? spliceUrl(formData.value.storeCover[0]) : '',
imgs: formData.value.img?.map(url => spliceUrl(url)) || [], img: formData.value.img ? spliceUrl(formData.value.img[0]) : '',
latitude: parseFloat(formData.value.latitude), latitude: parseFloat(formData.value.latitude),
longitude: parseFloat(formData.value.longitude), longitude: parseFloat(formData.value.longitude),
status:1 status:1
} }
console.log("====",params)
let result = null let result = null
switch (modal.value.type) { switch (modal.value.type) {
case 'create': case 'create':