edit

assets/dever/share.js

@@ -111,48 +111,33 @@ var Dever_Share =
                     nonceStr: data.nonceStr,
                     signature: data.signature,
                     jsApiList: [
-                        'onMenuShareTimeline',
-                        'onMenuShareAppMessage',
-                        'onMenuShareQQ'
+                        'updateTimelineShareData',//'onMenuShareTimeline',
+                        'updateAppMessageShareData',//'onMenuShareAppMessage',
+                        //'onMenuShareQQ'
                     ]
                 });
 
                 wx.ready(function() {
-                    wx.onMenuShareAppMessage({
+                    wx.updateAppMessageShareData({
                         title: param.title,
                         desc: param.desc,
                         link: param.url,
                         imgUrl: param.img,
                         success: function(res) {
-                            param.sendMessageCallback('success', res)
-                            self.ShareLog(1, 1);
+                            //param.sendMessageCallback('success', res)
+                            //self.ShareLog(1, 1);
                         },
-                        cancel: function(res) {
-                            param.sendMessageCallback('cancel', res)
-                            self.ShareLog(1, 2);
-                        },
-                        fail: function(res) {
-                            param.sendMessageCallback('fail', res)
-                            self.ShareLog(1, 3);
-                        }
                     });
-                    wx.onMenuShareTimeline({
+                    wx.updateTimelineShareData({
                         title: param.title,
                         link: param.url,
                         imgUrl: param.img,
                         success: function(res) {
-                            param.timelineCallback('success', res)
-                            self.ShareLog(2, 1);
+                            //param.timelineCallback('success', res)
+                            //self.ShareLog(2, 1);
                         },
-                        cancel: function(res) {
-                            param.timelineCallback('cancel', res)
-                            self.ShareLog(2, 2);
-                        },
-                        fail: function(res) {
-                            param.timelineCallback('fail', res)
-                            self.ShareLog(2, 3);
-                        }
                     });
+                    /*
                     wx.onMenuShareQQ({
                         title: param.title,
                         link: param.url,
@@ -169,7 +154,7 @@ var Dever_Share =
                             param.shareQQCallback('fail', res)
                             self.ShareLog(3, 3);
                         }
-                    });
+                    });*/
                 });
             },
             async:'true',

assets/lib/layui/admin/modules/plugin/formselects/formselects.js

@@ -61,6 +61,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
         FORM_INPUT = 'xm-input',
         FORM_DL_INPUT = 'xm-dl-input',
         FORM_SELECT_TIPS = 'xm-select-tips',
+        FORM_SELECT_PH = 'xm-select-placeholder',
         CHECKBOX_YES = 'xm-iconfont',
         FORM_TEAM_PID = 'XM_PID_VALUE',
         CZ = 'xm-cz',
@@ -166,7 +167,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
         this.values = [];
         $.extend(true, this.config, options, {
             searchUrl: options.isSearch ? options.searchUrl : null,
-            placeholder: options.optionsFirst ? options.optionsFirst.value ? TIPS : options.optionsFirst.innerHTML || TIPS : TIPS,
+            placeholder: options.placeholder ? TIPS + options.placeholder : TIPS,
             btns: options.radio ? [quickBtns[1]] : [quickBtns[0], quickBtns[1], quickBtns[2]]
         }, fsConfigs[options.name] || fsConfig);
         this.config.searchUrl = options.searchUrl;
@@ -239,6 +240,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
     Common.prototype.init = function (target) {
         var _this2 = this;
 
+
         //初始化页面上已有的select
         $(target ? target : 'select[' + NAME + ']').each(function (index, select) {
             var othis = $(select),
@@ -256,6 +258,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
                 skin: othis.attr(SKIN),
                 direction: othis.attr(DIRECTION),
                 optionsFirst: select.options[0],
+                placeholder: othis.attr(FORM_SELECT_PH),
                 height: othis.attr(HEIGHT),
                 formname: othis.attr('name') || othis.attr('_name'),
                 layverify: othis.attr('lay-verify') || othis.attr('_lay-verify'),
@@ -1351,12 +1354,12 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
         } else {
             var height = title.find('.' + NAME)[0].clientHeight;
-            title.css('height', (height > 36 ? height + 4 : height) + 'px');
+            //title.css('height', (height > 36 ? height + 4 : height) + 'px');
             //如果是layui pane模式, 处理label的高度
             var label = title.parents('.' + PNAME).parent().prev();
             if (label.is('.layui-form-label') && title.parents('.layui-form-pane')[0]) {
                 height = height > 36 ? height + 4 : height;
-                title.css('height', height + 'px');
+                //title.css('height', height + 'px');
                 label.css({
                     height: height + 2 + 'px',
                     lineHeight: height - 18 + 'px'