diff --git a/assets/images/apply.png b/assets/images/apply.png
index 9cb5781..bc45b17 100644
Binary files a/assets/images/apply.png and b/assets/images/apply.png differ
diff --git a/assets/images/apply1.png b/assets/images/apply1.png
index 2358b2b..a99c6ed 100644
Binary files a/assets/images/apply1.png and b/assets/images/apply1.png differ
diff --git a/pages/IDCardWithNFC/index.wxml b/pages/IDCardWithNFC/index.wxml
index fcf2798..584f793 100644
--- a/pages/IDCardWithNFC/index.wxml
+++ b/pages/IDCardWithNFC/index.wxml
@@ -1,6 +1,6 @@
跳过
- 欢迎来到伯才伯才
+ 欢迎来到伯才
为了更准确地为您推荐职位,请选择
身份信息录入方式
diff --git a/pages/billDetail/index.js b/pages/billDetail/index.js
index f95bc38..9bec074 100644
--- a/pages/billDetail/index.js
+++ b/pages/billDetail/index.js
@@ -543,8 +543,9 @@ Page({
});
console.log(data.serveRecords);
let userinfo = data.applyOrder;
- if (app.isNotEmptyCheck(userinfo.agencyReturnFeeType) || userinfo.agencyReturnFeeType == "0" || userinfo.agencyReturnFee == "0") {
- userinfo.fuWuFei = commonUtil.getReturnFeeTypeName1ById(userinfo.agencyReturnFeeType, userinfo.agencyReturnFee / 100)
+ console.log('userinfo.orderType',userinfo);
+ if (app.isNotEmptyCheck(userinfo.agencyReturnFeeType) || userinfo.agencyReturnFeeType == "0" || userinfo.agencyReturnFee == "0" || app.isNotEmptyCheck(userinfo.returnFee)) {
+ userinfo.fuWuFei = userinfo.orderType != 3 ? commonUtil.getReturnFeeTypeName1ById(userinfo.agencyReturnFeeType, userinfo.agencyReturnFee / 100) : commonUtil.getReturnFeeTypeName1ById(userinfo.returnFeeType, userinfo.returnFee / 100)
}
else {
diff --git a/pages/billDetail/index.wxml b/pages/billDetail/index.wxml
index 2259f3c..7cca00d 100644
--- a/pages/billDetail/index.wxml
+++ b/pages/billDetail/index.wxml
@@ -19,7 +19,7 @@
-
+
参与统计
@@ -199,12 +199,12 @@
服务费
- {{userinfo.fuWuFei ? userinfo.fuWuFei:'-'}}
+ {{userinfo.fuWuFei || '-'}}
服务费详情
-
- {{userinfo.agencyReturnFeeDesp ? userinfo.agencyReturnFeeDesp:'-'}}
+
+ {{userinfo.orderType != 3 ? userinfo.agencyReturnFeeDesp : userinfo.returnFeeDesp}}
@@ -212,10 +212,9 @@
政策模式
{{userinfo.zhengceTextShow ? userinfo.zhengceTextShow:'-'}}
-->
-
+
政策模式
-
{{userinfo.zhengceTextShow ||'请选择政策'}}
@@ -238,11 +237,11 @@
{{userinfo.storeJobName?userinfo.storeJobName:'-'}}
-
+
报名企业
{{userinfo.storeName?userinfo.storeName:'-'}}
-
+
项目方
{{userinfo.upAgencyName?userinfo.upAgencyName:'-'}}
@@ -287,7 +286,8 @@
- 驻场信息
+
+ 驻场信息
复制
@@ -349,7 +349,8 @@
- {{item.desp}}详情
+ {{item.desp}}
+ 详情
diff --git a/pages/detail/index.json b/pages/detail/index.json
index 4f25b71..3528ba6 100644
--- a/pages/detail/index.json
+++ b/pages/detail/index.json
@@ -2,8 +2,8 @@
"usingComponents": {
"bottom-drawer": "../../components/bottom-drawer/index"
},
- "navigationBarBackgroundColor":"#1890ff",
- "navigationBarTextStyle" :"white",
+ "navigationBarBackgroundColor":"#fff",
+ "navigationBarTextStyle" :"black",
"navigationBarTitleText": "",
"backgroundColor": "#fff"
diff --git a/pages/detail/index.wxml b/pages/detail/index.wxml
index 4a502f7..29252c3 100644
--- a/pages/detail/index.wxml
+++ b/pages/detail/index.wxml
@@ -3,7 +3,7 @@
-
@@ -355,7 +355,7 @@
复制
- {{jobDetail.record.jobDesp1}}
+ {{jobDetail.record.jobDesp1}}
-
+
-
+
+
+
+
+
+
+ 收藏
@@ -409,24 +415,33 @@
客服
-->
-
+
-
-
-
-
-
-
-
-
-
+ -->
+
+
+
+
+
+ 客服
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -509,7 +524,7 @@
-
+
diff --git a/pages/detail/index.wxss b/pages/detail/index.wxss
index 752521a..4a23bfc 100644
--- a/pages/detail/index.wxss
+++ b/pages/detail/index.wxss
@@ -176,10 +176,13 @@ button::after {
margin-left: 0px;
}
.bottomBtn .flex-1 {
- width: 55px;
+ flex: 1;
+}
+.bottomBtn .flex-2 {
+ flex: 2;
}
.bottomBtn .flex-3 {
- flex: 1;
+ flex: 3;
}
button.detailBtn {
width: 100% !important;
@@ -194,7 +197,7 @@ button.detailBtn {
border-radius: 21px;
}
.detailBtn1 {
- width: 93% !important;
+ /* width: 93% !important; */
padding: 6px 0;
font-size: 16px;
font-weight: bold !important;
@@ -206,6 +209,7 @@ button.detailBtn {
background: #fff;
border: 1px solid var(--color-ysd);
border-radius: 21px;
+ box-sizing: border-box;
}
.bottomBox {
padding-bottom: 32px;
diff --git a/pages/detail_old/index.wxss b/pages/detail_old/index.wxss
index 2a67112..16a3b31 100644
--- a/pages/detail_old/index.wxss
+++ b/pages/detail_old/index.wxss
@@ -309,9 +309,6 @@ button.collectBtn {
line-height: 16px;
margin-top: 2px;
}
-.flex-3 {
- flex: 3;
-}
.noShow {
position: absolute;
top: -9999px;
diff --git a/pages/firstBill/index.json b/pages/firstBill/index.json
index 5adde71..68e3859 100644
--- a/pages/firstBill/index.json
+++ b/pages/firstBill/index.json
@@ -6,7 +6,7 @@
"job-sub": "../../components/job-sub/index"
},
"navigationBarTitleText": "伯才供应链",
- "navigationBarBackgroundColor": "#1890ff",
- "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#fff",
+ "navigationBarTextStyle": "black",
"backgroundColor": "#f5f5f5"
}
\ No newline at end of file
diff --git a/pages/firstBill/index.wxml b/pages/firstBill/index.wxml
index 749629d..9741c77 100644
--- a/pages/firstBill/index.wxml
+++ b/pages/firstBill/index.wxml
@@ -4,7 +4,32 @@
-->
-
+
+
+
+
+ {{searchCityParamStorage.name == '' ? '全国' : searchCityParamStorage.shortName}}
+
+
+
+
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
-
-
- {{searchCityParamStorage.name == '' ? '全国' : searchCityParamStorage.shortName}}
-
-
-
-
-
-
-
-
- {{item}}
-
-
-
-
-
-
- 搜索
-
-
-
-
-
@@ -176,7 +177,7 @@
附近
- 最近更新
+ 最新
diff --git a/pages/messageDetail/index.wxml b/pages/messageDetail/index.wxml
index 6ec3565..92bc685 100644
--- a/pages/messageDetail/index.wxml
+++ b/pages/messageDetail/index.wxml
@@ -1,7 +1,7 @@
- 伯才伯才欢迎您
+ 伯才欢迎您
- 伯才伯才(以下简称“伯才”),让天下没有难做的劳务。
+ 伯才(以下简称“伯才”),让天下没有难做的劳务。
伯才秉承“资源共享、伙伴共赢”的理念,为合作伙伴提供海量项目内容分发及流量分佣。在伯才,您可以享受项目查看、老乡报名、面试跟踪、财务结算等一站式服务,省时、省心、省力。
如果您还现在不是伯才的合作代理,您可以在此
@@ -11,7 +11,7 @@
感谢您的支持与合作!
- 伯才伯才运营中心
+ 伯才运营中心
2023年6月16日
diff --git a/pages/mine/index.json b/pages/mine/index.json
index c63875d..7a109c9 100644
--- a/pages/mine/index.json
+++ b/pages/mine/index.json
@@ -3,7 +3,7 @@
"bottom-drawer": "../../components/bottom-drawer/index"
},
"navigationBarTitleText": "我的",
- "navigationBarBackgroundColor": "#1890ff",
- "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#fff",
+ "navigationBarTextStyle": "black",
"backgroundColor": "#f5f5f5"
}
\ No newline at end of file
diff --git a/pages/myBill/index.wxss b/pages/myBill/index.wxss
index 462aa33..5bb6be4 100644
--- a/pages/myBill/index.wxss
+++ b/pages/myBill/index.wxss
@@ -159,7 +159,7 @@ page {
z-index: 999;
}
.weui-tabs-bar__item {
- margin: 0 8px;
+ margin: 0 ;
}
.weui-tabs {
@@ -192,7 +192,7 @@ page {
}
.weui-tabs-bar__title {
- margin: 0px 10px;
+ margin: 0px 8px;
}
.tab-bar-title__selected {
diff --git a/pages/setting/index.wxml b/pages/setting/index.wxml
index 59420ed..1b9c0f8 100644
--- a/pages/setting/index.wxml
+++ b/pages/setting/index.wxml
@@ -28,7 +28,7 @@
- 关于伯才伯才
+ 关于伯才
版本{{version}}
diff --git a/pages/versionPage/index.wxml b/pages/versionPage/index.wxml
index 1ef46dd..2ecf59a 100644
--- a/pages/versionPage/index.wxml
+++ b/pages/versionPage/index.wxml
@@ -1,6 +1,6 @@
-
+
伯才
Version {{version}}