2

1 year ago · 3088750dac
parent 00d89e8d42
commit 3088750dac
39 changed files with 48 additions and 46 deletions
--- 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) {
--- 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": "首页"
      },
--- 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;
--- a/components/bottom-drawer/index.wxml
+++ b/components/bottom-drawer/index.wxml
@ -109,7 +109,7 @@
          </view>
          <view class="sticky" style="margin-bottom:32px">
            <!-- <view class="f16 poa" style="top:-320px" bindtap="handlerMore">多人报名切换</view>
-          <button class="bgf pt12 pb12 mb16" style="width: 100%; color:#0DCC91" hover-class="thover" bindtap="addPersion">
+          <button class="bgf pt12 pb12 mb16" style="width: 100%; color:#3578f6" hover-class="thover" bindtap="addPersion">
            <i class="iconfont icon-tianjia3 mr8 fw400"></i>选择报名人
            </button>-->

--- 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;
 }
--- a/images/job1.png
+++ b/images/job1.png
--- a/images/nav_company_selected.png
+++ b/images/nav_company_selected.png
--- a/images/nav_my_selected.png
+++ b/images/nav_my_selected.png
--- a/images/xx1.png
+++ b/images/xx1.png
--- a/images/xx12.png
+++ b/images/xx12.png
--- a/images/xx1222.png
+++ b/images/xx1222.png
--- a/images/消息1.png
+++ b/images/消息1.png
--- 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()
  },
  /**
  * 获取企业信息
--- 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": "网点列表"
--- 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": "网点介绍"
--- 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": "职位详情"
--- a/pages/detail/index.wxml
+++ b/pages/detail/index.wxml
@ -72,7 +72,7 @@
        <block wx:if="{{currIndex == '1'}}">
          <view>
            <view class="detailH3">
-              <view class="fl mr12" style="width: 4px;height: 19px;background: #0dcc91;border-radius: 2px;"></view>职位描述
+              <view class="fl mr12" style="width: 4px;height: 19px;background: #3578f6;border-radius: 2px;"></view>职位描述
            </view>
            <view class="pri f16" style="line-height:24px;padding:3px 0px;border-radius: 4px;color:#777;">{{jobDetail.jobInfo}}</view>
          </view>
--- a/pages/empty/index.json
+++ b/pages/empty/index.json
@ -1,6 +1,6 @@
 {
  "navigationBarTitleText": "暂无数据",
-  "navigationBarBackgroundColor": "#0dcc91",
+  "navigationBarBackgroundColor": "#3578f6",
  "navigationBarTextStyle": "white",
  "backgroundColor": "#f5f5f5"
 }
--- 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"
 }
--- 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: "联系我们"}
            ]
          });
        }
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@ -14,7 +14,7 @@
    </form>
  </view> -->
  <view class="navigatorBar" hover-class="none" style="height:{{navigationBarHeight + statusBarHeight}}px;z-index:{{leftShow ? '99':'0'}};box-sizing:border-box" hover-stop-propagation="false">
-    <view class="tabs daotian display-flex fw500" style="width:128px;text-align:center;padding-top:{{statusBarHeight + ((navigationBarHeight - menuButtonHeight) / 2) + 4}}px;margin-top:{{}};font-size:34rpx;letter-spacing: 1px;">一才工作</view>
+    <view class="tabs daotian display-flex fw500" style="width:128px;text-align:center;padding-top:{{statusBarHeight + ((navigationBarHeight - menuButtonHeight) / 2) + 4}}px;margin-top:{{}};font-size:34rpx;letter-spacing: 1px;">人海劳务</view>
  </view>
  <view class="weui-search-bar__form">
    <view class hover-class="none" id="searchInputBox" hover-stop-propagation="false">
--- 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%);
--- a/pages/login/index.json
+++ b/pages/login/index.json
@ -1,5 +1,5 @@
 {
-  "navigationBarBackgroundColor":"#0dcc91",
+  "navigationBarBackgroundColor":"#3578f6",
  "navigationBarTextStyle":"white",
  "backgroundColor": "#FFFFFF",
  "navigationBarTitleText": "登录"
--- a/pages/login/index.wxml
+++ b/pages/login/index.wxml
@ -7,7 +7,7 @@

 <view class="container">
  <view class='tc'>
-    <image src='https://matripe-cms.oss-cn-beijing.aliyuncs.com/pugongying/yicaiLogoBgf913.png' class='logoPng' mode='aspectFit'></image>
+    <image src='https://matripe-cms.oss-cn-beijing.aliyuncs.com/pugongying/renhailaowu.png' class='logoPng' mode='aspectFit'></image>
    <view class='logoTxt'>钱多活少离家近</view>
  </view>
  <view class="loginForm">
--- a/pages/message/index.json
+++ b/pages/message/index.json
@ -1,6 +1,6 @@
 {
  "navigationBarTitleText" : "消息",
-  "navigationBarBackgroundColor": "#0dcc91",
+  "navigationBarBackgroundColor": "#3578f6",
  "backgroundColor": "#f5f5f5",
  "navigationBarTextStyle": "white"
 }
--- a/pages/messageDetail/index.json
+++ b/pages/messageDetail/index.json
@ -1,7 +1,7 @@
 {
  "navigationBarTitleText" : "消息",
  "backgroundColor":"#f5f5f5",
-  "navigationBarBackgroundColor": "#0dcc91",
+  "navigationBarBackgroundColor": "#3578f6",
  "navigationBarTextStyle": "white"

 }
--- a/pages/mine/addressBook/index.wxml
+++ b/pages/mine/addressBook/index.wxml
@ -32,7 +32,7 @@
        </view>
        <view style="height: 1rpx;background-color:#eee;margin: 0 10px;"></view>
        <view class style="padding:16px 10px">
-          <radio value="{{item.id}}" checked="{{item.defaultFlag == 1}}" color="#0dcc91" style="transform: scale(0.7);" />
+          <radio value="{{item.id}}" checked="{{item.defaultFlag == 1}}" color="#3578f6" style="transform: scale(0.7);" />
          <text class="f14 {{item.defaultFlag == 1 ? 'cf00' : 'c9'}}">{{item.defaultFlag == 1 ? '默认' : '设为默认'}}</text>
          <view class="fr f14 c9">
            <navigator url="/pages/mine/addAddress/index?id={{item.id}}" class="dib" hover-class="text-hover">编辑</navigator>
--- 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,
--- a/pages/mine/index.json
+++ b/pages/mine/index.json
@ -1,7 +1,7 @@
 {
  "usingComponents": {},
  "navigationBarTitleText": "我的",
-  "navigationBarBackgroundColor": "#0dcc91",
+  "navigationBarBackgroundColor": "#3578f6",
  "navigationBarTextStyle": "white",
  "backgroundColor": "#f5f5f5"
 }
--- 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": "人海劳务"
 }
--- a/pages/mine/realName1/index.wxml
+++ b/pages/mine/realName1/index.wxml
@ -65,7 +65,7 @@

 <view class="f12 tc c045 mt32">
  <radio-group class="dib">
-    <radio checked="{{switch1Checked}}" catchtap="switch1Change" value="0" class="dib" color="#0dcc91" style="transform:scale(.7);position:relative;top:-2px;" />
+    <radio checked="{{switch1Checked}}" catchtap="switch1Change" value="0" class="dib" color="#3578f6" style="transform:scale(.7);position:relative;top:-2px;" />
  </radio-group>我已阅读并同意
  <navigator url="/pages/serviceTerm/index" class="aLink dib">《服务协议》</navigator>及
  <navigator url="/pages/secret/index" class="aLink dib">《隐私政策》</navigator>
--- a/pages/mine/seeIdCard/index.wxml
+++ b/pages/mine/seeIdCard/index.wxml
@ -9,7 +9,7 @@
    <view class="" hover-class="none" hover-stop-propagation="false">身份证反面</view>
  </view>
  <view class="f12 tc c045  display-flex" style="align-items:center;margin-top:16px;margin-left: 24px;" wx:if="{{!user.idcardImgBack}}">
-    <!-- <switch checked="{{switch1Checked}}" class="dib" color="#0dcc91" style="transform:scale(.5)" bindchange="switch1Change" /> -->
+    <!-- <switch checked="{{switch1Checked}}" class="dib" color="#3578f6" style="transform:scale(.5)" bindchange="switch1Change" /> -->
    <radio-group class="dib">
      <radio checked="{{switch1Checked}}" catchtap="switch1Change" value="0" class="dib" color="var(--color-ysd)" style="transform:scale(.7)" />
    </radio-group>
--- a/pages/mine/vitae/index.wxml
+++ b/pages/mine/vitae/index.wxml
@ -6,7 +6,7 @@
      </view>
    <view class="f14 ml8 c045  tar pr10">
      <radio-group class="dib">
-        <radio checked="{{switch1Checked}}" catchtap="switch1Change" value="0" class="dib" color="#0dcc91" style="transform:scale(.7);position:relative;top:-2px;" />
+        <radio checked="{{switch1Checked}}" catchtap="switch1Change" value="0" class="dib" color="#3578f6" style="transform:scale(.7);position:relative;top:-2px;" />
      </radio-group>默认报名人
      <!-- <navigator url="/pages/serviceTerm/index" class="aLink dib">《服务协议》</navigator>及
      <navigator url="/pages/secret/index" class="aLink dib">《隐私政策》</navigator> -->
--- a/pages/mine/vitaeList/index.wxml
+++ b/pages/mine/vitaeList/index.wxml
@ -20,7 +20,7 @@
      </view>
    </view>
  </view>
-  <button class="ml12 bgf pt12 pb12" style="width: 100%; color:#0DCC91" hover-class="thover" bindtap="addPersion">
+  <button class="ml12 bgf pt12 pb12" style="width: 100%; color:#3578f6" hover-class="thover" bindtap="addPersion">
    <i class="iconfont icon-tianjia3 mr8 fw400"></i>新增报名人
  </button>
  <view class="bgf pt16 fixBottom" wx:if="{{type == 'add'}}">
--- a/pages/newEnroll/enroll/index.wxml
+++ b/pages/newEnroll/enroll/index.wxml
@ -281,7 +281,7 @@
    </view> -->
    <view class="f12 ml8 c045 mt12">
      <radio-group class="dib">
-        <radio checked="{{switch1Checked}}" catchtap="switch1Change" value="0" class="dib" color="#0dcc91" style="transform:scale(.7);position:relative;top:-2px;" />
+        <radio checked="{{switch1Checked}}" catchtap="switch1Change" value="0" class="dib" color="#3578f6" style="transform:scale(.7);position:relative;top:-2px;" />
      </radio-group>我已阅读并同意
      <navigator url="../../serviceTerm/index" class="aLink dib">《服务协议》</navigator>及
      <navigator url="../../secret/index" class="aLink dib">《隐私政策》</navigator>
--- a/pages/newEnroll/index.wxml
+++ b/pages/newEnroll/index.wxml
@ -107,7 +107,7 @@
      </view>
    </view>
    <view class="f12 tc c9 ml14 display-flex" style="align-items:center;margin-top:16px;margin-bottom: 80px;">
-      <!-- <switch checked="{{switch1Checked}}" class="dib" color="#0dcc91" style="transform:scale(.5)" bindchange="switch1Change" /> -->
+      <!-- <switch checked="{{switch1Checked}}" class="dib" color="#3578f6" style="transform:scale(.5)" bindchange="switch1Change" /> -->
      <radio-group class="dib">
        <radio checked="{{switch1Checked}}" catchtap="switch1Change" value="0" class="dib" color="#f40" style="transform:scale(.7)" />
      </radio-group>
--- 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": "分类"
--- 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;
 }


--- a/project.config.json
+++ b/project.config.json
@ -44,7 +44,7 @@
    "tabIndent": "insertSpaces",
    "tabSize": 2
  },
-  "appid": "wxb0c590fd696b79be",
+  "appid": "wx57e965905e6b4530",
  "packOptions": {
    "ignore": [],
    "include": []