【新增】广告列表管理新增【广告位】下拉检索，增加行字段说明，增加【原图上传】。

CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertisementController.cs

@@ -221,14 +221,17 @@ namespace CoreCms.Net.Web.Admin.Controllers
         /// <returns></returns>
         [HttpPost]
         [Description("首页数据")]
-        public AdminUiCallBack GetIndex()
+        public async Task<AdminUiCallBack> GetIndex()
         {
             //返回数据
             var jm = new AdminUiCallBack { code = 0 };
             var types = EnumHelper.EnumToList<GlobalEnumVars.AdvertisementType>();
+            var advertPosition = await _coreCmsAdvertPositionServices.QueryAsync();
+
             jm.data = new
             {
-                types
+                types,
+                advertPosition
             };
             return jm;
         }

CoreCms.Net.Web.Admin/wwwroot/views/content/advert/advertisement/create.html

@@ -23,12 +23,17 @@
 
         <div class="layui-form-item">
             <label for="imageUrl" class="layui-form-label">广告图片</label>
-            <div class="layui-input-inline">
+            <div class="layui-input-inline layui-inline-8">
                 <input name="imageUrl" id="imageUrl" lay-verify="required" class="layui-input" placeholder="请上传广告图片" lay-reqText="请上传广告图片" />
             </div>
             <div class="layui-input-inline">
-                <img class="coreshop-upload-img" id="viewImgBoximageUrl" src="{{ layui.setter.noImagePicUrl }}">
+                <div class="layui-upload">
-                <button type="button" class="layui-btn" lay-active="doCropperImg">上传图片</button>
+                    <button type="button" class="layui-btn" lay-active="doCropperImg">裁剪上传</button>
+                    <button type="button" class="layui-btn" id="upBtnOriginal">原图上传</button>
+                    <div class="layui-upload-list">
+                        <img class="layui-upload-img" id="viewImgBoximageUrl" src="{{ layui.setter.noImagePicUrl }}">
+                    </div>
+                </div>
             </div>
         </div>
         <div class="layui-form-item">
@@ -265,6 +270,27 @@
                         });
                     }
                 });
+
+                //原图上传
+                upload.render({
+                    elem: '#upBtnOriginal'
+                    , url: layui.setter.apiUrl + 'Api/Tools/UploadFiles'
+                    , done: function (res) {
+                        if (res.code > 0) { return layer.msg('上传失败'); }
+                        layer.msg('上传成功');
+                        $('#viewImgBoximageUrl').attr('src', res.data.fileUrl);
+                        $("#imageUrl").val(res.data.fileUrl);
+                    }
+                    , error: function () {
+                        var viewTextBox = $('#viewTextBox');
+                        viewTextBox.html('<span style="color: #FF5722;">上传失败</span> <a class="layui-btn layui-btn-xs demo-reload">重试</a>');
+                        viewTextBox.find('.demo-reload').on('click', function () {
+                            uploadInst.upload();
+                        });
+                    }
+                });
+
+
                 form.verify({
 
                     verifyname: [/^[\S]{0,50}$/, '广告名称最大只允许输入50位字符，且不能出现空格'],

CoreCms.Net.Web.Admin/wwwroot/views/content/advert/advertisement/edit.html

@@ -24,13 +24,17 @@
 
         <div class="layui-form-item">
             <label for="imageUrl" class="layui-form-label">广告图片</label>
-            <div class="layui-input-inline">
+            <div class="layui-input-inline layui-inline-8">
                 <input name="imageUrl" id="imageUrl" lay-verify="required" class="layui-input" value="{{d.params.data.model.imageUrl || '' }}" placeholder="请上传广告图片id" lay-reqText="请上传广告图片id" />
             </div>
-            
             <div class="layui-input-inline">
-                <img class="coreshop-upload-img" id="viewImgBoximageUrl" src="{{d.params.data.model.imageUrl || layui.setter.noImagePicUrl }}">
+                <div class="layui-upload">
-                <button type="button" class="layui-btn" lay-active="doCropperImg">上传图片</button>
+                    <button type="button" class="layui-btn" lay-active="doCropperImg">裁剪上传</button>
+                    <button type="button" class="layui-btn" id="upBtnOriginal">原图上传</button>
+                    <div class="layui-upload-list">
+                        <img class="layui-upload-img" id="viewImgBoximageUrl" src="{{d.params.data.model.imageUrl || layui.setter.noImagePicUrl }}">
+                    </div>
+                </div>
             </div>
         </div>
 
@@ -269,6 +273,26 @@
                     }
                 });
 
