diff --git a/App.vue b/App.vue
index 92c33e5..79df2d0 100644
--- a/App.vue
+++ b/App.vue
@@ -22,11 +22,11 @@ export default {
// themeColor: "#00B666",
// themeBackgroundColor: "#00B66621",
- // themeColor: "#fea702",
- // themeBackgroundColor: "#fea70221",
+ themeColor: "#fea702",
+ themeBackgroundColor: "#fea70221",
- themeColor: "#2FC67D",
- themeBackgroundColor: "#2FC67D21",
+ // themeColor: "#2FC67D",
+ // themeBackgroundColor: "#2FC67D21",
logo: "",
// #ifdef MP-WEIXIN
diff --git a/components/custom-tabbar/custom-tabbar.vue b/components/custom-tabbar/custom-tabbar.vue
index 0ebac04..d19dd9d 100644
--- a/components/custom-tabbar/custom-tabbar.vue
+++ b/components/custom-tabbar/custom-tabbar.vue
@@ -41,7 +41,7 @@ export default {
data() {
return {
currentIndex: 0,
- activeColor: getApp().globalData.themeColor || '#2FC67D',
+ activeColor: getApp().globalData.themeColor || '#fea702',
inactiveColor: '#606266',
watcherTimer: null,
tabList: [
diff --git a/components/list/job.vue b/components/list/job.vue
index ce4fa4a..923e6ff 100644
--- a/components/list/job.vue
+++ b/components/list/job.vue
@@ -124,7 +124,7 @@
>
- 
+
{{ item.newXmf || "-" }}
diff --git a/manifest.json b/manifest.json
index 66f1af8..df30c27 100644
--- a/manifest.json
+++ b/manifest.json
@@ -137,7 +137,7 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
- "appid" : "wxfab5320942daaafa",
+ "appid" : "wx15bc9c758f4eb129",
"setting" : {
"urlCheck" : false,
"es6" : true,
diff --git a/pages.json b/pages.json
index 9477ea8..efe4337 100644
--- a/pages.json
+++ b/pages.json
@@ -859,7 +859,7 @@
"uniIdRouter": {},
"tabBar": {
"color": "#606266",
- "selectedColor": "#2FC67D",
+ "selectedColor": "#fea702",
"borderStyle": "black",
"backgroundColor": "#ffffff",
"custom": true,
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 9fb2ca5..ef69097 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1052,8 +1052,8 @@ export default {
recruitmentValue: item.recruitment == 1 ? true : false,
fuWuFei: that.G.setReturnFee(item.returnFee, item.returnFeeType),
newXmf:uni.getStorageSync('apply-agencyId') == uni.getStorageSync('pgy-agency-id') ?
- (item.agencyId == uni.getStorageSync('apply-agencyId') ? (item.upFullName || item.upAgencyName || item.upProviderName) : item.agencyName) :
- '',
+ (item.agencyId == uni.getStorageSync('apply-agencyId') ? (item.upFullName || item.upAgencyName || item.upProviderName || '金马人力') : (item.agencyName || '金马人力')) :
+ '金马人力',
newadd:that.G.setJobInfoPositionv3(item.storeDistrict || item.storeAddr)
};
});
@@ -1125,8 +1125,8 @@ export default {
priceStr: item.salaryClassify != 7 ? that.G.getSalaryClassifyValue(item.salaryClassify, item.salaryClassifyValue) : "月薪",
gender: that.G.getGenderByMinAge(item),
newXmf:uni.getStorageSync('apply-agencyId') == uni.getStorageSync('pgy-agency-id') ?
- (item.agencyId == uni.getStorageSync('apply-agencyId') ? (item.upFullName || item.upAgencyName || item.upProviderName) : item.agencyName) :
- '',
+ (item.agencyId == uni.getStorageSync('apply-agencyId') ? (item.upFullName || item.upAgencyName || item.upProviderName || '金马人力') : (item.agencyName || '金马人力')) :
+ '金马人力',
newadd:that.G.setJobInfoPositionv3(item.storeDistrict || item.storeAddr)
};
}),
@@ -1146,7 +1146,7 @@ export default {
fuWuFei: that.G.setReturnFee(item.returnFee, item.returnFeeType),
newXmf:uni.getStorageSync('apply-agencyId') == uni.getStorageSync('pgy-agency-id') ?
(item.agencyId == uni.getStorageSync('apply-agencyId') ? (item.upFullName || item.upAgencyName || item.upProviderName) : item.agencyName) :
- '',
+ '金马人力',
newadd:that.G.setJobInfoPositionv3(item.storeDistrict || item.storeAddr)
};
}),
diff --git a/root/components/chatEvent/markdown.vue b/root/components/chatEvent/markdown.vue
index e4bb078..b0af681 100644
--- a/root/components/chatEvent/markdown.vue
+++ b/root/components/chatEvent/markdown.vue
@@ -77,7 +77,7 @@
-
+
{{ item.supplierName || "-" }}
diff --git a/root/detail/job.vue b/root/detail/job.vue
index 875d2f2..5769495 100644
--- a/root/detail/job.vue
+++ b/root/detail/job.vue
@@ -1215,7 +1215,7 @@ export default {
that.jobDetail.logo = that.jobDetail.logo.indexOf("http:") > -1 ? that.jobDetail.logo.replace("http:", "https:") : that.jobDetail.logo;
that.jobDetail.newXmf = uni.getStorageSync('apply-agencyId') == uni.getStorageSync('pgy-agency-id') ?
(res.agencyId == uni.getStorageSync('apply-agencyId') ? (res.upFullName || res.upAgencyName || res.upProviderName) : res.agencyName) :
- '';
+ '金马人力';
diff --git a/root/other/search.vue b/root/other/search.vue
index c7dde62..a3fea3b 100644
--- a/root/other/search.vue
+++ b/root/other/search.vue
@@ -153,7 +153,7 @@ export default {
fuWuFei: that.G.setReturnFee(item.returnFee, item.returnFeeType),
newXmf:uni.getStorageSync('apply-agencyId') == uni.getStorageSync('pgy-agency-id') ?
(item.agencyId == uni.getStorageSync('apply-agencyId') ? (item.upFullName || item.upAgencyName || item.upProviderName) : item.agencyName) :
- '',
+ '金马人力',
};
})
: [];
@@ -171,7 +171,7 @@ export default {
fuWuFei: that.G.setReturnFee(item.returnFee, item.returnFeeType),
newXmf:uni.getStorageSync('apply-agencyId') == uni.getStorageSync('pgy-agency-id') ?
(item.agencyId == uni.getStorageSync('apply-agencyId') ? (item.upFullName || item.upAgencyName || item.upProviderName) : item.agencyName) :
- '',
+ '金马人力',
};
})
: []
diff --git a/uni_modules/rh-ui/components/rh-job-list/rh-job-list.vue b/uni_modules/rh-ui/components/rh-job-list/rh-job-list.vue
index a7bcc78..a607021 100644
--- a/uni_modules/rh-ui/components/rh-job-list/rh-job-list.vue
+++ b/uni_modules/rh-ui/components/rh-job-list/rh-job-list.vue
@@ -74,7 +74,7 @@
-
+
{{ item.upFullName || item.upAgencyName || item.upProviderName || "-" }}