Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

81041

2019-01-15 6fc11b72fa9f3812e91814c935cc06b8d04f2f51

Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

 gx_tieta/WebRoot/mobil/batt-approved1.html

@@ -357,6 +357,12 @@
             ,full: true

             ,anim: 4

             ,content: 'iframe/homeinfo1.html'

             ,success: function() {

                 $('div[data-role=page]').hide();

             }

             ,end: function() {

                 $('div[data-role=page]').show();

             }

         });

         layer.full(iframePopup);

    })


 gx_tieta/WebRoot/mobil/hcheckAccpet.html

@@ -195,6 +195,12 @@
                ,full: true

                ,anim: 4

                ,content: 'iframe/homeinfo1.html'

                ,success: function() {

                     $('div[data-role=page]').hide();

                 }

                 ,end: function() {

                     $('div[data-role=page]').show();

                 }

            });

            layer.full(iframePopup);

        // applyendyanshou(arr);        

@@ -271,6 +277,12 @@
                ,full: true

                ,anim: 4

                ,content: 'iframe/seenhomeinfo.html'

                ,success: function() {

                     $('div[data-role=page]').hide();

                 }

                 ,end: function() {

                     $('div[data-role=page]').show();

                 }

            });

            layer.full(iframePopup);

    });


 gx_tieta/WebRoot/mobil/iframe/homeinfo1.html

@@ -425,15 +425,10 @@
            var uploadImgsLoad;

            var uploadImgs = upload.render({

                elem: '#imgsSelect'

                ,url: 'MyFileAction!uploadStationFile'

                ,url: 'MyFileAction!uploadStationFile_mobile'

                ,accept: 'image'

                ,multiple: true

                ,data: {

                    json:JSON.stringify( {

                        StationId: homeInfo.homeId,

                        VideoOrImage: 'image'

                    })

                }

                ,data:{} 
                ,auto: false

                ,bindAction: '#uploadImgs'

                ,choose: function(obj){

@@ -466,8 +461,20 @@
                        imgsInfo.append(tr);

                      });

                }

                ,before:function() {

                ,before:function(obj) {

                    uploadImgsLoad = layer.load(1);

                    // 设置提交的参数

                    this.data.json = JSON.stringify({

                            StationId: homeInfo.homeId

                            ,VideoOrImage: 'image'

                            ,binfmation: {

                                StationId: homeInfo.homeId

                                ,StationName: $('#homeName').val()

                                ,latitude: $('#lat').val()    // 纬度

                                ,longitude: $('#lng').val()    // 经度

                                ,Address: $('#addr').val()                // 地址

                            }

                        })

                }

                ,done:function(res) {

                    var rs = JSON.parse(res.result);


 gx_tieta/WebRoot/mobil/wcheckAccept.html

@@ -203,6 +203,12 @@
                ,full: true

                ,anim: 4

                ,content: 'iframe/homeinfo1.html'

                ,success: function() {

                     $('div[data-role=page]').hide();

                 }

                 ,end: function() {

                     $('div[data-role=page]').show();

                 }

            });

            layer.full(iframePopup);

        // applyendyanshou(arr);        

@@ -291,6 +297,12 @@
                ,full: true

                ,anim: 4

                ,content: 'iframe/seenhomeinfo.html'

                ,success: function() {

                     $('div[data-role=page]').hide();

                 }

                 ,end: function() {

                     $('div[data-role=page]').show();

                 }

            });

            layer.full(iframePopup);

    });