Merge remote-tracking branch 'origin/user_action' into send_coupon

zxl

6 天以前 eabb18cf60273b25471509858b287474cea9b370

 store/index.js

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