合并分支 'qiaomeng' 到 'master'

Qiaomeng



查看合并请求 !1

@@ -24,6 +24,7 @@ App({
             let header = {
             let header = {
                 'content-type': 'application/x-www-form-urlencoded'
                 'content-type': 'application/x-www-form-urlencoded'
             }
             }
+            // console.log(baseUrl/ + url)
             header = Object.assign(header, headerParams)
             header = Object.assign(header, headerParams)
             wx.request({
             wx.request({
                 url: baseUrl + url,
                 url: baseUrl + url,
@@ -31,8 +32,9 @@ App({
                 method: 'POST',
                 method: 'POST',
                 header: header,
                 header: header,
                 success: function (res) {//返回取得的数据
                 success: function (res) {//返回取得的数据
+                    // console.log(res)
                     if (res.data.code == '20000') {
                     if (res.data.code == '20000') {
-      resolve(res.data.data);
+                        resolve(res.data);
                     } else if (res.data.code == '10001') {//用户未
                     } else if (res.data.code == '10001') {//用户未
 
 
                     } else if (res.data.code == '40000') {
                     } else if (res.data.code == '40000') {

 // pages/kaishi/kaishi.js
 // pages/kaishi/kaishi.js
-const app=getApp();
+const app = getApp();
 Page({
 Page({
 
 
     /**
     /**
@@ -11,11 +11,11 @@ Page({
             '../../imgs/lunbo2@3x.png',
             '../../imgs/lunbo2@3x.png',
             '../../imgs/lunbo3@3x.png'
             '../../imgs/lunbo3@3x.png'
         ],
         ],
-  indexs:0,
-  color:'#cccccc',
+        indexs: 0,
+        color: '#cccccc',
         indicatorDots: false,
         indicatorDots: false,
         autoplay: true,
         autoplay: true,
-  activecolor:'#ffffff',
+        activecolor: '#ffffff',
         interval: 5000,
         interval: 5000,
         duration: 1000
         duration: 1000
     },
     },
@@ -23,17 +23,18 @@ Page({
     start(e) {
     start(e) {
         let that = this;
         let that = this;
         app.globalData.userInfo = e.detail.userInfo;
         app.globalData.userInfo = e.detail.userInfo;
-
         wx.login({
         wx.login({
             success: function (s) {
             success: function (s) {
                 let url = 'wxapp/public/getSessionKey';
                 let url = 'wxapp/public/getSessionKey';
                 if (s.code) {
                 if (s.code) {
                     var code = s.code;
                     var code = s.code;
                     var param = {
                     var param = {
-      code: code
+                        code: s.code
                     }
                     }
                     app.post(url, param).then((res) => {
                     app.post(url, param).then((res) => {
-      that.login(res.openid, res.session_key, e.detail.encryptedData, e.detail.iv);
+                        console.log(res);
+                        console.log(e);
+                        that.login(res.data.openid, res.data.session_key, e.detail.encryptedData, e.detail.iv, e.detail.rawData, e.detail.signature);
                     }).catch((errMsg) => {
                     }).catch((errMsg) => {
                         console.log(errMsg);
                         console.log(errMsg);
                     })
                     })
@@ -41,28 +42,49 @@ Page({
             }
             }
         });
         });
     },
     },
- login(openid, session_key, encrypted_data, iv) {
+    login(openid, session_key, encrypted_data, iv,r,s) {
         let that = this;
         let that = this;
         let param = {
         let param = {
             openid: openid,
             openid: openid,
             session_key: session_key,
             session_key: session_key,
             encrypted_data: encrypted_data,
             encrypted_data: encrypted_data,
-   iv: iv
+            iv: iv,
+            rawData: r,
+            signature: s
         }
         }
         let url = 'wxapp/public/login';
         let url = 'wxapp/public/login';
+        // wx.navigateTo({
+        //     url: '/pages/login/login',
+        //     success: function (res) { },
+        //     fail: function (res) { },
+        //     complete: function (res) { },
+        // })
         app.post(url, param).then((res) => {
         app.post(url, param).then((res) => {
-   wx.setStorageSync('token', res.token);
-   wx.navigateTo({
-    url: '/pages/login/login',
-    success: function (res) { },
-    fail: function (res) { },
-    complete: function (res) { },
+            console.log(res)
+            wx.setStorageSync('token', res.data.token);
+            let u = "wxapp/public/isMobile";
+            let header = {
+                "XX-Token": res.data.token
+            }
+            let data = {
+                type: 1
+            }
+            app.post(u, data, header).then((r) => {
+                console.log(r)
+            }).catch((err) => {
+
             })
             })
+            // wx.navigateTo({
+            //     url: '/pages/login/login',
+            //     success: function (res) { },
+            //     fail: function (res) { },
+            //     complete: function (res) { },
+            // })
         }).catch((errMsg) => {
         }).catch((errMsg) => {
             console.log(errMsg);
             console.log(errMsg);
         })
         })
     },
     },
- changeindexs(e){
+    changeindexs(e) {
         this.setData({
         this.setData({
             indexs: e.detail.current
             indexs: e.detail.current
         })
         })

@@ -20,10 +20,11 @@
         </view>
         </view>
         <view class='start_btnbox'>
         <view class='start_btnbox'>
             <button class='start_btn' open-type='getUserInfo' bindgetuserinfo='start'>
             <button class='start_btn' open-type='getUserInfo' bindgetuserinfo='start'>
-     <text class='txt'>一起来吧</text> </button>
+                <text class='txt'>一起来吧</text> 
+            </button>
         </view>
         </view>
     </swiper-item>
     </swiper-item>
 </swiper>
 </swiper>
 <view class='botsbox'>
 <view class='botsbox'>
-<view class='bots {{index==indexs?"activecolor":""}}' wx:for='{{imgUrls.length+1}}' wx:key ></view>
+    <view class='bots {{index==indexs?"activecolor":""}}' wx:for='{{imgUrls.length+1}}' wx:key></view>
 </view>
 </view>

+//logs.js
+const util = require('../../utils/util.js')
+
+Page({
+  data: {
+    logs: []
+  },
+  onLoad: function () {
+    this.setData({
+      logs: (wx.getStorageSync('logs') || []).map(log => {
+        return util.formatTime(new Date(log))
+      })
+    })
+  }
+})

+{
+  "navigationBarTitleText": "查看启动日志",
+  "usingComponents": {}
+}

+<!--logs.wxml-->
+<view class="container log-list">
+  <block wx:for="{{logs}}" wx:for-item="log">
+    <text class="log-item">{{index + 1}}. {{log}}</text>
+  </block>
+</view>

+.log-list {
+  display: flex;
+  flex-direction: column;
+  padding: 40rpx;
+}
+.log-item {
+  margin: 10rpx;
+}

@@ -12,7 +12,7 @@
 	},
 	},
 	"compileType": "miniprogram",
 	"compileType": "miniprogram",
 	"libVersion": "2.4.1",
 	"libVersion": "2.4.1",
-	"appid": "wx4ac44ac1779dc6a6",
+	"appid": "wx6e9436f62c626fb7",
 	"projectname": "bar",
 	"projectname": "bar",
 	"debugOptions": {
 	"debugOptions": {
 		"hidedInDevtools": []
 		"hidedInDevtools": []