Merge remote-tracking branch 'origin/dev' into dev

packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue

@@ -120,10 +120,10 @@ export default {
       this.getDetail()
       this.getIntegralChange()
       this.getEventSummary()
-      let timeSta = dayjs().format('YYYY-MM-DD')
-      let timeEnd = dayjs().subtract(29, 'day').format('YYYY-MM-DD')
-      this.startPla = timeSta
-      this.endPla = timeEnd
+      let nowTime = dayjs().format('YYYY-MM-DD')
+      let timeAgo = dayjs().subtract(29, 'day').format('YYYY-MM-DD')
+      this.startPla = timeAgo
+      this.endPla = nowTime
     })
     
   },
@@ -206,16 +206,12 @@ export default {
           data: xData,
         },
         yAxis: {
-          type: 'value'
+          type: 'value',
         },
         series: [
           {
             data: yData,
             type: 'bar',
-            showBackground: true,
-            backgroundStyle: {
-              color: 'rgba(180, 180, 180, 0.2)'
-            },
             itemStyle: {
               normal: {
                 color: "#5087ec",

packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue

@@ -18,7 +18,7 @@
             </ai-download>
           </template>
         </ai-search-bar>
-        <ai-table :tableData="tableData" :total="page.total" :current.sync="current" :size.sync="page.size"
+        <ai-table :tableData="tableData" :total="total" :current.sync="current" :size.sync="size"
                   @getList="getTableData()" :col-configs="colConfigs" :dict="dict" @sort-change="changeTableSort">
 
           
@@ -90,7 +90,8 @@ export default {
       },
       girdIdList: [],
       tableData: [],
-      page: {size: 10, total: 0},
+      size: 10, 
+      total: 0,
       current: 1,
       girdList: [],
       form: {
@@ -124,9 +125,9 @@ export default {
       return [
         { prop: "userName", label: '姓名', align: "left",  },
         { prop: "girdName", label: '所属网格' },
-        { prop: "integral", label: '积分余额', align: "center", sortable: true },
-        { prop: "totalIntegral", label: '累计积分', align: "center", sortable: true },
-        { prop: "usedIntegral", label: '已用积分', align: "center", sortable: true  },
+        { prop: "integral", label: '积分余额', align: "center", sortable: "custom" },
+        { prop: "totalIntegral", label: '累计积分', align: "center", sortable: "custom" },
+        { prop: "usedIntegral", label: '已用积分', align: "center", sortable: "custom"  },
         { slot: "options" },
       ]
     },
@@ -144,14 +145,15 @@ export default {
     getTableData() {
       this.instance.post(`/app/appintegraluser/integralManager`,null,{
         params: {
-          ...this.page,
           ...this.search,
           current: this.current,
+          size: this.size,
+          total: this.total
         }
       }).then(res => {
         if(res?.data) {
           this.tableData = res.data.records
-          this.page.total = res.data.total
+          this.total = res.data.total
         }
       })
     },