zrug 6 месяцев назад
Родитель
Сommit
ef2976263e
4 измененных файлов с 37 добавлено и 12 удалено
  1. 13 8
      app.js
  2. 2 1
      config.js
  3. 13 0
      pages/index/index.js
  4. 9 3
      utils/http.js

+ 13 - 8
app.js

@@ -13,6 +13,14 @@ App({
 
   globalData: {
     storeId: null,
+    /**
+     *  userProfileDTO: {
+     *    isBindPhoneNumber: false
+          subMchList: []
+          userId: "107"
+          userType: "10"
+        }
+    */
     mUser: null,
   },
 
@@ -21,7 +29,7 @@ App({
     // 登录
     wx.login({
       success: res => {
-        // 发送 res.code 到后台换取 openId, sessionKey, unionId
+        // 发送 res.code 到后台换取 accessTokenDTO, userProfileDTO
         console.log("code", res);
         if (res.code){
           wx.request({
@@ -32,16 +40,13 @@ App({
             },
             header: {
               'content-type': 'application/x-www-form-urlencoded',
-              // 'X-Referrer-Id': codeUrl[1] || '',
-              // 'X-Store-Id': codeUrl[0] || ''
-              'X-Referrer-Id': '',
-              'X-Store-Id': ''
+              'X-Referrer-Id': '', // 旧租户字段
+              'X-Store-Id': '', // 旧租户字段
             },
             success:(res)=> {
               console.log(res);
-              // this.globalData.mUser = res.data.data;
-              // this.globalData.storeId = '';
-              // this.data.loginSuccess = true;
+              this.globalData.mUser = res.data.data;
+              wx.setStorageSync('accessToken', this.globalData.mUser.accessTokenDTO.accessToken);
             },
             fail: function(res){
               console.log(res);

+ 2 - 1
config.js

@@ -1,6 +1,7 @@
 export const baseUrl = "https://mpapitest.gululuq.com"; // 服务器地址
 // export const baseUrl = "http://测试接口地址"; // 测试服务器地址
-
+export const appid = "wx12e34630814e5d30"; // 小程序appid
 // export const ossHost = "https://res.zrug.top";
+
 export const version = "0.0.1"; // 版本号
 export const version_desc = "接口基础";

+ 13 - 0
pages/index/index.js

@@ -1,4 +1,9 @@
 // index.js
+const { HomepageApi } = require('../../service/api.js');
+
+const App = getApp();
+
+
 Component({
   data: {
     brandList: [
@@ -80,5 +85,13 @@ Component({
   },
 
   methods: {
+    onLoad: async function (options) {
+      // 生命周期函数--监听页面加载
+      console.log("onLoad");
+      console.log('App.globalData', App.globalData);
+
+      const res = await HomepageApi.getBanners({});
+      console.log('res', res);
+    },
   },
 })

+ 9 - 3
utils/http.js

@@ -1,10 +1,16 @@
-import { baseUrl } from "../config";
+import { baseUrl, appid } from "../config";
+
+const App = getApp();
 
 function getHeader() {
-  if (wx.getStorageSync("token")) {
+  if (wx.getStorageSync("accessToken")) {
     return {
       "content-type": "application/json",
-      "x-token": wx.getStorageSync("token"),
+      "X-Mp-App-Id": appid,
+      // "X-Store-Id": "",
+      "Accept-Language": "zh-CN",
+      "Accept": "application/json",
+      "Authorization": "Bearer " + wx.getStorageSync("accessToken"),
     };
   }
   return {