From 25bad9a765c608079258012766a37a571b5243aa Mon Sep 17 00:00:00 2001
From: liaoxujun@qq.com <liaoxujun@qq.com>
Date: 星期三, 10 四月 2024 13:40:04 +0800
Subject: [PATCH] 处理推广Bug
---
CoreCms.Net.Model/Entities/baifenbingfa/Promote/OffLineDistributor/OfflineDistributor.cs | 2 +-
CoreCms.Net.Services/baifenbingfa/OfflineDistributorServices.cs | 2 +-
CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/details.html | 2 +-
CoreCms.Net.Web.Admin/wwwroot/views/liao.js | 24 +++++++++++++++++++++---
CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/index.html | 2 +-
CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/edit.html | 11 +++++++----
CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/index.html | 1 +
CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/create.html | 4 ++--
8 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/CoreCms.Net.Model/Entities/baifenbingfa/Promote/OffLineDistributor/OfflineDistributor.cs b/CoreCms.Net.Model/Entities/baifenbingfa/Promote/OffLineDistributor/OfflineDistributor.cs
index a2c2271..1f699c7 100644
--- a/CoreCms.Net.Model/Entities/baifenbingfa/Promote/OffLineDistributor/OfflineDistributor.cs
+++ b/CoreCms.Net.Model/Entities/baifenbingfa/Promote/OffLineDistributor/OfflineDistributor.cs
@@ -75,7 +75,7 @@
/// <summary>
/// 搴楁嫑鍥剧墖鍦板潃
/// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "搴楁嫑鍥剧墖鍦板潃")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "搴楁嫑鍥剧墖鍦板潃",Length =65535)]
public string StoreLogoUrl { get; set; }
/// <summary>
diff --git a/CoreCms.Net.Services/baifenbingfa/OfflineDistributorServices.cs b/CoreCms.Net.Services/baifenbingfa/OfflineDistributorServices.cs
index a5bdb97..daa9c59 100644
--- a/CoreCms.Net.Services/baifenbingfa/OfflineDistributorServices.cs
+++ b/CoreCms.Net.Services/baifenbingfa/OfflineDistributorServices.cs
@@ -168,7 +168,7 @@
}
oldmod.Oders = entity.Oders;
- foreach (var meetin in entity.meetings)
+ foreach (OfflineDistributorMeeting meetin in entity.meetings)
{
if (meetin.id == 9999999)
{
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/create.html
index 1b600ed..c5cd9d7 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/create.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/create.html
@@ -120,8 +120,8 @@
<div class="layui-inline">
<label class="layui-form-label" for="storeLogoUrl">搴楁嫑</label>
<div class="layui-input-inline layui-inline-6">
- <input name="storeLogoUrl1" id="storeLogoUrlc1" size="15" autocomplete="off" class="layui-input" lay-reqText="璇疯緭鍏ャ�愮缉鐣ュ浘銆�" />
- <input name="storeLogoUrl2" id="storeLogoUrlc2" size="15" autocomplete="off" class="layui-input" lay-reqText="璇疯緭鍏ャ�愮缉鐣ュ浘銆�" />
+ <input name="storeLogoUrl1" type="hidden" id="storeLogoUrlc1" size="15" autocomplete="off" class="layui-input" lay-reqText="璇疯緭鍏ャ�愮缉鐣ュ浘銆�" />
+ <input name="storeLogoUrl2" type="hidden" id="storeLogoUrlc2" size="15" autocomplete="off" class="layui-input" lay-reqText="璇疯緭鍏ャ�愮缉鐣ュ浘銆�" />
</div>
<div class="layui-input-inline">
<button type="button" class="layui-btn" id="upBtnOriginalCreat1">涓婁紶鍥惧儚</button>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/edit.html
index b90ec0a..c815284 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/edit.html
@@ -203,7 +203,7 @@
class="layui-input"
placeholder="璇疯緭鍏ュ簵鎷涘浘鐗囧湴鍧�"
lay-reqText="璇疯緭鍏ュ簵鎷涘浘鐗囧湴鍧�"
- value="{{d.params.data.storeLogoUrl || '' }}"
+ value="{{d.params.data.storeLogoUrl1 || '' }}"
id="viewTextBoxEdittext"
type="hidden"
/>
@@ -213,7 +213,7 @@
class="layui-input"
placeholder="璇疯緭鍏ュ簵鎷涘浘鐗囧湴鍧�"
lay-reqText="璇疯緭鍏ュ簵鎷涘浘鐗囧湴鍧�"
- value="{{d.params.data.storeLogoUrl || '' }}"
+ value="{{d.params.data.storeLogoUrl2 || '' }}"
id="viewTextBoxEdittext2"
type="hidden"
/>
@@ -226,7 +226,7 @@
<img
class="layui-upload-img"
id="viewImgBoxEdit"
- src="{{ d.params.data.storeLogoUrl1 || layui.setter.noImagePicUrl ||''}}"
+ src="{{ d.params.data.storeLogoUrl1|| ''}}"
/>
<div class="layui-input-inline">
<div id="viewTextBoxEdit"></div>
@@ -241,7 +241,7 @@
<img
class="layui-upload-img"
id="viewImgBoxEdit2"
- src="{{ d.params.data.storeLogoUrl2 || layui.setter.noImagePicUrl ||''}}"
+ src="{{ d.params.data.storeLogoUrl2 ||''}}"
/>
<div class="layui-input-inline">
<div id="viewTextBoxEdit2"></div>
@@ -368,15 +368,18 @@
// 鎷嗗垎storeLogoUrl
var storeLogoUrl=d.params.data.storeLogoUrl.split(",");
for (let index = 0; index < storeLogoUrl.length; index++) {
+
if(index>1)
break;
if(index==0)
{d.params.data.storeLogoUrl1 = storeLogoUrl[index];
$("#viewImgBoxEdit").attr("src", d.params.data.storeLogoUrl1);
+ $("#viewTextBoxEdittext").val(d.params.data.storeLogoUrl1);
}
else
{ d.params.data.storeLogoUrl2 = storeLogoUrl[index];
$("#viewImgBoxEdit2").attr("src", d.params.data.storeLogoUrl2);
+ $("#viewTextBoxEdittext2").val(d.params.data.storeLogoUrl2);
}
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/index.html
index 62a24b9..b7c748b 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/index.html
@@ -524,7 +524,7 @@
"submit(LAY-app-OfflineDistributor-editForm-submit)",
function (data) {
var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
-
+ debugger
field.storeLogoUrl="";
if((!!field.storeLogoUrl1)&&(!!field.storeLogoUrl2))
{
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/details.html b/CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/details.html
index 486e17f..73d0aba 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/details.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/details.html
@@ -115,7 +115,7 @@
<div class="layui-form-item">
<label for="PromoteMoney" class="layui-form-label layui-form-required">鎺ㄥ箍璐圭敤</label>
<div class="layui-input-inline">
- <input name="PromoteMoney" disabled lay-verType="tips" lay-verify="required|number" class="layui-input" placeholder="璇疯緭鍏ユ帹骞胯垂鐢�" lay-reqText="璇疯緭鍏ユ帹骞胯垂鐢�" value="{{d.params.data.promoteMoney || '' }}" />
+ <input name="promoteMoney" disabled lay-verType="tips" lay-verify="required|number" class="layui-input" placeholder="璇疯緭鍏ユ帹骞胯垂鐢�" lay-reqText="璇疯緭鍏ユ帹骞胯垂鐢�" value="{{d.params.data.promoteMoney || '' }}" />
</div>
<span class="layui-form-mid layui-word-aux">鍏�</span>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/index.html
index 245fd11..ebffc0b 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/bloggersinfo/index.html
@@ -284,6 +284,7 @@
},
{ field: "platforms", title: "鍏ヤ綇骞冲彴", sort: false, with: 300 },
{ field: "areaCodeName", title: "鍖哄煙", sort: false, with: 300 },
+ { field: "promoteMoney", title: "鎺ㄥ箍璐圭敤", sort: false, with: 300 },
{ field: "createBy", title: "淇℃伅褰曞叆", sort: false, width: 100 },
{
field: "mangerName",
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/liao.js b/CoreCms.Net.Web.Admin/wwwroot/views/liao.js
index b03b48e..94fb7bd 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/liao.js
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/liao.js
@@ -3,7 +3,7 @@
* @Author: 灏忛渚�
* @Date: 2024-03-01 09:11:24
* @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-01 12:39:54
+ * @LastEditTime: 2024-04-10 13:37:35
* Copyright: 2024 MinTinge CO.,LTD. All Rights Reserved.
* @Descripttion: 鍐欏叆浣犵殑鎻忚堪
*/
@@ -78,6 +78,7 @@
*/
function formatAreaInPut(coreHelper, idname, areaid = "") {
let area = 0;
+
if ((areaid !== "")&&(areaid!==null) &&(areaid!==0))
area = areaid.split(",").reverse()[0];
@@ -87,20 +88,37 @@
$.each(data, function (i, n) {
str += `<select lay-ignore name='${idname}_` + (i + 1) + "' dep='" + (i + 1) + "' class='select-address'>";
str += "<option value='' >璇烽�夋嫨</option>";
- $.each(n.list, function (h, z) {
+
+ if(n?.list?.length>0)
+ {
+ $.each(n.list, function (h, z) {
if (n.hasOwnProperty('info') && n.info?.id == z.id) {
str += "<option value='" + z.id + "' selected='selected'>" + z.name + "</option>";
} else {
str += "<option value='" + z.id + "' >" + z.name + "</option>";
}
});
+ }
+ else
+ {
+ $.each(n.thisList, function (h, z) {
+ if (n.hasOwnProperty('info') && n.info?.id == z.id) {
+ str += "<option value='" + z.id + "' selected='selected'>" + z.name + "</option>";
+ } else {
+ str += "<option value='" + z.id + "' >" + z.name + "</option>";
+ }
+ });
+ }
str += "</select>";
});
$(`input[name='${idname}']`).after(str);
//浠ヤ笂鏁版嵁杈撳嚭瀹岋紝浠ヤ笅缁戝畾浜嬩欢
$.each(data, function (i, n) {
if (i < (data.length)) {
- $(`select[name='${idname}_` + (i + 1) + "']").change(function () {
+ // $(`select[name='${idname}_` + (i + 1) + "']").change(function () {
+ // changeareaIdArea(i + 1, data.length, idname);
+ // });
+ $(`select[name='${idname}_` + (i + 1) + "']").click(function () {
changeareaIdArea(i + 1, data.length, idname);
});
}
--
Gitblit v1.9.1