8.2

app.js

@@ -3,8 +3,8 @@ import { formatTime, arrRemoveObj, getTypeItem } from './utils/util'
 import * as socketApi from './utils/websocket'
 import { onSubscribeAppBack,openSubscribeMiniApp } from 'dingtalk-service-window-libs/lib/openSubscribeMiniApp'
 
-const baseUrl = "https://test-ding.g107.com/";//测试
-// const baseUrl = "https://app55493.eapps.dingtalkcloud.com/";//正式
+// const baseUrl = "https://test-ding.g107.com/";//测试
+const baseUrl = "https://app55493.eapps.dingtalkcloud.com/";//正式
 var that;
 var yearArr = [];
 var year = formatTime(new Date()).year;
@@ -15,8 +15,8 @@ App({
   //自定义全局变量
   globalData: {
     baseUrl:baseUrl,
-    webScoketUrl: "test-ding.g107.com",//webScoket测试
-    // webScoketUrl: "app55493.eapps.dingtalkcloud.com",//webScoket正式
+    // webScoketUrl: "test-ding.g107.com",//webScoket测试
+    webScoketUrl: "app55493.eapps.dingtalkcloud.com",//webScoket正式
     showToast: showToast,//提示框
     arrRemoveObj: arrRemoveObj,//删除数组的某一项
     year: formatTime(new Date()).year,//当前年

pages/deploy/webView/webView.js

@@ -9,16 +9,16 @@ Page({
     that = this;
     if(e.index){
       let index=e.index;
-      console.log(e)
-      let url='https://www.yuque.com/docs/share/a5803b46-cffd-4ad3-aca8-f9908a743618?#'
+
+      let url='https://www.yuque.com/xbddba/kreggp/qfwxsg?singleDoc#'
       if(index=='1'){
-          url='https://www.yuque.com/docs/share/a5803b46-cffd-4ad3-aca8-f9908a743618?#'
+          url='https://www.yuque.com/xbddba/kreggp/qfwxsg?singleDoc#'
       }else if(index=='2'){
-          url='https://www.yuque.com/docs/share/c64392c1-8c8d-40d4-9481-a5f1ad169c10?#'
+          url='https://www.yuque.com/xbddba/kreggp/gnl9gw?singleDoc#'
       }else if(index=='3'){
-          url='https://www.yuque.com/docs/share/282894d5-9309-432b-ab19-f05c06726c7e?#'
+          url='https://www.yuque.com/xbddba/kreggp/gyw5l0?singleDoc#'
       }else if(index=='4'){
-          url='https://www.yuque.com/docs/share/4ccb2328-08aa-4587-a6f5-5b5335692bd1?#'
+          url='https://www.yuque.com/xbddba/kreggp/zb825z?singleDoc#'
       }else if(index=='5'){
           url='https://www.yuque.com/books/share/b0ae3780-67e7-420a-bc97-2353c6cf3f4f?#'
       }

pages/statistics/assaign/assaign.js

@@ -98,8 +98,6 @@ Page({
       columnsArray: columnsArray,
       columnsIndex: parseInt(data.task_cycle_value)-1,
     });
-    console.log(this.data)
-
     // 规则
     let point=Number(data.point_config.base_point);
     if(data.point_config.item_info){

pages/statistics/my_issue/my_issue.axml

@@ -59,11 +59,12 @@
               <view class="textBox" a:else>已撤回</view>
             </block>
             <block a:else>
-              <view class="orangeBox" a:if="{{item.status==1}}">待领取</view>
+              <view class="orangeBox">{{item.status_mark}}</view>
+              <!-- <view class="orangeBox" a:if="{{item.status==1}}">待领取</view>
               <view class="yellowBox" a:elif="{{item.status==2}}">进行中</view>
               <view class="greenBox" a:elif="{{item.status==3}}">已完成</view>
               <view class="textBox" a:elif="{{item.status==4}}">已撤回</view>
-              <view class="redBox" a:else>已过期</view>
+              <view class="redBox" a:else>已过期</view> -->
             </block>
           </view>
         </view>

pages/statistics/taskDetail/taskDetail.axml

@@ -7,11 +7,13 @@
         <view class="top-left">
           <view class="name font-flex-word" a:if="{{dataDetail.status == 1 || dataDetail.status == -1 || dataDetail.receiver_id ==0 &&dataDetail.status == 4}}">{{dataDetail.owner_name}}悬赏的{{dataDetail.pt_name}}任务</view>
           <view class="name font-flex-word" a:if="{{dataDetail.status == 2 || dataDetail.status == 3 || dataDetail.receiver_id !=0 && dataDetail.status == 4}}">{{dataDetail.receiver_name}}的{{dataDetail.pt_name}}任务</view>
-          <view class="orange" a:if="{{dataDetail.status==1}}">待领取</view>
+          <block a:if="{{dataDetail.status==1}}">
+            <view class="orange" a:if="{{dataDetail.expire_time > date}}">待领取</view>
+            <view class="red" a:else>已过期</view>
+          </block>
           <view class="yellow" a:elif="{{dataDetail.status==2}}">进行中</view>
           <view class="green" a:elif="{{dataDetail.status==3}}">已完成</view>
           <view class="red" a:elif="{{dataDetail.status==4}}">已撤回</view>
-          <view class="red" a:else>已过期</view>
         </view>
       </view>
       <view class="name">{{dataDetail.point_config.base_point}}{{dataDetail.pt_name}}</view>

pages/statistics/taskDetail/taskDetail.js

@@ -1,6 +1,7 @@
 
 var app = getApp()
 var that;
+import moment from 'moment' // 时间库
 Page({
   data: {
     date: app.globalData.month,
@@ -10,13 +11,16 @@ Page({
     userId: '',
     id: '',
     isCreator: false,
+    date:'',
   },
   onLoad(e) {
     that = this;
     dd.setNavigationBar({ title: "任务详情" });
     this.setData({
-      isCreator: app.globalData.isCreator
+      isCreator: app.globalData.isCreator,
+      date:moment().format('YYYY-MM-DD HH:mm')
     })
+    console.log(this.data.date)
     if (e.id) {
       // that.getDetail(e.id);
       this.setData({

pages/workbench/index/index.axml

@@ -23,7 +23,7 @@
     <view class="top"></view>
     <view class="flex-box-ce" style="background-color: #fdf6ec;color: #FF9600;padding:10rpx 32rpx;font-size:28rpx;margin-bottom:0.4rem" a:if="{{isShowDate}}">
       <image mode="scaleToFill" src="../../../image/lb.png" style="width:30rpx;height:30rpx;position:relative;top:-2px"></image>
-      <view style="padding:0 20rpx;" class="flex-1 font-flex-word" onTap="openUrl2">系统将于{{day}}天后到期</view>
+      <view style="padding:0 20rpx;" class="flex-1 font-flex-word">系统将于{{day}}天后到期</view>
       <view catchTap="dayConfig" class="blue" data-index="1" style="padding-right:20rpx;">续费/升级</view>
       <view catchTap="dayConfig" data-index="2">
         <image mode="scaleToFill" style="width:34rpx;height:34rpx;position: relative;top: 4rpx;" src="../../../image/close.png" class="img-right"></image>

pages/workbench/index/index.js

@@ -806,7 +806,6 @@ Page({
                 }
                 lists.unshift(data);
               }
-
               this.setData({rankingListDetails:lists })
             } else {
               if(rankingList[0].employee_id!=app.globalData.userData.id){

pages/workbench/review/review.js

@@ -235,25 +235,25 @@ Page({
   opneWebSocket() {
     let wsData = this.data.resultList;
     if (wsData[this.data.resultIndex]) {
-      setTime = setTimeout(() => {
-        dd.alert({
-            title: '温馨提示',
-            content: '网络异常,请检查网络',
-            buttonText: '我知道了',
-            success: () => {
-              clearTimeout(setTime);
-              app.globalData.socketApi.closewebsocket();
-              that.closeTc();
-            },
-        });
-      }, 15000)
+      // setTime = setTimeout(() => {
+      //   dd.alert({
+      //       title: '温馨提示',
+      //       content: '网络异常,请检查网络',
+      //       buttonText: '我知道了',
+      //       success: () => {
+      //         clearTimeout(setTime);
+      //         app.globalData.socketApi.closewebsocket();
+      //         that.closeTc();
+      //       },
+      //   });
+      // }, 15000)
       app.globalData.socketApi.sendData(wsData[this.data.resultIndex],this.onmessageWS,true);
     }
   },
   onmessageWS(e) {
     // 因为作用域问题，这个函数不能使用this
     if (e.type == 'event_check') {
-       clearTimeout(setTime);
+      //  clearTimeout(setTime);
        if(that.data.resultList.length==1){ //单条
         if(e.code==1){
           app.globalData.showToast("提交成功");

pages/workbench/statistics_B/statistics_B.js

@@ -123,6 +123,7 @@ Page({
   getIncidentLsit() {
     var y = that.data.date.substr(that.data.date.length - 2, 2);
     var n = that.data.date.substr(0, 4);
+    console.log(y,n)
     var start_date;
     if (y >= 6) {
       start_date = n + "-" + "0" + (y - 5).toString();