Merge remote-tracking branch 'origin/xinghong-dev'

This commit is contained in:
java110 2021-05-24 09:47:43 +08:00
commit 0bd80bef73
3 changed files with 30 additions and 15 deletions

View File

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

View File

@ -174,6 +174,10 @@
_loadCompaint: function(_active) { _loadCompaint: function(_active) {
let that = this; let that = this;
if(!that.communityId || !that.roomId){
return;
}
let _state = ''; let _state = '';
if (_active == 0) { if (_active == 0) {
_state = '10001'; _state = '10001';

View File

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