Merge branch 'dev_fix_sub' into user_action

peng

2 天以前 27fb1f51c37083585dc873dd9ff86de2f2db82bc

 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 {