diff --git a/src/Common/HostUrl.ts b/src/Common/HostUrl.ts index e66f0d112..25f6dbdcb 100644 --- a/src/Common/HostUrl.ts +++ b/src/Common/HostUrl.ts @@ -184,6 +184,7 @@ export const GalleryURL = { GalleryDepoly: CURRENT_HOST + '/CAD-galleryDepoly', //用户-发布画廊文件 GalleryDelete: CURRENT_HOST + '/CAD-galleryDelete', //用户-下架画廊文件 UserGalleryList: CURRENT_HOST + '/CAD-galleryListUser', //用户画廊列表 + GalleryUpdate: CURRENT_HOST + '/CAD-galleryUpdate', //单个修改画廊文件 GalleryUpdateBatch: CURRENT_HOST + '/CAD-galleryUpdateBatch', //批量修改画廊文件 GalleryIndexList: CURRENT_HOST + '/CAD-galleryListIndex', //首页画廊列表 GalleryDetile: CURRENT_HOST + '/CAD-galleryDetail', //画廊文件详情 diff --git a/src/UI/Components/Gallery/GalleryAdmin/GalleryDetailDrawer.tsx b/src/UI/Components/Gallery/GalleryAdmin/GalleryDetailDrawer.tsx index d5823b8fa..fdc5173a2 100644 --- a/src/UI/Components/Gallery/GalleryAdmin/GalleryDetailDrawer.tsx +++ b/src/UI/Components/Gallery/GalleryAdmin/GalleryDetailDrawer.tsx @@ -4,7 +4,7 @@ import { observer } from 'mobx-react'; import React, { Component, createRef, RefObject } from 'react'; import { CURRENT_HOST } from '../../../../Common/HostUrl'; import { getFileSize } from '../../../../Common/Utils'; -import { UpdateBatchGallery } from '../data/GalleryData'; +import { UpdateGallery } from '../data/GalleryData'; import GalleryStore from '../GalleryStore'; import { IGalleryItem } from '../interface/GalleryInterfaces'; @@ -33,7 +33,7 @@ export default class GalleryDetailDrawer extends Component
- + + + +  {this.props.item.login_name} {this.props.item.create_date}
+
+
 {this.props.item.shop_name}  {this.props.item.hot} @@ -61,6 +71,16 @@ export default class GalleryItem extends Component {this.props.item.hot} {getFileSize(Number.parseInt(this.props.item.size))} {this.props.item.create_date} +
+
diff --git a/src/UI/Components/Gallery/UploadGalleryDialog.tsx b/src/UI/Components/Gallery/UploadGalleryDialog.tsx index b673a7cbf..910b2d1e8 100644 --- a/src/UI/Components/Gallery/UploadGalleryDialog.tsx +++ b/src/UI/Components/Gallery/UploadGalleryDialog.tsx @@ -70,6 +70,9 @@ export default class UploadGalleryDialog extends Component + + + diff --git a/src/UI/Components/Gallery/data/GalleryData.ts b/src/UI/Components/Gallery/data/GalleryData.ts index 0a89ec8a0..0324db24e 100644 --- a/src/UI/Components/Gallery/data/GalleryData.ts +++ b/src/UI/Components/Gallery/data/GalleryData.ts @@ -36,7 +36,12 @@ export async function UploadNewGallery(params: FormData) { return await Post(GalleryURL.GalleryDepoly, params); }; -//管理员修改画廊 +//管理员批量修改画廊 +export async function UpdateGallery(params: FormData) +{ + return await Post(GalleryURL.GalleryUpdate, params); +}; +//管理员批量修改画廊 export async function UpdateBatchGallery(params: FormData) { return await Post(GalleryURL.GalleryUpdateBatch, params); diff --git a/src/UI/Components/Gallery/interface/GalleryInterfaces.ts b/src/UI/Components/Gallery/interface/GalleryInterfaces.ts index 7959870a0..0fa956e6c 100644 --- a/src/UI/Components/Gallery/interface/GalleryInterfaces.ts +++ b/src/UI/Components/Gallery/interface/GalleryInterfaces.ts @@ -41,9 +41,10 @@ export interface IGalleryItemDetail state: string; //画廊状态 hot: string; //画廊热度 file: string; //画廊文件内容 + pano_url: string;//全景图链接 } export type IGalleryItem = Pick + 'gallery_id' | 'class_id' | 'name' | 'logo' | 'size' | 'create_date' | 'hot' | 'audit_desc' | 'audit_state' | 'state' | 'pano_url'> & { login_name: string; //发布用户 shop_name: string; //发布店铺 diff --git a/src/UI/Components/Gallery/less/GalleryIndexList.less b/src/UI/Components/Gallery/less/GalleryIndexList.less index c8113a2b7..661e60c7f 100644 --- a/src/UI/Components/Gallery/less/GalleryIndexList.less +++ b/src/UI/Components/Gallery/less/GalleryIndexList.less @@ -82,6 +82,13 @@ { transform: scale(1.1); } + + .panoramaButton + { + button{ + opacity: 0.95; + } + } } } .GalleryItemDescAndImg @@ -120,6 +127,22 @@ } } + + .panoramaButton{ + height: 100%; + + button{ + font-size : 12px; + position : absolute; + right : 0; + height : 27px; + min-height : 27px; + margin : 3px 9px; + opacity : 0; + transition : opacity 0.15s ease-in 0s; + border-radius: 5px; + } + } } .GalleryItemOption { diff --git a/src/UI/Components/Gallery/less/GalleryManagement.less b/src/UI/Components/Gallery/less/GalleryManagement.less index 588f6e98c..48053abeb 100644 --- a/src/UI/Components/Gallery/less/GalleryManagement.less +++ b/src/UI/Components/Gallery/less/GalleryManagement.less @@ -216,7 +216,7 @@ { >label { - min-width : 80px; + min-width : 85px; color : @font-color-title; font-size : 1.4rem; font-weight : bold; diff --git a/src/UI/Components/Gallery/less/UploadGalleryDialog.less b/src/UI/Components/Gallery/less/UploadGalleryDialog.less index 9a0810e82..00f1a1fef 100644 --- a/src/UI/Components/Gallery/less/UploadGalleryDialog.less +++ b/src/UI/Components/Gallery/less/UploadGalleryDialog.less @@ -30,6 +30,10 @@ { width: 100%; } + .bp3-form-group:nth-child(2) + { + width: 100%; + } .OtherInfo { width : 100%;