mz666
/
bocai_supplyChain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

同步

Browse Source
cyl/dev
wangxia 1 year ago
parent 3c8513c992
commit 24715f0408
25 changed files with 393 additions and 339 deletions
Show Stats Download Patch File Download Diff File

9
app.wxss
Unescape Escape View File

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

6
components/job-sub/index.js
Unescape Escape View File

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

11
components/job-sub/index.wxml
Unescape Escape View File

@ -82,6 +82,17 @@
</view>
</view>
</view>
<view class="pt8 pb8 pl10 pr10 fsa" wx:if="{{corpUserFlag}}">
<view class="br2 fss" style="background: #f1faff;">
<view class="tac" style="width:33px;height:22px;">
<image class style="width:100%;height:100%" src="../../assets/images/xmf.svg" mode="aspectFit|aspectFill|widthFix" lazy-load="false"></image>
</view>
<view class="f12 pl4 pr4" style="color:#646572" hover-class="none" hover-stop-propagation="false">{{item.supplierName || '-'}}</view>
</view>
<view class="fse" hover-class="none" hover-stop-propagation="false">
<!-- <view class="ml8" wx:for="{{4}}" style="background:pink;width:18px;height:18px" hover-class="none" hover-stop-propagation="false"></view> -->
</view>
</view>
<!-- <view class="pt8 pb8 pl10 pr10 fsa cusFlexStart">
<view class="br2 fss" style="background: #f1faff;" wx:for="{{item.labelGroup}}" wx:key="itm" wx:for-item="itm">
<view class="f12 pl4 pr4" style="color:#646572" hover-class="none" hover-stop-propagation="false">

17
custom-tab-bar/index.js
Unescape Escape View File

