许静 5 年前
父节点
当前提交
74081bbc4c
共有 4 个文件被更改,包括 39 次插入68 次删除
  1. 6
    11
      src/pages/activity/detail/assemble.js
  2. 6
    9
      src/pages/activity/detail/assistance.js
  3. 16
    46
      src/pages/person/profile/index.js
  4. 11
    2
      src/utils/request.js

+ 6
- 11
src/pages/activity/detail/assemble.js 查看文件

432
               <Notice></Notice>
432
               <Notice></Notice>
433
               <View className="detail-banner">
433
               <View className="detail-banner">
434
                 <Image mode="widthFix" src={detail.mainImg} className="detail-banner__img"></Image>
434
                 <Image mode="widthFix" src={detail.mainImg} className="detail-banner__img"></Image>
435
-                {
436
-                  groupState === GroupInProcess && actState != ActFinished &&
437
-                  (
438
-                    <View className="rest-time">
439
-                      <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '活动已结束')} </Text>
440
-                      <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : ''}</Text>
441
-                    </View>
442
-                  )
443
-                }
435
+
436
+                <View className="rest-time">
437
+                  <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
438
+                  <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
439
+                </View>
444
                 {detail.successNum > 0 &&
440
                 {detail.successNum > 0 &&
445
                   <View className="success-num">
441
                   <View className="success-num">
446
                     <View className="triangle"></View>
442
                     <View className="triangle"></View>
447
                     <View className="text">已成功 {detail.successNum}</View>
443
                     <View className="text">已成功 {detail.successNum}</View>
448
                   </View>
444
                   </View>
449
-
450
                 }
445
                 }
451
               </View>
446
               </View>
452
               <ScrollView
447
               <ScrollView
490
                         <View className='tools-item'>
485
                         <View className='tools-item'>
491
                           <Image src={recordDetail.avatarurl} className='tools-item-img'></Image>
486
                           <Image src={recordDetail.avatarurl} className='tools-item-img'></Image>
492
                           <View className='leader-tip'>团长</View>
487
                           <View className='leader-tip'>团长</View>
493
-                          <Text className='tools-item-txt'>recordDetail.nickname</Text>
488
+                          <Text className='tools-item-txt'>{recordDetail.nickname}</Text>
494
                         </View>
489
                         </View>
495
                       )
490
                       )
496
                     }
491
                     }

+ 6
- 9
src/pages/activity/detail/assistance.js 查看文件

430
               <Notice></Notice>
430
               <Notice></Notice>
431
               <View className="detail-banner">
431
               <View className="detail-banner">
432
                 <Image mode="widthFix" src={detail.img} className="detail-banner__img"></Image>
432
                 <Image mode="widthFix" src={detail.img} className="detail-banner__img"></Image>
433
-                {
434
-                  helpState === HelpInProcess && actState != ActFinished &&
435
-                  (
436
-                    <View className="rest-time">
437
-                      <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '活动已结束')} </Text>
438
-                      <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : ''}</Text>
439
-                    </View>
440
-                  )
441
-                }
433
+
434
+                <View className="rest-time">
435
+                  <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
436
+                  <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
437
+                </View>
442
                 {detail.successNum > 0 &&
438
                 {detail.successNum > 0 &&
443
 
439
 
444
                   <View className="success-num">
440
                   <View className="success-num">
447
                   </View>
443
                   </View>
448
 
444
 
449
                 }
445
                 }
446
+
450
               </View>
447
               </View>
451
               <ScrollView
448
               <ScrollView
452
                 scrollY
449
                 scrollY

+ 16
- 46
src/pages/person/profile/index.js 查看文件

2
 import './index.scss'
2
 import './index.scss'
3
 import { AtImagePicker } from 'taro-ui'
3
 import { AtImagePicker } from 'taro-ui'
4
 import { getDocumentVerify, commitDocumentVerify, editDocumentVerify } from '@services/user'
4
 import { getDocumentVerify, commitDocumentVerify, editDocumentVerify } from '@services/user'
5
+import { uploadFiles } from '@utils/request'
5
 
6
 
6
 import "taro-ui/dist/style/components/image-picker.scss";
7
 import "taro-ui/dist/style/components/image-picker.scss";
7
 import "taro-ui/dist/style/components/icon.scss";
8
 import "taro-ui/dist/style/components/icon.scss";
24
   // 审核状态   0审核中  1审核通过  2审核不通过 3未审核
25
   // 审核状态   0审核中  1审核通过  2审核不通过 3未审核
25
   componentDidMount() {
26
   componentDidMount() {
26
     this.getProfile()
27
     this.getProfile()
27
-
28
   }
28
   }
29
 
29
 
