sunlupeng преди 1 година
родител
ревизия
180502bdc4
променени са 5 файла, в които са добавени 28 реда и са изтрити 5 реда
  1. 5 0
      src/router/index.js
  2. 1 1
      src/views/AddFunds.vue
  3. 3 3
      src/views/HomeView/PointsMall.vue
  4. 1 1
      src/views/Ipay.vue
  5. 18 0
      src/views/RechargeAgreement.vue

+ 5 - 0
src/router/index.js

@@ -112,6 +112,10 @@ const routes = [
     path: '/ipay',
     component: () => import('../views/Ipay.vue'),
   },
+  {
+    path: '/rechargeAgreement',
+    component: () => import('../views/RechargeAgreement.vue'),
+  },
   {
     path: '/noticeCenter',
     component: () => import('../views/NoticeCenter.vue'),
@@ -137,6 +141,7 @@ const routes = [
 ]
 
 const router = new VueRouter({
+  mode: 'history',
   linkActiveClass:'route-active',
   routes,
 })

+ 1 - 1
src/views/AddFunds.vue

@@ -67,7 +67,7 @@
                     </div>
                     <div class="down">
                       <div>扫码支付代表已阅读并同意</div>
-                      <div style="color: #04498d;cursor: pointer;">《充值协议》</div>
+                      <a href="/RechargeAgreement" target="_blank" style="color: #04498d;">《充值协议》</a>
                     </div>
                   </div>
                 </div>

+ 3 - 3
src/views/HomeView/PointsMall.vue

@@ -407,7 +407,7 @@ export default {
         },
         getFirstList() {
             let params = {
-                limit: 8,
+                limit: 16,
                 page: this.page,
                 name: this.goodsName,
                 productAttribute: this.productAttribute,
@@ -488,7 +488,7 @@ export default {
             var scrollHeight = document.documentElement.scrollHeight || document.body.scrollHeight;
             //滚动条到底部的条件
             console.log("距顶部---" + scrollTop + "可视区高度---" + windowHeight + "滚动条总高度---" + scrollHeight);
-            if (scrollHeight - (scrollTop + windowHeight) < 1) {
+            if (scrollHeight - (scrollTop + windowHeight) < 500) {
                 if (this.page > this.pages) {
                     return
                 } else {
@@ -498,7 +498,7 @@ export default {
         },
     },
     mounted() {
-        window.addEventListener('scroll', debounce(this.handleScroll,500));
+        window.addEventListener('scroll', debounce(this.handleScroll,100));
     },
     destroyed() {
         console.log('lalalal')

+ 1 - 1
src/views/Ipay.vue

@@ -67,7 +67,7 @@
                   </div>
                   <div class="down">
                     <div>扫码支付代表已阅读并同意</div>
-                    <div style="color: #04498d;cursor: pointer;">《充值协议》</div>
+                    <a href="/RechargeAgreement" target="_blank" style="color: #04498d;">《充值协议》</a>
                   </div>
                 </div>
               </div>

+ 18 - 0
src/views/RechargeAgreement.vue

@@ -0,0 +1,18 @@
+<template>
+    <div v-html="htmlData"></div>
+  </template>
+  <script>
+  import { dictList } from "@/api/allApi";
+  export default {
+    data() {
+      return {
+        htmlData:'',
+      };
+    },
+    created() {
+        dictList({dictType:'recharge_agreement'}).then(response => {
+          this.htmlData = response.data.data[0].remark; 
+        })
+    }
+  }
+  </script>