Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop

username@email.com

2024-03-25 926774478bbab4b0ecf6a92b0889bd497be425bc

Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop

# Conflicts:
#	CoreCms.Net.Model/CoreCms.Net.Model.xml

 CoreCms.Net.Model/Entities/baifenbingfa/Promote/bloggers.cs

@@ -95,5 +95,12 @@
        [Display(Name = "运营经理")]
        [SugarColumn(ColumnDescription = "运营经理")]
        public string mangerName { get; set; }

        /// <summary>
        /// 备注
        /// </summary>	
        [Display(Name = "备注")]
        [SugarColumn(ColumnDescription = "备注",IsNullable =true)]
        public string reMaker { get; set; }
    }
}

 CoreCms.Net.Repository/blogger/bloggersInfoRepository.cs

@@ -200,6 +200,7 @@
                createBy = p.createBy,
                upDataBy = p.upDataBy,
                isdelete = p.isdelete,
                reMaker =p.reMaker,
                
                }).With(SqlWith.NoLock).ToPageListAsync(pageIndex, pageSize, totalCount);
            }
@@ -226,6 +227,7 @@
                createBy = p.createBy,
                upDataBy = p.upDataBy,
                isdelete = p.isdelete,
                reMaker = p.reMaker,    
                
                }).ToPageListAsync(pageIndex, pageSize, totalCount);
            }

 CoreCms.Net.Services/blogger/bloggersInfoServices.cs

@@ -105,6 +105,7 @@
            oldmod.mangerName= entity.mangerName;
            oldmod.nickname= entity.nickname;
            oldmod.intentionDec= entity.intentionDec;
            oldmod.reMaker= entity.reMaker;
            var oldMeetings = await db.Queryable<meeting>().Where(x => x.bloggerID == oldmod.id).OrderBy(x=>x.id).ToListAsync();
            var oldIntentions = await db.Queryable<intention>().Where(x => x.bloggerID == oldmod.id).OrderBy(x => x.id).ToListAsync();
            foreach (var intention in entity.intentions)

 CoreCms.Net.Web.Admin/Controllers/blogger/bloggersInfoController.cs

@@ -34,6 +34,7 @@
using CoreCms.Net.Model.Entities.baifenbingfa.Promote;
using CoreCms.Net.IRepository.UnitOfWork;
using CoreCms.Net.Repository.UnitOfWork;
using Microsoft.CodeAnalysis.Rename;

namespace CoreCms.Net.Web.Admin.Controllers
{
@@ -172,6 +173,12 @@
            {
                where = where.And(p => p.mangerName.Contains(mangerName));
            }
            //运营经理 varchar
            var reMaker = Request.Form["reMaker"].FirstOrDefault();
            if (!string.IsNullOrEmpty(reMaker))
            {
                where = where.And(p => p.reMaker.Contains(reMaker));
            }
            //建立时间 datetime
            var createTime = Request.Form["createTime"].FirstOrDefault();
            if (!string.IsNullOrEmpty(createTime))

 CoreCms.Net.Web.Admin/Properties/PublishProfiles/FolderProfile.pubxml

@@ -4,7 +4,7 @@
-->
<Project>
  <PropertyGroup>
    <DeleteExistingFiles>false</DeleteExistingFiles>
    <DeleteExistingFiles>true</DeleteExistingFiles>
    <ExcludeApp_Data>false</ExcludeApp_Data>
    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
@@ -16,7 +16,7 @@
    <SiteUrlToLaunchAfterPublish />
    <TargetFramework>net8.0</TargetFramework>
    <ProjectGuid>95487ef2-3942-4f9b-8ece-acd7a4b304d9</ProjectGuid>
    <SelfContained>false</SelfContained>
    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
    <SelfContained>true</SelfContained>
    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
  </PropertyGroup>
</Project>

 CoreCms.Net.Web.Admin/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -5,7 +5,7 @@
<Project>
  <PropertyGroup>
    <_PublishTargetUrl>D:\百分百兵法\amdin</_PublishTargetUrl>
    <History>True|2024-03-12T02:40:47.9194314Z||;True|2024-03-12T10:34:02.7762360+08:00||;True|2024-03-05T11:41:33.0893153+08:00||;True|2024-03-05T11:40:03.2217071+08:00||;True|2024-03-05T11:36:59.7527058+08:00||;True|2024-03-05T11:28:53.3016177+08:00||;True|2024-03-05T11:25:36.1455179+08:00||;True|2024-03-05T11:21:14.3434416+08:00||;True|2024-03-05T11:19:24.1653295+08:00||;True|2024-03-05T11:09:56.2458501+08:00||;True|2024-03-05T11:07:48.5516657+08:00||;True|2024-03-05T11:02:55.2646393+08:00||;True|2024-03-05T10:56:05.2900663+08:00||;</History>
    <History>True|2024-03-22T07:47:32.7654733Z||;True|2024-03-22T15:09:29.2264498+08:00||;True|2024-03-22T15:07:15.2508456+08:00||;True|2024-03-22T15:05:16.2711535+08:00||;False|2024-03-22T15:04:31.2575304+08:00||;True|2024-03-22T15:03:00.8920659+08:00||;True|2024-03-22T15:01:27.3610041+08:00||;True|2024-03-22T14:57:44.8810310+08:00||;True|2024-03-12T10:40:47.9194314+08:00||;True|2024-03-12T10:34:02.7762360+08:00||;True|2024-03-05T11:41:33.0893153+08:00||;True|2024-03-05T11:40:03.2217071+08:00||;True|2024-03-05T11:36:59.7527058+08:00||;True|2024-03-05T11:28:53.3016177+08:00||;True|2024-03-05T11:25:36.1455179+08:00||;True|2024-03-05T11:21:14.3434416+08:00||;True|2024-03-05T11:19:24.1653295+08:00||;True|2024-03-05T11:09:56.2458501+08:00||;True|2024-03-05T11:07:48.5516657+08:00||;True|2024-03-05T11:02:55.2646393+08:00||;True|2024-03-05T10:56:05.2900663+08:00||;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>

 CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/create.html

@@ -12,11 +12,11 @@
        <div class="layui-input-block">
          <input
            name="platforms"
            placeholder="请输入入住平台"
            class="layui-input"
            lay-verType="tips"
            lay-verify="required"
            class="layui-input"
            placeholder="请输入入住平台"
            lay-reqText="请输入入住平台"
            id="ID-dropdown-platforms-base-input"
          />
        </div>
      </div>
@@ -28,9 +28,8 @@
        >
        <div class="layui-input-inline" style="width: 110px;">
          <input
            type="number"
            min="0"
            max="999999"
          
           
            name="followersCount"
            lay-verType="tips"
            lay-verify="required|number"
@@ -40,7 +39,7 @@
            lay-reqText="请输入粉丝数量并为数字"
          />
        </div>
        <span class="layui-form-mid">元</span>
        <span class="layui-form-mid">个</span>
      </div>
    </div>
    <div class="layui-form-item">
@@ -125,9 +124,11 @@
      </div>
    </div> -->
    <div class="layui-form-item">
        <label for="areaId" class="layui-form-label layui-form-required">所在地区</label>
        <label for="areaId" class="layui-form-label layui-form-required"
          >所在地区</label
        >
        <div class="layui-input-block layui-inline-4 address-class">
            <input type="hidden" name="CreatareaId">
          <input type="hidden" name="CreatareaId" />
        </div>
    </div>

@@ -147,8 +148,6 @@
      </div>
    </div>

   

    <div class="layui-form-item">
      <label for="intentionDec" class="layui-form-label  layui-form-required"
        >合作意向</label
@@ -161,12 +160,15 @@
          class="layui-input"
          placeholder="请输入合作意向"
          lay-reqText="请输入合作意向"
            id="intentionDec"
        />
      </div>
    </div>
 <div class="layui-form-item">
    <div class="layui-inline">
      <label for="PromoteMoney" class="layui-form-label  layui-form-required"
          <label
            for="PromoteMoney"
            class="layui-form-label  layui-form-required"
        >推广费用</label
      >
      <div class="layui-input-inline " style="width: 110px;">
@@ -178,7 +180,6 @@
          placeholder="请输入推广费用"
          lay-reqText="请输入推广费用"
        />
       
      </div>
     <span class="layui-form-mid layui-word-aux">元</span>
    </div>
@@ -196,9 +197,25 @@
          lay-reqText="请输入运营经理"
        />
      </div>
    </div>

</div>

      </div>
      <div class="layui-inline">
        <label for="reMaker" class="layui-form-label"
          >备注</label
        >
        <div class="layui-input-inline">
          <input
            name="reMaker"
            lay-verType="tips"         
            class="layui-input"
            placeholder="备注"
            lay-reqText="备注"
          />
        </div>

      </div>

    <div class="layui-form-item text-right core-hidden">
      <input
@@ -210,9 +227,8 @@
        value="确认添加"
      />
    </div>


 
    </div>
  </div>
</script>
<script>
  var debug = layui.setter.debug;
@@ -230,10 +246,52 @@
          laydate = layui.laydate,
          upload = layui.upload,
          cropperImg = layui.cropperImg,
          coreHelper = layui.coreHelper;
          coreHelper = layui.coreHelper,
          dropdown = layui.dropdown;

          formatAreaInPut(coreHelper,"CreatareaId");

