diff --git a/root/login/index.vue b/root/login/index.vue
index 6f3ff55..4b48810 100644
--- a/root/login/index.vue
+++ b/root/login/index.vue
@@ -17,7 +17,7 @@
diff --git a/root/merchantManagement/inviteFollowSuccess.vue b/root/merchantManagement/inviteFollowSuccess.vue
index ae483b2..43657ca 100644
--- a/root/merchantManagement/inviteFollowSuccess.vue
+++ b/root/merchantManagement/inviteFollowSuccess.vue
@@ -3,10 +3,10 @@
我的公司
@@ -44,6 +44,7 @@
export default {
data() {
return {
+ themeColor: getApp().globalData.themeColor,
ing: false,
agencyNum: 0,
agencyInfo: uni.getStorageSync("agencyInfo"),
diff --git a/root/merchantManagement/jobForm.vue b/root/merchantManagement/jobForm.vue
index 24d796b..a61faf0 100644
--- a/root/merchantManagement/jobForm.vue
+++ b/root/merchantManagement/jobForm.vue
@@ -199,7 +199,7 @@
-
+
位置
@@ -429,17 +429,17 @@
{{ popText }}
-
+
{{ item.text }}
-
+
{{ item.text }}
-
+
{{ item.text }}
@@ -649,6 +649,7 @@ import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
// const G = "./utils/ajax.js";
const G = getCurrentInstance().appContext.app.config.globalProperties.G;
const api = getCurrentInstance().appContext.app.config.globalProperties.api;
+const themeColor = getApp().globalData.themeColor;
let sseTest = ref(null); // sse请求的实例
import { locationList } from "./utils/locationList";
import color from "../../uni_modules/vk-uview-ui/libs/function/color";
diff --git a/root/merchantManagement/merchantManagement.vue b/root/merchantManagement/merchantManagement.vue
index 0f439aa..6d551d7 100644
--- a/root/merchantManagement/merchantManagement.vue
+++ b/root/merchantManagement/merchantManagement.vue
@@ -72,7 +72,8 @@ export default {
? [
{
iconPath: "appstore g_c_9 iconfont ",
- selectedIconPath: "appstore g_c_main iconfont ",
+ selectedIconPath: "appstore iconfont ",
+ selectedIconStyle: `color: ${getApp().globalData.themeColor}`,
// iconPath: this.cdnBaseImg + "home.png",
// selectedIconPath: this.cdnBaseImg + "homeActive0925.png",
text: "工作台",
@@ -83,7 +84,8 @@ export default {
},
{
iconPath: "detail g_c_9 iconfont ",
- selectedIconPath: "detail g_c_main iconfont ",
+ selectedIconPath: "detail iconfont ",
+ selectedIconStyle: `color: ${getApp().globalData.themeColor}`,
// iconPath: this.cdnBaseImg + "bill.png",
// selectedIconPath: this.cdnBaseImg + "billActive0925.png",
text: "职位管理",
@@ -94,7 +96,8 @@ export default {
},
{
iconPath: "solution g_c_9 iconfont ",
- selectedIconPath: "solution g_c_main iconfont ",
+ selectedIconPath: "solution iconfont ",
+ selectedIconStyle: `color: ${getApp().globalData.themeColor}`,
// iconPath: this.cdnBaseImg + "apply.png",
// selectedIconPath: this.cdnBaseImg + "applyActive0925.png",
text: "简历工单",
@@ -114,7 +117,8 @@ export default {
: [
{
iconPath: "icon-appstore g_c_9",
- selectedIconPath: "icon-appstore g_c_main",
+ selectedIconPath: "icon-appstore",
+ selectedIconStyle: `color: ${getApp().globalData.themeColor}`,
// iconPath: this.cdnBaseImg + "home.png",
// selectedIconPath: this.cdnBaseImg + "homeActive0925.png",
text: "工作台",
@@ -124,7 +128,8 @@ export default {
},
{
iconPath: "icon-solution g_c_9",
- selectedIconPath: "icon-solution g_c_main",
+ selectedIconPath: "icon-solution",
+ selectedIconStyle: `color: ${getApp().globalData.themeColor}`,
// iconPath: this.cdnBaseImg + "apply.png",
// selectedIconPath: this.cdnBaseImg + "applyActive0925.png",
text: "简历工单",
diff --git a/root/merchantManagement/todayData.vue b/root/merchantManagement/todayData.vue
index f36d8c8..3188de0 100644
--- a/root/merchantManagement/todayData.vue
+++ b/root/merchantManagement/todayData.vue
@@ -5,12 +5,12 @@