@ -15,10 +15,10 @@ Component({
index: 0,
},
{
iconPath: "../assets/images/tabbar/unit_active.svg",
selectedIconPath: "../assets/images/tabbar/unit.svg",
pagePath: "/pages/workBench/index",
text: "工作台",
"iconPath": "../assets/images/tabbar/order_active.svg",
"selectedIconPath": "../assets/images/tabbar/order.svg",
"pagePath": "/pages/myBill/index",
"text": "工单",
index: 1,
},
{
@ -29,12 +29,13 @@ Component({
index: 2,
},
{
"iconPath": "../assets/images/tabbar/order_active.svg",
"selectedIconPath": "../assets/images/tabbar/order.svg",
"pagePath": "/pages/myBill/index",
"text": "工单",
iconPath: "../assets/images/tabbar/unit_active.svg",
selectedIconPath: "../assets/images/tabbar/unit.svg",
pagePath: "/pages/workBench/index",
text: "工作台",
index: 3,
},
{
iconPath: "../assets/images/tabbar/user_active.svg",

11
pages/city/index.wxml
Unescape Escape View File

@ -1,11 +1,11 @@
<view class="navigatorBar" hover-class="none" style="padding-top:{{statusBarHeight + ((navigationBarHeight - menuButtonHeight) / 2)}}px" hover-stop-propagation="false">
<view class="iconfont icon-xiangzuo poa fw500 f18" bindtap="goBack" style="top:{{statusBarHeight + ((navigationBarHeight - menuButtonHeight) / 2)}}px;left:12px" hover-class="none" hover-stop-propagation="false"></view>
<view class="tabs display-flex" style="width:128px;text-align:center;margin-top:{{}}">
<view class="tarbar" style bindtap="choosenTop" data-id="1">
<view class="tarbarText f16 {{toped == '1'?'active':''}}">城市</view>
<view class="tabs display-flex" style="width:128px;text-align:center;height:{{menuButtonHeight}}px">
<view class="tarbar {{toped == '1'?'active':''}}" style bindtap="choosenTop" data-id="1">
城市
</view>
<view class="tarbar ml12" bindtap="choosenTop" data-id="2">
<view class="tarbarText f16 {{toped == '2'?'active':''}}">省份</view>
<view class="tarbar ml12 {{toped == '2'?'active':''}}" bindtap="choosenTop" data-id="2">
省份
</view>
</view>
</view>
@ -70,7 +70,6 @@
</block>
</view>
</scroll-view>
<scroll-view class="letter-list" enhanced="true" catchtouchstart="handlerAlphaTap" bindtouchmove="touchMove" catchtouchend="touchEnd">
<!-- {{toView == 'top' ?'rlhc':'' }}" -->
<view class="letter {{toView == 'top' ?'rlhc':'' }}" bindtap="goTop" hover-class="rlhc">

120
pages/city/index.wxss
Unescape Escape View File

@ -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;
}
}

6
pages/detail/index.js
Unescape Escape View File

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

14
pages/detail/index.wxml
Unescape Escape View File

@ -126,9 +126,9 @@
{{jobDetail.record.monthlyPay ? '丨' + jobDetail.record.monthlyPay : '--'}}
</view>
</view>
<view wx:if="{{corpUserFlag}}" data-content="{{jobDetail.record.jobName+'@'+jobDetail.record.supplier.supplierName}}" catchtap="getJobName">
<!-- <icon class="iconfont icon-fuzhi mr4" style="font-size:16px;float: right;"></icon> -->
<span class="f14 c6 biggerSize">复制</span>
<view wx:if="{{corpUserFlag}}" class="fss ysd-base-color" data-content="{{jobDetail.record.jobName+'@'+jobDetail.record.supplier.supplierName}}" catchtap="getJobName">
<view class="iconfont icon-fuzhi mr4" style=""></view>
<span class="f14 biggerSize">复制</span>
</view>
</view>
</view>
@ -260,12 +260,12 @@
<view class="textb1">{{jobDetail.record.interviewDuration}}</view>
</view>
<!-- <view class="display-flex">
<view class="rb1">面试地点</view>
<view class="textb1">{{jobDetail.record.interviewAddr}}</view>
<view class="rb1">面试地点</view>
<view class="textb1">{{jobDetail.record.interviewAddr}}</view>
</view>-->
<!-- <view class="display-flex">
<view class="rb1">驻场信息</view>
<view class="textb1">{{jobDetail.record.onSiteInfo}}</view>
<view class="rb1">驻场信息</view>
<view class="textb1">{{jobDetail.record.onSiteInfo}}</view>
</view>-->
<view class="display-flex">
<view class="rb1">出行方式</view>

37
pages/firstBill/index.js
Unescape Escape View File

@ -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);
},
});

15
pages/firstBill/index.wxml
Unescape Escape View File

