diff --git a/conf/config.js b/conf/config.js
index 2434a20..d6c05df 100644
--- a/conf/config.js
+++ b/conf/config.js
@@ -15,11 +15,11 @@ const baseUrl = '/';
// 腾讯地图Key, h5使用
const QQMapKey = '';
-const commonBaseUrl= 'http://demo.homecommunity.cn';
+const commonBaseUrl= 'http://c.dgkaywin.com';
// #ifndef H5
//服务器域名 小程序 或者 app 时 后端地址
-const baseUrl = 'http://demo.homecommunity.cn/';
+const baseUrl = 'http://c.dgkaywin.com/';
// #endif
diff --git a/lib/java110/api/Java110SessionApi.js b/lib/java110/api/Java110SessionApi.js
index 3fa5ff0..9fc7726 100644
--- a/lib/java110/api/Java110SessionApi.js
+++ b/lib/java110/api/Java110SessionApi.js
@@ -45,6 +45,7 @@ export function login(userName, passwd) {
let data = res.data;
let _tmpUserInfo = data.userInfo;
_tmpUserInfo['password'] = passwd;
+ _tmpUserInfo['username'] = userName;
let _userInfo = desEncrypt(JSON.stringify(_tmpUserInfo));
uni.setStorageSync(java110Config.USER_INFO, _userInfo);
uni.setStorageSync(java110Config.TOKEN, data.token);
diff --git a/manifest.json b/manifest.json
index a4be9db..dff6580 100644
--- a/manifest.json
+++ b/manifest.json
@@ -85,13 +85,14 @@
"changeOrigin" : true, //是否跨域
"secure" : true // 设置支持https协议的代理
},
- "/callComponent" : {
- "target" : "http://property.homecommunity.cn", //目标接口域名http://192.168.1.16:8012
- "changeOrigin" : true, //是否跨域
- "secure" : true // 设置支持https协议的代理
- }
+ "/callComponent" : {
+ "target" : "http://property.homecommunity.cn", //目标接口域名http://192.168.1.16:8012
+ "changeOrigin" : true, //是否跨域
+ "secure" : true // 设置支持https协议的代理
+ }
}
},
- "domain" : "http://property.homecommunity.cn"
+ "domain" : "http://property.homecommunity.cn",
+ "title" : "KK智慧云"
}
}
diff --git a/pages.json b/pages.json
index d2ee6ca..5296783 100644
--- a/pages.json
+++ b/pages.json
@@ -3,7 +3,7 @@
{
"path": "pages/index/index",
"style": {
- "navigationBarTitleText": "HC掌上物业"
+ "navigationBarTitleText": "KK智慧云"
}
}
,{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b1bc810..0c4332e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,7 +2,7 @@
+ text="KK智慧云物业欢迎您">
+ 相关图片
+
+
+ 图片上传
+
+
+ {{imgList.length}}/4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -278,7 +300,7 @@
"appointmentTime": this.bindDate + " " + this.bindTime + ":00",
"tel": this.bindTel,
"roomId": this.roomId,
- // "photos": [],
+ "photos": [],
"context": this.context,
"communityId": this.communityId,
"bindDate": this.bindDate,
@@ -301,12 +323,12 @@
obj.repairObjName = this.floorNum + this.unitNum + this.roomNum;
}
- // let _photos = this.photos;
- // _photos.forEach(function(_item) {
- // obj.photos.push({
- // "photo": _item
- // });
- // });
+ let _photos = this.photos;
+ _photos.forEach(function(_item) {
+ obj.photos.push({
+ "photo": _item
+ });
+ });
let msg = "";
if (obj.repairType == "") {
@@ -416,29 +438,29 @@
url: '/pages/selectRoom/selectRoom?floorId=' + this.floorId + "&unitId=" + this.unitId
});
},
- // deleteImage: function(e) {
- // console.log(e);
- // let imageArr = this.$data.imgList;
- // imageArr.splice(e, 1);
- // this.photos.splice(e, 1);
- // },
- // ChooseImage: function(e) {
- // let that = this;
- // wx.chooseImage({
- // count: 4, //默认9
- // sizeType: ['compressed'], //可以指定是原图还是压缩图,默认二者都有
- // sourceType: ['album'], //从相册选择
- // success: (res) => {
- // console.log(res);
- // that.$data.imgList.push(res.tempFilePaths[0]);
- // var tempFilePaths = res.tempFilePaths[0]
+ deleteImage: function(e) {
+ console.log(e);
+ let imageArr = this.$data.imgList;
+ imageArr.splice(e, 1);
+ this.photos.splice(e, 1);
+ },
+ ChooseImage: function(e) {
+ let that = this;
+ wx.chooseImage({
+ count: 4, //默认9
+ sizeType: ['compressed'], //可以指定是原图还是压缩图,默认二者都有
+ sourceType: ['album'], //从相册选择
+ success: (res) => {
+ console.log(res);
+ that.$data.imgList.push(res.tempFilePaths[0]);
+ var tempFilePaths = res.tempFilePaths[0]
- // TanslateImage.translate(tempFilePaths, (url) => {
- // that.photos.push(url);
- // })
- // }
- // });
- // },
+ TanslateImage.translate(tempFilePaths, (url) => {
+ that.photos.push(url);
+ })
+ }
+ });
+ },
repairScopeChange: function(e) {
this.repairScopeIndex = e.target.value //取其下标
let selected = this.repairScopes[this.repairScopeIndex] //获取选中的数组