调试详情页面

周铨
1 parent 5fbc5f6a
Showing 8 changed files with 78 additions and 39 deletions
miniprogram/api/smartElectric.ts
miniprogram/pages/acount/acount.ts
miniprogram/pages/acount/acount.wxml
miniprogram/pages/home/home.ts
miniprogram/pages/home/home.wxml
miniprogram/pages/login/login.ts
miniprogram/pages/login/login.wxml
miniprogram/services/HTTPService.ts
--- a/miniprogram/api/smartElectric.ts
View file @0b66d2d
+++ b/miniprogram/api/smartElectric.ts
View file @0b66d2d
@@ -5,18 +5,18 @@ export const API_CONST = {
       url: `/qx-api/qx-apaas-auth/server/auth/login`,
       method: "POST"
     },
-    loginSecurity:{
-      url:`/qx-api/qx-unified-user/login/securityImg`,
-      method:"GET"
+    loginSecurity: {
+      url: `/qx-api/qx-unified-user/login/securityImg`,
+      method: "GET"
     },
-    userSecurity:{
-      url:`/qx-api/qx-apaas-uc/user/securityImg`,
-      method:"GET"
+    userSecurity: {
+      url: `/qx-api/qx-apaas-uc/user/securityImg`,
+      method: "GET"
     },
-    logout:{
-      url:`/qx-api/qx-apaas-auth/server/auth/mobile/logout`,
-      method:"POST"
+    logout: {
+      url: `/qx-api/qx-apaas-auth/server/auth/mobile/logout`,
+      method: "POST"
     }
   }, // 获取用户手机号并进行注册登录
@@ -30,7 +30,10 @@ export const API_CONST = {
     getDate: {
       url: `/open/qx-apaas-custom/hczd/getDate`,
       method: "POST"//参数
-
+    },
+    userInfoDetail: {
+      url: `/qx-api/qx-apaas-uc/user/mobile/detail`,
+      method: "GET"
     }
   }
--- a/miniprogram/pages/acount/acount.ts
View file @0b66d2d
+++ b/miniprogram/pages/acount/acount.ts
View file @0b66d2d
@@ -8,14 +8,19 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    optionsObj: {}
   },
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad() {
+  onLoad(option: any) {
+    console.log(option, 'options')
+    this.setData({
+    optionsObj : JSON.parse(option.userInfoStr)
+    })
+    
   },
   /**
@@ -70,15 +75,16 @@ Page({
     wx.navigateBack()
   },
-  __mobilelogoutEvent(){
+  __mobilelogoutEvent() {
     HTTP.POST({
       ...API_CONST.login.logout,
-      payload:{
-        
+      payload: {
+        cookieFlag: true
       }
     }).then((data: any) => {
-      if(data.success){
-        wx.navigateTo({url:"/pages/login/login"})
+      wx.clearStorageSync()
+      if (data.success) {
+        wx.navigateTo({ url: "/pages/login/login" })
       }
     })
   },
@@ -90,7 +96,7 @@ Page({
       .then(() => {
         // on confirm
         this.__mobilelogoutEvent()
-       
+
       })
       .catch(() => {
         // on cancel
--- a/miniprogram/pages/acount/acount.wxml
View file @0b66d2d
+++ b/miniprogram/pages/acount/acount.wxml
View file @0b66d2d
@@ -5,9 +5,9 @@
 		</view>
 		<view class="acount_info">
 			<van-cell-group>
-				<van-cell title="姓名" value="内容" />
-				<van-cell title="手机号" value="内容" />
-				<van-cell title="邮箱" value="内容" />
+				<van-cell title="姓名" value="{{optionsObj.name || '未设置'}}" />
+				<van-cell title="手机号" value="{{optionsObj.mobile || '未设置'}}" />
+				<van-cell title="邮箱" value="{{optionsObj.email || '未设置'}}" />
 			</van-cell-group>
 		</view>
 	</view>
--- a/miniprogram/pages/home/home.ts
View file @0b66d2d
+++ b/miniprogram/pages/home/home.ts
View file @0b66d2d
@@ -2,15 +2,16 @@
 import { HTTPService as HTTP } from "../../services/HTTPService";
 // 获取应用实例
 import minaEnv from "../../utils/minaEnv";
-import { getShareInfo } from "../../utils/wxUtil";
+import { API_CONST } from "./../../api/smartElectric";
 // @ts-ignore
 const app = getApp<IAppOption>();
 Page({
   data: {
     url: "",
+    userInfoObj: {}
   },
   onLoad() {
-
+    this.__getUserInfoDetail()
   },
   handleGetMessage(e: any) {
     console.log(e, 'handleGetMessagehandleGetMessage')
@@ -23,7 +24,32 @@ Page({
     // console.log(pages)
   },
   gotoAcount() {
-    wx.navigateTo({ url: "/pages/acount/acount" })
+    const userInfoStr = JSON.stringify(this.data.userInfoObj)
+    wx.navigateTo({ url: `/pages/acount/acount?userInfoStr=${userInfoStr}` })
   },
   onReady() { },
+  __getUserInfoDetail() {
+    HTTP.GET({
+      ...API_CONST.home.userInfoDetail,
+      payload: {
+        corpCode: "default",
+        cookieFlag: true
+      }
+    }).then((res: any) => {
+      console.log(res, 'rrreeesss')
+      const arr = res.data.dataTitle.split("")
+      const lastName = arr[arr.length-1]
+      console.log(arr,'pppppparrr')
+      if (res.success) {
+        this.setData({
+          userInfoObj:  {...res.data,lastName}
+        })
+      }else {
+        this.setData({
+          userInfoObj: {}
+        })
+      }
+    })
+  },
+
 });
--- a/miniprogram/pages/home/home.wxml
View file @0b66d2d
+++ b/miniprogram/pages/home/home.wxml
View file @0b66d2d
 <view class="home_main">
   <view class="home-info">
     <view class="home-info-avatar">
-      铨
+    {{userInfoObj.lastName}}
     </view>
     <view class="mine-info">
       <view class="mine-info-basic">
-        周铨
+        {{userInfoObj.dataTitle}}
       </view>
       <view class="mine-company">
         <!-- <image src="" class="image_view" mode=""/> -->
-        <view class="mine-company-info">青谷科技</view>
+        <view class="mine-company-info">{{userInfoObj.corpName}}</view>
       </view>
     </view>
   </view>
--- a/miniprogram/pages/login/login.ts
View file @0b66d2d
+++ b/miniprogram/pages/login/login.ts
View file @0b66d2d
@@ -9,11 +9,11 @@ Page({
   data: {
     logoUrl: "./../../img/qixiao.png",
     checkFlag: true,
-    username: "",// 用户名
-    password: "",//密码
+    username: "15556367216",// 用户名
+    password: "efault",//密码
     hideFlag: true,//是否隐藏
     keyStr: "",// key值
-    imgUrl:"",//显示验证码的图片地址
+    imgUrl: "",//显示验证码的图片地址
     codeKey: ""//验证码
   },
@@ -79,8 +79,8 @@ Page({
     // console.log(e.detail.errMsg) // 回调信息（成功失败都会返回）
     // console.log(e.detail.errno)  // 错误码（失败时返回）
   },
-  loginEvent() :any{
-    if(!this.data.username|| !this.data.password){
+  loginEvent(): any {
+    if (!this.data.username || !this.data.password) {
       wx.showToast({
         title: "请将信息填写完整",
         icon: 'none',
@@ -92,7 +92,11 @@ Page({
       ...API_CONST.login.wxLogin,
       payload: this.getLoginParams()
     }).then((data: any) => {
+      console.log(data, '登录参数')
       if (data.success) {
+        //登录请求回来之后,读取res的header的cookie
+        //cookie是个唯一标识
+        wx.setStorageSync("cookie", data.data)
         wx.switchTab({
           url: "/pages/monitor/monitor"
         })
@@ -153,7 +157,7 @@ Page({
           hideFlag: res.data.hide,//是否隐藏
           keyStr: res.data.key,// key值
         })
-        if(res.data.hide === false){
+        if (res.data.hide === false) {
           this.__getUserSecurityImg()
         }
       }
@@ -165,15 +169,15 @@ Page({
       ...API_CONST.login.userSecurity,
       payload: {
         corpCode: "default",
-        key:this.data.keyStr
+        key: this.data.keyStr
       }
     }).then((res: any) => {
-      console.log(res,'res------')
+      console.log(res, 'res------')
       if (res.success) {
         this.setData({
           hideFlag: res.data.hide,//是否隐藏
           keyStr: res.data.key,// key值
-          imgUrl:res.data.img.replace(/[\r\n]/g, '')
+          imgUrl: res.data.img
         })
       }
     })
--- a/miniprogram/pages/login/login.wxml
View file @0b66d2d
+++ b/miniprogram/pages/login/login.wxml
View file @0b66d2d
@@ -6,7 +6,7 @@
 		<view class="login_form">
 			<van-cell-group>
 				<van-field label="用户名" title-width="50" value="{{ username }}" bind:change="userEvent" required clearable placeholder="请输入手机号" bind:click-icon="onClickIcon" />
-				<van-field label="密码" title-width="50" value="{{ password }}" bind:change="passEvent" type="{{checkFlag?'':'password'}}" bind:click-icon="changeIconEvent" icon="{{checkFlag?'eye-o':'closed-eye'}}" placeholder="请输入密码" required />
+				<van-field label="密码" title-width="50" value="{{ password }}" bind:change="passEvent" type="{{checkFlag?'password':''}}" bind:click-icon="changeIconEvent" icon="{{!checkFlag?'eye-o':'closed-eye'}}" placeholder="请输入密码" required />
 				<van-field  wx:if="{{!hideFlag&& imgUrl}}"  title-width="50" label="验证码" value="{{ codeKey }}" bind:change="imgKeyEvent" placeholder="请输入验证码" required />
 				<image src="{{imgUrl}}"  wx:if="{{ imgUrl}}" class="code-img"  />
--- a/miniprogram/services/HTTPService.ts
View file @0b66d2d
+++ b/miniprogram/services/HTTPService.ts
View file @0b66d2d
@@ -99,7 +99,7 @@ class HTTPService {
     payload = {
       ...payload
     }
-
+   const cookieVal:any = wx.getStorageSync("cookie")
     return new Promise((resolve, reject) => {
       wx.request({
         url: rootUrlProduce + url,
@@ -109,7 +109,7 @@ class HTTPService {
         method,
         header: {
           "Content-Type": "application/json",
-          Authorization: payload.Authorization || ''
+          Authorization: payload.cookieFlag? cookieVal : ''
         },
         dataType: "json",
         success: responseJSON => {