Merge branch 'dev_fix_sub' into user_action

peng

4 天以前 58c78011ca0567a597d8c1e51696e317a3086604

 store/index.js

@@ -17,6 +17,7 @@
    token: "",
    // 活动弹窗状态
    activityPopup: {
       prizeActivityId:'',
         show: false,
         title: '',
         desc: '',