Merge db97eda391 into 784ed39930

web/html/component/aClientTable.html

@@ -112,7 +112,7 @@
     <a-popover :overlay-class-name="themeSwitcher.currentTheme">
       <template slot="content">
         <span v-if="client.expiryTime < 0">{{ i18n "pages.client.delayedStart" }}</span>
-        <span v-else>[[ IntlUtil.formatDate(client.expiryTime) ]]</span>
+        <span v-else>[[ IntlUtil.formatDate(client._expiryTime) ]]</span>
       </template>
       <table>
         <tr class="tr-table-box">
@@ -129,7 +129,7 @@
     <a-popover v-if="client.expiryTime != 0" :overlay-class-name="themeSwitcher.currentTheme">
       <template slot="content">
         <span v-if="client.expiryTime < 0">{{ i18n "pages.client.delayedStart" }}</span>
-        <span v-else>[[ IntlUtil.formatDate(client.expiryTime) ]]</span>
+        <span v-else>[[ IntlUtil.formatDate(client._expiryTime) ]]</span>
       </template>
       <a-tag :style="{ minWidth: '50px', border: 'none' }" :color="ColorUtils.userExpiryColor(app.expireDiff, client, themeSwitcher.isDarkTheme)"> [[ IntlUtil.formatRelativeTime(client.expiryTime) ]] </a-tag>
     </a-popover>
@@ -221,7 +221,7 @@
               <a-popover :overlay-class-name="themeSwitcher.currentTheme">
                 <template slot="content">
                   <span v-if="client.expiryTime < 0">{{ i18n "pages.client.delayedStart" }}</span>
-                  <span v-else>[[ IntlUtil.formatDate(client.expiryTime) ]]</span>
+                  <span v-else>[[ IntlUtil.formatDate(client._expiryTime) ]]</span>
                 </template>
                 <a-progress :show-info="false" :status="isClientDepleted(record, client.email)? 'exception' : ''" :percent="expireProgress(client.expiryTime, client.reset)" />
               </a-popover>
@@ -233,7 +233,7 @@
               <a-popover v-if="client.expiryTime != 0" :overlay-class-name="themeSwitcher.currentTheme">
                 <template slot="content">
                   <span v-if="client.expiryTime < 0">{{ i18n "pages.client.delayedStart" }}</span>
-                  <span v-else>[[ IntlUtil.formatDate(client.expiryTime) ]]</span>
+                  <span v-else>[[ IntlUtil.formatDate(client._expiryTime) ]]</span>
                 </template>
                 <a-tag :style="{ minWidth: '50px', border: 'none' }" :color="ColorUtils.userExpiryColor(app.expireDiff, client, themeSwitcher.isDarkTheme)"> [[ IntlUtil.formatRelativeTime(client.expiryTime) ]] </a-tag>
               </a-popover>

web/html/form/inbound.html

@@ -52,7 +52,7 @@
                     <br v-if="dbInbound.lastTrafficResetTime && dbInbound.lastTrafficResetTime > 0">
                     <span v-if="dbInbound.lastTrafficResetTime && dbInbound.lastTrafficResetTime > 0">
                         <strong>{{ i18n "pages.inbounds.lastReset" }}:</strong>
-                        <span>[[ IntlUtil.formatDate(dbInbound.lastTrafficResetTime) ]]</span>
+                        <span v-if="datepicker == 'gregorian'">[[ IntlUtil.formatDate(dbInbound.lastTrafficResetTime) ]]</span>
                     </span>
                 </template>
                 {{ i18n "pages.inbounds.periodicTrafficResetTitle" }}

web/html/inbounds.html

@@ -389,7 +389,7 @@
                         </template>
                         <a-tag :style="{ minWidth: '50px' }"
                           :color="ColorUtils.usageColor(new Date().getTime(), app.expireDiff, dbInbound._expiryTime)">
-                          [[ IntlUtil.formatRelativeTime(dbInbound.expiryTime) ]]
+                          [[ IntlUtil.formatRelativeTime(dbInbound._expiryTime) ]]
                         </a-tag>
                       </a-popover>
                       <a-tag v-else color="purple" class="infinite-tag">

web/html/settings/panel/subscription/subpage.html

@@ -4,6 +4,7 @@
 <script src="{{ .base_path }}assets/vue/vue.min.js?{{ .cur_ver }}"></script>
 <script src="{{ .base_path }}assets/ant-design-vue/antd.min.js"></script>
 <script src="{{ .base_path }}assets/js/util/index.js?{{ .cur_ver }}"></script>
+<script src="{{ .base_path }}assets/js/util/date-util.js?{{ .cur_ver }}"></script>
 <script src="{{ .base_path }}assets/qrcode/qrious2.min.js?{{ .cur_ver }}"></script>
 {{ template "page/head_end" .}}