diff --git a/app.js b/app.js index 0c5e40a..3a06202 100644 --- a/app.js +++ b/app.js @@ -1,4 +1,6 @@ App({ + // wx57e965905e6b4530 一才工作appID + // wx57e965905e6b4530 人海劳务appID globalData: { userInfo: null, // ip: 'https://test.renminshitang.com.cn/daotian/api_dev', @@ -7,21 +9,21 @@ App({ sessionId: "", header: { "content-type": "application/x-www-form-urlencoded", - appId:"wxb0c590fd696b79be", + appId:"wx57e965905e6b4530", "g-open-env":'MP_MINI', Authorization: "", Cookie: "", }, headers2: { "content-type": "multipart/form-data", - appId:"wxb0c590fd696b79be", + appId:"wx57e965905e6b4530", "g-open-env":'MP_MINI', Authorization: "", Cookie: "", }, headers: { "content-type": "application/x-www-form-urlencoded", - appId:"wxb0c590fd696b79be", + appId:"wx57e965905e6b4530", "g-open-env":'MP_MINI', Authorization: "", Cookie: "", @@ -50,7 +52,7 @@ App({ serviceInfo: {}, // 客服电话 version: null, loginKey:'', - appId:'wxb0c590fd696b79be' + appId:'wx57e965905e6b4530' }, // "permission": { // "scope.userLocation": { @@ -67,12 +69,13 @@ App({ console.log(envVersion) if (envVersion === 'develop') { console.log('当前是开发环境'); - that.globalData.ip = 'https://test.renminshitang.com.cn/daotian/api_dev' - that.globalData.agencyId = '2743' + // that.globalData.ip = 'https://test.renminshitang.com.cn/daotian/api_dev' + that.globalData.agencyId = '3087' that.globalData.ip = 'https://daotian.matripe.com.cn' } else if (envVersion === 'trial') { console.log('当前是体验环境'); - that.globalData.ip = "https://test.renminshitang.com.cn/daotian/api_dev" + // that.globalData.ip = "https://test.renminshitang.com.cn/daotian/api_dev" + that.globalData.ip = 'https://daotian.matripe.com.cn' that.globalData.agencyId = '2743' } else if (envVersion === 'release') { console.log('当前是正式环境'); @@ -488,7 +491,7 @@ if (envVersion === 'develop') { title: title, content: content, showCancel: false, - confirmColor: "#0dcc91", + confirmColor: "#3578f6", confirmText: btxt, success: function (res) { if (res.confirm) { diff --git a/app.json b/app.json index 7992b68..5866a17 100644 --- a/app.json +++ b/app.json @@ -72,11 +72,11 @@ "tabBar": { "color": "#666666", "borderStyle": "black", - "selectedColor": "#0dcc91", + "selectedColor": "#3578f6", "list": [ { "iconPath": "./images/nav_home_normal.png", - "selectedIconPath": "./images/nav_home_selected.png", + "selectedIconPath": "./images/job1.png", "pagePath": "pages/index/index", "text": "首页" }, diff --git a/app.wxss b/app.wxss index 4f8e35f..bf02d90 100644 --- a/app.wxss +++ b/app.wxss @@ -4,9 +4,9 @@ page { height: 100vh; background: #f5f5f5; - --color-ysd: #0dcc91; - --color-ysd-bg:#E8FFF8; - --color-hover: #3DD6A7; + --color-ysd: #3578f6; + --color-ysd-bg:#dee3ee; + --color-hover: #5085e7; --color-be: #ff4400; --color-f40: #ff4400; --color-027: #ff4400; diff --git a/components/bottom-drawer/index.wxml b/components/bottom-drawer/index.wxml index 4a96239..7c70e75 100644 --- a/components/bottom-drawer/index.wxml +++ b/components/bottom-drawer/index.wxml @@ -109,7 +109,7 @@ diff --git a/components/bottom-drawer/index.wxss b/components/bottom-drawer/index.wxss index 38179c5..5f3a4e0 100644 --- a/components/bottom-drawer/index.wxss +++ b/components/bottom-drawer/index.wxss @@ -58,7 +58,7 @@ background-color: #eeeeee55; } .sub.subActive { - color: #0dcc91; + color: #3578f6; background-color: #ebfff9; justify-content: space-between; } diff --git a/images/job1.png b/images/job1.png index 640bc2a..e9c888a 100644 Binary files a/images/job1.png and b/images/job1.png differ diff --git a/images/nav_company_selected.png b/images/nav_company_selected.png index f826644..3ebad81 100644 Binary files a/images/nav_company_selected.png and b/images/nav_company_selected.png differ diff --git a/images/nav_my_selected.png b/images/nav_my_selected.png index c9e2f99..a293fed 100644 Binary files a/images/nav_my_selected.png and b/images/nav_my_selected.png differ diff --git a/images/xx1.png b/images/xx1.png index a7496a9..d42bcbd 100644 Binary files a/images/xx1.png and b/images/xx1.png differ diff --git a/images/xx12.png b/images/xx12.png new file mode 100644 index 0000000..a7496a9 Binary files /dev/null and b/images/xx12.png differ diff --git a/images/xx1222.png b/images/xx1222.png new file mode 100644 index 0000000..17ee385 Binary files /dev/null and b/images/xx1222.png differ diff --git a/images/消息1.png b/images/消息1.png deleted file mode 100644 index 4155b87..0000000 Binary files a/images/消息1.png and /dev/null differ diff --git a/pages/company/company/index.js b/pages/company/company/index.js index cef7bd5..cdc0367 100644 --- a/pages/company/company/index.js +++ b/pages/company/company/index.js @@ -16,7 +16,6 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad (options) { - this.getInfo() }, /** @@ -47,7 +46,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow () { - + this.getInfo() }, /** * 获取企业信息 diff --git a/pages/company/company/index.json b/pages/company/company/index.json index 5aeaee6..137ebbc 100644 --- a/pages/company/company/index.json +++ b/pages/company/company/index.json @@ -1,5 +1,5 @@ { - "navigationBarBackgroundColor":"#0dcc91", + "navigationBarBackgroundColor":"#3578f6", "navigationBarTextStyle":"white", "backgroundColor": "#f5f5f5", "navigationBarTitleText": "网点列表" diff --git a/pages/company/companyDetail/index.json b/pages/company/companyDetail/index.json index 30d79c2..eaf06e5 100644 --- a/pages/company/companyDetail/index.json +++ b/pages/company/companyDetail/index.json @@ -1,5 +1,5 @@ { - "navigationBarBackgroundColor":"#0dcc91", + "navigationBarBackgroundColor":"#3578f6", "navigationBarTextStyle":"white", "backgroundColor": "#FFFFFF", "navigationBarTitleText": "网点介绍" diff --git a/pages/detail/index.json b/pages/detail/index.json index aec1eb9..0e650e8 100644 --- a/pages/detail/index.json +++ b/pages/detail/index.json @@ -2,7 +2,7 @@ "usingComponents": { "bottom-drawer": "../../components/bottom-drawer/index" }, - "navigationBarBackgroundColor":"#0dcc91", + "navigationBarBackgroundColor":"#3578f6", "navigationBarTextStyle":"white", "backgroundColor": "#FFFFFF", "navigationBarTitleText": "职位详情" diff --git a/pages/detail/index.wxml b/pages/detail/index.wxml index a2e0552..7e02d8a 100644 --- a/pages/detail/index.wxml +++ b/pages/detail/index.wxml @@ -72,7 +72,7 @@ - 职位描述 + 职位描述 {{jobDetail.jobInfo}} diff --git a/pages/empty/index.json b/pages/empty/index.json index 9a4462a..1e0a2fb 100644 --- a/pages/empty/index.json +++ b/pages/empty/index.json @@ -1,6 +1,6 @@ { "navigationBarTitleText": "暂无数据", - "navigationBarBackgroundColor": "#0dcc91", + "navigationBarBackgroundColor": "#3578f6", "navigationBarTextStyle": "white", "backgroundColor": "#f5f5f5" } \ No newline at end of file diff --git a/pages/hotList/index.json b/pages/hotList/index.json index 5864be7..4a765a3 100644 --- a/pages/hotList/index.json +++ b/pages/hotList/index.json @@ -3,7 +3,7 @@ "bottom-drawer": "../../components/bottom-drawer/index" }, "navigationBarTitleText": "主推/热推", - "navigationBarBackgroundColor": "#0dcc91", + "navigationBarBackgroundColor": "#3578f6", "navigationBarTextStyle": "white", "backgroundColor": "#f5f5f5" } \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index 7f09070..a159871 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -1207,7 +1207,7 @@ Page({ if (res.data.status == 200) { that.setData({ // navList: res.data.data.channels, - navList:[{path: "/subPage/vocationalList/index", img: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/2024-03-14/77694bb5-34e7-4381-8f2c-f4cc1987cf3a_职教职培.png", remark: "职教职培", id: 45, title: "职教职培"},{path: "/pages/tobeAgency/index", img: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/2023-08-31/69997d62-bfd5-4597-8553-b873fb154c40_成为代理.png", remark: "赚取积分", id: 18, title: "赚取积分"},{path: "/pages/xiangmuhezuo/index", img: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/2023-08-31/0a3700d8-61ef-41e7-86f1-3cd1298f54f1_项目合作.png", remark: "推荐有奖", id: 19, title: "推荐有奖"} + navList:[{path: "/subPage/vocationalList/index", img: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/2024-03-14/77694bb5-34e7-4381-8f2c-f4cc1987cf3a_职教职培.png", remark: "职教职培", id: 45, title: "职教职培"},{path: "/pages/tobeAgency/index", img: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/2023-08-31/69997d62-bfd5-4597-8553-b873fb154c40_成为代理.png", remark: "赚取积分", id: 18, title: "赚取积分"},{path: "/pages/xiangmuhezuo/index", img: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/2023-08-31/0a3700d8-61ef-41e7-86f1-3cd1298f54f1_项目合作.png", remark: "推荐有奖", id: 19, title: "推荐有奖"},{path: "/pages/xiangmuhezuo/index", img: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/2023-08-31/ad39756d-f3b5-4cad-8833-537ce84efbbf_联系我们.png", remark: "联系我们", id: 20, title: "联系我们"} ] }); } diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 49d154c..e3f05c1 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -14,7 +14,7 @@ --> - 一才工作 + 人海劳务 diff --git a/pages/index/index.wxss b/pages/index/index.wxss index e35718b..eed4ac9 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -1456,7 +1456,7 @@ button.collect icon::before { background-color: #fff; } .navSub { - width: 20%; + width: 25%; display: flex; flex-direction: column; align-items: center; @@ -1470,11 +1470,11 @@ button.collect icon::before { .navigatorBar { position: relative; z-index: 0; - background-color: #0dcc91; + background-color: #3578f6; } .navigatorBar .tabs { position: relative; - /* background-color: #0dcc91; */ + /* background-color: #3578f6; */ left: 50%; color: #fff; transform: translateX(-50%); diff --git a/pages/login/index.json b/pages/login/index.json index 5475e4e..14076d8 100644 --- a/pages/login/index.json +++ b/pages/login/index.json @@ -1,5 +1,5 @@ { - "navigationBarBackgroundColor":"#0dcc91", + "navigationBarBackgroundColor":"#3578f6", "navigationBarTextStyle":"white", "backgroundColor": "#FFFFFF", "navigationBarTitleText": "登录" diff --git a/pages/login/index.wxml b/pages/login/index.wxml index 273065f..aab3f29 100644 --- a/pages/login/index.wxml +++ b/pages/login/index.wxml @@ -7,7 +7,7 @@ - + 钱多活少离家近 diff --git a/pages/message/index.json b/pages/message/index.json index f072de7..1d9b783 100644 --- a/pages/message/index.json +++ b/pages/message/index.json @@ -1,6 +1,6 @@ { "navigationBarTitleText" : "消息", - "navigationBarBackgroundColor": "#0dcc91", + "navigationBarBackgroundColor": "#3578f6", "backgroundColor": "#f5f5f5", "navigationBarTextStyle": "white" } \ No newline at end of file diff --git a/pages/messageDetail/index.json b/pages/messageDetail/index.json index 1322522..e012e14 100644 --- a/pages/messageDetail/index.json +++ b/pages/messageDetail/index.json @@ -1,7 +1,7 @@ { "navigationBarTitleText" : "消息", "backgroundColor":"#f5f5f5", - "navigationBarBackgroundColor": "#0dcc91", + "navigationBarBackgroundColor": "#3578f6", "navigationBarTextStyle": "white" } \ No newline at end of file diff --git a/pages/mine/addressBook/index.wxml b/pages/mine/addressBook/index.wxml index f70cf4a..c7c288e 100644 --- a/pages/mine/addressBook/index.wxml +++ b/pages/mine/addressBook/index.wxml @@ -32,7 +32,7 @@ - + {{item.defaultFlag == 1 ? '默认' : '设为默认'}} 编辑 diff --git a/pages/mine/addressPage/index.js b/pages/mine/addressPage/index.js index c345982..2b681e4 100644 --- a/pages/mine/addressPage/index.js +++ b/pages/mine/addressPage/index.js @@ -12,7 +12,7 @@ Page({ jobDetail: {}, addressList: { storeAddress: { - color: "#0dcc91", + color: "#3578f6", icon: "icon-qiye", name: "厂区地址", addressName: "无", @@ -65,7 +65,7 @@ Page({ console.log(res); d1 = res.result.formatted_addresses.recommend; that.data.addressList["storeAddress"] = { - color: "#0dcc91", + color: "#3578f6", icon: "icon-qiye", name: "企业地址", addresss: data.store.detailPosition, diff --git a/pages/mine/index.json b/pages/mine/index.json index 194cc91..f8e855b 100644 --- a/pages/mine/index.json +++ b/pages/mine/index.json @@ -1,7 +1,7 @@ { "usingComponents": {}, "navigationBarTitleText": "我的", - "navigationBarBackgroundColor": "#0dcc91", + "navigationBarBackgroundColor": "#3578f6", "navigationBarTextStyle": "white", "backgroundColor": "#f5f5f5" } \ No newline at end of file diff --git a/pages/mine/listManagement/index.json b/pages/mine/listManagement/index.json index fe2eff2..8f810c1 100644 --- a/pages/mine/listManagement/index.json +++ b/pages/mine/listManagement/index.json @@ -3,5 +3,5 @@ "mp-switch": "../../../components/mp-switch/mp-switch" }, "backgroundColor": "#FFFFFF", - "navigationBarTitleText": "一才工作" + "navigationBarTitleText": "人海劳务" } \ No newline at end of file diff --git a/pages/mine/realName1/index.wxml b/pages/mine/realName1/index.wxml index facb389..e6c4039 100644 --- a/pages/mine/realName1/index.wxml +++ b/pages/mine/realName1/index.wxml @@ -65,7 +65,7 @@ - + 我已阅读并同意 《服务协议》及 《隐私政策》 diff --git a/pages/mine/seeIdCard/index.wxml b/pages/mine/seeIdCard/index.wxml index c884e7e..ee5332a 100644 --- a/pages/mine/seeIdCard/index.wxml +++ b/pages/mine/seeIdCard/index.wxml @@ -9,7 +9,7 @@ 身份证反面 - + diff --git a/pages/mine/vitae/index.wxml b/pages/mine/vitae/index.wxml index c99dab2..0174344 100644 --- a/pages/mine/vitae/index.wxml +++ b/pages/mine/vitae/index.wxml @@ -6,7 +6,7 @@ - + 默认报名人 diff --git a/pages/mine/vitaeList/index.wxml b/pages/mine/vitaeList/index.wxml index ae6bde0..3620533 100644 --- a/pages/mine/vitaeList/index.wxml +++ b/pages/mine/vitaeList/index.wxml @@ -20,7 +20,7 @@ - diff --git a/pages/newEnroll/enroll/index.wxml b/pages/newEnroll/enroll/index.wxml index 06a1019..da91559 100644 --- a/pages/newEnroll/enroll/index.wxml +++ b/pages/newEnroll/enroll/index.wxml @@ -281,7 +281,7 @@ --> - + 我已阅读并同意 《服务协议》及 《隐私政策》 diff --git a/pages/newEnroll/index.wxml b/pages/newEnroll/index.wxml index 187c077..720173e 100644 --- a/pages/newEnroll/index.wxml +++ b/pages/newEnroll/index.wxml @@ -107,7 +107,7 @@ - + diff --git a/pages/type/type/index.json b/pages/type/type/index.json index 78323ca..a690b18 100644 --- a/pages/type/type/index.json +++ b/pages/type/type/index.json @@ -2,7 +2,7 @@ "usingComponents": { "bottom-drawer": "../../../components/bottom-drawer/index" }, - "navigationBarBackgroundColor":"#0dcc91", + "navigationBarBackgroundColor":"#3578f6", "navigationBarTextStyle":"white", "backgroundColor": "#FFFFFF", "navigationBarTitleText": "分类" diff --git a/pages/type/type/index.wxss b/pages/type/type/index.wxss index 75172e3..c781a24 100644 --- a/pages/type/type/index.wxss +++ b/pages/type/type/index.wxss @@ -23,7 +23,7 @@ width: 3px; height: 16px; border-radius: 2px; - background-color:#0DCC91; + background-color:#3578f6; } diff --git a/project.config.json b/project.config.json index 160e6f3..f0f7282 100644 --- a/project.config.json +++ b/project.config.json @@ -44,7 +44,7 @@ "tabIndent": "insertSpaces", "tabSize": 2 }, - "appid": "wxb0c590fd696b79be", + "appid": "wx57e965905e6b4530", "packOptions": { "ignore": [], "include": []