张延森 5 年前
父节点
当前提交
75e813ce54
共有 3 个文件被更改,包括 27 次插入50 次删除
  1. 1
    1
      src/pages/activity/detail/assemble.js
  2. 15
    47
      src/pages/person/profile/index.js
  3. 11
    2
      src/utils/request.js

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

483
                         <View className='tools-item'>
483
                         <View className='tools-item'>
484
                           <Image src={recordDetail.avatarurl} className='tools-item-img'></Image>
484
                           <Image src={recordDetail.avatarurl} className='tools-item-img'></Image>
485
                           <View className='leader-tip'>团长</View>
485
                           <View className='leader-tip'>团长</View>
486
-                          <Text className='tools-item-txt'>recordDetail.nickname</Text>
486
+                          <Text className='tools-item-txt'>{recordDetail.nickname}</Text>
487
                         </View>
487
                         </View>
488
                       )
488
                       )
489
                     }
489
                     }

+ 15
- 47
src/pages/person/profile/index.js 查看文件

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