Merge branch 'master' of http://git.homecommunity.cn/supervip/WechatOwnerService

pages/complaint/complaint.vue

@@ -61,6 +61,7 @@
 <script>
 	// pages/enterCommunity/enterCommunity.js
 	import * as TanslateImage from '../../utils/translate-image.js';
+	import {checkPhoneNumber} from '../../utils/StringUtil.js'
 	const context = require("../../context/Java110Context.js");
 	const constant = context.constant;
 	const factory = context.factory;
@@ -236,6 +237,8 @@
 					msg = "请填写投诉人";
 				} else if (obj.tel == "") {
 					msg = "请填写手机号";
+				} else if (!checkPhoneNumber(obj.tel)) {
+					msg = "手机号有误";
 				} else if (obj.context == "") {
 					msg = "请填写投诉内容";
 				}

pages/complaintList/complaintList.vue

@@ -173,7 +173,11 @@
 			 */
 			_loadCompaint: function(_active) {
 				let that = this;
-
+				
+				if(!that.communityId || !that.roomId){
+					return;
+				}
+				
 				let _state = '';
 				if (_active == 0) {
 					_state = '10001';

pages/index/index.vue

@@ -73,7 +73,7 @@
 					</view>
 				</view>
 				<view class="padding-xl">
-					您确认拨打{{property.name}}-{{property.tel}}
+					您确认拨打,{{property.communityName}}物业客服电话<br />{{property.sCommunityTel}}
 				</view>
 				<view class="cu-bar bg-white justify-end">
 					<view class="action margin-0 flex-sub  solid-left" @tap="_cancleCall()">取消</view>
@@ -261,24 +261,32 @@
 					return;
 				}
 				//查询物业信息
-				getProperty()
-				.then(function(_propertyInfo){
-					_that.property = _propertyInfo;
-					_that.callPropertyModal = true;
-				})
-				.then(function(res){
-					uni.showToast({
-						title: res,
-						icon: 'none',
-						duration: 2000
-					});
-				})
+				// getProperty()
+				// .then(function(_propertyInfo){
+				// 	_that.property = _propertyInfo;
+				// 	_that.callPropertyModal = true;
+				// })
+				uni.getStorage({
+					key: 'ownerInfo',
+					success: function (res) {
+						console.log(res.data);
+						_that.property = res.data;
+						_that.callPropertyModal = true;
+					}
+				});
+				// .then(function(res){
+				// 	uni.showToast({
+				// 		title: res,
+				// 		icon: 'none',
+				// 		duration: 2000
+				// 	});
+				// })
 			},
 			_doCall: function() {
 				let _that = this;
 				uni.makePhoneCall({
 					// 手机号
-					phoneNumber: _that.property.tel,
+					phoneNumber: _that.property.sCommunityTel,
 					// 成功回调
 					success: (res) => {
 						console.log('调用成功!')

pages/questionAnswer/questionAnswer.vue

@@ -49,6 +49,9 @@
 		onLoad: function(options) {
 			let that = this;
 			context.onLoad(options);
+		},
+		onShow: function() {
+			let that = this;
 			that.communityId = context.getUserInfo().communityId;
 			that.userId = context.getUserInfo().userId;
 			
@@ -76,9 +79,6 @@
 				that.questions = _data.data;
 			})
 		},
-		onShow: function() {
-			let that = this;
-		},
 		methods: {
 			gotoDetail: function(_question) {
 				if(_question.state == '0'){

pages/questionAnswerDetail/questionAnswerDetail.vue

@@ -18,6 +18,11 @@
 						:checked="item.radio[valueIndex].checked?true:false" :value="valueItem.valueId"></checkbox>
 				</view>
 			</checkbox-group>
+			<view v-else>
+				<view class="cu-form-group ">
+					<textarea maxlength="512" v-model="item.radio" placeholder="请回答"></textarea>
+				</view>
+			</view>
 		</view>
 
 

pages/settings/settings.vue

@@ -86,6 +86,7 @@
 
 <script>
 	const context = require("../../context/Java110Context.js");
+	import * as TanslateImage from '../../utils/translate-image.js';
 	const constant = context.constant;
 	const factory = context.factory;
 	export default {
@@ -115,7 +116,7 @@
 				var _that = this;
 				wx.chooseImage({
 					count: 1,
-					sizeType: ['original', 'compressed'],
+					sizeType: ['compressed'],
 					sourceType: ['album', 'camera'],
 					success: function(res) {
 						// console.log(res)
@@ -127,11 +128,20 @@
 						});
 						var tempFilePaths = res.tempFilePaths
 						console.log('头像地址', tempFilePaths);
+						//#ifdef H5
+						TanslateImage.translate(tempFilePaths, (_baseInfo) => {
+							_that.headerImg = _baseInfo;
+							_that._uploadOwnerHeaderImg();
+							wx.hideLoading()
+						})
+						//#endif
+						//#ifdef MP-WEIXIN
 						factory.base64.urlTobase64(tempFilePaths[0]).then(function(_baseInfo) {
 							_that.headerImg = _baseInfo;
 							_that._uploadOwnerHeaderImg();
 							wx.hideLoading()
 						});
+						//#endif
 					}
 				})
 			},