From 93fc01349aa48a086c71123a2317765a925c0897 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 06 一月 2025 10:22:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/waybill/waybillDetail.vue | 10 +++-
h5/pages/driver/index.vue | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 2
h5/pages/login/login.vue | 76 ++++++++++++++++++++------------------
server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 2 -
server/system_service/src/main/java/com/doumee/service/business/third/model/TMSContants.java | 2
screen/src/views/EnergyConsum.vue | 8 ++--
h5/pages/wdata/home.vue | 10 ++--
8 files changed, 59 insertions(+), 53 deletions(-)
diff --git a/h5/pages/driver/index.vue b/h5/pages/driver/index.vue
index a7b0bb0..69e2736 100644
--- a/h5/pages/driver/index.vue
+++ b/h5/pages/driver/index.vue
@@ -1,7 +1,7 @@
<template>
<view class="main_app">
<view class="title_wrap">
- <view class="name">{{ driverInfo.realname }}锛屾杩庣櫥褰曪綖</view>
+ <view class="name">{{ driverInfo.realname || driverInfo.username }}锛屾杩庣櫥褰曪綖</view>
<view class="btn" @click="loginOut">閫�鍑虹櫥褰�</view>
</view>
<!-- -->
diff --git a/h5/pages/login/login.vue b/h5/pages/login/login.vue
index 8107316..cac61df 100644
--- a/h5/pages/login/login.vue
+++ b/h5/pages/login/login.vue
@@ -43,31 +43,31 @@
return {
code: ''
}
- },
- onLoad(option) {
- console.log('onLoad');
- if(option.ywid){
- uni.setStorageSync('ywinfo', {
- type: option.type,
- yw: option.yw,
- ywid: option.ywid
- })
- }
+ },
+ onLoad(option) {
+ console.log('onLoad');
+ if (option.ywid) {
+ uni.setStorageSync('ywinfo', {
+ type: option.type,
+ yw: option.yw,
+ ywid: option.ywid
+ })
+ }
},
onShow() {
var that = this
let url = 'https://atwl.ahzyssl.com/zhyq_h5/#/'
let code = ''
- if (window.location.href.indexOf('code=') !== -1 || this.code) {
- // if(window.location.href.indexOf('wdata') !== -1){
- // uni.redirectTo({
- // url: '/pages/wdata/home?code=' +
- // })
+ if (window.location.href.indexOf('code=') !== -1 || this.code) {
+ // if(window.location.href.indexOf('wdata') !== -1){
+ // uni.redirectTo({
+ // url: '/pages/wdata/home?code=' +
+ // })
// }
- const ywinfo = uni.getStorageSync('ywinfo') || {}
- if(ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)){
- this.userAuth(ywinfo.type)
- }
+ const ywinfo = uni.getStorageSync('ywinfo') || {}
+ if (ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)) {
+ this.userAuth(ywinfo.type)
+ }
} else {
// let url = window.location.href
const appID = 'wx173e6caf5abc718a'
@@ -132,24 +132,28 @@
that.$store.commit('setMember', res.data.member)
}
let flag = res.data.member && res.data.member.id
- if (source == 0) {
- if (res.data.token) {
- that.$store.commit('setToken', res.data.token)
- getUserInfo().then(ress => {
- that.$store.commit('setDriverInfo', ress.data)
- })
+ if (source == 0) {
+ if (res.data.token) {
+ that.$store.commit('setToken', res.data.token)
+ getUserInfo().then(ress => {
+ that.$store.commit('setDriverInfo', ress.data)
+ })
}
- this.driverLogin(flag)
- } else if (source == 2) {
- if (res.data.token) {
- that.$store.commit('setToken', res.data.token)
- getUserInfo().then(ress => {
- that.$store.commit('setUserInfo', ress.data)
- })
- }
- this.staffLogin(flag)
- } else {
- this.jump('/pages/index/index')
+ setTimeout(() => {
+ that.driverLogin(flag)
+ }, 200)
+ } else if (source == 2) {
+ if (res.data.token) {
+ that.$store.commit('setToken', res.data.token)
+ getUserInfo().then(ress => {
+ that.$store.commit('setUserInfo', ress.data)
+ })
+ }
+ setTimeout(() => {
+ that.staffLogin(flag)
+ }, 200)
+ } else {
+ this.jump('/pages/index/index')
}
}
})
diff --git a/h5/pages/waybill/waybillDetail.vue b/h5/pages/waybill/waybillDetail.vue
index c3a8251..30dc2b4 100644
--- a/h5/pages/waybill/waybillDetail.vue
+++ b/h5/pages/waybill/waybillDetail.vue
@@ -52,7 +52,8 @@
<image v-if="dri.key == 2 && k == 0" src="@/static/waybill/ic_cangku_sel@2x.png" class="icon"></image>
<image v-if="dri.key == 3 && k != 0" src="@/static/waybill/ic_yunshu@2x.png" class="icon"></image>
<image v-if="dri.key == 3 && k == 0" src="@/static/waybill/ic_yunshu_sel@2x.png" class="icon"></image>
- <image v-if="dri.key == 4" src="@/static/waybill/ic_daohuo_sel@2x.png" class="icon"></image>
+ <image v-if="dri.key == 4 && k != 0" src="@/static/waybill/ic_dingdan@2x.png" class="icon"></image>
+ <image v-if="dri.key == 4 && k == 0" src="@/static/waybill/ic_daohuo_sel@2x.png" class="icon"></image>
<image v-if="dri.key == 5" src="@/static/waybill/ic_ruku.png" class="icon"></image>
</view>
<view class="" :class="{primaryColor: k == 0}">{{dri.name}}</view>
@@ -65,8 +66,11 @@
<view v-else class="icon_wrap"></view>
<view class="text" :class="{placeholder3: k==0 && i== 0}">
{{item.orderStatusDes}}
- <text v-if="item.tel">锛屽彂璐т粨搴撶數璇濓細</text>
- <text v-if="item.tel" @click="callPhone(item.tel)" class="primaryColor">{{item.tel}}</text>
+ <text v-if="item.tel">锛屽彂璐т粨搴撶數璇濓細</text>
+ <template v-if="item.tel">
+ <text v-for="phone,p in item.tel.split(',')" @click="callPhone(phone)" class="primaryColor">{{phone}}<text v-if="p < item.tel.split(',').length - 1">,</text></text>
+ </template>
+
</view>
</view>
<view class="time">{{item.recordDate}}</view>
diff --git a/h5/pages/wdata/home.vue b/h5/pages/wdata/home.vue
index 8509eaa..4613bb3 100644
--- a/h5/pages/wdata/home.vue
+++ b/h5/pages/wdata/home.vue
@@ -73,12 +73,12 @@
this.$store.commit('setToken', res.data)
getUserInfo().then(ress => {
this.$store.commit('setDriverInfo', ress.data)
+ setTimeout(() => {
+ uni.navigateTo({
+ url: '/pages/wdata/list'
+ })
+ }, 100)
})
- setTimeout(() => {
- uni.navigateTo({
- url: '/pages/wdata/list'
- })
- }, 300)
}
}
})
diff --git a/screen/src/views/EnergyConsum.vue b/screen/src/views/EnergyConsum.vue
index 76eaed1..6a4ec2a 100644
--- a/screen/src/views/EnergyConsum.vue
+++ b/screen/src/views/EnergyConsum.vue
@@ -558,7 +558,7 @@
const data1 = ref({})
const getData1 = () => {
zxcenterData().then(res => {
- const result = res.data
+ const result = res.data || {}
data1.value = result
})
}
@@ -570,7 +570,7 @@
}
const getData6 = () => {
regionDataRanking({ type: activeDays.value }).then(res => {
- const result = res.data
+ const result = res.data || {}
data6.value = result
})
}
@@ -674,7 +674,7 @@
const data4 = ref([])
const getData4 = () => {
zxloadCurve().then(res => {
- const result = res.data
+ const result = res.data || []
data4.value = result
if (data4.value && data4.value.length > 0) {
initLoadReal()
@@ -685,7 +685,7 @@
const data5 = ref([])
const getData5 = () => {
zxenergyDataList({ type: 2 }).then(res => {
- const result = res.data
+ const result = res.data || []
data5.value = result
initOperation()
})
diff --git a/server/system_service/src/main/java/com/doumee/service/business/third/model/TMSContants.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/TMSContants.java
index 6f0e97b..6e55bb4 100644
--- a/server/system_service/src/main/java/com/doumee/service/business/third/model/TMSContants.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/TMSContants.java
@@ -136,7 +136,7 @@
shwtg(4, 2,1,"杩愯緭鍗曞鏍搁�氳繃",null),
sqzyzwc(5,6, 1,"鐢宠鍑嗚繍璇佸畬鎴�","杞﹁締鍑嗚繍璇佺敵璇峰畬鎴�" ),
ddzhddzs(6,3,2,"鍒拌揪瑁呰揣鍦�-鐢靛瓙閿佹苯杩�","杞﹁締宸插埌杈捐璐у湴" ),
- clqddzs(7, 4,2,"杞﹁締鍚繍-鐢靛瓙閿佹苯杩�","杞﹁締瑁呰揣瀹屾垚锛岀數瀛愰攣宸蹭笂閿�" ),
+ clqddzs(7, 4,2,"杞﹁締鍚繍-鐢靛瓙閿佹苯杩�","杞﹁締宸插惎杩�" ),
clqdapp(8, 7,3,"杞﹁締鍚繍-APP","杞﹁締杩愯緭涓�" ),
ddzhd(9, 8,4,"鍒拌揪鍗歌揣鍦�-APP","杞﹁締宸插埌杈惧嵏璐у湴" ),
ddxhd(10, 5,5,"鍒拌揪鍗歌揣鍦�-鐢靛瓙閿佹苯杩�","鐢靛瓙閿佸凡瑙ｉ攣锛岃繍杈撲换鍔″凡瀹屾垚" ),
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
index b11ecfb..506b502 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -397,8 +397,6 @@
}else{
throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
}
-
-
String pwd = Utils.Secure.encryptPassword(new String(dto.getPassword()), user.getSalt());
// 姣旇緝瀵嗙爜
if( !StringUtils.equals(pwd, user.getPassword())){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index e2b3621..3698711 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1765,7 +1765,7 @@
//濡傛灉鏄徃鏈烘垨鑰呭唴閮ㄤ汉鍛橈紝鍒欎粠system_user鏌ヨ
SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
.eq(SystemUser::getOpenid,openId)
- .eq(SystemUser::getType,source)
+ .eq(Objects.nonNull(source)&&Constants.equalsInteger(source,Constants.TWO),SystemUser::getType,source)
.eq(SystemUser::getDeleted,Boolean.FALSE)
.last(" limit 1 "));
//闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
--
Gitblit v1.9.3