张延森 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,7 +483,7 @@ export default class Detail extends Component {
483 483
                         <View className='tools-item'>
484 484
                           <Image src={recordDetail.avatarurl} className='tools-item-img'></Image>
485 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 487
                         </View>
488 488
                       )
489 489
                     }

+ 15
- 47
src/pages/person/profile/index.js 파일 보기

@@ -25,7 +25,6 @@ export default class Profile extends Component {
25 25
   // 审核状态   0审核中  1审核通过  2审核不通过 3未审核
26 26
   componentDidMount() {
27 27
     this.getProfile()
28
-
29 28
   }
30 29
 
31 30
   getProfile() {
@@ -35,20 +34,9 @@ export default class Profile extends Component {
35 34
         this.setState({
36 35
           auditStatus: 3,
37 36
         })
38
-
39 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 38
         this.setState({
51
-          files: imgList,
39
+          files: res.imgList.map(x => ({ url: x.img })),
52 40
           auditStatus: res.verifyStatus,
53 41
           // resData:res,
54 42
           documentVerifyId: res.documentVerifyId,
@@ -66,12 +54,11 @@ export default class Profile extends Component {
66 54
   }
67 55
 
68 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 64
   onFail(mes) {
@@ -80,6 +67,7 @@ export default class Profile extends Component {
80 67
   onImageClick(index, file) {
81 68
     console.log(index, file)
82 69
   }
70
+
83 71
   // 提交图片审核
84 72
   commitBtn() {
85 73
     console.log(this.state.auditStatus, "this.state.auditStatus")
@@ -89,34 +77,21 @@ export default class Profile extends Component {
89 77
       let imgList = []
90 78
       let fileList = this.state.files
91 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 87
       const payload = {
101
-        // ,
102
-
103
-        // ...resData,
104 88
         imgList,
105 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 93
         this.setState({
119
-          files: imgList,
94
+          files: res.imgList.map(x => ({url: x.img})),
120 95
           auditStatus: res.verifyStatus
121 96
         })
122 97
         Taro.showToast({ icon: 'none', title: '提交成功' });
@@ -137,15 +112,8 @@ export default class Profile extends Component {
137 112
       })
138 113
 
139 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 115
         this.setState({
148
-          files: imgList,
116
+          files: res.imgList.map(x => ({url: x.img})),
149 117
           auditStatus: res.verifyStatus
150 118
         })
151 119
         Taro.showToast({ icon: 'none', title: '提交成功' });

+ 11
- 2
src/utils/request.js 파일 보기

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