h5/pages/driver/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
h5/pages/login/login.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
h5/pages/waybill/waybillDetail.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
h5/pages/wdata/home.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
screen/src/views/EnergyConsum.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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
@@ -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') } } }) 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> 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) } } }) 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() })