From c0fd34dd01b5a00015d2e6ce31dbdf9f6a9e79b5 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期四, 18 四月 2024 11:48:16 +0800
Subject: [PATCH] no message
---
CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/index.html | 17 ++
CoreCms.Net.Web.WebApi/NLog.config | 2
CoreCms.Net.Web.Admin/NLog.config | 2
CoreCms.Net.Model/FromBody/FMDistribution.cs | 41 +++-
CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs | 123 ++++++++++++++-
CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/create.html | 2
CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/details.html | 2
/dev/null | 107 -------------
CoreCms.Net.Utility/Helper/AssemblyHelper.cs | 6
CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html | 9
CoreCms.Net.Web.Admin/Controllers/OfflineDistributor/OfflineDistributorController.cs | 8
CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/edit.html | 2
CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/create.html | 77 +++++++-
CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/edit.html | 40 ++++
14 files changed, 279 insertions(+), 159 deletions(-)
diff --git a/CoreCms.Net.Model/FromBody/FMDistribution.cs b/CoreCms.Net.Model/FromBody/FMDistribution.cs
index 8773228..c0d8b1f 100644
--- a/CoreCms.Net.Model/FromBody/FMDistribution.cs
+++ b/CoreCms.Net.Model/FromBody/FMDistribution.cs
@@ -85,12 +85,8 @@
/// </summary>
public class FMAdminCreateDistributionPost
{
- /// <summary>
- /// 宸叉敞鍐岀敤鎴锋墜鏈哄彿鐮�
- /// </summary>
- public System.String registeredUserMobile { get; set; }
-
-
+
+
/// <summary>
/// 鐢ㄦ埛搴忓垪
/// </summary>
@@ -112,14 +108,39 @@
public System.String mobile { get; set; }
/// <summary>
- /// 寰俊鍙�
+ /// 搴楅摵鍚嶇О
/// </summary>
- public System.String weixin { get; set; }
+ public string storeName { get; set; }
+ /// <summary>
+ /// 鍖哄煙
+ /// </summary>
+ public string areaCode { get; set; }
/// <summary>
- /// qq鍙�
+ /// 璇︾粏鍦板潃
/// </summary>
- public System.String qq { get; set; }
+ public string address { get; set; }
+
+ /// <summary>
+ /// 搴楅摵闂ㄥご
+ /// </summary>
+ public string storeBanner { get; set; }
+ //public string qq { get; set; }
+ //public string weixin { get; set; }
+ /// <summary>
+ /// 閿�鍞搴�
+ /// </summary>
+ public decimal sales { get; set; }
+
+ /// <summary>
+ /// 鎵�灞炶涓�
+ /// </summary>
+ public string profession { get; set; }
+
+ /// <summary>
+ /// 鍧愭爣
+ /// </summary>
+ public string storeCoordinate { get; set; }
/// <summary>
/// 瀹℃牳鐘舵��
diff --git a/CoreCms.Net.Utility/Helper/AssemblyHelper.cs b/CoreCms.Net.Utility/Helper/AssemblyHelper.cs
index 85470a3..f4be1b8 100644
--- a/CoreCms.Net.Utility/Helper/AssemblyHelper.cs
+++ b/CoreCms.Net.Utility/Helper/AssemblyHelper.cs
@@ -100,11 +100,7 @@
public static Type[] DbCodeFirstModes (string ModeProjectName, string ModeNamespace = null, string ConfigId = null , Type subClass= null, Type thisAttribute=null)
{
- var a= GetAllAssembly().Where(x => x.FullName.Contains(ModeProjectName + ",")).FirstOrDefault();
- var b = a.GetTypes();
- var c = b.WhereIF(!string.IsNullOrEmpty(ModeNamespace), name => name.FullName.Contains(ModeNamespace + ".")).ToArray();
- var d = c.WhereIF(subClass != null, x => x.IsSubclassOf(subClass)).ToArray();
- var e = d.WhereIF(thisAttribute != null, x => (x.GetCustomAttributes(thisAttribute, true).Length > 0)).ToArray(); ;
+
#nullable enable
Type[]? types = GetAllAssembly().Where(x => x.FullName.Contains(ModeProjectName + ",")).FirstOrDefault()?.GetTypes().WhereIF(!string.IsNullOrEmpty(ModeNamespace), name => name.FullName.Contains(ModeNamespace + ".")).ToArray()
.WhereIF(subClass!=null, x => x.IsSubclassOf(subClass)).ToArray()
diff --git a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs
index d9d042f..ae8e340 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs
@@ -27,6 +27,7 @@
using CoreCms.Net.Utility.Extensions;
using CoreCms.Net.Utility.Helper;
using CoreCms.Net.Web.Admin.Infrastructure;
+using Essensoft.Paylink.Alipay.Domain;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
@@ -316,7 +317,7 @@
{
var jm = new AdminUiCallBack();
- var user = await _userServices.QueryByClauseAsync(p => p.mobile == entity.registeredUserMobile);
+ var user = await _userServices.QueryByClauseAsync(p => p.id == entity.userId);
if (user == null)
{
jm.msg = "鎻愪氦鐨勩�愬凡娉ㄥ唽鎵嬫満鍙枫�戞湭鏌ヨ鍒版敞鍐岀敤鎴�";
@@ -326,27 +327,129 @@
var isDistribution = await _coreCmsDistributionServices.ExistsAsync(p => p.userId == user.id);
if (isDistribution)
{
- jm.msg = "鎻愪氦鐨勩�愬凡娉ㄥ唽鎵嬫満鍙枫�戝凡缁忔槸缁忛攢鍟嗕簡銆�";
+ jm.msg = "鎻愪氦鐨勭敤鎴峰凡缁忔湁缁忛攢鍟嗚褰曪紝璇锋壘鍒扮浉鍏抽」杩涜瀹℃牳";
return jm;
}
var model = new CoreCmsDistribution();
- model.userId = user.id;
- model.mobile = entity.registeredUserMobile;
+ model.userId = user.id;
model.name = entity.name;
model.gradeId = entity.gradeId;
model.mobile = string.IsNullOrEmpty(entity.mobile) ? user.mobile : entity.mobile;
- model.weixin = entity.weixin;
- model.qq = entity.qq;
+ model.profession = entity.profession;
+ model.storeCoordinate = entity.storeCoordinate;
+ model.storeLogo = entity.storeBanner;
+ model.storeName= entity.storeName;
+ model.sales=entity.sales;
+ model.areaCode=entity.areaCode;
+ model.address=entity.address;
model.verifyStatus = entity.verifyStatus;
model.createTime = DateTime.Now;
model.isDelete = false;
- if (model.verifyStatus == (int)GlobalEnumVars.DistributionVerifyStatus.VerifyYes) model.verifyTime = DateTime.Now;
+ try
+ {
+ _unitOfWork.BeginTran();
+ if (model.verifyStatus == (int)GlobalEnumVars.DistributionVerifyStatus.VerifyYes)
+ {
+ model.verifyTime = DateTime.Now;
+ //鑰佹ā鍨嬫湭閫氳繃瀹℃牳锛屾柊妯″瀷鏈�氳繃瀹℃牳锛岄偅涔堜负瀹℃牳閫氳繃杩囩▼
+ var allConfigs = await _coreCmsSettingServices.GetConfigDictionaries();
+ var kc = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DictionaryUserGroupKey);
+
+ var group = await _userGradeServices.GetUserGradeByValueKey(kc);
+ if (group != null)
+ {
- var id = await _coreCmsDistributionServices.InsertAsync(model);
+ //鍏宠仈缁忛攢鍟嗙敤鎴风瓑绾�
+ if (user != null)
+ {
+ user.grade = group.id;
+ user.updataTime = DateTime.Now;
+ await _userServices.UpdateAsync(user);
- jm.code = id > 0 ? 0 : 1;
- jm.msg = id > 0 ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure;
+ }
+ }
+ //澶勭悊搴楅摵
+ if (entity.profession == "鏂囧叿搴�")
+ {
+
+ //鏂板缓搴楅摵鍚嶇О
+
+ var store = await _coreCmsStoreServices.QueryByClauseAsync(x => x.userID == model.userId);
+ if (store != null)
+ {
+ //瀛樺湪搴楅摵
+ store.coordinate = entity.storeCoordinate;
+ store.storeName = entity.storeName;
+ //鐢╨ogo浠ｆ浛闂ㄥご鐓х墖
+ store.logoImage = model.storeLogo;
+ store.en = true;
+ store.updateTime = DateTime.Now;
+ await _coreCmsStoreServices.UpdateAsync(store);
+
+
+ }
+ else
+ {
+ var areaCode = model.areaCode.Split(',').OrderByDescending(x => x).FirstOrDefault();
+ var db = _unitOfWork.GetDbClient();
+ string[] lat = [];
+ if (!string.IsNullOrEmpty(model.storeCoordinate))
+ lat = model.storeCoordinate.Split(",");
+ //鏂板缓鍦伴摵
+ store = new CoreCmsStore
+ {
+ userID = model.userId,
+ address = model.address,
+ areaId = areaCode.ToInt32OrDefault(510000),
+ storeName = model.storeName,
+ coordinate = model.storeCoordinate,
+ createTime = DateTime.Now,
+ mobile = model.mobile,
+ linkMan = user.nickName,
+
+
+
+ };
+ if (lat.Length == 2)
+ {
+ store.latitude = lat[0];
+ store.longitude = lat[1];
+ }
+ var storeid = await _unitOfWork.GetDbClient().Insertable(store).ExecuteReturnIdentityAsync();
+
+ //灏嗚嚜宸辫缃负搴楀憳
+ CoreCmsClerk clerk = new CoreCmsClerk()
+ {
+ createTime = DateTime.Now,
+ storeId = storeid,
+ userId = entity.userId,
+
+ };
+ await _coreCmsClerkServices.InsertAsync(clerk);
+
+
+
+
+ }
+
+ }
+
+ }
+
+ await _coreCmsDistributionServices.InsertAsync(model);
+
+ _unitOfWork.CommitTran();
+ }
+ catch (Exception)
+ {
+ _unitOfWork.RollbackTran();
+ throw;
+ }
+
+
+ jm.code = 1;
+ jm.msg = GlobalConstVars.CreateSuccess ;
return jm;
}
#endregion
diff --git a/CoreCms.Net.Web.Admin/Controllers/OfflineDistributor/OfflineDistributorController.cs b/CoreCms.Net.Web.Admin/Controllers/OfflineDistributor/OfflineDistributorController.cs
index 1e4eff0..e701729 100644
--- a/CoreCms.Net.Web.Admin/Controllers/OfflineDistributor/OfflineDistributorController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/OfflineDistributor/OfflineDistributorController.cs
@@ -150,6 +150,12 @@
{
where = where.And(p => p.School.Contains(School));
}
+ // 鍦版帹浜哄憳
+ var pUserID = Request.Form["pUserID"].FirstOrDefault().ToInt32OrDefault(0);
+ if (pUserID>0)
+ {
+ where = where.And(p => p.PUserID==pUserID);
+ }
//缁忛攢鍟嗗悕绉� varchar
var DealerName = Request.Form["DealerName"].FirstOrDefault();
if (!string.IsNullOrEmpty(DealerName))
@@ -650,7 +656,7 @@
cellNumTemp++;
var rowTemp12 = rowTemp.CreateCell(cellNumTemp);
- rowTemp12.SetCellValue(listModel[i].NegotiationRecord.ToString());
+ rowTemp12.SetCellValue(listModel[i].NegotiationRecord?.ToString());
rowTemp12.CellStyle = commonCellStyle;
cellNumTemp++;
diff --git a/CoreCms.Net.Web.Admin/NLog.config b/CoreCms.Net.Web.Admin/NLog.config
index 00a747b..3097c5e 100644
--- a/CoreCms.Net.Web.Admin/NLog.config
+++ b/CoreCms.Net.Web.Admin/NLog.config
@@ -14,7 +14,7 @@
dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient"
connectionString="Server=127.0.0.1;Database=BaseMIS;User ID=sa;Password=123456"
-->
- <target name="log_database" xsi:type="Database" dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient" connectionString="Server=MS-FSEUTNLCXFDB\SQLEXPRESS;Database=CoreShopProfessional;MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;Trusted_Connection=True; ">
+ <target name="log_database" xsi:type="Database" dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient" connectionString="Server=MS-FSEUTNLCXFDB\SQLEXPRESS;Database=CoreShopProfessional;MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;integrated security=True;">
<commandText>
INSERT INTO SysNLogRecords
(LogDate,LogLevel,LogType,LogTitle,Logger,Message,MachineName,MachineIp,NetRequestMethod
diff --git a/CoreCms.Net.Web.Admin/appsettings.json b/CoreCms.Net.Web.Admin/appsettings.json
deleted file mode 100644
index cfe4c2a..0000000
--- a/CoreCms.Net.Web.Admin/appsettings.json
+++ /dev/null
@@ -1,100 +0,0 @@
-锘縶
- "ConnectionStrings": {
- "DbType": "SqlServer", //鏁版嵁搴撳皢鏀寔涓ょ妯″紡銆怱qlServer,MySql銆�
- "SqlConnection": "Server=localhost\\SQLEXPRESS;User ID=sa;Password=123456;Database=CoreShopProfessional;MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;"
- //SqlServer鏁版嵁搴撹繛鎺ュ瓧绗︿覆锛岄渶瑕佸紑鍚暟鎹簱杩炴帴澶嶇敤銆怣ultipleActiveResultSets=true銆�
-
- // 濡傛灉閲囩敤瀹瑰櫒鍖栭儴缃睸ervice 瑕佸啓鎴恗ysql鐨勬湇鍔″悕锛屽惁鍒欏啓鍦板潃
- //"SqlConnection": "Server=127.0.0.1;Port=3306;Database=CoreShopProfessional;Uid=CoreShopProfessional;Pwd=CoreShopProfessional;CharSet=utf8;pooling=true;SslMode=None;Allow User Variables=true;Convert Zero Datetime=True;Allow Zero Datetime=True;"
- // Mysql鏁版嵁搴撻摼鎺ュ瓧绗︿覆锛岃淇濇寔鍚庨潰鐨勫睘鎬у埆灏戙�傜粡杩囨祴璇曪紝mysql鐗堟湰闇�瑕�5.7鎴栦互涓�
- },
- //瀹氭椂浠诲姟绠＄悊闈㈡澘鐨勮处鎴峰瘑鐮�
- "HangFire": {
- "Login": "CoreShopProfessional",
- "PassWord": "CoreShopProfessional"
- },
- "AppConfig": {
- "AppUrl": "http://192.168.0.113:1987/", //鍚庣绠＄悊鍦板潃
- "AppPcUrl": "https://pc.test.pro.coreshop.cn/", //PC绔闂湴鍧�
- "AppH5Url": "https://h5.test.pro.coreshop.cn/", //H5绔闂湴鍧�
- "AppInterFaceUrl": "http://192.168.0.113:2015/", //鎺ュ彛璇锋眰鍦板潃
- "AppVersion": "CoreShopProfessional v0.7.3"
- },
- //redis涓哄繀椤诲惎鍔ㄩ」锛岃淇濇寔redis涓烘甯稿彲鐢�
- "RedisConfig": {
- "UseCache": true, //鍚敤redis浣滀负鍐呭瓨閫夋嫨
- "UseTimedTask": true, //鍚敤redis浣滀负瀹氭椂浠诲姟
- // 濡傛灉閲囩敤瀹瑰櫒鍖栭儴缃睸ervice 瑕佸啓鎴恟edis鐨勬湇鍔″悕锛屽惁鍒欏啓鍦板潃
- "ConnectionString": "127.0.0.1:6379,password=,connectTimeout=30000,responseTimeout=30000,abortConnect=false,connectRetry=1,syncTimeout=10000,DefaultDatabase=9" //redis鏁版嵁搴撹繛鎺ュ瓧绗︿覆
- },
- //jwt鎺堟潈璁よ瘉鐨勪竴浜涜缃�
- "JwtConfig": {
- "SecretKey": "", //璇疯嚜涓诲～鍐欎竴娈佃嫳鏂囨暟瀛楃瓑浣滀负token浠ょ墝锛�16浣�+
- "Issuer": "", //棰佸彂鑰呰韩浠芥爣璇嗭紝濡侰oreShop.Professional
- "Audience": "coreshop" //鏈熸湜鐨勬帴鏀朵汉锛屽core锛宑ms绛�
- },
- //璺ㄥ煙璁剧疆
- "Cors": {
- "PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
- "EnableAllIPs": false, //鏄惁搴旂敤鎵�鏈夌殑IP锛屽璁剧疆涓簍rue锛屽垯鍙栨秷璺ㄥ煙闄愬埗
- // 鏀寔澶氫釜鍩熷悕绔彛锛屾敞鎰忕鍙ｅ彿鍚庝笉瑕佸甫/鏂滄潌锛氭瘮濡俵ocalhost:8000/锛屾槸閿欑殑
- // 娉ㄦ剰锛宧ttp://127.0.0.1:1818 鍜� http://localhost:1818 鏄笉涓�鏍风殑
- "IPs": "http://127.0.0.1:4000,http://127.0.0.1:5000,http://127.0.0.1:6000,http://localhost:4000,http://localhost:5000,http://localhost:6000"
- },
- //涓棿浠�
- "Middleware": {
- //璁板綍璇锋眰鍜屽搷搴旀暟鎹�
- "RequestResponseLog": {
- "Enabled": false
- },
- //璁板綍鐢ㄦ埛鏂硅闂暟鎹�
- "RecordAccessLogs": {
- "Enabled": false, //鏄惁寮�鍚褰曟搷浣滄棩蹇楀姛鑳姐��
- "EnabledFileMode": false, //鏄惁寮�鍚褰曞埌鏂囦欢鍔熻兘銆傦紙褰卞搷鏁堢巼锛屾帴鍙ｄ笉寤鸿寮�鍚級
- "EnabledDbMode": false, //鏄惁寮�鍚褰曞埌鏁版嵁搴撴ā寮忋�傦紙褰卞搷鏁堢巼锛屽悗鍙板彲寮�鍚紝鎺ュ彛涓嶅缓璁紑鍚紝鍥犱负鏁版嵁搴撲細瀛樺偍澶ч噺鐨勭敤浜庤姹傛暟鎹拰杩斿洖鏁版嵁銆傦級
- "IgnoreApis": "/api/tools/getuserinfo,/api/tools/getNavs,/api/CodeGenerator/CodeGenDown" //浣跨敤灏忓啓閫楀彿鍒嗛殧
- },
- //璁板綍IP璇锋眰鏁版嵁
- "IPLog": {
- "Enabled": false
- }
- },
- //UseRateLimiter闄愭祦涓棿浠堕厤缃�
- "MyRateLimitOptions": {
- "MyRateLimit": {
- //涓�涓獥鍙ｄ腑鍏佽鐨勬渶澶у厑璁歌鏁板櫒鏁般�� 鍦ㄥ皢杩欎簺閫夐」浼犻�掔粰 鐨凢ixedWindowRateLimiter鏋勯�犲嚱鏁版椂锛屽繀椤昏缃负鍊� > 0銆�
- "PermitLimit": 100,
- //鎸囧畾璇锋眰鐨勬椂闂磋寖鍥淬�� 蹇呴』璁剧疆涓哄ぇ浜� Zero 灏嗚繖浜涢�夐」浼犻�掔粰 鐨勬瀯閫犲嚱鏁� FixedWindowRateLimiter鏃剁殑鍊笺��
- "Window": 10,
- //褰� AutoReplenishment 璁剧疆涓� true 鏃讹紝鍐呴儴璁℃椂鍣ㄦ瘡 ReplenishmentPeriod 鏃堕棿琛ュ厖涓�娆′护鐗屾暟锛涘綋 false 璁剧疆涓� TryReplenish 鏃讹紝搴旂敤蹇呴』瀵归檺鍒跺櫒璋冪敤 銆�
- "ReplenishmentPeriod": 2,
- //鎺掗槦鐨勮幏鍙栬姹傜殑鏈�澶х疮璁″厑璁歌鏁般�� 灏嗚繖浜涢�夐」浼犻�掔粰 鐨凢ixedWindowRateLimiter鏋勯�犲嚱鏁版椂锛屽繀椤昏缃负鍊� >= 0銆�
- "QueueLimit": 2,
- "SegmentsPerWindow": 8,
- "TokenLimit": 10,
- "TokensPerPeriod": 4,
- //鏄惁鑷姩琛ヨ揣
- "AutoReplenishment": false
- }
- },
- "Logging": {
- "LogLevel": {
- "Default": "Information",
- "Microsoft": "Warning",
- "Microsoft.Hosting.Lifetime": "Information"
- }
- },
- "AllowedHosts": "*",
- "WeChatOptions": {
- //鍏紬鍙�
- "WeiXinAppId": "",
- "WeiXinAppSecret": "",
- "WeiXinEncodingAesKey": "",
- "WeiXinToken": "",
- //灏忕▼搴�
- "WxOpenAppId": "wx45d700a970238807",
- "WxOpenAppSecret": "60faed587bd1028b1ef131539352f6bf",
- "WxOpenToken": "",
- "WxOpenEncodingAESKey": ""
- }
-}
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 c5cd9d7..c472675 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/create.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/create.html
@@ -11,7 +11,7 @@
</div>
</div>
<div class="layui-inline">
- <label for="pUserID" class="layui-form-label ">鎺ㄨ崘浜�</label>
+ <label for="pUserID" class="layui-form-label ">鍦版帹浜�</label>
<div class="layui-input-block">
<select lay-search="" name="pUserID" id="CreatOfflinedisSelUserID">
<option value="">璇烽�夋嫨鎴栨悳绱紙璁剧疆鍖哄垎澶у皬鍐欙級</option>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/details.html b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/details.html
index 7490676..0828623 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/details.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/details.html
@@ -29,7 +29,7 @@
</div>
</div>
<div class="layui-inline">
- <label for="pUserID" class="layui-form-label ">鎺ㄨ崘浜�</label>
+ <label for="pUserID" class="layui-form-label ">鍦版帹浜�</label>
<div class="layui-input-inline">
<div class="layui-input-inline">
<select lay-search="" name="pUserID" id="EditOfflinedisSelUserID" disabled>
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 c815284..35fc2fc 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/edit.html
@@ -43,7 +43,7 @@
</div>
</div>
<div class="layui-inline">
- <label for="pUserID" class="layui-form-label ">鎺ㄨ崘浜�</label>
+ <label for="pUserID" class="layui-form-label ">鍦版帹浜�</label>
<div class="layui-input-inline">
<div class="layui-input-inline">
<select lay-search="" name="pUserID" id="EditOfflinedisSelUserID">
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 b7c748b..2421e14 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/index.html
@@ -109,7 +109,16 @@
/>
</div>
</div>
-
+ <div class="layui-inline">
+ <label class="layui-form-label" for="CooperationIntent">鍦版帹浜哄憳</label>
+ <div class="layui-input-inline">
+ <div class="layui-input-inline">
+ <select lay-search="" name="pUserID" id="selOfflinedisSelUserID">
+ <option value="">璇烽�夋嫨鍦版帹浜�</option>
+ </select>
+ </div>
+ </div>
+ </div>
<div class="layui-inline">
<button
class="layui-btn layui-btn-sm"
@@ -360,6 +369,12 @@
}
}
);
+ formatUserSelInPut(
+ coreHelper,
+ form,
+ "selOfflinedisSelUserID",
+ ""
+ );
dropdown.render({
elem: "#SeCooperationIntent",
data: [
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/create.html
index f9c8b3d..995ed9f 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/create.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/create.html
@@ -1,12 +1,16 @@
<script type="text/html" template lay-done="layui.data.done(d);">
<div class="layui-form coreshop-form layui-form-pane" lay-filter="LAY-app-CoreCmsDistribution-createForm" id="LAY-app-CoreCmsDistribution-createForm">
- <input type="hidden" name="userId" value="0" />
+ <!-- <input type="hidden" name="userId" value="0" /> -->
<div class="layui-form-item">
- <label for="mobile" class="layui-form-label layui-form-required">宸叉敞鍐屾墜鏈哄彿</label>
- <div class="layui-input-inline">
+ <label for="mobile" class="layui-form-label layui-form-required">鐢ㄦ埛</label>
+ <div class="layui-input-block">
+ <select lay-search="" name="userId" id="CreatDistrbutorSelUserID" lay-verify="required" >
+ <option value="">璇烽�夋嫨鎴栨悳绱紙璁剧疆鍖哄垎澶у皬鍐欙級</option>
+ </select>
+ <!-- <div class="layui-input-inline">
<input name="registeredUserMobile" lay-verify="required|phone" class="layui-input" placeholder="璇疯緭鍏ユ墜鏈哄彿" lay-reqText="璇疯緭鍏ユ墜鏈哄彿" />
- </div>
+ </div> -->
</div>
<div class="layui-form-item">
@@ -20,21 +24,31 @@
</div>
</div>
<div class="layui-form-item">
- <label for="profession" class="layui-form-label">鎵�灞炶涓�</label>
+ <label for="profession" class="layui-form-label layui-form-required">鎵�灞炶涓�</label>
<div class="layui-input-inline">
- <input name="profession" class="layui-input" placeholder="鎵�灞炶涓�" lay-reqText="鎵�灞炶涓�" value="{{ '鏂囧叿搴�' }}" />
+ <input name="profession" class="layui-input" id="Creatprofession" lay-verify="required" placeholder="鎵�灞炶涓�" lay-reqText="鎵�灞炶涓�" value="{{ '鏂囧叿搴�' }}" />
</div>
+ <div class="layui-inline">
<label for="sales" class="layui-form-label layui-form-required">骞撮攢鍞</label>
<div class="layui-input-inline">
<input name="sales" class="layui-input" placeholder="骞撮攢鍞" lay-reqText="骞撮攢鍞" lay-verify="required|number" value="{{ '0' }}" />
</div>
- </div>
- <div class="layui-form-item">
- <label for="weixin" class="layui-form-label">寰俊鍙�</label>
- <div class="layui-input-inline">
- <input name="weixin" class="layui-input" placeholder="璇疯緭鍏ュ井淇″彿" lay-reqText="璇疯緭鍏ュ井淇″彿" />
+ <span class="layui-form-mid">鍏�</span>
</div>
-
+
+ </div>
+
+ <div class="layui-form-item">
+ <label for="name" class="layui-form-label layui-form-required">鍖哄煙</label>
+ <div class="layui-input-inline" style="width: 350px;">
+ <input name="CreatDistrbutorSelAreaCode" lay-verify="required" class="layui-input" type="hidden"/>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label for="mobile" class="layui-form-label ">璇︾粏鍦板潃</label>
+ <div class="layui-input-block">
+ <input name="address" class="layui-input" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" lay-reqText="璇疯緭鍏ヨ缁嗗湴鍧�" />
+ </div>
</div>
<div class="layui-form-item">
@@ -69,7 +83,7 @@
layui.data.done = function (d) {
//寮�鍚皟璇曟儏鍐典笅鑾峰彇鎺ュ彛璧嬪�兼暟鎹�
if (debug) { console.log(d.params.data); }
- layui.use(['admin', 'form', 'laydate', 'upload', 'coreHelper', 'cropperImg'],
+ layui.use(['admin', 'form', 'laydate', 'upload', 'coreHelper', 'cropperImg','dropdown'],
function () {
var $ = layui.$
, form = layui.form
@@ -77,8 +91,43 @@
, laydate = layui.laydate
, upload = layui.upload
, cropperImg = layui.cropperImg
+ ,dropdown=layui.dropdown
, coreHelper = layui.coreHelper;
-
+ formatAreaInPut(coreHelper, "CreatDistrbutorSelAreaCode");
+ formatUserSelInPut(coreHelper, form, "CreatDistrbutorSelUserID");
+ dropdown.render({
+ elem: "#Creatprofession",
+ data: [
+ {
+ title: "鏂囧叿搴�",
+ id: 101,
+ },
+ {
+ title: "骞垮憡搴�",
+ id: 102,
+ },
+ {
+ title: "灏忓崠閮�",
+ id: 103,
+ },
+ {
+ title: "寰晢",
+ id: 104,
+ },
+ {
+ title: "鐭棰戜富鎾�",
+ id: 105,
+ },
+ {
+ title: "鏁欏笀",
+ id: 106,
+ },
+ ],
+ click: function (obj) {
+ this.elem.val(obj.title);
+ },
+ style: "min-width: 235px;",
+ });
laydate.render({
elem: '#createTime-CoreCmsDistribution-createTime',
type: 'datetime'
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/edit.html
index 29636e0..bb3b0c1 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/edit.html
@@ -3,7 +3,7 @@
* @Author: 灏忛渚�
* @Date: 2024-02-28 13:48:49
* @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-27 13:03:32
+ * @LastEditTime: 2024-04-16 15:08:49
* Copyright: 2024 MinTinge CO.,LTD. All Rights Reserved.
* @Descripttion: 鍐欏叆浣犵殑鎻忚堪
-->
@@ -26,7 +26,7 @@
<div class="layui-form-item">
<label for="profession" class="layui-form-label">鎵�灞炶涓�</label>
<div class="layui-input-inline">
- <input name="profession" class="layui-input" placeholder="鎵�灞炶涓�" lay-reqText="鎵�灞炶涓�" value="{{d.params.data.model.profession || '' }}" />
+ <input name="profession" class="layui-input" placeholder="鎵�灞炶涓�" id="Editprofession" lay-reqText="鎵�灞炶涓�" value="{{d.params.data.model.profession || '' }}" />
</div>
<label for="sales" class="layui-form-label layui-form-required">骞撮攢鍞</label>
<div class="layui-input-inline">
@@ -71,13 +71,14 @@
layui.data.sendParams = function (d) {
//寮�鍚皟璇曟儏鍐典笅鑾峰彇鎺ュ彛璧嬪�兼暟鎹�
if (debug) { console.log(d.params.data); }
- layui.use(['admin', 'form', 'laydate', 'upload', 'coreHelper'],
+ layui.use(['admin', 'form', 'laydate', 'upload', 'coreHelper','dropdown'],
function () {
var $ = layui.$
, form = layui.form
, admin = layui.admin
, laydate = layui.laydate
, upload = layui.upload
+ ,dropdown=layui.dropdown
, coreHelper = layui.coreHelper;
laydate.render({
@@ -92,6 +93,39 @@
elem: '#editTime-CoreCmsDistribution-verifyTime',
type: 'datetime'
});
+ dropdown.render({
+ elem: "#Editprofession",
+ data: [
+ {
+ title: "鏂囧叿搴�",
+ id: 101,
+ },
+ {
+ title: "骞垮憡搴�",
+ id: 102,
+ },
+ {
+ title: "灏忓崠閮�",
+ id: 103,
+ },
+ {
+ title: "寰晢",
+ id: 104,
+ },
+ {
+ title: "鐭棰戜富鎾�",
+ id: 105,
+ },
+ {
+ title: "鏁欏笀",
+ id: 106,
+ },
+ ],
+ click: function (obj) {
+ this.elem.val(obj.title);
+ },
+ style: "min-width: 235px;",
+ });
form.verify({
verifyname: [/^[\S]{0,255}$/, '缁忛攢鍟嗗悕绉版渶澶у彧鍏佽杈撳叆255浣嶅瓧绗︼紝涓斾笉鑳藉嚭鐜扮┖鏍�'],
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html
index 20dd5b9..8786ba0 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html
@@ -122,7 +122,7 @@
</div>
</script>
-
+<script src="/views/liao.js"></script>
<script>
var indexData;
var debug = layui.setter.debug;
@@ -276,7 +276,7 @@
admin.popup({
shadeClose: false,
title: '鍒涘缓鏁版嵁',
- area: ['640px', '300px'],
+ area: ['640px', '500px'],
id: 'LAY-popup-CoreCmsDistribution-create',
success: function (layero, index) {
view(this.id).render('distribution/distributor/create', { data: e.data }).done(function () {
@@ -284,7 +284,10 @@
form.on('submit(LAY-app-CoreCmsDistribution-createForm-submit)',
function (data) {
var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
-
+ field.areaCode = GetAreaCodeFormFileid(
+ field,
+ "CreatDistrbutorSelAreaCode"
+ );
if (debug) { console.log(field); } //寮�鍚皟璇曡繑鍥炴暟鎹�
//鎻愪氦 Ajax 鎴愬姛鍚庯紝鍏抽棴褰撳墠寮瑰眰骞堕噸杞借〃鏍�
coreHelper.Post("Api/CoreCmsDistribution/DoCreate", field, function (e) {
diff --git a/CoreCms.Net.Web.WebApi/NLog.config b/CoreCms.Net.Web.WebApi/NLog.config
index 00a747b..75efa8b 100644
--- a/CoreCms.Net.Web.WebApi/NLog.config
+++ b/CoreCms.Net.Web.WebApi/NLog.config
@@ -14,7 +14,7 @@
dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient"
connectionString="Server=127.0.0.1;Database=BaseMIS;User ID=sa;Password=123456"
-->
- <target name="log_database" xsi:type="Database" dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient" connectionString="Server=MS-FSEUTNLCXFDB\SQLEXPRESS;Database=CoreShopProfessional;MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;Trusted_Connection=True; ">
+ <target name="log_database" xsi:type="Database" dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient" connectionString="Server=MS-FSEUTNLCXFDB\SQLEXPRESS;Database=CoreShopProfessional;MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;">
<commandText>
INSERT INTO SysNLogRecords
(LogDate,LogLevel,LogType,LogTitle,Logger,Message,MachineName,MachineIp,NetRequestMethod
diff --git a/CoreCms.Net.Web.WebApi/appsettings.json b/CoreCms.Net.Web.WebApi/appsettings.json
deleted file mode 100644
index 58295f5..0000000
--- a/CoreCms.Net.Web.WebApi/appsettings.json
+++ /dev/null
@@ -1,107 +0,0 @@
-锘縶
- "ConnectionStrings": {
- "DbType": "SqlServer", //鏁版嵁搴撳皢鏀寔涓ょ妯″紡銆怱qlServer,MySql銆�
- "SqlConnection": "Server=localhost\\SQLEXPRESS;User ID=sa;Password=123456;Database=CoreShopProfessional;MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;"
- //SqlServer鏁版嵁搴撹繛鎺ュ瓧绗︿覆锛岄渶瑕佸紑鍚暟鎹簱杩炴帴澶嶇敤銆怣ultipleActiveResultSets=true銆�
-
- // 濡傛灉閲囩敤瀹瑰櫒鍖栭儴缃睸ervice 瑕佸啓鎴恗ysql鐨勬湇鍔″悕锛屽惁鍒欏啓鍦板潃
- //"SqlConnection": "Server=127.0.0.1;Port=3306;Database=CoreShopProfessional;Uid=CoreShopProfessional;Pwd=CoreShopProfessional;CharSet=utf8;pooling=true;SslMode=None;Allow User Variables=true;Convert Zero Datetime=True;Allow Zero Datetime=True;"
- // Mysql鏁版嵁搴撻摼鎺ュ瓧绗︿覆锛岃淇濇寔鍚庨潰鐨勫睘鎬у埆灏戙�傜粡杩囨祴璇曪紝mysql鐗堟湰闇�瑕�5.7鎴栦互涓�
- },
- //瀹氭椂浠诲姟绠＄悊闈㈡澘鐨勮处鎴峰瘑鐮�
- "HangFire": {
- "Login": "CoreShopProfessional", //鐧诲綍璐﹀彿
- "PassWord": "uzmp0o3213217vr53", //鐧诲綍瀵嗙爜
- "JobExpirationTimeOut": "10080" //宸茬粡瀹屾垚鐨勪换鍔¤繃鏈熸椂闂达紝鍗曚綅鍒嗛挓锛堥粯璁�10080,7澶╂椂闂达級
- },
- //Swagger鎺堟潈璁块棶璁剧疆
- "SwaggerConfig": {
- "RoutePrefix": "doc", //璺敱鍦板潃锛岄粯璁oc
- "UserName": "1111",
- "PassWord": "1111"
- },
- "AppConfig": {
- "AppUrl": "http://192.168.0.113:1987/", //鍚庣绠＄悊鍦板潃
- "AppPcUrl": "https://pc.test.pro.coreshop.cn/", //PC绔闂湴鍧�
- "AppH5Url": "https://h5.test.pro.coreshop.cn/", //H5绔闂湴鍧�
- "AppInterFaceUrl": "http://192.168.0.113:2015/", //鎺ュ彛璇锋眰鍦板潃
- "AppVersion": "CoreShopProfessional v0.7.3"
- },
- //redis涓哄繀椤诲惎鍔ㄩ」锛岃淇濇寔redis涓烘甯稿彲鐢�
- "RedisConfig": {
- "UseCache": true, //鍚敤redis浣滀负鍐呭瓨閫夋嫨
- "UseTimedTask": true, //鍚敤redis浣滀负瀹氭椂浠诲姟
- // 濡傛灉閲囩敤瀹瑰櫒鍖栭儴缃睸ervice 瑕佸啓鎴恟edis鐨勬湇鍔″悕锛屽惁鍒欏啓鍦板潃
- "ConnectionString": "127.0.0.1:6379,password=,connectTimeout=30000,responseTimeout=30000,abortConnect=false,connectRetry=1,syncTimeout=10000,DefaultDatabase=9" //redis鏁版嵁搴撹繛鎺ュ瓧绗︿覆
- },
- //jwt鎺堟潈璁よ瘉鐨勪竴浜涜缃�
- "JwtConfig": {
- "SecretKey": "", //璇疯嚜涓诲～鍐欎竴娈佃嫳鏂囨暟瀛楃瓑浣滀负token浠ょ墝锛�16浣�+
- "Issuer": "", //棰佸彂鑰呰韩浠芥爣璇嗭紝濡侰oreShop.Professional
- "Audience": "coreshop" //鏈熸湜鐨勬帴鏀朵汉锛屽core锛宑ms绛�
- },
- //璺ㄥ煙璁剧疆
- "Cors": {
- "PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
- "EnableAllIPs": false, //鏄惁搴旂敤鎵�鏈夌殑IP锛屽璁剧疆涓簍rue锛屽垯鍙栨秷璺ㄥ煙闄愬埗
- // 鏀寔澶氫釜鍩熷悕绔彛锛屾敞鎰忕鍙ｅ彿鍚庝笉瑕佸甫/鏂滄潌锛氭瘮濡俵ocalhost:8000/锛屾槸閿欑殑
- // 娉ㄦ剰锛宧ttp://127.0.0.1:1818 鍜� http://localhost:1818 鏄笉涓�鏍风殑
- "IPs": "http://127.0.0.1:4000,http://127.0.0.1:5000,http://127.0.0.1:6000,http://localhost:4000,http://localhost:5000,http://localhost:6000"
- },
- //涓棿浠�
- "Middleware": {
- //璁板綍璇锋眰鍜屽搷搴旀暟鎹�
- "RequestResponseLog": {
- "Enabled": false
- },
- //璁板綍鐢ㄦ埛鏂硅闂暟鎹�
- "RecordAccessLogs": {
- "Enabled": false, //鏄惁寮�鍚褰曟搷浣滄棩蹇楀姛鑳姐��
- "EnabledFileMode": false, //鏄惁寮�鍚褰曞埌鏂囦欢鍔熻兘銆傦紙褰卞搷鏁堢巼锛屾帴鍙ｄ笉寤鸿寮�鍚級
- "EnabledDbMode": false, //鏄惁寮�鍚褰曞埌鏁版嵁搴撴ā寮忋�傦紙褰卞搷鏁堢巼锛屽悗鍙板彲寮�鍚紝鎺ュ彛涓嶅缓璁紑鍚紝鍥犱负鏁版嵁搴撲細瀛樺偍澶ч噺鐨勭敤浜庤姹傛暟鎹拰杩斿洖鏁版嵁銆傦級
- "IgnoreApis": "/api/tools/getuserinfo,/api/tools/getNavs,/api/CodeGenerator/CodeGenDown" //浣跨敤灏忓啓閫楀彿鍒嗛殧
- },
- //璁板綍IP璇锋眰鏁版嵁
- "IPLog": {
- "Enabled": false
- }
- },
- //UseRateLimiter闄愭祦涓棿浠堕厤缃�
- "MyRateLimitOptions": {
- "MyRateLimit": {
- //涓�涓獥鍙ｄ腑鍏佽鐨勬渶澶у厑璁歌鏁板櫒鏁般�� 鍦ㄥ皢杩欎簺閫夐」浼犻�掔粰 鐨凢ixedWindowRateLimiter鏋勯�犲嚱鏁版椂锛屽繀椤昏缃负鍊� > 0銆�
- "PermitLimit": 100,
- //鎸囧畾璇锋眰鐨勬椂闂磋寖鍥淬�� 蹇呴』璁剧疆涓哄ぇ浜� Zero 灏嗚繖浜涢�夐」浼犻�掔粰 鐨勬瀯閫犲嚱鏁� FixedWindowRateLimiter鏃剁殑鍊笺��
- "Window": 10,
- //褰� AutoReplenishment 璁剧疆涓� true 鏃讹紝鍐呴儴璁℃椂鍣ㄦ瘡 ReplenishmentPeriod 鏃堕棿琛ュ厖涓�娆′护鐗屾暟锛涘綋 false 璁剧疆涓� TryReplenish 鏃讹紝搴旂敤蹇呴』瀵归檺鍒跺櫒璋冪敤 銆�
- "ReplenishmentPeriod": 2,
- //鎺掗槦鐨勮幏鍙栬姹傜殑鏈�澶х疮璁″厑璁歌鏁般�� 灏嗚繖浜涢�夐」浼犻�掔粰 鐨凢ixedWindowRateLimiter鏋勯�犲嚱鏁版椂锛屽繀椤昏缃负鍊� >= 0銆�
- "QueueLimit": 2,
- "SegmentsPerWindow": 8,
- "TokenLimit": 10,
- "TokensPerPeriod": 4,
- //鏄惁鑷姩琛ヨ揣
- "AutoReplenishment": false
- }
- },
- "Logging": {
- "LogLevel": {
- "Default": "Information",
- "Microsoft": "Warning",
- "Microsoft.Hosting.Lifetime": "Information"
- }
- },
- "AllowedHosts": "*",
- "WeChatOptions": {
- //鍏紬鍙�
- "WeiXinAppId": "",
- "WeiXinAppSecret": "",
- "WeiXinEncodingAesKey": "",
- "WeiXinToken": "",
- //灏忕▼搴�
- "WxOpenAppId": "wx45d700a970238807",
- "WxOpenAppSecret": "60faed587bd1028b1ef131539352f6bf",
- "WxOpenToken": "",
- "WxOpenEncodingAESKey": ""
- }
-}
\ No newline at end of file
--
Gitblit v1.9.1