Merge branch 'feature-zyw' into 'dev'

Feature zyw

See merge request !26

src/utils/wxService.js

@@ -48,7 +48,7 @@ class WXService extends Http {
       wx.hideLoading()
     }).catch(res => {
       console.log(res)
-      if (res.msg === '该用户尚未登录') {
+      if (res.msg.indexOf('未登录') > -1) {
         wx.setStorageSync('token', '')
         var _this = this
         let userInfo = wx.getStorageSync('_baseUserInfo')
@@ -57,7 +57,7 @@ class WXService extends Http {
             _this.post(`/member/minaLogin`, {
               code: result.code,
               wechatInfo: userInfo,
-              brandId: 2005,
+              brandId: 1001,
             }).then(response=>{
               let dataResp = response.data.data
               wx.setStorageSync('token', dataResp.token)