Merge branch 'v4' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v4

config/dev.js

@@ -9,8 +9,8 @@ module.exports = {
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    HOST: '"http://192.168.0.84:8080"',
-    WSS_HOST: '"ws://192.168.0.84:8080"',
+    HOST: '"http://192.168.0.131:8080"',
+    WSS_HOST: '"ws://192.168.0.131:8080"',
   },
   weapp: {},
   h5: {}

src/actions/user.js

@@ -12,7 +12,8 @@ import {
   API_USER_SIGNIN,
   API_QUERY_CUSTOMER_INFO,
   API_QUERY_MYREPORT,
-  API_QUERY_USERINFO_BYID
+  API_QUERY_USERINFO_BYID,
+  API_QUERY_DOCUMENTVERIFY
 } from '@constants/api'
 
 import { createAction,createActionNormal } from '@utils/redux'
@@ -71,6 +72,7 @@ export const dispatchCustomerInfo = payload => createAction({
   payload,
   method: 'GET'
 })
+
 /**
  * 我报备的客户列表
  * @param {*} payload

src/app.js

@@ -40,11 +40,12 @@ class App extends Component {
       }
     },
     pages: [
-      'pages/project/index',
       'pages/person/index',
+      'pages/person/profile/index',
+      'pages/project/index',
       'pages/activity/activity',
       'pages/shop/index',
-      'pages/project/detail/index',      
+      'pages/project/detail/index',
       'pages/activity/assemblePage',
       'pages/activity/assistancePage',
       'pages/person/spread/index',

src/constants/api.js

@@ -26,6 +26,8 @@ export const API_QUERY_USER_INFO = resolvePath('user/info')
 export const API_QUERY_USERINFO_BYID = resolvePath('onePerson')
 export const API_QUERY_CUSTOMER_INFO = resolvePath('customer/myCustomer')
 export const API_QUERY_MYREPORT = resolvePath('customer/myReport')
+export const API_QUERY_DOCUMENTVERIFY = resolvePath('documentVerify')
+
 
 // chat
 export const API_CHAT_HISTORY = resolvePath('chat/history')

src/pages/person/index.js

@@ -103,6 +103,11 @@ export default class Person extends Component {
       url: '/pages/activity/assistancePage'
     })
   }
+  toProfile() {
+    Taro.navigateTo({
+      url: '/pages/person/profile/index'
+    })
+  }
 
   getRoleName(type) {
     switch (type) {
@@ -213,6 +218,13 @@ export default class Person extends Component {
             </View>
             <Text style=" width:10px;height:10px;border-top: 1px solid #999;border-right: 1px solid #999;transform:rotate(45deg);"></Text>
           </View>
+          <View onClick={this.toProfile} style=" display: flex;align-items: center;justify-content: space-between;margin: 0 20px;padding:10px 0;box-shadow:0px 1px 0px 0px rgba(0,0,0,0.12);">
+            <View style="display: flex;align-items: center;">
+              <Image style="width:22px;height:22px;margin-right:10px" src={require('@assets/mine/regiment.png')} ></Image>
+              <Text >我的资料</Text>
+            </View>
+            <Text style=" width:10px;height:10px;border-top: 1px solid #999;border-right: 1px solid #999;transform:rotate(45deg);"></Text>
+          </View>
           <View onClick={this.toAssistance} style=" display: flex;align-items: center;justify-content: space-between;margin: 0 20px;padding:10px 0;box-shadow:0px 1px 0px 0px rgba(0,0,0,0.12);">
             <View style="display: flex;align-items: center;">
               <Image style="width:22px;height:22px;margin-right:10px" src={require('@assets/mine/help.png')} ></Image>

src/pages/person/profile/index.js

@@ -0,0 +1,194 @@
+import Taro, { Component } from '@tarojs/taro';
+import './index.scss'
+import { AtImagePicker } from 'taro-ui'
+import { getDocumentVerify, commitDocumentVerify, editDocumentVerify } from '@services/user'
+
+import "taro-ui/dist/style/components/image-picker.scss";
+import "taro-ui/dist/style/components/icon.scss";
+
+// import { connect } from '@tarojs/redux'
+
+
+// @connect(state => state.city)
+export default class Profile extends Component {
+  config = {
+    navigationBarTitleText: '我的资料'
+  }
+
+  state = {
+    files: [],
+    auditStatus: 0,
+    documentVerifyId: '',
+
+  }
+  // 审核状态   0审核中  1审核通过  2审核不通过 3未审核
+  componentDidMount() {
+    this.getProfile()
+
+  }
+
+  getProfile() {
+    Taro.showLoading()
+    getDocumentVerify().then(res => {
+      if (!res) {
+        this.setState({
+          auditStatus: 3,
+        })
+
+      } else {
+        console.log(res, "res")
+        let imgList = []
+        let fileList = res.imgList
+        fileList.map((item, index) => {
+          let newObj = {}
+          newObj.url = item.img
+
+          imgList.push(newObj)
+        }
+        )
+        this.setState({
+          files: imgList,
+          auditStatus: res.verifyStatus,
+          // resData:res,
+          documentVerifyId: res.documentVerifyId,
+        })
+      }
+
+      Taro.hideLoading()
+    }).catch((err) => {
+      Taro.hideLoading()
+      setTimeout(() => {
+        Taro.showToast({ icon: 'none', title: '获取信息失败' });
+      }, 500)
+
+    });
+  }
+
+  onChange(files) {
+    this.setState({
+      files
+    })
+  }
+  onFail(mes) {
+    console.log(mes)
+  }
+  onImageClick(index, file) {
+    console.log(index, file)
+  }
+  // 提交图片审核
+  commitBtn() {
+    console.log(this.state.auditStatus, "this.state.auditStatus")
+    if (this.state.files.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)
+      }
+      )
+      // const resData = this.state.resData
+
+      const payload = {
+        // ,
+
+        // ...resData,
+        imgList,
+        documentVerifyId: this.state.documentVerifyId
+
+      }
+      editDocumentVerify(payload).then(res => {
+        let imgList = []
+        let fileList = res.imgList
+        fileList.map((item, index) => {
+          let newObj = {}
+          newObj.url = item.img
+
+          imgList.push(newObj)
+        })
+
+        this.setState({
+          files: imgList,
+          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 => {
+        let imgList = []
+        let fileList = res.imgList
+        fileList.map((item, index) => {
+          let newObj = {}
+          newObj.url = item.img
+          imgList.push(newObj)
+        })
+        this.setState({
+          files: imgList,
+          auditStatus: res.verifyStatus
+        })
+        Taro.showToast({ icon: 'none', title: '提交成功' });
+
+      }).catch((err) => {
+        Taro.showToast({ icon: 'none', title: err.errMsg || '提交失败' });
+        console.error(err);
+      });
+    }
+  }
+
+
+  render() {
+
+
+    return (
+      <View className="profile-page">
+        <View className="tip">
+          建议上传相关购房资格等相关资料,最多上传8张,
+        </View>
+        <View className="tip">
+          审核通过后将获取更多积分、兑换好礼~
+        </View>
+        {this.state.auditStatus == 1 &&
+          <View className="commit-text" >审核通过,快去查看积分吧~</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>
+        }
+
+        {(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>
+        }
+
+      </View>
+    )
+  }
+}

src/pages/person/profile/index.scss

@@ -0,0 +1,30 @@
+.profile-page{
+  padding: 20px 40px;
+  height: 100vh;
+  width: 100vw;
+  
+  .tip{
+    font-size:24px;
+    color:#c8c8c8;
+    text-align: center;
+    margin-bottom: 10px;
+  }
+  .commit-btn{
+    width:360px;
+    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;
+    
+  }
+  .commit-text{
+    text-align: center;
+    margin: 80px auto;
+    color: rgba(187,156,121,1);
+    font-size: 36px;
+  }
+}

src/pages/project/banner/index.js

@@ -8,7 +8,7 @@ export default class SwiperBanner extends Component {
     list: [],
     indicatorDots: true,
     style: {
-      height: '250px'
+      height: '200px'
     },
     onClick: function () { }
   }
@@ -19,38 +19,30 @@ export default class SwiperBanner extends Component {
   render() {
     const { list, style, indicatorDots, current } = this.props
     return (
-      <swiper indicator-dots="false"
-      >
-        {/* <block wx: for="{{ background }}" wx:key="*this"> */}
-        <swiper-item>
-          <view class="swiper-item {{item}}"></view>
-        </swiper-item>
-        {/* </block> */}
-      </swiper >
-      //   <View className='home-banner' style={style}>
-      //     <Swiper
-      //       className='home-banner__swiper'
-      //       circular
-      //       autoplay
-      //       indicatorDots={indicatorDots}
-      //       indicatorActiveColor='rgb(178, 42, 49)'
-      //     >
-      //       {list.map((item, index) => (
-      //         <SwiperItem
-      //           key={index}
-      //           onClick={this.onBannerClick.bind(this, item)}
-      //           className='home-banner__swiper-item'
-      //         >
-      //           <Image
-      //             mode="widthFix"
-      //             style={style}
-      //             className='home-banner__swiper-item-img'
-      //             src={item.image || item.url}
-      //           />
-      //         </SwiperItem>
-      //       ))}
-      //     </Swiper>
-      //   </View>
+      <View className='home-banner' style={style}>
+        <Swiper
+          className='home-banner__swiper'
+          circular
+          autoplay
+          indicatorDots={indicatorDots}
+          indicatorActiveColor='rgb(178, 42, 49)'
+        >
+          {list.map((item, index) => (
+            <SwiperItem
+              key={index}
+              onClick={this.onBannerClick.bind(this, item)}
+              className='home-banner__swiper-item'
+            >
+              <Image
+                mode="widthFix"
+                style={style}
+                className='home-banner__swiper-item-img'
+                src={item.image || item.url}
+              />
+            </SwiperItem>
+          ))}
+        </Swiper>
+      </View> 
     )
   }
 }

