Merge branch 'master' of https://git.nanodreamtech.com/Boss/yizhizan-h5

pages/my/myCompany.vue

@@ -20,7 +20,7 @@
 
 			<!-- 公司名称显示 -->
 			<view class="company-name-section">
-				<view class="company-brand">{{companyInfo.companyName}}</view>
+				<!-- <view class="company-brand">{{companyInfo.companyName}}</view> -->
 				<view class="company-full-name">{{companyInfo.companyAllName}}</view>
 			</view>
 		</view>
@@ -134,9 +134,14 @@
 				uni.showLoading({
 					title: '处理中...'
 				});
-				that.$Request.postJson("/app/company/deleteCompany").then(res => {
+				this.$Request.postJson("/app/company/deleteCompany").then(res => {
 					uni.hideLoading();
 					if (res.code === 0) {
+						setTimeout(()=>{
+							uni.switchTab({
+								url:'/pages/my/index'
+							})
+						},1000)
 						if (this.leaveType === 1) {
 							uni.showToast({
 								title: '已离开公司',

pages/my/onlineResume.vue

@@ -63,7 +63,7 @@
 						</view>
 					</view>
 					<view class="advantage-content">
-						<textarea @blur="setResume" auto-height
+						<textarea @blur="setResume" auto-height placeholder="请输入个人优势"
 							v-model="detail.resumeList&&detail.resumeList.adv"></textarea>
 					</view>
 				</view>

pages/recruitmentData/dataCenter.vue

@@ -14,158 +14,158 @@
           <u-icon name="arrow-down" color="#016BF6" size="16"></u-icon>
         </view> -->
         <picker @change="changeDate" :value="weekIndex" :range="weekList" :range-key="'name'">
-          <view class="filter-btn" >
-            <text class="filter-text">{{weekList.length?weekList[weekIndex].name:'/'}}</text>
+          <view class="filter-btn">
+            <text class="filter-text">{{ weekList.length ? weekList[weekIndex].name : '/' }}</text>
             <u-icon name="arrow-down" color="#016BF6" size="16"></u-icon>
           </view>
-		    </picker>
+        </picker>
         <picker @change="changeZw" :value="zwIndex" :range="zwList" :range-key="'name'">
-			    <view class="filter-btn">
-			    	<text class="filter-text">{{zwList.length?zwList[zwIndex].name:'/'}}</text>
-			    	<u-icon name="arrow-down" color="#016BF6" size="16"></u-icon>
-			    </view>
-		    </picker>
+          <view class="filter-btn">
+            <text class="filter-text">{{ zwList.length ? zwList[zwIndex].name : '/' }}</text>
+            <u-icon name="arrow-down" color="#016BF6" size="16"></u-icon>
+          </view>
+        </picker>
       </view>
     </view>
 
-     <!-- Content Section -->
-     <view class="content-section">
-       <!-- Recruitment Progress Card -->
-       <view class="card-header">
-         <text class="hearder-title">招聘进展</text>
-       </view>
+    <!-- Content Section -->
+    <view class="content-section">
+      <!-- Recruitment Progress Card -->
+      <view class="card-header">
+        <text class="hearder-title">招聘进展</text>
+      </view>
 
-       <!-- New Card -->
-       <view class="data-card">
-         <view class="card-header">
-           <view class="card-title">
-             <view class="card-icon-wrapper">
-               <image src="/static/images/eye.svg" class="card-icon" mode="aspectFit"></image>
-             </view>
-             <text>查看</text>
-           </view>
-         </view>
-         <view class="card-content">
-           <view class="data-row">
-             <view class="data-item">
-               <text class="data-label">我看过</text>
-               <view class="data-value-wrapper">
-                 <text class="data-value">{{dataStatics.iSaw}}</text>
-                 <text class="data-unit">人</text>
-               </view>
-             </view>
-             <view class="data-item">
-               <text class="data-label">看过我</text>
-               <view class="data-value-wrapper">
-                 <text class="data-value">{{dataStatics.sawMe}}</text>
-                 <text class="data-unit">人</text>
-               </view>
-             </view>
-           </view>
-         </view>
-       </view>
+      <!-- New Card -->
+      <view class="data-card">
+        <view class="card-header">
+          <view class="card-title">
+            <view class="card-icon-wrapper">
+              <image src="/static/images/eye.svg" class="card-icon" mode="aspectFit"></image>
+            </view>
+            <text>查看</text>
+          </view>
+        </view>
+        <view class="card-content">
+          <view class="data-row">
+            <view class="data-item">
+              <text class="data-label">我看过</text>
+              <view class="data-value-wrapper">
+                <text class="data-value">{{ dataStatics.iSaw }}</text>
+                <text class="data-unit">人</text>
+              </view>
+            </view>
+            <view class="data-item">
+              <text class="data-label">看过我</text>
+              <view class="data-value-wrapper">
+                <text class="data-value">{{ dataStatics.sawMe }}</text>
+                <text class="data-unit">人</text>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
 
-       <view class="data-card">
-         <view class="card-header">
-           <view class="card-title">
-             <view class="card-icon-wrapper">
-               <image src="/static/images/goutong.svg" class="card-icon" mode="aspectFit"></image>
-             </view>
-             <text>沟通</text>
-           </view>
-         </view>
-         <view class="card-content">
-           <view class="data-row">
-             <view class="data-item">
-               <text class="data-label">我沟通</text>
-               <view class="data-value-wrapper">
-                 <text class="data-value">{{ dataStatics.iCommunicated }}</text>
-                 <text class="data-unit">人</text>
-               </view>
-             </view>
-             <view class="data-item">
-               <text class="data-label">求职者</text>
-               <view class="data-value-wrapper">
-                 <text class="data-value">{{ dataStatics.candidateCommunicated }}</text>
-                 <text class="data-unit">人</text>
-               </view>
-             </view>
-           </view>
-         </view>
-       </view>
+      <view class="data-card">
+        <view class="card-header">
+          <view class="card-title">
+            <view class="card-icon-wrapper">
+              <image src="/static/images/goutong.svg" class="card-icon" mode="aspectFit"></image>
+            </view>
+            <text>沟通</text>
+          </view>
+        </view>
+        <view class="card-content">
+          <view class="data-row">
+            <view class="data-item">
+              <text class="data-label">我沟通</text>
+              <view class="data-value-wrapper">
+                <text class="data-value">{{ dataStatics.iCommunicated }}</text>
+                <text class="data-unit">人</text>
+              </view>
+            </view>
+            <view class="data-item">
+              <text class="data-label">求职者</text>
+              <view class="data-value-wrapper">
+                <text class="data-value">{{ dataStatics.candidateCommunicated }}</text>
+                <text class="data-unit">人</text>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
 
-       <view class="data-card">
-         <view class="card-header">
-           <view class="card-title">
-             <view class="card-icon-wrapper">
-               <image src="/static/images/lianxi.svg" class="card-icon" mode="aspectFit"></image>
-             </view>
-             <text>获取简历联系方式</text>
-           </view>
-         </view>
-         <view class="card-content">
-           <view class="data-row">
-             <view class="data-item">
-               <text class="data-label">合计</text>
-               <view class="data-value-wrapper">
-                 <text class="data-value">{{dataStatics.receivedResumes+dataStatics.exchangedContact}}</text>
-                 <text class="data-unit">人</text>
-               </view>
-             </view>
-             <view class="data-item">
-               <text class="data-label">获取简历</text>
-               <view class="data-value-wrapper">
-                 <text class="data-value">{{dataStatics.receivedResumes}}</text>
-                 <text class="data-unit">人</text>
-               </view>
-             </view>
-             <view class="data-item">
-               <text class="data-label">交换电话/微信</text>
-               <view class="data-value-wrapper">
-                 <text class="data-value">{{dataStatics.exchangedContact}}</text>
-                 <text class="data-unit">人</text>
-               </view>
-             </view>
-             <!-- <view class="data-item">
+      <view class="data-card">
+        <view class="card-header">
+          <view class="card-title">
+            <view class="card-icon-wrapper">
+              <image src="/static/images/lianxi.svg" class="card-icon" mode="aspectFit"></image>
+            </view>
+            <text>获取简历联系方式</text>
+          </view>
+        </view>
+        <view class="card-content">
+          <view class="data-row">
+            <view class="data-item">
+              <text class="data-label">合计</text>
+              <view class="data-value-wrapper">
+                <text class="data-value">{{ dataStatics.receivedResumes + dataStatics.exchangedContact }}</text>
+                <text class="data-unit">人</text>
+              </view>
+            </view>
+            <view class="data-item">
+              <text class="data-label">获取简历</text>
+              <view class="data-value-wrapper">
+                <text class="data-value">{{ dataStatics.receivedResumes }}</text>
+                <text class="data-unit">人</text>
+              </view>
+            </view>
+            <view class="data-item">
+              <text class="data-label">交换电话/微信</text>
+              <view class="data-value-wrapper">
+                <text class="data-value">{{ dataStatics.exchangedContact }}</text>
+                <text class="data-unit">人</text>
+              </view>
+            </view>
+            <!-- <view class="data-item">
                <text class="data-label">交换微信</text>
                <view class="data-value-wrapper">
                  <text class="data-value">2120</text>
                  <text class="data-unit">人</text>
                </view>
              </view> -->
-           </view>
-         </view>
-       </view>
+          </view>
+        </view>
+      </view>
 
-       <view class="data-card">
-         <view class="card-header">
-           <view class="card-title">
-             <view class="card-icon-wrapper">
-               <image src="/static/images/huoqu.svg" class="card-icon" mode="aspectFit"></image>
-             </view>
-             <text>获取简历联系方式</text>
-           </view>
-         </view>
-         <view class="card-content">
-           <view class="data-row">
-             <view class="data-item">
-               <text class="data-label">邀约面试</text>
-               <view class="data-value-wrapper">
-                 <text class="data-value">{{dataStatics.acceptedInterview}}</text>
-                 <text class="data-unit">人</text>
-               </view>
-             </view>
-             <view class="data-item">
-               <text class="data-label">接受面试</text>
-               <view class="data-value-wrapper">
-                 <text class="data-value">{{dataStatics.acceptedInterview}}</text>
-                 <text class="data-unit">人</text>
-               </view>
-             </view>
-           </view>
-         </view>
-       </view>
-     </view>
+      <view class="data-card">
+        <view class="card-header">
+          <view class="card-title">
+            <view class="card-icon-wrapper">
+              <image src="/static/images/huoqu.svg" class="card-icon" mode="aspectFit"></image>
+            </view>
+            <text>获取简历联系方式</text>
+          </view>
+        </view>
+        <view class="card-content">
+          <view class="data-row">
+            <view class="data-item">
+              <text class="data-label">邀约面试</text>
+              <view class="data-value-wrapper">
+                <text class="data-value">{{ dataStatics.acceptedInterview }}</text>
+                <text class="data-unit">人</text>
+              </view>
+            </view>
+            <view class="data-item">
+              <text class="data-label">接受面试</text>
+              <view class="data-value-wrapper">
+                <text class="data-value">{{ dataStatics.acceptedInterview }}</text>
+                <text class="data-unit">人</text>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
   </view>
 </template>
 
@@ -178,74 +178,77 @@ export default {
   },
   data() {
     return {
-      zwList:[],
-      zwIndex:0,
-      weekList:[],
-      weekIndex:0,
-      dataStatics:{}
+      zwList: [],
+      zwIndex: 0,
+      weekList: [],
+      weekIndex: 0,
+      dataStatics: {}
     }
   },
   onLoad() {
     this.getZwList()
-    this.weekList=[]
-    getPrevious8Weeks(new Date()).forEach(it=>{
+    this.weekList = []
+    getPrevious8Weeks(new Date()).forEach(it => {
       // this.weekList.push([
       //   it[0],it[1],it.join('~')
       // ]),
       this.weekList.push({
-        start:it[0],
-        end:it[1],
-        name:it.join('~')
+        start: it[0],
+        end: it[1],
+        name: it.join('~')
       })
     })
   },
   methods: {
-    changeDate(e){
-      this.weekIndex=e.detail.value;
+    changeDate(e) {
+      this.weekIndex = e.detail.value;
       this.getDataStatics()
     },
-    getZwList(){
-	    this.$Request.getT("/app/postPush/getMyPostPush").then(res=>{
-		    res.data.records.forEach(item=>{
-		    	this.zwList.push({
-		    		name:item.ruleClassifyName,
-		    		id:item.postPushId
-		    	})
-		    })
+    getZwList() {
+      this.$Request.getT("/app/postPush/getMyPostPush").then(res => {
+        res.data.records.forEach(item => {
+          this.zwList.push({
+            name: item.ruleClassifyName,
+            id: item.postPushId
+          })
+        })
         this.getDataStatics()
-	    })
-	  },
-    changeZw(e){
-      this.zwIndex=e.detail.value;
+      })
+    },
+    changeZw(e) {
+      this.zwIndex = e.detail.value;
       this.getDataStatics()
     },
-    getDataStatics(){
-		  let data = {
-		  	postPushId:this.zwList[this.zwIndex].id,
-		  	todayStart:this.formatDateRange(new Date(),new Date())[0],
-		  	todayEnd:this.formatDateRange(new Date(),new Date())[1],
-		  }
-		  this.$Request.getT("/app/user/userYesterdayData",data).then(res=>{
-        this.dataStatics=res.data;
-		  })
-	  },
+    getDataStatics() {
+      let [startDate, endDate] = this.weekList[this.weekIndex].name.split('~');
+      let data = {
+        postPushId: this.zwList[this.zwIndex].id,
+        // todayStart:this.formatDateRange(new Date(),new Date())[0],
+        // todayEnd:this.formatDateRange(new Date(),new Date())[1],
+        todayStart: `${startDate} 00:00:00`,
+        todayEnd: `${endDate} 23:59:59`,
+      }
+      this.$Request.getT("/app/user/userYesterdayData", data).then(res => {
+        this.dataStatics = res.data;
+      })
+    },
     formatDateRange(startDate, endDate) {
-	    // 格式化日期为 YYYY-MM-DD 格式
-	    const formatDate = (date) => {
-	        const year = date.getFullYear();
-	        const month = String(date.getMonth() + 1).padStart(2, '0');
-	        const day = String(date.getDate()).padStart(2, '0');
-	        return `${year}-${month}-${day}`;
-	    };
-	    
-	    // 创建开始日期的 00:00:00
-	    const startDateTime = `${formatDate(startDate)} 00:00:00`;
-	    
-	    // 创建结束日期的 23:59:59
-	    const endDateTime = `${formatDate(endDate)} 23:59:59`;
-	    
-	    return [startDateTime, endDateTime];
-	  },
+      // 格式化日期为 YYYY-MM-DD 格式
+      const formatDate = (date) => {
+        const year = date.getFullYear();
+        const month = String(date.getMonth() + 1).padStart(2, '0');
+        const day = String(date.getDate()).padStart(2, '0');
+        return `${year}-${month}-${day}`;
+      };
+
+      // 创建开始日期的 00:00:00
+      const startDateTime = `${formatDate(startDate)} 00:00:00`;
+
+      // 创建结束日期的 23:59:59
+      const endDateTime = `${formatDate(endDate)} 23:59:59`;
+
+      return [startDateTime, endDateTime];
+    },
     goBack() {
       uni.navigateBack()
     },
@@ -266,7 +269,7 @@ export default {
 
 <style lang="scss" scoped>
 .page {
-  background: linear-gradient(180.00deg, rgba(255, 102, 0, 1),rgba(255, 102, 0, 0) 100%);
+  background: linear-gradient(180.00deg, rgba(255, 102, 0, 1), rgba(255, 102, 0, 0) 100%);
   background-size: 100% 35%;
   background-position: center top;
   background-repeat: no-repeat;
@@ -295,13 +298,13 @@ export default {
 }
 
 .filter-text {
-    color: rgba(1, 107, 246, 1);
-    font-family: DM Sans;
-    font-size: 24rpx;
-    font-weight: 400;
-    line-height: 32rpx;
-    letter-spacing: -0.5px;
-    text-align: center;
+  color: rgba(1, 107, 246, 1);
+  font-family: DM Sans;
+  font-size: 24rpx;
+  font-weight: 400;
+  line-height: 32rpx;
+  letter-spacing: -0.5px;
+  text-align: center;
 }
 
 /* Content Section */
@@ -317,98 +320,98 @@ export default {
 .data-card {
   background: rgba(255, 255, 255, 1);
   border-radius: 12rpx;
-  padding: 24rpx; 
+  padding: 24rpx;
   border: 0.5px solid rgba(227, 231, 236, 1);
   margin-top: 24rpx;
 }
 
 .hearder-title {
-    color: rgba(23, 23, 37, 1);
-    font-family: DM Sans;
-    font-size: 28rpx;
-    font-weight: 400;
-    line-height: 44rpx;
-    letter-spacing: 0.5%;
-    text-align: left;
+  color: rgba(23, 23, 37, 1);
+  font-family: DM Sans;
+  font-size: 28rpx;
+  font-weight: 400;
+  line-height: 44rpx;
+  letter-spacing: 0.5%;
+  text-align: left;
 }
 
- .card-title {
-   display: flex;
-   align-items: center;
-   gap: 12rpx;
- }
+.card-title {
+  display: flex;
+  align-items: center;
+  gap: 12rpx;
+}
 
- .card-icon-wrapper {
-   width: 32rpx;
-   height: 32rpx;
-   display: flex;
-   align-items: center;
-   justify-content: center;
- }
+.card-icon-wrapper {
+  width: 32rpx;
+  height: 32rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 
- .card-icon {
-   width: 32rpx;
-   height: 32rpx;
- }
+.card-icon {
+  width: 32rpx;
+  height: 32rpx;
+}
 
- .card-title text {
-    color: rgba(102, 102, 102, 1);
-    font-family: DM Sans;
-    font-size: 24rpx;
-    font-weight: 400;
-    line-height: 32rpx;
-    letter-spacing: 0%;
-    text-align: left;
- }
+.card-title text {
+  color: rgba(102, 102, 102, 1);
+  font-family: DM Sans;
+  font-size: 24rpx;
+  font-weight: 400;
+  line-height: 32rpx;
+  letter-spacing: 0%;
+  text-align: left;
+}
 
- .card-content {
-   margin-top: 12rpx;
- }
+.card-content {
+  margin-top: 12rpx;
+}
 
- .data-row {
-   display: flex;
-   gap: 24rpx;
- }
+.data-row {
+  display: flex;
+  gap: 24rpx;
+}
 
- .data-item {
-//    flex: 1;
-//    display: flex;
-//    flex-direction: column;
-//    align-items: flex-start;
- }
+.data-item {
+  //    flex: 1;
+  //    display: flex;
+  //    flex-direction: column;
+  //    align-items: flex-start;
+}
 
- .data-label {
-    color: rgba(102, 102, 102, 1);
-    font-family: DM Sans;
-    font-size: 24rpx;
-    font-weight: 400;
-    line-height: 32rpx;
-    letter-spacing: 0%;
-    text-align: left;
-   margin-bottom: 12rpx;
- }
+.data-label {
+  color: rgba(102, 102, 102, 1);
+  font-family: DM Sans;
+  font-size: 24rpx;
+  font-weight: 400;
+  line-height: 32rpx;
+  letter-spacing: 0%;
+  text-align: left;
+  margin-bottom: 12rpx;
+}
 
- .data-value-wrapper {
-   display: flex;
-   align-items: baseline;
-   gap: 4rpx;
- }
+.data-value-wrapper {
+  display: flex;
+  align-items: baseline;
+  gap: 4rpx;
+}
 
- .data-value {
-    color: rgba(51, 51, 51, 1);
-    font-family: DM Sans;
-    font-size: 40rpx;
-    font-weight: 400;
-    line-height: 52rpx;
-    letter-spacing: 0%;
-    text-align: left;
- }
+.data-value {
+  color: rgba(51, 51, 51, 1);
+  font-family: DM Sans;
+  font-size: 40rpx;
+  font-weight: 400;
+  line-height: 52rpx;
+  letter-spacing: 0%;
+  text-align: left;
+}
 
- .data-unit {
-   color: rgba(153, 153, 153, 1);
-   font-family: DM Sans;
-   font-size: 24rpx;
-   font-weight: 400;
-   line-height: 32rpx;
- }
+.data-unit {
+  color: rgba(153, 153, 153, 1);
+  font-family: DM Sans;
+  font-size: 24rpx;
+  font-weight: 400;
+  line-height: 32rpx;
+}
 </style>