mirror of
https://gitee.com/java110/WechatOwnerService.git
synced 2026-02-24 05:46:04 +08:00
Merge remote-tracking branch 'origin/master' into xinghong-dev
This commit is contained in:
905166056
commit
424f81d8f4
@ -17,7 +17,7 @@ const commonBaseUrl = 'http://demo.homecommunity.cn/';
|
||||
//商城的url
|
||||
const mallUrl = 'http://mallapp.homecommunity.cn/';
|
||||
|
||||
const mallUrlIndexPage = mallUrl + '#/?mallFrom=HC';
|
||||
const mallUrlIndexPage = mallUrl + '#/pages/index/index?mallFrom=HC';
|
||||
|
||||
//商城token 刷新页面
|
||||
const mallUrlRefresh = mallUrl + "#/pages/mallTokenRefresh/mallTokenRefresh?mallFrom=HC"
|
||||
@ -28,8 +28,8 @@ const baseUrl = 'http://demo.homecommunity.cn/';
|
||||
// #endif
|
||||
|
||||
//默认的小区ID和名称，用户还没有登录时显示的小区信息
|
||||
const DEFAULT_COMMUNITY_ID = "7020181217000001"; //HC测试小区id 用于没有登录时展示相关信息
|
||||
const DEFAULT_COMMUNITY_NAME = "丰仪家园";
|
||||
const DEFAULT_COMMUNITY_ID = "2021080494780158"; //HC测试小区id 用于没有登录时展示相关信息
|
||||
const DEFAULT_COMMUNITY_NAME = "HC演示小区";
|
||||
|
||||
// APP 或者 公众号 appId
|
||||
const wAppId = ""; //微信AppId
|
||||
|
||||
@ -121,6 +121,9 @@ export default {
|
||||
listMachineTranslates: baseUrl + "app/machineTranslate.listMachineTranslates",
|
||||
generatorHcCode: baseUrl + "app/userLogin/generatorHcCode",
|
||||
queryApplyRoomDiscount: baseUrl + "app/applyRoomDiscount/queryApplyRoomDiscount",
|
||||
saveReportInfoBackCity: baseUrl + "app/reportInfoBackCity/saveReportInfoBackCity",
|
||||
|
||||
|
||||
|
||||
NEED_NOT_LOGIN_PAGE: [
|
||||
'/pages/login/login',
|
||||
|
||||
@ -104,6 +104,13 @@
|
||||
"navigationBarTitleText": "报修"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/reportInfoBack/reportInfoBack",
|
||||
"style": {
|
||||
"navigationBarTitleText": "返省上报",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/repairList/detail/detail",
|
||||
"style": {}
|
||||
|
||||
@ -77,7 +77,7 @@
|
||||
</view>
|
||||
<view class="cu-item" v-if="feeFlag != '2006012'">
|
||||
<view class="content">
|
||||
<text class="text-grey">到期时间</text>
|
||||
<text class="text-grey">缴费后时间</text>
|
||||
</view>
|
||||
<view class="action">
|
||||
<text class="text-grey text-sm">{{endTime }}</text>
|
||||
|
||||
18
pages/reportInfoBack/reportInfoBack.css
Normal file
18
pages/reportInfoBack/reportInfoBack.css
Normal file
@ -0,0 +1,18 @@
|
||||
|
||||
|
||||
.block__title {
|
||||
margin: 0;
|
||||
font-weight: 400;
|
||||
font-size: 14px;
|
||||
color: rgba(69,90,100,.6);
|
||||
padding: 40rpx 30rpx 20rpx;
|
||||
}
|
||||
|
||||
.button_up_blank{
|
||||
height: 40rpx;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.cu-form-group{
|
||||
text-align: right;
|
||||
}
|
||||
278
pages/reportInfoBack/reportInfoBack.vue
Normal file
278
pages/reportInfoBack/reportInfoBack.vue
Normal file
@ -0,0 +1,278 @@
|
||||
<template>
|
||||
<view>
|
||||
<!-- <view class="block__title">小区信息</view>
|
||||
<view class="cu-form-group">
|
||||
<view class="title">小区名称</view>
|
||||
<input :value="communityName" @input="bindInput" data-name="communityName" required readonly label="小区名称"
|
||||
></input>
|
||||
</view> -->
|
||||
<view class="block__title">返省人员信息上报</view>
|
||||
<view class="cu-form-group">
|
||||
<view class="title">姓名</view>
|
||||
<input :value="name" @input="bindInput" data-name="name" required label="姓名" clearable placeholder="请输入名称"
|
||||
name="name"></input>
|
||||
</view>
|
||||
<view class="cu-form-group">
|
||||
<view class="title">身份证</view>
|
||||
<input :value="idCard" @input="bindInput" data-name="idCard" required label="身份证" clearable placeholder="请输入身份证"
|
||||
name="idCard"></input>
|
||||
</view>
|
||||
<view class="cu-form-group">
|
||||
<view class="title">手机号</view>
|
||||
<view>
|
||||
<input :value="tel" @input="bindInput" data-name="tel" required label="手机号" clearable placeholder="请输入手机号" name="tel"></input>
|
||||
</view>
|
||||
</view>
|
||||
<view class="cu-form-group">
|
||||
<view class="title">来源地</view>
|
||||
<picker @change="bindSourceChange" :value="indexSource" :range="arraySourceType" range-key="name">
|
||||
<view >{{arraySourceType[indexSource].name}}</view>
|
||||
</picker>
|
||||
</view>
|
||||
<view class="cu-form-group">
|
||||
<view class="title">城市名称</view>
|
||||
<input :value="sourceCityName" @input="bindInput" data-name="sourceCityName" required label="城市名称" clearable placeholder="请输入城市名称" name="sourceCityName"></input>
|
||||
</view>
|
||||
<view class="cu-form-group">
|
||||
<view class="title">返回日期</view>
|
||||
<picker mode="date" :value="bindDate" start="2020-00-01" end="2030-09-01" @change="dateChange">
|
||||
<view class="picker">
|
||||
{{bindDate}}
|
||||
</view>
|
||||
</picker>
|
||||
</view>
|
||||
<view class="cu-form-group">
|
||||
<view class="title">返回时间</view>
|
||||
<picker mode="time" :value="bindTime" start="00:00" end="23:59" @change="timeChange">
|
||||
<view class="picker">
|
||||
{{bindTime}}
|
||||
</view>
|
||||
</picker>
|
||||
</view>
|
||||
<view class="cu-form-group">
|
||||
<view class="title">备注</view>
|
||||
<textarea v-model="remark" placeholder="请输入备注"></textarea>
|
||||
</view>
|
||||
<view class="button_up_blank">
|
||||
<button class="cu-btn bg-green lg margin-top" @tap.native.stop="reportBack">上报数据</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
// pages/enterCommunity/enterCommunity.js
|
||||
const context = require("../../context/Java110Context.js");
|
||||
const constant = context.constant;
|
||||
|
||||
export default {
|
||||
data() {
|
||||
const currentDate = this.getDate({
|
||||
format: true
|
||||
})
|
||||
return {
|
||||
areaCode: '',
|
||||
communityName: '',
|
||||
communityId: '',
|
||||
name: '',
|
||||
idCard: '',
|
||||
tel: '',
|
||||
backTime:"",
|
||||
bindDate: currentDate,
|
||||
bindTime: '12:01',
|
||||
areaShow: false,
|
||||
arraySourceType: [{'code':"1001",'name':'国内'},{'code':"2002",'name':'国外'}],
|
||||
indexSource: 0,
|
||||
sourceCityName:"",
|
||||
remark:"",
|
||||
source:"",
|
||||
areaName:null
|
||||
};
|
||||
},
|
||||
components: {},
|
||||
props: {},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面加载
|
||||
*/
|
||||
onLoad: function(options) {
|
||||
let _that = this;
|
||||
context.onLoad(options);
|
||||
if(!options.communityId){
|
||||
wx.showToast({
|
||||
title: "小区信息错误",
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
return
|
||||
}
|
||||
this.communityId = options.communityId;
|
||||
_that.source = _that.arraySourceType[_that.indexSource].code;
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面初次渲染完成
|
||||
*/
|
||||
onReady: function() {},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面显示
|
||||
*/
|
||||
onShow: function() {
|
||||
if (this.areaCode == '' || this.areaCode == undefined) {
|
||||
let _currentLocation = context.getCurrentLocation();
|
||||
|
||||
let _areaName = _currentLocation.city + _currentLocation.district;
|
||||
|
||||
let _areaCode = _currentLocation.adcode;
|
||||
this.areaCode = _areaCode;
|
||||
//this.areaName = _areaName;
|
||||
// this.setData({
|
||||
// areaCode: _areaCode,
|
||||
// areaName: _areaName
|
||||
// });
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面隐藏
|
||||
*/
|
||||
onHide: function() {},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面卸载
|
||||
*/
|
||||
onUnload: function() {},
|
||||
|
||||
/**
|
||||
* 页面相关事件处理函数--监听用户下拉动作
|
||||
*/
|
||||
onPullDownRefresh: function() {},
|
||||
|
||||
/**
|
||||
* 页面上拉触底事件的处理函数
|
||||
*/
|
||||
onReachBottom: function() {},
|
||||
|
||||
/**
|
||||
* 用户点击右上角分享
|
||||
*/
|
||||
onShareAppMessage: function() {},
|
||||
methods: {
|
||||
bindSourceChange: function(e) {
|
||||
this.indexSource = e.target.value;
|
||||
this.source = this.arraySourceType[this.indexSource].code;
|
||||
},
|
||||
|
||||
bindInput: function(e) {
|
||||
console.log('数据监听', e);
|
||||
let _that = this;
|
||||
let dataset = e.currentTarget.dataset;
|
||||
let value = e.detail.value;
|
||||
let name = dataset.name;
|
||||
_that[name] = value; //
|
||||
},
|
||||
reportBack: function(e) {
|
||||
let obj = {
|
||||
"areaCode": this.areaCode,
|
||||
"communityName": this.communityName,
|
||||
"name": this.name,
|
||||
"idCard": this.idCard,
|
||||
"tel": this.tel,
|
||||
"sourceCityName": this.sourceCityName,
|
||||
"bindDate": this.bindDate,
|
||||
"bindTime": this.bindTime,
|
||||
"remark":this.remark,
|
||||
"backTime":this.bindDate + " " + this.bindTime + ":00",
|
||||
};
|
||||
let msg = "";
|
||||
|
||||
if(obj.name == "") {
|
||||
msg = "请填写姓名";
|
||||
} else if (obj.idCard == "") {
|
||||
msg = "请填写身份证号";
|
||||
} else if (obj.tel == "") {
|
||||
msg = "请填写手机号";
|
||||
}else if (obj.sourceCityName == "") {
|
||||
msg = "请填写城市名称";
|
||||
}else if (obj.bindDate == "请选择") {
|
||||
msg = "请选择返回日期";
|
||||
} else if (obj.bindTime == "请选择") {
|
||||
msg = "请选择返回时间";
|
||||
}
|
||||
if (msg != "") {
|
||||
wx.showToast({
|
||||
title: msg,
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
} else {
|
||||
console.log("提交数据", obj);
|
||||
wx.showLoading({
|
||||
title: '提交中'
|
||||
});
|
||||
context.request({
|
||||
url: constant.url.saveReportInfoBackCity,
|
||||
header: context.getHeaders(),
|
||||
method: "POST",
|
||||
data: obj,
|
||||
//动态数据
|
||||
success: function(res) {
|
||||
console.log(res); //成功情况下跳转
|
||||
if (res.statusCode == 200) {
|
||||
wx.hideLoading();
|
||||
return;
|
||||
}
|
||||
wx.hideLoading();
|
||||
wx.showToast({
|
||||
title: res.data,
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
},
|
||||
fail: function(e) {
|
||||
wx.hideLoading();
|
||||
wx.showToast({
|
||||
title: "服务器异常了",
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
onChange: function(e) {
|
||||
console.log(e);
|
||||
},
|
||||
onCancel: function(e) {
|
||||
this.areaShow = false;
|
||||
// this.setData({
|
||||
// areaShow = false
|
||||
// });
|
||||
},
|
||||
dateChange: function(e) {
|
||||
this.bindDate = e.detail.value;
|
||||
},
|
||||
timeChange: function(e) {
|
||||
this.bindTime = e.detail.value;
|
||||
},
|
||||
getDate(type) {
|
||||
const date = new Date();
|
||||
let year = date.getFullYear();
|
||||
let month = date.getMonth() + 1;
|
||||
let day = date.getDate();
|
||||
|
||||
if (type === 'start') {
|
||||
year = year - 60;
|
||||
} else if (type === 'end') {
|
||||
year = year + 2;
|
||||
}
|
||||
month = month > 9 ? month : '0' + month;
|
||||
day = day > 9 ? day : '0' + day;
|
||||
return `${year}-${month}-${day}`;
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
<style>
|
||||
@import "./reportInfoBack.css";
|
||||
</style>
|
||||
@ -68,7 +68,7 @@
|
||||
</view>
|
||||
<view class="cu-item" v-if="feeFlag != '2006012'">
|
||||
<view class="content">
|
||||
<text class="text-grey">到期时间</text>
|
||||
<text class="text-grey">缴费后时间</text>
|
||||
</view>
|
||||
<view class="action">
|
||||
<text class="text-grey text-sm">{{endTime}}</text>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user