Merge branch 'feature-zyw' into 'dev'

Feature zyw

See merge request !15

src/app.js

@@ -103,5 +103,6 @@ App({
     loginFirst: false,
     imageUrl:"", //图片地址
     isFullSucreen: false, // 当前设备是否为 FullSucreen
+    brandId:2005
   }
 })

src/pages/consumptionDetails/consumptionDetails.js

@@ -45,7 +45,7 @@ wxService.page({
       title: '加载中'
     })
     // brandId  dev_1002 711_2005 
-    wxService.get(`/sale/order/findByOrderNo?orderNo=${orderNo}&brandId=2005`).then(res => {
+    wxService.get(`/sale/order/findByOrderNo?orderNo=${orderNo}&brandId=${app.globalData.brandId}`).then(res => {
       const {result,data} = res.data
       if(result == 0){
          wx.hideLoading()

src/pages/deliveryService/deliveryService.js

@@ -55,7 +55,7 @@ wxService.page({
       title: '加载中'
     })
     // brandId 1001  2005
-    wxService.post(`/merchant/modelPage/getDetailById?pageId=4&brandId=2005`).then(res => {
+    wxService.post(`/merchant/modelPage/getDetailById?pageId=4&brandId=${app.globalData.brandId}`).then(res => {
       const {result,data} = res.data
       if(result == 0){
         // 动态设置title

src/pages/memberRules/memberRules.js

@@ -35,7 +35,7 @@ wxService.page({
 
   //获取规则
   getRule(TYPE){
-    wxService.get(`/merchant/brandRuleDescSet/get?type=${TYPE}`).then(res => {
+    wxService.get(`/merchant/brandRuleDescSet/get?type=${TYPE}&brandId=${app.globalData.brandId}`).then(res => {
       console.log(res)
       this.setData({
         ruleImg: res.data.data.content

src/pages/userCenter/userCenter.js

@@ -138,7 +138,7 @@ wxService.page({
       title: '加载中'
     })
     // 1001 2005
-    wxService.post(`/merchant/modelPage/getDetailById?pageId=3&brandId=2005`).then(res => {
+    wxService.post(`/merchant/modelPage/getDetailById?pageId=3&brandId=${app.globalData.brandId}`).then(res => {
       const {result,data} = res.data
       if(result == 0){
         // 动态设置title

src/utils/util.js

@@ -2,6 +2,7 @@ const wxService = require('./wxService')
 const moment = require('../lib/moment.min')
 const Promise = require('../lib/bluebird')
 const _ = require('../lib/underscore.min')
+const app = getApp()
 const formatTime = date => {
   const year = date.getFullYear()
   const month = date.getMonth() + 1
@@ -263,8 +264,7 @@ function getUserInfoByBtn(userInfo) {
     return wxService.post(`/member/minaLogin`, {
       code: res[1].code,
       wechatInfo: res[0],
-      brandId: 2005,
-      // brandId: 1001,
+      brandId: app.globalData.brandId,
     })
   }, (err) => {
     return Promise.reject(err)