Merge branch 'dev_fix_sub' into user_action

peng

13 小时以前 9653f4faa20699a2d9a03391f4a6175ff8ce59c3

 pages.json

@@ -198,6 +198,7 @@
    //   "path": "pages/tabbar/user/my",
    //   "style": {
    //     "navigationBarTextStyle": "white",
    //     "navigationBarTextStyle": "white",
    //     "enablePullDownRefresh": true,
    //     "navigationStyle": "custom",
    //     "componentPlaceholder": {
@@ -2247,7 +2248,27 @@
          }
        }
      ]
    }
    },
   {
     "root": "pages/storeClaim",
     "pages": [{
        "path" : "store-claim",
        "style" : 
        {
           "navigationBarTitleText" : "优惠卷领取",
         "componentPlaceholder":{
            "u-card": "view",
            "u-navbar": "view",
            "u-tag": "view",
            "u-icon": "view",
            "u-button": "view",
            "u-empty": "view"
				
         }
        }
     }]
   }
	
  ],
  "globalStyle": {
    "navigationBarTextStyle": "black",