Merge branch 'develop' into test

miniprogram/pages/components/PayTypeChart/PayTypeChart.ts

@@ -41,7 +41,8 @@ function initChart(canvas, width, height, F2) {
   });
   paytypeChart.coord('polar', {
     transposed: true,
-    innerRadius: 0.7,
+    innerRadius: 0.5,
+    radius: 0.9,
   });
   paytypeChart.legend({
     position: 'right',
@@ -51,9 +52,7 @@ function initChart(canvas, width, height, F2) {
   paytypeChart
     .interval()
     .position('a*count')
-    .color('key', val => {
-      return colorMap[val];
-    })
+    .color('key', ['#EB7E59', '#13C2C2', '#FACC14', '#1890FF'])
     .adjust('stack');
   paytypeChart.axis(false);
   paytypeChart.render();
@@ -70,16 +69,20 @@ Component({
           paytypeChart.legend({
             position: 'right',
             marker: 'square',
-            custom: true,
-            items: newVal.map(item => ({
-              name: item.name,
-              value: ' ' + formatPrice(item.count),
-              marker: {
-                symbol: 'square',
-                fill: colorMap[item.key],
-                radius: 4,
-              },
-            })),
+            itemFormatter: val => {
+              let item = newVal.find(item => item.key === val);
+              return item ? item.name + '    ' + formatPrice(item.count) : '';
+            },
+            // custom: true,
+            // items: newVal.map(item => ({
+            //   name: item.name,
+            //   value: ' ' + formatPrice(item.count),
+            //   marker: {
+            //     symbol: 'square',
+            //     fill: colorMap[item.key],
+            //     radius: 4,
+            //   },
+            // })),
           });
         paytypeChart && paytypeChart.changeData(newVal);
       },

miniprogram/pages/home/home.ts

@@ -94,7 +94,7 @@ Component({
       } else if (timeType === 2) {
         entity.year = date.slice(0, 4);
       }
-      wx.showLoading({ title: '' });
+      wx.showLoading({ title: '', mask: true });
 
       let rechargeDataFetch = statisticsFetch({
         url: '/dcxy/reportInfo/queryRechargeOrderListV2',

miniprogram/pages/homeAndReport/homeAndReport.js

@@ -13,7 +13,7 @@ Page({
                 pagePath: '/pages/report/report',
                 iconPath: '/images/tab_baobiao_nor@2x.png',
                 selectedIconPath: '/images/tab_baobiao_pre@2x.png',
-                text: '报表分析',
+                text: '运营管理',
             },
         ],
     },
@@ -25,4 +25,4 @@ Page({
         });
     },
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9tZUFuZFJlcG9ydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImhvbWVBbmRSZXBvcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLElBQUksQ0FBQztJQUNILElBQUksRUFBRTtRQUNKLFFBQVEsRUFBRSxDQUFDO1FBQ1gsSUFBSSxFQUFFO1lBQ0o7Z0JBQ0UsUUFBUSxFQUFFLGtCQUFrQjtnQkFDNUIsUUFBUSxFQUFFLDhCQUE4QjtnQkFDeEMsZ0JBQWdCLEVBQUUsOEJBQThCO2dCQUNoRCxJQUFJLEVBQUUsTUFBTTthQUNiO1lBQ0Q7Z0JBQ0UsUUFBUSxFQUFFLHNCQUFzQjtnQkFDaEMsUUFBUSxFQUFFLGdDQUFnQztnQkFDMUMsZ0JBQWdCLEVBQUUsZ0NBQWdDO2dCQUNsRCxJQUFJLEVBQUUsTUFBTTthQUNiO1NBQ0Y7S0FDRjtJQUNELFdBQVcsWUFBQyxDQUFDO1FBQ1gsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDdkIsSUFBQSxhQUEwQixFQUF4QixjQUFJLEVBQUUsZ0JBQUssQ0FBYztRQUcvQixJQUFJLENBQUMsT0FBTyxDQUFDO1lBQ1gsUUFBUSxFQUFFLEtBQUs7U0FDaEIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIlBhZ2Uoe1xuICBkYXRhOiB7XG4gICAgc2VsZWN0ZWQ6IDAsXG4gICAgbGlzdDogW1xuICAgICAge1xuICAgICAgICBwYWdlUGF0aDogJy9wYWdlcy9ob21lL2hvbWUnLFxuICAgICAgICBpY29uUGF0aDogJy9pbWFnZXMvdGFiX3NodWp1X25vckAyeC5wbmcnLFxuICAgICAgICBzZWxlY3RlZEljb25QYXRoOiAnL2ltYWdlcy90YWJfc2h1anVfcHJlQDJ4LnBuZycsXG4gICAgICAgIHRleHQ6ICfmlbDmja7pppbpobUnLFxuICAgICAgfSxcbiAgICAgIHtcbiAgICAgICAgcGFnZVBhdGg6ICcvcGFnZXMvcmVwb3J0L3JlcG9ydCcsXG4gICAgICAgIGljb25QYXRoOiAnL2ltYWdlcy90YWJfYmFvYmlhb19ub3JAMngucG5nJyxcbiAgICAgICAgc2VsZWN0ZWRJY29uUGF0aDogJy9pbWFnZXMvdGFiX2Jhb2JpYW9fcHJlQDJ4LnBuZycsXG4gICAgICAgIHRleHQ6ICfmiqXooajliIbmnpAnLFxuICAgICAgfSxcbiAgICBdLFxuICB9LFxuICBjbGlja0hhbmRsZShlKSB7XG4gICAgY29uc29sZS5sb2coJ2luIGNsaWNrJywgZSk7XG4gICAgbGV0IHsgcGF0aCwgaW5kZXggfSA9IGUuZGV0YWlsO1xuICAgIC8vIGNvbnNvbGUubG9nKHBhdGgsIGluZGV4KTtcbiAgICAvLyB3eC5zd2l0Y2hUYWIoeyB1cmw6IHBhdGggfSk7XG4gICAgdGhpcy5zZXREYXRhKHtcbiAgICAgIHNlbGVjdGVkOiBpbmRleCxcbiAgICB9KTtcbiAgfSxcbn0pO1xuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9tZUFuZFJlcG9ydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImhvbWVBbmRSZXBvcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLElBQUksQ0FBQztJQUNILElBQUksRUFBRTtRQUNKLFFBQVEsRUFBRSxDQUFDO1FBQ1gsSUFBSSxFQUFFO1lBQ0o7Z0JBQ0UsUUFBUSxFQUFFLGtCQUFrQjtnQkFDNUIsUUFBUSxFQUFFLDhCQUE4QjtnQkFDeEMsZ0JBQWdCLEVBQUUsOEJBQThCO2dCQUNoRCxJQUFJLEVBQUUsTUFBTTthQUNiO1lBQ0Q7Z0JBQ0UsUUFBUSxFQUFFLHNCQUFzQjtnQkFDaEMsUUFBUSxFQUFFLGdDQUFnQztnQkFDMUMsZ0JBQWdCLEVBQUUsZ0NBQWdDO2dCQUNsRCxJQUFJLEVBQUUsTUFBTTthQUNiO1NBQ0Y7S0FDRjtJQUNELFdBQVcsWUFBQyxDQUFDO1FBQ1gsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDdkIsSUFBQSxhQUEwQixFQUF4QixjQUFJLEVBQUUsZ0JBQUssQ0FBYztRQUcvQixJQUFJLENBQUMsT0FBTyxDQUFDO1lBQ1gsUUFBUSxFQUFFLEtBQUs7U0FDaEIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIlBhZ2Uoe1xuICBkYXRhOiB7XG4gICAgc2VsZWN0ZWQ6IDAsXG4gICAgbGlzdDogW1xuICAgICAge1xuICAgICAgICBwYWdlUGF0aDogJy9wYWdlcy9ob21lL2hvbWUnLFxuICAgICAgICBpY29uUGF0aDogJy9pbWFnZXMvdGFiX3NodWp1X25vckAyeC5wbmcnLFxuICAgICAgICBzZWxlY3RlZEljb25QYXRoOiAnL2ltYWdlcy90YWJfc2h1anVfcHJlQDJ4LnBuZycsXG4gICAgICAgIHRleHQ6ICfmlbDmja7pppbpobUnLFxuICAgICAgfSxcbiAgICAgIHtcbiAgICAgICAgcGFnZVBhdGg6ICcvcGFnZXMvcmVwb3J0L3JlcG9ydCcsXG4gICAgICAgIGljb25QYXRoOiAnL2ltYWdlcy90YWJfYmFvYmlhb19ub3JAMngucG5nJyxcbiAgICAgICAgc2VsZWN0ZWRJY29uUGF0aDogJy9pbWFnZXMvdGFiX2Jhb2JpYW9fcHJlQDJ4LnBuZycsXG4gICAgICAgIHRleHQ6ICfov5DokKXnrqHnkIYnLFxuICAgICAgfSxcbiAgICBdLFxuICB9LFxuICBjbGlja0hhbmRsZShlKSB7XG4gICAgY29uc29sZS5sb2coJ2luIGNsaWNrJywgZSk7XG4gICAgbGV0IHsgcGF0aCwgaW5kZXggfSA9IGUuZGV0YWlsO1xuICAgIC8vIGNvbnNvbGUubG9nKHBhdGgsIGluZGV4KTtcbiAgICAvLyB3eC5zd2l0Y2hUYWIoeyB1cmw6IHBhdGggfSk7XG4gICAgdGhpcy5zZXREYXRhKHtcbiAgICAgIHNlbGVjdGVkOiBpbmRleCxcbiAgICB9KTtcbiAgfSxcbn0pO1xuIl19
\ No newline at end of file

miniprogram/pages/homeAndReport/homeAndReport.ts

@@ -12,7 +12,7 @@ Page({
         pagePath: '/pages/report/report',
         iconPath: '/images/tab_baobiao_nor@2x.png',
         selectedIconPath: '/images/tab_baobiao_pre@2x.png',
-        text: '报表分析',
+        text: '运营管理',
       },
     ],
   },

miniprogram/pages/index/index.wxml

@@ -5,7 +5,7 @@
     <input class="login-input" placeholder="请输入账号" bindinput="nameInputHandle" />
     <view class="login-input-password">
       <input class="login-input" placeholder="请输入密码" password="{{!showPassword}}" bindinput="passwardInoutHandle" />
-      <image wx:if="{{showPassword}}" catchtap="togglePassword" class="password-eyes" src="../../images/btn_turn on.png"></image>
+      <image wx:if="{{showPassword}}" catchtap="togglePassword" class="password-eyes" src="../../images/btn_turn_on.png"></image>
       <image wx:else catchtap="togglePassword" class="password-eyes" src="../../images/btn_turnoff.png"></image>
 
     </view>

miniprogram/pages/userGrowth/userGrowth.ts

@@ -18,6 +18,7 @@ Page({
     areaName: '',
     areaList: [],
     growthList: [],
+    registerCount: 0,
     customerCount: 0,
     activeCount: 0,
     isAdmin: 0,
@@ -108,9 +109,14 @@ Page({
             };
           }
         }
+        let registerCount = dayVos.reduce(
+          (total, current) => (total += current.count),
+          0,
+        );
         console.log('dayList:', dayList);
         this.setData!({
           growthList: dayList,
+          registerCount: registerCount,
           customerCount: customerCount ? customerCount : 0,
           activeCount: activeCount ? activeCount : 0,
         });

miniprogram/pages/userGrowth/userGrowth.wxml

@@ -3,7 +3,7 @@
   <view class="userGrowth-topBox">
     <view class="userGrowth-titleItem">
       <view class="userGrowth-titleName">注册人数</view>
-      <view class="userGrowth-titleValue">123412</view>
+      <view class="userGrowth-titleValue">{{registerCount}}</view>
     </view>
     <view class="userGrowth-titleItem">
       <view class="userGrowth-titleName">活跃人数</view>

miniprogram/utils/util.js

@@ -25,6 +25,9 @@ var joinComma = function (num) {
     var result = [], counter = 0;
     for (var index = num.length - 1; index >= 0; index--) {
         counter++;
+        if (index == 0 && isNaN(Number(num[index])) && result[0] === ',') {
+            result.shift();
+        }
         var element = num[index];
         result.unshift(element);
         if (!(counter % 3) && index != 0) {
@@ -40,4 +43,4 @@ exports.delay = (function () {
         timer = setTimeout(callback, ms);
     };
 })();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInV0aWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxvQkFBMkIsSUFBVTtJQUNuQyxJQUFNLElBQUksR0FBRyxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7SUFDaEMsSUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLFFBQVEsRUFBRSxHQUFHLENBQUMsQ0FBQztJQUNsQyxJQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDM0IsSUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQzdCLElBQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztJQUNqQyxJQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7SUFFakMsTUFBTSxDQUFDLENBQ0wsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDO1FBQzlDLEdBQUc7UUFDSCxDQUFDLElBQUksRUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FDbkQsQ0FBQztBQUNKLENBQUM7QUFiRCxnQ0FhQztBQUVELElBQU0sWUFBWSxHQUFHLFVBQUMsQ0FBUztJQUM3QixJQUFNLEdBQUcsR0FBRyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDekIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO0FBQ2xDLENBQUMsQ0FBQztBQUVXLFFBQUEsV0FBVyxHQUFHLFVBQUMsQ0FBUztJQUNuQyxJQUFNLEdBQUcsR0FBRyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3pCLElBQUksTUFBTSxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDNUIsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxHQUFHLEdBQUcsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2hELENBQUMsQ0FBQztBQUVGLElBQU0sU0FBUyxHQUFHLFVBQUMsR0FBVztJQUM1QixJQUFJLE1BQU0sR0FBRyxFQUFFLEVBQ2IsT0FBTyxHQUFHLENBQUMsQ0FBQztJQUNkLEdBQUcsQ0FBQyxDQUFDLElBQUksS0FBSyxHQUFHLEdBQUcsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLEtBQUssSUFBSSxDQUFDLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FBQztRQUNyRCxPQUFPLEVBQUUsQ0FBQztRQUNWLElBQU0sT0FBTyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUMzQixNQUFNLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3hCLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLEdBQUcsQ0FBQyxDQUFDLElBQUksS0FBSyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDakMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN0QixDQUFDO0lBQ0gsQ0FBQztJQUNELE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0FBQ3pCLENBQUMsQ0FBQztBQUNXLFFBQUEsS0FBSyxHQUFHLENBQUM7SUFDcEIsSUFBSSxLQUFLLEdBQUcsQ0FBQyxDQUFDO0lBQ2QsTUFBTSxDQUFDLFVBQVMsUUFBb0IsRUFBRSxFQUFVO1FBQzlDLFlBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNwQixLQUFLLEdBQUcsVUFBVSxDQUFDLFFBQVEsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUNuQyxDQUFDLENBQUM7QUFDSixDQUFDLENBQUMsRUFBRSxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGZ1bmN0aW9uIGZvcm1hdFRpbWUoZGF0ZTogRGF0ZSk6IHN0cmluZyB7XG4gIGNvbnN0IHllYXIgPSBkYXRlLmdldEZ1bGxZZWFyKCk7XG4gIGNvbnN0IG1vbnRoID0gZGF0ZS5nZXRNb250aCgpICsgMTtcbiAgY29uc3QgZGF5ID0gZGF0ZS5nZXREYXRlKCk7XG4gIGNvbnN0IGhvdXIgPSBkYXRlLmdldEhvdXJzKCk7XG4gIGNvbnN0IG1pbnV0ZSA9IGRhdGUuZ2V0TWludXRlcygpO1xuICBjb25zdCBzZWNvbmQgPSBkYXRlLmdldFNlY29uZHMoKTtcblxuICByZXR1cm4gKFxuICAgIFt5ZWFyLCBtb250aCwgZGF5XS5tYXAoZm9ybWF0TnVtYmVyKS5qb2luKCctJykgK1xuICAgICcgJyArXG4gICAgW2hvdXIsIG1pbnV0ZSwgc2Vjb25kXS5tYXAoZm9ybWF0TnVtYmVyKS5qb2luKCc6JylcbiAgKTtcbn1cblxuY29uc3QgZm9ybWF0TnVtYmVyID0gKG46IG51bWJlcikgPT4ge1xuICBjb25zdCBzdHIgPSBuLnRvU3RyaW5nKCk7XG4gIHJldHVybiBzdHJbMV0gPyBzdHIgOiAnMCcgKyBzdHI7XG59O1xuXG5leHBvcnQgY29uc3QgZm9ybWF0UHJpY2UgPSAobjogbnVtYmVyKSA9PiB7XG4gIGNvbnN0IHN0ciA9IG4udG9GaXhlZCgyKTtcbiAgbGV0IHN0ckFyciA9IHN0ci5zcGxpdCgnLicpO1xuICByZXR1cm4gam9pbkNvbW1hKHN0ckFyclswXSkgKyAnLicgKyBzdHJBcnJbMV07XG59O1xuXG5jb25zdCBqb2luQ29tbWEgPSAobnVtOiBzdHJpbmcpID0+IHtcbiAgdmFyIHJlc3VsdCA9IFtdLFxuICAgIGNvdW50ZXIgPSAwO1xuICBmb3IgKGxldCBpbmRleCA9IG51bS5sZW5ndGggLSAxOyBpbmRleCA+PSAwOyBpbmRleC0tKSB7XG4gICAgY291bnRlcisrO1xuICAgIGNvbnN0IGVsZW1lbnQgPSBudW1baW5kZXhdO1xuICAgIHJlc3VsdC51bnNoaWZ0KGVsZW1lbnQpO1xuICAgIGlmICghKGNvdW50ZXIgJSAzKSAmJiBpbmRleCAhPSAwKSB7XG4gICAgICByZXN1bHQudW5zaGlmdCgnLCcpO1xuICAgIH1cbiAgfVxuICByZXR1cm4gcmVzdWx0LmpvaW4oJycpO1xufTtcbmV4cG9ydCBjb25zdCBkZWxheSA9IChmdW5jdGlvbigpIHtcbiAgbGV0IHRpbWVyID0gMDtcbiAgcmV0dXJuIGZ1bmN0aW9uKGNhbGxiYWNrOiAoKSA9PiB2b2lkLCBtczogbnVtYmVyKSB7XG4gICAgY2xlYXJUaW1lb3V0KHRpbWVyKTtcbiAgICB0aW1lciA9IHNldFRpbWVvdXQoY2FsbGJhY2ssIG1zKTtcbiAgfTtcbn0pKCk7XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInV0aWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxvQkFBMkIsSUFBVTtJQUNuQyxJQUFNLElBQUksR0FBRyxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7SUFDaEMsSUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLFFBQVEsRUFBRSxHQUFHLENBQUMsQ0FBQztJQUNsQyxJQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDM0IsSUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQzdCLElBQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztJQUNqQyxJQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7SUFFakMsTUFBTSxDQUFDLENBQ0wsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDO1FBQzlDLEdBQUc7UUFDSCxDQUFDLElBQUksRUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FDbkQsQ0FBQztBQUNKLENBQUM7QUFiRCxnQ0FhQztBQUVELElBQU0sWUFBWSxHQUFHLFVBQUMsQ0FBUztJQUM3QixJQUFNLEdBQUcsR0FBRyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDekIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO0FBQ2xDLENBQUMsQ0FBQztBQUVXLFFBQUEsV0FBVyxHQUFHLFVBQUMsQ0FBUztJQUNuQyxJQUFNLEdBQUcsR0FBRyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3pCLElBQUksTUFBTSxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDNUIsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxHQUFHLEdBQUcsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2hELENBQUMsQ0FBQztBQUVGLElBQU0sU0FBUyxHQUFHLFVBQUMsR0FBVztJQUM1QixJQUFJLE1BQU0sR0FBRyxFQUFFLEVBQ2IsT0FBTyxHQUFHLENBQUMsQ0FBQztJQUNkLEdBQUcsQ0FBQyxDQUFDLElBQUksS0FBSyxHQUFHLEdBQUcsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLEtBQUssSUFBSSxDQUFDLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FBQztRQUNyRCxPQUFPLEVBQUUsQ0FBQztRQUNWLEVBQUUsQ0FBQyxDQUFDLEtBQUssSUFBSSxDQUFDLElBQUksS0FBSyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxJQUFJLE1BQU0sQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLENBQUMsQ0FBQyxDQUFDO1lBQ2pFLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNqQixDQUFDO1FBQ0QsSUFBTSxPQUFPLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzNCLE1BQU0sQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDeEIsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLE9BQU8sR0FBRyxDQUFDLENBQUMsSUFBSSxLQUFLLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUNqQyxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3RCLENBQUM7SUFDSCxDQUFDO0lBQ0QsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7QUFDekIsQ0FBQyxDQUFDO0FBQ1csUUFBQSxLQUFLLEdBQUcsQ0FBQztJQUNwQixJQUFJLEtBQUssR0FBRyxDQUFDLENBQUM7SUFDZCxNQUFNLENBQUMsVUFBUyxRQUFvQixFQUFFLEVBQVU7UUFDOUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ3BCLEtBQUssR0FBRyxVQUFVLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ25DLENBQUMsQ0FBQztBQUNKLENBQUMsQ0FBQyxFQUFFLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgZnVuY3Rpb24gZm9ybWF0VGltZShkYXRlOiBEYXRlKTogc3RyaW5nIHtcbiAgY29uc3QgeWVhciA9IGRhdGUuZ2V0RnVsbFllYXIoKTtcbiAgY29uc3QgbW9udGggPSBkYXRlLmdldE1vbnRoKCkgKyAxO1xuICBjb25zdCBkYXkgPSBkYXRlLmdldERhdGUoKTtcbiAgY29uc3QgaG91ciA9IGRhdGUuZ2V0SG91cnMoKTtcbiAgY29uc3QgbWludXRlID0gZGF0ZS5nZXRNaW51dGVzKCk7XG4gIGNvbnN0IHNlY29uZCA9IGRhdGUuZ2V0U2Vjb25kcygpO1xuXG4gIHJldHVybiAoXG4gICAgW3llYXIsIG1vbnRoLCBkYXldLm1hcChmb3JtYXROdW1iZXIpLmpvaW4oJy0nKSArXG4gICAgJyAnICtcbiAgICBbaG91ciwgbWludXRlLCBzZWNvbmRdLm1hcChmb3JtYXROdW1iZXIpLmpvaW4oJzonKVxuICApO1xufVxuXG5jb25zdCBmb3JtYXROdW1iZXIgPSAobjogbnVtYmVyKSA9PiB7XG4gIGNvbnN0IHN0ciA9IG4udG9TdHJpbmcoKTtcbiAgcmV0dXJuIHN0clsxXSA/IHN0ciA6ICcwJyArIHN0cjtcbn07XG5cbmV4cG9ydCBjb25zdCBmb3JtYXRQcmljZSA9IChuOiBudW1iZXIpID0+IHtcbiAgY29uc3Qgc3RyID0gbi50b0ZpeGVkKDIpO1xuICBsZXQgc3RyQXJyID0gc3RyLnNwbGl0KCcuJyk7XG4gIHJldHVybiBqb2luQ29tbWEoc3RyQXJyWzBdKSArICcuJyArIHN0ckFyclsxXTtcbn07XG5cbmNvbnN0IGpvaW5Db21tYSA9IChudW06IHN0cmluZykgPT4ge1xuICB2YXIgcmVzdWx0ID0gW10sXG4gICAgY291bnRlciA9IDA7XG4gIGZvciAobGV0IGluZGV4ID0gbnVtLmxlbmd0aCAtIDE7IGluZGV4ID49IDA7IGluZGV4LS0pIHtcbiAgICBjb3VudGVyKys7XG4gICAgaWYgKGluZGV4ID09IDAgJiYgaXNOYU4oTnVtYmVyKG51bVtpbmRleF0pKSAmJiByZXN1bHRbMF0gPT09ICcsJykge1xuICAgICAgcmVzdWx0LnNoaWZ0KCk7XG4gICAgfVxuICAgIGNvbnN0IGVsZW1lbnQgPSBudW1baW5kZXhdO1xuICAgIHJlc3VsdC51bnNoaWZ0KGVsZW1lbnQpO1xuICAgIGlmICghKGNvdW50ZXIgJSAzKSAmJiBpbmRleCAhPSAwKSB7XG4gICAgICByZXN1bHQudW5zaGlmdCgnLCcpO1xuICAgIH1cbiAgfVxuICByZXR1cm4gcmVzdWx0LmpvaW4oJycpO1xufTtcbmV4cG9ydCBjb25zdCBkZWxheSA9IChmdW5jdGlvbigpIHtcbiAgbGV0IHRpbWVyID0gMDtcbiAgcmV0dXJuIGZ1bmN0aW9uKGNhbGxiYWNrOiAoKSA9PiB2b2lkLCBtczogbnVtYmVyKSB7XG4gICAgY2xlYXJUaW1lb3V0KHRpbWVyKTtcbiAgICB0aW1lciA9IHNldFRpbWVvdXQoY2FsbGJhY2ssIG1zKTtcbiAgfTtcbn0pKCk7XG4iXX0=
\ No newline at end of file

miniprogram/utils/util.ts

@@ -29,6 +29,9 @@ const joinComma = (num: string) => {
     counter = 0;
   for (let index = num.length - 1; index >= 0; index--) {
     counter++;
+    if (index == 0 && isNaN(Number(num[index])) && result[0] === ',') {
+      result.shift();
+    }
     const element = num[index];
     result.unshift(element);
     if (!(counter % 3) && index != 0) {