zls

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
 	"description": "dev环境",
-	"appid": "wxd9ee3a9480a4e544",
+	"appid": "wxda1f84b79b3edeb3",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/app.js

@@ -40,10 +40,10 @@ class App extends Component {
       }
     },
     pages: [
+      'pages/project/index',
       'pages/shop/index',
       'pages/activity/activity',
       'pages/activity/myActivity',
-      'pages/project/index',
       'pages/person/index',
       'pages/person/profile/index',
       'pages/person/profile/detail/index',

src/pages/activity/activity.js

@@ -34,9 +34,9 @@ export default class active extends Component {
   }
 
   render() {
-    const { person: { phone } } = this.props.user.userInfo
+    const { person: { phone, tel } } = this.props.user.userInfo
 
-    return !phone ? this.renderLogin() : (
+    return !phone && !tel ? this.renderLogin() : (
       <View style="height:100vh">
         <AtTabs className="tab-box" scroll current={this.state.current} tabList={[{ title: '热门活动' }, { title: '最新资讯' }]} onClick={this.handleClick.bind(this)}>
           <AtTabsPane current={this.state.current} index={0} >

src/pages/activity/detail/assemble.js

@@ -106,8 +106,8 @@ export default class Detail extends Component {
 
   // 调起授权电话
   toggleGrantPhone = () => {
-    const { userInfo: { person: { phone } } } = this.props
-    if (!phone) {
+    const { userInfo: { person: { phone, tel } } } = this.props
+    if (!phone && !tel) {
       this.setState({ grantPhoneVisible: true })
       return false
     }
@@ -183,7 +183,7 @@ export default class Detail extends Component {
       const recordDetail = res.taShareRecord || {}
       let [actState, leftTime] = this.compActState(res.taShareActivity.startTime, res.taShareActivity.endTime)
 
-      if (res.taShareActivity.status != 1) {
+      if (res.taShareActivity.activityStatus === 2) {
         actState = ActFinished
       }
 

src/pages/activity/detail/assistance.js

@@ -105,8 +105,8 @@ export default class Detail extends Component {
 
   // 调起授权电话
   toggleGrantPhone = () => {
-    const { userInfo: { person: { phone } } } = this.props
-    if (!phone) {
+    const { userInfo: { person: { phone, tel } } } = this.props
+    if (!phone && !tel) {
       this.setState({ grantPhoneVisible: true })
       return false
     }
@@ -173,7 +173,7 @@ export default class Detail extends Component {
 
   // 请求详情
   loadDetail() {
-    debugger
+    // debugger
     const { id, initiateId } = this.state
     const { userInfo } = this.props
 
@@ -184,7 +184,7 @@ export default class Detail extends Component {
       const initiateDetail = res.helpInitiateRecord || {}
       let [actState, leftTime] = this.compActState(res.helpActivity.startDate, res.helpActivity.endDate)
 
-      if (res.helpActivity.status != 1) {
+      if (res.helpActivity.activityStatus === 2) {
         actState = ActFinished
       }
 
@@ -339,7 +339,8 @@ export default class Detail extends Component {
           this.setState({
             initiateDetail: res,
             initiateId: res.helpRecordInitiateId,
-            helpList: res.helpRecordList,
+            // helpList: res.helpRecordList,  // bug #5282
+            helpList: [],
             isStarter: true,
             helpState: HelpInProcess,
           }, resolve)
@@ -362,7 +363,7 @@ export default class Detail extends Component {
     // 必须授权头像
     if (this.toggleGrantAvatar()) {
       const initiateDetail = this.state.initiateDetail
-      debugger
+      // debugger
       if (!initiateDetail.helpRecordInitiateId) {
         // 如果是未发起的助力, 先以当前人身份发起
         this.startMine().then(() => {

src/pages/activity/detail/index.js

@@ -69,7 +69,7 @@ export default class Detail extends Component {
         isSaved,
         isSign,
         loaded: true,
-        selector: times(res.maxEnlistByPerson || 1).map((_, i) => `${i+1}`),
+        selector: times(res.maxEnlistByPerson || 1).map((_, i) => `${i + 1}`),
       }, () => {
 
         const { detail } = this.state
@@ -192,7 +192,7 @@ export default class Detail extends Component {
         "scene": `id=${dynamicId}&from=dynamic_share&recommender=${personId}`,
         "page": 'pages/activity/detail/index',
       }
-      debugger
+      // debugger
       const _avatarurl = getDownloadURL(avatarurl, 'avatar');
       getMiniQrcode(payload).then(qrcode => {
         let data = {
@@ -317,37 +317,37 @@ export default class Detail extends Component {
               <ScrollView
                 scrollY
                 className="detail-wrap">
-                <View className="detail">
-                  {(detail.enlisted == 0 || !detail.enlisted) &&
-                    <View className="detail-sign__num">不需要报名</View>
-                  }
-                  {detail.enlisted > 0 &&
-                    <View className="detail-sign__num">{detail.enlisted || 0}人已报名</View>
-                  }
-                  <View class="detail-title">{detail.title}</View>
-                  <View className="detail-top">
-                    <View className="detail-top__row">
-                      <Text className="row-label">活动时间：</Text>
-                      <Text className="row-content">{dayjs(detail.startDate).format('YYYY-MM-DD HH:mm:ss')}</Text>
-                    </View>
-                    <View className="detail-top__row">
-                      <Text className="row-label">活动地址：</Text>
-                      <Text className="row-content">{detail.address}</Text>
-                    </View>
-                    <View className="detail-top__row">
-                      <Text className="row-label">报名截止：</Text>
-                      {detail.enlistEnd &&
-                        <Text className="row-content">{dayjs(detail.enlistEnd).format('YYYY-MM-DD HH:mm:ss')}</Text>
-                      }
-
-                    </View>
+              <View className="detail">
+                {detail.isEnlist == 0 &&
+                  <View className="detail-sign__num">不需要报名</View>
+                }
+                {detail.isEnlist != 0 &&
+                  <View className="detail-sign__num">{detail.enlisted || 0}人已报名</View>
+                }
+                <View class="detail-title">{detail.title}</View>
+                <View className="detail-top">
+                  <View className="detail-top__row">
+                    <Text className="row-label">活动时间：</Text>
+                    <Text className="row-content">{dayjs(detail.startDate).format('YYYY-MM-DD HH:mm:ss')}</Text>
+                  </View>
+                  <View className="detail-top__row">
+                    <Text className="row-label">活动地址：</Text>
+                    <Text className="row-content">{detail.address}</Text>
                   </View>
-                  <View className="detail-con">
-                    <View className="detail-con__title">活动详情</View>
-                    <import src='../../../components/wxParse/wxParse.wxml' />
-                    <template is='wxParse' data='{{wxParseData:article.nodes}}' />
+                  <View className="detail-top__row">
+                    <Text className="row-label">报名截止：</Text>
+                    {detail.enlistEnd &&
+                      <Text className="row-content">{dayjs(detail.enlistEnd).format('YYYY-MM-DD HH:mm:ss')}</Text>
+                    }
+
                   </View>
                 </View>
+                <View className="detail-con">
+                  <View className="detail-con__title">活动详情</View>
+                  <import src='../../../components/wxParse/wxParse.wxml' />
+                  <template is='wxParse' data='{{wxParseData:article.nodes}}' />
+                </View>
+              </View>
               </ScrollView>
 
               <View className="chat-entrance" onClick={this.handleMoreClick}>

src/pages/activity/detail/index.scss

@@ -93,6 +93,7 @@
   padding: 30px 40px 0 40px;
   position: relative;
   overflow: hidden;
+  padding-bottom:120px; 
   .status__img{
     width: 176px;
     height: 176px;

src/pages/agent/become/index.js

@@ -33,7 +33,7 @@ export default class Index extends Component {
       channelCode: channelCode
     }
     registerAgent(payload).then(res => {
-      debugger
+      // debugger
       this.props.dispatchUpdateUserInfoNew(res.personId)
       Taro.navigateTo({
         url: '/pages/agent/index'

src/pages/card/index.js

@@ -472,7 +472,7 @@ export default class Index extends Component {
                 <View className='mycard__work'>
                   <View className='row mycard__work-department'>{cardInfo.department}<Text className='txt'>部门</Text></View>
                   <View className='row mycard__work-position'>{cardInfo.post}<Text className='txt'>职位</Text></View>
-                  <View className='row mycard__work-company'>{cardInfo.company}<Text className='txt'>楼盘</Text></View>
+                  <View className='row mycard__work-company'>{projectDetail.buildingName}<Text className='txt'>楼盘</Text></View>
                 </View>
 
                 {/* 人气 */}
@@ -549,4 +549,4 @@ export default class Index extends Component {
       </Block>
     )
   }
-}
+}

src/pages/im/index.js

@@ -89,7 +89,7 @@ export default class Chat extends Component {
       let receivePersonId = fromTempleteMsg ? sendPersonId : receiverId
       let receivePersonName = fromTempleteMsg ? sendName : receiverName
 
-      debugger
+      // debugger
       // if (!receivePersonId) {
       //   Taro.showToast({ title: 'receivePersonId不存在' })
       //   this.redirectTo()
@@ -125,7 +125,7 @@ export default class Chat extends Component {
 
       socket.wss.onMessage(res => {
         const data = JSON.parse(res.data)
-        debugger
+        // debugger
         this.handlerRecive(data)
       })
     })
@@ -139,7 +139,7 @@ export default class Chat extends Component {
     const { userInfo: { person: { personType: sendPersonType } } } = this.props
     const { receivePersonId, receivePersonName, sendPersonId } = this.state
     this.props.dispatchCardInfo(receivePersonId).then(res => {
-      debugger
+      // debugger
       // 本人不是置业顾问且对方是置业顾问 则对方向我发送消息
       const { personType: receivePersonType } = res
       const hasSend = (sendPersonType != ROLE_CODE['CONSULTANT'] && receivePersonType == ROLE_CODE['CONSULTANT'])
@@ -224,7 +224,7 @@ export default class Chat extends Component {
   // }
 
   handlerRecive(data) {
-    debugger
+    // debugger
     this.appendData(data)
   }
 
@@ -375,6 +375,9 @@ export default class Chat extends Component {
     // 发送消息
     socket.sendNotice(payload, res => {
       console.log('发送成功')
+      this.setState({
+        inputText:'',
+      })
       this.appendData(payload)
     })
   }

src/pages/im/list/index.js

@@ -55,7 +55,7 @@ export default class Index extends Component {
   toChat(person) {
     const { userInfo: { person: { personId, nickname, name } } } = this.props
     const { friendId: receivePersonId, name: receivePersonName } = person
-    debugger
+    // debugger
     Taro.navigateTo({
       url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${receivePersonId}&receiverName=${encodeURIComponent(receivePersonName)}`
     })

src/pages/person/index.js

@@ -206,11 +206,11 @@ export default class Person extends Component {
   }
 
   render() {
-    const { phone } = this.state.user
+    const { phone, tel } = this.state.user
     return (
       <View className='wrap'>
-        {phone && this.renderDetail()}
-        {!phone && this.renderLogin()}
+        {(phone || tel) && this.renderDetail()}
+        {!phone && !tel  && this.renderLogin()}
       </View>
     )
   }

src/pages/person/login/index.js

@@ -85,6 +85,8 @@ export default class Index extends Component {
       code:code
     }
     putRegister(payload).then(res => {
+      console.log('---bind-->', res)
+
       this.props.dispatchUpdateUserInfoNew(res.personId)
         Taro.showLoading({
           title: '登录中...',

src/pages/person/menus.js

@@ -1,6 +1,6 @@
 import { ROLE_CODE } from '@constants/user'
 
-export const icons = {
+const icons = {
   homepage: require('@assets/mine/homepage.png'),
   recommend: require('@assets/mine/recommend.png'),
   development: require('@assets/mine/development.png'),
@@ -21,7 +21,7 @@ const CONSULTANT = ROLE_CODE['CONSULTANT']
 const ESTATE_AGENT = ROLE_CODE['ESTATE_AGENT']
 const CHANNEL_AGENT = ROLE_CODE['CHANNEL_AGENT']
 
-export const menus = [
+const menus = [
   [
     {
       name: '我的主页',
@@ -55,7 +55,7 @@ export const menus = [
   [
     {
       name: '我的活动',
-      url: '/pages/activity/index?from=mine',
+      url: '/pages/activity/myActivity?from=mine',
       icon: icons.activities,
       extends: undefined,
       userTypes: [CUSTOMER, CONSULTANT, ESTATE_AGENT, CHANNEL_AGENT],
@@ -121,3 +121,4 @@ export const menus = [
   ],
 ]
 
+export { icons, menus }

src/pages/project/floor/index.js

@@ -39,7 +39,7 @@ export default class Index extends Component {
           </View>
           <View className='item'>
             <Text className='txt left-txt'>销售状态</Text>
-            <Text className='txt right-txt'>{this.state.statusOpts[projectDetail.status - 1]}</Text>
+            <Text className='txt right-txt'>{projectDetail.marketStatus ? projectDetail.marketStatus :'待定'}</Text>
           </View>
           <View className='item'>
             <Text className='txt left-txt'>开盘日期</Text>
@@ -89,4 +89,4 @@ export default class Index extends Component {
       </View >
     );
   }
-}
+}

src/pages/project/index.js

@@ -210,12 +210,16 @@ export default class Index extends Component {
     Taro.showLoading()
     this.props.dispatchProjectList(payload).then(res => {
       if (!this.state.loaded && res.records.length <= 0) {
-        let city = {
-          name: '南京市',
-          id: 320100
-        }
-        this.updateCity(city)
-        return
+        // let city = {
+        //   name: '南京市',
+        //   id: 320100
+        // }
+        // this.updateCity(city)
+        // return
+        Taro.showToast({
+          title: '当前城市暂无楼盘',
+          icon: 'none'
+        })
       }
       Taro.hideLoading()
       this.setState({
@@ -255,7 +259,7 @@ export default class Index extends Component {
     this.redirectTo(item)
   }
 
-  redirectTo({contentId, contentType, buildingId} = {}) {
+  redirectTo({ contentId, contentType, buildingId } = {}) {
     switch (contentType) {
       // 项目
       case 'project':
@@ -277,21 +281,21 @@ export default class Index extends Component {
           url: '/pages/activity/detail/assistance?id=' + contentId
         })
         return;
-      
+
       // 拼团
       case 'group':
         Taro.navigateTo({
           url: '/pages/activity/detail/assemble?id=' + contentId
         })
         return;
-      
+
       // 资讯
       case 'news':
         Taro.navigateTo({
           url: 'pages/news/detail/index?id=' + contentId
         })
         return;
-      
+
       // 其他
       case 'others':
       default:
@@ -487,11 +491,11 @@ export default class Index extends Component {
                 </View>
                 <View className="top-box">
                   <View className="search" onClick={this.handleToHouseList}>
-                    <Text className="search-icon icon-sousuo iconfont"></Text>
-                    <Input className="search-input" placeholder="输入你想查询的楼盘"></Input>
+                    <Image className="search-icon" src={require('@assets/search.png')} />
+                    <Input className="search-input" placeholder-style="color:#fff" placeholder="输入你想查询的楼盘"></Input>
                   </View>
                   <View className="location" onClick={this.handleLocationClick}>
-                    <Text className="location-icon iconfont icon-daohangdizhi"></Text>
+                    <Image className="location-icon" src={require('@assets/map.png')} />
                     <Text className="location-text">{curCity.id ? curCity.name : '正在定位'}</Text>
                   </View>
                 </View>

src/pages/project/index.scss

@@ -24,25 +24,24 @@
   .location {
     @extend .flex;
     justify-content: center;
-    padding: 13px 14px;
-    background:rgba(161,161,161,0.2);
+    padding: 0 12px;
+    background:rgba(0,0,0,0.2);
     border-radius:12px;
+    height: 60px;
+    line-height: 60px;
     
-  
     &-text {
       font-size: 25px;
       padding-left: 13px;
-      color: rgba(255, 255, 255, 1);
+      color: #fff;
       @include text-ellipsis; 
       width: 100px;
+      text-align: center;
     }
   
     &-icon {
-      color: rgb(209, 204, 204);
-      font-size: 16px;
-      font-weight: bold;
-      display: block;
-      margin-top: 10px;
+      width: 14px;
+      height: 20px;
       animation: bigger 1s ease 3 both;
     }
   }
@@ -50,7 +49,8 @@
   .search {
 
     height: 60px;
-    background:rgba(161,161,161,0.2);
+    line-height: 60px;
+    background:rgba(0,0,0,0.2);
     -webkit-box-pack: start;
     -webkit-justify-content: flex-start;
     -ms-flex-pack: start;
@@ -60,17 +60,15 @@
     width: 440px;
   
     &-icon {
-      font-size: 24px;
-      color: rgb(209, 204, 204);
-      font-weight: bold;
-      margin: 0 10px 0 10px;
+    width: 26px;
+    height: 26px;
+    margin: 0 16px 0 20px ;
     }
-  
     &-input {
       font-size: 24px;
-      line-height: 60px;
-      color: #A2A2A2;
+      color: #fff;
     }
+
   }
 }
 

src/pages/shop/index.js

@@ -50,35 +50,6 @@ export default class Shop extends Component {
     Taro.hideLoading()
   }
 
-  // loadUserInfo() {
-  //   queryUserInfo().then(user => {
-  //     this.setState({
-  //       user
-  //     })
-  //   })
-  // }
-
-
-  //loadCity(){
-  //  const {cityName}=this.state
-  //  if(!cityName){
-  //    const lat=Taro.getStorageSync('lat')
-  //    const lon=Taro.getStorageSync('lon')
-  //    const params={
-  //      lat,
-  //      lon
-  //    }
-  //    const payload=params
-  //    this.props.dispatchPointsAddress(payload).then(res => {
-  //      const city=res.cityName
-  //      this.setState({
-  //        cityName:city
-  //      })
-  //    })
-  //  }
-  //}
-
-
   loadBannerList() {
     const payload = {
       showPosition: 'mall'
@@ -90,15 +61,6 @@ export default class Shop extends Component {
     })
   }
 
-  // onSearch(val) {
-  //   // App.zhuge.track('搜索商品', {
-  //   //   '商品名称': val
-  //   // })
-  //   this.setState({
-  //     keywords: val,
-  //   }, this.loadList)
-  // }
-
   loadList() {
 
     Taro.showLoading()
@@ -107,26 +69,31 @@ export default class Shop extends Component {
       pageSize: '9999',
       buildingId: this.state.goodsBuilding[0].buildingId
     }
+
     console.log(params, "params")
     getGoodsList(params).then(res => {
       this.setState({
         goodsList: res.records || []
       })
       Taro.hideLoading()
+    }).catch(err => {
+      console.error(err)
+      Taro.hideLoading()
     })
   }
+
   loadGoodsBuilding() {
     getGoodsBuilding().then(res => {
-
       res.map(item => {
         item.title = item.buildingName
-
       })
+
       this.setState({
         goodsBuilding: res || []
-
       }, () => {
-        this.loadList()
+        if (res && res.length) {
+          this.loadList()
+        }
       }
       )
     })
@@ -328,11 +295,11 @@ export default class Shop extends Component {
   }
 
   render() {
-    const { person: { phone } } = this.props.userInfo
+    const { person: { phone, tel } } = this.props.userInfo
 
     return (
       <View className='wrap'>
-        {!phone ? this.renderLogin() : this.renderDetail()}
+        {!phone && !tel ? this.renderLogin() : this.renderDetail()}
       </View>
     )
   }

src/pages/toolKit/index.js

@@ -10,7 +10,7 @@ export default class Index extends Component {
 		selector: ['10%', '20%', '30%', '40%', '50%', '60%', '70%', '80%', '90%', '100%'],
 		selectorChecked: '10%',
 		firstPay: 0,
-		rateList: ['基准利率(4.85%)', '基准利率7折(3.395%)', '基准利率75折(‭3.6375‬%)', '基准利率8折(3.88%)', '基准利率85折(4.1225%)', '基准利率9折(4.365%)', '基准利率95折(4.6075%)', '基准利率1.05倍(5.0925%)', '基准利率1.1倍(5.335%)', '基准利率1.2倍(5.82%)', '基准利率1.3倍(6.305%)'],
+		rateList: ['基准利率(4.85%)', '基准利率7折(3.40%)', '基准利率75折(3.64%)', '基准利率8折(3.88%)', '基准利率85折(4.12%)', '基准利率9折(4.37%)', '基准利率95折(4.61%)', '基准利率1.05倍(5.09%)', '基准利率1.1倍(5.33%)', '基准利率1.2倍(5.82%)', '基准利率1.3倍(6.31%)'],
 		rate: '基准利率(4.85%)',
 		accumulationRateList: ['基准利率(3.25%)', '基准利率1.1倍(3.58%)', '基准利率1.2倍(3.90%)', '基准利率1.3倍(4.23%)'],
 		accumulationRate: '基准利率(3.25%)',
@@ -177,11 +177,10 @@ export default class Index extends Component {
     }
 
     
-		
-		var rate = (this.state.rate.slice(-6, -2)) / 100
+		var rate = (((this.state.rate).match(/\((.*)\%/))[1])/100
 		//			var lixi=calcute.singleDk(1,this.state.accumulation,this.state.time2,rate)
 
-    var shuju2 = this.state.shangPay + ',' + this.state.time1 + ',' + rate  //商贷数据
+    	var shuju2 = this.state.shangPay + ',' + this.state.time1 + ',' + rate  //商贷数据
 
 		console.log(shuju1 + '=' + shuju2)
 		

src/reducers/user.js

@@ -41,7 +41,7 @@ export default function user(state = INITIAL_STATE, action) {
     // }
     case UPDATE_USER_INFO: {
       const { person, extraInfo } = state.userInfo
-      debugger
+      // debugger
       return {
         ...state,
         userInfo: {

src/utils/request.js

@@ -87,7 +87,7 @@ export const uploadFiles = async (files) => {
         },
         name: 'file',
         success: function (res) {
-          debugger
+          // debugger
           const _data = JSON.parse(res.data)
           if (_data.code !== CODE_SUCCESS) {
             reject(new Error(_data.message))