Merge branch 'zjl_iteration_20181127' into development

public/js/order.js

@@ -359,7 +359,7 @@
                                             '<label class="radio-inline"><input type="radio" name="cancel_reason" value="1">其他</label>'+
                                         '</div>'+
 
-                                        '<div class="input-other-reason">'+
+                                        '<div class="input-other-reason" style="display:none;">'+
                                             '<textarea class="form-control" name="input-other-reason" placeholder="请填写其他原因"></textarea>'+
                                         '</div>'+
                                     '</div>';
@@ -411,6 +411,19 @@
                         }
                     })
                 })
+                
+                // 显示或隐藏 其他输入框
+                $(document).delegate('input[name=cancel_reason]', 'click', function() {
+                    var cancel_reason = $('input[name=cancel_reason]:checked').val();
+
+                    if (cancel_reason == 1) {
+                        $('.input-other-reason').show();
+                        $('.layui-layer-content').css('height', '310px');
+                    } else {
+                        $('.input-other-reason').hide();
+                        $('.layui-layer-content').css('height', 'auto');
+                    }
+                })
             },
 
 			details:function(){