liyangbin преди 2 години
родител
ревизия
9077257f50
променени са 11 файла, в които са добавени 2503 реда и са изтрити 2481 реда
  1. 1 1
      components/BuyTicket.vue
  2. 1 1
      components/BuyVip.vue
  3. 2 1
      components/LoginBar.vue
  4. 2 0
      middleware/user.js
  5. 616 604
      pages/converter.vue
  6. 3 3
      pages/index.vue
  7. 3 2
      pages/members/me/expenses.vue
  8. 17 15
      pages/members/me/points.vue
  9. 1852 1850
      pages/pricing.vue
  10. 5 3
      pages/sdk.vue
  11. 1 1
      plugins/axios.js

+ 1 - 1
components/BuyTicket.vue

@@ -31,7 +31,7 @@
         <div v-if="count <= 0">
           <div>
             <p class="text-18px mb-15px">二维码过期,请刷新</p>
-            <el-button @click="handleFreshWechetCode">刷新</el-button>
+            <client-only><el-button @click="handleFreshWechetCode">刷新</el-button></client-only>
           </div>
         </div>
         <div v-else>

+ 1 - 1
components/BuyVip.vue

@@ -33,7 +33,7 @@
         <div v-if="count <= 0">
           <div>
             <p class="text-18px mb-15px">二维码过期,请刷新</p>
-            <el-button @click="handleFreshWechetCode">刷新</el-button>
+            <client-only><el-button @click="handleFreshWechetCode">刷新</el-button></client-only>
           </div>
         </div>
         <div v-else>

+ 2 - 1
components/LoginBar.vue

@@ -249,7 +249,8 @@ export default {
               <div><span>2.&nbsp;</span>网页登录,输入手机号,点击忘记密码,进行账号密码设置,登录账号</div>
             </div>
           </div>
-          <button id="btn-login" type="submit" class="logging" :class="{'btn-signin': loginBtnDisabled}" :disabled="loginBtnDisabled" @click="handlerLogin">登录</button>
+          <button id="btn-login" type="submit" class="logging" :class="{'btn-signin': loginBtnDisabled}" 
+          :disabled="loginBtnDisabled" @click="handlerLogin">登录</button>
           <div v-show="logging" class="loading"></div>
           <div class="register-now">
             <span>还没有帐号?</span>

+ 2 - 0
middleware/user.js

@@ -12,6 +12,8 @@ export default function({store, app: {$axios}}) {
         if(res.code === 200) {
           store.commit('setUser',res.result.memberInfo)
         }
+      }).catch((err)=>{
+        console.log(err)
       })
     }
   }

Файловите разлики са ограничени, защото са твърде много
+ 616 - 604
pages/converter.vue


+ 3 - 3
pages/index.vue

