From 46cbcbde4cb1612b631999da73dfe579208c4a73 Mon Sep 17 00:00:00 2001
From: minom <minomdu@gmail.com>
Date: Wed, 4 Feb 2026 17:43:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=95=8F=E9=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/App_Code/api/activityController.cs | 2 +-
 web/admin/activity/kind_reg.aspx       | 4 ++++
 web/web.config                         | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/web/App_Code/api/activityController.cs b/web/App_Code/api/activityController.cs
index a614ac4..2b40226 100644
--- a/web/App_Code/api/activityController.cs
+++ b/web/App_Code/api/activityController.cs
@@ -750,7 +750,7 @@ public class activityController : ApiController
 
             //已有值
             var count = qry.Count(); //pageSize = count;//一次取回??
-            var qryList = (pageSize > 0) ? qry.ToPagedList(page, pageSize).ToList() : qry.ToList();
+            var qryList = (pageSize > 0) ? qry.OrderBy(a=>a.num).ToPagedList(page, pageSize).ToList() : qry.ToList();
             var ret = new
             {
                 list = qryList.Select(x => new
diff --git a/web/admin/activity/kind_reg.aspx b/web/admin/activity/kind_reg.aspx
index ed0790b..2b19687 100644
--- a/web/admin/activity/kind_reg.aspx
+++ b/web/admin/activity/kind_reg.aspx
@@ -10,6 +10,7 @@
               el: '#app',
               vuetify: new Vuetify(vuetify_options),
               data() {
+                  console.log("yes",<%= _this_id %>);
                   return {
                       this_id: '<%= _this_id %>',
                       options: {},
@@ -124,6 +125,9 @@
                       deep: true,
                   },
               },
+              created() {
+                  //this.initialize();
+              },
               methods: {
                   search_show(curr) {
                       //console.log("btn_click:", curr, curr.api_url);
diff --git a/web/web.config b/web/web.config
index eb77cc8..466bace 100644
--- a/web/web.config
+++ b/web/web.config
@@ -45,8 +45,8 @@
   </appSettings>
   <connectionStrings>
     <!--SQL用-->
-    <add name="shopConn" providerName="System.Data.SqlClient" connectionString="Data Source=localhost;Initial Catalog=17168erp_t;User ID=17168erp;Password=17168erp;Encrypt=False;TrustServerCertificate=True;Provider=SQLOLEDB;Connection Timeout=10;" />
-    <add name="ezEntities" providerName="System.Data.EntityClient" connectionString="metadata=res://*/App_Code.Model.Model.csdl|res://*/App_Code.Model.Model.ssdl|res://*/App_Code.Model.Model.msl;provider=System.Data.SqlClient;provider connection string=&quot;Data Source=localhost;Initial Catalog=17168erp_t;User ID=17168erp;Password=17168erp;Encrypt=False;TrustServerCertificate=True;Connection Timeout=10;&quot;" />
+    <add name="shopConn" providerName="System.Data.SqlClient" connectionString="Data Source=192.168.5.21;Initial Catalog=17168erp_t;User ID=sa;Password=linux@mssql1234;Encrypt=False;TrustServerCertificate=True;Provider=SQLOLEDB;Connection Timeout=10;" />
+    <add name="ezEntities" providerName="System.Data.EntityClient" connectionString="metadata=res://*/App_Code.Model.Model.csdl|res://*/App_Code.Model.Model.ssdl|res://*/App_Code.Model.Model.msl;provider=System.Data.SqlClient;provider connection string=&quot;Data Source=192.168.5.21;Initial Catalog=17168erp_t;User ID=sa;Password=linux@mssql1234;Encrypt=False;TrustServerCertificate=True;Connection Timeout=10;&quot;" />
     <!-- 
     -->
     <!--SQL用-->