diff --git a/public/components/frame/uploadFile/uploadFile.html b/public/components/frame/uploadFile/uploadFile.html index 8867968af..d16f9ec66 100644 --- a/public/components/frame/uploadFile/uploadFile.html +++ b/public/components/frame/uploadFile/uploadFile.html @@ -7,6 +7,6 @@
- +
- + \ No newline at end of file diff --git a/public/components/property/addSmallWeChat/addSmallWeChat.html b/public/components/property/addSmallWeChat/addSmallWeChat.html index f43f4e1cb..ed3bb7a40 100755 --- a/public/components/property/addSmallWeChat/addSmallWeChat.html +++ b/public/components/property/addSmallWeChat/addSmallWeChat.html @@ -39,18 +39,12 @@ - - - - - - - - - - - - +
+ +
+ +
+
@@ -72,4 +66,4 @@
- + \ No newline at end of file diff --git a/public/components/property/addSmallWeChat/addSmallWeChat.js b/public/components/property/addSmallWeChat/addSmallWeChat.js index 5be608cef..7d9c18a30 100755 --- a/public/components/property/addSmallWeChat/addSmallWeChat.js +++ b/public/components/property/addSmallWeChat/addSmallWeChat.js @@ -1,4 +1,4 @@ -(function (vc) { +(function(vc) { vc.extends({ propTypes: { @@ -12,39 +12,42 @@ appId: '', appSecret: '', payPassword: '', - objType:'1000', - objId:'', - mchId:'', - remarks:'', - objTypes:'', - types:'', - weChatType:'' + objType: '1000', + objId: '', + mchId: '', + remarks: '', + objTypes: '', + types: '', + weChatType: '', + certPath: '', } }, - _initMethod: function () { - vc.getDict('small_wechat',"obj_type",function(_data){ + _initMethod: function() { + vc.getDict('small_wechat', "obj_type", function(_data) { vc.component.addSmallWeChatInfo.objTypes = _data; }); - vc.getDict('small_wechat',"wechat_type",function(_data){ + vc.getDict('small_wechat', "wechat_type", function(_data) { vc.component.addSmallWeChatInfo.types = _data; }); }, - _initEvent: function () { - vc.on('addSmallWeChat', 'openAddSmallWeChatModal', function (type) { + _initEvent: function() { + vc.on('addSmallWeChat', 'openAddSmallWeChatModal', function(type) { console.log(type); vc.component.addSmallWeChatInfo.weChatType = type; $('#addSmallWeChatModel').modal('show'); }); + vc.on('addSmallWeChat', 'notifyCert', function(_param) { + $that.addSmallWeChatInfo.certPath = _param.realFileName; + }) }, methods: { addSmallWeChatValidate() { return vc.validate.validate({ addSmallWeChatInfo: vc.component.addSmallWeChatInfo }, { - 'addSmallWeChatInfo.name': [ - { + 'addSmallWeChatInfo.name': [{ limit: "required", param: "", errInfo: "名称不能为空" @@ -55,8 +58,7 @@ errInfo: "名称不能超过100位" }, ], - 'addSmallWeChatInfo.appId': [ - { + 'addSmallWeChatInfo.appId': [{ limit: "required", param: "", errInfo: "appId不能为空" @@ -67,8 +69,7 @@ errInfo: "appId不能超过100位" }, ], - 'addSmallWeChatInfo.appSecret': [ - { + 'addSmallWeChatInfo.appSecret': [{ limit: "required", param: "", errInfo: "应用密钥不能为空" @@ -79,8 +80,7 @@ errInfo: "应用密钥不能超过200个字符" }, ], - 'addSmallWeChatInfo.payPassword': [ - { + 'addSmallWeChatInfo.payPassword': [{ limit: "required", param: "", errInfo: "支付密码不能为空" @@ -91,18 +91,16 @@ errInfo: "支付密码不能超过200个字符" }, ], - 'addSmallWeChatInfo.mchId': [ - { - limit: "required", - param: "", - errInfo: "小程序商户id不能为空" - } - ], + 'addSmallWeChatInfo.mchId': [{ + limit: "required", + param: "", + errInfo: "小程序商户id不能为空" + }], }); }, - saveSmallWeChatInfo: function () { + saveSmallWeChatInfo: function() { if (!vc.component.addSmallWeChatValidate()) { vc.toast(vc.validate.errInfo); @@ -118,11 +116,10 @@ vc.component.addSmallWeChatInfo.objId = vc.getCurrentCommunity().communityId; vc.http.apiPost( 'smallWeChat.saveSmallWeChat', - JSON.stringify(vc.component.addSmallWeChatInfo), - { + JSON.stringify(vc.component.addSmallWeChatInfo), { emulateJSON: true }, - function (json, res) { + function(json, res) { //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); let _json = JSON.parse(json) if (_json.code == '0') { @@ -136,34 +133,36 @@ vc.message(_json.msg); }, - function (errInfo, error) { + function(errInfo, error) { console.log('请求失败处理'); vc.message(errInfo); }); }, - clearAddSmallWeChatInfo: function () { + clearAddSmallWeChatInfo: function() { vc.component.addSmallWeChatInfo = { weChatId: '', name: '', appId: '', appSecret: '', payPassword: '', - objType:'', - objId:'', - mchId:'', - weChatType:'', - types:vc.component.addSmallWeChatInfo.types, - remarks:'', - objTypes:vc.component.addSmallWeChatInfo.objTypes, - + objType: '', + objId: '', + mchId: '', + weChatType: '', + types: vc.component.addSmallWeChatInfo.types, + remarks: '', + objTypes: vc.component.addSmallWeChatInfo.objTypes, + certPath: '', }; + + vc.emit('addSmallWeChat', 'uploadFile', 'clearVedio', {}) }, - getObjType:function () { + getObjType: function() { } } }); -})(window.vc); +})(window.vc); \ No newline at end of file diff --git a/public/components/property/editSmallWeChat/editSmallWeChat.html b/public/components/property/editSmallWeChat/editSmallWeChat.html index 229e97cc3..a2bf92d89 100755 --- a/public/components/property/editSmallWeChat/editSmallWeChat.html +++ b/public/components/property/editSmallWeChat/editSmallWeChat.html @@ -39,17 +39,12 @@ - +
@@ -71,4 +66,4 @@
- + \ No newline at end of file diff --git a/public/components/property/editSmallWeChat/editSmallWeChat.js b/public/components/property/editSmallWeChat/editSmallWeChat.js index a098f63e9..236907e0c 100755 --- a/public/components/property/editSmallWeChat/editSmallWeChat.js +++ b/public/components/property/editSmallWeChat/editSmallWeChat.js @@ -13,7 +13,8 @@ objId: '', mchId: '', remarks: '', - objTypes: '1000' + objTypes: '1000', + certPath: '' } }, @@ -28,7 +29,13 @@ }); $('#editSmallWeChatModel').modal('show'); vc.copyObject(_params, vc.component.editSmallWeChatInfo); + if ($that.editSmallWeChatInfo.certPath) { + vc.emit('editSmallWeChat', 'uploadFile', 'notifyVedio', $that.editSmallWeChatInfo.certPath) + } }); + vc.on('editSmallWeChat', 'notifyCert', function(_param) { + $that.editSmallWeChatInfo.certPath = _param.realFileName; + }) }, methods: { editSmallWeChatValidate: function() { @@ -137,9 +144,10 @@ objId: '', mchId: '', remarks: '', - objTypes: '1000' - + objTypes: '1000', + certPath: '' } + vc.emit('editSmallWeChat', 'uploadFile', 'clearVedio', {}); } } }); diff --git a/public/pages/admin/addContract/addContract.html b/public/pages/admin/addContract/addContract.html index 341574293..05dafe025 100644 --- a/public/pages/admin/addContract/addContract.html +++ b/public/pages/admin/addContract/addContract.html @@ -61,10 +61,10 @@
+ + +
@@ -75,10 +75,10 @@
+ + +
@@ -107,9 +107,7 @@
- +
diff --git a/public/pages/property/room/room.js b/public/pages/property/room/room.js index 5effadf00..089da42d7 100755 --- a/public/pages/property/room/room.js +++ b/public/pages/property/room/room.js @@ -35,7 +35,7 @@ _initMethod: function() { vc.component.roomInfo.conditions.floorId = vc.getParam("floorId"); vc.component.roomInfo.conditions.floorName = vc.getParam("floorName"); - vc.component.listRoom(DEFAULT_PAGE, DEFAULT_ROW); + //vc.component.listRoom(DEFAULT_PAGE, DEFAULT_ROW); //与字典表关联 vc.getDict('building_room', "state", function(_data) { vc.component.roomInfo.states = _data;