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

config/dev.js

@@ -5,13 +5,13 @@ module.exports = {
   defineConstants: {
     // 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://192.168.2.52:8080"',
-    // WSS_HOST: '"ws://192.168.2.52:8080"',
-    Version:'V3.5.2.2_12121'
+    HOST: '"https://dev.jinchengjiaye.com"',//测试
+    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
+    // HOST: '"https://lt.pawoma.cn"',
+    // WSS_HOST: '"wss://lt.pawoma.cn"',
+    // HOST: '"http://192.168.2.51:8080"',
+    // WSS_HOST: '"ws://192.168.2.51:8080"',
+    Version: 'V3.5.2.2_12122'
   },
   weapp: {},
   h5: {}

config/prod.js

@@ -5,10 +5,10 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://192.168.0.218:8080"',
     // WSS_HOST: '"ws://192.168.0.218:8080"',
-    // HOST: '"https://dev.jinchengjiaye.com"',//测试
-    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
-    HOST: '"https://lt.pawoma.cn"',
-    WSS_HOST: '"wss://lt.pawoma.cn"',
+    HOST: '"https://dev.jinchengjiaye.com"',//测试
+    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
+    // HOST: '"https://lt.pawoma.cn"',
+    // WSS_HOST: '"wss://lt.pawoma.cn"',
     Version:'V3.5.2.2_2019-12-12'
   },
   weapp: {},

project.config.json

@@ -1,8 +1,8 @@
 {
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
-	"description": "知与行互动",
-	"appid": "wxd6f47a9bb3052175",
+	"description": "知与行联调",
+	"appid": "wxd9ee3a9480a4e544",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/app.js

@@ -134,7 +134,7 @@ class App extends Component {
         },
         {
           pagePath: "pages/activity/activity",
-          text: "活动",
+          text: "活动资讯",
           iconPath: './assets/tabbar/activity1.png',
           selectedIconPath: './assets/tabbar/activity2.png',
         },

src/app.scss

@@ -58,4 +58,7 @@
       color: #666;
     }
   }
+}
+.wxParse-inline {
+  line-height: 50px;
 }

src/pages/activity/detail/index.js

@@ -373,8 +373,10 @@ export default class Detail extends Component {
                   </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 >{detail.desc}</View> */}
+                    <richText nodes={detail.desc} ></richText>
+                    {/* <import src='../../../components/wxParse/wxParse.wxml' />
+                    <template is='wxParse' data='{{wxParseData:article.nodes}}' /> */}
                   </View>
                   <View style="color:#999;font-size:15px;margin:0 auto 90px auto;text-align:center">已经到底了~</View>
 

src/pages/person/accessRecord.js

@@ -7,6 +7,7 @@ import { savePoint, updatePoint } from '@services/common'
 import dayjs from 'dayjs';
 
 @connect(state => state.user)
