:bookmark: :bookmark: :bookmark: Releasing / Version tags. 3.2.0

src/page/login/index.vue

@@ -13,7 +13,7 @@
           src="/img/logo.png"
           alt="">
         <p class="title">{{ website.infoTitle }}</p>
-        <p>v 3.1.0</p>
+        <p>v 3.2.0</p>
       </div>
       <div class="login-border">
         <div class="login-main">

src/page/login/thirdlogin.vue

@@ -58,20 +58,20 @@ export default {
   name: 'SocialSignin',
   methods: {
     handleClick(thirdpart) {
-      let appid, client_id, redirect_uri, url
-      redirect_uri = encodeURIComponent(window.location.origin + '/#/authredirect')
+      let url
+      const redirect_uri = encodeURIComponent(window.location.origin + '/#/authredirect')
       if (thirdpart === 'wechat') {
-        appid = 'wxd1678d3f83b1d83a'
-        url = 'https://open.weixin.qq.com/connect/qrconnect?appid=' + appid + '&redirect_uri=' + redirect_uri + '&state=WX-LOGIN&response_type=code&scope=snsapi_login#wechat_redirect'
+        const appid = 'wxd1678d3f83b1d83a'
+        url = `https://open.weixin.qq.com/connect/qrconnect?appid=${appid}&redirect_uri=${redirect_uri}&state=WX-LOGIN&response_type=code&scope=snsapi_login#wechat_redirect`
       } else if (thirdpart === 'tencent') {
-        client_id = '101322838'
-        url = 'https://graph.qq.com/oauth2.0/authorize?response_type=code&state=QQ-LOGIN&client_id=' + client_id + '&redirect_uri=' + redirect_uri
+        const client_id = '101322838'
+        url = `https://graph.qq.com/oauth2.0/authorize?response_type=code&state=QQ-LOGIN&client_id=${client_id}&redirect_uri=${redirect_uri}`
       } else if (thirdpart === 'gitee') {
-        client_id = '8fc54e0e76e7842cf767c3ae3b9fdc48c03cefed27aa565ff7b2a39d142d9892'
-        url = 'https://gitee.com/oauth/authorize?response_type=code&client_id=' + client_id + '&state=GITEE-LOGIN&redirect_uri=' + redirect_uri
+        const client_id = 'c771eff6cf10c5353bc60eaf0c4a265ebdb91750e2fc844b61dbf75ace702723'
+        url = `https://gitee.com/oauth/authorize?response_type=code&client_id=${client_id}&state=GITEE-LOGIN&redirect_uri=${redirect_uri}`
       } else if (thirdpart === 'osc') {
-        client_id = 'neIIqlwGsjsfsA6uxNqD'
-        url = 'https://www.oschina.net/action/oauth2/authorize?response_type=code&client_id=' + client_id + '&state=OSC-LOGIN&redirect_uri=' + redirect_uri
+        const client_id = 'uLJ41IGu7qAGmzSVHwF4'
+        url = `https://www.oschina.net/action/oauth2/authorize?response_type=code&client_id=${client_id}'&state=OSC-LOGIN&redirect_uri=${redirect_uri}`
       }
       openWindow(url, thirdpart, 540, 540)
     }

src/page/wel.vue

@@ -4,18 +4,18 @@
       <div class="banner-text">
         <span>
           <a href="https://avue.top/#/pay" target="_blank">
-            <img src="https://img.shields.io/badge/Avue-2.0.3-green.svg" alt="Build Status">
+            <img src="https://img.shields.io/badge/Avue-2.0.4-green.svg" alt="Build Status">
           </a>
           <img src="https://img.shields.io/badge/Spring%20Boot-2.1.6.RELEASE-yellowgreen.svg" alt="Downloads">
-          <img src="https://img.shields.io/badge/Spring%20Cloud-Greenwich.SR1-blue.svg" alt="Coverage Status">
+          <img src="https://img.shields.io/badge/Spring%20Cloud-Greenwich.SR2-blue.svg" alt="Coverage Status">
         </span>
         <br>
         <span>
           <el-collapse v-model="activeNames">
             <el-collapse-item title="完整的微服务架构" name="1">
               <div>基于Spring Cloud Gateway</div>
-              <div>基于Spring Cloud Greenwich.SR1</div>
-              <div>基于Spring Boot 2.1.5.RELEASE</div>
+              <div>基于Spring Cloud Greenwich.SR2</div>
+              <div>基于Spring Boot 2.1.6.RELEASE</div>
             </el-collapse-item>
             <el-collapse-item title="完善的权限控制" name="2">
               <div>基于Spring Security OAuth实现鉴权体系；</div>

src/views/mp/wxstatistics/index.vue

@@ -4,13 +4,17 @@
       <el-col :md="4">
         <el-row>
           <el-date-picker
-            v-model="interval"
-            :picker-options="datePickerOptions"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            @change="check"/>
+            v-model="beginTime"
+            placeholder="选择开始时间"
+            @change="check">
+          </el-date-picker>
+        </el-row>
+        <el-row>
+          <el-date-picker
+            v-model="endTime"
+            placeholder="选择结束时间"
+            @change="check">
+          </el-date-picker>
         </el-row>
         <el-row>
           <avue-tree
@@ -59,12 +63,8 @@ export default {
   },
   data() {
     return {
-      datePickerOptions: {
-        disabledDate(date) {
-          return date >= new Date(new Date() - 3600 * 1000 * 24)
-        }
-      },
-      interval: [new Date() - 3600 * 1000 * 24 * 7, new Date() - 3600 * 1000 * 24],
+      beginTime: new Date() - 3600 * 1000 * 24 * 7,
+      endTime: new Date() - 3600 * 1000 * 24,
       q: {
         interval: undefined,
         appId: undefined
@@ -184,7 +184,7 @@ export default {
     nodeClick(data) {
       this.check()
       this.q.appId = data.appid
-      this.q.interval = new Date(this.interval[0]).getTime() + '-' + new Date(this.interval[1]).getTime()
+      this.q.interval = new Date(this.beginTime).getTime() + '-' + new Date(this.endTime).getTime()
       fetchStatistics(this.q).then(response => {
         this.userCumulate.series[0].data = response.data.data[0]
         this.userCumulate.xAxis.data = response.data.data[4]
@@ -202,8 +202,8 @@ export default {
       })
     },
     check() {
-      const start = new Date(this.interval[0])
-      const end = new Date(this.interval[1])
+      const start = new Date(this.beginTime)
+      const end = new Date(this.endTime)
 
       if (end.getDate() >= new Date()) {
         this.$message.error('统计结束日小于，请重新选择')

src/views/pay/cd/index.vue

@@ -32,25 +32,31 @@
 </style>
 
 <script>
-  import VueQrcode from '@xkeshi/vue-qrcode'
+import VueQrcode from '@xkeshi/vue-qrcode'
 
-  export default {
-    components: {
-      'qrcode': VueQrcode
-    },
-    data() {
-      return {
-        amount: '1',
-        msg: 'http://pigx.huaxiadaowei.com/pay/goods/buy?amount=1',
-        options: {
-          size: 300
-        }
-      }
-    },
-    watch: {
-      amount: function(amount) {
-        this.msg = 'http://pigx.huaxiadaowei.com/pay/goods/buy?amount=' + amount
+const protocol = window.location.protocol
+const host = window.location.host
+
+export default {
+  components: {
+    'qrcode': VueQrcode
+  },
+  data() {
+    return {
+      amount: '1',
+      msg: '',
+      options: {
+        size: 300
       }
     }
+  },
+  watch: {
+    amount: function(amount) {
+      this.msg = `${protocol}//${host}/pay/goods/buy?amount=${amount}`
+    }
+  },
+  created() {
+    this.msg = `${protocol}//${host}/pay/goods/buy?amount=1`
   }
+}
 </script>