Merge branch 'master' of http://175.178.51.79:3000/Augcl/houserent-front

# Conflicts:
#	config.js
#	manifest.json
#	pages/login/index.vue
#	pages/user/index.vue

common/config.js

@@ -4,6 +4,4 @@ export default {
 	baseUrl:'https://houserent-admin.hhlm1688.com',
 	// baseUrl:'http://augcl.natapp1.cc',
 	// baseUrl:'http://h5.xzaiyp.top'
-	// baseUrl:'https://houserent-admin.hhlm1688.com'
-	// baseUrl:'http://h5.xzaiyp.top'
 }

config.js

@@ -1,9 +1,11 @@
 import Vue from 'vue'
 import utils from './utils/utils.js'
-// 移除重复的 uvUI 导入和初始化，已在 main.js 中处理
+import uvUI from '@/uni_modules/uv-ui-tools'
+
+Vue.use(uvUI);
 
 // 当前环境
-const type = 'dev'
+const type = 'prod'
 
 
 // 环境配置
@@ -15,8 +17,7 @@ const config = {
 		baseUrl : 'http://augcl.natapp1.cc/employ-api',
 	},
 	prod : {
-		baseUrl : 'https://houserent-admin.hhlm1688.com/employ-api',
-		// baseUrl : 'https://employadmin.augcl.com/employ-api',
+		baseUrl : 'https://employadmin.augcl.com/employ-api',
 	}
 }
 
@@ -24,18 +25,18 @@ const config = {
 // 默认配置
 const defaultConfig = {
 	mapKey : 'XMBBZ-BCPCV-SXPPQ-5Y7MY-PHZXK-YFFVU',
-	aliOss: {
-		url: 'https://image.hhlm1688.com/',
-		config: {
+	aliOss : {
+		url : 'https://image.hhlm1688.com',
+		config : {
 			//桶的地址
-			region: 'oss-cn-guangzhou',
+			region: 'oss-cn-shenzhen',
 			//id
-			accessKeyId: 'LTAI5tQSs47izVy8DLVdwUU9',
+			accessKeyId:'LTAI5tQSs47izVy8DLVdwUU9',
 			//密钥
-			accessKeySecret: 'qHI7C3PaXYZySr84HTToviC71AYlFq',
+			accessKeySecret:'qHI7C3PaXYZySr84HTToviC71AYlFq',
 			//桶的名字
 			bucket: 'hanhaiimage',
-			endpoint: 'oss-cn-shenzhen.aliyuncs.com',
+			endpoint:'oss-cn-shenzhen.aliyuncs.com',
 		}
 	},
 }

pages/auth/index.vue

@@ -12,11 +12,11 @@
 				<image class="se-w-45 se-h-35" src="@/static/image/wechat.png" mode=""></image>
 				<text class="se-ml-10">微信登录</text>
 			</button>
-			<button  @getuserinfo="onLogin" 
-			style="margin-top: 30rpx;background-color: rgba(#0f0, 0.4);color: #0f0;"
+			<view  @click="onJump()" 
+			style="margin-top: 30rpx;color: #666;"
 			class="se-mx-80  se-br-40 se-flex-h-c se-h-80 se-lh-80 se-ta-c se-fs-32">
 				<text class="se-ml-10">取消登录</text>
-			</button>
+			</view>
 			<!-- <view class="se-mx-80 se-br-40 se-mt-40 se-flex-h-c se-h-80 se-lh-80 se-ta-c se-fs-32 se-c-66 se-bgc-f5">
 				<text>手机验证码登录</text>
 			</view> -->
@@ -75,6 +75,11 @@
 			this.userYsObj = this.$utils.getkeyContent('user_ys')
 		},
 		methods: {
+			onJump(){
+				uni.switchTab({
+					url:"/pages/home/index"
+				})
+			},
 			open(){
 				this.$refs.popup.open();
 			},
@@ -128,7 +133,7 @@
 							let userInfo =response.result.userInfo
 							
 							if(!userInfo.nickName
-							|| !userInfo.phone){
+							|| !userInfo.phone || !userInfo.headImage){
 								uni.navigateTo({
 									url:"/pages/login/index"
 								})

pages/login/index.vue

@@ -53,10 +53,10 @@
 			}
 		},
 		onLoad(options) {
+			this.imagUrl = uni.getStorageSync('userInfo').headImage
+			this.nameUser = uni.getStorageSync('userInfo').nickName
+			this.phone = uni.getStorageSync('userInfo').phone
 			if(options.back==1){
-				this.imagUrl = uni.getStorageSync('userInfo').headImage
-				this.nameUser = uni.getStorageSync('userInfo').nickName
-				this.phone = uni.getStorageSync('userInfo').phone
 				this.back = options.back
 			}
 		},
@@ -78,13 +78,11 @@
 						code : detail.code,
 						encryptedData: detail.encryptedData,
 						iv:detail.iv,
-						sessionKey: uni.getStorageSync('sessionKey'),
-						openid:uni.getStorageSync('userInfo').appletOpenid
 					}
 					bindPhone(params).then((response) => {
 						console.info(response)
-						console.info(JSON.parse(response.result).phone_info.phoneNumber)
-						that.phone = JSON.parse(response.result).phone_info.phoneNumber
+						let data = JSON.parse(response.result)
+						that.phone = data.phone_info.phoneNumber
 					}).catch(error=>{
 						
 					})

pages/tourGuide/tourGuide.vue

@@ -237,7 +237,7 @@ export default {
             this.$refs.dropDown.init();
         }
     },
