From 24715f04080bf08f6556b2b291cbf82b002e034f Mon Sep 17 00:00:00 2001 From: wangxia <779219182@qq.com> Date: Wed, 5 Mar 2025 14:14:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.wxss | 9 +- components/job-sub/index.js | 6 + components/job-sub/index.wxml | 11 ++ custom-tab-bar/index.js | 17 +- pages/city/index.wxml | 11 +- pages/city/index.wxss | 120 +++++++------- pages/detail/index.js | 6 +- pages/detail/index.wxml | 14 +- pages/firstBill/index.js | 37 +++-- pages/firstBill/index.wxml | 15 +- pages/listSharePage/index.js | 6 +- pages/listSharePage/index.wxml | 6 +- pages/listSharePage/index.wxss | 2 +- pages/mine/index.wxml | 9 +- pages/mine/index.wxss | 5 - pages/myBill/index.js | 2 +- pages/wodeBill/index.wxml | 2 +- pages/wodeBillDetail/index.js | 10 +- pages/wodeBillDetail/index.wxml | 12 +- pages/wodeBillDetail/index.wxss | 2 +- pages/workBench/index.js | 2 +- pages/workBench/index.wxml | 69 ++++---- pages/workBench/index.wxss | 348 ++++++++++++++++++++-------------------- project.private.config.json | 7 + utils/commonUtil.js | 4 +- 25 files changed, 393 insertions(+), 339 deletions(-) diff --git a/app.wxss b/app.wxss index bdd4120..1c678d2 100644 --- a/app.wxss +++ b/app.wxss @@ -144,6 +144,12 @@ page { .pl16 { padding-left: 16px; } +.pl32 { + padding-left: 32px; +} +.pr32 { + padding-right: 32px; +} .pb12 { padding-bottom: 12px; } @@ -2055,7 +2061,8 @@ page { */ .contact { width: 80%; - height: 350px; + /* height: 450px; */ + padding-bottom: 32px; } .contact .contact_bottomBtn .v-center { width: 80px !important; diff --git a/components/job-sub/index.js b/components/job-sub/index.js index 433c565..71fac14 100644 --- a/components/job-sub/index.js +++ b/components/job-sub/index.js @@ -3,6 +3,7 @@ Component({ data: { labelColor: ["#c41d7f", "#096dd9", "#531dab", "#d46b08", "#389e0d", "#08979c", "#cf1322"], bgColor: ["#fff0f6", "#e6f7ff", "#f9f0ff", "#fff7e6", "#f6ffed", "#e6fffb", "#fff1f0"], + corpUserFlag: false, }, properties: { // 抽屉高度 @@ -32,6 +33,11 @@ Component({ } }, + ready () { + this.setData({ + corpUserFlag: app.globalData.loginUserInfo.corpUserFlag + }) + }, methods: { goLogin () { diff --git a/components/job-sub/index.wxml b/components/job-sub/index.wxml index 5970866..b1603b4 100644 --- a/components/job-sub/index.wxml +++ b/components/job-sub/index.wxml @@ -82,6 +82,17 @@ + + + + + + {{item.supplierName || '-'}} + + + + + diff --git a/pages/city/index.wxss b/pages/city/index.wxss index 7d594f5..3202bc9 100644 --- a/pages/city/index.wxss +++ b/pages/city/index.wxss @@ -1,106 +1,112 @@ @import "../screen/index.wxss"; page { - padding-bottom: 0; + padding-bottom: 0; background-color: #fff; } .weui-search-bar { - padding: 0; + padding: 0; } .weui-search-bar__box { - background-color: #f6f6f6; + background-color: #f6f6f6; } .weui-search-bar__form { - padding-right: 10px; + padding-right: 10px; } .weui-search-bar__box { - border-radius: 17px; + border-radius: 17px; } .p10200 { - padding: 10px 10px 140px 20px; + padding: 10px 10px 140px 20px; } .letter-list { - position: fixed; - top: 190px; - right: 3px; - z-index: 999; - width: 24px; - font-size: 11px; - text-align: center; - color: #999999; + position: fixed; + top: 120px; + right: 3px; + z-index: 999; + width: 20px; + font-size: 11px; + text-align: center; + color: #999999; } .letter-list .letter { - padding: 2px 0px; - line-height: 1.3; + padding: 3px 0px; + line-height: 1.3; } .rlhc { - background: var(--color-ysd); - border-radius: 100%; - color: #ffffff; + background: var(--color-ysd); + border-radius: 100%; + color: #ffffff; } .positionLetter { - position: fixed; - right: 40px; - top: 90px; - width: 47px; - height: 47px; - opacity: 1; - background: #cccccc; - border-radius: 50%; - font-size: 25px; - font-weight: 601; - text-align: center; - color: #ffffff; - line-height: 47px; - z-index: 9999; + position: fixed; + right: 40px; + top: 90px; + width: 47px; + height: 47px; + opacity: 1; + background: #cccccc; + border-radius: 50%; + font-size: 25px; + font-weight: 601; + text-align: center; + color: #ffffff; + line-height: 47px; + z-index: 9999; } .loginOut { - margin-top: 20rpx; + margin-top: 20rpx; } .btn { - width: unset !important; + width: unset !important; } .navigatorBar { - position: relative; - /* z-index: 999; */ - background-color: #fff; - padding-bottom: 16px; + position: relative; + /* z-index: 999; */ + background-color: #fff; + padding-bottom: 16px; + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.1); /* 灰色底部阴影 */ } .navigatorBar .tabs { - position: relative; - left: 50%; - color: #fff; + display: flex; + position: relative; + left: 50%; + color: #fff; border-radius: 8px; overflow: hidden; - transform: translateX(-50%); - justify-content: center; - box-sizing: border-box; + transform: translateX(-50%); + justify-content: center; + box-sizing: border-box; background-color: #f2f2f2; } .navigatorBar .tabs > view { - flex: 1; - line-height: 26px; - width: 56px; - color: #666666; - text-align: center; + flex: 1; + height: 100%; + display: flex; + flex-direction: column; + justify-content: center; + /* line-height: 26px; */ + width: 56px; + color: #666666; + text-align: center; } .navigatorBar .tabs .active { - height: 26px; - background-color: #1890ff; - color: #fff; - border-radius: 6px; + /* height: 100%; */ + background-color: #1890ff; + color: #fff; + border-radius: 6px; } -.searchBox{ +.searchBox { margin: 0 20px; margin-bottom: 10px; height: 34px; border-radius: 99px; background-color: #f9f9f9; } -.fss{ +.fss { display: flex; justify-content: start; align-items: center; -} \ No newline at end of file +} diff --git a/pages/detail/index.js b/pages/detail/index.js index f2ae844..d90784c 100644 --- a/pages/detail/index.js +++ b/pages/detail/index.js @@ -1249,14 +1249,14 @@ Page({ if (hasHourlyPay) { if (app.isNotEmptyCheck(jobDetail.record.minMonthlyPay) && app.isNotEmptyCheck(jobDetail.record.maxMonthlyPay)) { if (jobDetail.record.minMonthlyPay == jobDetail.record.maxMonthlyPay) { - monthlyPayStr = jobDetail.record.minMonthlyPay; + monthlyPayStr = jobDetail.record.minMonthlyPay / 100; } else { monthlyPayStr = jobDetail.record.minMonthlyPay / 100 + "-" + jobDetail.record.maxMonthlyPay / 100; } } else if (app.isNotEmptyCheck(jobDetail.record.minMonthlyPay)) { - monthlyPayStr = jobDetail.record.minMonthlyPay; + monthlyPayStr = jobDetail.record.minMonthlyPay / 100; } else if (app.isNotEmptyCheck(jobDetail.record.maxMonthlyPay)) { - monthlyPayStr = jobDetail.record.maxMonthlyPay; + monthlyPayStr = jobDetail.record.maxMonthlyPay / 100; } } jobDetail.record["monthlyPay"] = monthlyPayStr; diff --git a/pages/detail/index.wxml b/pages/detail/index.wxml index 731935e..1d00165 100644 --- a/pages/detail/index.wxml +++ b/pages/detail/index.wxml @@ -126,9 +126,9 @@ {{jobDetail.record.monthlyPay ? '丨' + jobDetail.record.monthlyPay : '--'}} - - - 复制 + + + 复制 @@ -260,12 +260,12 @@ {{jobDetail.record.interviewDuration}} 出行方式 diff --git a/pages/firstBill/index.js b/pages/firstBill/index.js index dda5462..4df9b70 100644 --- a/pages/firstBill/index.js +++ b/pages/firstBill/index.js @@ -31,6 +31,20 @@ Page({ picked: '0' }, ], + sortList:[ + { + name: '综合排序', + key: 'zuigao', + }, + { + name: '综合排序', + key: 'zuigao', + }, + { + name: '综合排序', + key: 'zuigao', + }, + ], anchorList: [ { id: 'age', @@ -40,17 +54,17 @@ Page({ id: 'gender', name: '性别' }, - { - id: 'class', - name: '分类' - }, + // { + // id: 'class', + // name: '分类' + // }, { id: 'xzfl', name: '薪资福利' }, { id: 'ssbz', - name: '宿舍保障' + name: '吃饭住宿' }, { id: 'bzxx', @@ -1850,7 +1864,7 @@ Page({ }, swiperToggleF () { this.setData({ - // isSwiper:true, + isSwiper:true, // inputVal:'' }) }, @@ -2673,8 +2687,8 @@ Page({ console.log(res); if ($type == 'search') { that.setData({ - isSwiper: true, - inputVal: '' + // isSwiper: true, + // inputVal: '' }) } let data = res.data.data @@ -4409,6 +4423,11 @@ Page({ siv: "menu", }); }); + } else if (str == "shijian"){ + that.setData({ + firstMenu: "时间", + // storeJobListSearchForm: tha t.data.storeJobListSearchForm, + }); } that.setData({ activez: str, @@ -4873,7 +4892,7 @@ Page({ }) }, catchScrollInfo (e) { - console.log(e); + // console.log(e); }, }); \ No newline at end of file diff --git a/pages/firstBill/index.wxml b/pages/firstBill/index.wxml index b069200..4c71a92 100644 --- a/pages/firstBill/index.wxml +++ b/pages/firstBill/index.wxml @@ -13,7 +13,7 @@ - + @@ -24,7 +24,7 @@ - + 搜索 @@ -63,9 +63,10 @@ - 工价优先 + 按工价 - 佣金优先 + 按佣金 + 按时间 @@ -135,12 +136,12 @@ {{item.name}} - + 薪资福利 @@ -148,7 +149,7 @@ - 宿舍保障 + 吃饭住宿 {{item.name}} diff --git a/pages/listSharePage/index.js b/pages/listSharePage/index.js index e301975..5de5085 100644 --- a/pages/listSharePage/index.js +++ b/pages/listSharePage/index.js @@ -2110,6 +2110,7 @@ Page({ currentJobDrawer: that.data.currentJobDrawer, checkedList: that.data.checkedList, }); + console.log('that.data.recordList',that.data.recordList); }) }); }, @@ -2604,7 +2605,8 @@ Page({ .boundingClientRect() .exec(function (res) { res.forEach((item) => { - item.forEach((element, index) => { + if(that.data.recordList.length > 0){ + item.forEach((element, index) => { if (element.width > 200) { // that.data.recordList[index].isTagShow = true; var age = "recordList[" + index + "].isTagShow"; @@ -2613,6 +2615,8 @@ Page({ }); } }); + } + }); // if(){ diff --git a/pages/listSharePage/index.wxml b/pages/listSharePage/index.wxml index ec22bdf..d51918c 100644 --- a/pages/listSharePage/index.wxml +++ b/pages/listSharePage/index.wxml @@ -355,7 +355,7 @@ 登录查看 - {{agencyStatus == 1 ? (item.fuWuFei ? item.fuWuFei : '-') : '仅代理可见'}} + {{agencyStatus == 1 ? (item.fuWuFei ? item.fuWuFei : '详询客服') : '仅代理可见'}} @@ -369,7 +369,7 @@ - 没有符合条件的职位 + @@ -380,7 +380,7 @@ - 暂无记录 + 没有符合条件的职位 diff --git a/pages/listSharePage/index.wxss b/pages/listSharePage/index.wxss index 50939aa..af9ea38 100644 --- a/pages/listSharePage/index.wxss +++ b/pages/listSharePage/index.wxss @@ -426,7 +426,7 @@ height: 746rpx; flex: 1; text-align: right; white-space: nowrap; - color: var(--color-ysd); + color: var(--color-f40); font-weight: 601; } .weui-btn { diff --git a/pages/mine/index.wxml b/pages/mine/index.wxml index e0b19b3..514bd55 100644 --- a/pages/mine/index.wxml +++ b/pages/mine/index.wxml @@ -400,14 +400,7 @@ - - - - - 商家管理 - - - + diff --git a/pages/wodeBillDetail/index.js b/pages/wodeBillDetail/index.js index b102272..09d0691 100644 --- a/pages/wodeBillDetail/index.js +++ b/pages/wodeBillDetail/index.js @@ -73,7 +73,7 @@ Page({ } }).then((res) => { console.log(res); - console.log(that.data);`` + console.log(that.data); `` let status; let info; let index; @@ -86,7 +86,7 @@ Page({ console.log(sceneJson); that.data.searchParam.agencyId = sceneJson.agencyId || sceneJson.aId; that.data.searchParam.factoryBillId = sceneJson.factoryBillId || sceneJson.fId; - if (app.isNotEmptyCheck(sceneJson.status)) { + if (app.isNotEmptyCheck(sceneJson.status)) { status = sceneJson.status; } else { status = 0; @@ -362,7 +362,7 @@ Page({ let that = this; console.log(e); let id = e.currentTarget.dataset.id; - customRequest("/yishoudan/factory/bill/record/details/" + id,{header:'headers', method: 'GET', data: {}}).then(({data})=>{ + customRequest("/yishoudan/factory/bill/record/details/" + id, { header: 'headers', method: 'GET', data: {} }).then(({ data }) => { if (data.status == 200) { // data.data.pageBean.recordList.forEach((item) => { // item.showTime = formatDateYMDHM(item.updateTime); @@ -457,7 +457,7 @@ Page({ billSubmit (ids) { let that = this; if (!this.data.isBtnLoading) { - customRequest("/yishoudan/factory/bill/record/confirm",{header:'headers', method: 'post', data: ids}).then(({data})=>{ + customRequest("/yishoudan/factory/bill/record/confirm", { header: 'headers', method: 'post', data: ids }).then(({ data }) => { if (data.status == 200) { wx.showToast({ title: "确认成功", icon: "success", duration: 2000 }); //隐藏消息提示框 that.data.searchParam.status = 10; @@ -583,7 +583,7 @@ Page({ // wx.showLoading({ // title: "加载中...", // }); - customRequest("/yishoudan/factory/bill/record/list",{header:'headers', method: 'POST', data: that.data.searchParam}).then((res)=>{ + customRequest("/yishoudan/factory/bill/record/list", { header: 'headers', method: 'POST', data: that.data.searchParam }).then((res) => { if (res.data.status == 200) { if (res.data.data.pageBean.recordList != null && res.data.data.pageBean.recordList.length < 20) { var recordListTemp = res.data.data.pageBean.recordList; diff --git a/pages/wodeBillDetail/index.wxml b/pages/wodeBillDetail/index.wxml index 80933e1..10a9deb 100644 --- a/pages/wodeBillDetail/index.wxml +++ b/pages/wodeBillDetail/index.wxml @@ -57,7 +57,7 @@ --> 税后金额（元） - + {{(factoryBill.totalSalaryStr)}} {{'.' + factoryBill.totalSalaryDot}} @@ -82,7 +82,7 @@ - + {{item.userName || '-'}} @@ -100,7 +100,7 @@ - + {{(item.salaryDot)}}元 @@ -117,7 +117,7 @@ - + @@ -132,7 +132,7 @@ - + {{item.salaryDot}}元 @@ -166,7 +166,7 @@ 全选 合计： - {{selectTotalSalary + '元'}} + {{selectTotalSalary + '元'}} 核对无误 diff --git a/pages/wodeBillDetail/index.wxss b/pages/wodeBillDetail/index.wxss index f5910a8..bf0e4eb 100644 --- a/pages/wodeBillDetail/index.wxss +++ b/pages/wodeBillDetail/index.wxss @@ -17,7 +17,7 @@ page { margin-left: -36px; } .totalPriceInfoContainer { - padding: 10px 10px 0 10px; + padding: 0px 10px 0 10px; } .totalPriceInfo { position: relative; diff --git a/pages/workBench/index.js b/pages/workBench/index.js index 416cb37..c4ba5e8 100644 --- a/pages/workBench/index.js +++ b/pages/workBench/index.js @@ -34,7 +34,7 @@ Page({ if (typeof this.getTabBar === "function" && this.getTabBar()) { this.getTabBar().setData({ isShow: true, - selected: 1, + selected: 3, }); } diff --git a/pages/workBench/index.wxml b/pages/workBench/index.wxml index 7da7069..f804b1c 100644 --- a/pages/workBench/index.wxml +++ b/pages/workBench/index.wxml @@ -141,40 +141,34 @@ --> - + - + 待结算（元） - {{map.billStatus20Salary || '0'}} + {{map.billStatus20Salary || '0'}} - + 累计结算（元） - {{map.billStatus30Salary}} + {{map.billStatus30Salary}} 待核对 - - {{ map.billStatus10Num }} + + {{ map.billStatus10Num }}

暂无待核对账单

 - + 今日数据 @@ -242,23 +236,26 @@ - + + + + + 商家管理 + + + - + 朋友圈助手 - + 伯才TV - - - - - - + + @@ -354,20 +351,22 @@ - - - - - 加客户经理微信 - - - + + + + + 联系项目经理 + 目前平台的自助发布职位功能暂未全面开放，若您有发布职位的需求，烦请添加项目经理微信。 + + + + + 加载中... - 加载中... + + + 长按识别二维码 - - 长按识别二维码 - diff --git a/pages/workBench/index.wxss b/pages/workBench/index.wxss index c0e6223..7cff12b 100644 --- a/pages/workBench/index.wxss +++ b/pages/workBench/index.wxss @@ -1,202 +1,202 @@ /**index.wxss**/ page { - height: 90vh; + height: 90vh; } .weui-grid__label { - font-size: 14px; - color: #666; + font-size: 14px; + color: #666; } .wdgd:active { - background-color: #ececec; + background-color: #ececec; } .display-flex { - display: flex; - align-items: center; + display: flex; + align-items: center; } .navigationbar { - background-color: var(--color-ysd); + background-color: var(--color-ysd); } .navigationbar text { - position: absolute; - bottom: 10px; - left: 50%; - transform: translateX(-50%); - color: #fff; - font-size: 18px; + position: absolute; + bottom: 10px; + left: 50%; + transform: translateX(-50%); + color: #fff; + font-size: 18px; } .container { - padding: 10px; + padding: 10px; } .container .weui-panel { - border-radius: 8px; + border-radius: 8px; } .container .weui-panel::before { - display: none; + display: none; } .container .weui-panel::after { - display: none; + display: none; } .container .weui-panel .weui-panel__hd { - justify-content: space-between; - padding: 16px 16px 0; - color: #333; - font-weight: 400; + justify-content: space-between; + padding: 16px 16px 0; + color: #333; + font-weight: 400; } .container .weui-panel .weui-panel__hd view:first-child { - font-size: 16px; - line-height: 22px; + font-size: 16px; + line-height: 22px; } .container .weui-panel .weui-panel__hd button { - margin: 0; - padding: 0; - font-weight: 400; - font-size: 14px; - background-color: #fff; - line-height: 22px; - color: #333; + margin: 0; + padding: 0; + font-weight: 400; + font-size: 14px; + background-color: #fff; + line-height: 22px; + color: #333; } .container .weui-panel .weui-panel__hd::after { - display: none; - left: 0 !important; - color: #f9f9f9; + display: none; + left: 0 !important; + color: #f9f9f9; } .container .weui-panel .weui-panel__bd { - display: flex; - justify-content: space-around; - padding: 20px 0; + display: flex; + justify-content: space-around; + padding: 20px 0; } .container .weui-panel .weui-panel__bd::after { - display: none; + display: none; } .container .weui-panel .weui-panel__bd button { - background-color: #fff; - margin: 0; - padding: 0; - text-align: center; + background-color: #fff; + margin: 0; + padding: 0; + text-align: center; } .container .weui-panel .weui-panel__bd navigator > view, .container .weui-panel .weui-panel__bd button > view { - /* height: 52px; */ - width: 60px; - height: 64px; - /* margin: 0 22px; */ - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - /* border-right: 1px solid #f5f5f5; */ + /* height: 52px; */ + width: 60px; + height: 64px; + /* margin: 0 22px; */ + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + /* border-right: 1px solid #f5f5f5; */ } .container .weui-panel .weui-panel__bd navigator > view image, .container .weui-panel .weui-panel__bd button > view image { - width: 24px; - height: 24px; - background-repeat: no-repeat; - background-position: center; + width: 24px; + height: 24px; + background-repeat: no-repeat; + background-position: center; } .container .weui-panel .weui-panel__bd navigator > view text, .container .weui-panel .weui-panel__bd button > view text { - font-size: 14px; - font-weight: normal; - color: #666; - margin-top: 12px; + font-size: 14px; + font-weight: normal; + color: #666; + margin-top: 12px; } .container .weui-panel .weui-panel__bd navigator > view:nth-child(2), .container .weui-panel .weui-panel__bd button > view:nth-child(2) { - border-left: 1px solid #f3f3f3; - border-right: 1px solid #f3f3f3; + border-left: 1px solid #f3f3f3; + border-right: 1px solid #f3f3f3; } /* .townsman.weui-panel__bd { justify-content: start !important; } */ .tabbar { - display: flex; - position: fixed; - justify-content: space-between; - width: 100vw; - padding: 5px 30px; - box-sizing: border-box; - bottom: 0; - left: 0; - background-color: #fff; + display: flex; + position: fixed; + justify-content: space-between; + width: 100vw; + padding: 5px 30px; + box-sizing: border-box; + bottom: 0; + left: 0; + background-color: #fff; } .tabbar > view { - display: flex; - flex-direction: column; - align-items: center; + display: flex; + flex-direction: column; + align-items: center; } .tabbar > view view { - width: 20px; - height: 20px; - background-position: center center; - background-size: 100% 100%; + width: 20px; + height: 20px; + background-position: center center; + background-size: 100% 100%; } .quickapply { - position: relative; - height: 80px; - margin: 10px; - margin-bottom: 0; - /* background-color: #fff; */ - overflow: hidden; - border-radius: 8px; + position: relative; + height: 80px; + margin: 10px; + margin-bottom: 0; + /* background-color: #fff; */ + overflow: hidden; + border-radius: 8px; } .quickapply button { - display: flex; - height: 100%; - width: 100%; - padding: 0; - margin: 0; - background-color: #fff; -} -.ii-icon{ + display: flex; + height: 100%; + width: 100%; + padding: 0; + margin: 0; + background-color: #fff; +} +.ii-icon { font-size: 24px; color: #333; } .quickapply button > view { - position: relative; - display: flex; - justify-content: space-between; - align-items: center; - width: 50%; - padding: 20px 10px; + position: relative; + display: flex; + justify-content: space-between; + align-items: center; + width: 50%; + padding: 20px 10px; } .quickapply button > view:first-child::after { - content: ""; - width: 1px; - height: 48px; - position: absolute; - right: 0; - top: 50%; - transform: translateY(-50%); - background-color: #eee; + content: ""; + width: 1px; + height: 48px; + position: absolute; + right: 0; + top: 50%; + transform: translateY(-50%); + background-color: #eee; } .quickapply button > view .t-icon { - width: 38px; - height: 38px; + width: 38px; + height: 38px; } .quickapply button > view .info > view { - text-align: left; - line-height: 1.6; + text-align: left; + line-height: 1.6; } .quickapply button > view .info > view:first-child { - font-size: 16px; - font-weight: bold; + font-size: 16px; + font-weight: bold; } .quickapply button > view .info > view:last-child { - font-size: 12px; - color: #666; - font-weight: 400; + font-size: 12px; + color: #666; + font-weight: 400; } .friendBar .container { - display: flex; + display: flex; justify-content: start; - padding: 0 ; + padding: 0; } .friendBar .container .sub { flex: 25%; padding: 16px 0; text-align: center; } -.friendBar .container .sub .t-icon{ +.friendBar .container .sub .t-icon { margin-bottom: 6px; } .friendBar .container .sub view { @@ -204,78 +204,84 @@ page { } .balanceBox { - border-radius: 8px; - margin-bottom: 10px; - overflow: hidden; - margin-top: 10px; + border-radius: 8px; + margin-bottom: 10px; + overflow: hidden; + margin-top: 10px; } .balanceBox .myaBill { - display: flex; - justify-content: space-between; - align-items: center; - height: 48px; - padding: 0 10px 0 16px; - background-color: #fff; + display: flex; + justify-content: space-between; + align-items: center; + height: 48px; + padding: 0 10px 0 16px; + background-color: #fff; } .balanceBox .myaBill .icon-gengduo11 { - color: #999; - font-size: 12px; + color: #999; + font-size: 12px; } .container .userbalance { - display: flex; - justify-content: space-between; - align-items: center; - /* padding: 16px; */ - border-radius: 8px 8px 0 0; - /* width: 355px; */ - /* height: 96px; */ - box-sizing: border-box; - color: #fff; - background-color: #fff; + display: flex; + justify-content: space-between; + align-items: center; + /* padding: 16px; */ + border-radius: 8px 8px 0 0; + /* width: 355px; */ + /* height: 96px; */ + box-sizing: border-box; + color: #fff; + background-color: #fff; } .container .userbalance > navigator { - height: 100%; - display: flex; - flex: 1; - flex-direction: column; - justify-content: space-around; - padding: 16px 0 16px 16px; + height: 100%; + display: flex; + flex: 1; + flex-direction: column; + justify-content: space-around; + padding: 16px 0 16px 16px; } .container .userbalance > view > view:last-child { - font-size: 26px; + font-size: 26px; } .balanceinfo { - display: flex; - justify-content: start; - flex-direction: row; - align-items: center; + display: flex; + justify-content: start; + flex-direction: row; + align-items: center; } .balanceinfo > view:last-child { - width: 20px; - height: 20px; - background-repeat: no-repeat; - background-size: 100% 100%; + width: 20px; + height: 20px; + background-repeat: no-repeat; + background-size: 100% 100%; } .rightbox { - display: flex; - justify-content: space-between; - flex-direction: column; - align-items: center; + display: flex; + justify-content: space-between; + flex-direction: column; + align-items: center; } .rightbox > view:last-child { - width: 12px; - height: 12px; - /* margin-left: 8px; */ + width: 12px; + height: 12px; + /* margin-left: 8px; */ } .userbalance > navigator { - height: 100%; - display: flex; - flex: 1; - flex-direction: column; - justify-content: space-around; - padding: 16px 0 16px 16px; -} -.gbr{ - border-right: 0.1px solid #eee; -} \ No newline at end of file + height: 100%; + display: flex; + flex: 1; + flex-direction: column; + justify-content: space-around; + padding: 16px 0 16px 16px; +} +.gbr { + border-right: 0.1px solid #eee; +} +.centerSet { + display: flex; + justify-content: center; + + align-items: center; +} diff --git a/project.private.config.json b/project.private.config.json index 8ac6013..9554eed 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -8,6 +8,13 @@ "condition": { "miniprogram": { "list": [ + { + "name": "pages/wodeBillDetail/index", + "pathName": "pages/wodeBillDetail/index", + "query": "", + "launchMode": "default", + "scene": null + }, { "name": "pages/billDetail/index", "pathName": "pages/billDetail/index", diff --git a/utils/commonUtil.js b/utils/commonUtil.js index 0b83c79..914223d 100644 --- a/utils/commonUtil.js +++ b/utils/commonUtil.js @@ -1184,14 +1184,14 @@ export function setJobInfoPositionv3 (str) { .map((item) => { return item; }) - .join(" | "); + .join("丨"); } else if (str.match(reg).length == 3) { result = str .match(reg) .filter((item, index) => { return item; }) - .join(" | "); + .join("丨"); } } else { result = str;