jinx 4 лет назад
Родитель
Сommit
ed59d83241

+ 3 - 3
apps/RealtorEasier/components/detail-components/detail-scroll/detail-scroll.wxml

@@ -58,14 +58,14 @@
                 <text class="value" wx:if="{{item.name=='buildingArea' ||item.name=='floorSpace' }}">平方英尺</text>
             </view>
         </view>
-        <view class="vr-tip" wx:if="{{!isAgency && house.vrLink}}">
+        <!-- <view class="vr-tip" wx:if="{{!isAgency && house.vrLink}}">
             <view class="vr-tip-logo"></view>
             <view class="vr-tip-right">
                 <view class="vr-tip-title">语音云带看</view>
                 <view class="vr-tip-intro">在线语音带看,足不出户看实况</view>
                 <view class="vr-tip-btn" bind:tap="onlineWatch">线上带看</view>
             </view>
-        </view>
+        </view> -->
     </view>
     <view class="location-info padding-container">
         <view class="location-text-info">
@@ -87,7 +87,7 @@
         </map>
         <view class="cover" bindtap="toMap"></view> -->
         <view class="detail-map">
-            <image mode="aspectFill" lazy-load="true" :src="{{house.addres_images}}"></image>
+            <image mode="aspectFill" lazy-load="true" src="{{house.addres_images}}"></image>
         </view>
     </view>
 

+ 1 - 1
apps/RealtorEasier/pages/agent-detail/agent-detail.wxml

@@ -39,7 +39,7 @@
   </view>
 
   <view class="house-list">
-    <view class="main-title">推荐房源(5)</view>
+    <view class="main-title">推荐房源({{house_list.length}})</view>
     <house-item wx:for="{{house_list}}" house="{{item}}" wx:key="index" />
   </view>
 </scroll-view>

+ 3 - 0
apps/RealtorEasier/pages/city/city.js