-    created() {
+    mounted() {
         this.getCurrentLocation()
         this.onHouseType() // 获取房源类型
         //this.getUserInfo() // 获取用户信息

pages_subpack/detail/index.vue

@@ -13,8 +13,6 @@
 				</view>
 			</view>
 			<view class="se-pr-30 se-flex se-flex-v-c">
-				
-				
 				<button style="justify-content: center;" class="se-w-140 se-flex se-flex-ai-c se-h-60 se-lh-60 se-fs-22 se-bgc-green se-c-white se-py-0 se-br-30 se-px-20 se-m-0" open-type="share">
 					<uv-icon name="share" color="#fff"></uv-icon>
 					<text class="se-fs-20 se-pl-5">分享</text>

pages_subpack/house/index.vue

@@ -880,13 +880,13 @@
 						image:that.form.ownershipList.map(item => item.url).join(','),//图片
 						iconImage:"",//左上角图标
 						homeImage:that.form.houseList.map(item => item.url).join(','),//产权证照片
-						homeMp4:that.form.mp4List.map(item => item.url).join(','),//视频
+						homeMp4:that.form.mp4List ? that.form.mp4List.map(item => item.url).join(',') : "",//视频
 						latitude:that.form.latitude,
 						longitude:that.form.longitude
 					}
 					
-					console.log(that.form);
-					console.log(params);
+					// console.log(that.form);
+					// console.log(params);
 						
 					if(this.$utils.verificationAll(params, {
 						image : '请上传房屋照片',

util/request/responseInterceptors.js

@@ -21,9 +21,18 @@ export const responseInterceptors = (vm) => {
 			return Promise.reject(data)
 		}
         
-    }, (response) => { /*  对响应错误做点什么 （statusCode !== 200）*/
-	
-		console.info('interceptors.response---------',data)
-        return Promise.reject(response)
+    }, (response) => {
+		const data = response.data
+		console.info('responseresponse',data)
+		if(data.code === 401){
+			uni.removeStorageSync('token')
+			uni.removeStorageSync('userInfo')
+			uni.removeStorageSync('sessionKey')
+			uni.navigateTo({
+				url:"/pages/auth/index"
+			})
+			return;
+		}
+		return Promise.reject(response)
     })
 }