1

app.js

@@ -14,7 +14,7 @@ App({
           url: `${this.globalData.publicUrl}/api/st/system/weixin/appAuth?js_code=` + js_code,
           method: "get",
           header: {
-            'x-tenant': 'test'
+            'x-tenant': this.globalData.tenant
           },
           success: res => {
             const { errcode, data } = res.data
@@ -45,7 +45,7 @@ App({
     windowHeight: 0,
     publicUrl: 'http://192.168.1.19:9901',
     fileUrl: "http://broadcast.waityou24.cn",
-    openid: null
+    tenant: "test"
   }
 })
 

pages/food/index.js

@@ -46,7 +46,7 @@ Page({
       url: `${app.globalData.publicUrl}/api/st/dining/arrange?${query}`,
       method: "get",
       header: {
-        'x-tenant': 'test'
+        'x-tenant': app.globalData.tenant
       },
       data: {},
       success: res => {

pages/home/index.js

@@ -46,7 +46,26 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    console.log(app.globalData.usserInfo);
+    // const test = `${app.globalData.publicUrl}/api/st/dining/arrange`;
+    // console.log(test);
+    wx.request({
+      url: `${app.globalData.publicUrl}/api/st/dining/arrange`,
+      method: "get",
+      header: {
+        'x-tenant': app.globalData.tenant
+      },
+      data: {},
+
+      success: res => {
+        console.log(res);
+      },
+      error: err => {
+        wx.showToast({
+          title: err.msg,
+          icon: 'error'
+        })
+      }
+    })
   },
 
   /**

pages/news/detail.js

@@ -27,7 +27,7 @@ Page({
     wx.request({
       url: `${app.globalData.publicUrl}/api/st/system/news/${options.id}`,
       method: "get",
-      header: { 'x-tenant': 'test' },
+      header: { 'x-tenant': app.globalData.tenant },
       data: {},
       success: res => {
         this.setData({ detailInfo: res.data.data })

pages/news/index.js

@@ -43,7 +43,7 @@ Page({
     wx.request({
       url: `${app.globalData.publicUrl}/api/st/system/news`,
       method: "get",
-      header: { 'x-tenant': 'test' },
+      header: { 'x-tenant': app.globalData.tenant },
       data: { "type": '国内新闻' },
       success: res => {
         this.setData({ oneList: res.data.data })
@@ -58,7 +58,7 @@ Page({
     wx.request({
       url: `${app.globalData.publicUrl}/api/st/system/news`,
       method: "get",
-      header: { 'x-tenant': 'test' },
+      header: { 'x-tenant': app.globalData.tenant },
       data: { "type": '健康资讯' },
       success: res => {
         this.setData({ twoList: res.data.data })

pages/reserve/index.js

@@ -145,23 +145,23 @@ Page({
     if (app.globalData.userInfo.openid) data.openid =app.globalData.userInfo.openid;
     if (this.data.today) data.date = this.data.today
     console.log(data)
-    // wx.request({
-    //   url: `${app.globalData.publicUrl}/api/st/dining/order`,
-    //   method: "post",
-    //   header: {
-    //     'x-tenant': 'test'
-    //   },
-    //   data,
-    //   success: res => {
-    //     console.log(res)
-    //   },
-    //   error: err => {
-    //     wx.showToast({
-    //       title: err.msg,
-    //       icon: 'error'
-    //     })
-    //   }
-    // })
+    wx.request({
+      url: `${app.globalData.publicUrl}/api/st/dining/order`,
+      method: "post",
+      header: {
+        'x-tenant': app.globalData.tenant
+      },
+      data,
+      success: res => {
+        console.log(res)
+      },
+      error: err => {
+        wx.showToast({
+          title: err.msg,
+          icon: 'error'
+        })
+      }
+    })
     wx.showToast({
       title: '完成点餐',
     })
@@ -222,7 +222,7 @@ Page({
       url: `${app.globalData.publicUrl}/api/st/dining/arrange/getByDate?date=` + today,
       method: "get",
       header: {
-        'x-tenant': 'test'
+        'x-tenant': app.globalData.tenant
       },
       success: res => {
         const { arrange } = res.data.data;