update code

api/common.js

@@ -28,5 +28,22 @@ module.exports={
   //提示
   notify:(obj)=>{
     Notify(obj)
+  },
+  /**
+   * 节流
+   * @param {Function} func 
+   * @param {Number} delay 
+   * @returns 
+   */
+  throttle:(func, delay = 2000)=> {
+    let flag = true
+    return () => {
+      if (!flag) return;
+      flag = false;
+      setTimeout(() => {
+        func()
+        flag = true
+      }, delay)
+    }
   }
  }

app.js

@@ -34,7 +34,7 @@ App({
     windowHeight:0,
     windowWidth:0,
     phone:'0755-82839168',
-    localImagePath:'',//发布是'.',本地开发是''
+    localImagePath:'.',//发布是'.',本地开发是''
     imghttp:'https://www.xsip.cn/fileManager/downloadFile?fileId='
     // imghttp:'http://192.168.1.16:8801/fileManager/downloadFile?fileId='
   },

app.json

@@ -64,7 +64,8 @@
     "wux-ellipsis": "/miniprogram_npm/wux-weapp/ellipsis/index",
     "wux-gallery": "/miniprogram_npm/wux-weapp/gallery/index",
     "wux-fab-button": "/miniprogram_npm/wux-weapp/fab-button/index",
-    "van-icon": "/miniprogram_npm/@vant/weapp/icon/index"
+    "van-icon": "/miniprogram_npm/@vant/weapp/icon/index",
+    "my-scroll-view":"/myComponents/scrollView/scrollView"
   },
   "componentFramework": "glass-easel",
   "sitemapLocation": "sitemap.json",

app.wxss

@@ -59,4 +59,10 @@ button[type=primary]{
 }
 .label{
   font-size: 35rpx;
+}
+.text{
+  font-size: 14px;
+}
+.link{
+  color: #4695e5;
 }

myComponents/avatar/avatar.js

@@ -0,0 +1,29 @@
+// myComponents/avatar/avatar.js
+const app = getApp()
+Component({
+
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    phone:app.globalData.phone,
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    makePhoneCall(){
+      wx.makePhoneCall({
+        phoneNumber: this.data.phone
+      })
+    },
+  }
+})

pages/personalInformation/editMessage.json

@@ -1,3 +1,4 @@
 {
+  "component": true,
   "usingComponents": {}
 }

myComponents/avatar/avatar.wxml

@@ -0,0 +1,4 @@
+<!--myComponents/avatar/avatar.wxml-->
+<view class="kefu" catch:tap="makePhoneCall">
+  <image class="img" src="/static/image/人工客服.png" mode="aspectFit"/>
+</view>

myComponents/avatar/avatar.wxss

@@ -0,0 +1,19 @@
+/* myComponents/avatar/avatar.wxss */
+@import "/static/iconfont/iconfont.wxss";
+.kefu{
+  position: fixed;  
+  border-radius: 50%;
+  width: 30px;  
+  height: 30px; 
+  padding: 5px; 
+  line-height: 100rpx;
+  background-color: #33cd5f !important;
+  right: 10px;
+  bottom: 100px;
+  z-index: 999; /* 确保按钮在其他内容之上 */  
+  overflow: hidden; /* 防止拖动时页面滚动 */  
+}
+.img{
+  width: 100%;
+  height: 100%;  
+}

myComponents/navBar/navBar.wxss