        dropdown.render({
          elem: "#ID-dropdown-platforms-base-input",
          data: [
            {
              title: "抖音",
              id: 101,
            },
            {
              title: "腾讯",
              id: 102,
            },
            {
              title: "小红书",
              id: 103,
            }
          ],
          click: function (obj) {
            this.elem.val(obj.title);
          },
          style: "min-width: 235px;",
        });
        dropdown.render({
          elem: "#intentionDec",
          data: [
            {
              title: "大",
              id: 101,
            },
            {
              title: "小",
              id: 102,
            },
            {
              title: "不确定",
              id: 103,
            }
          ],
          click: function (obj) {
            this.elem.val(obj.title);
          },
          style: "min-width: 235px;",
        });
        laydate.render({
          elem: "#createTime-bloggersInfo-createTime",
          type: "datetime",

 CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/details.html

@@ -134,8 +134,25 @@
      <div class="layui-form-item">
          <label for="mangerName" class="layui-form-label  disabled layui-form-required">运营经理</label>
          <div class="layui-input-block">
              <input name="mangerName"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="请输入运营经理" lay-reqText="请输入运营经理"  value="{{d.params.data.mangerName || '' }}" />
              <input name="mangerName" disabled  lay-verType="tips" lay-verify="required" class="layui-input" placeholder="请输入运营经理" lay-reqText="请输入运营经理"  value="{{d.params.data.mangerName || '' }}" />
          </div>
      </div>

          </div>
          <div class="layui-inline">
            <label for="reMaker" class="layui-form-label disabled "
              >备注</label
            >
            <div class="layui-input-block">
              <input
              disabled
                name="reMaker"
                lay-verType="tips"
                class="layui-input"
                placeholder="备注"
                lay-reqText="备注"
                value="{{d.params.data.reMaker || '' }}"
              />
      </div>

          </div>
@@ -240,10 +257,10 @@
  }
</style>


<script type="text/html" id="ID-table-demo-page-pagebar">
    <div class="layui-btn-container">
      <button class="layui-btn layui-btn-sm" lay-event="footerDemoBtn1">添加记录</button>
   
    <button class="layui-btn layui-btn-sm" lay-event="footerDemoBtn1">
      添加记录
    </button>
    </div>
  </script>

 CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/edit.html

@@ -11,17 +11,19 @@
          <label for="platforms" class="layui-form-label  layui-form-required"
            >入住平台</label
          >
         
          
          <div class="layui-input-block">
            <input
              name="platforms"
              lay-verType="tips"
              lay-verify="required"
              class="layui-input"
              placeholder="请输入入住平台"
              lay-reqText="请输入入住平台"
                class="layui-input"
                id="ID-dropdown-platforms-base-input"
              value="{{d.params.data.platforms || '' }}"
            />
          </div>
         
        </div>
      </div>
      <div class="layui-col-xs4">
@@ -191,6 +193,7 @@
                placeholder="请输入合作意向"
                lay-reqText="请输入合作意向"
                value="{{d.params.data.intentionDec || '' }}"
                id="intentionDec"
              />
            </div>
          </div>
@@ -215,6 +218,22 @@
            </div>
          </div>
        </div>
      </div>
      <div class="layui-inline">
        <label for="reMaker" class="layui-form-label "
          >备注</label
        >
        <div class="layui-input-block">
          <input
            name="reMaker"
            lay-verType="tips"         
            class="layui-input"
            placeholder="备注"
            lay-reqText="备注"
            value="{{d.params.data.reMaker || '' }}"
          />
        </div>

      </div>

      <div class="layui-form-item">
@@ -298,7 +317,50 @@
          upload = layui.upload,
          cropperImg = layui.cropperImg,
          table = layui.table,
          dropdown=layui.dropdown,
          coreHelper = layui.coreHelper;
          dropdown.render({
          elem: "#ID-dropdown-platforms-base-input",
          data: [
            {
              title: "抖音",
              id: 101,
            },
            {
              title: "腾讯",
              id: 102,
            },
            {
              title: "小红书",
              id: 103,
            }
          ],
          click: function (obj) {
            this.elem.val(obj.title);
          },
          style: "min-width: 235px;",
        });
        dropdown.render({
          elem: "#intentionDec",
          data: [
            {
              title: "大",
              id: 101,
            },
            {
              title: "小",
              id: 102,
            },
            {
              title: "不确定",
              id: 103,
            }
          ],
          click: function (obj) {
            this.elem.val(obj.title);
          },
          style: "min-width: 235px;",
        });

        formatAreaInPut(
          coreHelper,

 CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/index.html

@@ -2,19 +2,29 @@
<!--当前位置开始-->
<div class="layui-card layadmin-header">
    <div class="layui-breadcrumb" lay-filter="breadcrumb">
        <script type="text/html" template lay-done="layui.data.updateMainBreadcrumb();">
        </script>
    <script
      type="text/html"
      template
      lay-done="layui.data.updateMainBreadcrumb();"
    ></script>
    </div>
</div>
<!--当前位置结束-->
<style>
    /* 重写样式 */
</style>
<script type="text/html" template lay-type="Post" lay-url="Api/bloggersInfo/GetIndex" lay-done="layui.data.done(d);">
    
</script>
<script
  type="text/html"
  template
  lay-type="Post"
  lay-url="Api/bloggersInfo/GetIndex"
  lay-done="layui.data.done(d);"
></script>
<div class="table-body">
    <table  id="LAY-app-bloggersInfo-tableBox" lay-filter="LAY-app-bloggersInfo-tableBox"></table>
  <table
    id="LAY-app-bloggersInfo-tableBox"
    lay-filter="LAY-app-bloggersInfo-tableBox"
  ></table>
</div>

<script type="text/html" id="LAY-app-bloggersInfo-toolbar">
@@ -23,7 +33,13 @@
            <div class="layui-inline">
                <label class="layui-form-label" for="createTime">新增时间</label>
                <div class="layui-input-inline" style="width: 260px;">
                    <input type="text" name="createTime" id="searchTime-bloggersInfo-createTime" placeholder="请输入建立时间" class="layui-input">
          <input
            type="text"
            name="createTime"
            id="searchTime-bloggersInfo-createTime"
            placeholder="请输入建立时间"
            class="layui-input"
          />
                </div>
            </div>
            <!-- <div class="layui-inline">
@@ -35,13 +51,20 @@
            <div class="layui-inline areaCode">
                <label class="layui-form-label" for="areaCode">区域</label>
                <div class="layui-input-inline selaroeinline"  style="width: 300px;">
                    <input type="hidden"name="bloggerSesareaId"  >
          <input type="hidden" name="bloggerSesareaId" />
                </div>
            </div>
            <div class="layui-inline">
                <label class="layui-form-label" for="platforms">入住平台</label>
                <div class="layui-input-inline" >
                    <input type="text" name="platforms"  placeholder="请输入入住平台" class="layui-input">
          <input
           
            name="platforms"
            placeholder="请输入入住平台"
            class="layui-input"
            id="ID-dropdown-platforms-Ss-input"
          />
          
                </div>
            </div>
            <!-- <div class="layui-inline">
@@ -53,7 +76,12 @@
            <div class="layui-inline">
                <label class="layui-form-label" for="nickname">博主网名</label>
                <div class="layui-input-inline">
                    <input type="text" name="nickname"  placeholder="请输入网名" class="layui-input">
          <input
            type="text"
            name="nickname"
            placeholder="请输入网名"
            class="layui-input"
          />
                </div>
            </div>
            <!-- <div class="layui-inline">
@@ -71,41 +99,67 @@
            <div class="layui-inline">
                <label class="layui-form-label" for="weiXin">微信号</label>
                <div class="layui-input-inline">
                    <input type="text" name="weiXin"  placeholder="请输入微信号" class="layui-input">
          <input
            type="text"
            name="weiXin"
            placeholder="请输入微信号"
            class="layui-input"
          />
                </div>
            </div>
           
        
            <!-- <div class="layui-inline">
                <label class="layui-form-label" for="PromoteMoney">推广费用</label>
                <div class="layui-input-inline">
                    <input type="text" name="PromoteMoney"  placeholder="请输入推广费用" class="layui-input">
                </div>
            </div> -->
            <div class="layui-inline">
                <label class="layui-form-label" for="intentionDec">合作意向</label>
                <div class="layui-input-inline">
                    <input type="text" name="intentionDec"  placeholder="请输入合作意向" class="layui-input">
         
          <input
          name="intentionDec"
      
          class="layui-input"
          placeholder="请输入合作意向"
          lay-reqText="请输入合作意向"
          id="intentionDec-ss"
        />
                </div>
            </div>
            <div class="layui-inline">
                <label class="layui-form-label" for="mangerName">运营经理</label>
                <div class="layui-input-inline">
                    <input type="text" name="mangerName"  placeholder="请输入运营经理" class="layui-input">
          <input
            type="text"
            name="mangerName"
            placeholder="请输入运营经理"
            class="layui-input"
          />
                </div>
            </div>
         
            
            <div class="layui-inline">
                <label class="layui-form-label" for="reMaker">备注</label>
                <div class="layui-input-inline">
                    <input type="text" name="reMaker"  placeholder="备注" class="layui-input">
                </div>
            </div>
            <div class="layui-inline">
                <label class="layui-form-label" for="createBy">信息录入</label>
                <div class="layui-input-inline">
                    <input type="text" name="createBy"  placeholder="请输入创建人" class="layui-input">
          <input
            type="text"
            name="createBy"
            placeholder="请输入创建人"
            class="layui-input"
          />
                </div>
            </div>
          
           
            <div class="layui-inline">
                <button class="layui-btn layui-btn-sm" lay-submit lay-filter="LAY-app-bloggersInfo-search"><i class="layui-icon layui-icon-search"></i>筛选</button>
        <button
          class="layui-btn layui-btn-sm"
          lay-submit
          lay-filter="LAY-app-bloggersInfo-search"
        >
          <i class="layui-icon layui-icon-search"></i>筛选
        </button>
            </div>
        </div>
    </div>
@@ -113,19 +167,37 @@

<script type="text/html" id="LAY-app-bloggersInfo-pagebar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" lay-event="addData"><i class="layui-icon layui-icon-add-1"></i>添加数据</button>
        <button class="layui-btn layui-btn-sm" lay-event="batchDelete"><i class="layui-icon layui-icon-delete"></i>批量删除</button>
        <button class="layui-btn layui-btn-sm" lay-event="selectExportExcel"><i class="layui-icon layui-icon-add-circle"></i>选择导出</button>
        <button class="layui-btn layui-btn-sm" lay-event="queryExportExcel"><i class="layui-icon layui-icon-download-circle"></i>查询导出</button>
    <button class="layui-btn layui-btn-sm" lay-event="addData">
      <i class="layui-icon layui-icon-add-1"></i>添加数据
    </button>
    <button class="layui-btn layui-btn-sm" lay-event="batchDelete">
      <i class="layui-icon layui-icon-delete"></i>批量删除
    </button>
    <button class="layui-btn layui-btn-sm" lay-event="selectExportExcel">
      <i class="layui-icon layui-icon-add-circle"></i>选择导出
    </button>
    <button class="layui-btn layui-btn-sm" lay-event="queryExportExcel">
      <i class="layui-icon layui-icon-download-circle"></i>查询导出
    </button>
    </div>
</script>

<script type="text/html" id="LAY-app-bloggersInfo-tableBox-bar">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看</a>
  <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail"
    >查看</a
  >
    <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs" data-dropdown="#bloggersInfoTbDelDrop{{d.LAY_INDEX}}" no-shade="true">删除</a>
    <div class="dropdown-menu-nav dropdown-popconfirm dropdown-top-right layui-hide" id="bloggersInfoTbDelDrop{{d.LAY_INDEX}}"
         style="max-width: 200px;white-space: normal;min-width: auto;margin-left: 10px;">
  <a
    class="layui-btn layui-btn-danger layui-btn-xs"
    data-dropdown="#bloggersInfoTbDelDrop{{d.LAY_INDEX}}"
    no-shade="true"
    >删除</a
  >
  <div
    class="dropdown-menu-nav dropdown-popconfirm dropdown-top-right layui-hide"
    id="bloggersInfoTbDelDrop{{d.LAY_INDEX}}"
    style="max-width: 200px;white-space: normal;min-width: auto;margin-left: 10px;"
  >
        <div class="dropdown-anchor"></div>
        <div class="dropdown-popconfirm-title">
            <i class="layui-icon layui-icon-help"></i>
@@ -143,65 +215,99 @@
    var debug= layui.setter.debug;
    layui.data.done = function (d) {
        //开启调试情况下获取接口赋值数据
        if (debug) { console.log(d); }
    if (debug) {
      console.log(d);
    }

        indexData = d.data;
        layui.use(['index', 'table', 'laydate', 'util', 'coredropdown', 'coreHelper'],
    layui.use(
      ["index", "table", "laydate", "util", "coredropdown", "coreHelper"],
            function () {
                var $ = layui.$
                    , admin = layui.admin
                    , table = layui.table
                    , form = layui.form
                    , laydate = layui.laydate
                    , setter = layui.setter
                    , coreHelper = layui.coreHelper
                    , util = layui.util
                    , view = layui.view;
        var $ = layui.$,
          admin = layui.admin,
          table = layui.table,
          form = layui.form,
          laydate = layui.laydate,
          setter = layui.setter,
          coreHelper = layui.coreHelper,
          util = layui.util,
          dropdown = layui.dropdown,
          view = layui.view;
                
                var searchwhere;
               
                formatAreaInPut(coreHelper,"bloggerSesareaId");
                //监听搜索
                form.on('submit(LAY-app-bloggersInfo-search)',
                    function(data) {
        form.on("submit(LAY-app-bloggersInfo-search)", function (data) {
                        var field = data.field;
                        field.areaCode=GetAreaCodeFormFileid(field,"bloggerSesareaId");
                        searchwhere = field;
                        
                        //执行重载
                        table.reloadData('LAY-app-bloggersInfo-tableBox',{ where: field });
          table.reloadData("LAY-app-bloggersInfo-tableBox", { where: field });
                    });
                //数据绑定
                table.render({
                    elem: '#LAY-app-bloggersInfo-tableBox',
                    url: layui.setter.apiUrl + 'Api/bloggersInfo/GetPageList',
                    method: 'POST',
                    toolbar: '#LAY-app-bloggersInfo-toolbar',
                    pagebar: '#LAY-app-bloggersInfo-pagebar',
                    className: 'pagebarbox',
                    defaultToolbar: ['filter', 'print', 'exports'],
                    height: 'full-127',//面包屑142px,搜索框4行172,3行137,2行102,1行67
          elem: "#LAY-app-bloggersInfo-tableBox",
          url: layui.setter.apiUrl + "Api/bloggersInfo/GetPageList",
          method: "POST",
          toolbar: "#LAY-app-bloggersInfo-toolbar",
          pagebar: "#LAY-app-bloggersInfo-pagebar",
          className: "pagebarbox",
          defaultToolbar: ["filter", "print", "exports"],
          height: "full-127", //面包屑142px,搜索框4行172,3行137,2行102,1行67
                    page: true,
                    limit: 30,
                    limits: [10, 15, 20, 25, 30, 50, 100, 200],
                    text: {none: '暂无相关数据'},
          text: { none: "暂无相关数据" },
                    cols: [
                        [

                            { type: "checkbox", fixed: "left" },                         
                            { field: 'createTime', title: '新增时间', width: 150, sort: false},
                            { field: 'nickname', title: '网名', sort: false,templet: '#nickname',width: 105 },
                            { field: 'followersCount', title: '粉丝数量', sort: false,width: 105 },
                            { field: 'platforms', title: '入住平台', sort: false ,with:300},
                            { field: 'areaCodeName', title: '区域', sort: false,with:300},
                            { field: 'createBy', title: '信息录入', sort: false,width: 100 },
                            { field: 'mangerName', title: '运营经理', sort: false,width: 100 },
                            { field: 'intentionDec', title: '合作意向', sort: false},
              {
                field: "createTime",
                title: "新增时间",
                width: 150,
                sort: false,
              },
              {
                field: "nickname",
                title: "网名",
                sort: false,
                templet: "#nickname",
                width: 105,
              },
              {
                field: "followersCount",
                title: "粉丝数量",
                sort: false,
                width: 105,
              },
              { field: "platforms", title: "入住平台", sort: false, with: 300 },
              { field: "areaCodeName", title: "区域", sort: false, with: 300 },
              { field: "createBy", title: "信息录入", sort: false, width: 100 },
              {
                field: "mangerName",
                title: "运营经理",
                sort: false,
                width: 100,
              },
              { field: "intentionDec", title: "合作意向", sort: false },
                            // { field: 'meetings', title: '洽谈记录', sort: false, templet: '#meetings', width: 100},
                            // { field: 'intentions', title: '合作记录', sort: false, templet: '#intentions',width: 100 },
                          
                            { field: 'meetingsCount', title: '洽谈记录', sort: false, width: 100},
                            { field: 'intentionsCount', title: '合作记录', sort: false,width: 100 },
              {
                field: "meetingsCount",
                title: "洽谈记录",
                sort: false,
                width: 100,
              },
              {
                field: "intentionsCount",
                title: "合作记录",
                sort: false,
                width: 100,
              },
              { field: "reMaker", title: "备注", sort: false },
                            // { field: 'name', title: '姓名', sort: false,width: 105 },                         
                            // { field: 'phone', title: '电话号码', sort: false,width: 105 },
                           
@@ -210,68 +316,71 @@
                            // { field: 'address', title: '详细地址', sort: false,width: 105 },
                            // { field: 'PromoteMoney', title: '推广费用', sort: false,width: 105 },
                           
						   
						    
                            // { field: 'upDataTime', title: '修改时间', width: 130, sort: false},
                           
                            // { field: 'upDataBy', title: '修改人', sort: false,width: 105 },
                            // { field: 'isdelete', title: '删除标志', width: 95, templet: '#switch_isdelete', sort: false , unresize: true},
                            { width: 162, align: 'center', title:'操作', fixed: 'right', toolbar: '#LAY-app-bloggersInfo-tableBox-bar' }
                        ]
                    ]
              {
                width: 162,
                align: "center",
                title: "操作",
                fixed: "right",
                toolbar: "#LAY-app-bloggersInfo-tableBox-bar",
              },
            ],
          ],
                });
                //监听排序事件
                table.on('sort(LAY-app-bloggersInfo-tableBox)', function(obj){
                    table.reloadData('LAY-app-bloggersInfo-tableBox', {
        table.on("sort(LAY-app-bloggersInfo-tableBox)", function (obj) {
          table.reloadData("LAY-app-bloggersInfo-tableBox", {
                        initSort: obj, //记录初始排序，如果不设的话，将无法标记表头的排序状态。
                        where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
            where: {
              //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
                            orderField: obj.field, //排序字段
                            orderDirection: obj.type //排序方式
                        }
              orderDirection: obj.type, //排序方式
            },
                    });
                });
                //监听行双击事件
                table.on('rowDouble(LAY-app-bloggersInfo-tableBox)', function (obj) {
        table.on("rowDouble(LAY-app-bloggersInfo-tableBox)", function (obj) {
                    //查看详情
                    doDetails(obj);
                });
                //头工具栏事件
                table.on('pagebar(LAY-app-bloggersInfo-tableBox)', function (obj) {
        table.on("pagebar(LAY-app-bloggersInfo-tableBox)", function (obj) {
                    var checkStatus = table.checkStatus(obj.config.id);
                    switch (obj.event) {
                    case 'addData':
            case "addData":
                        doCreate();
                        break;
                    case 'batchDelete':
            case "batchDelete":
                        doBatchDelete(checkStatus);
                        break;
                    case 'selectExportExcel':
            case "selectExportExcel":
                        doSelectExportExcel(checkStatus);
                        break;
                    case 'queryExportExcel':
            case "queryExportExcel":
                        doQueryExportexcel();
                        break;
                    };
                });
                //监听工具条
                table.on('tool(LAY-app-bloggersInfo-tableBox)',
                    function(obj) {
                        if (obj.event === 'detail') {
                            doDetails(obj);
                        } else if (obj.event === 'del') {
                            doDelete(obj);
                        } else if (obj.event === 'edit') {
                            doEdit(obj)
                        }
                    });
        table.on('tool(nickname)',
                    function(obj) {
                        if (obj.event === 'detail') {
        //监听工具条
        table.on("tool(LAY-app-bloggersInfo-tableBox)", function (obj) {
          if (obj.event === "detail") {
                            doDetails(obj);
                        } else if (obj.event === 'del') {
          } else if (obj.event === "del") {
                            doDelete(obj);
                        } else if (obj.event === 'edit') {
                            doEdit(obj)
          } else if (obj.event === "edit") {
            doEdit(obj);
          }
        });
        table.on("tool(nickname)", function (obj) {
          if (obj.event === "detail") {
            doDetails(obj);
          } else if (obj.event === "del") {
            doDelete(obj);
          } else if (obj.event === "edit") {
            doEdit(obj);
                        }
                    });
                //执行创建操作
@@ -280,45 +389,67 @@
                            if (e.code === 0) {
                                admin.popup({
                                    shadeClose: false,
                                    title: '创建数据',
                                    area: ['1200px', '90%'],
                                    id: 'LAY-popup-bloggersInfo-create',
                title: "创建数据",
                area: ["1200px", "90%"],
                id: "LAY-popup-bloggersInfo-create",
                                    success: function (layero, index) {

                                        
                                        view(this.id).render('bloggersInfo/create', { data: e.data }).done(function () {
                  view(this.id)
                    .render("bloggersInfo/create", { data: e.data })
                    .done(function () {
                                            //监听提交
                                            form.on('submit(LAY-app-bloggersInfo-createForm-submit)',
                      form.on(
                        "submit(LAY-app-bloggersInfo-createForm-submit)",
                                                function(data) {
                                                  
                                                    var field = data.field; //获取提交的字段
                                                    field.areaCode=GetAreaCodeFormFileid(field,"CreatareaId");
                                                    if((field.areaCode===null)||(field.areaCode==="")||(field.areaCode===undefined))
                                                    {layer.msg("必须选择区域");
                                                        return}
                                                    field.isdelete = field.isdelete == 'on';
                          field.areaCode = GetAreaCodeFormFileid(
                            field,
                            "CreatareaId"
                          );
                          if (
                            field.areaCode === null ||
                            field.areaCode === "" ||
                            field.areaCode === undefined
                          ) {
                            layer.msg("必须选择区域");
                            return;
                          }
                          field.isdelete = field.isdelete == "on";
                                                    
                                                    if (debug) { console.log(field); } //开启调试返回数据
                          if (debug) {
                            console.log(field);
                          } //开启调试返回数据
                                                    //提交 Ajax 成功后，关闭当前弹层并重载表格
                                                    coreHelper.Post("Api/bloggersInfo/DoCreate", field, function (e) {
                                                            console.log(e)
                          coreHelper.Post(
                            "Api/bloggersInfo/DoCreate",
                            field,
                            function (e) {
                              console.log(e);
                                                            if (e.code === 0) {
                                                                layui.table.reloadData('LAY-app-bloggersInfo-tableBox'); //重载表格
                                layui.table.reloadData(
                                  "LAY-app-bloggersInfo-tableBox"
                                ); //重载表格
                                                                layer.close(index); //再执行关闭
                                                                layer.msg(e.msg);
                                                            } else {
                                                                layer.msg(e.msg);
                                                            }
                                                        });
                                                });
                            }
                          );
                        }
                      );
                                        });
                                        // 禁止弹窗出现滚动条
                                        $(layero).children('.layui-layer-content').css('overflow', 'visible');
                                    }
                                    , btn: ['确定', '取消']
                                    , yes: function (index, layero) {
                                        layero.contents().find("#LAY-app-bloggersInfo-createForm-submit").click();
                                    }
                  $(layero)
                    .children(".layui-layer-content")
                    .css("overflow", "visible");
                },
                btn: ["确定", "取消"],
                yes: function (index, layero) {
                  layero
                    .contents()
                    .find("#LAY-app-bloggersInfo-createForm-submit")
                    .click();
                },
                                });
                            } else {
                                layer.msg(e.msg);
@@ -327,175 +458,278 @@
                }
                //执行编辑操作
                function doEdit(obj){
                    coreHelper.Post("Api/bloggersInfo/GetEdit", {id:obj.data.id}, function (e) {
          coreHelper.Post(
            "Api/bloggersInfo/GetEdit",
            { id: obj.data.id },
            function (e) {
                        if (e.code === 0) {
                            admin.popup({
                                shadeClose: false,
                                title: '编辑数据',
                                area: ['1200px', '90%'],
                                id: 'LAY-popup-bloggersInfo-edit',
                  title: "编辑数据",
                  area: ["1200px", "90%"],
                  id: "LAY-popup-bloggersInfo-edit",
                                success: function (layero, index) {
                                    view(this.id).render('bloggersInfo/edit', { data: e.data }).done(function () {
                    view(this.id)
                      .render("bloggersInfo/edit", { data: e.data })
                      .done(function () {
                                        //监听提交
                                        form.on('submit(LAY-app-bloggersInfo-editForm-submit)',
                        form.on(
                          "submit(LAY-app-bloggersInfo-editForm-submit)",
                                            function(data) {
                                                var field = data.field; //获取提交的字段
                                                field.areaCode=GetAreaCodeFormFileid(field,"EditbloggerareaId");
                                                    if((field.areaCode===null)||(field.areaCode==="")||(field.areaCode===undefined))
                                                    {layer.msg("必须选择区域");
                                                        return}
                                                        debugger
                                                field.isdelete = field.isdelete == 'on';
                                                field.intentions = table.cache["id-EditintentionsTab"];
                            field.areaCode = GetAreaCodeFormFileid(
                              field,
                              "EditbloggerareaId"
                            );
                            if (
                              field.areaCode === null ||
                              field.areaCode === "" ||
                              field.areaCode === undefined
                            ) {
                              layer.msg("必须选择区域");
                              return;
                            }
                            debugger;
                            field.isdelete = field.isdelete == "on";
                            field.intentions =
                              table.cache["id-EditintentionsTab"];
          field.meetings = table.cache["id-EditmeettingTab"];
                                                //提交 Ajax 成功后，关闭当前弹层并重载表格
                                                coreHelper.Post("Api/bloggersInfo/DoEdit", field, function (e) {
                                                        console.log(e)
                            coreHelper.Post(
                              "Api/bloggersInfo/DoEdit",
                              field,
                              function (e) {
                                console.log(e);
                                                        if (e.code === 0) {
                                                            layui.table.reloadData('LAY-app-bloggersInfo-tableBox'); //重载表格
                                  layui.table.reloadData(
                                    "LAY-app-bloggersInfo-tableBox"
                                  ); //重载表格
                                                            layer.close(index); //再执行关闭
                                                            layer.msg(e.msg);
                                                        } else {
                                                            layer.msg(e.msg);
                                                        }
                              }
                            );
                          }
                        );
                                                    });
                                            });
                                    })
                                    // 禁止弹窗出现滚动条
                                    $(layero).children('.layui-layer-content').css('overflow', 'visible');
                                }
                                 , btn: ['确定', '取消']
                                , yes: function (index, layero) {
                                     layero.contents().find("#LAY-app-bloggersInfo-editForm-submit").click();
                                }
                    $(layero)
                      .children(".layui-layer-content")
                      .css("overflow", "visible");
                  },
                  btn: ["确定", "取消"],
                  yes: function (index, layero) {
                    layero
                      .contents()
                      .find("#LAY-app-bloggersInfo-editForm-submit")
                      .click();
                  },
                            });
                        } else {
                            layer.msg(e.msg);
                        }
                    });
            }
          );
                }
                //执行预览操作
                function doDetails(obj) {
                    coreHelper.Post("Api/bloggersInfo/GetDetails", { id: obj.data.id }, function (e) {
          coreHelper.Post(
            "Api/bloggersInfo/GetDetails",
            { id: obj.data.id },
            function (e) {
                        if (e.code === 0) {
                            admin.popup({
                                shadeClose: false,
                                title: '查看详情',
                                area: ['1200px', '90%'],
                                id: 'LAY-popup-bloggersInfo-details',
                  title: "查看详情",
                  area: ["1200px", "90%"],
                  id: "LAY-popup-bloggersInfo-details",
                                success: function (layero, index) {
                                    view(this.id).render('bloggersInfo/details', { data: e.data }).done(function () {
                    view(this.id)
                      .render("bloggersInfo/details", { data: e.data })
                      .done(function () {
                                        form.render();
                                    });
                                    // 禁止弹窗出现滚动条
                                    $(layero).children('.layui-layer-content').css('overflow', 'visible');
                                }
                    $(layero)
                      .children(".layui-layer-content")
                      .css("overflow", "visible");
                  },
                            });
                        } else {
                            layer.msg(e.msg);
                        }
                    });
            }
          );
                }
                //执行单个删除
                function doDelete(obj){
                    coreHelper.Post("Api/bloggersInfo/DoDelete", { id: obj.data.id }, function (e) {
                            if (debug) { console.log(e); } //开启调试返回数据
                            table.reloadData('LAY-app-bloggersInfo-tableBox');
          coreHelper.Post(
            "Api/bloggersInfo/DoDelete",
            { id: obj.data.id },
            function (e) {
              if (debug) {
                console.log(e);
              } //开启调试返回数据
              table.reloadData("LAY-app-bloggersInfo-tableBox");
                            layer.msg(e.msg);
                        });
            }
          );
                }
                //执行批量删除
                function doBatchDelete(checkStatus){
                    var checkData = checkStatus.data;
                    if (checkData.length === 0) {
                        return layer.msg('请选择要删除的数据');
            return layer.msg("请选择要删除的数据");
                    }
                    layer.confirm('确定删除吗？删除后将无法恢复。',
                        function(index) {
          layer.confirm("确定删除吗？删除后将无法恢复。", function (index) {
                            var delidsStr = [];
                            layui.each(checkData,
                                function(index, item) {
            layui.each(checkData, function (index, item) {
                                    delidsStr.push(item.id);
                                });
                            coreHelper.Post("Api/bloggersInfo/DoBatchDelete", { id: delidsStr }, function (e) {
                                    if (debug) { console.log(e); } //开启调试返回数据
                                    table.reloadData('LAY-app-bloggersInfo-tableBox');
            coreHelper.Post(
              "Api/bloggersInfo/DoBatchDelete",
              { id: delidsStr },
              function (e) {
                if (debug) {
                  console.log(e);
                } //开启调试返回数据
                table.reloadData("LAY-app-bloggersInfo-tableBox");
                                    layer.msg(e.msg);
                                });
              }
            );
                        });
                }
                //执行查询条件导出excel
                function doQueryExportexcel(){
                    layer.confirm('确定根据当前的查询条件导出数据吗？',
                        function(index) {
          layer.confirm("确定根据当前的查询条件导出数据吗？", function (index) {
                            var field = searchwhere;
                            coreHelper.PostForm("Api/bloggersInfo/QueryExportExcel", field, function (e) {
                                    if (debug) { console.log(e); } //开启调试返回数据
            coreHelper.PostForm(
              "Api/bloggersInfo/QueryExportExcel",
              field,
              function (e) {
                if (debug) {
                  console.log(e);
                } //开启调试返回数据
                                    if (e.code === 0) {
                                        window.open(e.data);
                                    } else {
                                        layer.msg(e.msg);
                                    }
                                });
              }
            );
                        });
                }
                //执行选择目录导出数据
                function doSelectExportExcel(checkStatus){
                    var checkData = checkStatus.data;
                    if (checkData.length === 0) {
                        return layer.msg('请选择您要导出的数据');
            return layer.msg("请选择您要导出的数据");
                    }
                    layer.confirm('确定导出选择的内容吗？',
                        function(index) {
          layer.confirm("确定导出选择的内容吗？", function (index) {
                            var delidsStr = [];
                            layui.each(checkData,
                                function(index, item) {
            layui.each(checkData, function (index, item) {
                                    delidsStr.push(item.id);
                                });
                            layer.close(index);
                            coreHelper.Post("Api/bloggersInfo/SelectExportExcel", { id: delidsStr }, function (e) {
                                    if (debug) { console.log(e); } //开启调试返回数据
            coreHelper.Post(
              "Api/bloggersInfo/SelectExportExcel",
              { id: delidsStr },
              function (e) {
                if (debug) {
                  console.log(e);
                } //开启调试返回数据
                                    if (e.code === 0) {
                                        window.open(e.data);
                                    } else {
                                        layer.msg(e.msg);
                                    }
                                });
              }
            );
                        });
                }

                
                laydate.render({
                    elem: '#searchTime-bloggersInfo-createTime',
                    type: 'datetime',
                    range: '到',
          elem: "#searchTime-bloggersInfo-createTime",
          type: "datetime",
          range: "到",
                });
                laydate.render({
                    elem: '#searchTime-bloggersInfo-upDataTime',
                    type: 'datetime',
                    range: '到',
          elem: "#searchTime-bloggersInfo-upDataTime",
          type: "datetime",
          range: "到",
                });

        dropdown.render({
          elem: "#ID-dropdown-platforms-Ss-input",
          data: [
            {
              title: "抖音",
              id: 101,
            },
            {
              title: "腾讯",
              id: 102,
            },
            {
              title: "小红书",
              id: 103,
            },
          ],
          click: function (obj) {
            this.elem.val(obj.title);
          },
          style: "min-width: 235px;",
        });
        dropdown.render({
          elem: "#intentionDec-ss",
          data: [
            {
              title: "大",
              id: 101,
            },
            {
              title: "小",
              id: 102,
            },
            {
              title: "不确定",
              id: 103,
            },
          ],
          click: function (obj) {
            this.elem.val(obj.title);
          },
          style: "min-width: 235px;",
        });
                //监听 表格复选框操作
                
                layui.form.on('switch(switch_isdelete)', function (obj) {
                    coreHelper.Post("Api/bloggersInfo/DoSetisdelete", { id: this.value, data: obj.elem.checked }, function (e) {
                        if (debug) { console.log(e); } //开启调试返回数据
        layui.form.on("switch(switch_isdelete)", function (obj) {
          coreHelper.Post(
            "Api/bloggersInfo/DoSetisdelete",
            { id: this.value, data: obj.elem.checked },
            function (e) {
              if (debug) {
                console.log(e);
              } //开启调试返回数据
                        //table.reloadData('LAY-app-bloggersInfo-tableBox');
                        layer.msg(e.msg);
            }
          );
                    });
                });
                

                //重载form
                form.render();
            });
      }
    );
    };
</script>

<!--设置删除标志-->
<script type="text/html" id="switch_isdelete">
    <input type="checkbox" name="switch_isdelete" value="{{d.id}}" lay-skin="switch" lay-text="开启|关闭" lay-filter="switch_isdelete" {{ d.isdelete ? 'checked' : '' }}>
  <input type="checkbox" name="switch_isdelete" value="{{d.id}}"
  lay-skin="switch" lay-text="开启|关闭" lay-filter="switch_isdelete" {{
  d.isdelete ? 'checked' : '' }}>
</script>

<!--洽谈记录-->
@@ -505,8 +739,7 @@
    <!-- <input type="checkbox" name="switch_isdelete" value="{{d.id}}" lay-skin="switch" lay-text="开启|关闭" lay-filter="switch_isdelete" {{ d.isdelete ? 'checked' : '' }}> -->
</script>
<style >
 .areaCode .select-address
    {
  .areaCode .select-address {
        padding: 5px !important        ;
        width: 30%;
    }

 CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.csproj.user

@@ -5,5 +5,6 @@
  </PropertyGroup>
  <PropertyGroup>
    <ActiveDebugProfile>CoreCms.Net.Web.WebApi</ActiveDebugProfile>
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
  </PropertyGroup>
</Project>

 CoreCms.Net.Web.WebApi/Properties/PublishProfiles/FolderProfile.pubxml

New file
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
  <PropertyGroup>
    <DeleteExistingFiles>true</DeleteExistingFiles>
    <ExcludeApp_Data>false</ExcludeApp_Data>
    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
    <PublishUrl>D:\百分百兵法\API</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
    <_TargetId>Folder</_TargetId>
    <SiteUrlToLaunchAfterPublish />
    <TargetFramework>net8.0</TargetFramework>
    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
    <ProjectGuid>cc504b7b-c4e1-4b0d-aaa8-e090e286f850</ProjectGuid>
    <SelfContained>true</SelfContained>
  </PropertyGroup>
</Project>

 CoreCms.Net.Web.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user

New file
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
  <PropertyGroup>
    <_PublishTargetUrl>D:\百分百兵法\API</_PublishTargetUrl>
    <History>True|2024-03-22T08:31:04.2218156Z||;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>