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

zxl

7 小时以前 4c85457a83afeebb0bb4977d0525222493d29de2

 pages/mine/activity/myActivity.vue

@@ -160,6 +160,7 @@
</template>

<script>
import '@/components/uview-components/uview-ui';
import {getMyActivityList,collectCancel,activityCancel} from '@/api/activity.js'
import {getFilePreviewUrl} from '@/api/common.js'
export default {