From 83003c432448461ec483ace4038e5083d22e3ef5 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Thu, 6 Feb 2020 20:38:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=A4=B4=E5=83=8F=E8=AE=BE?=
=?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/collectHeaderImg/collectHeaderImg.wxml | 6 +-
pages/my/my.js | 21 ++++-
pages/my/my.wxml | 5 +-
pages/openDoor/openDoor.wxml | 10 ++-
pages/settings/settings.js | 83 +++++++++++++++++++-
pages/settings/settings.wxml | 6 +-
pages/viewHeadImg/viewHeadImg.js | 2 +-
pages/viewHeadImg/viewHeadImg.wxml | 2 +-
8 files changed, 118 insertions(+), 17 deletions(-)
diff --git a/pages/collectHeaderImg/collectHeaderImg.wxml b/pages/collectHeaderImg/collectHeaderImg.wxml
index d109d06..31336f3 100644
--- a/pages/collectHeaderImg/collectHeaderImg.wxml
+++ b/pages/collectHeaderImg/collectHeaderImg.wxml
@@ -3,15 +3,15 @@
- 拿起手机，设置头像
+ 拿起手机，面向手机
- 头像上传
+ 采集人脸
-
+
diff --git a/pages/my/my.js b/pages/my/my.js
index 78604ce..56ac501 100644
--- a/pages/my/my.js
+++ b/pages/my/my.js
@@ -1,13 +1,15 @@
/** index.js **/
const context = require('../../context/Java110Context.js');
const factory = context.factory;
+const constant = context.constant;
//获取app实例
const app = getApp();
Page({
data: {
userInfo: {}, // 用户信息
- ownerFlag: false // 是否有业主信息 标记 如果有为 true 没有为false
+ ownerFlag: false, // 是否有业主信息 标记 如果有为 true 没有为false
+ headerImg:''
},
onLoad: function() {
let _that = this;
@@ -17,7 +19,9 @@ Page({
});
//查询用户信息
_that.loadOwenrInfo();
+
});
+
},
onShow: function() {
@@ -28,8 +32,22 @@ Page({
_that.setData({
userInfo: context.getUserInfo()
});
+ console.log('查询头像');
+ _that.loadOwnerHeaderImg();
},
+ /**
+ * 查询业主头像
+ */
+ loadOwnerHeaderImg: function () {
+ let _that = this;
+ context.getOwner(function (_owner) {
+ let _headerImg = constant.url.getOwnerPhotoPath + "?objId=" + _owner.memberId + "&communityId=" + _owner.communityId + "&fileTypeCd=10000&time=" + new Date();
+ _that.setData({
+ headerImg: _headerImg
+ });
+ });
+ },
bindingOwner: function() {
wx.navigateTo({
url: '../bindOwner/bindOwner',
@@ -77,6 +95,5 @@ Page({
wx.navigateTo({
url: '/pages/settings/settings',
});
-
}
})
\ No newline at end of file
diff --git a/pages/my/my.wxml b/pages/my/my.wxml
index 6714512..b6f1c84 100644
--- a/pages/my/my.wxml
+++ b/pages/my/my.wxml
@@ -9,7 +9,10 @@
-->
-
+
+
+
+
diff --git a/pages/openDoor/openDoor.wxml b/pages/openDoor/openDoor.wxml
index 9bfcf14..9f27b8a 100644
--- a/pages/openDoor/openDoor.wxml
+++ b/pages/openDoor/openDoor.wxml
@@ -31,14 +31,18 @@
text="访客钥匙"
/>
-
--->
diff --git a/pages/settings/settings.js b/pages/settings/settings.js
index cc4d8e2..7272937 100644
--- a/pages/settings/settings.js
+++ b/pages/settings/settings.js
@@ -1,18 +1,22 @@
// pages/settings/settings.js
+const context = require("../../context/Java110Context.js");
+const constant = context.constant;
+const factory = context.factory;
Page({
/**
* 页面的初始数据
*/
data: {
-
+ headerImg: null,
+ imageList:[]
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
-
+ this.loadOwnerHeaderImg();
},
/**
@@ -64,9 +68,80 @@ Page({
},
settingHeadImg:function(){
- wx.navigateTo({
- url: '/pages/viewHeadImg/viewHeadImg',
+ var _that = this;
+ wx.chooseImage({
+ count: 1,
+ sizeType: ['original', 'compressed'],
+ sourceType: ['album', 'camera'],
+ success: function (res) {
+ // console.log(res)
+ wx.showToast({
+ title: '正在上传',
+ icon: 'loading',
+ mask: true,
+ duration: 1000
+ });
+ var tempFilePaths = res.tempFilePaths
+ console.log('头像地址',tempFilePaths);
+ factory.base64.urlTobase64(tempFilePaths[0]).then(function (_baseInfo) {
+ _that.setData({
+ headerImg: _baseInfo
+ });
+ _that._uploadOwnerHeaderImg();
+ wx.hideLoading()
+ });
+ }
+ })
+ },
+
+ /**
+ * 查询业主头像
+ */
+ loadOwnerHeaderImg: function () {
+ let _that = this;
+ context.getOwner(function (_owner) {
+ let _headerImg = constant.url.getOwnerPhotoPath + "?objId=" + _owner.memberId + "&communityId=" + _owner.communityId + "&fileTypeCd=10000&time=" + new Date();
+ _that.setData({
+ headerImg: _headerImg
+ });
});
+ },
+ _uploadOwnerHeaderImg: function () {
+ let _that = this;
+ context.getOwner(function (_owner) {
+ let _memberId = _owner.memberId;
+ let _communityId = _owner.communityId;
+ let obj = {
+ memberId: _memberId,
+ communityId: _communityId,
+ photo: _that.data.headerImg
+ };
+ context.request({
+ url: constant.url.uploadOwnerPhoto,
+ header: context.getHeaders(),
+ method: "POST",
+ data: obj, //动态数据
+ success: function (res) {
+ console.log(res);
+ if (res.statusCode != 200) {
+ wx.showToast({
+ title: '头像上传失败',
+ icon: 'none',
+ duration: 2000
+ });
+ return;
+ }
+ },
+ fail: function (e) {
+ wx.showToast({
+ title: "服务器异常了",
+ icon: 'none',
+ duration: 2000
+ });
+ }
+ });
+ });
+
}
})
\ No newline at end of file
diff --git a/pages/settings/settings.wxml b/pages/settings/settings.wxml
index fa83140..ceb6a19 100644
--- a/pages/settings/settings.wxml
+++ b/pages/settings/settings.wxml
@@ -1,9 +1,11 @@
-
+
+
+
-
+
\ No newline at end of file
diff --git a/pages/viewHeadImg/viewHeadImg.js b/pages/viewHeadImg/viewHeadImg.js
index 9d54ebe..d89bbbf 100644
--- a/pages/viewHeadImg/viewHeadImg.js
+++ b/pages/viewHeadImg/viewHeadImg.js
@@ -8,7 +8,7 @@ Page({
*/
data: {
headerImg:null,
- btnValue:"上传头像"
+ btnValue:"上传人脸"
},
/**
diff --git a/pages/viewHeadImg/viewHeadImg.wxml b/pages/viewHeadImg/viewHeadImg.wxml
index fb4ede3..f4625a1 100644
--- a/pages/viewHeadImg/viewHeadImg.wxml
+++ b/pages/viewHeadImg/viewHeadImg.wxml
@@ -3,7 +3,7 @@
- 头像信息
+ 人脸信息