Merge remote-tracking branch 'origin/dev' into dev

zxl

4 天以前 c9928dd4f6d25e2339ea1400f59ec58674a927a7

 pages/mine/myCollect/myCollect.vue

@@ -164,8 +164,7 @@
</template>

<script>
   import ULoadmore from '@/uview-components/uview-ui/components/u-loadmore/u-loadmore.vue'
   import UImage from '@/uview-components/uview-ui/components/u-image/u-image.vue';
   import '@/components/uview-components/uview-ui';
   import {
      getFilePreviewUrl
   } from '@/api/common.js'
@@ -177,10 +176,7 @@
      ifError
   } from 'assert'
   export default {
      components: {
         UImage,
         ULoadmore
      },

      data() {
         return {
            total: 0,