bug fix

config/dev.js

@@ -3,14 +3,14 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    // HOST: '"http://47.101.36.130:8085"',//测试
+		// HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
     // HOST: '"https://dev.jinchengjiaye.com"',//测试
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    HOST: '"http://127.0.0.1:8080"',
-    WSS_HOST: '"ws://127.0.0.1:8080"',
+    HOST: '"http://192.168.0.238:8080"',
+    WSS_HOST: '"ws://192.168.0.238:8080"',
   },
   weapp: {},
   h5: {}

src/app.js

@@ -46,6 +46,7 @@ class App extends Component {
       'pages/project/index',
       'pages/person/index',
       'pages/person/profile/index',
+      'pages/person/profile/detail/index',
       'pages/project/detail/index',
       'pages/activity/assemblePage',
       'pages/activity/assistancePage',

src/components/Poster/style.scss

@@ -1,3 +1,4 @@
+@import "@styles/theme.scss";
 .poster {
   position: fixed;
   width: 100vw;
@@ -55,7 +56,7 @@
     color: white;
     border: none;
     font-size: 36px;
-    background: linear-gradient(90deg, rgba(255, 199, 12, 1) 0%, rgba(255, 65, 65, 1) 100%);
+    background: $primary-color;
     border-radius: 12px;
     margin: 20px 0;
   }

src/constants/api.js

@@ -28,6 +28,8 @@ export const API_QUERY_CUSTOMER_INFO = resolvePath('customer/myCustomer')
 export const API_QUERY_MYREPORT = resolvePath('customer/myReport')
 export const API_QUERY_DOCUMENTVERIFY = resolvePath('documentVerify')
 
+export const API_QUERY_DOCUMENTVERIFY_list = resolvePath('documentVerify/list')
+
 
 // chat
 export const API_CHAT_HISTORY = resolvePath('chat/history')

src/pages/activity/detail/index.scss

@@ -50,6 +50,9 @@
     }
     .row-content{
       color: #FF245A;
+      min-width: 6em;
+      display: inline-block;
+      white-space: nowrap;
     }
   }
   .success-num{
@@ -274,7 +277,7 @@
     color: white;
     font-size: 32px;
     margin: 0;
-    background: linear-gradient(90deg, rgba(255, 199, 12, 1) 0%, rgba(255, 65, 65, 1) 100%);
+    background: $primary-color;
   }
 
   .hasSigned {
@@ -397,7 +400,7 @@
       .comfire {
         width: 490px;
         height: 96px;
-        background: linear-gradient(90deg, rgba(255, 199, 12, 1) 0%, rgba(255, 65, 65, 1) 100%);
+        background: $primary-color;
         border-radius: 7px;
         line-height: 96px;
         color: white;

src/pages/activity/detail/poster.scss

@@ -1,3 +1,4 @@
+@import "@styles/theme.scss";
 .poster {
   position: fixed;
   width: 100vw;
@@ -55,7 +56,7 @@
     color: white;
     border: none;
     font-size: 36px;
-    background: linear-gradient(90deg, rgba(255, 199, 12, 1) 0%, rgba(255, 65, 65, 1) 100%);
+    background: $primary-color;
     border-radius: 12px;
     margin: 20px 0;
   }

src/pages/agent/client/index.scss

@@ -110,7 +110,7 @@
   font-size: 30px;
   top:0;
   right:0;
-  background:linear-gradient(57deg,rgba(255,199,12,1) 0%,rgba(255,65,65,1) 100%);
+  background:$primary-color;
 
   text {
     color: #fff;

src/pages/agent/recommend/index.scss

@@ -1,3 +1,4 @@
+@import "@styles/theme.scss";
 .ani {
   position: absolute;
 }
@@ -51,7 +52,7 @@
     bottom: 3%;
     font-size: 30px;
     color: #fff;
-    background: linear-gradient(90deg, rgba(255, 199, 12, 1) 0%, rgba(255, 65, 65, 1) 100%);
+    background: $primary-color;
     border-radius: 10px;
   }
 }

src/pages/card/index.scss

@@ -232,7 +232,7 @@
     font-size: 30px;
     color: #fff;
     padding: 0;
-    background: linear-gradient(90deg, rgba(255, 199, 12, 1) 0%, rgba(255, 65, 65, 1) 100%);
+    background: $primary-color;
   }
 
   .poster-btn {
@@ -278,7 +278,7 @@
     .fans__num {
       font-size: 28px;
       color: rgba(0, 0, 0, 0.37);
-      background: linear-gradient(90deg, rgba(255, 199, 12, 1) 0%, rgba(255, 65, 65, 1) 30%, rgba(255, 65, 65, 1) 100%);
+      background: $primary-color;
       -webkit-background-clip: text;
       -webkit-text-fill-color: transparent;
       letter-spacing: 4px;
@@ -606,7 +606,7 @@
     &__btn {
       width: 490px;
       height: 96px;
-      background: linear-gradient(90deg, rgba(255, 199, 12, 1) 0%, rgba(255, 65, 65, 1) 100%);
+      background: $primary-color;
       border-radius: 7px;
       line-height: 96px;
       color: white;

src/pages/card/poster.scss

@@ -1,3 +1,4 @@
+@import "@styles/theme.scss";
 .poster {
   position: fixed;
   width: 100vw;
@@ -55,7 +56,7 @@
     color: white;
     border: none;
     font-size: 36px;
-    background: linear-gradient(90deg, rgba(255, 199, 12, 1) 0%, rgba(255, 65, 65, 1) 100%);
+    background: $primary-color;
     border-radius: 12px;
     margin: 20px 0;
   }

src/pages/card/register/index.scss

@@ -1,3 +1,4 @@
+@import "@styles/theme.scss";
 .login {
   padding: 50px 50px 0;
   padding-top: 200px;
@@ -16,7 +17,7 @@
       margin-top: 100px;
       width: 100%;
       Button{
-        background: linear-gradient(90deg, rgba(255, 199, 12, 1) 0%, rgba(255, 65, 65, 1) 100%);
+        background: $primary-color;
         box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.14);
         border-radius: 10px;
       }

src/pages/im/index.scss

@@ -31,7 +31,7 @@
   @extend .fixed-btn;
 
   bottom: 31%;
-  background: linear-gradient(90deg, rgba(90, 214, 163, 1) 0%, rgba(26, 181, 121, 1) 100%);
+  background: $primary-color;
   box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.25);
   .text {
     padding: 0 20px;
@@ -42,7 +42,7 @@
 .home__btn {
   @extend .fixed-btn;
   bottom: 20%;
-  background: linear-gradient(90deg, rgba(255, 199, 12, 1) 0%, rgba(255, 65, 65, 1) 100%);
+  background: $primary-color;
   box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.25);
   color: #fff;
 }
@@ -150,7 +150,7 @@
       padding: 5px 35px;
       color: white;
       margin: 0;
-      background: linear-gradient(90deg, rgba(255, 199, 12, 1) 0%, rgba(255, 65, 65, 1) 100%);
+      background: $primary-color;
       border-radius: 10px;
     }
     .submit-img {

src/pages/news/detail/poster.scss

@@ -1,3 +1,4 @@
+@import "@styles/theme.scss";
 .poster {
   position: fixed;
   width: 100vw;
@@ -48,7 +49,7 @@
     color: white;
     border: none;
     font-size: 36px;
-    background: linear-gradient(90deg, rgba(255, 199, 12, 1) 0%, rgba(255, 65, 65, 1) 100%);
+    background: $primary-color;
     border-radius: 12px;
     margin: 20px 0;
   }

src/pages/person/feedback/index.scss

@@ -61,7 +61,7 @@
     border: none;
     // border-radius: 0;
     color: white;
-    background: linear-gradient(90deg, rgba(255, 199, 12, 1) 0%, rgba(255, 65, 65, 1) 100%);
+    background: $primary-color;
     box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.14);
     border-radius: 10px;
   }