@@ -43,7 +43,7 @@ export default {
 <template>
   <div class="page-home">
     <client-only>
-      <el-carousel ref="carousel" indicator-position="none" interval="4000" loop  height="100vh" @change="handlerCarouselChange">
+      <el-carousel ref="carousel" indicator-position="none" trigger="click" :interval="4000" loop  height="100vh" @change="handlerCarouselChange">
         <el-carousel-item>
           <div class="home-banner banner ">
             <div class="bg"><img src="~/assets/images/common/pic_home_banner00.png" /></div>
@@ -66,7 +66,7 @@ export default {
             <div class="bg"><img src="~/assets/images/common/pic_home_banner02.png" /></div>
           </div>
         </el-carousel-item>
-        <el-carousel-item>
+        <!-- <el-carousel-item>
           <div class="home-banner banner">
             <div class="bg"><img src="~/assets/images/common/pic_home_banner00.png" /></div>
             <div class="slogan">
@@ -87,7 +87,7 @@ export default {
             </div>
             <div class="bg"><img src="~/assets/images/common/pic_home_banner02.png" /></div>
           </div>
-        </el-carousel-item>
+        </el-carousel-item> -->
       </el-carousel>
     </client-only>
     <!-- 自定义轮播点 -->

+ 3 - 2
pages/members/me/expenses.vue

@@ -29,7 +29,7 @@
         <button class="btn btn-delete" :disabled="isDelete" @click="deleteChangeFileRecord">删除</button>
       </div>
     </div>
-
+  <client-only>
     <el-table :data="tableData" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="50"></el-table-column>
       <el-table-column prop="format" label="格式转换" ></el-table-column>
@@ -67,6 +67,7 @@
       :page-size="25"
       @current-change="handleCurrentChange">
     </el-pagination>
+  </client-only>
   </div>
 </template>
 
@@ -74,7 +75,7 @@
 import { mapState } from 'vuex' 
 export default {
   layout: 'userCenter',
-  middleware: ['auth'],
+  middleware: ['auth','user'],
   data() {
     return {
       tableData:[],

+ 17 - 15
pages/members/me/points.vue

@@ -10,18 +10,20 @@
     <div>
       <p class="py-15px text-20px leading-28px">转换券购买记录</p>
     </div>
-    <el-table :data="tableData" :default-sort = "{prop: 'startDate', order: 'descending'}">
-      <el-table-column label="类目" prop="totalPoints"></el-table-column>
-      <el-table-column label="金额" prop="price"></el-table-column>
-      <el-table-column label="订单编号" ></el-table-column>
-      <el-table-column label="时间" prop="startDate"></el-table-column>
-      <!-- 表格无数据显示 -->
-      <div slot="empty">
-        <div class="table-empty"></div>
-        <p class="text-14px" style="color:rgba(0,0,0,0.54)">没有任何消费记录</p>
-        <p class="leading-20px mt-8px mb-100px text-14px" style="color:rgba(0,0,0,0.38)">每一分钱都花在了刀刃上</p>
-      </div>
-    </el-table>
+    <client-only>
+      <el-table :data="tableData" :default-sort = "{prop: 'startDate', order: 'descending'}">
+        <el-table-column label="类目" prop="totalPoints"></el-table-column>
+        <el-table-column label="金额" prop="price"></el-table-column>
+        <el-table-column label="订单编号" ></el-table-column>
+        <el-table-column label="时间" prop="startDate"></el-table-column>
+        <!-- 表格无数据显示 -->
+        <div slot="empty">
+          <div class="table-empty"></div>
+          <p class="text-14px" style="color:rgba(0,0,0,0.54)">没有任何消费记录</p>
+          <p class="leading-20px mt-8px mb-100px text-14px" style="color:rgba(0,0,0,0.38)">每一分钱都花在了刀刃上</p>
+        </div>
+      </el-table>
+    </client-only>
   </div>
 
 </template>
@@ -29,7 +31,7 @@
 <script>
 export default {
   layout: 'userCenter',
-  middleware: ['auth'],
+  middleware: ['auth','user'],
   data() {
     return {
       tableData: []
@@ -38,10 +40,10 @@ export default {
   mounted() {
     this.$axios.get("/members/getMemberInfo").then((res) => {
       if (res.code === 200) {
-        console.log(res.result)
+        // console.log(res.result)
         const change = []
         res.result.pricingList.forEach(item => {
-          console.log("数据",item)
+          // console.log("数据",item)
           const totalPoints = item.totalPoints + "张转换劵"
           const price="¥"+item.price+".0"
           const id= ''

Файловите разлики са ограничени, защото са твърде много
+ 1852 - 1850
pages/pricing.vue


+ 5 - 3
pages/sdk.vue

@@ -273,9 +273,11 @@ export default {
     // noLeadind<T> 代表第一次不触发函数执行,解决了鼠标滚轮事件在防抖处理后还触发两次绑定事件的问题
   },
   beforeDestroy() {
-     window.removeEventListener('resize',this.getLastSectionH)
-     window.removeEventListener('scroll',this.handlerScroll)
-     window.onmousewheel=document.onmousewheel=''
+    if(window){
+      window.removeEventListener('resize',this.getLastSectionH)
+      window.removeEventListener('scroll',this.handlerScroll)
+      window.onmousewheel=document.onmousewheel=''
+    }
   },
   methods: {
     // 获取最后一个selection的高度

+ 1 - 1
plugins/axios.js

@@ -27,7 +27,7 @@ export default function({store, app:{ $axios }, redirect} ) {
       return Promise.resolve(false)
     }
     if (code !== 200) {
-      console.log(123)
+      // console.log(123)
       Message.error(error.response?.data?.msg)
     }
   })