+                //原图上传
+                upload.render({
+                    elem: '#upBtnOriginal'
+                    , url: layui.setter.apiUrl + 'Api/Tools/UploadFiles'
+                    , done: function (res) {
+                        if (res.code > 0) { return layer.msg('上传失败'); }
+                        layer.msg('上传成功');
+                        $('#viewImgBoximageUrl').attr('src', res.data.fileUrl);
+                        $("#imageUrl").val(res.data.fileUrl);
+                    }
+                    , error: function () {
+                        var viewTextBox = $('#viewTextBox');
+                        viewTextBox.html('<span style="color: #FF5722;">上传失败</span> <a class="layui-btn layui-btn-xs demo-reload">重试</a>');
+                        viewTextBox.find('.demo-reload').on('click', function () {
+                            uploadInst.upload();
+                        });
+                    }
+                });
+
+
                 form.verify({
 
                     verifyname: [/^[\S]{0,50}$/, '广告名称最大只允许输入50位字符，且不能出现空格'],

CoreCms.Net.Web.Admin/wwwroot/views/content/advert/advertisement/index.html

@@ -25,6 +25,16 @@
                     <input type="text" name="name" id="name" placeholder="请输入广告名称" class="layui-input">
                 </div>
             </div>
+            <div class="layui-inline">
+                <div class="layui-input-inline">
+                    <select name="positionId">
+                        <option value="">所属广告位</option>
+                        {{# layui.each(indexData.advertPosition, function(index, item){ }}
+                        <option value="{{ item.id }}">{{ item.name }}</option>
+                        {{# }); }}
+                    </select>
+                </div>
+            </div>
             <div class="layui-inline">
                 <div class="layui-input-inline core-time-input">
                     <input type="text" name="updateTime" id="searchTime-CoreCmsAdvertisement-updateTime" placeholder="请输入更新时间" class="layui-input">
@@ -96,7 +106,18 @@
                     cols: [
                         [
                             { field: 'id', title: '序列', width: 60, sort: false },
-                            { field: 'positionId', title: '广告位序列', sort: false },
+                            //{ field: 'positionId', title: '广告位序列', sort: false },
+                            {
+                                field: 'positionId', title: '广告位名称', sort: false,
+                                templet: function (data) {
+                                    for (var i = 0; i < d.data.advertPosition.length; i++) {
+                                        if (data.positionId == d.data.advertPosition[i].id) {
+                                            return d.data.advertPosition[i].name;
+                                        }
+                                    }
+                                    return "";
+                                }
+                            },
                             { field: 'name', title: '广告名称', sort: false },
                             {
                                 field: 'imageUrl', title: '广告图片', width: 100, sort: false,
@@ -162,7 +183,7 @@
                             admin.popup({
                                 shadeClose: false,
                                 title: '创建数据',
-                                area: ['600px', '550px'],
+                                area: ['800px', '550px'],
                                 id: 'LAY-popup-CoreCmsAdvertisement-create',
                                 success: function (layero, index) {
                                     view(this.id).render('content/advert/advertisement/create', { data: e.data }).done(function () {
@@ -218,7 +239,7 @@
                             admin.popup({
                                 shadeClose: false,
                                 title: '编辑数据',
-                                area: ['600px', '550px'],
+                                area: ['800px', '550px'],
                                 id: 'LAY-popup-CoreCmsAdvertisement-edit',
                                 success: function (layero, index) {
                                     view(this.id).render('content/advert/advertisement/edit', { data: e.data }).done(function () {