From 814bf1fc5e973346c4d56d7f4d210b1c05189060 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Wed, 22 Jan 2025 17:03:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/detail/index.js               |  2 +-
 pages/detail/index.wxml             |  4 ++--
 pages/merchantManagement/index.wxml |  6 +++---
 pages/mine/index.js                 | 32 ++++++++------------------------
 pages/mine/index.wxml               |  8 ++++----
 pages/myBill/index.json             |  2 +-
 pages/townsMan/index.js             |  8 +++++---
 7 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/pages/detail/index.js b/pages/detail/index.js
index 5184de6..76b6145 100644
--- a/pages/detail/index.js
+++ b/pages/detail/index.js
@@ -1762,7 +1762,7 @@ Page({
   },
   showFee () {
     let that = this
-    if (!this.data.isAgency) return false
+    // if (!this.data.isAgency) return false
     console.log('that.data.bclr', that.data.bclr);
     wx.showModal({
       title: that.data.isAgency ? '佣金: ' + that.data.fuWuFei : '',
diff --git a/pages/detail/index.wxml b/pages/detail/index.wxml
index cda6cde..feef86b 100644
--- a/pages/detail/index.wxml
+++ b/pages/detail/index.wxml
@@ -175,7 +175,7 @@
         <view class="topMenu bt1">
           <view class="onMune {{currIndex == '1' ? 'active ysd-base-color' : ''}}" data-id="1" bindtap="changeMenu">
             <view class="pr dib">
-              基本信息
+              职位详情
               <!-- <view class="menuBorder ysd-basebg-color"></view> -->
             </view>
           </view>
@@ -197,7 +197,7 @@
           <!-- <view class="onMune  {{currIndex == '5' ? 'active ysd-base-color' : ''}}" data-id="5" bindtap="changeMenu" wx:if="{{isAgency}}"> -->
           <view class="onMune {{currIndex == '5' ? 'active ysd-base-color' : ''}}" data-id="5" bindtap="changeMenu">
             <view class="pr dib">
-              职位描述
+              通告分享
               <!-- <view class="menuBorder ysd-basebg-color"></view> -->
             </view>
           </view>
diff --git a/pages/merchantManagement/index.wxml b/pages/merchantManagement/index.wxml
index 19a299e..c0896ee 100644
--- a/pages/merchantManagement/index.wxml
+++ b/pages/merchantManagement/index.wxml
@@ -31,13 +31,13 @@
       <view class="iconfont icon-gengduo11 c9 f14"></view>
     </navigator>
   </view>
-  <navigator class="fsa sub mt12 br8" target url="/pages/configAnnunciate/index" hover-class="thover" open-type="navigate">
+  <!-- <navigator class="fsa sub mt12 br8" target url="/pages/configAnnunciate/index" hover-class="thover" open-type="navigate">
     <view class="fsa" hover-class="none" hover-stop-propagation="false">
-      <!-- <view class="t-icon t-icon-tonggao mr10" style="width:22px;height:22px;background-repeat:no-repeat;background-size:100% 100%" lazy-load="false" binderror bindload></view> -->
+      <view class="t-icon t-icon-tonggao mr10" style="width:22px;height:22px;background-repeat:no-repeat;background-size:100% 100%" lazy-load="false" binderror bindload></view>
       <view>配置通告</view>
     </view>
     <view class hover-class="none" hover-stop-propagation="false">
       <view class="iconfont icon-gengduo11 c9 f14"></view>
     </view>
-  </navigator>
+  </navigator> -->
 </view>
diff --git a/pages/mine/index.js b/pages/mine/index.js
index 90fe702..01099a2 100644
--- a/pages/mine/index.js
+++ b/pages/mine/index.js
@@ -15,7 +15,6 @@ Page({
     // user:app.globalData.user,
     serviceInfo: {},
     map: { num10: "0", num20: "0", num25: "0", num30: "0", num40: "0", num999: "0", user999: "0", user40: "0", user48: "0", user50: "0", billStatus10Salary: "0", billStatus30Salary: "0" },
-    townsMnaNum:{}, // 老乡数量
     motto: "Hello World",
     userInfo: {},
     hasUserInfo: false,
@@ -88,18 +87,20 @@ Page({
   onShow: function () {
     console.log("isshow");
     let that = this;
-    wx.setStorageSync("comeFromPage", "me");
-    if (wx.getStorageSync("configInfo")) {
-      this.setData({
-        configInfo: { ...wx.getStorageSync("configInfo"), biao: false },
-      });
-    }
+
     if (typeof this.getTabBar === "function" && this.getTabBar()) {
       this.getTabBar().setData({
         selected: 3,
         isShow: true
       });
     }
+    wx.setStorageSync("comeFromPage", "me");
+    if (wx.getStorageSync("configInfo")) {
+      this.setData({
+        configInfo: { ...wx.getStorageSync("configInfo"), biao: false },
+      });
+      console.log('configInfo',this.data.configInfo);
+    }
     wx.setStorageSync('BILLFROM', 'mine')
 
     // wx.showTabBar({
@@ -128,7 +129,6 @@ Page({
           corpUserFlag: app.globalData.loginUserInfo.corpUserFlag,
         });
         that.getDataNum();
-        that.getTownsmanDataNum();
       } else {
         // 由于 userLogin 是网络请求，可能会在 Page.onLoad 之后才返回
         // 所以此处加入 callback 以防止这种情况
@@ -388,22 +388,6 @@ Page({
     }
   },
   
-    /**
-   * 获取老乡状态数量
-   *
-   *
-   */
-    getTownsmanDataNum () {
-      let that = this;
-      customRequest("/yishoudan/agency/user/listStatistics", { header: 'headers', method: 'GET', data: {} }).then((res) => {
-        if (res.data.status == 200) {
-          that.setData({
-            townsMnaNum: res.data.data,
-          });
-          console.log('getDataNum',res.data.data);
-        }
-      })
-    },
   /**
    * 获取各个数量
    *
diff --git a/pages/mine/index.wxml b/pages/mine/index.wxml
index 94ff007..a74fa08 100644
--- a/pages/mine/index.wxml
+++ b/pages/mine/index.wxml
@@ -196,7 +196,7 @@
     </view>
   </view>
   <!-- 我的老乡 -->
-  <view class="mt10 mb10 myTownsman">
+  <view class="mt10 mb10 myTownsman" wx:if='{{false}}'>
     <view class="bgf br8 container" style="padding: 0;">
       <navigator class="pl16 pr10 bb1" hover-class="thover" url="{{isLogin? '../townsMan/index?state=0': '/pages/login/index'}}">
         <view class="f16 c3 fwb fl" style="line-height:44px;">我的老乡</view>
@@ -208,11 +208,11 @@
       </navigator>
       <view class="weui-grids">
         <navigator url="{{isLogin ? '../townsMan/index?state=0': '/pages/login/index'}}" class="weui-grid4 br1" hover-class="thover">
-          <view class="f20 c3 fwb">{{townsMnaNum.num0 || '0'}}</view>
+          <view class="f20 c3 fwb">{{map.user0 || '0'}}</view>
           <view class="weui-grid__label c6 f14">全部</view>
         </navigator>
         <navigator url="{{isLogin ? '../townsMan/index?state=40': '/pages/login/index'}}" class="weui-grid4 br1" hover-class="thover">
-          <view class="f20 c3 fwb">{{townsMnaNum.num3 || '0'}}</view>
+          <view class="f20 c3 fwb">{{map.user3 || '0'}}</view>
           <view class="weui-grid__label c6 f14">在职中</view>
         </navigator>
         <!-- <navigator url="{{isLogin ? '../townsMan/index?state=0': '/pages/login/index'}}" class="weui-grid4 br1" wx:if="{{isLogin}}" hover-class="thover">
@@ -220,7 +220,7 @@
           <view class="weui-grid__label c6 f14">准备离职</view>
         </navigator>-->
         <navigator url="{{isLogin ? '../townsMan/index?state=50': '/pages/login/index'}}" class="weui-grid4 br1" wx:if="{{isLogin}}" hover-class="thover">
-          <view class="f20 c3 fwb">{{townsMnaNum.num0 || '0'}}</view>
+          <view class="f20 c3 fwb">{{map.user50 || '0'}}</view>
           <view class="weui-grid__label c6 f14">已离职</view>
         </navigator>
         <!-- <navigator url="{{isLogin ? '../townsMan/index?state=1': '/pages/login/index'}}" class="weui-grid4 br1" hover-class="thover">
diff --git a/pages/myBill/index.json b/pages/myBill/index.json
index 67b3615..911cf4a 100644
--- a/pages/myBill/index.json
+++ b/pages/myBill/index.json
@@ -1,7 +1,7 @@
 {
   "navigationBarBackgroundColor": "#fff",
   "navigationBarTextStyle": "black",
-  "navigationBarTitleText": "工单",
+  "navigationBarTitleText": "报名工单",
   "backgroundColor": "#f5f5f5",
   "usingComponents": {
     "mp-tabs": "@miniprogram-component-plus/tabs"
diff --git a/pages/townsMan/index.js b/pages/townsMan/index.js
index 458c846..4c6c2c0 100644
--- a/pages/townsMan/index.js
+++ b/pages/townsMan/index.js
@@ -165,11 +165,12 @@ Page({
   onLoad: function (options) {
     var that = this;
     //this.getLocation();
-    console.log(options.state);
+    console.log('options.state',options.state);
     this.setData({
       currIndex: options.state,
       // toped: options.state,
     });
+    this.data.searchParam.status = that.data.currIndex;
     that.getList();
 
     // wx.showLoading({
@@ -186,7 +187,7 @@ Page({
     //     this.data.searchParam.status = 48;
     //  }
     console.log(this.data.menuButton);
-    this.data.searchParam.status = that.data.currIndex;
+    console.log('that.data.currIndex',that.data.currIndex);
     // this.data.searchParam.pageNum = 1;
     console.log(this.data.searchParam);
 
@@ -256,7 +257,8 @@ Page({
     });
     that.data.searchParam.keys = that.data.inputVal == "搜索姓名" ? "" : that.data.inputVal;
     that.data.searchParam.binded = that.data.toped;
-    customRequest("/yishoudan/agency/user/list",{header:'headers', method: 'GET', data: that.data.searchParam}).then((res)=>{
+    console.log('that.data.searchParam',that.data.searchParam);
+    customRequest("/yishoudan/agency/user/list",{header:'headers', method: 'POST', data: that.data.searchParam}).then((res)=>{
       if (res.data.status == 200) {
         that.setData({
           isLoading: false,