merge

src/pages/activity/detail/assemble.js

               <Notice></Notice>
               <View className="detail-banner">
                 <Image mode="widthFix" src={detail.mainImg} className="detail-banner__img"></Image>
-<<<<<<< HEAD
                 
                 <View className="rest-time">
                   <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
                   <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
                 </View>
 
-=======
-                {
-                  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>
-                  )
-                }
-                {detail.successNum>0 &&
-                  <View className="success-num">已成功 {detail.successNum}</View>
-
-                }
->>>>>>> 4fa08fccaf3ed20ed1dcc549346b4b829f473145
               </View>
               <ScrollView
                 scrollY

src/pages/activity/detail/assistance.js

               <Notice></Notice>
               <View className="detail-banner">
                 <Image mode="widthFix" src={detail.img} className="detail-banner__img"></Image>
-<<<<<<< HEAD
                 
                 <View className="rest-time">
                   <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
                   <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
                 </View>
 
-=======
-                {
-                  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>
-                  )
-                }
-                {detail.successNum>0 &&
-                  <View className="success-num">已成功 {detail.successNum}</View>
-
-                }
->>>>>>> 4fa08fccaf3ed20ed1dcc549346b4b829f473145
               </View>
               <ScrollView
                 scrollY

src/pages/person/profile/index.js

 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";
   }
 
   onChange(files) {
-    
-
+    uploadFiles(files).then((res) => {
+      debugger
+    })
 
     this.setState({
       files