From 0ed4f8119089136bb2a87db423f6650ede75740a Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 16 May 2022 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
vue.config.js | 4 ++--
pages/exam/examTextPage.vue | 11 +++++++----
pages/loging/loging.vue | 1 +
pages/clockSignIn/clockSignIn.vue | 4 +++-
pages/exam/examResultPage.vue | 2 +-
store/state.js | 11 ++++++-----
store/actions.js | 1 +
7 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/pages/clockSignIn/clockSignIn.vue b/pages/clockSignIn/clockSignIn.vue
index 001105b..9f5f1ac 100644
--- a/pages/clockSignIn/clockSignIn.vue
+++ b/pages/clockSignIn/clockSignIn.vue
@@ -93,6 +93,8 @@
geocode:'true',
success: function (res) {
console.log('当前位置：' + res);
+ console.log('当前位置longitude：' + res.longitude);
+ console.log('当前位置latitude：' + res.latitude);
//114.921652006005 25.8457176283118
// that.jd = '114.921652006005';
// that.wd = '25.8457176283118';
@@ -167,7 +169,7 @@
goClock() {
var that = this;
uni.request({
- url: this.$store.state.piAPI + `/attendance/AppSave`,
+ url: this.$store.state.BaopiAPI + `/attendance/AppSave`,
method: "POST",
data:{
number: this.code,
diff --git a/pages/exam/examResultPage.vue b/pages/exam/examResultPage.vue
index fdc8d61..38eca31 100644
--- a/pages/exam/examResultPage.vue
+++ b/pages/exam/examResultPage.vue
@@ -1,7 +1,7 @@
<template>
<view class="content">
- <u-navbar height="44" back-icon-color="#fff" title="考试结果" :is-back="false" title-color="#fff"
+ <u-navbar height="48" back-icon-color="#fff" title="考试结果" :is-back="false" title-color="#fff"
:background="{background: '#103289'}">
</u-navbar>
diff --git a/pages/exam/examTextPage.vue b/pages/exam/examTextPage.vue
index 7717127..1bb0f37 100644
--- a/pages/exam/examTextPage.vue
+++ b/pages/exam/examTextPage.vue
@@ -20,6 +20,9 @@
export default {
data() {
return {
+ // baseUrl: "http://223.82.109.183:2080/api",
+ baseUrl: "http://localhost:81",
+ baseUrl: this.$store.state.BaopiAPI,
show: false,
content: '是否确认交卷',
questionList: [],
@@ -31,11 +34,11 @@
var that = this
// 理论考试
uni.request({
- url: "http://61.131.136.25:2080/api/simulateExamRecord/beginExam",
- // url: "http://localhost:81/simulateExamRecord/beginExam",
+ url: this.baseUrl + "/simulateExamRecord/beginExam",
method: 'POST',
data: {
- idCardNo: this.$store.state.UserData.cardid
+ // idCardNo: this.$store.state.UserData.cardid
+ idCardNo: this.$store.state.UserData.securityId
},
success: (res) => {
var examObj = res.data.data.simulateExamRecord
@@ -129,7 +132,7 @@
uni.request({
- url: "http://61.131.136.25:2080/api/simulateExamRecord/saveSimulateExam",
+ url: this.baseUrl + "/simulateExamRecord/saveSimulateExam",
method: 'POST',
data: sendData,
success: (res) => {
diff --git a/pages/loging/loging.vue b/pages/loging/loging.vue
index 92742a9..127fc2e 100644
--- a/pages/loging/loging.vue
+++ b/pages/loging/loging.vue
@@ -89,6 +89,7 @@
userName: name,
userID: userID
}
+ // console.log(data,123)
this.$store.commit('getUse', data)
// wx.reLaunch({
// url: '/pages/alarm_list/alarm_list?login=' + data.userName
diff --git a/store/actions.js b/store/actions.js
index 8b8cc75..220060f 100644
--- a/store/actions.js
+++ b/store/actions.js
@@ -58,6 +58,7 @@
})
return
}
+ console.log(res.data,456);
store.commit('getUserData', res.data)
console.log(res.data, 123542);
data.isit = true
diff --git a/store/state.js b/store/state.js
index 352cf91..f396795 100644
--- a/store/state.js
+++ b/store/state.js
@@ -17,12 +17,13 @@
roleid: '', //角色id
Jurisdiction: '', //角色辖区
logPath: '',
- piAPI: apis.api,
- // piAPI: 'http://61.131.136.25:2082/api/',
- //piAPI: 'http://192.168.0.110:83/',
+ // piAPI: apis.api,
+ // piAPI: 'http://223.82.109.183:2082/api/',
+ piAPI: 'http://192.168.0.114:83/',
// piAPI: 'http://192.168.0.222:83/',
- //piAPI: 'http://61.131.136.25:2082/api/',
- BaopiAPI: 'http://61.131.136.25:2080/api/',
+ //piAPI: 'http://223.82.109.183:2082/api/',
+ // BaopiAPI: 'http://223.82.109.183:2080/api/',
+ BaopiAPI: 'http://192.168.0.114:81',
firstlogin: null,
puserName: '',
puserID: '',
diff --git a/vue.config.js b/vue.config.js
index 2359511..ea661af 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -23,9 +23,9 @@
'/api': {
// 本地服务接口地址
// target: 'http://localhost:81',
- // target: 'http://192.168.0.114:81', //钟日健W
+ target: 'http://192.168.0.114:81', //钟日健W
// target: 'http://192.168.0.107:85', //唐
- target: 'http://192.168.0.108:83',//曾W
+ // target: 'http://192.168.0.108:83',//曾W
// target: 'http://192.168.0.107:81',//唐N
// target: 'http://61.131.136.25:81', //唐N
//远程演示服务地址,可用于直接启动项目
--
Gitblit v1.9.3