diff --git a/pages/family/family.js b/pages/family/family.js
index f11e2cc..d628a94 100644
--- a/pages/family/family.js
+++ b/pages/family/family.js
@@ -9,8 +9,9 @@ Page({
* 页面的初始数据
*/
data: {
- "sexArr":["男","女"],
- "sex": "0",
+ "columns":["男","女"],
+ "sex": "",
+ sexValue:"",
"name": "",
"link": "",
"remark": "",
@@ -18,13 +19,26 @@ Page({
"userId": "",
"ownerTypeCd": "1002",
"age": "",
- "memberId": ""
+ "memberId": -1,
+ communityId:"",
+ idCard:"",
+ sexShow: false
},
/**
* 生命周期函数--监听页面加载
*/
- onLoad: function(options) {},
+ onLoad: function(options) {
+ let that = this;
+ context.getOwner(function (_owner) {
+ console.log(_owner);
+ that.setData({
+ ownerId: _owner.memberId,
+ userId: _owner.memberId,
+ communityId: _owner.communityId
+ })
+ })
+ },
/**
* 生命周期函数--监听页面初次渲染完成
@@ -61,33 +75,39 @@ Page({
},
+ bindInput: function (e) {
+ console.log('数据监听', e);
+ let _that = this;
+ let dataset = e.currentTarget.dataset;
+ let value = e.detail;
+ let name = dataset.name;
+ _that.data[name] = value;
+ // _that.setData({
+ // name: value
+ // });
+ console.log(this.data);
+ },
- bindSexChange: function(e) {
+ onSexConfirm: function (e) {
+ console.log("onConfirm", e);
this.setData({
- sex: e.detail.value
- })
+ sexValue: e.detail.value,
+ sex: e.detail.index+'',
+ sexShow: false
+ });
},
- bindOwnerId: function(e) {
+ onSexCancel: function (e) {
this.setData({
- ownerId: e.detail.value
- })
+ sexShow: false
+ });
},
- bindName: function(e) {
+ chooseSex: function (e) {
this.setData({
- name: e.detail.value
- })
+ sexShow: true
+ });
},
- bindAge: function(e) {
- this.setData({
- age: e.detail.value
- })
- },
- bindRemark: function(e) {
- this.setData({
- remark: e.detail.value
- })
- },
- submitRepair: function(e) {
+
+ submit: function(e) {
let obj = {
"sex": this.data.sex,
"name": this.data.name,
@@ -97,17 +117,21 @@ Page({
"userId": this.data.userId,
"ownerTypeCd": this.data.ownerTypeCd,
"age": this.data.age,
- "memberId": this.data.memberId
+ "memberId": this.data.memberId,
+ "communityId": this.data.communityId,
+ "idCard": this.data.idCard
}
let msg = "";
- if (obj.ownerId == "") {
- msg = "请填写业主";
- } else if (obj.name == "") {
+ if (obj.name == "") {
msg = "请填写姓名";
} else if (obj.sex == "") {
msg = "请填写性别";
+ } else if (obj.idCard == "") {
+ msg = "请填写身份证";
} else if (obj.age == "") {
msg = "请填写年龄";
+ } else if (obj.link == "") {
+ msg = "请填写电话";
}
if (msg != "") {
wx.showToast({
@@ -121,20 +145,23 @@ Page({
url: constant.url.saveOwner, // http://hc.demo.winqi.cn:8012/appApi/ownerRepair.saveOwnerRepair
header: context.getHeaders(),
method: "POST",
- data: {
- "sex": "1",
- "name": "1",
- "link": "1",
- "remark": "1",
- "ownerId": "1",
- "userId": "1",
- "ownerTypeCd": "1002",
- "age": "11",
- "memberId": "1"
- },
- // data:obj, //动态数据
+ // data: {
+ // "sex": "1",
+ // "name": "1",
+ // "link": "1",
+ // "remark": "1",
+ // "ownerId": "1",
+ // "userId": "1",
+ // "ownerTypeCd": "1002",
+ // "age": "11",
+ // "memberId": "1"
+ // },
+ data:obj, //动态数据
success: function(res) {
console.log(res, 99999);
+ if (res.statusCode == 200){
+ wx.navigateBack()
+ }
}
});
}
diff --git a/pages/family/family.wxml b/pages/family/family.wxml
index 9a09579..fd236db 100644
--- a/pages/family/family.wxml
+++ b/pages/family/family.wxml
@@ -1,99 +1,18 @@
-
-
-
-
-
+ 成员信息
+
+
+
+
+
+
+
+
+
+
+ 提交
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{sexArr[sex]}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/pages/family/family.wxss b/pages/family/family.wxss
index d8b27ce..fa29c5f 100644
--- a/pages/family/family.wxss
+++ b/pages/family/family.wxss
@@ -1,17 +1,28 @@
-.user-container {
- padding: 25rpx 10rpx;
- background-color: #F0F0F0;
- /*border: 1px solid black;*/
+@import '../../lib/common/index.wxss';
+
+.block__title {
+ margin: 0;
+ font-weight: 400;
+ font-size: 14px;
+ color: rgba(69,90,100,.6);
+ padding: 60rpx 30rpx 20rpx;
}
-.form{
- background-color: #fff;
- margin: 10rpx 7rpx;
+
+.button_up_blank{
+ height: 40rpx;
}
-.repair_textarea{
- width: 100%;
- height: 150rpx;
+
+.uploader-container{
+ margin: 0 10px;
}
-.repair_image{
- width: 150rpx;
- height: 150rpx;
-}
\ No newline at end of file
+
+.aku_photo_view{
+ background-color: #FFF;
+ padding: 40rpx 0 40rpx 40rpx;
+}
+
+.aku_photo_view text{
+ font-size: 30rpx;
+ color: #8a8a8a
+}
+
diff --git a/pages/familyList/familyList.js b/pages/familyList/familyList.js
index 13b4771..23b1f4c 100644
--- a/pages/familyList/familyList.js
+++ b/pages/familyList/familyList.js
@@ -7,45 +7,63 @@ Page({
tableData: [],
page: 1,
totalPage: 0,
- loading: false
+ loading: false,
+ communityId: "",
+ ownerId: ""
},
- onLoad: function () {
- this.getTable(1);
+ onLoad: function() {
+ // let that = this;
+ // context.getOwner(function(_owner) {
+ // console.log(_owner);
+ // that.setData({
+ // communityId: _owner.communityId,
+ // ownerId: _owner.memberId
+ // })
+ // that.getTable(1);
+ // })
},
- onShow: function () {
+ onShow: function() {
let that = this;
+ context.getOwner(function (_owner) {
+ console.log(_owner);
+ that.setData({
+ communityId: _owner.communityId,
+ ownerId: _owner.memberId
+ })
+ that.getTable(1);
+ })
},
- getTable: function (page, override) {
+ getTable: function(page, override) {
let that = this;
this.setData({
loading: true
})
return this.request({
- "ownerId": "772019122036600002",
- "communityId": "702019120393220007",
+ "ownerId": that.communityId,
+ "communityId": that.ownerId
// "page": page,
// "row": 10
}).then(res => {
that.setData({
- tableData: override ? res.data.ownerRepairs : this.data.tableData.concat(res.data.ownerRepairs),
+ tableData: override ? res.data.owners : this.data.tableData.concat(res.data.owners),
totalPage: res.data.records,
page: page,
loading: false
})
})
- },
- goAdd: function (e) {
+ },
+ goAdd: function(e) {
wx.navigateTo({
url: "/pages/family/family"
})
},
- gotoDetail: function (e) {
+ gotoDetail: function(e) {
wx.navigateTo({
url: "/pages/repairList/detail/detail?item=" + JSON.stringify(e.currentTarget.dataset.item)
})
},
- onPullDownRefresh: function () {
+ onPullDownRefresh: function() {
// 上拉刷新
if (!this.data.loading) {
this.getTable(1, true).then(() => {
@@ -54,8 +72,8 @@ Page({
})
}
},
- onReachBottom: function () {
- console.log(1, !this.data.loading,this.data.page < this.data.totalPage);
+ onReachBottom: function() {
+ console.log(1, !this.data.loading, this.data.page < this.data.totalPage);
// 下拉触底，先判断是否有请求正在进行中
// 以及检查当前请求页数是不是小于数据总页数，如符合条件，则发送请求
if (!this.data.loading && this.data.page < this.data.totalPage) {
@@ -63,14 +81,14 @@ Page({
}
},
//封装请求
- request: function (data) {
+ request: function(data) {
return new Promise((resolve, reject) => {
wx.request({
url: constant.url.queryOwnerMembers,
header: context.getHeaders(),
- method: "POST",
+ method: "GET",
data: data,
- success: function (res) {
+ success: function(res) {
if (res.statusCode == 200) {
resolve(res);
}
diff --git a/pages/familyList/familyList.wxml b/pages/familyList/familyList.wxml
index a0e0230..bb67d3d 100644
--- a/pages/familyList/familyList.wxml
+++ b/pages/familyList/familyList.wxml
@@ -1,7 +1,5 @@
-
-
-
+
{{item.repairName}}
@@ -19,4 +17,5 @@
-
\ No newline at end of file
+
+添加
\ No newline at end of file
diff --git a/pages/familyList/familyList.wxss b/pages/familyList/familyList.wxss
index a151110..f4ab718 100644
--- a/pages/familyList/familyList.wxss
+++ b/pages/familyList/familyList.wxss
@@ -2,18 +2,17 @@
padding: 25rpx 10rpx;
background-color: #F0F0F0;
- /*border: 1px solid black;*/
}
.add_button{
+ position: fixed;
+ bottom: 0;
+ width: 100%;
}
.notice {
margin: 10rpx 7rpx;
padding: 25rpx;
background-color: #ffffff;
border-radius: 7rpx;
- /* display: flex;
- justify-content: space-between;
- align-items: flex-end; */
}
.title {
border-bottom: 1rpx solid #dedede;