Merge remote-tracking branch 'origin/develop' into develop

app/admin/view/teaching_knowledge/form.html

@@ -30,10 +30,6 @@
             </table>
         </div>
 
-        <label class="layui-form-item relative block">
-            <input type="text" name="mut" width="1000px">
-            <a data-file data-type="png,jpg,jpeg" data-field="mut">上传文件</a>
-        </label>
 
 
 
@@ -43,6 +39,15 @@
                 <textarea class="layui-hide" name="content" placeholder="请输入内容">{$vo.content|default=''}</textarea>
             </div>
         </div>
+        <div class="layui-form-item label-required-prev">
+            <tr>
+                <td  width="10%" class="infoBoxTd"><div style="width:55px;">话题<br />(<a href="#" id="AddMoreFileBox" style="color: red" class="btn btn-info">添加</a>):</div></td>
+                <td colspan="2" id="InputsWrapper">
+
+                </td>
+            </tr>
+        </div>
+
 
         <div class="hr-line-dashed"></div>
         {notempty name='vo.id'}<input name='id' type='hidden' value='{$vo.id}'>{/notempty}
@@ -60,89 +65,40 @@
     require(['ckeditor'], function () {
         window.createEditor('[name=content]', {height: 350})
     });
-    layui.use(['upload', 'element', 'layer'], function() {
-        var $ = layui.jquery
-            , upload = layui.upload
-            , element = layui.element
-            , layer = layui.layer;
-
-        upload.render({
-            elem: '#test5'
-            ,url: '' //此处配置你自己的上传接口即可
-            ,accept: 'video' //视频
-            ,done: function(res){
-                layer.msg('上传成功');
-                console.log(res)
+
+    $(document).ready(function() {
+
+        var MaxInputs       = 100;
+        var InputsWrapper   = $("#InputsWrapper");
+        var AddButton       = $("#AddMoreFileBox");
+
+        var x = InputsWrapper.length;
+        var FieldCount=1;
+
+        $(AddButton).click(function (e)
+        {
+            console.log(x)
+            if(x <= MaxInputs)
+            {
+                FieldCount++;
+                //add input box
+                $(InputsWrapper).append('<span><input type="text" name="mytext[]" id="field_'+ FieldCount +'" value="" style="width:400px;"/><a href="#" class="removeclass">×</a>&nbsp;&nbsp;</span>');
+                x++; //text box increment
             }
+            return false;
         });
 
-        //演示多文件列表
-        var uploadListIns = upload.render({
-            elem: '#testList'
-            ,elemList: $('#demoList') //列表元素对象
-            ,url: 'https://httpbin.org/post' //此处用的是第三方的 http 请求演示，实际使用时改成您自己的上传接口即可。
-            ,accept: 'file'
-            ,multiple: true
-            ,number: 3
-            ,auto: false
-            ,bindAction: '#testListAction'
-            ,choose: function(obj){
-                var that = this;
-                var files = this.files = obj.pushFile(); //将每次选择的文件追加到文件队列
-                //读取本地文件
-                obj.preview(function(index, file, result){
-                    var tr = $(['<tr id="upload-'+ index +'">'
-                        ,'<td>'+ file.name +'</td>'
-                        ,'<td>'+ (file.size/1014).toFixed(1) +'kb</td>'
-                        ,'<td><div class="layui-progress" lay-filter="progress-demo-'+ index +'"><div class="layui-progress-bar" lay-percent=""></div></div></td>'
-                        ,'<td>'
-                        ,'<button class="layui-btn layui-btn-xs demo-reload layui-hide">重传</button>'
-                        ,'<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">删除</button>'
-                        ,'</td>'
-                        ,'</tr>'].join(''));
-
-                    //单个重传
-                    tr.find('.demo-reload').on('click', function(){
-                        obj.upload(index, file);
-                    });
-
-                    //删除
-                    tr.find('.demo-delete').on('click', function(){
-                        delete files[index]; //删除对应的文件
-                        tr.remove();
-                        uploadListIns.config.elem.next()[0].value = ''; //清空 input file 值，以免删除后出现同名文件不可选
-                    });
-
-                    that.elemList.append(tr);
-                    element.render('progress'); //渲染新加的进度条组件
-                });
-            }
-            ,done: function(res, index, upload){ //成功的回调
-                var that = this;
-                //if(res.code == 0){ //上传成功
-                var tr = that.elemList.find('tr#upload-'+ index)
-                    ,tds = tr.children();
-                tds.eq(3).html(''); //清空操作
-                delete this.files[index]; //删除文件队列已经上传成功的文件
-                return;
-                //}
-                this.error(index, upload);
-            }
-            ,allDone: function(obj){ //多文件上传完毕后的状态回调
-                console.log(obj)
-            }
-            ,error: function(index, upload){ //错误回调
-                var that = this;
-                var tr = that.elemList.find('tr#upload-'+ index)
-                    ,tds = tr.children();
-                tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //显示重传
+        $("body").on("click",".removeclass", function(e){
+            if( x > 0 ) {
+                $(this).parent('span').remove(); //remove text box
+                x--;
             }
-            ,progress: function(n, elem, e, index){ //注意：index 参数为 layui 2.6.6 新增
-                element.progress('progress-demo-'+ index, n + '%'); //执行进度条。n 即为返回的进度百分比
-            }
-        });
+            return false;
+        })
 
     });
 
+
+
 </script>
 {/block}

app/data/controller/api/auth/Center.php

@@ -1494,10 +1494,10 @@ class Center extends Auth
      */
     public function getandroidversion(){
         $info= [
-            'version'=>sysconf('android.version'),
+            'version'=>(int)sysconf('android.version'),
             'name'=>sysconf('android.name'),
             'title'=>sysconf('android.title'),
-            'isCompel'=>sysconf('android.isCompel'),
+            'isCompel'=>(int)sysconf('android.isCompel'),
             'content'=>sysconf('android.content'),
             'download_url'=>sysconf('android.download_url'),
         ];