@ -13,7 +13,7 @@
<view class="weui-search-bar__box" id="searchInput" style="overflow:hidden">
<view class="fss g_flex_1" hover-class="none" hover-stop-propagation="false" style="position: relative;">
<i class="iconfont icon-sousuo11 mr4"></i>
<view style="position: absolute;left: 18px;top: 0;width: 90%;" wx:if="{{isSwiper}}">
<view style="position: absolute;left: 18px;top: 0;width: 90%;" wx:if="{{isSwiper && inputVal == ''}}">
<swiper class="c9 f14 ml4" style="height: 40px;width:70px;line-height:42px" bindchange="getSwiperIndex" autoplay circular vertical interval="{{5000}}" duration="{{600}}">
<block wx:for="{{swiperTextList}}" wx:key="index">
<swiper-item catchtouchmove="modalMove">
@ -24,7 +24,7 @@
</view>
<input type="text" value="{{inputVal}}" class="f14" bindinput="inputTyping" bindconfirm="bindconfirm" catchblur placeholder-class="f14" confirm-type="search" style="position: absolute;left: 18px;top: 0;width: 90%;height: 100%;" bindfocus="swiperToggleT" bindblur="swiperToggleF" maxlength="12" />
<view class="iconfont icon-guanbi11 f10 c9 biggerSize" wx:if="{{chaShowed}}" style="color:#333;left: 80%;" catchtap="clearInput"></view>
<view class="iconfont icon-guanbi11 f10 c9 biggerSize" wx:if="{{inputVal}}" style="color:#333;left: 80%;" catchtap="clearInput"></view>
</view>
<view class="search f16 g_flex_none" catchtap="searchKey" style="color: var(--color-ysd);">搜索</view>
</view>
@ -63,9 +63,10 @@
<i class="iconfont icon-jiaobiao f4 {{activez=='zuijin' ?'c3':'c3'}} fst" data-type="gj"></i>
<scroll-view class="gjFixed" wx:if="{{ whichOneShow == 'gj' }}" catchtouchmove="cc">
<view class="bgf tl c3 por filter filterprice sort {{whichOneShow == 'gj' ? 'activeWindow' : ''}}" catchtap style="height:240px">
<view class="f16 fw500 p016 {{activez=='zuigao'?'cf00 b1 ':''}}" data-id="zuigao" bindtap="choiceFilter" style="line-height: 42px" hover-class="thover">工价优先</view>
<view class="f16 fw500 p016 {{activez=='zuigao'?'cf00 b1 ':''}}" data-id="zuigao" bindtap="choiceFilter" style="line-height: 42px" hover-class="thover">按工价</view>
<!-- <view class="f16 fw500 p016 {{activez=='zuijin'?'cf00 b1':''}}" data-id="zuijin" bindtap="choiceFilter" style="line-height: 42px" hover-class="thover">距离优先</view> -->
<view class="f16 fw500 p016 {{activez=='fuwufei'?'cf00 b1':''}}" data-id="fuwufei" bindtap="choiceFilter" style="line-height: 42px" hover-class="thover">佣金优先</view>
<view wx:if="{{choiceCollect == '1'}}" class="f16 fw500 p016 {{activez=='fuwufei'?'cf00 b1':''}}" data-id="fuwufei" bindtap="choiceFilter" style="line-height: 42px" hover-class="thover">按佣金</view>
<view class="f16 fw500 p016 {{activez=='shijian'?'cf00 b1':''}}" data-id="shijian" bindtap="choiceFilter" style="line-height: 42px" hover-class="thover">按时间</view>
</view>
</scroll-view>
</view>
@ -135,12 +136,12 @@
<span wx:for="{{filterData.sex}}" catchtap="setActive" wx:key="index" data-type="sex" data-id="{{item.id}}" style="margin-right:{{index == filterData.sex.length - 1? '0':''}}" class="{{item.active ? 'active':''}}" hover-class="none" hover-stop-propagation="false">{{item.name}}</span>
</view>
</view>
<view class="sub" id="class" hover-class="none" hover-stop-propagation="false">
<!-- <view class="sub" id="class" hover-class="none" hover-stop-propagation="false">
<view class="title">分类</view>
<view class="content">
<span wx:for="{{filterData.classifyList}}" catchtap="setActive" wx:key="index" data-type="classifyList" data-id="{{item.id}}" class="{{item.active ? 'active':''}}" hover-class="none" hover-stop-propagation="false">{{item.name}}</span>
</view>
</view>
</view> -->
<view class="sub" id="xzfl" hover-class="none" hover-stop-propagation="false">
<view class="title">薪资福利</view>
<view class="content">
@ -148,7 +149,7 @@
</view>
</view>
<view class="sub" id="ssbz" hover-class="none" hover-stop-propagation="false">
<view class="title">宿舍保障</view>
<view class="title">吃饭住宿</view>
<view class="content">
<span wx:for="{{filterData.jobFilter.tagArray3}}" catchtap="setActive" wx:key="index" data-type="jobFilter" data-arr="tagArray3" data-id="{{item.id}}" class="{{item.active ? 'active':''}}" hover-class="none" hover-stop-propagation="false">{{item.name}}</span>
</view>

6
pages/listSharePage/index.js
Unescape Escape View File

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

6
pages/listSharePage/index.wxml
Unescape Escape View File

