Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Views/Perm_Function/Form.cshtml

@@ -18,10 +18,10 @@
     <div class="col-xs-12 lr-form-item" data-table="Perm_Function">
         <div class="lr-form-item-title">登录接口地址<font face="宋体">*</font></div>
         <input id="FInterfaceUrl" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>  
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="Perm_Function" style="display: none;" id="divFId">
         <div class="lr-form-item-title">appid</div>
-        <input id="FId" type="text" class="form-control"  disabled="disabled" />
+        <input id="FId" type="text" class="form-control" disabled="disabled" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Perm_Function">
         <div class="lr-form-item-title">应用私钥<font face="宋体">*</font></div>
@@ -35,13 +35,17 @@
         <div class="lr-form-item-title">是否启用<font face="宋体">*</font></div>
         <div id="FEnabled" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="Perm_Function">
+    <div class="col-xs-6 lr-form-item" data-table="Perm_Function">
         <div class="lr-form-item-title">是否管理页<font face="宋体">*</font></div>
         <div id="FIsManagePage" isvalid="yes" checkexpession="NotNull"></div>
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="Perm_Function">
+        <div class="lr-form-item-title">是否手机端<font face="宋体">*</font></div>
+        <div id="FIsH5" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="Perm_Function">
         <div class="lr-form-item-title">图片<font face="宋体">*</font></div>
-        <div id="FImage" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="FImage" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Perm_Function">
         <div class="lr-form-item-title">备注</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Views/Perm_Function/Form.js

@@ -30,6 +30,7 @@ var bootstrap = function ($, learun) {
             }
             $('#FEnabled').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#FIsManagePage').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#FIsH5').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#FImage').lrUploader();
         },
         initData: function () {