浏览代码

小程序授权

Your Name 2 月之前
父节点
当前提交
7937cb42ca
共有 4 个文件被更改,包括 51 次插入13 次删除
  1. 30 6
      js/api.js
  2. 3 1
      pages/index/index.js
  3. 11 0
      pages/login/login.js
  4. 7 6
      project.config.json

+ 30 - 6
js/api.js

@@ -3,7 +3,7 @@ const SM4Exten = require('../js/SM4Exten');
 const miniprogramsm4 = require("../miniprogram_npm/miniprogram-sm-crypto/index").sm4;
 const miniprogramsm4 = require("../miniprogram_npm/miniprogram-sm-crypto/index").sm4;
 const secretId = "D2BCF8DE-AA24-4BF6-9C34-C8DD325E412B";//小程序应用ID
 const secretId = "D2BCF8DE-AA24-4BF6-9C34-C8DD325E412B";//小程序应用ID
 const Secret = "6C680A47B87740138DFB299FC69A64E1";//小程序应用密钥
 const Secret = "6C680A47B87740138DFB299FC69A64E1";//小程序应用密钥
-const api_root = 'http://192.168.0.202:5006/'
+const api_root = 'http://192.168.88.140:5006/'
 const CurrentBuId = '12345678-9abc-def0-1234-56789abcdef0';
 const CurrentBuId = '12345678-9abc-def0-1234-56789abcdef0';
 
 
 function request(path, method = 'GET', data = null) {
 function request(path, method = 'GET', data = null) {
@@ -13,14 +13,18 @@ function request(path, method = 'GET', data = null) {
     var url = api_root +  path;
     var url = api_root +  path;
     var nonce = generateRandomString();
     var nonce = generateRandomString();
     const timestamp = Date.now();
     const timestamp = Date.now();
+    console.log('data :' + data);
     let jsonString = (data != null && method != 'GET') ? JSON.stringify(data) : '';
     let jsonString = (data != null && method != 'GET') ? JSON.stringify(data) : '';
     console.log('request :' + jsonString);
     console.log('request :' + jsonString);
     var stringToSign = "sign_method=" +sign_method + 
     var stringToSign = "sign_method=" +sign_method + 
                        "&secret_id=" +secretId+
                        "&secret_id=" +secretId+
                        "&nonce=" +  nonce +
                        "&nonce=" +  nonce +
-                       "&timestamp=" + timestamp + 
-                       jsonString;
-                       debugger
+                       "&timestamp=" + timestamp;
+    if(jsonString != '')
+    {
+      stringToSign +=  "&"+jsonString
+    }
+    debugger
     console.log('加密串 :' + stringToSign);
     console.log('加密串 :' + stringToSign);
     let key =  stringToHex(Secret);//key转16进制
     let key =  stringToHex(Secret);//key转16进制
     key = getFirst32Chars(key);//截取前16位
     key = getFirst32Chars(key);//截取前16位
@@ -174,8 +178,28 @@ function request_GetMiniProgramTransactionsUnpaidNozzle(data) {
 function request_Wechatlogin(data) {
 function request_Wechatlogin(data) {
   return request('api/Auth/Wechatlogin?code='+ data, "GET",data);
   return request('api/Auth/Wechatlogin?code='+ data, "GET",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 {
 export default {
-  request_getSite,
+  request_GetSiteInfo,
   request_wechatPay,
   request_wechatPay,
-  request_Wechatlogin
+  request_Wechatlogin,
+  request_AddMiniprogramUser,
+  request_NozzleAuthorization,
+  request_CancelNozzleAuthorization
 }
 }

+ 3 - 1
pages/index/index.js

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

+ 11 - 0
pages/login/login.js

@@ -69,6 +69,7 @@ Page({
   pay(){
   pay(){
     api.request_wechatPay(1)
     api.request_wechatPay(1)
     .then(res => {
     .then(res => {
+      debugger
      wx.requestPayment({
      wx.requestPayment({
        timeStamp: res.data.data.unifiedOrderResult.timeStamp,
        timeStamp: res.data.data.unifiedOrderResult.timeStamp,
        nonceStr: res.data.data.unifiedOrderResult.nonceStr,
        nonceStr: res.data.data.unifiedOrderResult.nonceStr,
@@ -131,6 +132,16 @@ Page({
       desc: '用于完善用户资料', // 声明获取用户信息的目的
       desc: '用于完善用户资料', // 声明获取用户信息的目的
       success(res) {
       success(res) {
         console.log('用户信息:', res.userInfo);
         console.log('用户信息:', res.userInfo);
+        var user = {
+          UserName : res.userInfo.nickName,
+          UserAvatarUrl :res.userInfo.avatarUrl,
+          UserPhoneNumber:'',
+          Address:''
+        };
+        api.request_AddMiniprogramUser(user)
+        .then(res => {
+          debugger
+        });
         // 将用户信息发送到服务器
         // 将用户信息发送到服务器
         // 例如:wx.request({ url: 'https://example.com/userInfo', data: res.userInfo })
         // 例如:wx.request({ url: 'https://example.com/userInfo', data: res.userInfo })
       },
       },

+ 7 - 6
project.config.json

@@ -1,10 +1,6 @@
 {
 {
   "compileType": "miniprogram",
   "compileType": "miniprogram",
   "libVersion": "trial",
   "libVersion": "trial",
-  "packOptions": {
-    "ignore": [],
-    "include": []
-  },
   "setting": {
   "setting": {
     "coverView": true,
     "coverView": true,
     "es6": true,
     "es6": true,
@@ -17,12 +13,17 @@
       "ignore": [],
       "ignore": [],
       "disablePlugins": [],
       "disablePlugins": [],
       "outputPath": ""
       "outputPath": ""
-    }
+    },
+    "ignoreUploadUnusedFiles": true
   },
   },
   "condition": {},
   "condition": {},
   "editorSetting": {
   "editorSetting": {
     "tabIndent": "auto",
     "tabIndent": "auto",
     "tabSize": 2
     "tabSize": 2
   },
   },
-  "appid": "wx32dbc8c959199561"
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "appid": "wxb198dafff060e651"
 }
 }