@ -355,7 +355,7 @@
<image class="mr4" style="width:20px;height:20px;display:block" src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/fee.svg" mode="aspecFill" lazy-load="false"></image>
</view>
<view class style="font-size:13px" wx:if="{{!isLogin}}" hover-class="none" hover-stop-propagation="false">登录查看</view>
<view class style="font-size:13px" wx:else hover-class="none" hover-stop-propagation="false">{{agencyStatus == 1 ? (item.fuWuFei ? item.fuWuFei : '-') : '仅代理可见'}}</view>
<view class style="font-size:13px" wx:else hover-class="none" hover-stop-propagation="false">{{agencyStatus == 1 ? (item.fuWuFei ? item.fuWuFei : '详询客服') : '仅代理可见'}}</view>
</view>
</view>
</view>
@ -369,7 +369,7 @@
</view>
</view>
<block wx:if="{{(recordList == null || recordList.length == 0) && (storeJobListSearchForm.keys != null && storeJobListSearchForm.keys != '')}}">
<view class="tc p20 f12 c045">没有符合条件的职位</view>
<view class="tc p20 f12 c045"></view>
</block>
<block wx:else>
<block wx:if="{{isLogin}}">
@ -380,7 +380,7 @@
</view>
<view wx:if="{{(recordList == null || recordList.length == 0) && pageShow}}" class="tc">
<view class="t-icon t-icon-zanwu" style="width: 80px; height: 80px; margin: 50% auto 20px"></view>
<view class="tc f14 c045">暂无记录</view>
<view class="tc f14 c045">没有符合条件的职位</view>
</view>
</view>
</view>

2
pages/listSharePage/index.wxss
Unescape Escape View File

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

9
pages/mine/index.wxml
Unescape Escape View File

@ -400,14 +400,7 @@
</view>
</view>
</navigator>
<navigator class hover-class style="margin-bottom: 200px;" target url="{{isLogin? '/pages/merchantManagement/index': '/pages/login/index'}}">
<view class="br_8 centerSet" hover-class="none" style="background-color:#fff;height:56px;" hover-stop-propagation="false">
<view class="centerSet" style hover-class="none" hover-stop-propagation="false">
<view class="iconfont icon-shangjiahoutai mr6" hover-class="none" hover-stop-propagation="false"></view>
<view class="fw500" hover-class="none" hover-stop-propagation="false">商家管理</view>
</view>
</view>
</navigator>
<!-- <view class="login" wx:if="{{!isLogin}}">
<navigator class="" target="" url="../login/index" hover-class="none" open-type="navigate">
<button class="loginBtn" style="font-weight:400;margin-top:0px;" type="primary" role="button" bindtap=''>登录</button>

5
pages/mine/index.wxss
Unescape Escape View File

