diff --git a/src/pages/grabOrderPage/grabOrderPage.js b/src/pages/grabOrderPage/grabOrderPage.js index 153f262..9e0a51f 100644 --- a/src/pages/grabOrderPage/grabOrderPage.js +++ b/src/pages/grabOrderPage/grabOrderPage.js @@ -5,6 +5,7 @@ import { AtModal, AtModalHeader, AtModalContent, AtModalAction, AtIcon } from 't import URL from '../../serviceAPI.config' +import RenderingView from './renderingView/renderingView' import CopyrightComponent from '../../component/copyrightComponent/copyrightComponent' import './grabOrderPage.scss' @@ -180,49 +181,44 @@ class GrabOrderPage extends Component { } deleteMyNeeds({ demandId }) { Taro.request({ - url: URL.DeleteMyNeeds, - method: 'POST', - dataType: 'json', - data: { - demandId: demandId - }, - header: { - 'Cookie': 'PFWSSS=' + Taro.getStorageSync('session_id'), - 'content-type': 'application/x-www-form-urlencoded', - 'X-Requested-With': 'XMLHttpRequest' - } + url: URL.DeleteMyNeeds, + method: 'POST', + dataType: 'json', + data: { + demandId: demandId + }, + header: { + 'Cookie': 'PFWSSS=' + Taro.getStorageSync('session_id'), + 'content-type': 'application/x-www-form-urlencoded', + 'X-Requested-With': 'XMLHttpRequest' + } }).then(res => { - - if (res.data.err_msg === "success") { - Taro.showToast({ - title: '删除成功', - icon: 'success', - duration: 1500 - }) - setTimeout(() => { - Taro.reLaunch({ - url: '/pages/myNeeds/myNeeds' - }) - }, 1500); - } else { - Taro.showToast({ - title: res.data.err_msg, - icon: 'none', - duration: 1500 - }) - } + + if (res.data.err_msg === "success") { + Taro.showToast({ + title: '删除成功', + icon: 'success', + duration: 1500 + }) + setTimeout(() => { + Taro.reLaunch({ + url: '/pages/myNeeds/myNeeds' + }) + }, 1500); + } else { + Taro.showToast({ + title: res.data.err_msg, + icon: 'none', + duration: 1500 + }) + } }) - - } + + } render() { const localStoageUserId = Taro.getStorageSync('userInfo').user_id - // 显示效果图 - const renderingElementArray = this.state.renderingImage.length ? this.state.renderingImage.map((item, index) => { - return - - - }) : null; + // 提示框 const deleteModalWindowElement = 提示 @@ -296,17 +292,18 @@ class GrabOrderPage extends Component { const imageElementArray = this.state.images.map((item, index) => { return - + + + }) return ( + {modalMessageGrabElement} {deleteModalWindowElement} - {this.state.isShowRendering ? - {renderingElementArray} - : null} + {this.state.isShowRendering ? : null} {this.state.stateId === '3' && !this.state.isShowRendering ? : null} diff --git a/src/pages/grabOrderPage/grabOrderPage.scss b/src/pages/grabOrderPage/grabOrderPage.scss index b7c1ce6..6bca752 100644 --- a/src/pages/grabOrderPage/grabOrderPage.scss +++ b/src/pages/grabOrderPage/grabOrderPage.scss @@ -1,17 +1,7 @@ .grabOrderPage{ padding: 10px 20px; font-size: 32rpx; - .rendering-container{ - display: flex; - flex-wrap: wrap; - flex-direction: row; - border: 4rpx solid #ddd; - .image-wrapper{ - width: 30%; - height: 200px; - margin:1.3%; - } - } + .box{ margin-top: 35px; } @@ -24,6 +14,8 @@ } } .image-wrapper{ + display: flex; + justify-content:center; border: 4rpx solid #ddd; margin-top: 10px } diff --git a/src/pages/grabOrderPage/renderingView/renderingView.js b/src/pages/grabOrderPage/renderingView/renderingView.js new file mode 100644 index 0000000..2d820d5 --- /dev/null +++ b/src/pages/grabOrderPage/renderingView/renderingView.js @@ -0,0 +1,78 @@ +import Taro, { Component } from '@tarojs/taro' +import { View, Image } from '@tarojs/components' +import { AtCurtain } from 'taro-ui' + + +import URL from '../../../serviceAPI.config' +import './renderingView.scss' + + + + +class RenderingView extends Component { + + //效果图组件 接受:rendering=[] + config = { + navigationBarTitleText: '效果图' + } + constructor(props) { + super(props) + this.state = { + image: '', + isOpened:false + } + + } + + onClickHandler(item) { + this.setState({ + image: URL.Base + item.file_path, + isOpened:true + }) + } + onCloseCurtain(){ + this.setState({ + isOpened:false + }) + } + componentDidMount() { + + } + componentWillReceiveProps(nextProps) { + + } + + componentWillUnmount() { } + + componentDidShow() { } + + componentDidHide() { } + + render() { + // 显示效果图 + let { rendering } = this.props + let renderingElementArray = rendering.length ? rendering.map((item, index) => { + return + + + }) : null; + let curtainElement = + + + return ( + + {curtainElement} + {renderingElementArray} + + + ) + } +} + +export default RenderingView diff --git a/src/pages/grabOrderPage/renderingView/renderingView.scss b/src/pages/grabOrderPage/renderingView/renderingView.scss new file mode 100644 index 0000000..358dd56 --- /dev/null +++ b/src/pages/grabOrderPage/renderingView/renderingView.scss @@ -0,0 +1,14 @@ +.rendering-container{ + display: flex; + flex-wrap: wrap; + flex-direction: row; + border: 4rpx solid #ddd; + .image-wrapper{ + border: 4rpx solid #ddd; + margin-top: 10px; + box-sizing: border-box; + width: 30%; + height: 200px; + margin:1.6%; + } +} \ No newline at end of file diff --git a/src/pages/myGoodList/myGoodList.js b/src/pages/myGoodList/myGoodList.js index d13aefc..35d40b7 100644 --- a/src/pages/myGoodList/myGoodList.js +++ b/src/pages/myGoodList/myGoodList.js @@ -309,8 +309,10 @@ class MyGoodList extends Component { icon: 'success', duration: 1500 }).then(() => { - this.setState({ isCheckAll: false, currPageParam: 1 }) - this.getMyGoodListApi({}) + this.setState({ isCheckAll: false, currPageParam: 1 },()=>{ + this.getMyGoodListApi({}) + }) + }) } else { Taro.showToast({ diff --git a/src/pages/myNeeds/myNeeds.js b/src/pages/myNeeds/myNeeds.js index f4a4d87..c002993 100644 --- a/src/pages/myNeeds/myNeeds.js +++ b/src/pages/myNeeds/myNeeds.js @@ -315,7 +315,6 @@ class MyNeeds extends Component { this.setState({ industryTypeSelected: value }) } render() { - console.log('myneed') const myNeedsListArrayElement = this.state.allNeedsList.map((item, index) => { return diff --git a/src/pages/myNeedsEdit/myNeedsEdit.js b/src/pages/myNeedsEdit/myNeedsEdit.js index 7b72d03..092b85c 100644 --- a/src/pages/myNeedsEdit/myNeedsEdit.js +++ b/src/pages/myNeedsEdit/myNeedsEdit.js @@ -306,6 +306,7 @@ class MyNeedsEdit extends Component { url: '/pages/myNeeds/myNeeds' }) } + // 保存需求按钮 saveButtonHandler() { if (this.state.title &&