Merge branch 'master' of http://dev.hsfuel.com:3000/wei.chen/Fuelwx into feature/整合页面与接口

# Conflicts:
#	js/api.js
#	pages/login/login.js
#	project.config.json

js/api.js

@@ -13,6 +13,7 @@ function request(path, method = 'GET', data = null) {
     var url = api_root +  path;
     var nonce = generateRandomString();
     const timestamp = Date.now();
+    console.log('data :' + data);
     let jsonString = (data != null && method != 'GET') ? JSON.stringify(data) : '';
     console.log('request :' + jsonString);
      var stringToSign = "sign_method=" +sign_method + 
@@ -176,15 +177,30 @@ function request_GetMiniProgramTransactionsUnpaidNozzle(data) {
 function request_Wechatlogin(data) {
   return request('api/Auth/Wechatlogin?code='+ data, "GET",data);
 }
+
 //添加用户信息
-function request_AddMiniprogramUser(data) {
-    return request('api/Site/AddMiniprogramUser', "POST",data);
-  }
+function request_AddMiniprogramUser(data) {
+  return request('api/Site/AddMiniprogramUser', "POST",data);
+}
+
+//向fcc发起油枪授权
+function request_NozzleAuthorization(data) {
+  return request('api/Nozzle/NozzleAuthorization?trxid=' +data, "GET",data);
+}
+
+//向fcc发起取消油枪授权
+function request_CancelNozzleAuthorization(data) {
+  return request('api/Nozzle/CancelNozzleAuthorization?trxid=' +data, "GET",data);
+}
+
+
 export default {
-  // request_getSite,
+  request_GetSiteInfo,
   request_wechatPay,
   request_Wechatlogin,
-  request_GetSiteInfo,
+  request_AddMiniprogramUser,
+  request_NozzleAuthorization,
+  request_CancelNozzleAuthorization,
   request_GetMiniProgramTransactionsUnpaidQuery,
-  request_AddMiniprogramUser
+  request_GetMiniProgramTransactionsUnpaidNozzle
 }

pages/index/index.js

@@ -39,10 +39,12 @@ Page({
   getUserProfile(e) {
     console.log("获取信息",e)
     // 推荐使用wx.getUserProfile获取用户信息，开发者每次通过该接口获取用户个人信息均需用户确认，开发者妥善保管用户快速填写的头像昵称，避免重复弹窗
+    debugger
     wx.getUserProfile({
       desc: '展示用户信息', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
       success: (res) => {
-        console.log(res)
+        debugger
+        console.log("getUserProfile : "+res)
         this.setData({
           userInfo: res.userInfo,
           hasUserInfo: true

pages/login/login.js

@@ -84,7 +84,6 @@ Page({
                 url: '../scan/scan',
               })
             }, 2000)
-
           },
           fail: res => {
             wx.hideLoading()