Merge remote-tracking branch 'origin/master'

jiangping

2025-01-06 93fc01349aa48a086c71123a2317765a925c0897

Merge remote-tracking branch 'origin/master'

 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>

        <!--  -->


 h5/pages/login/login.vue

@@ -139,7 +139,9 @@
                                        that.$store.commit('setDriverInfo', ress.data)
                                    })
                                }
                                this.driverLogin(flag)
                                setTimeout(() => {
                                    that.driverLogin(flag)
                                }, 200)

                            } else if (source == 2) {
                                if (res.data.token) {
                                    that.$store.commit('setToken', res.data.token)
@@ -147,7 +149,9 @@
                                        that.$store.commit('setUserInfo', ress.data)
                                    })
                                }
                                this.staffLogin(flag)
                                setTimeout(() => {

                                    that.staffLogin(flag)

                                }, 200)

                            } else {
                                this.jump('/pages/index/index')
                            }


 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>

@@ -66,7 +67,10 @@
                            <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>

                                <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>


 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'
                                })
                            }, 300)
                                }, 100)
                            })
                        }

                    }

                })


 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()
  })

 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,"到达卸货地-电子锁汽运","电子锁已解锁，运输任务已完成" ),

 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())){

 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 "));
            //非访客用户 进行判断是否存在用户