@@ -33,7 +33,7 @@
 .image {
   width: 22px;
   height: 22px;
-  /* text-align: center; */
+  text-align: center;
   line-height: 22px;
 }
 .title {

myComponents/product/product.wxml

@@ -57,9 +57,9 @@
     </view>
   </block>
   </view>
-  <view class="foot" wx:if="{{total && tableData.length>0}}">
+  <!-- <view class="foot" wx:if="{{total && tableData.length>0}}">
     <view wx:if="{{total>tableData.length}}" bind:tap="loadMore">加载更多</view>
     <wux-spin wux-class="spin" size="small" wx:elif="{{loading}}"/>
     <view wx:elif="{{total>10}}">没有更多了</view>
-  </view>
+  </view> -->
 </view>

myComponents/product/product.wxss

@@ -29,6 +29,7 @@
 .product_content{
   display: flex;
   flex-wrap: wrap;
+  height: 100%;
 }
 .product_item{
   width: 45%;

myComponents/scrollView/scrollView.js

@@ -0,0 +1,93 @@
+// myComponents/scrollView/scrollView.js
+Component({
+
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    customStyle:{
+      type:String,
+      value:"height: 100px;"
+    },
+    threshold:{
+      type:Number,
+      value:100
+    },
+    triggered:{
+      type:Boolean,
+      value:false
+    },
+    hasMore:{
+      type:Boolean,
+      value:true
+    },
+    load:{
+      type:Boolean,
+      value:false
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    show:false,
+    scrollHeight:0,
+    scrollTop: 0,
+    threshold2: 50
+  },
+  attached:function(){
+    // const query = wx.createSelectorQuery().in(this);  
+    // query.select('.scroll-view-class').boundingClientRect(rect => {  
+    //   this.setData({  
+    //     scrollHeight: rect.height  
+    //   });  
+    // }).exec(); 
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    onRefresh(){
+      this.triggerEvent('onRefresh')
+    },
+    handleScroll(e) {  
+      if (this.data.scrollHeight && this.data.scrollTop) {  
+        const distanceToBottom = this.data.scrollHeight - this.data.scrollTop - window.innerHeight;  
+        if (distanceToBottom <= this.data.threshold2) {  
+          // 触发加载更多数据的操作  
+          return true
+        }  
+      }  
+      return false
+    }, 
+    loadMore(e){
+      // this.setData({  
+      //   scrollTop: e.detail.scrollTop  
+      // });  
+      // var a = this.handleScroll()
+      // if(!a){
+      //   return 
+      // }
+      if(this.data.hasMore){
+        this.triggerEvent('loadMore')
+        return
+      }
+      this.setData(
+        {
+          show:true
+        }
+      )
+      // wx.showToast({
+      //   title: '没有更多了',
+      // })
+      var self = this
+      setTimeout(function () {
+        self.setData({
+          show: false,
+        })
+      }, 2000);
+    }
+  },
+
+})

myComponents/scrollView/scrollView.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

myComponents/scrollView/scrollView.wxml

@@ -0,0 +1,19 @@
+<!--myComponents/scrollView/scrollView.wxml-->
+<scroll-view type="list" scroll-y="true"
+      class="scroll-view-class"
+      refresher-enabled="{{true}}" 
+      refresher-threshold="{{threshold}}"
+      refresher-default-style="white"
+      refresher-background="rgb(211, 234, 248)"
+      refresher-triggered="{{triggered}}"
+      bindrefresherrefresh="onRefresh"  
+      bindscrolltolower="loadMore"
+     style="{{customStyle}}">
+    <slot></slot>
+    
+  </scroll-view>
+  <view class="text" wx:if="{{hasMore && load}}">
+    <image class="img" src="/static/image/loading.gif" mode="aspectFit"/>
+    加载中...
+  </view>
+  <view class="text" wx:elif="{{(!hasMore && load) || show}}">没有更多了</view>

myComponents/scrollView/scrollView.wxss

@@ -0,0 +1,12 @@
+/* myComponents/scrollView/scrollView.wxss */
+.text{
+  /* text-align: center;*/
+  padding: 10px; 
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.img{
+  width: 20px;
+  height: 20px;
+}

pages/collectPatent/collectPatent.js

@@ -1,7 +1,7 @@
 // pages/collectPatent/collectPatent.js
 const app = getApp()
 const api = require('../../api/index')
-import { $startWuxRefresher, $stopWuxRefresher,$stopWuxLoader,$wuxGallery} from '../../miniprogram_npm/wux-weapp/index'
+import {$wuxGallery} from '../../miniprogram_npm/wux-weapp/index'
 Page({
 
   /**
@@ -9,15 +9,16 @@ Page({
    */
   data: {
     imgHttp:app.globalData.imghttp,
-    loading:false,
-    scrolltop: 20,
     tableData:[],
     queryParams:{
       size:10,
       current:1
     },
     total:0,
-    id:null
+    id:null,
+    triggered:false,
+    load:false,
+    hasMore:true
   },
 
   /**
@@ -61,17 +62,18 @@ Page({
         queryParams:params,
         total:0,
         tableData:[],
+        hasMore:true
       }
     )
     this.selectCollectPatent()
   },
-  //下拉
-  onPulling() {
-    console.log('onPulling')
-  },
+
   //下拉刷新
   onRefresh() {
     console.log('onRefresh')
+    this.setData({
+      triggered: true,
+    })
     this.init()
   },
    //查看图片
@@ -96,7 +98,7 @@ Page({
     //   urls:imgs,
     // })
   },
-  //获取关注的产品
+  //获取收藏的专利
   selectCollectPatent(type){
     if(!this.data.id){
       return false
@@ -112,13 +114,20 @@ Page({
       if(res.code == 200){
         var len1 = this.data.tableData.length
         var len = len1>0?len1: 0
-        
+        var data = this.data.tableData.concat(res.data.data)
         this.setData(
           {
-            tableData:this.data.tableData.concat(res.data.data),
+            tableData:data,
             total:res.data.total,
+            triggered: false,
+            load:false
           }
         )
+        if(this.data.total<=data.length){
+          this.setData({
+            hasMore:false
+          })
+        }
         for(let i = 0;i<res.data.data.length;i++){
           this.getPictureByNo(res.data.data[i],len)
           len += 1 
@@ -129,6 +138,10 @@ Page({
         // })
       }
     }).catch(error=>{
+      this.setData({
+        triggered: false,
+        load:false
+      })
     })
   },
   //根据专利号获取相关图片
@@ -158,7 +171,8 @@ Page({
     var current = this.data.queryParams.current
     this.setData(
       {
-        ['queryParams.current']:current+1
+        ['queryParams.current']:current+1,
+        load :true
       }
     )
     this.selectCollectPatent()

pages/collectPatent/collectPatent.wxml

@@ -2,55 +2,45 @@
 <navBar></navBar>
 <van-notify id="van-notify" />
 <wux-gallery id="wux-gallery" />
-<wux-refresher
-  id="wux-refresher"
-  bind:pulling="onPulling"
-  bind:refresh="onRefresh"
-  distance="60"
->
+
 <view class="collectPatent">
   <view class="head">
     <text>我的收藏专利</text>
   </view>
-  <scroll-view wx:if="{{tableData.length>0}}" type="list" scroll-y class="main">
-    <block wx:for="{{tableData}}" wx:key="index">
-        <myCard edit="{{false}}">
-          <view slot="head_left">
-            <van-tag round color="#3f395c">{{index+ 1}}</van-tag>  专利号：<text class="link" data-patentNo="{{item.patentNo}}" catch:tap="checkPatentDetail">{{item.patentNo}} </text>
-          </view>
-          <!-- <view slot="head_right">
-            <van-checkbox-group value="{{ patentNoList }}" data-item="{{item}}" data-index="{{index}}" data-appNo="{{item.appNo}}"  bind:change="changePatentNoList">
-              <van-checkbox name="{{item.appNo}}"></van-checkbox>
-            </van-checkbox-group>
-          </view> -->
-          <view>
-            <swiper indicator-dots="{{true}}"
-            autoplay="{{false}}" interval="{{2000}}" duration="{{500}}">
-            <block wx:if="{{item.imageList && item.imageList.length>0}}" wx:for="{{item.imageList}}" wx:for-item="img" wx:key="index">
-              <swiper-item>
-                <view style="background-image: url('{{imgHttp+img.guid}}')" class="slide-image" data-current="{{img}}" data-imgList="{{item.imageList}}" bind:tap="previewImage"></view>  
-                 <!-- <image src="{{imgHttp+img.guid}}" class="slide-image" data-current="{{img}}" data-imgList="{{item.systemFileList}}" bindtap="previewImage" mode="aspectFit"/>   -->
-              </swiper-item>
-            </block>
-          </swiper>
-          <view wx:if="{{item.rightHolder && item.rightHolder.length>0}}">
-            专利权人：
-            <!-- {{item.rightHolder[0]}} -->
-            <text wx:for="{{item.rightHolder}}" wx:for-item="rightHolder" wx:for-index="ind" wx:key="ind">
-              <text>{{rightHolder}}</text>
-              <text wx:if="{{ind != item.rightHolder.length-1}}">、</text>
-            </text>
-          </view>
-          </view>
-        </myCard>
-      </block>
-    <view class="loadData" wx:if="{{total && tableData.length>0}}">
-      <view wx:if="{{total>tableData.length}}" bind:tap="loadMore">加载更多</view>
-      <wux-spin wux-class="spin" size="small" wx:elif="{{loading}}"/>
-      <view wx:else>没有更多了</view>
-    </view>
-  </scroll-view>
-  <van-empty wx:else description="暂无数据" />
+  <view class="main">
+    <my-scroll-view wx:if="{{tableData.length>0}}" triggered="{{triggered}}" load="{{load}}" hasMore="{{hasMore}}" bindonRefresh="onRefresh" bindloadMore="loadMore" customStyle="height: calc(100vh - 300rpx)">
+      <block wx:for="{{tableData}}" wx:key="index">
+          <myCard edit="{{false}}">
+            <view slot="head_left">
+              <van-tag round color="#3f395c">{{index+ 1}}</van-tag>  专利号：<text class="link" data-patentNo="{{item.patentNo}}" catch:tap="checkPatentDetail">{{item.patentNo}} </text>
+            </view>
+            <!-- <view slot="head_right">
+              <van-checkbox-group value="{{ patentNoList }}" data-item="{{item}}" data-index="{{index}}" data-appNo="{{item.appNo}}"  bind:change="changePatentNoList">
+                <van-checkbox name="{{item.appNo}}"></van-checkbox>
+              </van-checkbox-group>
+            </view> -->
+            <view>
+              <swiper indicator-dots="{{true}}"
+              autoplay="{{false}}" interval="{{2000}}" duration="{{500}}">
+              <block wx:if="{{item.imageList && item.imageList.length>0}}" wx:for="{{item.imageList}}" wx:for-item="img" wx:key="index">
+                <swiper-item>
+                  <view style="background-image: url('{{imgHttp+img.guid}}')" class="slide-image" data-current="{{img}}" data-imgList="{{item.imageList}}" bind:tap="previewImage"></view>  
+                  <!-- <image src="{{imgHttp+img.guid}}" class="slide-image" data-current="{{img}}" data-imgList="{{item.systemFileList}}" bindtap="previewImage" mode="aspectFit"/>   -->
+                </swiper-item>
+              </block>
+            </swiper>
+            <view wx:if="{{item.rightHolder && item.rightHolder.length>0}}">
+              专利权人：
+              <!-- {{item.rightHolder[0]}} -->
+              <text wx:for="{{item.rightHolder}}" wx:for-item="rightHolder" wx:for-index="ind" wx:key="ind">
+                <text>{{rightHolder}}</text>
+                <text wx:if="{{ind != item.rightHolder.length-1}}">、</text>
+              </text>
+            </view>
+            </view>
+          </myCard>
+        </block>
+    </my-scroll-view>
+    <van-empty wx:else description="暂无数据" />
+  </view>
 </view>
-
-</wux-refresher>

pages/collectPatent/collectPatent.wxss

@@ -10,10 +10,11 @@
   background-repeat: no-repeat; /* 图片不重复 */  
 }
 .collectPatent{
-  padding: 0 25rpx;
+  /* padding: 0 25rpx; */
   /* height: 100vh; */
 }
 .head{
+  margin: 0 25rpx;
   background-color: var(--themeColor);
   text-align: center;
   line-height: 80rpx;
@@ -24,9 +25,10 @@
 
 
 .main{
+  padding: 0 25rpx;
   flex: 1;
   overflow-y: hidden;
-  height: calc(100vh - 300rpx);
+  /* height: calc(100vh - 300rpx); */
   box-sizing: border-box;
   margin-top: 10px;
 }

pages/form/addProduct/addProduct.js

@@ -2,6 +2,7 @@
 const upload = require("../../../utils/upload")
 const api = require('../../../api/index')
 import { $wuxForm} from '../../../miniprogram_npm/wux-weapp/index'
+
 Page({
 
   /**
@@ -198,40 +199,48 @@ Page({
     if(!key){
       return false
     }
-    var that = this
+    // var that = this
     const { validateFields } = $wuxForm()
     validateFields((err, values) => {
       console.log(err)
       if (!err) {
-        var fileGuids = that.data.fileList.map(item=>{
+        var fileGuids = this.data.fileList.map(item=>{
           return item.guid
         })
         var params = {
-          ...that.data.form,
+          ...this.data.form,
           fileGuids:fileGuids
         }
         wx.showLoading({
           title: '加载中',
         })
-        api.addOrUpdateProduct(params).then(res=>{
-          if(res.code == 200){
-            var pages = getCurrentPages()
-            var prepage = pages[pages.length-2]
-            var product = {
-              concernType : params.concernType,
-              id:res.data[0],
-              key:params.searchCondition,
-              filePath:that.data.fileList[0]?.url
+        var that = this
+        api.throttle(
+          api.addOrUpdateProduct(params).then(res=>{
+            if(res.code == 200){
+              wx.showToast({
+                title: '关注成功',
+                icon: 'success',
+                duration: 2000
+              })
+              var pages = getCurrentPages()
+              var prepage = pages[pages.length-2]
+              var product = {
+                concernType : params.concernType,
+                id:res.data[0],
+                key:params.searchCondition,
+                filePath:that.data.fileList[0]?.url
+              }
+              prepage.setData({
+                product : product,
+                showDialog:false,
+                followType:null,
+              })
+              prepage.collectPatent()
+              wx.navigateBack()
             }
-            prepage.setData({
-              product : product,
-              showDialog:false,
-              followType:null,
-            })
-            prepage.collectPatent()
-            wx.navigateBack()
-          }
-        })
+          })
+        )
       }else{
         var error = Object.keys(err)
         var key = error[0]

pages/hotProduct/hotProduct.js

@@ -1,7 +1,5 @@
 // pages/hotProduct/hotProduct.js
 const api = require('../../api/index')
-
-import { $startWuxRefresher, $stopWuxRefresher,$stopWuxLoader} from '../../miniprogram_npm/wux-weapp/index'
 Page({
 
   /**
@@ -15,8 +13,9 @@ Page({
       size:10
     },
     total:25,
-    loading:false,
-    scrolltop: 20,
+    triggered:false,
+    load:false,
+    hasMore:true
   },
 
   /**
@@ -54,19 +53,20 @@ Page({
       {
         queryParams:params,
         total:0,
-        tableData:[]
+        tableData:[],
+        hasMore:true
       }
     )
     this.getProductList()
   },
-  //下拉
-  onPulling() {
-    console.log('onPulling')
-  },
+
   //下拉刷新
   onRefresh() {
     console.log('onRefresh')
     this.init()
+    this.setData({
+      triggered: true,
+    })
   },
 
   //获取爆款产品
@@ -86,10 +86,21 @@ Page({
             }
           )
         }
-        setTimeout(() => {
-          $stopWuxRefresher()
-        }, 1000)
+        this.setData({
+          triggered: false,
+          load:false
+        })
+        if(this.data.total<=data.length){
+          this.setData({
+            hasMore:false
+          })
+        }
       }
+    }).catch(error=>{
+      this.setData({
+        triggered: false,
+        load:false
+      })
     })
     
   },
@@ -98,10 +109,12 @@ Page({
     var current = this.data.queryParams.current
     this.setData(
       {
-        ['queryParams.current']:current+1
+        ['queryParams.current']:current+1,
+        load :true
       }
     )
     this.getProductList()
+    
   },
    //修改输入的关键词
    changeKeyword(e){

pages/hotProduct/hotProduct.wxml

@@ -1,11 +1,5 @@
 <!--pages/hotProduct/hotProduct.wxml-->
 <van-notify id="van-notify" />
-<wux-refresher
-  id="wux-refresher"
-  bind:pulling="onPulling"
-  bind:refresh="onRefresh"
-  distance="60"
->
 <view class="hotProduct">
   <view class="search">
     <myInput value="{{keyword}}" placeholder="请输入产品相关关键词" bindchange="changeKeyword" bindsearch="search" bindclickInnerIcon="clickInnerIcon"></myInput>
@@ -24,9 +18,8 @@
       <text>黑名单</text>
     </view>
   </view>
-  <scroll-view wx:if="{{tableData.length>0}}" type="list" scroll-y class="main">
-    <myProduct tableData="{{tableData}}" total="{{total}}" loading="{{loading}}" bindloadMore="loadMore"></myProduct>
-  </scroll-view>
+  <my-scroll-view wx:if="{{tableData.length>0}}" triggered="{{triggered}}" load="{{load}}" hasMore="{{hasMore}}" bindonRefresh="onRefresh" bindloadMore="loadMore" customStyle="height: calc(100vh - 260rpx)">
+    <myProduct tableData="{{tableData}}"></myProduct>
+  </my-scroll-view>
   <van-empty wx:else description="暂无数据" />
-</view>
-</wux-refresher>
+</view>

pages/hotProduct/hotProduct.wxss

@@ -2,6 +2,7 @@
 .hotProduct{
   padding:0 20rpx;
   height: 100vh;
+  z-index: 999;
 }
 .menuList{
   padding: 10rpx 0;
@@ -30,6 +31,6 @@
 .main{
   flex: 1;
   overflow-y: hidden;
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 220rpx);
   box-sizing: border-box;
 }

pages/index/index.wxss

@@ -74,7 +74,7 @@ page {
   padding: 5px;
   font-weight: bold;
   text-align: left;
-  font-size: 15px;
+  font-size: 28rpx;
   color: black;
 }
 .landscape_content_body_item{

pages/login/login.wxml

@@ -32,7 +32,7 @@
       </wux-field>
       <view slot="footer" class="btn-area btn-area_auto">
         <button type="primary" bindtap="onSubmit">登录 / 注册</button>
-        <button type="primary" open-type="getPhoneNumber" bindgetphonenumber="fastLogin" style="margin-top:20rpx">微信一键登录</button>
+        <button type="primary" open-type="getPhoneNumber" bindgetphonenumber="fastLogin" style="margin-top:20rpx">手机号快捷登录</button>
       </view>
     </wux-form>
 	</view>

pages/mine/mine.js

@@ -7,16 +7,16 @@ Page({
    * 页面的初始数据
    */
   data: {
-    menu1:[
-      {
-        label:'关注微信公众号',
-        type:'1'
-      },
-      {
-        label:'帮助与反馈',
-        type:'2'
-      },
-    ],
+    // menu1:[
+    //   {
+    //     label:'关注微信公众号',
+    //     type:'1'
+    //   },
+    //   {
+    //     label:'帮助与反馈',
+    //     type:'2'
+    //   },
+    // ],
     menu2:[
       {
         type:1,

pages/monitor/monitor.js

@@ -1,6 +1,5 @@
 // pages/monitor/monitor.js
 const api = require('../../api/index')
-import { $startWuxRefresher, $stopWuxRefresher,$stopWuxLoader} from '../../miniprogram_npm/wux-weapp/index'
 Page({
 
   /**
@@ -13,7 +12,9 @@ Page({
       size:10
     },
     total:0,
-    scrolltop: 20,
+    triggered:false,
+    load:false,
+    hasMore:true
   },
 
   /**
@@ -50,18 +51,19 @@ Page({
       {
         queryParams:params,
         total:0,
-        tableData:[]
+        tableData:[],
+        hasMore:true
       }
     )
     this.getMyMonitor()
   },
-  //下拉
-  onPulling() {
-    console.log('onPulling')
-  },
+
   //下拉刷新
   onRefresh() {
     console.log('onRefresh')
+    this.setData({
+      triggered: true,
+    })
     this.init()
   },
   //获取关注的产品
@@ -71,7 +73,8 @@ Page({
     var current = this.data.queryParams.current
     this.setData(
       {
-        ['queryParams.current']:current+1
+        ['queryParams.current']:current+1,
+        load:true
       }
     )
     this.getMyMonitor()

pages/monitor/monitor.wxml

@@ -1,19 +1,17 @@
 <!--pages/monitor/monitor.wxml 监控-->
 <navBar></navBar>
 <van-notify id="van-notify" />
-<wux-refresher
-  id="wux-refresher"
-  bind:pulling="onPulling"
-  bind:refresh="onRefresh"
-  distance="60"
->
+
 <view class="monitor">
   <view class="head">
     <text>我的监控</text>
   </view>
-  <scroll-view wx:if="{{tableData.length>0}}" type="list" scroll-y class="main">
-    <myProduct tableData="{{tableData}}" total="{{total}}" bindloadMore="loadMore"></myProduct>
-  </scroll-view>
-  <van-empty wx:else description="暂无数据" />
-</view>
-</wux-refresher>
+  <view class="main">
+    <my-scroll-view wx:if="{{tableData.length>0}}" triggered="{{triggered}}" load="{{load}}" hasMore="{{hasMore}}" bindonRefresh="onRefresh" bindloadMore="loadMore" customStyle="height: calc(100vh - 300rpx)">
+      <myProduct tableData="{{tableData}}"></myProduct>
+    </my-scroll-view>
+    <van-empty wx:else description="暂无数据" />
+  </view>
+  
+  
+</view>

pages/monitor/monitor.wxss

@@ -1,9 +1,10 @@
 /* pages/monitor/monitor.wxss */
 .monitor{
-  padding: 0 25rpx;
+  /* padding: 0 25rpx; */
   /* height: 100vh; */
 }
 .head{
+  margin: 0 25rpx;
   background-color: var(--themeColor);
   text-align: center;
   line-height: 80rpx;
@@ -17,6 +18,7 @@
   flex: 1;
   overflow-y: hidden;
   margin-top: 15rpx;
-  height: calc(100vh - 300rpx);
+  padding: 0 25rpx;
+  /* height: calc(100vh - 300rpx); */
   box-sizing: border-box;
 }

pages/myFollow/myFollow.js

@@ -1,7 +1,6 @@
 // pages/myFollow/myFollow.js
 const api = require('../../api/index')
 const app = getApp()
-import { $startWuxRefresher, $stopWuxRefresher,$stopWuxLoader} from '../../miniprogram_npm/wux-weapp/index'
 Page({
 
   /**
@@ -41,7 +40,9 @@ Page({
       },
     ],
     checked:[],
-    scrolltop: 20,
+    triggered:false,
+    load:false,
+    hasMore:true
   },
 
   /**
@@ -80,17 +81,18 @@ Page({
         queryParams:params,
         total:0,
         tableData:[],
+        hasMore:true
       }
     )
     this.getMyFollowProductList()
   },
-  //下拉
-  onPulling() {
-    console.log('onPulling')
-  },
+
   //下拉刷新
   onRefresh() {
     console.log('onRefresh')
+    this.setData({
+      triggered: true,
+    })
     this.init()
   },
   //取消关注
@@ -131,9 +133,16 @@ Page({
         this.setData(
           {
             tableData:data,
-            total:res.data.total
+            total:res.data.total,
+            triggered: false,
+            load:false
           }
         )
+        if(this.data.total<=data.length){
+          this.setData({
+            hasMore:false
+          })
+        }
         api.notify(
           {
             type:'success',
@@ -144,6 +153,10 @@ Page({
       }
     }).catch(error=>{
       wx.hideLoading()
+      this.setData({
+        triggered: false,
+        load:false
+      })
     })
   },
   //加载更多
@@ -151,7 +164,8 @@ Page({
     var current = this.data.queryParams.current
     this.setData(
       {
-        ['queryParams.current']:current+1
+        ['queryParams.current']:current+1,
+        load :true
       }
     )
     this.getMyFollowProductList()

pages/myFollow/myFollow.wxml

@@ -1,12 +1,7 @@
 <!--pages/myFollow/myFollow.wxml 我关注的-->
 <navBar></navBar>
 <van-notify id="van-notify" />
-<wux-refresher
-  id="wux-refresher"
-  bind:pulling="onPulling"
-  bind:refresh="onRefresh"
-  distance="60"
->
+
 <view class="myFollow">
   <view class="head">
     <text>我的关注</text>
@@ -19,9 +14,10 @@
       </van-checkbox>
     </van-checkbox-group>
   </view>
-  <scroll-view wx:if="{{tableData.length>0}}" type="list" scroll-y class="main">
-    <myProduct tableData="{{tableData}}" total="{{total}}" isFollow="{{true}}" bindloadMore="loadMore" bindcancelFollow="cancelFollow"></myProduct>
-  </scroll-view>
-  <van-empty wx:else description="暂无数据" />
-</view>
-</wux-refresher>
+  </view>
+  <view class="main myFollow">
+    <my-scroll-view wx:if="{{tableData.length>0}}" triggered="{{triggered}}" load="{{load}}" hasMore="{{hasMore}}" bindonRefresh="onRefresh" bindloadMore="loadMore" customStyle="height: calc(100vh - 320rpx)">
+      <myProduct tableData="{{tableData}}" isFollow="{{true}}" bindcancelFollow="cancelFollow"></myProduct>
+    </my-scroll-view>
+    <van-empty wx:else description="暂无数据" />
+  </view>

pages/myFollow/myFollow.wxss

@@ -35,7 +35,7 @@
 .main{
   flex: 1;
   overflow-y: hidden;
-  height: calc(100vh - 320rpx);
+  /* height: calc(100vh - 320rpx); */
   box-sizing: border-box;
   margin-top: 10rpx;
 }

pages/myWork/myWork.js

@@ -16,7 +16,6 @@ Page({
     total:0,
     loading:false,
     imgHttp:app.globalData.imghttp,
-    scrolltop: 20,
     ticketTypeFiled:{
       '1':'ticketFillInVO',
       '2':'ticketRightsProtectionVO',
@@ -34,7 +33,8 @@ Page({
       '2':'已受理，待支付',
       '3':'正在处理中',
       '4':'完成',
-      '5':'取消'
+      '5':'取消',
+      '6':'已上传结果',
     },
     //操作栏位
     menu:[
@@ -54,7 +54,10 @@ Page({
         method:'cancel',
         icon:''
       },
-    ]
+    ],
+    triggered:false,
+    load:false,
+    hasMore:true
   },
 
   /**
@@ -92,18 +95,19 @@ Page({
       {
         queryParams:params,
         total:0,
-        tableData:[]
+        tableData:[],
+        hasMore:true
       }
     )
     this.getMyWork()
   },
-  //下拉
-  onPulling() {
-    console.log('onPulling')
-  },
+
   //下拉刷新
   onRefresh() {
     console.log('onRefresh')
+    this.setData({
+      triggered: true,
+    })
     this.init()
   },
 
@@ -132,10 +136,22 @@ Page({
         this.setData(
           {
             tableData:data,
-            total:res.data.total
+            total:res.data.total,
+            triggered: false,
+            load:false
           }
         )
+        if(this.data.total<=data.length){
+          this.setData({
+            hasMore:false
+          })
+        }
       }
+    }).catch(error=>{
+      this.setData({
+        triggered: false,
+        load:false
+      })
     })
   },
   //加载更多
@@ -143,7 +159,8 @@ Page({
     var current = this.data.queryParams.current
     this.setData(
       {
-        ['queryParams.current']:current+1
+        ['queryParams.current']:current+1,
+        load :true
       }
     )
     this.getMyWork()

pages/myWork/myWork.wxml

@@ -2,17 +2,15 @@
 
 <navBar></navBar>
 <van-notify id="van-notify"/>
-<wux-refresher
-  id="wux-refresher"
-  bind:pulling="onPulling"
-  bind:refresh="onRefresh"
-  distance="60"
->
+
 <view class="myWork">
   <view class="head">
     <text>提交工单记录</text>
   </view>
-  <scroll-view wx:if="{{tableData.length>0}}" type="list" scroll-y class="main">
+</view>
+
+  <my-scroll-view wx:if="{{tableData.length>0}}" triggered="{{triggered}}" load="{{load}}" hasMore="{{hasMore}}" bindonRefresh="onRefresh" bindloadMore="loadMore" customStyle="height: calc(100vh - 280rpx)">
+    <view class="main myWork">
     <block wx:for="{{tableData}}" wx:for-item="item" wx:key="index">
       <myCard menu="{{menu}}" data="{{item}}" index="{{index}}" edit="{{(item.ticketProgress == 4 || item.ticketProgress == 5)?false:true}}" bindvalue='clickMenu'>
         <view slot="head_left" class="head_left">
@@ -121,12 +119,6 @@
         </view>
       </myCard>
     </block>
-    <view class="loadData" wx:if="{{total && tableData.length>0}}">
-      <view wx:if="{{total>tableData.length}}" bind:tap="loadMore">加载更多</view>
-      <wux-spin wux-class="spin" size="small" wx:elif="{{loading}}"/>
-      <view wx:elif="{{total>10}}">没有更多了</view>
-    </view>
-  </scroll-view>
+  </view>
+  </my-scroll-view>
   <van-empty wx:else description="暂无数据" />
-</view>
-</wux-refresher>

pages/myWork/myWork.wxss

@@ -16,7 +16,7 @@
 .main{
   flex: 1;
   overflow-y: hidden;
-  height: calc(100vh - 300rpx);
+  /* height: calc(100vh - 300rpx); */
   box-sizing: border-box;
 }
 .head_left{

pages/patentDetails/patentDetails.wxml

@@ -22,7 +22,7 @@
   </block>
  
   <wux-divider wux-class="line" position="left" text="号码" />
-  <view>
+  <view class="form">
     <my-form-item wx:if="{{patent.appNo}}" label="申请号：" border="{{false}}" customStyle="{{customStyle}}" labelWidth="{{labelWidth}}" labelPosition="{{labelPosition}}">
         <view class="form_item">{{patent.appNo}}</view>
       </my-form-item>
@@ -35,7 +35,7 @@
   </view>
  
   <wux-divider wux-class="line" position="left" text="申请（权利）人/设计人" />
-  <view>
+  <view class="form">
     <view >
       <my-form-item label="申请（权利）人：" border="{{false}}" customStyle="{{customStyle}}" labelWidth="350" labelPosition="{{labelPosition}}">
         <view class="form_item" wx:if="{{isSame}}">{{patent.rightHolder}}</view>
@@ -58,7 +58,7 @@
   
   <block wx:if="{{(patent.agency && patent.agency.length>0) ||(patent.agent && patent.agent.length>0) }}">
      <wux-divider wux-class="line" position="left" text="代理人" />
-      <view>
+      <view class="form">
         <my-form-item wx:if="{{patent.agency && patent.agency.length>0}}" label="代理机构：" border="{{false}}" customStyle="{{customStyle}}" labelWidth="{{labelWidth}}" labelPosition="{{labelPosition}}">
           <view class="form_item">{{patent.agency}}</view>
         </my-form-item>
@@ -70,7 +70,7 @@
    
     <block wx:if="{{patent.abstractStr && patent.abstractStr.length>0}}">
       <wux-divider wux-class="line" position="left" text="简要说明" />
-      <view class="form_item">
+      <view class="form_item form">
         <rich-text nodes="{{patent.abstractStr[0].text_content}}"></rich-text>
       </view>
     </block>

pages/patentDetails/patentDetails.wxss

@@ -5,6 +5,15 @@
   font-weight: bold !important;
   font-size: 15px !important;
 }
+.line::before{
+  width: 0px !important;
+}
+.line>.wux-divider__text{
+  padding-left: 0px !important;
+}
+.form{
+  padding: 0 10px;
+}
 .swiper{
   height: 200rpx;
 }

pages/personalInformation/editMessage.js

@@ -1,66 +0,0 @@
-// pages/personalInformation/editMessage.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

pages/personalInformation/editMessage.wxml

@@ -1,2 +0,0 @@
-<!--pages/personalInformation/editMessage.wxml-->
-<text>pages/personalInformation/editMessage.wxml</text>

pages/personalInformation/editMessage.wxss

@@ -1 +0,0 @@
-/* pages/personalInformation/editMessage.wxss */

pages/personalInformation/personalInformation.wxml

@@ -1,5 +1,6 @@
 <!--pages/personalInformation/personalInformation.wxml-->
 <navBar></navBar>
+<van-notify id="van-notify" />
 <van-popup
   show="{{ show }}"
   closeable

pages/riskAssessment/riskAssessment.js

@@ -100,7 +100,7 @@ Page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh() {
-
+  
   },
 
   /**

pages/riskAssessment/riskAssessment.wxml

@@ -1,25 +1,11 @@
 <!--pages/riskAssessment/riskAssessment.wxml-->
 <navBar backType="editLaw"></navBar>
 <van-notify id="van-notify" />
-<wux-refresher
-  id="wux-refresher"
-  bind:pulling="onPulling"
-  bind:refresh="onRefresh"
-  distance="60"
->
-<scroll-view class="appscrollarea" scroll-y >
 <view class="padding_50 content">
-  <!-- <view class="head">
-    <view class="img">
-      <image class="img" src="/static/image/logo-3.png" mode=""/>
-    </view>
-  </view> -->
   <view class="search">
     <myInput value="{{keyword}}" placeholder="请输入产品相关关键词" bindchange="changeKeyword" bindsearch="search" bindclickInnerIcon="clickInnerIcon"></myInput>
   </view>
   <view class="main">
     <myProduct tableData="{{tableData}}"></myProduct>
   </view>
-</view>
-</scroll-view>
-</wux-refresher>
+</view>

pages/searchRecords/searchRecords.js

@@ -1,7 +1,6 @@
 // pages/searchRecords/searchRecords.js
 const api = require('../../api/index')
 const app = getApp()
-import { $startWuxRefresher, $stopWuxRefresher,$stopWuxLoader} from '../../miniprogram_npm/wux-weapp/index'
 Page({
 
   /**
@@ -16,14 +15,16 @@ Page({
     total:0,
     loading:false,
     imgHttp:app.globalData.imghttp,
-    scrolltop: 20,
     menu:[
       {
         label:'删除',
         method:'del',
         icon:''
       },
-    ]
+    ],
+    triggered:false,
+    load:false,
+    hasMore:true
   },
 
   /**
@@ -61,18 +62,19 @@ Page({
       {
         queryParams:params,
         total:0,
-        tableData:[]
+        tableData:[],
+        hasMore:true
       }
     )
     this.getSearchRecords()
   },
-  //下拉
-  onPulling() {
-    console.log('onPulling')
-  },
+
   //下拉刷新
   onRefresh() {
     console.log('onRefresh')
+    this.setData({
+      triggered: true,
+    })
     this.init()
   },
   //查看图片
@@ -126,10 +128,22 @@ Page({
         this.setData(
           {
             tableData:data,
-            total:res.data.total
+            total:res.data.total,
+            triggered: false,
+            load:false
           }
         )
+        if(this.data.total<=data.length){
+          this.setData({
+            hasMore:false
+          })
+        }
       }
+    }).catch(error=>{
+      this.setData({
+        triggered: false,
+        load:false
+      })
     })
   },
   //加载更多
@@ -137,7 +151,8 @@ Page({
     var current = this.data.queryParams.current
     this.setData(
       {
-        ['queryParams.current']:current+1
+        ['queryParams.current']:current+1,
+        load :true
       }
     )
     this.getSearchRecords()

pages/searchRecords/searchRecords.wxml

@@ -1,17 +1,14 @@
 <!--pages/searchRecords/searchRecords.wxml 检索记录-->
 <navBar></navBar>
 <van-notify id="van-notify" />
-<wux-refresher
-  id="wux-refresher"
-  bind:pulling="onPulling"
-  bind:refresh="onRefresh"
-  distance="60"
->
+
 <view class="searchRecords">
   <view class="head">
     <text>检索记录</text>
   </view>
-  <scroll-view wx:if="{{tableData.length>0}}" type="list" scroll-y class="main">
+</view>
+<my-scroll-view wx:if="{{tableData.length>0}}" triggered="{{triggered}}" load="{{load}}" hasMore="{{hasMore}}" bindonRefresh="onRefresh" bindloadMore="loadMore" customStyle="height: calc(100vh - 300rpx)">
+  <view class="main searchRecords">
     <block wx:for="{{tableData}}" wx:key="index">
       <myCard edit="{{false}}" menu="{{menu}}" data="{{item}}" index="{{index}}" bindvalue='clickMenu'>
         <view slot="head_left" class="head_left">
@@ -39,12 +36,6 @@
         </view>
       </myCard>
     </block>
-    <view class="loadData" wx:if="{{total && tableData.length>0}}">
-      <view wx:if="{{total>tableData.length}}" bind:tap="loadMore">加载更多</view>
-      <wux-spin wux-class="spin" size="small" wx:elif="{{loading}}"/>
-      <view wx:elif="{{total>10}}">没有更多了</view>
-    </view>
-  </scroll-view>
+  </view>
+  </my-scroll-view>
   <van-empty wx:else description="暂无数据" />
-</view>
-</wux-refresher>

pages/searchRecords/searchRecords.wxss

@@ -26,7 +26,7 @@
   flex: 1;
   overflow-y: hidden;
   margin-top: 15rpx;
-  height: calc(100vh - 280rpx);
+  /* height: calc(100vh - 280rpx); */
   box-sizing: border-box;
 }
 .slide-image{

pages/searchResults/searchResults.js

@@ -1,8 +1,7 @@
 // pages/searchResults/searchResults.js
 const app = getApp()
 const api = require('../../api/index')
-const downLoad = require('../../utils/downLoad')
-import { $startWuxRefresher, $stopWuxRefresher,$stopWuxLoader,$wuxGallery} from '../../miniprogram_npm/wux-weapp/index'
+import { $wuxGallery} from '../../miniprogram_npm/wux-weapp/index'
 Page({
 
   /**
@@ -20,7 +19,6 @@ Page({
     loading:false,
     tableData:[],
     keyword:'',
-    scrolltop: 60,
     searchType:1,//检索类型1是爆款产品0是手动检索
     product:{},//产品信息
     patentNoList:[],
@@ -49,7 +47,10 @@ Page({
     },
     showDialog:false,
     followType:null,
-    isAdd:false
+    isAdd:false,
+    triggered:false,
+    load:false,
+    hasMore:true
   },
 
   /**
@@ -97,17 +98,18 @@ Page({
         tableData:[],
         patentNoList:[],
         patentList:[],
+        hasMore:true
       }
     )
     this.getPatentVectors()
   },
-  //下拉
-  onPulling() {
-    console.log('onPulling')
-  },
+
   //下拉刷新
   onRefresh() {
     console.log('onRefresh')
+    this.setData({
+      triggered: true,
+    })
     this.init()
   },
  
@@ -205,14 +207,21 @@ Page({
         console.log(res)
         var len1 = this.data.tableData.length
         var len = len1>0?len1: 0
-        
+        var data = this.data.tableData.concat(res.data.data)
         this.setData(
           {
-            tableData:this.data.tableData.concat(res.data.data),
+            tableData:data,
             total:res.data.total,
-            ifAddSearchRecord:false
+            ifAddSearchRecord:false,
+            triggered: false,
+            load:false
           }
         )
+        if(this.data.total<=data.length){
+          this.setData({
+            hasMore:false
+          })
+        }
         for(let i = 0;i<res.data.data.length;i++){
           this.getPictureByNo(res.data.data[i],len)
           len += 1 
@@ -222,6 +231,11 @@ Page({
         //   len += 1 
         // })
       }
+    }).catch(error=>{
+      this.setData({
+        triggered: false,
+        load:false
+      })
     })
   },
   //根据专利号获取相关图片
@@ -244,7 +258,8 @@ Page({
     var current = this.data.queryParams.current
     this.setData(
       {
-        ['queryParams.current']:current+1
+        ['queryParams.current']:current+1,
+        load :true
       }
     )
     this.getPatentVectors()
@@ -395,16 +410,16 @@ Page({
   },
 //收藏专利
 collectPatent(){
-  if(that.data.isAdd ){
-    that.setData(
+  if(this.data.isAdd ){
+    this.setData(
       {
         idAdd:false
       }
     )
-    if(that.data.patentNoList && that.data.patentNoList.length>0){
+    if(this.data.patentNoList && this.data.patentNoList.length>0){
       var params1 = {
-        productId:that.data.product.id,
-        patentNos:that.data.patentNoList
+        productId:this.data.product.id,
+        patentNos:this.data.patentNoList
       }
       api.collectPatent(params1).then(res=>{
         if(res.code == 200){

pages/searchResults/searchResults.wxml

@@ -40,13 +40,8 @@
   bind:contact="onContact"
   bind:getuserinfo="onGotUserInfo"
 />
-<wux-refresher
-  id="wux-refresher"
-  bind:pulling="onPulling"
-  bind:refresh="onRefresh"
-  distance="60"
->
-<scroll-view scroll-y class="searchResults">
+<my-scroll-view triggered="{{triggered}}" load="{{load}}" hasMore="{{hasMore}}" bindonRefresh="onRefresh" bindloadMore="loadMore"  customStyle="height: calc(100vh - 200rpx)">
+<view class="searchResults">
   <view class="head">
     <!-- <view class="img">
       <image class="img" src="/static/image/logo-3.png" mode=""/>
@@ -126,7 +121,10 @@
               </swiper-item>
             </block>
           </swiper>
-          <view wx:if="{{item.rightHolder && item.rightHolder.length>0}}">
+          <view wx:if="{{item.title && item.title.length>0}}" class="text">
+            <wux-ellipsis direction="end" content="标题：{{item.title[0].text_content}}"/>
+          </view>
+          <view wx:if="{{item.rightHolder && item.rightHolder.length>0}}"  class="text">
             专利权人：
             <text wx:for="{{item.rightHolder}}" wx:for-item="rightHolder" wx:for-index="ind" wx:key="ind">
               <text>{{rightHolder.name}}</text>
@@ -136,13 +134,14 @@
           </view>
         </myCard>
       </block>
-      <view class="loadData" wx:if="{{total && tableData.length>0}}">
+      <!-- <view class="loadData" wx:if="{{total && tableData.length>0}}">
         <view wx:if="{{total>tableData.length}}" bind:tap="loadMore">加载更多</view>
         <wux-spin wux-class="spin" size="small" wx:elif="{{loading}}"/>
         <view wx:else>没有更多了</view>
-      </view>
+      </view> -->
     </view>
     <van-empty wx:else description="暂无数据" />
   </view>
-</scroll-view>
-</wux-refresher>
+</view>
+  
+</my-scroll-view>

pages/searchResults/searchResults.wxss

@@ -11,7 +11,7 @@
   background-repeat: no-repeat; /* 图片不重复 */  
 }
 .searchResults{
-  height: calc(100vh - 200rpx);
+  /* height: calc(100vh - 200rpx); */
   margin: 10px 0 ;
   width: calc(100% - 60rpx);
   padding: 0 30rpx;

utils/request.js

@@ -1,6 +1,6 @@
 // request.js  
 import Notify from '../miniprogram_npm/@vant/weapp/notify/notify';
-import { $startWuxRefresher, $stopWuxRefresher,$stopWuxLoader} from '../miniprogram_npm/wux-weapp/index';
+import {  $stopWuxRefresher} from '../miniprogram_npm/wux-weapp/index';
 // 配置项  
 const config = {  
   // baseURL: 'http://192.168.1.18:8901', // 基础URL  
@@ -85,9 +85,9 @@ function request(url, method = 'GET', data = {}, header = {},isLogin=true) {
           
           reject(res.data.message || '未知错误');  
         }  
-        if($stopWuxRefresher()){
-          $stopWuxRefresher()
-        }
+        // if($stopWuxRefresher()){
+        //   $stopWuxRefresher()
+        // }
       },  
       fail: function(error) { 
         console.log(error) 
@@ -103,9 +103,9 @@ function request(url, method = 'GET', data = {}, header = {},isLogin=true) {
         // Notify({ type: 'danger', message: '请求失败',top:'90' });
         Notify(obj)
         reject(error);  
-        if($stopWuxRefresher()){
-          $stopWuxRefresher()
-        }
+        // if($stopWuxRefresher()){
+        //   $stopWuxRefresher()
+        // }
       },  
     });  
   });  
@@ -163,9 +163,9 @@ function upload(url="/fileManager/uploadNormalFile", path = '', header = {},form
           
           reject(res.data.message || '未知错误');  
         }  
-        if($stopWuxRefresher()){
-          $stopWuxRefresher()
-        }
+        // if($stopWuxRefresher()){
+        //   $stopWuxRefresher()
+        // }
       },  
       fail: function(error) { 
         console.log(error) 

utils/util.js

@@ -14,6 +14,8 @@ const formatNumber = n => {
   return n[1] ? n : `0${n}`
 }
 
+ 
+
 module.exports = {
   formatTime
 }