@@ -210,12 +210,14 @@ Page({
     } = e.currentTarget.dataset
     // app.globalData.city = city.replace('市', '')
     app.globalData.city = city
+
     this.set_historyCity(city)
     wx.navigateBack()
   },
   selectLocation() {
     // app.globalData.city = '珠海'
     app.globalData.city = this.data.city
+    this.set_historyCity(this.data.city)
     wx.navigateBack()
   },
   /**
@@ -304,6 +306,7 @@ Page({
 
   },
   set_historyCity(city) {
+    console.log(city)
     if (!app.globalData.historyCity.includes(city)) {
       app.globalData.historyCity.push(city)
       saveHistoryCity(app.globalData.historyCity)

+ 2 - 1
apps/RealtorEasier/pages/login/login.wxml

@@ -4,7 +4,8 @@
 
   </view>
   <view class='login_text'>
-    <image src='{{login_logo}}'></image>
+    <!-- <image src='{{login_logo}}'></image> -->
+    <image src='/image/4Dage/about/logo.png'></image>
     <view>美房理</view>
     <view>看房大平台,在线云带看,足不出户看实况让您的房产交易更便捷</view>
   </view>

+ 2 - 1
apps/RealtorEasier/pages/web/web.js

@@ -47,7 +47,7 @@ Page({
     this.setData({
       socketOpts: opts,
       url: `${vr_link}&room_id=${opts.roomId}${options.is_auto? `&vr=1` : ''}`,
-      // url: `http://192.168.0.77:8080/realtor-easier.html?m=t-LloMBfU&appname=realtor-easier&role=customer&room_id=10507db19f478ed5f551621558258956&user_id=10021912303a282f2a41620886147753&room_id=10507db19f478ed5f551621558258956`,
+      // url: `http://192.168.0.77:8080/realtor-easier.html?m=t-lB3Dg4N&appname=realtor-easier&room_id=10508354bb8bbe62ad21624264392186&room_id=10508354bb8bbe62ad21624264392186&vr=1&role=customer&user_id=100269d2526bdb38c9d1623317318008`,
       room_id: opts.roomId,
       house_id: options.house_id || '',
       vr_link: vr_link,
@@ -179,6 +179,7 @@ Page({
     e.detail.wx_code = this.code
     e.detail.user_id = getApp().globalData.userinfo.user_id
     e.detail.agency_user_id = this.agency.agency_user_id
+    
     UserApi.delegation(e.detail).then(res => {
       console.log(res, res.code == 0, 'res')
       if (res.code == 0) {

+ 1 - 1
apps/RealtorEasier/pages/web/web.wxml

@@ -1,5 +1,5 @@
 <view class="web-w">
-<web-view src="{{url}}"></web-view>   
+<web-view class="web-view" src="{{url}}"></web-view>   
 
 <trtc-room id="trtcroom" config="{{trtcConfig}}"></trtc-room>
 

+ 2 - 1
apps/RealtorEasier/utils/login.js

@@ -191,8 +191,9 @@ export default function Login(phone_data, code, isAgency) {
 export async function loginByUserInfo() {
   // wx.showLoading('登录中')
   let UserProfile = await getUserProfile()
+  let code = await wxLogin()
   return new Promise(async (resolve, reject) => {
-    let code = await wxLogin()
+ 
     wx.getUserInfo({
       withCredentials: true,
       success(res) {

+ 3 - 3
apps/agent/components/detail-components/detail-scroll/detail-scroll.wxml

@@ -58,14 +58,14 @@
                 <text class="value" wx:if="{{item.name=='buildingArea' ||item.name=='floorSpace' }}">平方英尺</text>
             </view>
         </view>
-        <view class="vr-tip" wx:if="{{!isAgency && house.vrLink}}">
+        <!-- <view class="vr-tip" wx:if="{{!isAgency && house.vrLink}}">
             <view class="vr-tip-logo"></view>
             <view class="vr-tip-right">
                 <view class="vr-tip-title">语音云带看</view>
                 <view class="vr-tip-intro">在线语音带看,足不出户看实况</view>
                 <view class="vr-tip-btn" bind:tap="onlineWatch">线上带看</view>
             </view>
-        </view>
+        </view> -->
     </view>
     <view class="location-info padding-container">
         <view class="location-text-info">
@@ -87,7 +87,7 @@
         </map>
         <view class="cover" bindtap="toMap"></view> -->
         <view class="detail-map">
-            <image mode="aspectFill" lazy-load="true" :src="{{house.addres_images}}"></image>
+            <image mode="aspectFill" lazy-load="true" src="{{house.addres_images}}"></image>
         </view>
     </view>
 

+ 2 - 1
apps/agent/pages/login/login.wxml

@@ -4,7 +4,8 @@
 
   </view>
   <view class='login_text'>
-    <image src='{{login_logo}}'></image>
+    <!-- <image src='{{login_logo}}'></image> -->
+    <image src='/image/4Dage/about/logo.png'></image>
     <view>RealtorEasier</view>
     <view>RealtorEasier是一个为海外房产经纪人提供一站式服务的平台,服务包括但不只Signs,3D Visual,Staging,Cleaning,Hauling……总公司FALCON GROUP在洛杉矶已经拥有了三十年的服务口碑。</view>
   </view>

+ 6 - 1
apps/agent/utils/login.js

@@ -148,15 +148,19 @@ export  function Login(phone_data, code, isAgency) {
 export async function loginByUserInfo () {
   // wx.showLoading('登录中')
   let UserProfile  = await getUserProfile()
+  let code = await wxLogin()
+  console.log('************')
+  console.log(UserProfile)
   return new Promise(async (resolve, reject) => {
-    let code = await wxLogin()
     wx.getUserInfo({
       withCredentials: true,
       success (res) {
         res.wx_code = code
         res.userInfo = UserProfile.userInfo
+     
         UserApi.loginByUserInfo(res).then(loginRes => {
           const data = loginRes.data
+          console.log(data)
           data.user = data.user || data.agency
           UserProfile.userInfo.user_id = data.user.user_id || data.user.agency_user_id
           saveToken(data.token)
@@ -164,6 +168,7 @@ export async function loginByUserInfo () {
           UserProfile.userInfo.name = UserProfile.userInfo.name || UserProfile.userInfo.nickName
           UserProfile.userInfo.avatar = UserProfile.userInfo.avatar || UserProfile.userInfo.avatarUrl
           getApp().globalData.userinfo =UserProfile.userInfo
+          getApp().globalData.userinfo.agency_user_id =data.agency.agency_user_id
           saveUserInfo(UserProfile.userInfo)
           EventEmitter.emit('login')
           wx.hideLoading()