src/services/user.js

@@ -3,7 +3,8 @@ import {
   API_USER_INFO,
   API_USER_PHONE,
   API_USER_SIGNIN,
-  API_QUERY_USER_INFO
+  API_QUERY_USER_INFO,
+  API_QUERY_DOCUMENTVERIFY
 } from '@constants/api'
 
 /**
@@ -24,6 +25,22 @@ export const queryUserPhone = payload => fetch({ url: API_USER_PHONE, payload, m
  */
 export const queryUserInfo = payload => fetch({ url: API_QUERY_USER_INFO, payload })
 
+/**
+ * 获取我的资料
+ * @param {*} payload
+ */
+export const getDocumentVerify = payload => fetch({ url: API_QUERY_DOCUMENTVERIFY, payload })
+/**
+ * 提交我的资料 (首次)
+ * @param {*} payload
+ */
+export const commitDocumentVerify = payload => fetch({ url: API_QUERY_DOCUMENTVERIFY, payload, method: 'POST'  })
+/**
+ * 提交我的资料 (非首次)
+ * @param {*} payload
+ */
+export const editDocumentVerify = payload => fetch({ url:`${API_QUERY_DOCUMENTVERIFY}/${payload.documentVerifyId}`, payload: payload.imgList, method: 'PUT'  })
+
 /**
  * 用户签到
  * @param {*} payload