30
   getProfile() {
30
   getProfile() {
34
         this.setState({
34
         this.setState({
35
           auditStatus: 3,
35
           auditStatus: 3,
36
         })
36
         })
37
-
38
       } else {
37
       } else {
39
-        console.log(res, "res")
40
-        let imgList = []
41
-        let fileList = res.imgList
42
-        fileList.map((item, index) => {
43
-          let newObj = {}
44
-          newObj.url = item.img
45
-
46
-          imgList.push(newObj)
47
-        }
48
-        )
49
         this.setState({
38
         this.setState({
50
-          files: imgList,
39
+          files: res.imgList.map(x => ({ url: x.img })),
51
           auditStatus: res.verifyStatus,
40
           auditStatus: res.verifyStatus,
52
           // resData:res,
41
           // resData:res,
53
           documentVerifyId: res.documentVerifyId,
42
           documentVerifyId: res.documentVerifyId,
65
   }
54
   }
66
 
55
 
67
   onChange(files) {
56
   onChange(files) {
68
-    
69
-
70
-
71
-    this.setState({
72
-      files
57
+    const filePaths = files.map(x => x.file.path)
58
+    uploadFiles(filePaths).then((res) => {
59
+      this.setState({
60
+        files: res.map(x => ({ url: x}))
61
+      })
73
     })
62
     })
74
   }
63
   }
75
   onFail(mes) {
64
   onFail(mes) {
78
   onImageClick(index, file) {
67
   onImageClick(index, file) {
79
     console.log(index, file)
68
     console.log(index, file)
80
   }
69
   }
70
+
81
   // 提交图片审核
71
   // 提交图片审核
82
   commitBtn() {
72
   commitBtn() {
83
     console.log(this.state.auditStatus, "this.state.auditStatus")
73
     console.log(this.state.auditStatus, "this.state.auditStatus")
87
       let imgList = []
77
       let imgList = []
88
       let fileList = this.state.files
78
       let fileList = this.state.files
89
       fileList.map((item, index) => {
79
       fileList.map((item, index) => {
90
-        let newObj = {}
91
-        newObj.img = item.url
92
-        newObj.sort = index
93
-        imgList.push(newObj)
94
-      }
80
+          let newObj = {}
81
+          newObj.img = item.url,
82
+          newObj.sort = index
83
+          imgList.push(newObj)
84
+        }
95
       )
85
       )
96
-      // const resData = this.state.resData
97
 
86
 
98
       const payload = {
87
       const payload = {
99
-        // ,
100
-
101
-        // ...resData,
102
         imgList,
88
         imgList,
103
         documentVerifyId: this.state.documentVerifyId
89
         documentVerifyId: this.state.documentVerifyId
104
-
105
       }
90
       }
106
-      editDocumentVerify(payload).then(res => {
107
-        let imgList = []
108
-        let fileList = res.imgList
109
-        fileList.map((item, index) => {
110
-          let newObj = {}
111
-          newObj.url = item.img
112
-
113
-          imgList.push(newObj)
114
-        })
115
 
91
 
92
+      editDocumentVerify(payload).then(res => {
116
         this.setState({
93
         this.setState({
117
-          files: imgList,
94
+          files: res.imgList.map(x => ({url: x.img})),
118
           auditStatus: res.verifyStatus
95
           auditStatus: res.verifyStatus
119
         })
96
         })
120
         Taro.showToast({ icon: 'none', title: '提交成功' });
97
         Taro.showToast({ icon: 'none', title: '提交成功' });
135
       })
112
       })
136
 
113
 
137
       commitDocumentVerify(imgList).then(res => {
114
       commitDocumentVerify(imgList).then(res => {
138
-        let imgList = []
139
-        let fileList = res.imgList
140
-        fileList.map((item, index) => {
141
-          let newObj = {}
142
-          newObj.url = item.img
143
-          imgList.push(newObj)
144
-        })
145
         this.setState({
115
         this.setState({
146
-          files: imgList,
116
+          files: res.imgList.map(x => ({url: x.img})),
147
           auditStatus: res.verifyStatus
117
           auditStatus: res.verifyStatus
148
         })
118
         })
149
         Taro.showToast({ icon: 'none', title: '提交成功' });
119
         Taro.showToast({ icon: 'none', title: '提交成功' });

+ 11
- 2
src/utils/request.js 查看文件

74
 export const uploadFiles = async (files) => {
74
 export const uploadFiles = async (files) => {
75
   const uploads = []
75
   const uploads = []
76
   const token = await getStorage('token')
76
   const token = await getStorage('token')
77
-  const header = token ? { 'authorization': `Bearer ${token}` } : {}
77
+  const authHeader = token ? { 'authorization': `Bearer ${token}` } : {}
78
   for (var i = 0; i < files.length; i++) {
78
   for (var i = 0; i < files.length; i++) {
79
     uploads[i] = new Promise((resolve, reject) => {
79
     uploads[i] = new Promise((resolve, reject) => {
80
       wx.uploadFile({
80
       wx.uploadFile({
81
         url: API_UPLOAD_IMAGE,
81
         url: API_UPLOAD_IMAGE,
82
         filePath: files[i],
82
         filePath: files[i],
83
-        header,
83
+        header: {
84
+          ...authHeader,
85
+          'appId': appId,
86
+          'x-action':'miniapp'
87
+        },
84
         name: 'file',
88
         name: 'file',
85
         success: function (res) {
89
         success: function (res) {
90
+          debugger
86
           const _data = JSON.parse(res.data)
91
           const _data = JSON.parse(res.data)
92
+          if (_data.code !== CODE_SUCCESS) {
93
+            reject(new Error(_data.message))
94
+          }
95
+
87
           resolve(_data.data)
96
           resolve(_data.data)
88
         },
97
         },
89
         fail(err) {
98
         fail(err) {