+
 export default class Person extends Component {
   config = {
     navigationBarTitleText: '访客信息'

src/pages/person/index.js

@@ -10,6 +10,7 @@ import * as actions from '@actions/user'
 import Authorize from '@components/authorize'
 import { transferImage } from '@utils/tools'
 import { menus } from './menus'
+import login from '@utils/login'
 export const version = Version
 
 @connect(({ user, city }) => ({ user, city }), { ...actions })
@@ -36,7 +37,6 @@ export default class Person extends Component {
   }
 
   loadUserInfo () {
-
     queryUserInfo().then(user => {
       const [roleSetting, roleName] = this.getRoleName(user.personType)
 
@@ -83,7 +83,6 @@ export default class Person extends Component {
       url: '/pages/shop/index'
     })
   }
-
   redirectTo = (url) => {
     if (url) {
       if (typeof url === 'function') {
@@ -94,8 +93,21 @@ export default class Person extends Component {
     }
     else {
       putRegisterConsultant().then(res => {
+        Taro.showToast({
+          title: "匹配成功",
+          icon: "none",
+          duration: 3000
+        })
         Taro.setStorageSync('userId',res.userId)
-        this.loadUserInfo()
+        const  payload={
+          path:'',
+          scene:''
+        }
+
+        login(payload, res => {
+          this.loadUserInfo()
+        })
+
 
         // this.setState({
         //   consultant:true,

src/pages/person/login/index.js

@@ -33,7 +33,7 @@ export default class Index extends Component {
     const {isClick}=this.state
     const Phone=this.state.tel
 
-    if (!(/^1[3|4|5|7|8|9][0-9]\d{4,8}$/.test(Phone)) || Phone.length != 11) {
+    if (!(/^1[3|4|5|6|7|8|9][0-9]\d{4,8}$/.test(Phone)) || Phone.length != 11) {
         Taro.showToast({
           title: '输入的手机号格式不对，请重新输入',
           icon: 'none'

src/pages/person/personDetail/editDetail/index.js

@@ -89,7 +89,7 @@ export default class editDetail extends Component {
       this.Alert('请输入电话号码')
       return;
     }
-    if (!(/^1[3|4|5|7|8|9][0-9]\d{4,8}$/.test(this.state.phone)) || this.state.phone.length != 11) {
+    if (!(/^1[3|4|5|6|7|8|9][0-9]\d{4,8}$/.test(this.state.phone)) || this.state.phone.length != 11) {
       this.Alert('请输入正确的手机号码');
       return false;
     }

src/pages/person/personDetail/editDetail/index.scss

@@ -13,12 +13,8 @@
       margin-top: 40px;
       margin-bottom: 32px;
     }
-    // edit-name
 
-    // edit-phone
-
-    // edit-name
-    Input,.selector{
+  Input,.selector{
       height: 80px;
       line-height: 80px;
     }
@@ -26,7 +22,7 @@
   .comfire{
     width:680px;
     height:90px;
-    background:rgba(255,71,64,1);
+    background:$primary-color;
     border-radius:14px;
     margin: 0 auto;
     text-align: center;

src/pages/project/detail/index.js

@@ -692,14 +692,14 @@ export default class Index extends Component {
     }
 
     return (
-      <Block>
+      <View style="margin-bottom:-5px">
         <View className="section circum">
           <View className="section-head">
             <Text className="section-head__title">位置及周边配套</Text>
           </View>
         </View>
         <Around building={building} onAction={this.openMap.bind(this)}></Around>
-      </Block>
+      </View>
     )
   }
 
@@ -887,10 +887,7 @@ export default class Index extends Component {
     )
   }
   renderActivities() {
-
-
     const { activityList } = this.state
-
     return (
       <Block>
         {
@@ -914,10 +911,8 @@ export default class Index extends Component {
                   onClick={this.handActivityItemClick}
                 >
                 </HelpGroupBanner>
-
               </View>
             </View>
-
           )
         }
       </Block>
@@ -1002,8 +997,6 @@ export default class Index extends Component {
   //     videoPlayShow: 'flex'e.detail
   //   })
   // }
-
-
   renderVideo() {
     const { videoPlayShow } = this.state
     const { projectDetail } = this.props
@@ -1193,41 +1186,30 @@ export default class Index extends Component {
                   </View>
                   {/* 项目顾问 */}
                   {this.renderConsuler()}
-
                   {/* 周边 */}
                   {this.rendercircum()}
-
                   {/* 户型介绍 */}
                   {this.renderHouseTypeList()}
-
                   {/* 助力活动 */}
                   {this.renderHelp()}
-
                   {/* 拼团活动 */}
                   {this.renderGroup()}
-
                   {/* 新鲜资讯 */}
                   {this.renderNews()}
-
                   {/* 热门活动 */}
                   {this.renderActivities()}
-
                   {/* 相册 */}
                   {this.renderPhotoAlbum()}
-
                   {/* 免责声明 */}
                   {this.renderStatement()}
                 </View>
               </ScrollView>
-
               {/* 生成海报 */}
               {
                 posterStatus && (<Poster data={posterData} toggle={this.togglePosterStatus}></Poster>)
               }
-
               {/* 底部菜单 */}
               {this.renderBottomMenu()}
-
               {/* <View className="tel-entrance" onClick={this.makePhoneCall}>
                 <Text className="iconfont icon-dianhua2"></Text>
                 <Text className="text">电话</Text>

src/pages/project/detail/index.scss

@@ -860,10 +860,11 @@
 
   .house-type__title {
     width: 100%;
-    font-size: 35px;
+    font-size: 40px;
     color: #000;
     font-weight: bold;
-    height: 76px;
+    height: 86px;
+    margin-top: 10px;
   }
 
   .house-type__list {
@@ -968,7 +969,7 @@
 
   .photos__type__title {
     width: 100%;
-    font-size: 35px;
+    font-size: 40px;
     color: #000;
     font-weight: bold;
     height: 76px;
@@ -1066,17 +1067,14 @@
 
   &__item {
     flex: 1 0 auto;
-
     font-size: 32px;
     color: #666;
     line-height: 44px;
     padding: 4px 0;
-
     &.active {
       color: #BB9C79;
       border-bottom: 1px solid #C8B299;
     }
-
     &+& {
       margin-left: 64px;
     }

src/pages/project/h5Page.js

@@ -7,6 +7,7 @@ import ready from '@utils/ready'
 import { reportClient } from '@services/report'
 import { connect } from '@tarojs/redux'
 import { ROLE_CODE } from '@constants/user'
+import { getQrCodeParams } from '@utils/qrcode'
 import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
 const bgImg = require('@assets/helpgroup/bg.png')
 
@@ -55,6 +56,7 @@ export default class Index extends Component {
   onShareAppMessage = () => {
     const { pageInfo } = this.state
     const currentPage = this.currentPageAndParams().join('?')
+    console.log(currentPage)
     return {
       title: pageInfo.shareTitle,
       path: currentPage,
@@ -114,7 +116,7 @@ export default class Index extends Component {
       console.log(router, "router")
       const hFiveId = this.$router.params.id || router.query.id || ""
       console.log(hFiveId, "hFiveId")
-      // h5id 、第一个分享人ID、置业顾问ID、分享人ID 
+      // h5id 、第一个分享人ID、置业顾问ID、分享人ID
       getHFiveDetail(hFiveId).then(res => {
         Taro.hideLoading()
         if (res.status == 1) {
@@ -241,12 +243,13 @@ export default class Index extends Component {
   }
   // 报备客户
   reportClient() {
+
     const router = Taro.getStorageSync('router')
     const consultant = this.$router.params.consultant || router.query.consultant || ""
     const {
       userInfo: { person: { phone, tel, userId } }
     } = this.props
-
+    // debugger
     if (consultant && consultant != userId) {
       const realPhone = phone || tel
       const payload = {
@@ -254,13 +257,12 @@ export default class Index extends Component {
         phone: realPhone,
         showToast: false
       }
+
       reportClient(payload).then(res => {
         console.log('恭喜您绑定成功')
+      }).catch(err => {
+        console.error(err)
       })
-      // .catch(err => {
-      //   console.error(err)
-
-      // })
     }
   }
 
@@ -288,9 +290,11 @@ export default class Index extends Component {
   render() {
     const { pageInfo, webViewVisible, codeParams } = this.state
     const { userInfo: { person } } = this.props
+    const consultant = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
     const webUrlParams = [
       `personId=${person.personId}`,
       `h5id=${this.$router.params.id}`,
+      `consultant=${consultant}`,
       `codeParams=${encodeURIComponent(codeParams)}`,
     ].join('&')
 

src/pages/project/index.js

@@ -37,8 +37,7 @@ export default class Index extends Component {
     loaded: false,
     maskBanner: '',
     // shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/cff400dab32e9230f6bf7498b8291d7.jpg',
-    // shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg',
-    shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1576128320527-d9287eea5fb1bab389601ed1d31cf70.jpg', // 融创
+    shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg',
     // shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1565358322510-share.jpg',
     // adImage: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/f58480ff83787b64235b729bca5d805.jpg',
     bannerList: [],
@@ -82,6 +81,7 @@ export default class Index extends Component {
     })
   }
   componentDidShow() {
+<<<<<<< HEAD
     Taro.showTabBar({
       animation: false
     })
@@ -89,14 +89,25 @@ export default class Index extends Component {
       ready.queue(() => {
         // debugger
         this.loadData()
+=======
+    if (Taro.getStorageSync('firstLoading') != '8') {
+      Taro.showTabBar({
+        animation: false
+>>>>>>> 931b162337bc2aed1029d4f6257d9a1807a6e7ef
       })
+      if (this.props.curCity.id) {
+        ready.queue(() => {
+          // debugger
+          this.loadData()
+        })
+      }
+      Taro.setStorageSync('firstLoading', '6')
     }
   }
 
   componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
-
   }
 
   getLocation() {
@@ -176,7 +187,6 @@ export default class Index extends Component {
       const banner = res[0]
 
       const maskVisible = banner && this.props.screenShow !== (banner || {}).contentId
-      // debugger
       if (maskVisible) {
         Taro.hideTabBar({
           animation: true
@@ -187,8 +197,12 @@ export default class Index extends Component {
         maskVisible,
         maskBanner: banner || {}
       }, () => {
+
+
         const { dispatch } = getStore()
         dispatch({ type: SET_SCREEN_SHOWED, payload: (banner || {}).contentId })
+
+
       })
     })
   }
@@ -702,4 +716,4 @@ export default class Index extends Component {
       </Block>
     )
   }
-}
+}

src/pages/report/detail/index.js

@@ -163,7 +163,7 @@ export default class ReportDetail extends Component {
       this.Alert("请输入客户电话");
       return false;
     }
-    if (!(/^1[3|4|5|7|8|9][0-9]\d{4,8}$/.test(phone)) || phone.length != 11) {
+    if (!(/^1[3|4|5|6|7|8|9][0-9]\d{4,8}$/.test(phone)) || phone.length != 11) {
       this.Alert('请输入正确的手机号码');
       return false;
     }

src/pages/shop/index.js

@@ -143,9 +143,9 @@ export default class Shop extends Component {
   }
 
   goPointRecords() {
-    const { person: { points } } = this.props.userInfo
+    // const { person: { points } } = this.props.userInfo
     Taro.navigateTo({
-      url: `/pages/shop/integralDetail/index?points=` + points
+      url: `/pages/shop/integralDetail/index?points=` + this.state.points
     })
   }
 
@@ -358,7 +358,7 @@ export default class Shop extends Component {
               <View className='user__left__name'>{person.nickname}</View>
               {
                 user.havaSigned ?
-                  (<View className="qiandao__btn">已签到</View>) :
+                  (<View className="reday-qiandao-btn">已签到</View>) :
                   (<View className="qiandao__btn" onClick={this.doSign}>签到</View>)
               }
               <View className='message'>

src/pages/shop/index.scss

@@ -70,6 +70,16 @@
         border-radius: 12px;
         color: #fff;
       }
+      .reday-qiandao-btn{
+        padding: 6px 18px;
+        font-size: 28px;
+        color: #fff;
+        position: absolute;
+        top:64px;
+        right:70px;
+        background-color: #DADADA;
+        border-radius: 12px;
+      }
       .message{
         width: 100%;
         display: flex;

src/utils/login.js

@@ -46,6 +46,8 @@ export default function (payload, callback) {
           ]
 
           if (noAuthPages.indexOf(path) === -1 || !sceneInShare(scene)) {
+
+            Taro.setStorageSync('firstLoading', '8')
             Taro.reLaunch({
               url: '/pages/auth/index'
             })
@@ -58,4 +60,4 @@ export default function (payload, callback) {
       })
     }
   })
-}
+}

src/utils/request.js

@@ -27,7 +27,9 @@ export const setStorage = function (key, data) {
  * @param {*} options
  */
 export const fetch = async (options) => {
-  const { url, payload, method = 'GET', showToast = true, autoLogin = true } = options
+  const { url, payload = {}, method = 'GET', showToast = true, autoLogin = true } = options
+  const showMessage = Object.prototype.hasOwnProperty.call(payload, 'showToast') ? payload.showToast : showToast
+  // debugger
   return Taro.request({
     url,
     method,
@@ -44,7 +46,6 @@ export const fetch = async (options) => {
         title: "请检查网络",
         icon: 'none'
       })
-
       console.error(res)
       throw new Error('请检查网络')
     }
@@ -63,14 +64,14 @@ export const fetch = async (options) => {
           })
         })
       } else {
-        if (showToast) {
+        if (showMessage) {
           Taro.showToast({
             title: defaultMsg,
             icon: 'none'
           })
         }
       }
-      if (showToast) {
+      if (showMessage) {
 
         Taro.showToast({
           title: message,
@@ -91,11 +92,13 @@ export const fetch = async (options) => {
     if (err.message) {
       errMessage = err.message
     }
+    if (showMessage) {
 
-    Taro.showToast({
-      title: errMessage,
-      icon: 'none'
-    })
+      Taro.showToast({
+        title: errMessage,
+        icon: 'none'
+      })
+    }
 
     throw new Error(errMessage)
   })