From c8aa5edef15a0f130e96a6d6664bb14bdaeed487 Mon Sep 17 00:00:00 2001 From: cclu <1106109051@qq.com> Date: Fri, 17 Jan 2025 18:18:49 +0800 Subject: [PATCH] update --- common/utils.js | 353 +++++++------ pages/billOfLading/detail.vue | 77 ++- pages/billOfLading/index.vue | 102 ++-- pages/index/index.vue | 31 +- pages/userCenter/userCenter.vue | 880 ++++++++++++++++++-------------- util/api.js | 5 +- 6 files changed, 804 insertions(+), 644 deletions(-) diff --git a/common/utils.js b/common/utils.js index 78db376..9e38769 100644 --- a/common/utils.js +++ b/common/utils.js @@ -65,7 +65,7 @@ import request from '@/util/index.js' // } const netChange = () => { - uni.onNetworkStatusChange(function(res) { + uni.onNetworkStatusChange(function (res) { // console.log(res.isConnected) store.mutations.isConnect(res.isConnected) if (!res.isConnected) { @@ -110,24 +110,25 @@ const fmoney = (s, n) => { for (let i = 0; i < l.length; i++) { t += l[i] + ((i + 1) % 3 == 0 && (i + 1) != l.length ? "," : ""); } - if (n===0){ + if (n === 0) { return s - }else{ + } else { return fuhao + [...t].reverse().join("") + "." + r; } } // 四舍五入不保留小数的 金额化数字方法 -function noDecimal(s){ - console.log('s',s) +function noDecimal(s) { + console.log('s', s) let fuhao = ''; //如果数字小于零则值为- if (s < 0) { s = Math.abs(s); fuhao = '-' } s = parseFloat((s + "").replace(/[^\d\.-]/g, "")) + "" - let l = s.split(".")[0].split("").reverse(), r = s.split(".")[1]; + let l = s.split(".")[0].split("").reverse(), + r = s.split(".")[1]; let t = '' for (let i = 0; i < l.length; i++) { t += l[i] + ((i + 1) % 3 == 0 && (i + 1) != l.length ? "," : ""); @@ -144,11 +145,11 @@ function changeStringToDate(s) { if (s.length === 14) { return s.substring(0, 4) + '-' + s.substring(4, 6) + '-' + s.substring(6, 8) + ' ' + s.substring(8, 10) + ':' + s.substring(10, 12) + ':' + s.substring(12, 14); - } - else if (s.length === 8) { + } else if (s.length === 8) { return s.substring(0, 4) + '-' + s.substring(4, 6) + '-' + s.substring(6, 8); } } + function toNextRoute(type, url) { uni[type]({ url: url, @@ -161,6 +162,17 @@ function toNextRoute(type, url) { }) } +function formatNumber(num) { + // 先保留两位小数，不四舍五入 + num = Math.floor(num * 100) / 100; + + // 添加千分号 + let [integer, decimal] = num.toString().split('.'); + integer = integer.replace(/\B(?=(\d{3})+(?!\d))/g, ','); // 千分号格式化 + + return decimal ? `${integer}.${decimal}` : integer; // 如果有小数部分则保留 +} + // 记录用户行为的方法 每个页面的onUnload里面要调用 function addUserBehavior(obj) { @@ -184,22 +196,23 @@ function addUserBehavior(obj) { let baseInfo = uni.getStorageSync('userInfo') let req = { - userName:userDate.UserName, - phoneNumber:userDate.Membership_Phone, - userId:userDate.UserId ? userDate.UserId:'', - wechatAppId:'wx4fb5da2b8d9e0e43', - intoRoute:obj.intoRoute, - outtoRoute:obj.outtoRoute, - visitChannels:obj.visitChannels, - behaviorRecordDesc:'', + userName: userDate.UserName, + phoneNumber: userDate.Membership_Phone, + userId: userDate.UserId ? userDate.UserId : '', + wechatAppId: 'wx4fb5da2b8d9e0e43', + intoRoute: obj.intoRoute, + outtoRoute: obj.outtoRoute, + visitChannels: obj.visitChannels, + behaviorRecordDesc: '', LoginIP: baseInfo.ip || '', - LoginPlace: (baseInfo.prov ? baseInfo.prov : '' ) + (baseInfo.prov && baseInfo.city ? '-' : '') + (baseInfo.city ? baseInfo.city : ''), + LoginPlace: (baseInfo.prov ? baseInfo.prov : '') + (baseInfo.prov && baseInfo.city ? '-' : '') + (baseInfo.city ? baseInfo.city : ''), SOURCE_PLATFORM: '数智化看板' } - request.$webGet('CommercialApi/UserBehavior/AddUserBehavior',req).then(() => { + request.$webGet('CommercialApi/UserBehavior/AddUserBehavior', req).then(() => { }) } + function addUserBehaviorNew(obj) { var pages = getCurrentPages() // 获取加载的页面 @@ -219,16 +232,16 @@ function addUserBehaviorNew(obj) { obj.visitChannels = store.state.visitChannels let userDate = store.state.userData let req = { - userName:userDate.UserName, - phoneNumber:userDate.Membership_Phone, - userId:userDate.UserId ? userDate.UserId:'', - wechatAppId:'wx4fb5da2b8d9e0e43', - intoRoute:obj.intoRoute, - outtoRoute:obj.outtoRoute, - visitChannels:obj.visitChannels, - behaviorRecordDesc:'' + userName: userDate.UserName, + phoneNumber: userDate.Membership_Phone, + userId: userDate.UserId ? userDate.UserId : '', + wechatAppId: 'wx4fb5da2b8d9e0e43', + intoRoute: obj.intoRoute, + outtoRoute: obj.outtoRoute, + visitChannels: obj.visitChannels, + behaviorRecordDesc: '' } - request.$webGet('CommercialApi/UserBehavior/AddUserBehavior',req).then(() => { + request.$webGet('CommercialApi/UserBehavior/AddUserBehavior', req).then(() => { }) } @@ -260,26 +273,35 @@ async function getFieldEnumByField(params) { // 得到这个月有多少天 -function getThisMonthDay(value){ +function getThisMonthDay(value) { let date = new Date(value) let y = date.getFullYear() let m = date.getMonth() + 1 let howDay; let flag = false - if( y%4 ===0 && y%100!==0 || y%400===0 ){ - flag=true + if (y % 4 === 0 && y % 100 !== 0 || y % 400 === 0) { + flag = true } - switch (m){ - case 1: case 3: case 5: case 7: case 8: case 10: case 12: - howDay=31 + switch (m) { + case 1: + case 3: + case 5: + case 7: + case 8: + case 10: + case 12: + howDay = 31 break - case 4: case 6: case 9: case 11: - howDay=30 + case 4: + case 6: + case 9: + case 11: + howDay = 30 break - case 2 : - if(flag){ - howDay=29 - }else{ + case 2: + if (flag) { + howDay = 29 + } else { howDay = 28 } break @@ -288,56 +310,56 @@ function getThisMonthDay(value){ } // 输入时间拿到月份 -function getThisMonth(value){ +function getThisMonth(value) { const date = new Date(value) let y = date.getFullYear() - let m = date.getMonth()+1 - if (m<10){ - m = '0'+m + let m = date.getMonth() + 1 + if (m < 10) { + m = '0' + m } return `${y}${m}` } // 输入时间得到带-的月份 -function getThisMonthHaveHeng(value){ +function getThisMonthHaveHeng(value) { const date = new Date(value) let y = date.getFullYear() - let m = date.getMonth()+1 - if (m<10){ - m = '0'+m + let m = date.getMonth() + 1 + if (m < 10) { + m = '0' + m } return `${y}-${m}` } //有横杠 -function getThisMonthHave(value){ +function getThisMonthHave(value) { const date = new Date(value) let y = date.getFullYear() - let m = date.getMonth()+1 - if (m<10){ - m = '0'+m + let m = date.getMonth() + 1 + if (m < 10) { + m = '0' + m } return `${y}-${m}` } // 显示月日 -function handleGetMonthDay(value){ +function handleGetMonthDay(value) { const date = new Date(value) - let m = date.getMonth()+1 - if (m<10){ - m = '0'+m + let m = date.getMonth() + 1 + if (m < 10) { + m = '0' + m } let d = date.getDate() - if (d<10){ + if (d < 10) { d = '0' + d } return `${m}-${d}` } // 输入时间拿到月份 输出月份的字符串 -function getThisTimeMonth(value){ +function getThisTimeMonth(value) { const date = new Date(value) - let m = date.getMonth()+1 - if (m<10){ - m = '0'+m + let m = date.getMonth() + 1 + if (m < 10) { + m = '0' + m } return `${m}` } @@ -351,42 +373,54 @@ function playVideo(opt) { } // 输入年份和月份 输出该月的天数 是一个数组 格式为 *月**日 -function getThisMonthDateList(value){ +function getThisMonthDateList(value) { let date = new Date(value) let y = date.getFullYear() let m = date.getMonth() + 1 let howDay; let flag = false - if( y%4 ===0 && y%100!==0 || y%400===0 ){ + if (y % 4 === 0 && y % 100 !== 0 || y % 400 === 0) { flag = true } - switch (m){ - case 1: case 3: case 5: case 7: case 8: case 10: case 12: - howDay=31 + switch (m) { + case 1: + case 3: + case 5: + case 7: + case 8: + case 10: + case 12: + howDay = 31 break - case 4: case 6: case 9: case 11: - howDay=30 + case 4: + case 6: + case 9: + case 11: + howDay = 30 break - case 2 : - if(flag){ - howDay=29 - }else{ + case 2: + if (flag) { + howDay = 29 + } else { howDay = 28 } break } let list = [] - for (let i = 0;i <= howDay,++i;) { - if (i>howDay){ + for (let i = 0; i <= howDay, ++i;) { + if (i > howDay) { break - }else{ - list.push({label:`${m}月${i}日`,value:`${y}-${m<10?'0'+m:m}-${i<10?'0'+i:i}`}) + } else { + list.push({ + label: `${m}月${i}日`, + value: `${y}-${m<10?'0'+m:m}-${i<10?'0'+i:i}` + }) } } return list } // 传入 老的时间和要变成的时间 老时间要日期 新时间不用 月份为1无效 -function handleReduceAMonth(nowTime,newTime){ +function handleReduceAMonth(nowTime, newTime) { const oldDate = new Date(nowTime) let y = oldDate.getFullYear() let m = oldDate.getMonth() + 1 @@ -395,106 +429,106 @@ function handleReduceAMonth(nowTime,newTime){ const newDate = new Date(newTime) let newY = newDate.getFullYear() let newM = newDate.getMonth() + 1 - let thisMonth = newM<10?'0'+newM:newM + let thisMonth = newM < 10 ? '0' + newM : newM let howDay = this.getThisMonthDay(`${y}-${m}`) let newHowDay = this.getThisMonthDay(`${newY}-${thisMonth}`) const nowDate = new Date() - let nowM =nowDate.getMonth() + 1 + let nowM = nowDate.getMonth() + 1 let nowD = nowDate.getDate() - if (d === newHowDay){ - if (d newHowDay) { + if (newM < 10) { + newM = '0' + newM + } + if (newHowDay < 10) { + newHowDay = '0' + newHowDay + } + return `${newY}-${newM}-${newHowDay}` + } else { + if (newM < 10) { + newM = '0' + newM + } + if (d < 10) { + d = '0' + d + } + return `${newY}-${newM}-${d}` + } + } else { + if (nowD < d) { + if (nowM === newM) { + if (newM < 10) { newM = '0' + newM } - if (nowD<10){ + if (nowD < 10) { nowD = '0' + nowD } return `${newY}-${newM}-${nowD}` - }else{ - if (newM<10){ - newM = '0' + newM - } - if (newHowDay<10){ - newHowDay = '0' + newHowDay - } - return `${newY}-${newM}-${newHowDay}` - } - } - }else{ - if (newM===2){ - if (d>newHowDay){ - if (newM<10){ - newM = '0' + newM - } - if (newHowDay<10){ - newHowDay = '0' + newHowDay - } - return `${newY}-${newM}-${newHowDay}` - }else{ - if (newM<10){ - newM = '0' + newM - } - if (d<10){ - d = '0' + d - } - return `${newY}-${newM}-${d}` - } - }else{ - if (nowD{ - if (list && list.length>0){ +const handleGetSortList = (list, field, type) => { + if (list && list.length > 0) { let len = list.length - if (type===2){ - for (var i = 0; i < len - 1;i++){ + if (type === 2) { + for (var i = 0; i < len - 1; i++) { for (var j = 0; j < len - 1 - i; j++) { - if (list[i][field]list[j][field]){ + if (list[i][field] > list[j][field]) { var temp = list[j]; list[j] = list[j + 1]; list[j + 1] = temp; @@ -579,6 +613,7 @@ export default { getThisTimeMonth, handleGetMonthDay, fmoney, + formatNumber, noDecimal, changeStringToDate, toNextRoute, @@ -593,4 +628,4 @@ export default { getMoneyNoDecimal, getThisMonthDateList, handleReduceAMonth -} +} \ No newline at end of file diff --git a/pages/billOfLading/detail.vue b/pages/billOfLading/detail.vue index 927d441..3df5b28 100644 --- a/pages/billOfLading/detail.vue +++ b/pages/billOfLading/detail.vue @@ -8,7 +8,7 @@ src="https://eshangtech.com/ShopICO/ahyd-BID/examine/leftArrowWhite.svg" > -

