From f87ea6675b5899d045a243fdd6510f47201e7e11 Mon Sep 17 00:00:00 2001
From: liaoxujun@qq.com <liaoxujun@qq.com>
Date: 星期二, 26 三月 2024 09:25:41 +0800
Subject: [PATCH] no message
---
CoreCms.Net.Services/blogger/bloggersInfoServices.cs | 1
CoreCms.Net.Model/CoreCms.Net.Model.xml | 5 +
CoreCms.Net.Model/Entities/baifenbingfa/Promote/bloggers.cs | 12 ++--
CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/create.html | 32 ++++++----
CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/index.html | 38 +++++++-----
CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/edit.html | 36 ++++++-----
6 files changed, 71 insertions(+), 53 deletions(-)
diff --git a/CoreCms.Net.Model/CoreCms.Net.Model.xml b/CoreCms.Net.Model/CoreCms.Net.Model.xml
index d41aa23..7d29bc0 100644
--- a/CoreCms.Net.Model/CoreCms.Net.Model.xml
+++ b/CoreCms.Net.Model/CoreCms.Net.Model.xml
@@ -979,6 +979,11 @@
杩愯惀缁忕悊
</summary>
</member>
+ <member name="P:CoreCms.Net.Model.Entities.baifenbingfa.Promote.bloggersInfo.reMaker">
+ <summary>
+ 澶囨敞
+ </summary>
+ </member>
<member name="P:CoreCms.Net.Model.Entities.baifenbingfa.Promote.bloggersInfo.intentions">
<summary>
鍚堜綔璁板綍
diff --git a/CoreCms.Net.Model/Entities/baifenbingfa/Promote/bloggers.cs b/CoreCms.Net.Model/Entities/baifenbingfa/Promote/bloggers.cs
index b51f287..30d8205 100644
--- a/CoreCms.Net.Model/Entities/baifenbingfa/Promote/bloggers.cs
+++ b/CoreCms.Net.Model/Entities/baifenbingfa/Promote/bloggers.cs
@@ -34,7 +34,7 @@
/// 濮撳悕
/// </summary>
[Display(Name = "濮撳悕")]
- [SugarColumn(ColumnDescription = "濮撳悕", Length = 100)]
+ [SugarColumn(ColumnDescription = "濮撳悕", Length = 100, IsNullable = true)]
public string name { get; set; }
/// <summary>
@@ -47,7 +47,7 @@
/// 鐢佃瘽鍙风爜
/// </summary>
[Display(Name = "鐢佃瘽鍙风爜")]
- [SugarColumn(ColumnDescription = "鐢佃瘽鍙风爜", Length = 100)]
+ [SugarColumn(ColumnDescription = "鐢佃瘽鍙风爜", Length = 100, IsNullable = true)]
public string phone { get; set; }
/// <summary>
/// 绮変笣鏁伴噺
@@ -60,20 +60,20 @@
/// 寰俊鍙�
/// </summary>
[Display(Name = "寰俊鍙�")]
- [SugarColumn(ColumnDescription = "寰俊鍙�", Length = 100)]
+ [SugarColumn(ColumnDescription = "寰俊鍙�", Length = 100, IsNullable = true)]
public string weiXin { get; set; }
/// <summary>
/// 琛屾斂鍖哄煙
/// </summary>
[Display(Name = "琛屾斂鍖哄煙")]
- [SugarColumn(ColumnDescription = "琛屾斂鍖哄煙锛岀敤锛屽彿鍒嗗壊", Length = 100)]
+ [SugarColumn(ColumnDescription = "琛屾斂鍖哄煙锛岀敤锛屽彿鍒嗗壊", Length = 100, IsNullable = true)]
public string areaCode { get; set; }
/// <summary>
/// 璇︾粏鍦板潃
/// </summary>
[Display(Name = "璇︾粏鍦板潃")]
- [SugarColumn(ColumnDescription = "璇︾粏鍦板潃")]
+ [SugarColumn(ColumnDescription = "璇︾粏鍦板潃", IsNullable = true)]
public string address { get; set; }
/// <summary>
/// 鎺ㄥ箍璐圭敤
@@ -93,7 +93,7 @@
/// 杩愯惀缁忕悊
/// </summary>
[Display(Name = "杩愯惀缁忕悊")]
- [SugarColumn(ColumnDescription = "杩愯惀缁忕悊")]
+ [SugarColumn(ColumnDescription = "杩愯惀缁忕悊", IsNullable = true)]
public string mangerName { get; set; }
/// <summary>
diff --git a/CoreCms.Net.Services/blogger/bloggersInfoServices.cs b/CoreCms.Net.Services/blogger/bloggersInfoServices.cs
index ff83ce3..2b6bd1f 100644
--- a/CoreCms.Net.Services/blogger/bloggersInfoServices.cs
+++ b/CoreCms.Net.Services/blogger/bloggersInfoServices.cs
@@ -106,6 +106,7 @@
oldmod.nickname= entity.nickname;
oldmod.intentionDec= entity.intentionDec;
oldmod.reMaker= entity.reMaker;
+ oldmod.PromoteMoney=entity.PromoteMoney;
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)
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/create.html
index b271b90..1fab9d2 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/create.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/create.html
@@ -44,14 +44,13 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label for="name" class="layui-form-label layui-form-required"
+ <label for="name" class="layui-form-label "
>鐪熷疄濮撳悕</label
>
<div class="layui-input-block">
<input
name="name"
- lay-verType="tips"
- lay-verify="required"
+ lay-verType="tips"
class="layui-input"
placeholder="璇疯緭鍏ュ鍚�"
lay-reqText="璇疯緭鍏ュ鍚�"
@@ -77,14 +76,14 @@
<div class="layui-form-item">
<div class="layui-inline">
- <label for="phone" class="layui-form-label layui-form-required"
+ <label for="phone" class="layui-form-label "
>鐢佃瘽鍙风爜</label
>
<div class="layui-input-block">
<input
name="phone"
lay-verType="tips"
- lay-verify="required|phone"
+ lay-verify="phone"
class="layui-input"
placeholder="璇疯緭鍏ョ數璇濆彿鐮�"
lay-reqText="璇疯緭鍏ョ數璇濆彿鐮�"
@@ -93,14 +92,13 @@
</div>
<div class="layui-inline">
- <label for="weiXin" class="layui-form-label layui-form-required"
+ <label for="weiXin" class="layui-form-label "
>寰俊鍙�</label
>
<div class="layui-input-block">
<input
name="weiXin"
- lay-verType="tips"
- lay-verify="required"
+ lay-verType="tips"
class="layui-input"
placeholder="璇疯緭鍏ュ井淇″彿"
lay-reqText="璇疯緭鍏ュ井淇″彿"
@@ -124,7 +122,7 @@
</div>
</div> -->
<div class="layui-form-item">
- <label for="areaId" class="layui-form-label layui-form-required"
+ <label for="areaId" class="layui-form-label"
>鎵�鍦ㄥ湴鍖�</label
>
<div class="layui-input-block layui-inline-4 address-class">
@@ -133,14 +131,14 @@
</div>
<div class="layui-form-item">
- <label for="address" class="layui-form-label layui-form-required"
+ <label for="address" class="layui-form-label "
>璇︾粏鍦板潃</label
>
<div class="layui-input-block">
<input
name="address"
lay-verType="tips"
- lay-verify="required"
+
class="layui-input"
placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"
lay-reqText="璇疯緭鍏ヨ缁嗗湴鍧�"
@@ -168,7 +166,7 @@
<div class="layui-inline">
<label
for="PromoteMoney"
- class="layui-form-label layui-form-required"
+ class="layui-form-label "
>鎺ㄥ箍璐圭敤</label
>
<div class="layui-input-inline " style="width: 110px;">
@@ -179,19 +177,20 @@
class="layui-input"
placeholder="璇疯緭鍏ユ帹骞胯垂鐢�"
lay-reqText="璇疯緭鍏ユ帹骞胯垂鐢�"
+ value="0"
/>
</div>
<span class="layui-form-mid layui-word-aux">鍏�</span>
</div>
<div class="layui-inline">
- <label for="mangerName" class="layui-form-label layui-form-required"
+ <label for="mangerName" class="layui-form-label "
>杩愯惀缁忕悊</label
>
<div class="layui-input-block">
<input
name="mangerName"
lay-verType="tips"
- lay-verify="required"
+
class="layui-input"
placeholder="璇疯緭鍏ヨ繍钀ョ粡鐞�"
lay-reqText="璇疯緭鍏ヨ繍钀ョ粡鐞�"
@@ -265,6 +264,11 @@
title: "灏忕孩涔�",
id: 103,
}
+ ,
+ {
+ title: "蹇墜",
+ id: 103,
+ }
],
click: function (obj) {
this.elem.val(obj.title);
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/edit.html
index b1352c2..743c1f8 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/edit.html
@@ -51,14 +51,13 @@
</div>
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label for="name" class="layui-form-label layui-form-required"
+ <label for="name" class="layui-form-label "
>鐪熷疄濮撳悕</label
>
<div class="layui-input-block">
<input
name="name"
- lay-verType="tips"
- lay-verify="required"
+ lay-verType="tips"
class="layui-input"
placeholder="璇疯緭鍏ュ鍚�"
lay-reqText="璇疯緭鍏ュ鍚�"
@@ -90,14 +89,14 @@
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label for="phone" class="layui-form-label layui-form-required"
+ <label for="phone" class="layui-form-label "
>鐢佃瘽鍙风爜</label
>
<div class="layui-input-block">
<input
name="phone"
lay-verType="tips"
- lay-verify="required|phone"
+ lay-verify="phone"
class="layui-input"
placeholder="璇疯緭鍏ョ數璇濆彿鐮�"
lay-reqText="璇疯緭鍏ョ數璇濆彿鐮�"
@@ -108,14 +107,14 @@
</div>
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label for="weiXin" class="layui-form-label layui-form-required"
+ <label for="weiXin" class="layui-form-label"
>寰俊鍙�</label
>
<div class="layui-input-block">
<input
name="weiXin"
lay-verType="tips"
- lay-verify="required"
+
class="layui-input"
placeholder="璇疯緭鍏ュ井淇″彿"
lay-reqText="璇疯緭鍏ュ井淇″彿"
@@ -126,7 +125,7 @@
</div>
<div class="layui-form-item">
- <label for="areaCode" class="layui-form-label layui-form-required"
+ <label for="areaCode" class="layui-form-label "
>琛屾斂鍖哄煙</label
>
<div class="layui-input-block" style="width: 500px;">
@@ -140,14 +139,14 @@
</div>
<div class="layui-form-item">
- <label for="address" class="layui-form-label layui-form-required"
+ <label for="address" class="layui-form-label "
>璇︾粏鍦板潃</label
>
<div class="layui-input-block">
<input
name="address"
lay-verType="tips"
- lay-verify="required"
+
class="layui-input"
placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"
lay-reqText="璇疯緭鍏ヨ缁嗗湴鍧�"
@@ -160,18 +159,18 @@
<div class="layui-form-item">
<label
for="PromoteMoney"
- class="layui-form-label layui-form-required"
+ class="layui-form-label "
>鎺ㄥ箍璐圭敤</label
>
<div class="layui-input-inline">
<input
- name="PromoteMoney"
+ name="promoteMoney"
lay-verType="tips"
- lay-verify="required|number"
+ lay-verify="required"
class="layui-input"
placeholder="璇疯緭鍏ユ帹骞胯垂鐢�"
lay-reqText="璇疯緭鍏ユ帹骞胯垂鐢�"
- value="{{d.params.data.promoteMoney || '' }}"
+ value="{{d.params.data.promoteMoney || '0' }}"
/>
</div>
<span class="layui-form-mid layui-word-aux">鍏�</span>
@@ -202,14 +201,14 @@
<div class="layui-form-item">
<label
for="mangerName"
- class="layui-form-label layui-form-required"
+ class="layui-form-label "
>杩愯惀缁忕悊</label
>
<div class="layui-input-block">
<input
name="mangerName"
lay-verType="tips"
- lay-verify="required"
+
class="layui-input"
placeholder="璇疯緭鍏ヨ繍钀ョ粡鐞�"
lay-reqText="璇疯緭鍏ヨ繍钀ョ粡鐞�"
@@ -334,6 +333,11 @@
title: "灏忕孩涔�",
id: 103,
}
+ ,
+ {
+ title: "蹇墜",
+ id: 103,
+ }
],
click: function (obj) {
this.elem.val(obj.title);
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/index.html
index dff21ce..f808d74 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/index.html
@@ -405,14 +405,14 @@
field,
"CreatareaId"
);
- if (
- field.areaCode === null ||
- field.areaCode === "" ||
- field.areaCode === undefined
- ) {
- layer.msg("蹇呴』閫夋嫨鍖哄煙");
- return;
- }
+ // if (
+ // field.areaCode === null ||
+ // field.areaCode === "" ||
+ // field.areaCode === undefined
+ // ) {
+ // layer.msg("蹇呴』閫夋嫨鍖哄煙");
+ // return;
+ // }
field.isdelete = field.isdelete == "on";
if (debug) {
@@ -481,15 +481,15 @@
field,
"EditbloggerareaId"
);
- if (
- field.areaCode === null ||
- field.areaCode === "" ||
- field.areaCode === undefined
- ) {
- layer.msg("蹇呴』閫夋嫨鍖哄煙");
- return;
- }
- debugger;
+ // if (
+ // field.areaCode === null ||
+ // field.areaCode === "" ||
+ // field.areaCode === undefined
+ // ) {
+ // layer.msg("蹇呴』閫夋嫨鍖哄煙");
+ // return;
+ // }
+
field.isdelete = field.isdelete == "on";
field.intentions =
table.cache["id-EditintentionsTab"];
@@ -675,6 +675,10 @@
title: "灏忕孩涔�",
id: 103,
},
+ {
+ title: "蹇墜",
+ id: 103,
+ },
],
click: function (obj) {
this.elem.val(obj.title);
--
Gitblit v1.9.1