@ -354,12 +354,7 @@ page {
bottom: -5px;
transform: translateX(-50%);
}
.centerSet {
display: flex;
justify-content: center;
align-items: center;
}
.wodezhiwei{
display: flex;
background-color: #fff;

2
pages/myBill/index.js
Unescape Escape View File

@ -130,7 +130,7 @@ Page({
if (typeof this.getTabBar === "function" && this.getTabBar()) {
this.getTabBar().setData({
isShow: true,
selected: 3,
selected: 1,
});
}
if (wx.getStorageSync('MYBILL_PAGE_CHANGE') || that.data.inputVal != "搜索姓名/手机号") {

2
pages/wodeBill/index.wxml
Unescape Escape View File

@ -55,7 +55,7 @@
<view class="vsb" style="flex:1" hover-class="none" hover-stop-propagation="false">
<view class="fsa" hover-class="none" style hover-stop-propagation="false">
<view class="mb4 oelps" style="font-weight:bold;max-width:250px" hover-class="none" hover-stop-propagation="false">{{item.title}}</view>
<view class="f14 fw500 ysd-base-color mb4" hover-class="none" hover-stop-propagation="false">
<view class="f14 fw500 ysd-base-f40 mb4" hover-class="none" hover-stop-propagation="false">
{{(item.totalSalaryDot)}}元
<!-- <text style wx:if="{{!item.isInt}}">{{'.' + item.totalSalaryDot}}</text> -->
</view>

10
pages/wodeBillDetail/index.js
Unescape Escape View File

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

12
pages/wodeBillDetail/index.wxml
Unescape Escape View File

@ -57,7 +57,7 @@
</button> -->
<view class="c6">
税后金额（元）
<view class="f28 ysd-base-color fw500">
<view class="f28 ysd-base-f40 fw500">
{{(factoryBill.totalSalaryStr)}}
<text wx:if="{{!factoryBill.isInt}}">{{'.' + factoryBill.totalSalaryDot}}</text>
</view>
@ -82,7 +82,7 @@
<view class>
<!-- 不是待确认时候显示的列表 -->
<block wx:if="{{recordList != null && recordList.length > 0 && currIndex != 1}}">
<view class="billList" hover-class="none" hover-stop-propagation="false">
<view class="billList mt20" hover-class="none" hover-stop-propagation="false">
<view class="display-flex bgf fsa " hover-class="hcb" style="{{idx == 0 ? 'border-top:1px solid #eee;' : ''}} border-bottom:1px solid #eee;padding:16px 12px;" wx:for="{{recordList}}" wx:for-item="item" wx:for-index="idx" wx:key="idx" data-id="{{item.id}}" data-name="{{item.companyName}}" bindtap="goDetail">
<view class>
<view class="pb4 fw500" style>{{item.userName || '-'}}</view>
@ -100,7 +100,7 @@
</view>
<view class="tar display-flex">
<view class="vsb">
<view class="f16 pb4 ysd-base-color fw500">
<view class="f16 pb4 ysd-base-f40 fw500">
{{(item.salaryDot)}}元
<!-- <text wx:if="{{!item.isInt}}">{{ '.' + item.salaryDot}}</text> -->
</view>
@ -117,7 +117,7 @@
</block>
<!-- 待核对时候显示的列表 -->
<block wx:if="{{currIndex == 1}}">
<view class="billList" hover-class="none" hover-stop-propagation="false">
<view class="billList mt20" hover-class="none" hover-stop-propagation="false">
<view class="display-flex bgf fsa " hover-class="hcb" style="{{idx == 0 ? 'border-top:1px solid #eee;' : ''}}border-bottom:1px solid #eee;padding:16px 12px;" wx:for="{{recordList}}" wx:for-item="item" wx:for-index="idx" wx:key="idx" data-id="{{item.id}}" data-name="{{item.companyName}}" bindtap="goDetail">
<view class="fsa">
<view class wx:if="{{item.status == 10}}">
@ -132,7 +132,7 @@
</view>
<view class="tar display-flex">
<view class="vsb">
<view class="f16 pb4 ysd-base-color fw500">
<view class="f16 pb4 ysd-base-f40 fw500">
{{item.salaryDot}}元
<!-- <text wx:if="{{!item.isInt}}">{{'.' + item.salaryDot}}</text> -->
</view>
@ -166,7 +166,7 @@
<view class selectable="false" space="false" decode="false">全选</view>
<view class="ml24 f18" selectable="false" space="false" decode="false">
合计：
<text class="ysd-base-color" selectable="false" space="false" decode="false" style="font-weight:601;font-size:18px;line-height:16px">{{selectTotalSalary + '元'}}</text>
<text class="ysd-base-f40" selectable="false" space="false" decode="false" style="font-weight:601;font-size:18px;line-height:16px">{{selectTotalSalary + '元'}}</text>
</view>
</view>
<view aria-role="button" class="weui-btn weui-btn_primary" bindtap="confirmBill">核对无误</view>

2
pages/wodeBillDetail/index.wxss
Unescape Escape View File

@ -17,7 +17,7 @@ page {
margin-left: -36px;
}
.totalPriceInfoContainer {
padding: 10px 10px 0 10px;
padding: 0px 10px 0 10px;
}
.totalPriceInfo {
position: relative;

2
pages/workBench/index.js
Unescape Escape View File

@ -34,7 +34,7 @@ Page({
if (typeof this.getTabBar === "function" && this.getTabBar()) {
this.getTabBar().setData({
isShow: true,
selected: 1,
selected: 3,
});
}

69
pages/workBench/index.wxml
Unescape Escape View File

@ -141,40 +141,34 @@
</view>
</view>-->
<!-- 统计 -->
<view class="balanceBox bgcf"
wx:if="{{(userInfo.user.agencyRole == 1 || userInfo.user.agencyRole == 2 || userInfo.hasBill) && configInfo.bill}}"
style="width:calc(100% - 20px);margin:10px auto 0;overflow:hidden;border-radius:8px !important;"
>
<view class="balanceBox bgcf" wx:if="{{(userInfo.user.agencyRole == 1 || userInfo.user.agencyRole == 2 || userInfo.hasBill) && configInfo.bill}}" style="width:calc(100% - 20px);margin:10px auto 0;overflow:hidden;border-radius:8px !important;">
<view class="userbalance br_8" style="display:flex;">
<navigator url="../wodeBill/index?state=20" hover-class="thover" class="br1">
<navigator url="../wodeBill/index?state=20" style="padding-bottom:12px !important" hover-class="thover" class="br1">
<view class="balanceinfo f14" style="width:100%;">
<view class="c3 mb12" style="line-height:1">待结算（元）</view>
<view class hover-class="none" hover-stop-propagation="false"></view>
</view>
<view class="ysd-base-f40 fw500 f26" style="line-height:1">{{map.billStatus20Salary || '0'}}</view>
<view class="ysd-base-f40 fw500 f20" style="line-height:1">{{map.billStatus20Salary || '0'}}</view>
</navigator>
<navigator url="../wodeBill/index?state=30" hover-class="thover">
<navigator url="../wodeBill/index?state=30" style="padding-bottom:12px !important" hover-class="thover">
<view class="balanceinfo f14" style="width:100%;">
<view class="c3 mb12" style="line-height:1">累计结算（元）</view>
<view class hover-class="none" hover-stop-propagation="false"></view>
</view>
<view class="c3 fw500 f26" style="line-height:1">{{map.billStatus30Salary}}</view>
<view class="c3 fw500 f20" style="line-height:1">{{map.billStatus30Salary}}</view>
</navigator>
</view>
<navigator url="../wodeBill/index?state=10" hover-class="thover" class="myaBill bt1">
<view class="fw500">待核对</view>
<view class="f14">
<span wx:if="{{map.billStatus10Num}}" class="f12 ysd-basebg-color ml4 mr4" style="border-radius:10px;padding:0px 4.5px;color:#fff;line-height:16px">{{ map.billStatus10Num }}</span>
<view class="f14 fse">
<view wx:if="{{map.billStatus10Num}}" class="f12 ml4 mr4 tac" style="min-width:16px; border-radius:20px;padding:1px 1px;color:#fff;line-height:16px;background-color:red">{{ map.billStatus10Num }}</view>
<p wx:else class="f14 mr8 c9">暂无待核对账单</p>
<i class="iconfont icon-gengduo11"></i>
</view>
</navigator>
</view>
<!-- 今日数据 -->
<view class="bgf br8 container bgcf mt10"
style="width:calc(100% - 20px);margin:10px auto 0;padding:0;overflow:hidden;border-radius:8px !important;"
wx:if="{{configInfo.record}}"
>
<view class="bgf br8 container bgcf mt10" style="width:calc(100% - 20px);margin:10px auto 0;padding:0;overflow:hidden;border-radius:8px !important;" wx:if="{{configInfo.record}}">
<view hover-class="thover" class="pl16 pr10 fsa" style="line-height:44px;" bindtap="toTodayData">
<view class="f16 c3 fwb fl wdgd">今日数据</view>
<view class="iconfont icon-gengduo11 c9 f12"></view>
@ -242,23 +236,26 @@
</view>
</view>
</view>
<navigator class="mt32 ml12 mr12" hover-class style="margin-bottom: 200px;" target url="{{isLogin? '/pages/merchantManagement/index': '/pages/login/index'}}">
<view class="centerSet br_8" hover-class="none" style="background-color:#fff;height:56px;" hover-stop-propagation="false">
<view class="centerSet" style hover-class="none" hover-stop-propagation="false">
<view class="iconfont icon-shangjiahoutai mr6" hover-class="none" hover-stop-propagation="false"></view>
<view class="fw500" hover-class="none" hover-stop-propagation="false">商家管理</view>
</view>
</view>
</navigator>
<view class="p010 mt10 friendBar" wx:if="{{false}}">
<view class="bgf br8 container">
<navigator url="../friendHelper/index?status=1" class='sub' hover-class="none">
<navigator url="../friendHelper/index?status=1" class="sub" hover-class="none">
<view class="t-icon t-icon-pengyouquanzhushou" style="width:24px;height:24px"></view>
<view class="f12">朋友圈助手</view>
</navigator>
<navigator url="../bocaiTV/index" class='sub' hover-class="none">
<navigator url="../bocaiTV/index" class="sub" hover-class="none">
<view class="t-icon t-icon-zhaogongtv" style="width:24px;height:24px"></view>
<view class="f12">伯才TV</view>
</navigator>
<view class="sub" hover-class="none" hover-stop-propagation="false">
</view>
<view class="sub" hover-class="none" hover-stop-propagation="false">
</view>
<view class="sub" hover-class="none" hover-stop-propagation="false"></view>
<view class="sub" hover-class="none" hover-stop-propagation="false"></view>
</view>
</view>
<view class="p010 mt10" wx:if="{{false}}">
@ -354,20 +351,22 @@
</view>
<view aria-role="dialog" aria-modal="true" catchtouchmove="modalMove" class="fadeIn" wx:if="{{iosDialog}}">
<view class="weui-mask"></view>
<view class="weui-dialog contact" style="box-sizing:border-box;">
<view class="weui-dialog__hd">
<i class="iconfont icon-guanbi guanbi c6 biggerSize" bindtap="closeDialog"></i>
<view class="f16 c3 fw500 mb32">加客户经理微信</view>
<view wx:if="{{isLoading}}" class style="position:absolute;left:50%;top:50%;transform:translate(-50%,-50%)" hover-class="none" hover-stop-propagation="false">
<view aria-role="img" aria-label="加载中" style class="weui-primary-loading">
<view class="weui-primary-loading__dot"></view>
<view class="weui-mask"></view>
<view class="weui-dialog contact" style="box-sizing:border-box;">
<view class="weui-dialog__hd">
<i class="iconfont icon-guanbi guanbi c6 biggerSize" bindtap="closeDialog"></i>
<view class="f18 c3 fw500 mb24">联系项目经理</view>
<view class="f14 c9 pl32 pr32 mb32" style="text-align:left;text-indent:28px" hover-class="none" hover-stop-propagation="false">目前平台的自助发布职位功能暂未全面开放，若您有发布职位的需求，烦请添加项目经理微信。</view>
<view wx:if="{{isLoading}}" class style="position:absolute;left:50%;top:50%;transform:translate(-50%,-50%)" hover-class="none" hover-stop-propagation="false">
<view aria-role="img" aria-label="加载中" style class="weui-primary-loading">
<view class="weui-primary-loading__dot"></view>
</view>
<view class hover-class="none" hover-stop-propagation="false">加载中...</view>
</view>
<view class hover-class="none" hover-stop-propagation="false">加载中...</view>
<!-- serviceInfo.qrCode -->
<image src="{{'https://matripe.oss-cn-beijing.aliyuncs.com/namecard/yzy-gzlw.png'}}" bindload="imageLoad" show-menu-by-longpress="{{true}}" style="width: 184px;height: 184px;"></image>
<view class="f14 c3 mt6">长按识别二维码</view>
</view>
<image src="{{serviceInfo.qrCode}}" bindload="imageLoad" show-menu-by-longpress="{{true}}" style="width: 184px;height: 184px;"></image>
<view class="f14 c3 mt6">长按识别二维码</view>
</view>
</view>
</view>
</view>

348
pages/workBench/index.wxss
Unescape Escape View File

@ -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;
}
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;
}

7
project.private.config.json
Unescape Escape View File

@ -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",

4
utils/commonUtil.js
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save