提单申请

+

{{ item.BillState === 1 ? "已提单" : "提单申请" }}

@@ -38,8 +38,8 @@

{{ - detailInfo.BUSINESSPROCESS_NAME - ? detailInfo.BUSINESSPROCESS_NAME.split("】")[1] + detailInfo.BusinessProcess_Name + ? detailInfo.BusinessProcess_Name.split("】")[1] : "-" }}

@@ -48,7 +48,7 @@ class="serviceFixed" src="https://eshangtech.com/ShopICO/yxcl/projectWarning/position.svg" > - {{ detailInfo.SERVERPART_NAME }} + {{ detailInfo.Serverpart_Name }} @@ -56,7 +56,7 @@ class="icon" src="https://eshangtech.com/ShopICO/yxcl/projectWarning/user.svg" > - {{ detailInfo.STAFF_NAME || "-" }} + {{ detailInfo.Staff_Name || "-" }} + + {{ + !pageMsg.isOver ? "正在加载,请稍后..." : "——— 我是有底线的 ———" + }} + @@ -97,12 +108,7 @@ - - - {{ - !pageData.isEnd ? "正在加载,请稍后..." : "——— 我是有底线的 ———" - }} - + 0) { - this.pageList = list; - } else { - this.pageList = []; + let oldList = []; + if (this.pageList && this.pageList.length > 0) { + oldList = this.pageList; } + if (list && list.length > 0) { + list.forEach((item) => { + item.BusinessProcess_Name = item.BusinessProcess_Name.split("】")[1]; + }); + if (list.length < 10) { + this.pageMsg.isOver = true; + } + } + this.pageList = oldList.concat(list); uni.hideLoading(); }, // 跳转去详情 @@ -289,6 +262,15 @@ export default { // 修改顶部的tab handleClick(obj) { this.activeType = obj.id; + this.BillState = + obj.id === 0 ? "" : obj.id === 1 ? 1 : obj.id === 2 ? "0" : ""; + this.pageList = []; + this.pageMsg = { + pageSize: 10, + pageIndex: 1, + isOver: false, + }; + this.handleGetList(); }, }, }; diff --git a/pages/index/index.vue b/pages/index/index.vue index 940e046..349392e 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1203,14 +1203,18 @@ selectVersion3Obj["累计"].RevenueINC .curYearData || "-" }} - {{(Math.floor(index / 12) + 2023)}}年/万元 + {{ Math.floor(index / 12) + 2023 }}年/万元
{{ selectVersion3Obj["累计"].RevenueINC.lYearData || "-" }} - {{(Math.floor(index / 12) + 2022)}}年/万元 + {{ Math.floor(index / 12) + 2022 }}年/万元
- {{(Math.floor(index / 12) + 2023)}}年/万元 + {{ Math.floor(index / 12) + 2023 }}年/万元
{{ selectVersion3Obj["累计"].AccountINC.lYearData || "-" }} - {{(Math.floor(index / 12) + 2022)}}年/万元 + {{ Math.floor(index / 12) + 2022 }}年/万元
- {{(Math.floor(index / 12) + 2023)}}年/万元 + {{ Math.floor(index / 12) + 2023 }}年/万元
{{ selectVersion3Obj["累计"].BayonetINC.lYearData || "-" }} - {{(Math.floor(index / 12) + 2022)}}年/万元 + {{ Math.floor(index / 12) + 2022 }}年/万元
- + -
- +
+ - - + + - 我的 + 我的
- + -

{{user.Membership_Name}}

- - {{user.DepartmentName}} +

{{ user.Membership_Name }}

+ + {{ user.DepartmentName }}

{{ handleGetPhone(user.Membership_Phone) }}

-

{{user.OwnerUnitName}}

+

{{ user.OwnerUnitName }}

 @@ -40,383 +60,447 @@ - + - +