src/pages/person/index.js

@@ -49,10 +49,6 @@ export default class Person extends Component {
   doSign() {
     const { user: { id, havaSigned } } = this.state
     if (havaSigned) {
-      Taro.showToast({
-        title: '你已经签到过了',
-        icon: 'none'
-      })
       return
     }
 
@@ -175,7 +171,7 @@ export default class Person extends Component {
           </View>
           <View className='qiandao-con'>
             <Text className='qiandao-text'>签到得积分，积分兑好礼，马上去签到吧！</Text>
-            <View className="qiandao-btn" onClick={this.doSign}>签到</View>
+            <View className={user.havaSigned?'reday-qiandao-btn' : 'qiandao-btn'} onClick={this.doSign}>{user.havaSigned ? '已签到' : '签到'}</View>
 
             {/* <Text className='integral-cont_btn' onClick={this.goShop}>去兑换</Text> */}
 

src/pages/person/index.scss

@@ -105,6 +105,13 @@
       border:2px solid #fff;
       border-radius: 12px;
     }
+    .reday-qiandao-btn{
+      padding: 6px 18px;
+      font-size: 28px;
+      color: #ddd;
+      border:2px solid #ddd;
+      border-radius: 12px;
+    }
  
   }
   .bg {
@@ -186,7 +193,7 @@
     padding: 10px 0;
     font-size: 32px;
     text-align: center;
-    background: linear-gradient(90deg, rgba(255, 199, 12, 1) 0%, rgba(255, 149, 77, 1) 100%);
+    background: $primary-color;
     border-radius: 34px;
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;

src/pages/person/profile/detail/index.js

@@ -0,0 +1,214 @@
+import Taro, { Component } from '@tarojs/taro';
+import './index.scss'
+import { AtImagePicker } from 'taro-ui'
+import dayjs from 'dayjs'
+
+import { getProfileDetail, 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";
+const profileBg = require('@assets/profile.png')
+const add = require('@assets/add.png')
+const img = require('@assets/shop/banner1.jpg')
+const closeImg = require('@assets/close.png')
+
+// import { connect } from '@tarojs/redux'
+
+
+// @connect(state => state.city)
+export default class Profile extends Component {
+  config = {
+    navigationBarTitleText: '审核详情'
+  }
+
+  state = {
+
+    imgList: [],
+    documentTitle: '',
+    detail: {}
+
+
+  }
+
+  componentDidMount() {
+    this.initPage()
+  }
+  initPage() {
+    let id = this.$router.params.id
+
+    if (id) {
+
+      getProfileDetail(id).then(res => {
+        this.setState({
+          detail: res,
+          imgList: res.imgList,
+          documentTitle: res.documentTitle,
+        })
+      })
+    }
+
+  }
+
+  // 选择图片
+  bindAlbumClick(e) {
+    e.stopPropagation()
+    Taro.chooseImage({
+      sizeType: ['original', 'compressed'],  //可选择原图或压缩后的图片
+      sourceType: ['album', 'camera'], //可选择性开放访问相册、相机
+      success: res => {
+        uploadFiles(res.tempFilePaths).then(data => {
+          let arr = []
+          data.map((item, index) => {
+            arr.push({ img: item, sort: index })
+          })
+          const imgList = this.state.imgList.concat(arr)
+          this.setState({
+            marginTop: 0,
+            messageType: 'image',
+            imgList: imgList
+          }, this.onSendMsg)
+        })
+      }
+    })
+  }
+  // 删除图片
+  deleteImg(inx) {
+
+    const imgList = this.state.imgList;
+    imgList.splice(inx, 1);
+    this.setState({
+      imgList: imgList
+    })
+  }
+
+
+  // 提交资料审核
+  commitBtn() {
+    if (this.state.imgList.length == 0) {
+      Taro.showToast({ icon: 'none', title: '请先上传图片' });
+    } else if (this.state.documentTitle == "") {
+      Taro.showToast({ icon: 'none', title: '资料说明不能为空' });
+    } else {
+
+      const payload = {
+        documentTitle: this.state.documentTitle,
+        imgList: this.state.imgList,
+        id: this.state.detail.documentVerifyId
+      }
+
+      editDocumentVerify(payload).then(res => {
+        this.setState({
+          detail: res,
+          imgList: res.imgList,
+          documentTitle: res.documentTitle,
+        })
+        Taro.showToast({ icon: 'none', title: '提交成功' });
+
+      }).catch((err) => {
+        Taro.showToast({ icon: 'none', title: err.errMsg || '提交失败' });
+        console.error(err);
+      });
+    }
+  }
+  // 输入资料说明
+  onInputText = e => {
+    this.setState({
+      documentTitle: e.detail.value
+    })
+  }
+  // 查看大图
+  onPreview = (item, e) => {
+    let urls = []
+    this.state.imgList.map((ele, index) => {
+      urls.push(ele.img)
+    })
+    e.stopPropagation()
+    e.preventDefault()
+    Taro.previewImage({
+      current: item.img,
+      urls: urls
+    })
+  }
+  // 上传资料模块
+  renderUpImages() {
+    return (
+      <Block>
+        <View className="up-btn" onClick={this.bindAlbumClick}>
+          <Image className="add-img" src={add} />
+          上传资料
+        </View>
+      </Block>
+    )
+  }
+  // 资料审核列表模块
+  // 审核状态 0未审核  1审核通过  2审核不通过 verifyStatus
+
+
+  render() {
+    const { imgList, documentTitle, detail } = this.state
+
+    return (
+      <View className="profile-page" style="background:#f4f4f4">
+        <ScrollView scrollY scrollWithAnimation style="height: 100vh">
+
+          {
+            detail.verifyStatus == 2 &&
+            <View>
+              <View className="reject-reason" >驳回原因:{detail.rejectReason || ''}</View>
+
+              <View className="desc-box">
+                资料说明：
+              <Input className='inputDesc' value={documentTitle || ''} onInput={this.onInputText.bind(this)} type='text' placeholder='请填写资料说明' />
+              </View>
+              <View style="padding:10px 20px">
+                {this.renderUpImages()}
+              </View>
+              <View className="image-box">
+                {imgList.length &&
+                  imgList.map((item, inx) => {
+                    return (
+                      <View className="image-con" key={`img-${inx}`}>
+                        <Image className="close-btn" src={closeImg} onClick={this.deleteImg.bind(this, (inx))} />
+                        <Image className="img" src={item.img} onClick={this.onPreview.bind(this, (item))} />
+                      </View>
+                    )
+                  })
+                }
+
+              </View>
+              <View className="commit-btn" onClick={this.commitBtn}>重新提交</View>
+
+            </View>
+          }
+          {
+            detail.verifyStatus != 2 &&
+            <View>
+              <View className="detail-title" >{detail.documentTitle || '资料审核'}</View>
+              {
+                detail.verifyStatus == 1 && <View className="commit-text" >审核通过</View>
+              }
+              {
+                detail.verifyStatus == 0 && <View className="verfying" >审核中</View>
+              }
+              <View className="image-box">
+                {imgList.length &&
+                  imgList.map((item, inx) => {
+                    return (
+                      <View className="image-con" key={`img-${inx}`}>
+                        <Image className="img" src={item.img} onClick={this.onPreview.bind(this, (item))} />
+                      </View>
+                    )
+                  })
+                }
+
+              </View>
+            </View>
+          }
+
+        </ScrollView>
+      </View>
+    )
+  }
+}

src/pages/person/profile/detail/index.scss

@@ -0,0 +1,120 @@
+@import "@styles/theme.scss";
+
+.profile-page{
+  background-color: #f4f4f4;
+  height: 100%;
+
+  .up-btn{
+    width: 670px;
+    height: 220px;
+    background-color: #fff;
+    border: 1px solid #E8E8E8;
+    border-radius: 12px;
+    text-align: center;
+    color: $primary-color;
+    margin: 0 auto;
+    .add-img{
+      width: 72px;
+      height: 72px;
+      margin: 42px auto 20px auto;
+      display: block;
+
+    }
+    }
+  .up-images{
+    width: 100%;
+    padding: 0 40px;
+    position: absolute;
+    top: 36%;
+    left: 0;
+    .tip{
+      font-size:28px;
+      color:#999;
+      text-align: center;
+      margin-bottom: 8px;
+      }
+  }
+  .desc-box{
+    color: #666;
+    font-size: 32px;
+    display: flex;
+    align-items: center;
+    padding: 20px 40px 6px 40px;
+    .inputDesc{
+      background-color: #fff;
+      height:64px;
+      line-height:64px;
+      width:470px;
+      padding: 0 15px;
+      box-shadow:0px 2px 0px 0px rgba(0,0,0,0.08);
+    }
+
+  }
+  
+  .image-box{
+    display: flex;
+    flex-wrap: wrap;
+    align-content: flex-start;
+    justify-content: space-between;
+    padding: 20px 25px;
+
+    .image-con {
+      flex: 0 0 50%;
+      height: 316px;
+      box-sizing: border-box;
+      margin-bottom: 42px;
+      position: relative;
+      .close-btn{
+        position: absolute;
+        width: 76px;
+        height: 48px;
+        right: 19px;
+        top:0;
+      }
+      .img{
+        width: 316px;
+        height: 316px;
+        border-radius: 12px;
+        margin: 0 17px;
+        background-color: #fff;
+      }
+    }
+  }
+  .commit-btn{
+    width:86%;
+    height:100px;
+    background:rgba(187,156,121,1);
+    border-radius:12px;
+    color: #fff;
+    font-size: 36px;
+    line-height: 100px;
+    text-align: center;
+    margin: 140px auto;
+    
+  }
+  .detail-title{
+    text-align: center;
+    margin: 20px auto;
+    color: #333;
+    padding: 0 40px;
+    font-size: 36px;
+  }
+  .commit-text{
+    text-align: center;
+    margin: 0 auto 30px auto;
+    color: rgba(187,156,121,1);
+    font-size: 36px;
+  }
+  .verfying{
+    text-align: center;
+    margin: 0 auto 30px auto;
+    color: #666;
+    font-size: 36px;
+  }
+  .reject-reason{
+    color: #BDBDBD;
+    padding: 0 90px;
+    margin-top:30px;
+    font-size: 26px;
+  }
+}

src/pages/person/profile/index.js

@@ -1,16 +1,13 @@
 import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
-import { AtImagePicker } from 'taro-ui'
-import { getDocumentVerify, commitDocumentVerify, editDocumentVerify } from '@services/user'
+import dayjs from 'dayjs'
+import { getDocumentVerify, commitDocumentVerify, getVerifyList } 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";
+const profileBg = require('@assets/profile.png')
+const add = require('@assets/add.png')
+const closeImg = require('@assets/close.png')
 
-// import { connect } from '@tarojs/redux'
-
-
-// @connect(state => state.city)
 export default class Profile extends Component {
   config = {
     navigationBarTitleText: '我的资料'
@@ -20,29 +17,23 @@ export default class Profile extends Component {
     files: [],
     auditStatus: 0,
     documentVerifyId: '',
+    imgList: [],
+    documentTitle: '',
+    verfyList: [], // 审核列表
+    descVisible: false,
 
   }
-  // 审核状态   0审核中  1审核通过  2审核不通过 3未审核
+
   componentDidMount() {
     this.getProfile()
   }
 
   getProfile() {
     Taro.showLoading()
-    getDocumentVerify().then(res => {
-      if (!res) {
-        this.setState({
-          auditStatus: 3,
-        })
-      } else {
-        this.setState({
-          files: res.imgList.map(x => ({ url: x.img })),
-          auditStatus: res.verifyStatus,
-          // resData:res,
-          documentVerifyId: res.documentVerifyId,
-        })
-      }
-
+    getVerifyList().then(res => {
+      this.setState({
+        verfyList: res
+      })
       Taro.hideLoading()
     }).catch((err) => {
       Taro.hideLoading()
@@ -53,70 +44,82 @@ export default class Profile extends Component {
     });
   }
 
-  onChange(files) {
-    const filePaths = files.map(x => x.file.path)
-    uploadFiles(filePaths).then((res) => {
-      this.setState({
-        files: res.map(x => ({ url: x}))
-      })
+  // 选择图片
+  bindAlbumClick(e) {
+    this.setState({
+      descVisible: true
+    })
+    e.stopPropagation()
+    Taro.chooseImage({
+      sizeType: ['original', 'compressed'],  //可选择原图或压缩后的图片
+      sourceType: ['album', 'camera'], //可选择性开放访问相册、相机
+      success: res => {
+        uploadFiles(res.tempFilePaths).then(data => {
+          let arr = []
+          data.map((item, index) => {
+            arr.push({ img: item, sort: index })
+          })
+          const imgList = this.state.imgList.concat(arr)
+          this.setState({
+            marginTop: 0,
+            messageType: 'image',
+            imgList: imgList
+          }, this.onSendMsg)
+        })
+      }
     })
   }
-  onFail(mes) {
-    console.log(mes)
+  // 删除图片
+  deleteImg(inx) {
+
+    const imgList = this.state.imgList;
+    imgList.splice(inx, 1);
+    this.setState({
+      imgList: imgList
+    })
   }
-  onImageClick(index, file) {
-    console.log(index, file)
+  toProfileDetail(item) {
+    console.log(item, "item")
+    Taro.navigateTo({
+      url: '/pages/person/profile/detail/index?id=' + item.documentVerifyId
+    })
   }
-
-  // 提交图片审核
+  // 查看大图
+  onPreview = (item, e) => {
+    let urls = []
+    this.state.imgList.map((ele, index) => {
+      urls.push(ele.img)
+    })
+    e.stopPropagation()
+    e.preventDefault()
+    Taro.previewImage({
+      current: item.img,
+      urls: urls
+    })
+  }
+  // 提交资料审核
   commitBtn() {
     console.log(this.state.auditStatus, "this.state.auditStatus")
-    if (this.state.files.length == 0) {
+    if (this.state.imgList.length == 0) {
       Taro.showToast({ icon: 'none', title: '请先上传图片' });
-    } else if (this.state.auditStatus != 3) {
-      let imgList = []
-      let fileList = this.state.files
-      fileList.map((item, index) => {
-          let newObj = {}
-          newObj.img = item.url,
-          newObj.sort = index
-          imgList.push(newObj)
-        }
-      )
+    } else if (this.state.documentTitle == "") {
+      Taro.showToast({ icon: 'none', title: '资料说明不能为空' });
+    }
+    else {
 
       const payload = {
-        imgList,
-        documentVerifyId: this.state.documentVerifyId
+        documentTitle: this.state.documentTitle,
+        imgList: this.state.imgList
       }
 
-      editDocumentVerify(payload).then(res => {
+      commitDocumentVerify(payload).then(res => {
         this.setState({
-          files: res.imgList.map(x => ({url: x.img})),
-          auditStatus: res.verifyStatus
-        })
-        Taro.showToast({ icon: 'none', title: '提交成功' });
-      }).catch((err) => {
-        Taro.showToast({ icon: 'none', title: err.errMsg || '提交失败' });
-        console.error(err);
-      });
-
-    } else {
-
-      let imgList = []
-      let fileList = this.state.files
-      fileList.map((item, index) => {
-        let newObj = {}
-        newObj.img = item.url
-        newObj.sort = index
-        imgList.push(newObj)
-      })
-
-      commitDocumentVerify(imgList).then(res => {
-        this.setState({
-          files: res.imgList.map(x => ({url: x.img})),
-          auditStatus: res.verifyStatus
+          documentTitle: '',
+          imgList: [],
+          descVisible: false,
         })
         Taro.showToast({ icon: 'none', title: '提交成功' });
+        this.getProfile()
 
       }).catch((err) => {
         Taro.showToast({ icon: 'none', title: err.errMsg || '提交失败' });
@@ -124,43 +127,112 @@ export default class Profile extends Component {
       });
     }
   }
-
-
-  render() {
-
-
+  // 输入资料说明
+  onInputText = e => {
+    this.setState({
+      documentTitle: e.detail.value
+    })
+  }
+  // 上传资料模块
+  renderUpImages() {
     return (
-      <View className="profile-page">
-        <View className="tip">
-          建议上传相关购房资格等相关资料,最多上传8张,
+      <Block>
+        <View className="up-btn" onClick={this.bindAlbumClick}>
+          <Image className="add-img" src={add} />
+          上传资料
         </View>
-        <View className="tip">
-          审核通过后将获取更多积分、兑换好礼~
-        </View>
-        {this.state.auditStatus == 1 &&
-          <View className="commit-text" >审核通过,快去查看积分吧~</View>
+      </Block>
+    )
+  }
+  // 资料审核列表模块
+  // 审核状态 0未审核  1审核通过  2审核不通过 verifyStatus
+  renderVerfyList() {
+    const { verfyList } = this.state
+    return (
+      <View className="verfy-list">
+        {
+          verfyList.map((item, inx) => {
+            return (
+              <View className="verfy-item" key={`verfy-${inx}`} onClick={this.toProfileDetail.bind(this, (item))}>
+                <View className="top">
+
+                  <Text className="title">{item.documentTitle || ' '}</Text><Text className={item.verifyStatus == 0 ? 'status0' : item.verifyStatus == 1 ? 'status1' : 'status2'}>{item.verifyStatus == 0 ? '审核中' : item.verifyStatus == 1 ? '审核通过' : '未通过'}</Text>
+                </View>
+                <View className="bottom">
+                  <Text className="time">{`${dayjs(item.createDate).format('YYYY年MM月DD日 HH:mm:ss')}`}</Text><Text className="handle">点击{item.verifyStatus == 2 ? '编辑' : '查看'}</Text>
+                </View>
+              </View>
+            )
+
+          })
         }
 
-        <AtImagePicker
-          showAddBtn={(this.state.files.length < 8 && this.state.auditStatus == 2) || (this.state.auditStatus == 3 && this.state.files.length < 8)}
-          length={2}
-          mode="scaleToFill"
-          files={this.state.files}
-          onChange={this.onChange.bind(this)}
-          onFail={this.onFail.bind(this)}
-          onImageClick={this.onImageClick.bind(this)}
-        />
-        {this.state.auditStatus == 2 &&
-          <View className="commit-text" >审核未通过,请重新提交!</View>
-        }
+      </View>
+    )
+  }
+
 
-        {(this.state.auditStatus == 2 || this.state.auditStatus == 3) &&
-          <View className="commit-btn" onClick={this.commitBtn}>提交审核</View>
-        }
-        {this.state.auditStatus == 0 &&
-          <View className="commit-text" >审核中</View>
-        }
 
+  render() {
+    const { imgList, documentTitle, verfyList, descVisible } = this.state
+
+    return (
+      <View className="profile-page" style={`background: url(${profileBg}) no-repeat top;background-size: 100% 100%;`}>
+        <ScrollView scrollY scrollWithAnimation style="height: 100vh">
+
+          {!verfyList.length &&
+            <View className="up-images">
+              {this.renderUpImages()}
+
+              <View className="tip">
+                建议上传相关购房资格等相关资料,审核
+          </View>
+              <View className="tip">
+                通过后将获取更多积分、兑换好礼~
+          </View>
+            </View>
+          }
+          {verfyList.length &&
+            <View>
+
+              {descVisible &&
+                <View>
+                  <View className="desc-box">
+                    资料说明：
+            <Input className='inputDesc' onInput={this.onInputText.bind(this)} type='text' placeholder='请填写资料说明' />
+                  </View>
+                  <View style="padding:10px 20px">
+                    {this.renderUpImages()}
+                  </View>
+                  <View className="image-box">
+                    {imgList.length &&
+                      imgList.map((item, inx) => {
+                        return (
+                          <View className="image-con" key={`img-${inx}`}>
+                            <Image className="close-btn" src={closeImg} onClick={this.deleteImg.bind(this, (inx))} />
+                            <Image className="img" onClick={this.onPreview.bind(this, (item))} src={item.img} />
+                          </View>
+                        )
+                      })
+                    }
+
+                  </View>
+                </View>
+              }
+              {!descVisible &&
+                <View>
+                  <View style="padding:10px 20px">
+                    {this.renderUpImages()}
+                  </View>
+                  {this.renderVerfyList()}
+                </View>}
+
+              {imgList.length && <View className="commit-btn" onClick={this.commitBtn}>提交审核</View>}
+
+            </View>
+          }
+
+        </ScrollView>
       </View>
     )
   }

src/pages/person/profile/index.scss

@@ -1,16 +1,135 @@
+@import "@styles/theme.scss";
+
 .profile-page{
-  padding: 20px 40px;
-  height: 100vh;
-  width: 100vw;
-  
-  .tip{
-    font-size:24px;
-    color:#c8c8c8;
+  background-color: #f4f4f4;
+  height: 100%;
+
+  .up-btn{
+    width: 670px;
+    height: 220px;
+    background-color: #fff;
+    border: 1px solid #E8E8E8;
+    border-radius: 12px;
     text-align: center;
-    margin-bottom: 10px;
+    color: $primary-color;
+    margin: 0 auto;
+    .add-img{
+      width: 72px;
+      height: 72px;
+      margin: 42px auto 20px auto;
+      display: block;
+
+    }
+    }
+  .up-images{
+    width: 100%;
+    padding: 0 40px;
+    position: absolute;
+    top: 36%;
+    left: 0;
+    .tip{
+      font-size:28px;
+      color:#999;
+      text-align: center;
+      margin-bottom: 8px;
+      }
+  }
+  .desc-box{
+    color: #666;
+    font-size: 32px;
+    display: flex;
+    align-items: center;
+    padding: 20px 40px 6px 40px;
+    .inputDesc{
+      background-color: #fff;
+      height:64px;
+      line-height:64px;
+      width:470px;
+      padding: 0 15px;
+      box-shadow:0px 2px 0px 0px rgba(0,0,0,0.08);
+    }
+
+  }
+  .verfy-list{
+    background-color: #fff;
+    padding: 0 40px;
+    .verfy-item{
+      padding: 30px 0 34px 0;
+      box-shadow:0px 1px 0px 0px rgba(0,0,0,0.08);
+      .top{
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        margin-bottom: 20px;
+        .title{
+          font-size: 32px;
+          color: #333;
+    
+        }
+        .status0{
+          color: #666;
+          font-size: 28px;
+          margin-right: 6px;
+        }
+        .status1{
+          color: #999;
+          font-size: 28px;
+          margin-right: 6px;
+        }
+        .status2{
+          color: #E35E44;
+          font-size: 28px;
+          margin-right: 6px;
+        }
+      }
+      .bottom{
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        .time{
+          color: #999;
+          font-size: 24px;
+        }
+        .handle{
+          font-size: 30px;
+          color: $primary-color;
+        }
+      }
+    }
+
+  }
+  
+  .image-box{
+    display: flex;
+    flex-wrap: wrap;
+    align-content: flex-start;
+    justify-content: space-between;
+    padding: 20px 25px;
+
+    .image-con {
+      flex: 0 0 50%;
+      height: 316px;
+      box-sizing: border-box;
+      margin-bottom: 42px;
+      position: relative;
+      .close-btn{
+        position: absolute;
+        width: 76px;
+        height: 48px;
+        right: 19px;
+        top:0;
+      }
+      .img{
+        width: 316px;
+        height: 316px;
+        border-radius: 12px;
+        margin: 0 17px;
+        background-color: #fff;
+      }
+    }
   }
   .commit-btn{
-    width:360px;
+    width:86%;
     height:100px;
     background:rgba(187,156,121,1);
     border-radius:12px;

src/pages/person/spread/index.scss

@@ -1,3 +1,4 @@
+@import "@styles/theme.scss";
 .page {
   position: relative;
   width: 100%;
@@ -52,6 +53,6 @@
   font-weight: bold;
   left: 20%;
   top: 85%;
-  background: linear-gradient(270deg, rgba(248, 68, 60, 1) 0%, rgba(254, 195, 16, 1) 100%);
+  background: $primary-color;
   border-radius: 10px;
 }

src/pages/project/detail/index.scss

@@ -373,7 +373,7 @@
         }
 
         .saved {
-          color: linear-gradient(90deg, rgba(255, 199, 12, 1) 0%, rgba(255, 65, 65, 1) 100%);
+          color: $primary-color;
         }
 
         .txt {

src/pages/project/detail/poster.scss

@@ -1,3 +1,4 @@
+@import "@styles/theme.scss";
 .poster {
   position: fixed;
   width: 100vw;
@@ -55,7 +56,7 @@
     color: white;
     border: none;
     font-size: 36px;
-    background: linear-gradient(90deg, rgba(255, 199, 12, 1) 0%, rgba(255, 65, 65, 1) 100%);
+    background: $primary-color;
     border-radius: 12px;
     margin: 20px 0;
   }

src/pages/project/list/filter/index.js

@@ -25,7 +25,7 @@ export default class Index extends Component {
       {
         name: '价格',
         id: 'price',
-        list: ['不限', '10000/㎡以下', '10000-20000元/㎡', '20000-30000元/㎡', '30000-50000元/㎡', '50000-70000元/㎡', '70000-100000元/㎡', '100000元/㎡以上']
+        list: ['不限', '10000元/㎡以下', '10000-20000元/㎡', '20000-30000元/㎡', '30000-50000元/㎡', '50000-70000元/㎡', '70000-100000元/㎡', '100000元/㎡以上']
         // list: [
         //   {
         //     name: '总价',

src/pages/project/list/filter/index.scss

@@ -151,7 +151,7 @@
     }
 
     &-btn {
-      background: linear-gradient(90deg, rgba(255, 199, 12, 1) 0%, rgba(255, 65, 65, 1) 100%);
+      background: $primary-color;
       border-radius: 8px;
       color: white;
       width: 200px;

src/pages/shop/detail/index.scss

@@ -138,7 +138,7 @@
   left: 5%;
   font-size: 32px;
   line-height: 90px;
-  background: linear-gradient(90deg, rgba(255, 199, 12, 1) 0%, rgba(255, 65, 65, 1) 100%);
+  background: $primary-color;
   box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.14);
   border-radius: 10px;
 }

src/pages/shop/index.js

@@ -212,11 +212,10 @@ export default class Shop extends Component {
     const { goodsList, goodsBuilding, current } = this.state
 
     return (
-      <View className="list__wrap">
+      <View>
         {
-
           goodsBuilding && goodsBuilding.length < 2 &&
-          <View>
+          <View className="list__wrap">
             <View className="hot_title">热门商品</View>
             {
               goodsList.map(item => (
@@ -238,35 +237,36 @@ export default class Shop extends Component {
         }
         {
           goodsBuilding && goodsBuilding.length >= 2 &&
-          <AtTabs scroll tabDirection='horizontal' current={current} tabList={goodsBuilding} onClick={this.handleClick.bind(this)}>
-
-            {goodsBuilding.map((l_item, index) => (
-
-              <AtTabsPane current={current} index={index} >
-                <View>
-                  {
-                    goodsList.map(item => (
-                      <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
-                        <Image className="item__img" src={item.imgUrl} />
-                        <View className="item__title">{item.goodsName}</View>
-                        <View className="item__des">
-                          <View>
-                            剩余数量{item.inventory}
-                          </View>
-                          <View >
-                            <Text className="item__jifen">{item.pointPrice}</Text>积分
+          <View className="list__wrap">
+            <AtTabs scroll tabDirection='horizontal' current={current} tabList={goodsBuilding} onClick={this.handleClick.bind(this)}>
+
+              {goodsBuilding.map((l_item, index) => (
+                <AtTabsPane current={current} key={index} index={index} >
+                  <View>
+                    {
+                      goodsList.map(item => (
+                        <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
+                          <Image className="item__img" src={item.imgUrl} />
+                          <View className="item__title">{item.goodsName}</View>
+                          <View className="item__des">
+                            <View>
+                              剩余数量{item.inventory}
+                            </View>
+                            <View >
+                              <Text className="item__jifen">{item.pointPrice}</Text>积分
                 </View>
-                        </View>
+                          </View>
 
-                      </View>
-                    ))
-                  }
+                        </View>
+                      ))
+                    }
 
-                </View>
-              </AtTabsPane>
-            ))
-            }
-          </AtTabs>
+                  </View>
+                </AtTabsPane>
+              ))
+              }
+            </AtTabs>
+          </View>
         }
       </View>
 

src/pages/shop/record/index.scss

@@ -32,7 +32,7 @@
 			.title-state{
 				height: 60px;
 				width: 120px;
-				background:linear-gradient(57deg,rgba(255,199,12,1) 0%,rgba(255,65,65,1) 100%);
+				background:$primary-color;
 				color:white;
 				font-size: 26px;
 				border-radius: 0 0 0 30px;

src/pages/toolKit/index.scss

@@ -1,3 +1,4 @@
+@import "@styles/theme.scss";
 .list_big_box {
     width: 100%;
 
@@ -65,7 +66,7 @@
         color: white;
         margin-top: 30px;
         position: fixed;
-        background: linear-gradient(90deg, rgba(255, 199, 12, 1) 0%, rgba(255, 65, 65, 1) 100%);
+        background: $primary-color;
     }
 }
 

src/services/user.js

@@ -4,7 +4,8 @@ import {
   API_USER_PHONE,
   API_USER_SIGNIN,
   API_QUERY_USER_INFO,
-  API_QUERY_DOCUMENTVERIFY
+  API_QUERY_DOCUMENTVERIFY,
+  API_QUERY_DOCUMENTVERIFY_list
 } from '@constants/api'
 
 /**
@@ -30,6 +31,12 @@ export const queryUserInfo = payload => fetch({ url: API_QUERY_USER_INFO, payloa
  * @param {*} payload
  */
 export const getDocumentVerify = payload => fetch({ url: API_QUERY_DOCUMENTVERIFY, payload })
+
+/**
+ * 获取我的资料审核列表
+ * @param {*} payload
+ */
+export const getVerifyList = payload => fetch({ url: API_QUERY_DOCUMENTVERIFY_list, payload })
 /**
  * 提交我的资料 (首次)
  * @param {*} payload
@@ -39,7 +46,13 @@ export const commitDocumentVerify = payload => fetch({ url: API_QUERY_DOCUMENTVE
  * 提交我的资料 (非首次)
  * @param {*} payload
  */
-export const editDocumentVerify = payload => fetch({ url:`${API_QUERY_DOCUMENTVERIFY}/${payload.documentVerifyId}`, payload: payload.imgList, method: 'PUT'  })
+export const editDocumentVerify = payload => fetch({ url:`${API_QUERY_DOCUMENTVERIFY}/${payload.id}`, payload, method: 'PUT'  })
+
+/**
+ * 获取审核资料详情
+ *  * @param {*} payload
+ */
+export const getProfileDetail = payload => fetch({ url:`${API_QUERY_DOCUMENTVERIFY}/${payload}`, payload  })
 
 /**
  * 用户签到