From 6485e88aeb079910dd46e6e13c9f94aaeec135b3 Mon Sep 17 00:00:00 2001
From: liuwu <975499773@qq.com>
Date: Wed, 6 Sep 2023 15:30:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
miniprogram/app.json | 2 +-
miniprogram/pages/loading/loading.js | 33 ++++----------------
miniprogram/pages/queryList/queryList.js | 2 +-
miniprogram/pages/work/work.js | 2 +-
miniprogram/pages/work/work.wxml | 2 +-
miniprogram/pages/workReport/workReport.js | 3 +-
miniprogram/pages/workReport/workReport.wxml | 2 +-
miniprogram/utils/api.js | 2 +-
miniprogram/utils/http.js | 11 +++++--
9 files changed, 22 insertions(+), 37 deletions(-)
diff --git a/miniprogram/app.json b/miniprogram/app.json
index c7b7084..9b9c3ea 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -1,7 +1,7 @@
{
"pages": [
- "pages/work/work",
"pages/loading/loading",
+ "pages/work/work",
"pages/mine/mine",
"pages/bind/bind",
"pages/evaluation/evaluation",
diff --git a/miniprogram/pages/loading/loading.js b/miniprogram/pages/loading/loading.js
index 78c45f5..ea8530f 100644
--- a/miniprogram/pages/loading/loading.js
+++ b/miniprogram/pages/loading/loading.js
@@ -46,34 +46,13 @@ Page({
wx.login({
success: res => {
$api.getUserInfo({
- "code": res.code
+ "loginName": "erds",
+ "password": "123456",
}).then(obj => {
- if (obj.code == 200) {
- //保存openId
- wx.setStorageSync("openId", obj.data.openId);
- //判断绑定状态,跳转页面
- if (obj.data.status == "UNBIND") {
- wx.reLaunch({
- url: '/pages/bind/bind'
- })
- } else {
- wx.setStorageSync("token", obj.data.token);
- wx.setStorageSync("sourceCow", obj.data.loginUser.sourceCow);
- wx.setStorageSync("userInfo", obj.data.loginUser);
- wx.setStorageSync("sourceCow", obj.data.loginUser.sourceCow);
- wx.setStorageSync("farmName", obj.data.loginUser.name);
- let roles = obj.data.loginUser.roles;
- //拼接角色字符串
- var roleStr = "";
- roles.forEach(element => {
- roleStr += element.roleKey;
- });
- wx.setStorageSync("roleStr",roleStr);
- //保存用户信息
- wx.reLaunch({
- url: '/pages/work/work'
- });
- }
+ if (obj.code === 0){
+ wx.reLaunch({
+ url: '/pages/evaluation/evaluation'
+ });
}
}).catch(err => {
Dialog.alert({
diff --git a/miniprogram/pages/queryList/queryList.js b/miniprogram/pages/queryList/queryList.js
index 908c7de..61c84f7 100644
--- a/miniprogram/pages/queryList/queryList.js
+++ b/miniprogram/pages/queryList/queryList.js
@@ -18,7 +18,7 @@ Page({
{text:'党务及意识形态',value:'党务及意识形态'},
{text:'党风廉政建设',value:'党风廉政建设'},
{text:'日常考核指标',value:'日常考核指标'},
- {text:'年度考核指标',value:'年度考核指标'},
+ {text:'季度考核指标',value:'季度考核指标'},
],
deptOpt:[],
targetOpt:[],
diff --git a/miniprogram/pages/work/work.js b/miniprogram/pages/work/work.js
index 6fe0079..eb50c0c 100644
--- a/miniprogram/pages/work/work.js
+++ b/miniprogram/pages/work/work.js
@@ -6,7 +6,7 @@ Page({
* 页面的初始数据
*/
data: {
- typeOpt:['党务及意识形态','党风廉政建设','日常考核指标','年度考核指标']
+ typeOpt:['党务及意识形态','党风廉政建设','日常考核指标','季度考核指标']
},
/**
diff --git a/miniprogram/pages/work/work.wxml b/miniprogram/pages/work/work.wxml
index 782b9b1..d3b7da9 100644
--- a/miniprogram/pages/work/work.wxml
+++ b/miniprogram/pages/work/work.wxml
@@ -14,7 +14,7 @@
- 年度考核汇报
+ 季度考核汇报
diff --git a/miniprogram/pages/workReport/workReport.js b/miniprogram/pages/workReport/workReport.js
index 86276b9..22b1c8c 100644
--- a/miniprogram/pages/workReport/workReport.js
+++ b/miniprogram/pages/workReport/workReport.js
@@ -18,7 +18,7 @@ Page({
{text:'党务及意识形态',value:'党务及意识形态'},
{text:'党风廉政建设',value:'党风廉政建设'},
{text:'日常考核指标',value:'日常考核指标'},
- {text:'年度考核指标',value:'年度考核指标'},
+ {text:'季度考核指标',value:'季度考核指标'},
],
typeShow:false,
targetOpt:[],
@@ -106,6 +106,7 @@ Page({
this.setData({
"searchForm.target":e.detail.text,
"searchForm.targetId":e.detail.id,
+ "searchForm.shotName":e.detail.shotName,
activeId:e.detail.id,
targetShow:false,
})
diff --git a/miniprogram/pages/workReport/workReport.wxml b/miniprogram/pages/workReport/workReport.wxml
index f491fc1..7fae74a 100644
--- a/miniprogram/pages/workReport/workReport.wxml
+++ b/miniprogram/pages/workReport/workReport.wxml
@@ -14,7 +14,7 @@
http.request("GET","/wx/health/getUserInfo",data,false),
+ getUserInfo:data => http.request("GET","/wx/index/getUserInfo",data,false),
//获取验证码
getMsgCode:data => http.request("GET","/wx/health/sendSms",data,false),
//绑定用户
diff --git a/miniprogram/utils/http.js b/miniprogram/utils/http.js
index ae489ee..da15fc1 100644
--- a/miniprogram/utils/http.js
+++ b/miniprogram/utils/http.js
@@ -1,5 +1,5 @@
// const base_url = "https://breed.nxcyx.com/wx/"; //配置的域名
-const base_url = "http://192.168.0.19:8101"; //配置的域名
+const base_url = "http://192.168.0.107:8088"; //配置的域名
// const base_url = "http://q43k76.natappfree.cc/wx/"
/**
@@ -14,10 +14,11 @@ function request(method,url,data,token){
return new Promise(function(resolve,reject){
let header = {
"content-type":"application/json",
- "Authorization":""
+ // "Authorization":""
};
if(token){
- header.Authorization = 'Bearer '+wx.getStorageSync('token');
+ // header.Authorization = 'Bearer '+wx.getStorageSync('token');
+ header.Cookie = wx.getStorageSync('JSessionId')
}
wx.request({
url: base_url + url,
@@ -25,6 +26,10 @@ function request(method,url,data,token){
data: method === "POST" ? JSON.stringify(data) : data,
header: header,
success(res){
+ if (url.indexOf('getUserInfo')!==-1){
+ let JSessionId = res.header["Set-Cookie"].toString().split(';')[0]
+ wx.setStorageSync("JSessionId", JSessionId);
+ }
/**
* 请求成功
* 判断code是否为200