同步

app.json

@@ -105,7 +105,6 @@
     }
   ],
   "requiredPrivateInfos": [
-    "getLocation",
     "chooseLocation",
     "chooseAddress"
   ],

app.wxss

@@ -283,29 +283,29 @@ page {
   border: 1px solid #eee;
 }
 .bb1 {
-  border-bottom: 1rpx solid #eee;
+  border-bottom: 1px solid #eee;
 }
 
 .br1 {
-  border-right: 1rpx solid #eee;
+  border-right: 1px solid #eee;
 }
 .bt1 {
-  border-top: 1rpx solid #eee;
+  border-top: 1px solid #eee;
 }
 .bl1 {
-  border-left: 1rpx solid #eee;
+  border-left: 1px solid #eee;
 }
 .bbd1 {
-  border-bottom: 1rpx dotted #eee;
+  border-bottom: 1px dotted #eee;
 }
 .brd1 {
-  border-right: 1rpx dotted #eee;
+  border-right: 1px dotted #eee;
 }
 .btd1 {
-  border-top: 1rpx dotted #eee;
+  border-top: 1px dotted #eee;
 }
 .bld1 {
-  border-left: 1rpx dotted #eee;
+  border-left: 1px dotted #eee;
 }
 .f4 {
   font-size: 4px;
@@ -501,7 +501,7 @@ page {
 }
 
 .lineT {
-  height: 1rpx;
+  height: 1px;
   width: calc(100vw - 40px);
   margin: 0 auto;
   background-color: rgba(0, 0, 0, 0.1);
@@ -701,7 +701,7 @@ button[disabled][type="primary"] {
   height: 50px;
   margin-right: 6px;
   border-radius: 4px;
-  /* border: 1rpx solid #ddd; */
+  /* border: 1px solid #ddd; */
 }
 
 .row-extra.c025 {
@@ -860,8 +860,8 @@ button {
   margin: 0 !important;
 }
 .wx-border-tb {
-  border-top: 1px solid #f3f3f3;
-  border-bottom: 1px solid #f3f3f3;
+  border-top: 1px solid #eee;
+  border-bottom: 1px solid #eee;
 }
 
 .userImg {
@@ -911,13 +911,7 @@ button::after {
   justify-content: center;
 }
 
-.jobTitle {
-  font-size: 22px;
-  font-weight: 601;
-  color: rgba(0, 0, 0, 0.85);
-  line-height: 30px;
-  flex: 1;
-}
+
 
 [data-title*="null"] {
   display: none;
@@ -1026,7 +1020,7 @@ button::after {
   padding-bottom: 16px;
   padding-top: 16px;
   box-sizing: border-box;
-  border-bottom: 1px solid #f3f3f3;
+  border-bottom: 1px solid #eee;
 }
 
 .staticTitle {
@@ -1082,13 +1076,13 @@ button::after {
   color: #787878;
   line-height: 22px;
   margin-bottom: 20px;
-  /* border-bottom: 1rpx solid #e2e2e2; */
+  /* border-bottom: 1px solid #e2e2e2; */
 }
 
 .weui-dialog__bd view {
   /* padding-bottom: 20px; */
 
-  /* border-bottom: 1rpx solid #e2e2e2; */
+  /* border-bottom: 1px solid #e2e2e2; */
 }
 
 .weui-dialog__hd {
@@ -1173,7 +1167,7 @@ button::after {
   white-space: nowrap;
 }
 .servicePrice {
-  border: 1rpx solid var(--color-ysd);
+  border: 1px solid var(--color-ysd);
   background-color: #ffeee7;
   justify-content: space-between;
   border-right-color: transparent;
@@ -1245,7 +1239,7 @@ button::after {
   padding-bottom: 10px;
   margin-bottom: 60px;
   padding-top: 32rpx;
-  border-top: 1px solid #f3f3f3;
+  border-top: 1px solid #eee;
 }
 
 .ui-step.ui-list > view {
@@ -1411,7 +1405,7 @@ button::after {
   padding-bottom: 10px;
   margin-bottom: 60px;
   padding-top: 32rpx;
-  border-top: 1px solid #f3f3f3;
+  border-top: 1px solid #eee;
 }
 
 .ui-step.ui-list > view {
@@ -1481,7 +1475,7 @@ button.newBtn.mbtn-hover {
 .topMenu {
   display: flex;
   padding: 12px 0;
-  border-bottom: 1px solid #f3f3f3;
+  border-bottom: 1px solid #eee;
   background-color: #fff;
 }
 
@@ -1522,14 +1516,14 @@ button.newBtn.mbtn-hover {
   line-height: 18px;
 }
 .loadMore {
-  border-top: 1rpx solid transparent;
-  border-bottom: 1rpx solid transparent;
+  border-top: 1px solid transparent;
+  border-bottom: 1px solid transparent;
   background-color: #fff;
 }
 .loadMore view {
   width: 120px;
   height: 28px;
-  border: 1px solid #f3f3f3;
+  border: 1px solid #eee;
   border-radius: 20px;
   font-size: 14px;
   text-align: center;
@@ -1698,7 +1692,7 @@ page {
 }
 
 .weui-loadmore_line {
-  border-top: 1px solid #f3f3f3;
+  border-top: 1px solid #eee;
 }
 .weui-grid4,
 .weui-grid5 {

components/job-sub/index.wxml

@@ -6,20 +6,21 @@
         <!-- <image style="width: 72px;height: 72px;position: absolute;right: 100px;" src="http://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/weishangxian.svg" wx:if="{{item.state == 0}}"></image> -->
         <view class="display-flex">
           <view class="flex-1 vsb">
-            <view class="display-flex">
+            <view class="fsa">
               <view class="storeName">{{item.jobName || item.aliasName}}</view>
-              <!-- <view class="hourPay">{{item.salaryClassifyValue}}</view> -->
+              <view class="f14s c045">{{item.update}}</view>
             </view>
             <view class="v-center mt8 mb10">
               <view class="f14s c045 flex-1">
                 <view class="overflowOmit mb8 fss">
-                  <view class='oelps mr4' style="max-width:120px">
-                    {{item.storeAddr ?item.storeAddr  : ''}}
+                  <view class='oelps' style="max-width:120px">
+                    {{item.district }}
                   </view>
+                  {{item.district ?'丨' :''}}
                   <block wx:if="{{item.distance != null && item.distance != '' && storeJobListSearchForm.sortTag == 2}}">
                     {{item.distanceKm}}
                   </block>
-                  <block wx:else>{{' | ' + item.age}}</block>
+                  <block wx:else>{{item.genderRestrict + '丨' + item.age}}</block>
                 </view>
                 <scroll-view scroll-x="{{true}}" catchscroll="stoptap" bindtap="stoptap" class="tttg {{item.isTagShow==true ? 'isTagShow':''}}">
                   <!-- <view class="t-icon t-icon-ziying1 " wx:if="{{item.signType == 1}}" style="background-repeat:no-repeat"></view> -->

pages/city/index.js

@@ -147,7 +147,7 @@ Page({
     this.getAllCityLevel2();
     this.getAllProvinceLevel1();
     // that.getProvinceLocation()
-    // that.getLocation()
+    that.getLocation()
   },
   leftMove (e) {
     this.setData({

pages/detail/index.js

@@ -1,5 +1,7 @@
 const app = getApp();
 const commonUtil = require("../../utils/commonUtil");
+const dateUtil = require("../../utils/dateUtil");
+
 const {
   wxml,
   style
@@ -928,6 +930,10 @@ Page({
         //   item.url = item.url.replaceAll('http:','https:')
         // });
         result.record.genderRestrict = commonUtil.getGenderByMinAge(result.record);
+        // 更新时间
+
+        result.record.update = dateUtil.timeShowXXX2(result.record.updateTime);
+
         if (app.isNotEmptyCheck(title)) {
           title = result.record.jobName;
         } else {
@@ -1004,7 +1010,7 @@ Page({
         that.setData({
           jobDetail: result,
           isMaskShow: !(result.record.recruitment == "1"),
-          citys: citys || "-",
+          citys: citys ,
           // addressNew: result.storeDistrict.replace(/,/g, "") + result.store.detailPosition,
         });
         that.data.jobDetail.record["storeName"] = that.data.jobDetail.storeName ? that.data.jobDetail.storeName : that.data.jobDetail.record["storeName"];
@@ -1735,4 +1741,24 @@ Page({
       iosDialogTobe: false,
     });
   },
+  showFee () {
+    let that = this
+    wx.showModal({
+      // title: "确认要转让创建人吗？",
+      content: that.data.jobDetail.record.returnFeeDesp,
+      contentColor: "#ccc",
+      confirmColor: "#1890ff",
+      confirmText: "确定",
+      showCancel: false,
+      success (res) {
+        // console.log(res);
+        // if (res.confirm) {
+        //   wx.navigateTo({
+        //     url: `/pages/sendCreatorCode/index?info=${JSON.stringify(data.data)}`,
+        //   });
+        // }
+
+      },
+    });
+  }
 });

pages/detail/index.json

@@ -5,7 +5,7 @@
   "navigationBarBackgroundColor":"#fff",
   "navigationBarTextStyle" :"black",
   "navigationBarTitleText": "",
-  "backgroundColor": "#fff"
+  "backgroundColor": "#f5f5f5"
 
 
 }

pages/detail/index.wxml

@@ -1,12 +1,8 @@
-<view class="pb180 bt1">
+<view class="pb180">
   <!-- <canvas type="2d" style="position: absolute;left:-2000px; width: 425px; height: 350px; background: #fff;" id="canvasId"></canvas> -->
   <view>
-    <view class="display-flex servicePrice mt12 p14" hover-class="none" hover-stop-propagation="false">
+    <!-- <view class="display-flex servicePrice mt12 p14" hover-class="none" hover-stop-propagation="false" wx:if="{{false}}">
       <view class="left">
-        <!--<view class="display-flex">
-          <icon class="iconfont icon-zhuyi f14 ysd-base-color"></icon>
-          <view class="f14 color666">该区域内容转发后老乡不可见</view>
-        </view>-->
         <view class="price ysd-base-f40">
           服务费：
           <span wx:if="{{!isLogin}}" bindtap="goNewEnroll">仅登录可见</span>
@@ -20,8 +16,41 @@
       <view class="right">
         <icon wx:if="{{isAgency}}" class="iconfont {{isServicePriceShow ? 'icon-zhengyan1' : 'icon-biyan1'}} ysd-base-f40" size="23" color bindtap="toggleprice" data-index="{{isServicePriceShow ? 1 : 2}}" style="height: 18px;  position: relative; top: -10px;"></icon>
       </view>
+    </view>-->
+    <view class="bgf p16 br8">
+      <view class="fsa" hover-class="none" hover-stop-propagation="false">
+        <view class="fss" hover-class="none" hover-stop-propagation="false">
+          <view class="fw500 mr4">代理佣金</view>
+          <icon wx:if="{{isAgency}}" class="iconfont {{isServicePriceShow ? 'icon-zhengyan1' : 'icon-biyan1'}} ysd-base-f40 f22" color bindtap="toggleprice" data-index="{{isServicePriceShow ? 1 : 2}}"></icon>
+        </view>
+        <view class="fse" bindtap="showFee" hover-class="none" hover-stop-propagation="false">
+          <span class wx:if="{{isServicePriceShow}}">{{fuWuFei || '--'}}</span>
+          <span class wx:else>***</span>
+          <view class="iconfont icon-you f14 c045 ml4" hover-class="none" hover-stop-propagation="false"></view>
+        </view>
       </view>
+      <view wx:if="{{!isAgency}}" class>
+        <view class="display-flex">
+          <view class="f16" style="width:100px">佣金:</view>
+          <view class>
+            <span wx:if="{{!isLogin}}" bindtap="goNewEnroll">仅登录可见</span>
+            <span wx:elif="{{!isAgency}}" bindtap="showTobe">仅代理可见</span>
+            <span wx:else>
+              <span class wx:if="{{isServicePriceShow}}">{{fuWuFei || '--'}}</span>
+              <span class wx:else>***</span>
+            </span>
           </view>
+        </view>
+        <view class="fss">
+          <view class="f16" style="width:100px">佣金详情:</view>
+          <view class="flex-1" style="min-height:32px" wx:if="{{isServicePriceShow}}">{{jobDetail.record.returnFeeDesp}}</view>
+          <span class wx:else>***</span>
+        </view>
+      </view>
+      <!-- <view wx:elif="{{!isLogin}}" class bindtap="goNewEnroll" hover-class="none" hover-stop-propagation="false">仅登录可见</view>
+      <view wx:else class bindtap="showTobe" hover-class="none" hover-stop-propagation="false">仅代理可见</view>-->
+    </view>
+    <view class="bgf mt10 br8 pb20" hover-class="none" hover-stop-propagation="false">
       <view class="p20 pb10" style="padding-top:10px" id="tocanvas">
         <view class="v-center">
           <view class="jobTitle">
@@ -31,19 +60,16 @@
           <i class="iconfont icon-zhuanfa f20" style="color: #999;"></i>
             </button>-->
           </view>
+          <view class="f14 c045" hover-class="none" hover-stop-propagation="false">{{jobDetail.record.update}}</view>
         </view>
-    <view class="display-flex mt12 mb8">
-      <view class="display-flex flex-1">
-        <!-- <view>
-          <image class="tImage" wx:if="{{jobDetail.store.logo != null && jobDetail.store.logo != ''}}" mode="aspectFit" src="{{jobDetail.store.logo}}"></image>
-          <image class="tImage" wx:else mode="aspectFit" src="https://matripe.oss-cn-beijing.aliyuncs.com/default.png"></image>
-        </view>-->
-        <view class="flex-1 vsb">
-          <view class="f14s c045">
+        <view class="mb8">
+          <view class="fss c045">
+            <view class="f14s oelps" style="max-width:50%">
               <!-- 深圳丨龙岗区丨16-35岁 -->
               {{citys}}
               <!-- {{jobDetail.store.distance}} -->
             </view>
+            {{citys ? '丨' :''}}
             <view class="f14s c045">
               <!-- 深圳丨龙岗区丨16-35岁 -->
               <block>{{jobDetail.record.genderRestrict}}</block>
@@ -52,66 +78,65 @@
             </view>
           </view>
         </view>
-      <view class="tr">
-        <view class="jobMoney ysd-base-f40">
+        <view class="tabBox pb4">
+          <!-- <view wx:if="{{jobDetail.record.rebate != null}}" class='tagsLi spli'>
+            返费{{jobDetail.record.rebate}}
+          </view>-->
+          <view class="display-flex" hover-class="none" hover-stop-propagation="false">
+            <!-- <view class="t-icon t-icon-ziying1" wx:if="{{jobDetail.storeProjectSignType == 1}}"></view> -->
+            <view class="tagsLi" style="color:{{labelColor[index % labelColor.length]}};background-color:{{bgColor[index % bgColor.length]}};" wx:for="{{jobDetail.record.jobRequestLabelNames}}" wx:for-item="item1" wx:key="index">{{item1}}</view>
+          </view>
+          <view class="pr10 pt4 pb4 fsa cusFlexStart">
+            <view class="br2 fss" style="background: #f1faff;" wx:for="{{item.labelGroup}}" wx:key="itm" wx:for-item="itm">
+              <view class="f12 pl4 pr4" style="color:#646572" hover-class="none" hover-stop-propagation="false">{{itm || '-'}}</view>
+            </view>
+            <view class="f12 pl4 pr4" style="background: #f1faff;" wx:if="{{item.labelGroup.length <= 0}}">暂无特色</view>
+          </view>
+          <view class="fss">
+            <view class="jobMoney ysd-base-f40 mr12">
               <!-- {{jobDetail.record.combiSalary}} -->
               <view class="hourPay" wx:if="{{jobDetail.record.salaryClassify == 0}}">
                 <span class="f14">￥</span>
-            <span class="f18">{{jobDetail.record.hourlyPay}}</span>
+                <span class="f20">{{jobDetail.record.hourlyPay}}</span>
                 <span class="f14">/时</span>
               </view>
               <view class="hourPay" wx:if="{{jobDetail.record.salaryClassify == 1}}">
                 <span class="f14">￥</span>
-            <span class="f18">{{jobDetail.record.hourlyPay}}</span>
+                <span class="f20">{{jobDetail.record.hourlyPay}}</span>
                 <span class="f14">/天</span>
               </view>
               <view class="hourPay" wx:if="{{jobDetail.record.salaryClassify == 2}}">
                 <span class="f14">￥</span>
-            <span class="f18">{{jobDetail.record.hourlyPay}}</span>
-            <span class="f12">补</span>
+                <span class="f20">{{jobDetail.record.hourlyPay}}</span>
+                <span class="f14">补</span>
               </view>
               <view class="hourPay" wx:if="{{jobDetail.record.salaryClassify == 3}}">
                 <span class="f14">￥</span>
-            <span class="f18">{{jobDetail.record.hourlyPay}}</span>
-            <span class="f12">返</span>
+                <span class="f20">{{jobDetail.record.hourlyPay}}</span>
+                <span class="f14">返</span>
               </view>
               <view class="hourPay" wx:if="{{jobDetail.record.salaryClassify == 4}}">计件</view>
               <view class="hourPay" wx:if="{{jobDetail.record.salaryClassify == 5}}">
                 <span class="f14">￥</span>
-            <span class="f18">{{jobDetail.record.hourlyPay}}</span>
-            <span class="f12">保底</span>
+                <span class="f20">{{jobDetail.record.hourlyPay}}</span>
+                <span class="f14">保底</span>
               </view>
               <view class="hourPay" wx:if="{{jobDetail.record.salaryClassify == 6}}">面议</view>
               <view class="hourPay" wx:if="{{jobDetail.record.salaryClassify == 7}}">
                 <span class="f14">￥</span>
-            <span class="f18">{{jobDetail.record.monthlyPay}}</span>
-            <span class="f12">/月</span>
+                <span class="f20">{{jobDetail.record.monthlyPay}}</span>
+                <span class="f14">/月</span>
               </view>
               <!-- {{jobDetail.record.hourlyPay || '--'}} -->
             </view>
-        <view class="f14s c633 mt10 ysd-base-f40">
+            <view class="f14s c045">
               <!-- 5200-8400 -->
               {{jobDetail.record.monthlyPay || '--'}}
             </view>
           </view>
         </view>
-    <view class="bb1 tabBox pb4">
-      <!-- <view wx:if="{{jobDetail.record.rebate != null}}" class='tagsLi spli'>
-            返费{{jobDetail.record.rebate}}
-      </view>-->
-      <view class="display-flex" hover-class="none" hover-stop-propagation="false">
-        <!-- <view class="t-icon t-icon-ziying1" wx:if="{{jobDetail.storeProjectSignType == 1}}"></view> -->
-        <view class="tagsLi" style="color:{{labelColor[index % labelColor.length]}};background-color:{{bgColor[index % bgColor.length]}};" wx:for="{{jobDetail.record.jobRequestLabelNames}}" wx:for-item="item1" wx:key="index">{{item1}}</view>
       </view>
-    </view>
-    <view class="pr10 pt4 pb4 fsa cusFlexStart">
-      <view class="br2 fss" style="background: #f1faff;" wx:for="{{item.labelGroup}}" wx:key="itm" wx:for-item="itm">
-        <view class="f12 pl4 pr4" style="color:#646572" hover-class="none" hover-stop-propagation="false">{{itm || '-'}}</view>
-      </view>
-      <view class="f12 pl4 pr4" style="background: #f1faff;" wx:if="{{item.labelGroup.length <= 0}}">暂无特色</view>
-    </view>
-  </view>
-  <view class="mg020 pb8 bb1 v-center" bindtap="toMapChoice" data-address="{{jobDetail}}">
+      <view class="mg020 pb8 pt8 bb1 bt1 v-center" bindtap="toMapChoice" data-address="{{jobDetail}}" wx:if="{{jobDetail.record.storeLat}}">
         <view>
           <i class="iconfont icon-dizhi11 f18 mr4" style="color:#027AFF;"></i>
         </view>
@@ -165,12 +190,11 @@
           报名须知
         </view>
           </view>-->
-      <view class="onMune {{currIndex == '4' ? 'active ysd-base-color' : ''}}" data-id="4" bindtap="changeMenu">
+          <!-- <view class="onMune {{currIndex == '4' ? 'active ysd-base-color' : ''}}" data-id="4" bindtap="changeMenu">
         <view class="pr dib">
           财务结算
-          <!-- <view class="menuBorder ysd-basebg-color"></view> -->
-        </view>
         </view>
+          </view>-->
           <!-- <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">
@@ -374,6 +398,8 @@
         </view>-->
       </view>
     </view>
+  </view>
+</view>
 <view class="bottomBtn" style="padding-bottom:{{pbtm}}px">
   <view class="norecruit" wx:if="{{isMaskShow}}">该职位暂时停招</view>
   <view class="fsa tc bottomBox">

pages/detail/index.wxss

@@ -2,7 +2,10 @@
 page,
 .pb180 {
   padding-bottom: 180px;
-  background-color: #fff;
+  background-color: #f5f5f5;
+}
+page{
+  padding: 16px;
 }
 .p14 {
   padding: 14px;
@@ -13,6 +16,13 @@ page,
 .pb10 {
   padding-bottom: 10px;
 }
+.jobTitle {
+  font-size: 20px;
+  font-weight: 601;
+  color: rgba(0, 0, 0, 0.85);
+  line-height: 30px;
+  flex: 1;
+}
 .desp-copy {
   color: #1890ff;
   font-size: 12px;

utils/commonUtil.js

@@ -1,3 +1,4 @@
+import dateUtil from './dateUtil.js' 
 /**
  * 如果是null '' 'null' 'undefined'
  * @param item
@@ -1168,7 +1169,7 @@ export function setJobInfoPosition (pos) {
     }
   });
   citys = citys.join(",").replace(/,/g, " | ");
-  return citys || "-";
+  return citys ;
 }
 /* 
   处理详情地址
@@ -1278,6 +1279,11 @@ export function disposeJobListData (recordList) {
     // console.log(item.salaryClassify, '=============', item.salaryClassifyValue);
     item["salaryClassifyValueHaibao"] = getSalaryClassifyValue1(item.salaryClassify, item.salaryClassifyValue);
     item["salaryClassifyValue"] = getSalaryClassifyValue(item.salaryClassify, item.salaryClassifyValue);
+    // x天前更新
+    item["update"] = dateUtil.timeShowXXX2(item.updateTime);
+    console.log('item["update"]',item["update"]);
+    item.genderRestrict = getGenderByMinAge(item);
+
     // //时薪
     // var hourlyPayStr = '';
     // var hasHourlyPay = false;
@@ -1319,9 +1325,9 @@ export function disposeJobListData (recordList) {
     // }
     item["monthlyPay"] = monthlyPayStr;
     //地址深圳丨龙岗区丨
-    let citys = setJobListInfoPosition(item.district);
+    let citys = setJobInfoPosition(item.storeDistrict);
 
-    // console.log(citys);
+    console.log('citys',citys);
     var districtStr = "";
     if (isNotEmptyCheck(item.district)) {
       var districtArr = item.district.split(",");

utils/dateUtil.js

@@ -786,24 +786,44 @@ function timeShow(val) {
 
 	return hour;
 }
-
+function timeShowXXX2(val) {
+  const now = Date.now();
+  const diff = now - val;
+
+  const seconds = Math.floor(diff / 1000);
+  const minutes = Math.floor(seconds / 60);
+  const hours = Math.floor(minutes / 60);
+  const days = Math.floor(hours / 24);
+
+  if (days < 2) {
+      if (hours > 0) {
+          return `${hours}小时前`;
+      } else if (minutes > 0) {
+          return `${minutes}分钟前`;
+      } else {
+          return `${seconds}秒前`;
+      }
+  } else {
+      return `${days}天前`;
+  }
+}
 function timeShowXXX(val) {
 	if (isEmptyCheck(val)) {
 		return "";
 	}
 	let date = "";
 	let differenceTime = new Date().getTime() - new Date(val).getTime();
-	var D = Math.floor(differenceTime / (24 * 60 * 60 * 1000));
-	var level1 = differenceTime % (24 * 3600 * 1000);
-	var H = Math.floor(level1 / (3600 * 1000));
+	var D = Math.floor(differenceTime / (48 * 60 * 60 * 1000));
+	var level1 = differenceTime % (48 * 3600 * 1000);
+	var H = Math.floor(level1 / ( 48 * 3600 * 1000));
 	var level2 = level1 % (3600 * 1000);
 	var M = Math.floor(level2 / (60 * 1000));
 	var level3 = level2 % (60 * 1000);
 	var S = Math.floor(level3 / 1000);
 	date = null;
-	if (D > 0 && D <= 100) {
+	if (D > 1 && D <= 100) {
 		date = D + "天前";
-	} else if (D > 0) {
+	} else if (D > 1) {
 		let date1 = new Date(val);
 		var y = date1.getFullYear();
 		var m = date1.getMonth() + 1;
@@ -962,4 +982,5 @@ module.exports = {
 	getUserApplyOrderTypeByType,
 	splitRemark,
 	timeShow,
+  timeShowXXX2
 };