From c97a386f0f305934be247c21baf1bb6bb3c02892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Fri, 28 Jul 2023 07:26:40 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E8=8E=B7=E5=8F=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=96=B0=E5=A2=9E=E5=8A=A0=E8=BD=BD=E4=B8=AD=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/CodeGenTemplate/app/vue2.txt      | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/vue2.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/vue2.txt
index b2f51734..c964ad94 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/vue2.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/vue2.txt
@@ -126,7 +126,7 @@ $end
         </view>
       </view>
     </u-popup>
-    <u-back-top :scroll-top="scrollTop" :bottom="150"></u-back-top>
+    <u-back-top :scroll-top="scrollTop" :bottom="180"></u-back-top>
   </view>
 </template>
 
@@ -174,13 +174,14 @@ $end
         loading: false,
 $foreach(item in genTable.Columns)
 $if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox") && item.DictType == "")
-        // ${item.ColumnComment}选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+        // ${item.ColumnComment}选项列表 格式 eg:{ label: '标签', value: '0'}
         ${item.CsharpFieldFl}Options: [],
 $elseif(item.HtmlType == "datetime" && item.IsQuery == true)
         //${item.ColumnComment}时间范围
         dateRange${item.CsharpField}: [],
 $end
 $end
+        // 排序集合 格式 eg:{ label: '名称', value: 'userId'}
         sortOptions: [
 $foreach(column in genTable.Columns)
 $if(column.IsSort)
@@ -199,6 +200,9 @@ $end
     methods: {
       checkPermi,
       getList() {
+        uni.showLoading({
+          title: 'loading...'
+        });
 $foreach(item in genTable.Columns)
 $if(item.HtmlType == "datetime" && item.IsQuery == true)
       this.addDateRange(this.queryParams, this.dateRange${item.CsharpField}, '${item.CsharpField}');
@@ -206,9 +210,8 @@ $end
 $end
         list${genTable.BusinessName}(this.queryParams).then(res => {
          if (res.code == 200) {
-           this.dataList = res.data.result;
+           this.dataList = [...this.dataList, ...res.data.result]
            this.total = res.data.totalNum;
-           this.loading = false;
           }
         })
       },
@@ -282,10 +285,4 @@ $end
       }
     }
   }
-</script>
-
-<style lang="scss">
-  .container {
-    padding-bottom: 20px;
-  }
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file