pingtuan

src/pages/activity/detail/assemble.js

@@ -432,21 +432,16 @@ export default class Detail extends Component {
               <Notice></Notice>
               <View className="detail-banner">
                 <Image mode="widthFix" src={detail.mainImg} className="detail-banner__img"></Image>
-                {
-                  groupState === GroupInProcess && actState != ActFinished &&
-                  (
-                    <View className="rest-time">
-                      <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '活动已结束')} </Text>
-                      <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : ''}</Text>
-                    </View>
-                  )
-                }
+
+                <View className="rest-time">
+                  <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
+                  <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
+                </View>
                 {detail.successNum > 0 &&
                   <View className="success-num">
                     <View className="triangle"></View>
                     <View className="text">已成功 {detail.successNum}</View>
                   </View>
-
                 }
               </View>
               <ScrollView
@@ -490,7 +485,7 @@ export default class Detail extends Component {
                         <View className='tools-item'>
                           <Image src={recordDetail.avatarurl} className='tools-item-img'></Image>
                           <View className='leader-tip'>团长</View>
-                          <Text className='tools-item-txt'>recordDetail.nickname</Text>
+                          <Text className='tools-item-txt'>{recordDetail.nickname}</Text>
                         </View>
                       )
                     }

src/pages/activity/detail/assistance.js

@@ -430,15 +430,11 @@ export default class Detail extends Component {
               <Notice></Notice>
               <View className="detail-banner">
                 <Image mode="widthFix" src={detail.img} className="detail-banner__img"></Image>
-                {
-                  helpState === HelpInProcess && actState != ActFinished &&
-                  (
-                    <View className="rest-time">
-                      <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '活动已结束')} </Text>
-                      <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : ''}</Text>
-                    </View>
-                  )
-                }
+
+                <View className="rest-time">
+                  <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
+                  <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
+                </View>
                 {detail.successNum > 0 &&
 
                   <View className="success-num">
@@ -447,6 +443,7 @@ export default class Detail extends Component {
                   </View>
 
                 }
+
               </View>
               <ScrollView
                 scrollY

src/pages/person/profile/index.js

@@ -2,6 +2,7 @@ import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
 import { AtImagePicker } from 'taro-ui'
 import { getDocumentVerify, commitDocumentVerify, editDocumentVerify } from '@services/user'
+import { uploadFiles } from '@utils/request'
 
 import "taro-ui/dist/style/components/image-picker.scss";
 import "taro-ui/dist/style/components/icon.scss";
@@ -24,7 +25,6 @@ export default class Profile extends Component {
   // 审核状态   0审核中  1审核通过  2审核不通过 3未审核
   componentDidMount() {
     this.getProfile()
-
   }
 
   getProfile() {
@@ -34,20 +34,9 @@ export default class Profile extends Component {
         this.setState({
           auditStatus: 3,
         })
-
       } else {
-        console.log(res, "res")
-        let imgList = []
-        let fileList = res.imgList
-        fileList.map((item, index) => {
-          let newObj = {}
-          newObj.url = item.img
-
-          imgList.push(newObj)
-        }
-        )
         this.setState({
-          files: imgList,
+          files: res.imgList.map(x => ({ url: x.img })),
           auditStatus: res.verifyStatus,
           // resData:res,
           documentVerifyId: res.documentVerifyId,
@@ -65,11 +54,11 @@ export default class Profile extends Component {
   }
 
   onChange(files) {
-    
-
-
-    this.setState({
-      files
+    const filePaths = files.map(x => x.file.path)
+    uploadFiles(filePaths).then((res) => {
+      this.setState({
+        files: res.map(x => ({ url: x}))
+      })
     })
   }
   onFail(mes) {
@@ -78,6 +67,7 @@ export default class Profile extends Component {
   onImageClick(index, file) {
     console.log(index, file)
   }
+
   // 提交图片审核
   commitBtn() {
     console.log(this.state.auditStatus, "this.state.auditStatus")
@@ -87,34 +77,21 @@ export default class Profile extends Component {
       let imgList = []
       let fileList = this.state.files
       fileList.map((item, index) => {
-        let newObj = {}
-        newObj.img = item.url
-        newObj.sort = index
-        imgList.push(newObj)
-      }
+          let newObj = {}
+          newObj.img = item.url,
+          newObj.sort = index
+          imgList.push(newObj)
+        }
       )
-      // const resData = this.state.resData
 
       const payload = {
-        // ,
-
-        // ...resData,
         imgList,
         documentVerifyId: this.state.documentVerifyId
-
       }
-      editDocumentVerify(payload).then(res => {
-        let imgList = []
-        let fileList = res.imgList
-        fileList.map((item, index) => {
-          let newObj = {}
-          newObj.url = item.img
-
-          imgList.push(newObj)
-        })
 
+      editDocumentVerify(payload).then(res => {
         this.setState({
-          files: imgList,
+          files: res.imgList.map(x => ({url: x.img})),
           auditStatus: res.verifyStatus
         })
         Taro.showToast({ icon: 'none', title: '提交成功' });
@@ -135,15 +112,8 @@ export default class Profile extends Component {
       })
 
       commitDocumentVerify(imgList).then(res => {
-        let imgList = []
-        let fileList = res.imgList
-        fileList.map((item, index) => {
-          let newObj = {}
-          newObj.url = item.img
-          imgList.push(newObj)
-        })
         this.setState({
-          files: imgList,
+          files: res.imgList.map(x => ({url: x.img})),
           auditStatus: res.verifyStatus
         })
         Taro.showToast({ icon: 'none', title: '提交成功' });

src/utils/request.js

@@ -74,16 +74,25 @@ export const fetch = async (options) => {
 export const uploadFiles = async (files) => {
   const uploads = []
   const token = await getStorage('token')
-  const header = token ? { 'authorization': `Bearer ${token}` } : {}
+  const authHeader = token ? { 'authorization': `Bearer ${token}` } : {}
   for (var i = 0; i < files.length; i++) {
     uploads[i] = new Promise((resolve, reject) => {
       wx.uploadFile({
         url: API_UPLOAD_IMAGE,
         filePath: files[i],
-        header,
+        header: {
+          ...authHeader,
+          'appId': appId,
+          'x-action':'miniapp'
+        },
         name: 'file',
         success: function (res) {
+          debugger
           const _data = JSON.parse(res.data)
+          if (_data.code !== CODE_SUCCESS) {
+            reject(new Error(_data.message))
+          }
+
           resolve(_data.data)
         },
         fail(err) {