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

zxl

4 天以前 c9928dd4f6d25e2339ea1400f59ec58674a927a7

 pages/mine/myCollect.vue

@@ -62,6 +62,8 @@
</template>

<script>
   import '@/components/uview-components/uview-ui';
	
   import {
      getGoodsCollection,
      getStoreCollection,