9.13 重复任务改版

Component/Review/Review.axml

@@ -16,7 +16,7 @@
           <text a:if="{{item.review_point&&item.review_point<0}}">{{item.review_point}}</text>
         </view>
         <view class="process-date">{{item.time}}</view>
-        <view class="process-context yellow">{{item.action_des}}</view>
+        <view class="process-context orange">{{item.action_des}}</view>
         <view class="process-context">{{item.comment}}</view>
       </view>
     </view>

Component/img-box/index.js

@@ -14,11 +14,11 @@ Component({
   },
   //为渲染后回调，此时页面已经渲染，通常在这里请求服务端数据比较合适。
   didMount() {
-      this.setName();
+    this.setName();
   },
   //为更新后回调，每次组件数据变更的时候都会调用。
   didUpdate() {
-    
+    this.setName();
   },
   //为删除后回调，每当组件示例从页面删除的时候会触发此回调。
   didUnmount() {

Component/process/process.axml

@@ -9,7 +9,7 @@
       <view class="process-bottom-right flex-1">
         <view class="flex-box flex-v-ce names">
           <text class="process-name">{{item.name}}</text>
-          <text class="fontColorF" a:if="{{item.remark == '申请人'||item.remark == '发起'}}">{{item.remark}}</text>
+          <text class="fontColorB" a:if="{{item.remark == '申请人'||item.remark == '发起'}}">{{item.remark}}</text>
           <text class="yellow" a:if="{{item.remark == '待审核'}}">{{item.remark}}</text>
           <text class="green" a:if="{{item.remark == '审核通过'}}">{{item.remark}}</text>
           <text class="red" a:if="{{item.remark == '审核驳回'}}">{{item.remark}}</text>

Component/selectDate/selectDate.axml

@@ -12,7 +12,7 @@
         <block a:else>
             <view class="flex-box flex-center-center">
                <text class="dateVal" onTap="selectDay">{{startDay}}</text>
-               <text class="fontColorT" style="margin:0 20rpx;">至</text>
+               <text class="fontColorD" style="margin:0 20rpx;">至</text>
                <text class="dateVal" onTap="selectDay2">{{endDay}}</text>
             </view>
         </block>

Component/selectDate_two/selectDate_two.axml

@@ -30,7 +30,7 @@
             <view class="dateVal">{{yearArr[jdYearIndex]}}</view>
           </picker>
           <!--<text class="dateVal" onTap="selectDay">{{jdYear}}</text> -->
-          <text class="fontColorT" style="margin:0 20rpx;">--</text>
+          <text class="fontColorD" style="margin:0 20rpx;">--</text>
           <picker onChange="setjdji" value="{{jdji}}" range="{{jdArr}}">
             <view class="dateVal">{{jdArr[jdji]}}</view>
           </picker>
@@ -41,13 +41,13 @@
       
       <block a:if="{{dateIndex=='4'}}">
         <text data-index="customIndOn" class="dateVal" onTap="customDate">{{customIndOn}}</text>
-        <text class="fontColorT" style="margin:0 20rpx;">--</text>
+        <text class="fontColorD" style="margin:0 20rpx;">--</text>
         <text data-index="customIndTw" class="dateVal" onTap="customDate">{{customIndTw}}</text>
         <!-- <view class="flex-box flex-center-center">
           <picker onChange="selectYear2" value="{{customIndOn}}" range="{{customArr}}">
             <view class="dateVal">{{customArr[customInd]}}</view>
           </picker>
-          <text class="fontColorT" style="margin:0 20rpx;">--</text>
+          <text class="fontColorD" style="margin:0 20rpx;">--</text>
           <picker onChange="setjdji" value="{{customIndOnTw}}" range="{{customArr}}">
             <view class="dateVal">{{customArr[jdji]}}</view>
           </picker>

Component/selectRule/selectRule.axml

@@ -35,13 +35,13 @@
             <view class="radio-right flex-1">
               <view>{{item.remark}}</view>
               <view class="red num" a:if="{{item.min_point>0}}">+{{(item.range_type == 1 ? item.min_point : item.min_point +' ~ '+ item.max_point)}}
-                <text class="fontColorT" style="margin-left:10rpx">{{item.pt_Obj.name}}</text></view>
+                <text class="fontColorD" style="margin-left:10rpx">{{item.pt_Obj.name}}</text></view>
               <view class="green num" a:if="{{item.min_point<0}}">{{(item.range_type == 1 ? item.min_point : item.min_point+' ~ '+item.max_point)}}
-                <text class="fontColorT" style="margin-left:10rpx">{{item.pt_Obj.name}}</text></view>
+                <text class="fontColorD" style="margin-left:10rpx">{{item.pt_Obj.name}}</text></view>
             </view>
           </label>
         </radio-group>
-        <view a:if="{{item_list.length==0}}" class="nodata fontColorF">
+        <view a:if="{{item_list.length==0}}" class="nodata fontColorB">
           <view>
             <image mode="scaleToFill" src="../../../image/noData.png" style="width: 340rpx;height: 340rpx;margin-bottom:20rpx;"/>
           </view>
@@ -58,13 +58,13 @@
           <view class="radio-right flex-1">
             <view>{{item.remark}}</view>
             <view class="green num" a:if="{{item.min_point<0}}">{{(item.range_type == 1 ? item.min_point : item.min_point+' ~ '+item.max_point)}}
-              <text class="fontColorT" style="margin-left:10rpx">{{item.pt_Obj.name}}</text></view>
+              <text class="fontColorD" style="margin-left:10rpx">{{item.pt_Obj.name}}</text></view>
             <view class="red num" a:if="{{item.min_point>0}}">+{{(item.range_type == 1 ? item.min_point : item.min_point+' ~ '+item.max_point)}}
-              <text class="fontColorT" style="margin-left:10rpx">{{item.pt_Obj.name}}</text></view>
+              <text class="fontColorD" style="margin-left:10rpx">{{item.pt_Obj.name}}</text></view>
           </view>
         </label>
       </radio-group>
-      <view a:else class="nodata fontColorT">暂无积分规则，请前往钉钉电脑端添加【积分规则】</view>
+      <view a:else class="nodata fontColorD">暂无积分规则，请前往钉钉电脑端添加【积分规则】</view>
     </scroll-view>
   </view>
 </view>

Component/selectSectionStaff/selectSectionStaff.axml

@@ -51,11 +51,11 @@
         <view style="text-align:center">
           <image mode="scaleToFill" src="../../../image/noData.png" style="width: 340rpx;height: 340rpx;margin-bottom:20rpx;"/>
         </view>
-        <view class="fontColorF" style="margin-top:0rpx;text-align: center;" a:if="{{isCreator}}">
+        <view class="fontColorB" style="margin-top:0rpx;text-align: center;" a:if="{{isCreator}}">
           <view  style="font-size:0.28rem">未授权员工进入系统，请前往钉钉电脑端</view>
           <view  style="font-size:0.28rem">为员工【启用积分管理】</view>
         </view>
-        <view class="fontColorF" style="margin-top:0rpx;text-align: center;" a:else>
+        <view class="fontColorB" style="margin-top:0rpx;text-align: center;" a:else>
           <view style="font-size:0.28rem">你当前没有可管理人员，请前往钉钉电脑端</view>
           <view  style="font-size:0.28rem" >设置【管理范围】</view>
         </view>

Component/selectSectionStaff_tow/selectSectionStaff_tow.axml

@@ -36,7 +36,7 @@
       </view>
       
       <view a:if="{{userList.length==0}}">
-        <view class="fontColorF" style="margin-top:200rpx;text-align: center;">
+        <view class="fontColorB" style="margin-top:200rpx;text-align: center;">
           <view>你暂无相关审批人</view>
         </view>
       </view>

Component/selectStaff/selectStaff.axml

@@ -16,7 +16,7 @@
           <checkbox onChange="radioChange" data-index="{{index}}" data-item="{{item}}" checked="{{item.checked}}" name="{{item.id}}" value="{{item}}"/>
         </label>
       </view>
-      <view a:if="{{userList.length==0}}" class="fontColorF" style="margin-top:200rpx;text-align: center;">
+      <view a:if="{{userList.length==0}}" class="fontColorB" style="margin-top:200rpx;text-align: center;">
         <view>暂无相关人员</view>
       </view>
     </scroll-view>

Component/selectSx/selectSx.axml

@@ -9,7 +9,7 @@
         <view class="flex-box flex-d-wrap rule-items" a:if="{{item.child.length>0}}">
           <view catchTap="ruleActive" data-index="{{index}}" data-indexChild="{{idx}}" class="{{itemName.checked==true? 'ruleActive':''}} ruleGe font-flex-word" a:for="{{item.child}}" a:for-index="idx" a:for-item="itemName">{{itemName.name}}</view>
         </view>
-        <view style="text-align: center;font-size:22rpx;" class="fontColorT" a:else>暂无相关规则</view>
+        <view style="text-align: center;font-size:22rpx;" class="fontColorD" a:else>暂无相关规则</view>
       </view>
     </scroll-view>
     <view class="flex-box staff-btn">

Component/selectType/selectType.axml

@@ -21,7 +21,7 @@
                <view class="xia" data-item="{{item}}" catchTap="openDown" a:if="{{item.child.length>0}}">| 下级</view>
             </view>
          </radio-group>
-         <view a:if="{{rule_tree.length==0}}" class="nodata fontColorF">
+         <view a:if="{{rule_tree.length==0}}" class="nodata fontColorB">
             <view>
               <image mode="scaleToFill" src="../../../image/noData.png" style="width: 340rpx;height: 340rpx;margin-bottom:20rpx;"/>
             </view>

app.acss

@@ -1,502 +1,524 @@
-	page {
-		color: #303133;
-		font-size: 32rpx;
-		background: rgba(245, 247, 250, 1);
-		/* height: 100%; */
-		width: 100%;
-		margin: 0;
-		padding: 0;
-		-webkit-font-smoothing: antialiased;
-		-webkit-tap-highlight-color: transparent;
-		font-family: "Source Sans Pro", "Helvetica Neue", Arial, sans-serif;
-	}
+page {
+	color: #303133;
+	font-size: 32rpx;
+	background: rgba(245, 247, 250, 1);
+	/* height: 100%; */
+	width: 100%;
+	margin: 0;
+	padding: 0;
+	-webkit-font-smoothing: antialiased;
+	-webkit-tap-highlight-color: transparent;
+	font-family: "Source Sans Pro", "Helvetica Neue", Arial, sans-serif;
+}
 
-	.nodeBer {
-		border: none!important;
-	}
+.nodeBer {
+	border: none !important;
+}
 
-	view, text {
-		line-height: 40rpx;
-	}
-  .dept_name{
-    color: #969799 !important;
-    font-size: 0.24rem;
-  }
-	.blue {
-		color: #26A2FF!important;
-	}
+view,
+text {
+	line-height: 40rpx;
+}
 
-	.red {
-		color: #F56C6C!important;
-	}
-  .yellowText{
-    color: #E6A23C!important;
-    font-size: 0.24rem;
-    padding: 0 0.24rem;
-  }
-	.yellow {
-		color: #E6A23C!important;
-	}
+.dept_name {
+	color: #969799 !important;
+	font-size: 0.24rem;
+}
 
-	.yellow2 {
-		color: #fc0!important;
-	}
+.blue {
+	color: #26A2FF !important;
+}
 
-	.green {
-		color: #67C23A!important;
-	}
+.red {
+	color: #F56C6C !important;
+}
 
-	.fontColorZ {
-		color: #303133!important;
-	}
+.yellow {
+	color: #FFC910 !important;
+}
 
-	.fontColorF {
-		color: #606266 !important;
-	}
+.orange {
+	color: #FF9600 !important;
+}
 
-	.fontColorX {
-		color: #969799 !important;
-	}
+.green {
+	color: #67C23A !important;
+}
 
-	.fontColorT {
-		color: #C0C4CC!important;
-	}
+.cyan {
+	color: #00C4CB !important;
+}
 
-	/* 搜索框 */
+.black {
+	color: #141c28 !important;
+}
+	
+.orangeText {
+	color: #E6A23C !important;
+	font-size: 0.24rem;
+	padding: 0 0.24rem;
+}
+.fontColorA {
+	color: #303133 !important;
+}
 
-	.search {
-		background-color: #f1f1f1;
-		border-radius: 10rpx;
-		width: 90%;
-		margin: 0 auto;
-		padding: 6rpx 10rpx;
-	}
+.fontColorB {
+	color: #606266 !important;
+}
 
-	.search input {
-		background-color: #f1f1f1;
-		font-size: 32rpx !important;
-	}
+.fontColorC {
+	color: #89919F !important;
+}
 
-	.search image {
-		width: 30rpx;
-		height: 30rpx;
-		margin-left: 10rpx;
-	}
+.fontColorD {
+	color: #BFC7D5 !important;
+}
 
-	/* 弹窗相关 */
+/* 搜索框 */
 
-	.data-tier {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		height: 80rpx;
-	}
+.search {
+	background-color: #f1f1f1;
+	border-radius: 10rpx;
+	width: 90%;
+	margin: 0 auto;
+	padding: 6rpx 10rpx;
+}
+
+.search input {
+	background-color: #f1f1f1;
+	font-size: 32rpx !important;
+}
+
+.search image {
+	width: 30rpx;
+	height: 30rpx;
+	margin-left: 10rpx;
+}
+
+/* 弹窗相关 */
+
+.data-tier {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	height: 80rpx;
+}
+
+.animationBox {
+	position: fixed;
+	left: 0;
+	right: 0;
+	top: 0;
+	overflow: hidden;
+	z-index: 3;
+	transform: translate(0, -100%);
+}
 
-	.animationBox {
-		position: fixed;
-		left: 0;
-		right: 0;
-		top: 0;
-		overflow: hidden;
-		z-index: 3;
-		transform: translate(0, -100%);
-	}
 /* 禁止滚动背景穿透 */
-	.container__mask {
-		overflow: hidden;
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		z-index: 1;
-}
-
-	.tab {
-		background: #fff;
-		text-align: center;
-		z-index: 4;
-		position: sticky;
-		top: 0;
-		height: 80rpx;
-	}
+.container__mask {
+	overflow: hidden;
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 1;
+}
 
-	.tab view {
-		width: 25%;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
+.tab {
+	background: #fff;
+	text-align: center;
+	z-index: 4;
+	position: sticky;
+	top: 0;
+	height: 80rpx;
+}
 
-	.tab view text {
-		position: relative;
-		padding: 20rpx 0;
-		/* width: 120%; */
-		white-space: nowrap
-	}
+.tab view {
+	width: 25%;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
 
-	.tab text::after {
-		position: absolute;
-		top: 50%;
-		right: -20rpx;
-		margin-top: -0.1rem;
-		border: 0.06rem solid;
-		border-color: transparent transparent #C0C4CC #C0C4CC;
-		-webkit-transform: rotate(-45deg);
-		transform: rotate(-45deg);
-		opacity: .8;
-		content: '';
-	}
+.tab view text {
+	position: relative;
+	padding: 20rpx 0;
+	/* width: 120%; */
+	white-space: nowrap
+}
 
-	.tab .activeView {
-		color: #26a2ff;
-	}
+.tab text::after {
+	position: absolute;
+	top: 50%;
+	right: -20rpx;
+	margin-top: -0.1rem;
+	border: 0.06rem solid;
+	border-color: transparent transparent #C0C4CC #C0C4CC;
+	-webkit-transform: rotate(-45deg);
+	transform: rotate(-45deg);
+	opacity: .8;
+	content: '';
+}
 
-	.tab .activeView::after {
-		margin-top: -0.02rem;
-		-webkit-transform: rotate(135deg);
-		transform: rotate(135deg);
-		border-color: transparent transparent #26a2ff #26a2ff;
-	}
+.tab .activeView {
+	color: #26a2ff;
+}
 
-	.windows {
-		position: fixed;
-		top: 0px;
-		left: 0px;
-		right: 0px;
-		bottom: 0px;
-		background: rgba(0, 0, 0, 0.4);
-		z-index: 999;
-	}
+.tab .activeView::after {
+	margin-top: -0.02rem;
+	-webkit-transform: rotate(135deg);
+	transform: rotate(135deg);
+	border-color: transparent transparent #26a2ff #26a2ff;
+}
 
-	.meng {
-		position: fixed;
-		bottom: 0;
-		background-color: rgba(0, 0, 0, .5);
-		left: 0;
-		right: 0;
-		top: 80rpx;
-		overflow: hidden;
-	}
+.windows {
+	position: fixed;
+	top: 0px;
+	left: 0px;
+	right: 0px;
+	bottom: 0px;
+	background: rgba(0, 0, 0, 0.4);
+	z-index: 999;
+}
 
-	.delVal {
-		height: 40rpx;
-		width: 40rpx;
-		border-radius: 100%;
-		background-color: #909399;
-		color: #fff;
-		text-align: center;
-		/* line-height: 40rpx; */
-		line-height: 34rpx;
-		margin: 0 10rpx;
-	}
+.meng {
+	position: fixed;
+	bottom: 0;
+	background-color: rgba(0, 0, 0, .5);
+	left: 0;
+	right: 0;
+	top: 80rpx;
+	overflow: hidden;
+}
 
-	/* 弹窗过程 */
-
-	.pop-up {
-		position: fixed;
-		right: 10rpx;
-		width: 100rpx;
-		height: 100rpx;
-		border-radius: 50%;
-		background: #fff;
-		text-align: center;
-		bottom: 50%;
-		box-sizing: border-box;
-		line-height: 100rpx;
-		box-shadow: 0 0 0.12rem rgba(0, 0, 0, .15);
-	}
+.delVal {
+	height: 40rpx;
+	width: 40rpx;
+	border-radius: 100%;
+	background-color: #909399;
+	color: #fff;
+	text-align: center;
+	/* line-height: 40rpx; */
+	line-height: 34rpx;
+	margin: 0 10rpx;
+}
+
+/* 弹窗过程 */
+
+.pop-up {
+	position: fixed;
+	right: 10rpx;
+	width: 100rpx;
+	height: 100rpx;
+	border-radius: 50%;
+	background: #fff;
+	text-align: center;
+	bottom: 50%;
+	box-sizing: border-box;
+	line-height: 100rpx;
+	box-shadow: 0 0 0.12rem rgba(0, 0, 0, .15);
+}
 
-	.showPop {
-		animation: showLayer 0.2s linear both;
+.showPop {
+	animation: showLayer 0.2s linear both;
+}
+
+@keyframes showLayer {
+	0% {
+		transform: translateY(-100%);
 	}
 
-	@keyframes showLayer {
-		0% {
-			transform: translateY(-100%);
-		}
-		100% {
-			transform: translateY(0%);
-		}
+	100% {
+		transform: translateY(0%);
 	}
+}
 
-	/* 带字体背景颜色 */
+/* 带字体背景颜色 */
 
-	.redBox {
-		border-radius: 6rpx;
-		background: rgba(245,108,108,.1);
-		color: #F56C6C;
-		font-size: 28rpx;
-		padding: 0 6rpx;
-	}
+.redBox {
+	border-radius: 6rpx;
+	background: rgba(245, 108, 108, .1);
+	color: #F56C6C;
+	font-size: 28rpx;
+	padding: 0 6rpx;
+}
 
-	.greenBox {
-		border-radius: 6rpx;
-		background: rgba(103,194,58,.1);
-		color: #67C23A;
-		font-size: 28rpx;
-		padding: 0 6rpx;
-	}
+.greenBox {
+	border-radius: 6rpx;
+	background: rgba(103, 194, 58, .1);
+	color: #67C23A;
+	font-size: 28rpx;
+	padding: 0 6rpx;
+}
 
-	.yellowBox2{
-		border-radius: 6rpx;
-		background: rgba(255,204,0,.1);
-		color: #fc0;
-		font-size: 28rpx;
-		padding: 0 6rpx;
-	}
+.yellowBox {
+	border-radius: 6rpx;
+	background: rgba(255, 204, 0, .1);
+	color: #FFC910;
+	font-size: 28rpx;
+	padding: 0 6rpx;
+}
 
-	.yellowBox {
-		border-radius: 6rpx;
-		background: rgba(230,162,60,.1);
-		color: #E6A23C;
-		font-size: 28rpx;
-		padding: 0 6rpx;
-	}
+.orangeBox {
+	border-radius: 6rpx;
+	background: rgba(230, 162, 60, .1);
+	color: #FF9600;
+	font-size: 28rpx;
+	padding: 0 6rpx;
+}
 
-	.blueBox {
-		border-radius: 6rpx;
-		background: rgba(38,162,255,.1);
-		color: #26A2FF;
-		font-size: 28rpx;
-		padding: 0 6rpx;
-	}
+.blueBox {
+	border-radius: 6rpx;
+	background: rgba(38, 162, 255, .1);
+	color: #26A2FF;
+	font-size: 28rpx;
+	padding: 0 6rpx;
+}
 
-	.textBox {
-		border-radius: 6rpx;
-		background: rgba(48,49,51,.1);
-		color: #303133;
-		font-size: 28rpx;
-		padding: 0 6rpx;
-	}
+.textBox {
+	border-radius: 6rpx;
+	background: rgba(48, 49, 51, .1);
+	color: #303133;
+	font-size: 28rpx;
+	padding: 0 6rpx;
+}
 
-	.margin-bottom {
-		margin-bottom: 20rpx;
-	}
+.margin-bottom {
+	margin-bottom: 20rpx;
+}
 
-	.margin-top {
-		margin-top: 20rpx;
-	}
+.margin-top {
+	margin-top: 20rpx;
+}
 
-	.defBtn {
-		background: #26A2FF;
-		color: #fff;
-	}
+.defBtn {
+	background: #26A2FF;
+	color: #fff;
+}
 
-	.border-bottom {
-		border-bottom: 1px solid #f1f1f1;
-	}
+.border-bottom {
+	border-bottom: 1px solid #f1f1f1;
+}
 
-	.text-right {
-		text-align: right;
-	}
+.text-right {
+	text-align: right;
+}
 
-	.text-left {
-		text-align: left;
-	}
+.text-left {
+	text-align: left;
+}
 
-	.noDatas {
-		text-align: center;
-		padding: 16rpx 0;
-		color: #909399
-	}
+.noDatas {
+	text-align: center;
+	padding: 16rpx 0;
+	color: #909399
+}
 
-	.radio_ {
-		width: 40rpx !important;
-		height: 40rpx !important;
-		border: 1px solid #ccc;
-		border-radius: 50% !important;
-		background: #fff;
-		position: relative;
-		margin: 0 20rpx 0 24rpx;
-	}
+.radio_ {
+	width: 40rpx !important;
+	height: 40rpx !important;
+	border: 1px solid #ccc;
+	border-radius: 50% !important;
+	background: #fff;
+	position: relative;
+	margin: 0 20rpx 0 24rpx;
+}
 
-	.active .radio_ {
-		border: 1px solid #26A2FF;
-	}
+.active .radio_ {
+	border: 1px solid #26A2FF;
+}
 
-	.active .radio_::before {
-		content: '';
-		width: 20rpx !important;
-		height: 20rpx !important;
-		border-radius: 50% !important;
-		background: #26A2FF;
-		position: absolute;
-		display: block;
-		top: 50%;
-		left: 50%;
-		margin-top: -10rpx;
-		margin-left: -9.5rpx;
-	}
+.active .radio_::before {
+	content: '';
+	width: 20rpx !important;
+	height: 20rpx !important;
+	border-radius: 50% !important;
+	background: #26A2FF;
+	position: absolute;
+	display: block;
+	top: 50%;
+	left: 50%;
+	margin-top: -10rpx;
+	margin-left: -9.5rpx;
+}
 
-	/* 盒子模型 */
+/* 盒子模型 */
 
-	.flex-box {
-		display: -webkit-box;
-		display: -moz-box;
-		display: -ms-flexbox;
-		display: -webkit-flex;
-		display: flex;
-	}
+.flex-box {
+	display: -webkit-box;
+	display: -moz-box;
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: flex;
+}
 
-	/*盒子模型，竖向自适应,垂直排列  */
+/*盒子模型，竖向自适应,垂直排列  */
 
-	.flex-box-v {
-		display: -webkit-box;
-		display: -webkit-flex;
-		display: flex;
-		-webkit-box-orient: vertical;
-		-webkit-flex-flow: column;
-		flex-flow: column !important;
-	}
+.flex-box-v {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-orient: vertical;
+	-webkit-flex-flow: column;
+	flex-flow: column !important;
+}
 
-	.flex-box-ce{
-		display: -webkit-box;
-		display: -moz-box;
-		display: -ms-flexbox;
-		display: -webkit-flex;
-		display: flex;
-		align-items: center;
-		-webkit-align-items: center;
-		-webkit-box-align: center;
-	}
+.flex-box-ce {
+	display: -webkit-box;
+	display: -moz-box;
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: flex;
+	align-items: center;
+	-webkit-align-items: center;
+	-webkit-box-align: center;
+}
 
-	/* 水平等列排版（容器左右没缝隙，子元素左右两边自适应） */
+/* 水平等列排版（容器左右没缝隙，子元素左右两边自适应） */
 
-	.flex-d-center {
-		justify-content: space-between;
-		-webkit-justify-content: space-between;
-	}
+.flex-d-center {
+	justify-content: space-between;
+	-webkit-justify-content: space-between;
+}
 
-	/* 水平等列排版（子元素两边有缝隙自己适应） */
+/* 水平等列排版（子元素两边有缝隙自己适应） */
 
-	.flex-dv-center {
-		justify-content: space-around;
-		-webkit-justify-content: space-around;
-	}
+.flex-dv-center {
+	justify-content: space-around;
+	-webkit-justify-content: space-around;
+}
 
-	/*通过一起使用 box-align 和 box-pack 属性，对 view 框的子元素进行居中，目前没有浏览器支持box-align 和 box-pack 属性，所以需要加上浏览器内核-webkit，-moz等的简写  */
-
-	.flex-center-center {
-		justify-content: center;
-		-webkit-justify-content: center;
-		-moz-justify-content: center;
-		align-items: center;
-		-webkit-align-items: center;
-		-webkit-box-pack: center;
-		-webkit-box-align: center;
-		-moz-align-items: center;
-		-moz-box-pack: center;
-		-moz-box-align: center;
-	}
+/*通过一起使用 box-align 和 box-pack 属性，对 view 框的子元素进行居中，目前没有浏览器支持box-align 和 box-pack 属性，所以需要加上浏览器内核-webkit，-moz等的简写  */
+
+.flex-center-center {
+	justify-content: center;
+	-webkit-justify-content: center;
+	-moz-justify-content: center;
+	align-items: center;
+	-webkit-align-items: center;
+	-webkit-box-pack: center;
+	-webkit-box-align: center;
+	-moz-align-items: center;
+	-moz-box-pack: center;
+	-moz-box-align: center;
+}
 
-	/*对view中的子元素进行居中，并且位于容器的中间位置 水平居中  */
+/*对view中的子元素进行居中，并且位于容器的中间位置 水平居中  */
 
-	.flex-v-zhu, .flex-h-zhu {
-		justify-content: center;
-		-webkit-justify-content: center;
-		-webkit-box-pack: center;
-	}
+.flex-v-zhu,
+.flex-h-zhu {
+	justify-content: center;
+	-webkit-justify-content: center;
+	-webkit-box-pack: center;
+}
 
-	/*对view中的子元素进行居中，并且位于容器的中间位置 垂直居中  */
+/*对view中的子元素进行居中，并且位于容器的中间位置 垂直居中  */
 
-	.flex-v-ce, .flex-h-ce {
-		align-items: center;
-		-webkit-align-items: center;
-		-webkit-box-align: center;
-	}
+.flex-v-ce,
+.flex-h-ce {
+	align-items: center;
+	-webkit-align-items: center;
+	-webkit-box-align: center;
+}
 
-	/*让所有弹性盒模型对象的子元素都有相同的长度，且忽略它们内部的内容：  */
+/*让所有弹性盒模型对象的子元素都有相同的长度，且忽略它们内部的内容：  */
 
-	.flex-1 {
-		-webkit-box-flex: 1;
-		-moz-box-flex: 1;
-		-webkit-flex: 1;
-		-ms-flex: 1;
-		flex: 1;
-	}
+.flex-1 {
+	-webkit-box-flex: 1;
+	-moz-box-flex: 1;
+	-webkit-flex: 1;
+	-ms-flex: 1;
+	flex: 1;
+}
 
-	.flex-2 {
-		-webkit-box-flex: 2;
-		box-flex: 2;
-		-moz-box-flex: 2;
-		-webkit-flex: 2;
-		-ms-flex: 2;
-		flex: 2;
-	}
+.flex-2 {
+	-webkit-box-flex: 2;
+	box-flex: 2;
+	-moz-box-flex: 2;
+	-webkit-flex: 2;
+	-ms-flex: 2;
+	flex: 2;
+}
 
-	.flex-3 {
-		-webkit-box-flex: 3;
-		box-flex: 3;
-		-moz-box-flex: 3;
-		-webkit-flex: 3;
-		-ms-flex: 3;
-		flex: 3;
-	}
+.flex-3 {
+	-webkit-box-flex: 3;
+	box-flex: 3;
+	-moz-box-flex: 3;
+	-webkit-flex: 3;
+	-ms-flex: 3;
+	flex: 3;
+}
 
-	.flex-4 {
-		-webkit-box-flex: 4;
-		box-flex: 4;
-		-moz-box-flex: 4;
-		-webkit-flex: 4;
-		-ms-flex: 4;
-		flex: 4;
-	}
+.flex-4 {
+	-webkit-box-flex: 4;
+	box-flex: 4;
+	-moz-box-flex: 4;
+	-webkit-flex: 4;
+	-ms-flex: 4;
+	flex: 4;
+}
 
-	.flex-5 {
-		-webkit-box-flex: 5;
-		box-flex: 5;
-		-moz-box-flex: 5;
-		-webkit-flex: 5;
-		-ms-flex: 5;
-		flex: 5;
-	}
+.flex-5 {
+	-webkit-box-flex: 5;
+	box-flex: 5;
+	-moz-box-flex: 5;
+	-webkit-flex: 5;
+	-ms-flex: 5;
+	flex: 5;
+}
 
-	.flex-direction-row-reverse {
-		flex-direction: row-reverse;
-		-webkit-flex-direction: row-reverse;
-	}
+.flex-direction-row-reverse {
+	flex-direction: row-reverse;
+	-webkit-flex-direction: row-reverse;
+}
 
-	/*超出部分用....表示的公用样式  */
-	.font-flex-word {
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-  }
-  
-.clamp2{
-	display: -webkit-box;
-	-webkit-box-orient: vertical;
-	-webkit-line-clamp: 2;
+/*超出部分用....表示的公用样式  */
+.font-flex-word {
 	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
 }
-.clamp3{
+
+.clamp2 {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	word-break: break-all;
 	display: -webkit-box;
+	-webkit-line-clamp: 2;
 	-webkit-box-orient: vertical;
-	-webkit-line-clamp: 3;
+}
+
+.clamp3 {
 	overflow: hidden;
+	text-overflow: ellipsis;
+	word-break: break-all;
+	display: -webkit-box;
+	-webkit-line-clamp: 3;
+	-webkit-box-orient: vertical;
 }
 
-	/* 内容超出部分自动换行 */
 
-	.flex-d-wrap {
-		flex-wrap: wrap;
-	}
+/* 内容超出部分自动换行 */
 
-	/* 内容超出部分不换行 */
+.flex-d-wrap {
+	flex-wrap: wrap;
+}
 
-	.flex-no-wrap {
-		flex-wrap: nowrap;
-	}
+/* 内容超出部分不换行 */
 
-	/* 从右边开始排列 */
+.flex-no-wrap {
+	flex-wrap: nowrap;
+}
+
+/* 从右边开始排列 */
 
-	.flex-box-end {
-		display: -webkit-box;
-		display: -moz-box;
-		display: -ms-flexbox;
-		display: -webkit-flex;
-		display: flex;
-		justify-content: flex-end;
-	}
+.flex-box-end {
+	display: -webkit-box;
+	display: -moz-box;
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: flex;
+	justify-content: flex-end;
+}

app.js

@@ -273,7 +273,7 @@ App({
                 that.globalData.token = token;
                 that.globalData.userData = user;
                 var getIsStart = dd.getStorageSync({ key: 'isStart' });//判断是否需要打开引导页
-                // console.log(JSON.stringify(user));
+                console.log(JSON.stringify(user));
                 that.getUserList();//缓存人员列表
                 if (isStart && !getIsStart.data&&isShowStart) {//判断是否需要打开引导
                   dd.reLaunch({

pages/deploy/index/index.axml

@@ -4,7 +4,7 @@
       <img-box name="{{userData.name}}" imgUrl="{{userData.img_url}}" height="100rpx" width="100rpx"></img-box>
       <view class="name font-flex-word">
         <view>{{userData.name}}</view>
-        <view class="fontColorF font-flex-word" style="font-size:28rpx;margin-top:10rpx;">{{userData.post}}</view>
+        <view class="fontColorB font-flex-word" style="font-size:28rpx;margin-top:10rpx;">{{userData.post}}</view>
       </view>
     </view>
   </view>

pages/deploy/integralRule/integralRule.axml

@@ -26,12 +26,12 @@
           <view class="remark">{{item.remark}}</view>
           <view class="flex-box flex-v-ce">
             <view class="red num flex-1" a:if="{{item.min_point>0}}">+{{(item.range_type == 1 ? item.min_point : item.min_point+'～'+item.max_point)}}
-              <text class="fontColorT" style="margin-left:10rpx">{{item.pt_Obj[0].name}}</text>
+              <text class="fontColorD" style="margin-left:10rpx">{{item.pt_Obj[0].name}}</text>
             </view>
             <view class="green num flex-1" a:if="{{item.min_point<0}}">{{(item.range_type == 1 ? item.min_point : item.min_point+'～'+item.max_point)}}
-              <text class="fontColorT" style="margin-left:10rpx">{{item.pt_Obj[0].name}}</text>
+              <text class="fontColorD" style="margin-left:10rpx">{{item.pt_Obj[0].name}}</text>
             </view>
-            <view class="item-type fontColorF num">{{item.typeName.name}}</view>
+            <view class="item-type fontColorB num">{{item.typeName.name}}</view>
           </view>
         </view>
       </view>
@@ -44,12 +44,12 @@
         <view class="remark">{{item.remark}}</view>
         <view class="flex-box flex-v-ce">
           <view class="red num flex-1" a:if="{{item.min_point>0}}">+{{(item.range_type == 1 ? item.min_point : item.min_point+'～'+item.max_point)}}
-            <text class="fontColorT" style="margin-left:10rpx">{{item.pt_Obj[0].name}}</text>
+            <text class="fontColorD" style="margin-left:10rpx">{{item.pt_Obj[0].name}}</text>
           </view>
           <view class="green num flex-1" a:if="{{item.min_point<0}}">{{(item.range_type == 1 ? item.min_point : item.min_point+'～'+item.max_point)}}
-            <text class="fontColorT" style="margin-left:10rpx">{{item.pt_Obj[0].name}}</text>
+            <text class="fontColorD" style="margin-left:10rpx">{{item.pt_Obj[0].name}}</text>
           </view>
-          <view class="item-type fontColorF num">{{item.typeName.name}}</view>
+          <view class="item-type fontColorB num">{{item.typeName.name}}</view>
         </view>
       </view>
     </view>

pages/deploy/organization/organization.axml

@@ -35,14 +35,14 @@
       </view>
     </view>
     <view class="flex-box flex-v-ce title2">
-      <view class="flex-1 fontColorF">
+      <view class="flex-1 fontColorB">
         <picker onChange="bingIntegralType" value="{{minuteIndex}}" range="{{minuteArray}}" range-key="name">
           <text class="selectText">{{minuteArray[minuteIndex].name}}</text>
         </picker>
       </view>
       <view class="flex-box">
         <label>
-          <text class="fontColorZ" style="padding-right:20rpx">全选</text>
+          <text class="fontColorA" style="padding-right:20rpx">全选</text>
           <checkbox onChange="ruleActiveAll"  checked="{{isAllChecked}}"></checkbox>
         </label>
       </view>
@@ -79,14 +79,14 @@
   <!-- 搜索的人员 -->
   <scroll-view a:else class="main" scroll-y="{{true}}" style="height: calc(100vh - 388rpx)">
     <view class="flex-box flex-v-ce title2">
-      <view class="flex-1 fontColorF">
+      <view class="flex-1 fontColorB">
         <picker onChange="bingIntegralType" value="{{minuteIndex}}" range="{{minuteArray}}" range-key="name">
           <text class="selectText">{{minuteArray[minuteIndex].name}}</text>
         </picker>
       </view>
       <view class="flex-box">
         <label>
-          <text class="fontColorZ" style="padding-right:20rpx">全选</text>
+          <text class="fontColorA" style="padding-right:20rpx">全选</text>
           <checkbox onChange="ruleActiveAll"  checked="{{isAllChecked2}}"></checkbox>
         </label>
       </view>

pages/deploy/setCheck/setCheck.acss

@@ -5,9 +5,7 @@
 .yellow{
   padding:0 28rpx;
   font-size: 28rpx;
-}
-.yellow{
-    padding-top: 10rpx;
+  padding-top: 10rpx;
 }
 .li{
   padding: 20rpx 0;
@@ -16,7 +14,7 @@
 .li-left{
   margin-right: 20rpx;
 }
-.fontColorF{
+.fontColorB{
   font-size: 28rpx;
 }
 .li-left view:nth-child(1){

pages/deploy/setCheck/setCheck.axml

@@ -1,5 +1,5 @@
 <view>
-  <view class="yellow">以下分数皆为B分，请前往电脑端（PC）钉钉设置</view>
+  <view class="orange">以下分数皆为B分，请前往电脑端（PC）钉钉设置</view>
   <block a:if="{{data.enable!=0}}">
     <view class="ul margin-bottom">
       <!--<view class="flex-box li"><view class="li-left"><view>月度全勤</view><view >当月加分{{data.month_full_ad}}分</view></view></view> -->
@@ -53,7 +53,7 @@
     </view>
   </block>
   <view a:else class="null">
-    <text class="fontColorF">未启动考勤设置，请前往电脑端（PC）钉钉设置</text>
+    <text class="fontColorB">未启动考勤设置，请前往电脑端（PC）钉钉设置</text>
   </view>
   <!--<view class="flex-box li"><view class="li-left"><view>加班</view><view>每小时加{{data.ot_per_hour}}分</view></view></view><view class="flex-box li"><view class="li-left"><view>请假</view><view>每小时扣{{data.leave_per_hour}}分</view></view></view> -->
 </view>

pages/deploy/sku/sku.axml

@@ -6,8 +6,8 @@
       <icon type="success" size="20"/>
       <view>支付成功</view>
     </view>
-    <view class="text fontColorF">感谢你购买功道云服务，请联系专属客服</view>
-    <view class="text fontColorF">进行服务对接</view>
+    <view class="text fontColorB">感谢你购买功道云服务，请联系专属客服</view>
+    <view class="text fontColorB">进行服务对接</view>
     <view class="btn" onTap="openUrl">联系专属客服</view>
     <view class="btn2" onTap="openUrl2">回到首页</view>
   </view>

pages/deploy/upgrade/upgrade.axml

@@ -12,7 +12,7 @@
     <scroll-view scroll-y="{{true}}" class="scroll" a:if="{{list.length>0}}" onScrollToLower="onScrollToLower">
       <view class="li" a:for="{{list}}" catchTap="openDetail" data-id="{{item.id}}">
         <view class="font-flex-word">{{item.title}}</view>
-        <view class="fontColorT">发布时间：{{item.publish_time}}</view>
+        <view class="fontColorD">发布时间：{{item.publish_time}}</view>
       </view>
     </scroll-view>
     <no-data a:if="{{list.length==0}}"></no-data>

pages/exchange/commodityDetail/commodityDetail.axml

@@ -2,7 +2,7 @@
   <view class="flex-box-ce" style="background:#fff;padding:24rpx">
     <image mode="aspectFill" src="{{detail.image}}" class="img" data-url="{{detail.image}}"  catchTap="showImg"/>
     <view class="flex-box-v flex-1" style="height:300rpx;padding-left:20rpx">
-      <view class="content fontColorF flex-1">
+      <view class="content fontColorB flex-1">
        {{detail.name}}
       </view>
       <view style="margin-bottom:20rpx" class="flex-box-ce">
@@ -18,11 +18,11 @@
       </view>
     </view>
   </view>
-  <view class="fontColorF" style="padding:20rpx;background:#fff;padding-bottom:0"> 库存:
+  <view class="fontColorB" style="padding:20rpx;background:#fff;padding-bottom:0"> 库存:
     <text a:if="{{detail.stock_type == 1}}">不限</text>
     <text a:else>{{detail.stock}}</text>
    </view>
-  <view class="fontColorF" style="padding:20rpx;background:#fff"> 奖品描述: {{detail.desc}}</view>
+  <view class="fontColorB" style="padding:20rpx;background:#fff"> 奖品描述: {{detail.desc}}</view>
   <textarea onBlur="bindTextAreaBlur" placeholder="请输入兑换备注" maxlength="100" style="margin-top:24rpx;padding:24rpx;height:200rpx;margin-bottom:200rpx" />
   <button type="primary" class="btn" catchTap="showText" loading="{{disabled}}" disabled="{{disabled}}">立即兑换</button>
   <view a:if="{{isBh}}" class="windows" content="还没有积分事件">
@@ -35,7 +35,7 @@
         <image src="{{detail.image}}" mode="aspectFill" style="width:260rpx;height:260rpx;border-radius: 10rpx" />
       </view>
       <view class="windows-content" style="text-align:center">需要花<text class="red">{{num}}</text>功勋点兑换此奖品</view>
-      <view style="text-align:center;font-size:24rpx;margin-bottom:20rpx" class="fontColorX">
+      <view style="text-align:center;font-size:24rpx;margin-bottom:20rpx" class="fontColorC">
         （当前的功勋点为{{gxd}}）
       </view>
       <view class="btns flex-box flex-v-ce">

pages/exchange/exchangeRecord/exchangeRecord.axml

@@ -4,7 +4,7 @@
       catchTap="openDetail">
       <view class="flex-box-ce" style="border-bottom:1px solid #f1f1f1;padding-bottom:20rpx">
         <text class="flex-1 font-flex-word" style="padding-right:20rpx;">{{item.goods_name}}</text>
-        <text class="yellow" style="width:100rpx" a:if="{{item.status==0}}">未发放</text>
+        <text class="orange" style="width:100rpx" a:if="{{item.status==0}}">未发放</text>
         <text class="green" style="width:100rpx" a:if="{{item.status==1}}">已发放</text>
         <text class="red" style="width:100rpx" a:if="{{item.status==2}}">已取消</text>
       </view>
@@ -12,12 +12,12 @@
         <image src="{{item.goods_image}}" mode="aspectFill" style="width:200rpx;height:200rpx;border-radius: 10rpx;" />
         <view class="flex-box-v flex-1" style="height:200rpx;padding-top:20rpx;padding-left:20rpx;">
           <view style="margin-bottom:30rpx"> 单价：{{item.price}}功勋点</view>
-          <view class="fontColorF" style="margin-bottom:30rpx"> 数量：{{item.num}}</view>
+          <view class="fontColorB" style="margin-bottom:30rpx"> 数量：{{item.num}}</view>
           <view >总价：{{item.total_price}}功勋点</view>
         </view>
         <image src="../../../image/code.jpg" data-item="{{item}}" style="width:70rpx;height:70rpx" catchTap="showText" />
       </view>
-      <view class="fontColorF" style="font-size:28rpx">兑换时间 {{item.date}}</view>
+      <view class="fontColorB" style="font-size:28rpx">兑换时间 {{item.date}}</view>
     </view>
     <view class="noDatas" a:if="{{isData}}">没有更多咯</view>
   </scroll-view>

pages/exchange/gxdDetail/gxdDetail.axml

@@ -48,12 +48,12 @@
             <text a:if="{{item.type==3}}">转换</text>
             <text a:if="{{item.remark}}">“{{item.remark}}”</text>
           </view>
-          <text style="font-size:28rpx" class="fontColorF">{{item.date}}</text>
+          <text style="font-size:28rpx" class="fontColorB">{{item.date}}</text>
         </view>
         <view>
           <view class="red" a:if="{{item.achievement>0}}">{{item.achievement}}</view>
           <view class="green" a:else>{{item.achievement}}</view>
-          <view class="fontColorF" style="font-size:24rpx;text-align:right">
+          <view class="fontColorB" style="font-size:24rpx;text-align:right">
             <view a:if="{{item.type==1}}">发放</view>
             <view a:if="{{item.type==2}}">回收</view>
             <view a:if="{{item.type==3}}">转换</view>

pages/exchange/prizeDetail/prizeDetail.axml

@@ -8,18 +8,18 @@
   </view>
   <view style="padding:20rpx;">
     <view style="padding:20rpx;box-shadow: 0px 0px 10px #ccc;border-radius: 4px;margin-bottom:20rpx">
-      <view class="fontColorF" style="font-size:28rpx;margin-bottom:10rpx">兑换时间：{{detail.date}}</view>
+      <view class="fontColorB" style="font-size:28rpx;margin-bottom:10rpx">兑换时间：{{detail.date}}</view>
       <view style="background:#F5F7FA;min-height:100rpx;border-radius: 4px;padding:16rpx;color: #606266;font-size:28rpx" a:if="{{detail.remark}}">
         {{detail.remark}}
       </view>
-      <view class="fontColorF" style="font-size:28rpx;margin-bottom:10rpx" a:if="{{detail.status==2}}">取消时间：{{detail.date2}}</view>
-      <view class="fontColorF" style="font-size:28rpx;margin-bottom:10rpx" a:if="{{detail.status==1}}">发放时间：{{detail.date2}}</view>
+      <view class="fontColorB" style="font-size:28rpx;margin-bottom:10rpx" a:if="{{detail.status==2}}">取消时间：{{detail.date2}}</view>
+      <view class="fontColorB" style="font-size:28rpx;margin-bottom:10rpx" a:if="{{detail.status==1}}">发放时间：{{detail.date2}}</view>
       <view style="background:#F5F7FA;min-height:100rpx;border-radius: 4px;padding:16rpx;color: #606266;font-size:28rpx" a:if="{{detail.cancel_remark}}">
         {{detail.cancel_remark}}
       </view>
     </view>
     <view style="padding:20rpx;box-shadow: 0px 0px 10px #ccc;border-radius: 4px;margin-bottom:20rpx">
-      <view class="fontColorF flex-box-ce" style="font-size:28rpx;padding-bottom:20rpx;border-bottom:1px dashed #f1f1f1">
+      <view class="fontColorB flex-box-ce" style="font-size:28rpx;padding-bottom:20rpx;border-bottom:1px dashed #f1f1f1">
         <image mode="widthFix" src="../../../image/dhm.png" style="width:40rpx;" />
         <text class="flex-1" style="font-size:28rpx;padding-left:20rpx">兑换码</text>
       </view>
@@ -36,7 +36,7 @@
         <image src="{{detail.goods_image}}" mode="aspectFill" style="width:200rpx;height:200rpx;border-radius: 10rpx;" data-url="{{detail.goods_image}}"  catchTap="showImg"/>
         <view class="flex-box-v flex-1" style="height:200rpx;padding-top:20rpx;padding-left:20rpx;">
           <view style="margin-bottom:30rpx"> 单价：{{detail.price}}功勋点</view>
-          <view class="fontColorF" style="margin-bottom:30rpx"> 数量：{{detail.num}}</view>
+          <view class="fontColorB" style="margin-bottom:30rpx"> 数量：{{detail.num}}</view>
           <view > 总价：{{detail.total_price}}功勋点</view>
         </view>
       </view>

pages/reportBox/moreE/moreE.axml

@@ -12,7 +12,7 @@
             </view>
             <view class="content">{{item.remark.customize||item.remark.rule}}</view>
             <view class="flex-box li-bottom">
-              <text class="flex-1 fontColorX">{{item.date}} 截止</text>
+              <text class="flex-1 fontColorC">{{item.date}} 截止</text>
             </view>
           </view>
         </view>

pages/reportBox/newspaperTask/newspaperTask.axml

@@ -21,7 +21,7 @@
             </view>
             <view class="content">{{item.task_name}}</view>
             <view class="flex-box li-bottom">
-              <text class="flex-1 fontColorX">{{item.date}} 截止</text>
+              <text class="flex-1 fontColorC">{{item.date}} 截止</text>
               <button type="primary" class="defBtn" catchTap="openDetail" data-item="{{item}}">查看任务</button>
             </view>
           </view>

pages/start/start.axml

@@ -1,19 +1,19 @@
 <view>
   <view a:if="{{showIndex==1}}" class="box">
     <view class="title">欢迎使用功道云积分制</view>
-    <view class="content fontColorZ">
+    <view class="content fontColorA">
       <view class="c_top">
         你是开通应用的
-        <text class="yellow">创始人</text>
+        <text class="orange">创始人</text>
         ，可在
-        <text class="yellow">“设置-组织架构”</text>
+        <text class="orange">“设置-组织架构”</text>
         授权员工【开启积分管理】
       </view>
       <view class="flex-box  c_main">
         <image mode="scaleToFill" src="../../image/dt.png"></image>
-        <view class="c_text fontColorZ">
+        <view class="c_text fontColorA">
           <view>授权后，员工才能正式进入应用</view>
-          <view class="fontColorF">设置路径：钉钉电脑版-工作-功道云积分制-设置-组织架构</view>
+          <view class="fontColorB">设置路径：钉钉电脑版-工作-功道云积分制-设置-组织架构</view>
         </view>
       </view>
       <view class="c_footer">
@@ -24,17 +24,17 @@
   </view>
   <view a:if="{{showIndex==2}}" class="box">
     <view class="title">欢迎使用功道云积分制</view>
-    <view class="content fontColorZ">
+    <view class="content fontColorA">
       <view class="c_top">
         你可在
-        <text class="yellow">“设置-角色权限”</text>
+        <text class="orange">“设置-角色权限”</text>
         添加【积分管理员】来协助执行积分管理
       </view>
       <view class="flex-box  c_main">
         <image mode="scaleToFill" src="../../image/dt.png"></image>
-        <view class="c_text fontColorZ">
+        <view class="c_text fontColorA">
           <view>推荐行政人事或有执行力的管理层来当【积分管理员】</view>
-          <view class="fontColorF">设置路径：钉钉电脑版-工作-功道云积分制-设置-角色权限</view>
+          <view class="fontColorB">设置路径：钉钉电脑版-工作-功道云积分制-设置-角色权限</view>
         </view>
       </view>
       <view class="c_footer">
@@ -45,15 +45,15 @@
   </view>
   <view a:if="{{showIndex==3}}" class="box">
     <view class="title">欢迎使用功道云积分制</view>
-    <view class="content fontColorZ">
+    <view class="content fontColorA">
       <view class="c_top">
         <view>3步走，轻松搭建积分管理</view>
-        <view class="fontColorF">请前往电脑端体验完整管理流程</view>
+        <view class="fontColorB">请前往电脑端体验完整管理流程</view>
       </view>
       <view class="c_footer">
         <image mode="scaleToFill" src="../../image/start1.jpg" data-str="../../image/start1.jpg"></image>
       </view>
-      <view class="fontColorT text_f">路径：钉钉电脑端（需下载安装）-工作-功道云积分制</view>
+      <view class="fontColorD text_f">路径：钉钉电脑端（需下载安装）-工作-功道云积分制</view>
 
       <button type="primary" class="btn" catchTap="openUrl">已熟悉电脑端，直达手机端功能</button>
       <!-- <button type="primary" class="btn" catchTap="openView">前往PC端操作</button> -->

pages/statistics/B_ranking/B_ranking.axml

@@ -9,7 +9,7 @@
         <text a:else>从低到高</text>
       </view>
     </view>
-    <view class="fontColorF" style="font-size:28rpx;padding:10rpx 28rpx;">排名包含初始分和工龄分</view>
+    <view class="fontColorB" style="font-size:28rpx;padding:10rpx 28rpx;">排名包含初始分和工龄分</view>
     <view class="main scroll">
       <scroll-view lower-threshold="100" class="scroll" scroll-y="{{true}}" a:if="{{list.length>0}}" onScrollToLower="onScrollToLower">
         <view a:for="{{list}}" data-item="{{item}}" class="flex-box flex-v-ce item border-bottom" catchTap="openDetail">

pages/statistics/C_ranking/C_ranking.axml

@@ -9,7 +9,7 @@
       <text a:else>从低到高</text>
     </view>
   </view>
-  <view class="fontColorF" style="font-size:28rpx;padding:10rpx 28rpx;">排名不包含初始分和工龄分</view>
+  <view class="fontColorB" style="font-size:28rpx;padding:10rpx 28rpx;">排名不包含初始分和工龄分</view>
   <view class="main scroll">
     <scroll-view class="scroll" scroll-y="{{true}}" a:if="{{list.length>0}}" onScrollToLower="onScrollToLower">
       <view a:for="{{list}}" a:key="{{item.id}}" data-item="{{item}}" class="flex-box flex-v-ce item border-bottom"  catchTap="openDetail">

pages/statistics/addCustom/addCustom.axml

@@ -1,16 +1,16 @@
 <view>
   <view class="header">
-    <view class="title fontColorF">分组名称</view>
+    <view class="title fontColorB">分组名称</view>
     <view style="width:100%">
         <input placeholder="请输入分组名称" class="input" value="{{title}}" onInput="setTitle"/>
     </view>
   </view>
   <view class="main">
     <view class="main-herader margin-bottom">
-      <view class="title fontColorF">分组成员({{selectUser.length}})</view>
+      <view class="title fontColorB">分组成员({{selectUser.length}})</view>
       <view class="flex-box flex-v-ce add" onTap="openAdd">
         <view class="blue flex-1">+ 添加员工</view>
-        <view class="add-right fontColorF">
+        <view class="add-right fontColorB">
           <!-- <text a:for="{{selectUser}}">{{item.name}},</text>
           <text>{{selectUser.length}}人</text> -->
           <!-- <image mode="scaleToFill" src="../../../image/right.png"/> -->

pages/statistics/allTask/allTask.axml

@@ -23,7 +23,7 @@
       </view>
     </form>
   </view>
-  <view class="yellowText" a:if="{{config.event_review_status==1&&config.event_task_review==1}}">复核开启后，积分需管理员复核后才计入排名和统计</view>
+  <view class="orangeText" a:if="{{config.event_review_status==1&&config.event_task_review==1}}">复核开启后，积分需管理员复核后才计入排名和统计</view>
   <view class="main scroll">
     <scroll-view class="scroll" style="{{(config.event_review_status==1&&config.event_task_review==1)?'height: calc(100vh - 2.5rem)':''}}" a:if="{{list.length>0}}" scroll-y="{{true}}" onScrollToLower="onScrollToLower">
       <view class="li border-bottom" a:for="{{list}}" catchTap="openDetail" data-item="{{item}}" key="{{item.id}}">
@@ -38,7 +38,7 @@
             </view>
             <view class="content">{{item.task_name}}</view>
             <view class="flex-box li-bottom">
-              <text class="flex-1 fontColorX">{{item.expire_time}} 截止</text>
+              <text class="flex-1 fontColorC">{{item.expire_time}} 截止</text>
               <button type="primary" class="defBtn" catchTap="openDetail" data-item="{{item}}">查看任务</button>
               <button a:if="{{minuteIndex==1||minuteIndex==2}}" type="primary" class="defBtn" catchTap="openDetail2" data-item="{{item}}" 
                 style="margin-left:20rpx;">查看审批</button>

pages/statistics/assaign/assaign.axml

@@ -67,8 +67,8 @@
             </view>
           </view>
           <block a:if="{{selectRule}}">
-            <view class="fontColorT input_text" a:if="{{selectRule.range_type==1&&selectRule.min_point==selectRule.max_point}}">固定：{{selectRule.min_point}} {{selectRule.pt_Obj[0].name}}</view>
-            <view class="fontColorT input_text" a:else> 范围(可修改)：{{selectRule.min_point}}至{{selectRule.max_point}}
+            <view class="fontColorD input_text" a:if="{{selectRule.range_type==1&&selectRule.min_point==selectRule.max_point}}">固定：{{selectRule.min_point}} {{selectRule.pt_Obj[0].name}}</view>
+            <view class="fontColorD input_text" a:else> 范围(可修改)：{{selectRule.min_point}}至{{selectRule.max_point}}
               <text>{{selectRule.pt_Obj[0].name}}</text></view>
           </block>
         </view>
@@ -97,6 +97,15 @@
         <view class="flex-1">{{items.revieweName}}</view>
         <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
       </view>
+      <view class="flex-box flex-v-ce li">
+        <view class="label">重复周期</view>
+        <view class="flex-1">
+          <picker onChange="bindObjPickerChange" value="{{arrIndex}}" range="{{objectArray}}" range-key="name">
+            <view class="row-extra">{{objectArray[arrIndex].name}}</view>
+          </picker>
+        </view>
+        <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
+      </view>
       <view class="flex-box flex-v-ce li  margin-bottom">
         <view class="label isBt">截止时间</view>
         <view class="flex-1" a:if="{{items.task_cycle==0}}" catchTap="openDate">{{items.expire_time}}</view>
@@ -110,15 +119,6 @@
       <view class="li">
         <textarea maxlength="300" value="{{items.task_remark}}" onInput="bindTextAreaBlur2" placeholder="请输入任务描述" data-index="{{index}}"></textarea>
       </view>
-      <view class="flex-box flex-v-ce li">
-        <view class="label">重复周期</view>
-        <view class="flex-1">
-          <picker onChange="bindObjPickerChange" value="{{arrIndex}}" range="{{objectArray}}" range-key="name">
-            <view class="row-extra">{{objectArray[arrIndex].name}}</view>
-          </picker>
-        </view>
-        <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
-      </view>
       <view class="flex-box li" style="padding:15rpx 28rpx;">
         <view class="label2" style="position: relative;top:10rpx;">提前奖分(天)</view>
         <text class="red" style="position: relative;top:10rpx;">+</text>

pages/statistics/assaign/assaign.js

@@ -1,6 +1,7 @@
 var app = getApp()
 var that;
 var animation;
+import moment from 'moment' // 时间库
 Page({
   data: {
     users: [],
@@ -449,8 +450,6 @@ Page({
       items.rule_id=items.rule_id2;
       delete items.item_id
     }
-
-
     if (items.targets.length == 0) {
       this.showToast('请选择执行对象')
       return;
@@ -486,17 +485,56 @@ Page({
       url = '/api/integral/schedule/publish/work'
     }
     this.setData({ disabled: true });
+    let is=true;
+    if(this.data.items.task_cycle==1&&this.data.items.task_expire_day<=moment().format('HH')){
+      is=false  
+    }else if(this.data.items.task_cycle==2&&this.data.items.task_expire_day<=moment().day()){
+      is=false  
+    }else if(this.data.items.task_cycle==3&&this.data.items.task_expire_day<=moment().format('D')){
+      is=false  
+    }
+    this.setData({ disabled: true });
     app.$post(url, items).then((res) => {
       this.showToast(res.data.msg);
-      setTimeout(() => {
-        dd.navigateBack({ delta: 1 })
-      }, 1000);
+      let str=this.data.items.task_cycle==1? '您发布的每日重复任务将于明天0点执行自动发布，是否需要立即发布一条任务？':this.data.items.task_cycle==2? '您发布的每周重复任务将于下周一执行自动发布，是否需要立即发布一条任务？':'您发布的每月重复任务将于下个月1号执行自动发布，是否需要立即发布一条任务？'
+      if(this.data.items.task_cycle!=0&&is){
+          dd.confirm({
+            title: '温馨提示',
+            content: str,
+            confirmButtonText: '发布',
+            cancelButtonText: '不需要',
+            success: (result) => {
+              if(result.confirm){
+                this.executeTask(res.data.data)
+              }else{
+                setTimeout(() => {
+                    dd.navigateBack({ delta: 1 })
+                }, 1000);
+              }
+            },
+          });
+      }else{
+        setTimeout(() => {
+            dd.navigateBack({ delta: 1 })
+        }, 1000);
+      }
     }).catch(err => {
       this.setData({ disabled: false });
     }).finally(err => {
-	  this.setData({ disabled: false });
-	})
+      this.setData({ disabled: false });
+    })
+  },
+    //执行周期任务
+  executeTask(id){
+    	app.$post('/api/integral/schedule/hand_exec',{schedule_id:id}).then(res => {
+        this.showToast('已发布');
+    	}).finally(err => {
+        setTimeout(() => {
+            dd.navigateBack({ delta: 1 })
+        }, 1000);
+      });
   },
+  
   //选择时间
   openDate(e) {
     var item = `items.expire_time`

pages/statistics/assaign_set/assaign_set.axml

@@ -51,8 +51,8 @@
             </view>
           </view>
           <block a:if="{{selectRule}}">
-            <view class="fontColorT input_text" a:if="{{selectRule.range_type==1&&selectRule.min_point==selectRule.max_point}}">固定：{{selectRule.min_point}} {{items.pt_name}}</view>
-            <view class="fontColorT input_text" a:else> 范围(可修改)：{{selectRule.min_point}}至{{selectRule.max_point}}
+            <view class="fontColorD input_text" a:if="{{selectRule.range_type==1&&selectRule.min_point==selectRule.max_point}}">固定：{{selectRule.min_point}} {{items.pt_name}}</view>
+            <view class="fontColorD input_text" a:else> 范围(可修改)：{{selectRule.min_point}}至{{selectRule.max_point}}
               <text>{{items.pt_name}}</text>
             </view>
           </block>

pages/statistics/checkDetail/checkDetail.axml

@@ -7,7 +7,7 @@
     </view>
     <view class="text-right">
       <view class="red">{{item_obj.point}}</view>
-      <view class="fontColorF">第{{item_obj.rank}}名</view>
+      <view class="fontColorB">第{{item_obj.rank}}名</view>
     </view>
   </view>
   <view class="main">
@@ -15,11 +15,11 @@
       <view class="flex-box li" a:if="{{list.length>0}}" a:for="{{list}}" a:for-item="val">
         <view class="flex-1">
           <view>{{val.event_date}} {{val.remark}}</view>
-          <view class="date fontColorF">时间：{{val.event_date}}</view>
+          <view class="date fontColorB">时间：{{val.event_date}}</view>
         </view>
         <view class="text-right">
           <view class="red">{{val.point}}</view>
-          <view class="date fontColorF">{{val.event_name}}</view>
+          <view class="date fontColorB">{{val.event_name}}</view>
         </view>
       </view>
       <view class="noDatas" a:if="{{isData}}">没有更多咯</view>

pages/statistics/check_top/check_top.axml

@@ -12,7 +12,7 @@
       <picker a:if="{{tisrrArr.length>0}}" onChange="bingMinute2" value="{{TisrrIndex}}" range="{{tisrrArr}}" range-key="name">
         <text>{{tisrrArr[TisrrIndex].name}}</text>
       </picker>
-      <text class="fontColorT" a:else>无考勤组</text>
+      <text class="fontColorD" a:else>无考勤组</text>
     </view>
   </view>
   <view class="main scroll">

pages/statistics/customDetail/customDetail.axml

@@ -11,7 +11,7 @@
         <text a:else>升序</text>
     </view>
   </view>
-  <view class="fontColorF" style="font-szie:20rpx;padding:10rpx 28rpx;">排名包含初始分和工龄分</view>
+  <view class="fontColorB" style="font-szie:20rpx;padding:10rpx 28rpx;">排名包含初始分和工龄分</view>
   <view class="main">
     <scroll-view scroll-y="{{true}}">
       <view a:for="{{[1,2,3,4,4,6,5,5,5,5]}}" catchTap="openDetail" data-item="{{item}}" class="flex-box flex-v-ce item border-bottom">

pages/statistics/customRamking/customRamking.axml

@@ -15,7 +15,7 @@
           <view class="flex-box flex-v-ce message border-bottom">
             <view class="flex-1">
               <view class="title">{{item.name}}</view>
-              <!-- <view class="num fontColorF">共{{item.employees.length}}人参与排名</view> -->
+              <!-- <view class="num fontColorB">共{{item.employees.length}}人参与排名</view> -->
             </view>
             <!-- <view onTap="openCompile" class="openCompile" data-item="{{item}}">
               <image mode="scaleToFill" src="../../../image/Bj.png" style="width:40rpx;height:40rpx"></image>
@@ -29,7 +29,7 @@
       </view>
     </block>
     <view a:else class="noDataBox">
-      <view class="noDataTop fontColorF">
+      <view class="noDataTop fontColorB">
         <view>暂无分组</view>
         <view>通过分组你可针对性的查看对应人员的B分排名</view>
       </view>

pages/statistics/getTask/getTask.axml

@@ -10,10 +10,10 @@
       <view class="li border-bottom"  a:for="{{list}}" catchTap="openDetail" data-item="{{item}}">
         <view class="flex-box li-top">
           <view class="flex-1">{{item.task_name}}</view>
-          <text class="fontColorX">{{item.base_point}} {{item.pt_name}}</text>
+          <text class="fontColorC">{{item.base_point}} {{item.pt_name}}</text>
         </view>
         <view class="flex-box li-bottom">
-          <text class="flex-1 fontColorX">{{item.end_time}} 截止</text>
+          <text class="flex-1 fontColorC">{{item.end_time}} 截止</text>
           <button type="primary" class="defBtn" data-item="{{item}}" a:if="{{item.status == '1' && userId != item.owner_id}}">领取任务</button>
         </view>
       </view>
@@ -30,7 +30,7 @@
           </view>
           <view class="context" a:if="{{item.task_name}}">{{item.task_name}}</view>
           <view class="flex-box flex-v-ce">
-            <view class="date fontColorX flex-1">{{item.expire_time}} 截止</view>
+            <view class="date fontColorC flex-1">{{item.expire_time}} 截止</view>
           </view>
         </view>
       </view>

pages/statistics/jfDetail/jfDetail.axml

@@ -8,8 +8,8 @@
       </view>
       <view class="blue" style="font-size:0.24rem" catchTap="open2">看TA的积分统计<text style="font-size:0.18rem;position: relative;right:-8rpx;top:-2rpx">〉</text></view>
     </view>
-    <view class="fontColorF" style="font-size:28rpx;padding:10rpx 28rpx;" a:if="{{type==2}}">总分：<text class="blue">{{userInfo.point}}</text> (包含基础分<text class="blue">{{base_point}}</text>,工龄分<text class="blue">{{service_point}}</text>)</view>
-    <view class="fontColorF" style="font-size:28rpx;padding:10rpx 28rpx;" a:else>分值：<text class="blue">{{userInfo.point}}</text> (当前明细不包含基础分和工龄分)</view>
+    <view class="fontColorB" style="font-size:28rpx;padding:10rpx 28rpx;" a:if="{{type==2}}">总分：<text class="blue">{{userInfo.point}}</text> (包含基础分<text class="blue">{{base_point}}</text>,工龄分<text class="blue">{{service_point}}</text>)</view>
+    <view class="fontColorB" style="font-size:28rpx;padding:10rpx 28rpx;" a:else>分值：<text class="blue">{{userInfo.point}}</text> (当前明细不包含基础分和工龄分)</view>
     <view class="flex-box flex-v-ce tab" style="border-bottom:1px solid #f1f1f1">
       <view class="flex-1">
         <picker onChange="bingIntegralType" value="{{typesIndex}}" range="{{types}}" range-key="name">

pages/statistics/logDetail/logDetail.axml

@@ -3,7 +3,7 @@
     <view a:if="{{obj.contents.length>0}}">
         <view class="contents" a:for="{{obj.contents}}">
             <view class="key">{{item.key}}</view>
-            <view class="value fontColorF">
+            <view class="value fontColorB">
                 <text a:if="{{item.value}}">{{item.value}}</text>
                 <text a:else>未填写</text>
             </view>

pages/statistics/log_rank/log_rank.axml

@@ -14,7 +14,7 @@
         <text class="{{showSx? 'activeView blue':''}}">{{sxVal}}</text>
       </view> -->
     </view>
-    <view class="fontColorF" style="font-size:28rpx;padding:10rpx 28rpx;">排名不包含初始分和工龄分</view>
+    <view class="fontColorB" style="font-size:28rpx;padding:10rpx 28rpx;">排名不包含初始分和工龄分</view>
     <view class="main scroll">
       <scroll-view class="scroll" scroll-y="{{true}}" a:if="{{list.length>0}}" onScrollToLower="onScrollToLower">
         <view a:for="{{list}}" data-item="{{item}}" class="flex-box flex-v-ce item border-bottom" key="{{item.id}}">

pages/statistics/my_PrizeBuckle/my_PrizeBuckle.axml

@@ -13,7 +13,7 @@
       <view data-index="3" class="{{activeIndex == 3? 'active':''}} flex-1" catchTap="activeItem">被驳回</view>
     </view>
   </view>
-  <view class="yellowText" a:if="{{config.event_review_status==1&&config.event_entry_review==1}}">复核开启后，积分需管理员复核后才计入排名和统计</view>
+  <view class="orangeText" a:if="{{config.event_review_status==1&&config.event_entry_review==1}}">复核开启后，积分需管理员复核后才计入排名和统计</view>
   <view class="main scroll">
     <scroll-view class="scroll" style="{{(config.event_review_status==1&&config.event_entry_review==1)?'height: calc(100vh - 2.6rem)':''}}" 
       a:if="{{activeIndex==1&&list.length>0}}" scroll-y="{{true}}" onScrollToLower="onScrollToLower">

pages/statistics/my_apply/my_apply.axml

@@ -14,7 +14,7 @@
       <view data-index="1" class="{{activeIndex == 1? 'active':''}} flex-1" catchTap="activeItem">已复核</view>
     </view>
   </view>
-  <view class="yellowText" a:if="{{config.event_review_status==1&&config.event_apply_review==1}}">复核开启后，积分需管理员复核后才计入排名和统计</view>
+  <view class="orangeText" a:if="{{config.event_review_status==1&&config.event_apply_review==1}}">复核开启后，积分需管理员复核后才计入排名和统计</view>
   <view class="main scroll">
     <scroll-view class="scroll" style="{{(config.event_review_status==1&&config.event_apply_review==1)?'height: calc(100vh - 2.68rem)':''}}" a:if="{{list.length>0}}" scroll-y="{{true}}" onScrollToLower="onScrollToLower">
       <view class="flex-box li border-bottom" catchTap="openDetail" a:for="{{list}}" data-item="{{item}}" key="{{item.id}}">

pages/statistics/my_issue/my_issue.axml

@@ -52,15 +52,15 @@
           <view class="flex-box flex-v-ce">
             <view class="date flex-1">{{item.expire_time}}截止</view>
             <block a:if="{{activeIndex==1}}">
-              <view class="yellowBox2" a:if="{{item.status==1}}">进行中</view>
+              <view class="yellowBox" a:if="{{item.status==1}}">进行中</view>
               <view class="greenBox" a:elif="{{item.status==2}}">已完成</view>
               <view class="redBox" a:elif="{{item.status==3}}">退回</view>
               <view class="greenBox" a:elif="{{item.status==4}}">已审批</view>
               <view class="textBox" a:else>已撤回</view>
             </block>
             <block a:else>
-              <view class="yellowBox" a:if="{{item.status==1}}">待领取</view>
-              <view class="yellowBox2" a:elif="{{item.status==2}}">进行中</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>
@@ -73,11 +73,11 @@
     <scroll-view class="scroll" a:if="{{activeIndex==3&&list.length>0}}" scroll-y="{{true}}" onScrollToLower="onScrollToLower">
       <view class="li2 border-bottom" data-index="2" a:for="{{list}}" catchTap="openDetail" data-item="{{item}}">
         <view style="margin-bottom:10rpx;">{{item.name}}</view>
-        <view class="flex-box flex-v-ce fontColorX" style="font-size:28rpx;">
+        <view class="flex-box flex-v-ce fontColorC" style="font-size:28rpx;">
           <image mode="scaleToFill" src="../../../image/sj2.png"/>
           <text a:if="{{item.task_cycle == 1}}">每天0点自动发布，{{item.task_cycle_value > 9 ? item.task_cycle_value + ': 00' : '0' + item.task_cycle_value + ': 00'}}截止</text>
-          <text a:if="{{item.task_cycle == 2}}">每天自动发布，周{{weekList[item.task_cycle_value - 1]}}截止</text>
-          <text a:if="{{item.task_cycle == 3}}">每月1号自动发布，{{item.task_cycle_value - 1}}号截止</text>
+          <text a:if="{{item.task_cycle == 2}}">每周一自动发布，周{{weekList[item.task_cycle_value - 1]}}截止</text>
+          <text a:if="{{item.task_cycle == 3}}">每月1号自动发布，{{item.task_cycle_value }}号截止</text>
         </view>
       </view>
       <view class="noDatas" a:if="{{isData}}">没有更多咯</view>

pages/statistics/my_sp/my_sp.axml

@@ -23,7 +23,7 @@
       </view>
     </form>
   </view>
-  <view class="yellowText" a:if="{{config.event_review_status==1}}">复核开启后，积分需管理员复核后才计入排名和统计</view>
+  <view class="orangeText" a:if="{{config.event_review_status==1}}">复核开启后，积分需管理员复核后才计入排名和统计</view>
   <view class="main scroll">
     <scroll-view class="scroll" style="{{config.event_review_status==1?'height: calc(100vh - 2.58rem)':''}}" a:if="{{(minuteIndex==0)&&list.length>0}}" scroll-y="{{true}}" onScrollToLower="onScrollToLower">
       <view class="li border-bottom" a:for="{{list}}" key="{{item.id}}">
@@ -37,7 +37,7 @@
             </view>
             <view class="content">{{item.task_name}}</view>
             <view class="flex-box li-bottom">
-              <text class="flex-1 fontColorX {{item.isCs? 'red':''}}">{{item.expire_time}} 截止</text>
+              <text class="flex-1 fontColorC {{item.isCs? 'red':''}}">{{item.expire_time}} 截止</text>
               <button type="primary" class="defBtn" catchTap="openDetail" data-item="{{item}}">查看任务</button>
             </view>
           </view>
@@ -57,7 +57,7 @@
             </view>
             <view class="content">{{item.task_name}}</view>
             <view class="flex-box li-bottom">
-              <text class="flex-1 fontColorX">{{item.expire_time}} 截止</text>
+              <text class="flex-1 fontColorC">{{item.expire_time}} 截止</text>
               <button type="primary" class="defBtn" catchTap="openDetail" data-item="{{item}}">查看任务</button>
               <button a:if="{{minuteIndex==1}}" type="primary" class="defBtn" catchTap="openDetail2" data-item="{{item}}" style="margin-left:20rpx;">去审批</button>
               <button a:if="{{minuteIndex==2}}" type="primary" class="defBtn" catchTap="openDetail2" data-item="{{item}}" style="margin-left:20rpx;">查看审批</button>

pages/statistics/my_task/my_task.axml

@@ -18,7 +18,7 @@
       </view>
     </form>
   </view>
-  <view class="yellowText" a:if="{{config.event_review_status==1&&config.event_task_review==1}}">复核开启后，积分需管理员复核后才计入排名和统计</view>
+  <view class="orangeText" a:if="{{config.event_review_status==1&&config.event_task_review==1}}">复核开启后，积分需管理员复核后才计入排名和统计</view>
   <view class="main scroll">
     <scroll-view class="scroll" style="{{(config.event_review_status==1&&config.event_task_review==1)?'height: calc(100vh - 2.6rem)':''}}"  a:if="{{(activeIndex==1)&&list.length>0}}" scroll-y="{{true}}" onScrollToLower="onScrollToLower">
       <view class="task" a:if="{{toList.length>0}}">今日任务</view>
@@ -29,7 +29,7 @@
           <text a:else>{{item.point_config.base_point}}  {{item.pt_name}}</text>
         </view>
         <view class="flex-box li-bottom">
-          <text class="flex-1 fontColorX" catchTap="openDetail" data-item="{{item}}">{{item.expire_time}} 截止</text>
+          <text class="flex-1 fontColorC" catchTap="openDetail" data-item="{{item}}">{{item.expire_time}} 截止</text>
           <button type="primary" class="defBtn" a:if="{{item.status == 1}}" data-is="{{true}}" data-item="{{item}}" onTap="openPerform">完成任务</button>
           <text class="yellowBox" a:if="{{item.status == 2}}">待审批</text>
           <text class="redBox" a:if="{{item.review_status == 2}}">审批驳回</text>
@@ -44,7 +44,7 @@
           <text a:else>{{item.point_config.base_point}}  {{item.pt_name}}</text>
         </view>
         <view class="flex-box li-bottom">
-          <text class="flex-1 fontColorX {{item.isCs? 'red':''}}" catchTap="openDetail" data-item="{{item}}">{{item.expire_time}} 截止</text>
+          <text class="flex-1 fontColorC {{item.isCs? 'red':''}}" catchTap="openDetail" data-item="{{item}}">{{item.expire_time}} 截止</text>
           <button type="primary" class="defBtn" a:if="{{item.status == 1}}" data-item="{{item}}" onTap="openPerform">完成任务</button>
           <text class="yellowBox" a:if="{{item.status == 2}}">待审批</text>
           <text class="redBox" a:if="{{item.status == 3}}">审批驳回</text>
@@ -61,7 +61,7 @@
           <text a:else>{{item.point_config.base_point}}  {{item.pt_name}}</text>
         </view>
         <view class="flex-box li-bottom">
-          <text class="flex-1 fontColorX" catchTap="openDetail" data-item="{{item}}">{{item.expire_time}} 截止</text>
+          <text class="flex-1 fontColorC" catchTap="openDetail" data-item="{{item}}">{{item.expire_time}} 截止</text>
           <button type="primary" class="defBtn" a:if="{{item.status == 1}}" data-item="{{item}}" onTap="openPerform">完成任务</button>
           <text class="yellow" a:if="{{item.review_status == 0}}">待处理</text>
           <text class="green" a:if="{{item.review_status == 1}}">已通过</text>

pages/statistics/offerAreward/offerAreward.axml

@@ -55,8 +55,8 @@
             </view>
           </view>
           <block a:if="{{selectRule}}">
-            <view class="fontColorT input_text" a:if="{{selectRule.range_type==1&&selectRule.min_point==selectRule.max_point}}">固定：{{selectRule.min_point}} {{selectRule.pt_Obj[0].name}}</view>
-            <view class="fontColorT input_text" a:else> 范围(可修改)：{{selectRule.min_point}}至{{selectRule.max_point}}
+            <view class="fontColorD input_text" a:if="{{selectRule.range_type==1&&selectRule.min_point==selectRule.max_point}}">固定：{{selectRule.min_point}} {{selectRule.pt_Obj[0].name}}</view>
+            <view class="fontColorD input_text" a:else> 范围(可修改)：{{selectRule.min_point}}至{{selectRule.max_point}}
               <text>{{selectRule.pt_Obj[0].name}}</text></view>
           </block>
         </view>
@@ -74,6 +74,15 @@
         <view class="flex-1">{{items.revieweName}}</view>
         <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
       </view>
+      <view class="flex-box flex-v-ce li">
+        <view class="label">重复周期</view>
+        <view class="flex-1">
+          <picker onChange="bindObjPickerChange" value="{{arrIndex}}" range="{{objectArray}}" range-key="name">
+            <view class="row-extra">{{objectArray[arrIndex].name}}</view>
+          </picker>
+        </view>
+        <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
+      </view>
       <view class="flex-box flex-v-ce li  margin-bottom">
         <view class="label isBt">截止时间</view>
         <view class="flex-1" a:if="{{items.task_cycle==0}}" catchTap="openDate">{{items.expire_time}}</view>
@@ -87,15 +96,6 @@
       <view class="li">
         <textarea maxlength="300" value="{{items.task_remark}}" onInput="bindTextAreaBlur2" placeholder="请输入任务描述" data-index="{{index}}"></textarea>
       </view>
-      <view class="flex-box flex-v-ce li">
-        <view class="label">重复周期</view>
-        <view class="flex-1">
-          <picker onChange="bindObjPickerChange" value="{{arrIndex}}" range="{{objectArray}}" range-key="name">
-            <view class="row-extra">{{objectArray[arrIndex].name}}</view>
-          </picker>
-        </view>
-        <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
-      </view>
       <view class="flex-box li" style="padding:15rpx 28rpx;">
         <view class="label2" style="position: relative;top:10rpx;">提前奖分(天)</view>
         <text class="red" style="position: relative;top:10rpx;">+</text>

pages/statistics/offerAreward/offerAreward.js

@@ -1,6 +1,7 @@
 var app = getApp()
 var that;
 var animation;
+import moment from 'moment' // 时间库
 Page({
   data: {
     items: {
@@ -528,16 +529,55 @@ Page({
       delete items.expire_time
       url = '/api/integral/schedule/publish/task'
     }
+    let is=true;
+    if(this.data.items.task_cycle==1&&this.data.items.task_expire_day<=moment().format('HH')){
+      is=false  
+    }else if(this.data.items.task_cycle==2&&this.data.items.task_expire_day<=moment().day()){
+      is=false  
+    }else if(this.data.items.task_cycle==3&&this.data.items.task_expire_day<=moment().format('D')){
+      is=false  
+    }
     app.$post(url, items).then((res) => {
       this.showToast(res.data.msg);
-      setTimeout(() => {
-        dd.navigateBack({ delta: 1 })
-      }, 1000);
+      let str=this.data.items.task_cycle==1? '您发布的每日重复任务将于明天0点执行自动发布，是否需要立即发布一条任务？':this.data.items.task_cycle==2? '您发布的每周重复任务将于下周一执行自动发布，是否需要立即发布一条任务？':'您发布的每月重复任务将于下个月1号执行自动发布，是否需要立即发布一条任务？'
+      if(this.data.items.task_cycle!=0&&is){
+          dd.confirm({
+            title: '温馨提示',
+            content: str,
+            confirmButtonText: '发布',
+            cancelButtonText: '不需要',
+            success: (result) => {
+              if(result.confirm){
+                this.executeTask(res.data.data)
+              }else{
+                setTimeout(() => {
+                    dd.navigateBack({ delta: 1 })
+                }, 1000);
+              }
+            },
+          });
+      }else{
+        setTimeout(() => {
+            dd.navigateBack({ delta: 1 })
+        }, 1000);
+      }
+
+
     }).catch(err => {
       this.setData({ disabled: false });
     }).finally(err => {
       this.setData({ disabled: false });
     })
+  },
+      //执行周期任务
+  executeTask(id){
+    	app.$post('/api/integral/schedule/hand_exec',{schedule_id:id}).then(res => {
+        this.showToast('已发布');
+    	}).finally(err => {
+        setTimeout(() => {
+            dd.navigateBack({ delta: 1 })
+        }, 1000);
+      });
   },
   //选择时间
   openDate(e) {

pages/statistics/offerAreward_set/offerAreward_set.axml

@@ -55,8 +55,8 @@
             </view>
           </view>
           <block a:if="{{selectRule}}">
-            <view class="fontColorT input_text" a:if="{{selectRule.range_type==1&&selectRule.min_point==selectRule.max_point}}">固定：{{selectRule.min_point}} {{items.pt_name}}</view>
-            <view class="fontColorT input_text" a:else> 范围(可修改)：{{selectRule.min_point}}至{{selectRule.max_point}}
+            <view class="fontColorD input_text" a:if="{{selectRule.range_type==1&&selectRule.min_point==selectRule.max_point}}">固定：{{selectRule.min_point}} {{items.pt_name}}</view>
+            <view class="fontColorD input_text" a:else> 范围(可修改)：{{selectRule.min_point}}至{{selectRule.max_point}}
               <text>{{items.pt_name}}</text>
             </view>
           </block>

pages/statistics/prizeBuckleDetail/prizeBuckleDetail.axml

@@ -87,7 +87,7 @@
     </block>
   </view>
   <view class="bottom flex-box flex-flex-center-center" a:if="{{dataDetail.recorder_id==userId&&dataDetail.process.length==1&&(dataDetail.event_type==3||dataDetail.event_type==4)}}">
-    <text class="flex-2 fontColorF">撤销后数据将不可恢复</text>
+    <text class="flex-2 fontColorB">撤销后数据将不可恢复</text>
     <view></view>
     <view class="flex-1 blueBtn" catchTap="openCx">撤销奖扣</view>
   </view>

pages/statistics/repetitive_tasks_detail/repetitive_tasks_detail.axml

@@ -1,16 +1,6 @@
 <view>
   <view class="header margin-bottom">
     <view class="header-main">
-      <view class="flex-box ">
-        <view class="laber">发布时间</view>
-        <view class="flex-1">{{dataDetail.create_time}}</view>
-      </view>
-      <view class="flex-box ">
-        <view class="laber">截止时间</view>
-        <view class="flex-1" a:if="{{dataDetail.task_cycle==1}}">{{dataDetail.task_cycle_mark}}{{dataDetail.task_cycle_value}}点</view>
-        <view class="flex-1" a:if="{{dataDetail.task_cycle==2}}">周{{dataDetail.task_cycle_value}}</view>
-        <view class="flex-1" a:if="{{dataDetail.task_cycle==3}}">{{dataDetail.task_cycle_mark}}{{dataDetail.task_cycle_value}}号</view>
-      </view>
       <view class="flex-box ">
         <view class="laber">任务内容</view>
         <view class="flex-1">{{dataDetail.name}}</view>
@@ -19,18 +9,46 @@
         <view class="laber">任务描述</view>
         <view class="flex-1">{{dataDetail.remark}}</view>
       </view>
+      <view class="flex-box flex-v-ce">
+        <view class="laber">执行周期</view>
+        <view class="flex-1">{{dataDetail.target_info.length>0? '临时任务-':'悬赏任务-'}}{{dataDetail.task_cycle_mark}}</view>
+      </view>
       <view class="flex-box flex-v-ce" a:if="{{dataDetail.point_config.base_point}}">
         <view class="laber">任务积分</view>
         <view class="flex-1">{{dataDetail.point_config.base_point}}{{dataDetail.pt_name}}</view>
       </view>
-      <view class="flex-box flex-v-ce">
-        <view class="laber">任务类型</view>
-        <view class="flex-1">{{dataDetail.pt_name}}</view>
+      <view class="flex-box" a:if="{{dataDetail.file_list.length>0}}">
+        <view class="laber">任务附件</view>
+        <view class="flex-1 flex-box flex-v-ce imgs">
+          <image mode="scaleToFill" data-index="{{index}}" a:for="{{dataDetail.file_list}}" data-item="{{dataDetail.file_list}}" 
+            src="{{item}}" catchTap="showImg" />
+        </view>
       </view>
       <view class="flex-box flex-v-ce">
         <view class="laber">发布人</view>
         <view class="flex-1">{{dataDetail.owner_name}}</view>
       </view>
+      <view class="flex-box ">
+        <view class="laber">创建时间</view>
+        <view class="flex-1">{{dataDetail.create_time}}</view>
+      </view>
+      <view class="flex-box ">
+        <view class="laber">截止时间</view>
+        <view class="flex-1" a:if="{{dataDetail.task_cycle==1}}">{{dataDetail.task_cycle_mark}}{{dataDetail.task_cycle_value > 9 ? dataDetail.task_cycle_value + ': 00' : '0' + dataDetail.task_cycle_value + ': 00'}}点截止</view>
+        <view class="flex-1" a:if="{{dataDetail.task_cycle==2}}">{{dataDetail.task_cycle_mark}}{{ weekList[dataDetail.task_cycle_value - 1] }}截止</view>
+        <view class="flex-1" a:if="{{dataDetail.task_cycle==3}}">{{dataDetail.task_cycle_mark}}{{dataDetail.task_cycle_value}}号截止</view>
+      </view>
+      <view class="flex-box flex-v-ce">
+        <view class="laber">可见范围</view>
+        <view class="flex-1" a:if="{{dataDetail.department_info.length>0}}">
+          <text a:for="{{dataDetail.department_info}}">{{item.name}},</text>
+        </view>
+        <view class="flex-1" a:else>全公司</view>
+      </view>
+      <!-- <view class="flex-box flex-v-ce">
+        <view class="laber">任务类型</view>
+        <view class="flex-1">{{dataDetail.pt_name}}</view>
+      </view> -->
       <view class="flex-box flex-v-ce" a:if="{{dataDetail.point_config.ahead_award_point}}">
         <view class="laber">提前奖分</view>
         <view class="flex-1">{{dataDetail.point_config.ahead_award_point}}B分/天</view>
@@ -47,26 +65,10 @@
         <view class="laber">扣分上限</view>
         <view class="flex-1">{{dataDetail.point_config.timeout_deduction_point_limit}}B分</view>
       </view>
-      <view class="flex-box flex-v-ce">
-        <view class="laber">执行周期</view>
-        <view class="flex-1">{{dataDetail.task_cycle_mark}}</view>
-      </view>
-      <view class="flex-box flex-v-ce" a:if="{{dataDetail.department_info.length>0}}">
-        <view class="laber">可见范围</view>
-        <view class="flex-1">
-          <text a:for="{{dataDetail.department_info}}">{{item.name}},</text>
-        </view>
-      </view>
-      <view class="flex-box" a:if="{{dataDetail.file_list.length>0}}">
-        <view class="laber">任务附件</view>
-        <view class="flex-1 flex-box flex-v-ce imgs">
-          <image mode="scaleToFill" data-index="{{index}}" a:for="{{dataDetail.file_list}}" data-item="{{dataDetail.file_list}}" src="{{item}}" catchTap="showImg"/>
-        </view>
-      </view>
     </view>
     <view class="main margin-bottom">
       <block a:if="{{dataDetail.point_config}}">
-        <view class="mian-title border-bottom" a:if="{{dataDetail.point_config&&(dataDetail.point_config.item_info||dataDetail.point_config.rule_info)}}">规则依据1
+        <view class="mian-title border-bottom" a:if="{{dataDetail.point_config&&(dataDetail.point_config.item_info||dataDetail.point_config.rule_info)}}">规则依据
           <text>此事件打分参考以下积分规则</text>
         </view>
         <view class="header-main" a:if="{{dataDetail.point_config&&(dataDetail.point_config.item_info||dataDetail.point_config.rule_info)}}">
@@ -91,16 +93,16 @@
     </view>
     <view class="main">
       <view class="margin-top main-item">
-        <view class="margin-bottom">审批者</view>
+        <view class="margin-bottom">审批人</view>
         <view class="flex-box">
           <view class="flex-box-v flex-center-center img-item">
-            <img-box name="{{dataDetail.owner_name}}" imgUrl="{{dataDetail.img_url}}" height="90rpx" width="90rpx" fSize="28rpx"></img-box>
-            <text>{{dataDetail.owner_name}}</text>
+            <img-box name="{{dataDetail.reviewer_name}}" id="{{dataDetail.reviewer_id}}" height="90rpx" width="90rpx" fSize="28rpx"></img-box>
+            <text>{{dataDetail.reviewer_name}}</text>
           </view>
         </view>
       </view>
-      <view class="margin-top main-item" >
-        <view class="margin-bottom">执行者</view>
+      <view class="margin-top main-item" a:if="{{dataDetail.target_info.length>0}}">
+        <view class="margin-bottom">执行人</view>
         <view class="flex-box flex-d-wrap ">
           <view class="flex-box-v flex-center-center img-item" a:for="{{dataDetail.target_info}}">
             <img-box name="{{item.name}}" height="90rpx" width="90rpx" fSize="28rpx"></img-box>
@@ -110,7 +112,7 @@
       </view>
     </view>
     <view class="btn-area flex-box-ce">
-      <button type="primary"  class="flex-1 defBtn2"  style="margin-right:0.24rem" catchTap="fy">复制</button>
+      <button type="primary" class="flex-1 defBtn2" style="margin-right:0.24rem" catchTap="fy">复制</button>
       <button type="warn" loading="{{disabled}}" class="flex-3 defBtn2" disabled="{{disabled}}" catchTap="formSubmit">删除重复任务</button>
     </view>
   </view>

pages/statistics/repetitive_tasks_detail/repetitive_tasks_detail.js

@@ -6,6 +6,7 @@ Page({
     date: app.globalData.month,
     activeIndex: 1,
     id: '',
+    weekList: ['一', '二', '三', '四', '五', '六', '日']
   },
   onLoad(e) {
     that = this;

pages/statistics/sectionRanking/sectionRanking.axml

@@ -14,7 +14,7 @@
         <text class="{{showSx? 'activeView blue':''}}">{{sxVal}}</text>
       </view>
     </view>
-    <view class="fontColorF" style="font-size:28rpx;padding:10rpx 28rpx;">排名不包含初始分和工龄分</view>
+    <view class="fontColorB" style="font-size:28rpx;padding:10rpx 28rpx;">排名不包含初始分和工龄分</view>
     <view class="main scroll">
       <scroll-view class="scroll" scroll-y="{{true}}" a:if="{{list.length>0}}" onScrollToLower="onScrollToLower">
         <view a:for="{{list}}" data-item="{{item}}" class="flex-box flex-v-ce item border-bottom" key="{{item.id}}" catchTap="openDetail">

pages/statistics/taskDetail/taskDetail.axml

@@ -7,8 +7,8 @@
         <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="yellow" a:if="{{dataDetail.status==1}}">待领取</view>
-          <view class="yellow2" a:elif="{{dataDetail.status==2}}">进行中</view>
+          <view class="orange" a:if="{{dataDetail.status==1}}">待领取</view>
+          <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>

pages/statistics/taskSList/taskSList.acss

@@ -45,7 +45,7 @@
   padding: 24rpx 28rpx;
 }
 
-.li-bottom .fontColorX {
+.li-bottom .fontColorC {
   font-size: 24rpx;
 }
 .li-bottom .red {

pages/statistics/taskSList/taskSList.axml

@@ -12,7 +12,7 @@
             </view>
             <view class="content">{{item.task_name}}</view>
             <view class="flex-box-ce li-bottom">
-              <text class="flex-1 fontColorX">{{item.date}} 截止 
+              <text class="flex-1 fontColorC">{{item.date}} 截止 
                 <text class="red" a:if="{{parameter.index=='1'&&item.sub}}">逾期{{item.sub}}</text>
                 <text class="red" a:if="{{parameter.index=='4'&&item.sub}}">已等待{{item.sub}}</text>
               </text>

pages/statistics/task_rank/task_rank.axml

@@ -20,7 +20,7 @@
         <text class="{{showSx? 'activeView blue':''}}">{{sxVal}}</text>
       </view> -->
     </view>
-    <view class="fontColorF" style="font-size:28rpx;padding:10rpx 28rpx;">排名不包含初始分和工龄分</view>
+    <view class="fontColorB" style="font-size:28rpx;padding:10rpx 28rpx;">排名不包含初始分和工龄分</view>
     <view class="main scroll">
       <scroll-view class="scroll" scroll-y="{{true}}" a:if="{{list.length>0}}" onScrollToLower="onScrollToLower">
         <view a:for="{{list}}" data-item="{{item}}" class="flex-box flex-v-ce item border-bottom" key="{{item.id}}">

pages/statistics/userRamking/userRamking.axml

@@ -15,7 +15,7 @@
           <view class="flex-box flex-v-ce message border-bottom">
             <view class="flex-1">
               <view class="title">{{item.group_name}}</view>
-              <!-- <view class="num fontColorF">共{{item.employees.length}}人参与排名</view> -->
+              <!-- <view class="num fontColorB">共{{item.employees.length}}人参与排名</view> -->
             </view>
             <!-- <view onTap="openCompile" class="openCompile" data-item="{{item}}">
               <image mode="scaleToFill" src="../../../image/Bj.png" style="width:40rpx;height:40rpx"></image>
@@ -29,7 +29,7 @@
       </view>
     </block>
     <!-- <view a:else class="noDataBox">
-      <view class="noDataTop fontColorF">
+      <view class="noDataTop fontColorB">
         <view>暂无分组</view>
         <view>通过分组你可针对性的查看对应人员的B分排名</view>
       </view>

pages/statistics/workDetail/workDetail.axml

@@ -165,7 +165,7 @@
           <img-box name="{{item.recorder}}" imgUrl="{{item.img_url}}" height="90rpx" width="90rpx" fSize="28rpx"></img-box>
           <view class="top-left flex-1">
             <view class="flex-box flex-v-ce">
-              <view class="fontColorX flex-1">{{item.recorder}}</view>
+              <view class="fontColorC flex-1">{{item.recorder}}</view>
               <view style="font-size:28rpx">{{item.time}}</view>
             </view>
             <view style="color:#222;margin-right:80rpx;word-break: break-all;">{{item.remark}}</view>
@@ -188,7 +188,7 @@
           <img-box name="{{item.recorder}}" imgUrl="{{item.img_url}}" height="90rpx" width="90rpx" fSize="28rpx"></img-box>
           <view class="top-left flex-1">
             <view class="flex-box flex-v-ce">
-              <view class="fontColorX flex-1">{{item.recorder}}</view>
+              <view class="fontColorC flex-1">{{item.recorder}}</view>
               <view style="font-size:28rpx">{{item.time}}</view>
             </view>
             <view a:if="{{item.point*1 > 0}}" style="margin-bottom:10rpx;">+{{item.point}}</view>

pages/workbench/apply/apply.axml

@@ -32,11 +32,11 @@
                   <text class="red" a:if="{{item.selectRule.min_point>0}}"> {{item.selectRule.min_point}}~{{item.selectRule.max_point}}</text>
                   <text class="green" a:else>{{item.selectRule.min_point}} ~ {{item.selectRule.max_point}}</text>
               </view>
-              <view class="fontColorF" style="margin-left:10rpx;">
+              <view class="fontColorB" style="margin-left:10rpx;">
                 {{item.selectRule.pt_Obj.name}}
               </view>
           </view>
-          <view style="font-size:24rpx;margin-left:10rpx;" class="fontColorF">
+          <view style="font-size:24rpx;margin-left:10rpx;" class="fontColorB">
             {{item.selectRule.remark}}
           </view>
         </view>

pages/workbench/apply/apply.js

@@ -135,8 +135,8 @@ Page({
     app.$get('/api/employee/info', { id: id }).then(res => {
       var item = res.data.data || {}
       if (item.employee_detail.superior_list && item.employee_detail.superior_id != 0) {
-        let obj = item.employee_detail.superior_list.filter(x => x.id == item.employee_detail.superior_id)[0];
-        if (obj.id == app.globalData.userData.id) {
+        let obj = item.employee_detail.superior_list.filter(x => x.id == item.employee_detail.superior_id)[0]||{};
+        if(obj&&obj.id == app.globalData.userData.id){
           this.getReviewerObj(id, fuc)
         } else {
           fuc(obj)

pages/workbench/approve/approve.axml

@@ -7,7 +7,7 @@
           <view class="flex-box flex-v-ce li" style="padding:26rpx 28rpx;">
             <view class="label">分类名称</view>
             <view class="flex-1"></view>
-            <view class="fontColorF">{{item.rule_name}}</view>
+            <view class="fontColorB">{{item.rule_name}}</view>
           </view>
           <view class="flex-box flex-v-ce li">
             <view class="label isBt">选择规则</view>
@@ -24,11 +24,11 @@
                 <text class="red" a:if="{{item.selectRule.min_point>0}}"> +{{item.selectRule.min_point}}~{{item.selectRule.max_point}}</text>
                 <text class="green" a:else>{{item.selectRule.min_point}} ~ {{item.selectRule.max_point}}</text>
               </view>
-              <view class="fontColorF" style="margin-left:10rpx;">
+              <view class="fontColorB" style="margin-left:10rpx;">
                   {{item.selectRule.pt_Obj.name}}
               </view>
             </view>
-            <view style="font-size:24rpx;margin-left:10rpx;" class="fontColorF">
+            <view style="font-size:24rpx;margin-left:10rpx;" class="fontColorB">
               {{item.selectRule.remark}}
             </view>
           </view>
@@ -51,8 +51,8 @@
 
               </view>
               <block a:if="{{item.selectRule}}">
-                <view class="fontColorT input_text" a:if="{{item.selectRule.range_type==1}}">固定：{{item.selectRule.min_point}} {{item.selectRule.pt_Obj.name}}</view>
-                <view class="fontColorT input_text" a:else> 范围(可修改)：{{item.selectRule.min_point}}至{{item.selectRule.max_point}}
+                <view class="fontColorD input_text" a:if="{{item.selectRule.range_type==1}}">固定：{{item.selectRule.min_point}} {{item.selectRule.pt_Obj.name}}</view>
+                <view class="fontColorD input_text" a:else> 范围(可修改)：{{item.selectRule.min_point}}至{{item.selectRule.max_point}}
                   <text>{{item.selectRule.pt_Obj.name}}</text></view>
               </block>
             </view>
@@ -63,7 +63,7 @@
           <view class="flex-box flex-v-ce li" style="padding:26rpx 28rpx;">
             <view class="label">分类名称</view>
             <view class="flex-1"></view>
-            <view class="fontColorF">{{item.rule_name}}</view>
+            <view class="fontColorB">{{item.rule_name}}</view>
           </view>
           <view class="margin-bottom"></view>
           <view class="flex-box li margin-bottom" style="padding:15rpx 28rpx;">
@@ -82,7 +82,7 @@
           <view class="flex-box flex-v-ce li" style="padding:26rpx 28rpx;">
             <view class="label">分类名称</view>
             <view class="flex-1"></view>
-            <view class="fontColorF">{{item.rule_name}}</view>
+            <view class="fontColorB">{{item.rule_name}}</view>
           </view>
           <view class="flex-box li margin-bottom" style="padding:15rpx 28rpx;">
             <view class="label isBt" style="position: relative;top:8rpx;">积分</view>
@@ -101,8 +101,8 @@
                 </view>
               </view>
               <block a:if="{{item.selectRule}}">
-                <view class="fontColorT input_text" a:if="{{item.selectRule.range_type==1}}">固定：{{item.selectRule.min_point}} {{item.selectRule.pt_Obj.name}}</view>
-                <view class="fontColorT input_text" a:else> 范围(可修改)：{{item.selectRule.min_point}}至{{item.selectRule.max_point}}
+                <view class="fontColorD input_text" a:if="{{item.selectRule.range_type==1}}">固定：{{item.selectRule.min_point}} {{item.selectRule.pt_Obj.name}}</view>
+                <view class="fontColorD input_text" a:else> 范围(可修改)：{{item.selectRule.min_point}}至{{item.selectRule.max_point}}
                   <text>{{item.selectRule.pt_Obj.name}}</text></view>
               </block>
             </view>
@@ -136,11 +136,11 @@
                 <text class="red" a:if="{{item.selectRule.min_point>0}}"> +{{item.selectRule.min_point}}~{{item.selectRule.max_point}}</text>
                 <text class="green" a:else>{{item.selectRule.min_point}} ~ {{item.selectRule.max_point}}</text>
               </view>
-              <view class="fontColorF" style="margin-left:10rpx;">
+              <view class="fontColorB" style="margin-left:10rpx;">
                   {{item.selectRule.pt_Obj.name}}
               </view>
             </view>
-            <view style="font-size:24rpx;margin-left:10rpx;" class="fontColorF">
+            <view style="font-size:24rpx;margin-left:10rpx;" class="fontColorB">
               {{item.selectRule.remark}}
             </view>
           </view>
@@ -162,8 +162,8 @@
                 </view>
               </view>
               <block a:if="{{item.selectRule}}">
-                <view class="fontColorT input_text" a:if="{{item.selectRule.range_type==1}}">固定：{{item.selectRule.min_point}} {{item.selectRule.pt_Obj.name}}</view>
-                <view class="fontColorT input_text" a:else> 范围(可修改)：{{item.selectRule.min_point}}至{{item.selectRule.max_point}}
+                <view class="fontColorD input_text" a:if="{{item.selectRule.range_type==1}}">固定：{{item.selectRule.min_point}} {{item.selectRule.pt_Obj.name}}</view>
+                <view class="fontColorD input_text" a:else> 范围(可修改)：{{item.selectRule.min_point}}至{{item.selectRule.max_point}}
                   <text>{{item.selectRule.pt_Obj.name}}</text></view>
               </block>
             </view>
@@ -186,7 +186,7 @@
             </view>
           </view>
         </block>
-        <view class="fontColorF" style="font-size:24rpx;padding-left:28rpx">奖票多用于优秀表现和重要事项的表彰</view>
+        <view class="fontColorB" style="font-size:24rpx;padding-left:28rpx">奖票多用于优秀表现和重要事项的表彰</view>
         <view class="flex-box flex-v-ce li margin-bottom" style="padding:26rpx 28rpx;">
           <view class="label">发放奖票</view>
           <view class="flex-1"></view>

pages/workbench/approve/approve.js

@@ -80,6 +80,7 @@ Page({
     var item = that.data.item;
     var data, point;
     var num = item.checked ? item.point : item.point2
+    console.log(item)
     if (item.checked) {
       if (!item.rule_id) {
         this.showToast("请选择所属规则")
@@ -247,10 +248,11 @@ Page({
       }
 
       var isData, selectRule;
-      var checked = true;
+      var checked = false;
       if (data.rule_id && data.item_id) {
         console.log(1);
         isData = 1;
+        checked = true;
         selectRule = {
           range_type: data.item_range_type,
           min_point: data.item_min_point,
@@ -279,6 +281,7 @@ Page({
         ['item.checked']: checked,
         ['item.selectRule']: selectRule,
         ['item.rule_id']: data.rule_id,
+        ['item.rule_id2']: data.rule_id,
         ['item.item_id']: data.item_id,
         ['item.rule_name']: data.rule_name,
         ['item.point']: getPoint == 0 ? '' : getPoint,

pages/workbench/approveDetail/approveDetail.axml

@@ -4,7 +4,7 @@
       <img-box a:if="{{dataDetail.employee_name}}" imgUrl="{{dataDetail.employee_img}}" name="{{dataDetail.employee_name}}" height="90rpx" width="90rpx" fSize="24rpx"></img-box>
       <view class="header-top-right">
         <view class="name">{{dataDetail.employee_name}}</view>
-        <view class="yellow" a:if="{{dataDetail.review_status==0}}">{{dataDetail.status_mark}}</view>
+        <view class="orange" a:if="{{dataDetail.review_status==0}}">{{dataDetail.status_mark}}</view>
         <view class="red" a:if="{{dataDetail.review_status==1}}">{{dataDetail.status_mark}}</view>
         <view class="green" a:if="{{dataDetail.review_status==2}}">{{dataDetail.status_mark}}</view>
       </view>
@@ -95,7 +95,7 @@
       <view class="flex-3 blueBtn" catchTap="submit">通过</view>
     </block>
     <block a:if="{{dataDetail.can_refuse == '1'}}">
-      <text class="flex-2 fontColorF">撤回后需重新审批</text>
+      <text class="flex-2 fontColorB">撤回后需重新审批</text>
       <view></view>
       <view class="flex-1 blueBtn" catchTap="openCx">撤回</view>
     </block>
@@ -107,13 +107,13 @@
       <view class="flex-3 blueBtn" catchTap="submit">通过</view>
     </block>
     <block a:if="{{dataDetail.can_refuse == '1'}}">
-      <text class="flex-2 fontColorF">撤回后需重新审批</text>
+      <text class="flex-2 fontColorB">撤回后需重新审批</text>
       <view></view>
       <view class="flex-1 blueBtn" catchTap="openCx">撤回</view>
     </block>
   </view>
   <view class="bottom flex-box flex-flex-center-center" a:if="{{dataDetail.applyor_id==userData.id&&dataDetail.can_refuse == '1'&&dataDetail.source_type==2}}">
-    <text class="flex-2 fontColorF">撤销申请后数据将不可恢复</text>
+    <text class="flex-2 fontColorB">撤销申请后数据将不可恢复</text>
     <view></view>
     <view class="flex-1 blueBtn" catchTap="openCx">撤销申请</view>
   </view>
@@ -124,13 +124,13 @@
       <view class="flex-3 blueBtn" catchTap="submit">通过</view>
     </block>
     <block a:if="{{dataDetail.can_refuse == '1'}}">
-      <text class="flex-2 fontColorF">撤回后需重新审批</text>
+      <text class="flex-2 fontColorB">撤回后需重新审批</text>
       <view></view>
       <view class="flex-1 blueBtn" catchTap="openCx">撤回</view>
     </block>
   </view>
   <view class="bottom flex-box flex-flex-center-center" a:if="{{dataDetail.applyor_id==userData.id&&dataDetail.can_refuse == '1'&&dataDetail.source_type==3}}">
-    <text class="flex-2 fontColorF">撤销奖扣后数据将不可恢复</text>
+    <text class="flex-2 fontColorB">撤销奖扣后数据将不可恢复</text>
     <view></view>
     <view class="flex-1 blueBtn" catchTap="openCx">撤销奖扣</view>
   </view>

pages/workbench/index/index.axml

@@ -53,7 +53,7 @@
   <view class="main margin-bottom">
     <view class="main-title flex-box flex-v-ce" onTap="openView" data-index="10">
       <text class="flex-1" style="font-size:32rpx">排行榜</text>
-      <text class="fontColorF" style="font-size:28rpx">每小时更新一次</text>
+      <text class="fontColorB" style="font-size:28rpx">每小时更新一次</text>
     </view>
     <view a:for="{{rankingList}}" class="flex-box flex-v-ce" style="padding:0.28rem; border-bottom: 1px solid #f1f1f1; " 
       data-item="{{item}}" onTap="openViewRanking">
@@ -62,10 +62,10 @@
         <view class="ranking_num flex-1">
           <view>{{ item.group_name }}</view>
           <block a:if="{{item.rank}}">
-            <text a:if="{{getRole_four}}" class="fontColorF">第 {{ item.rank }} 名:{{item.employee_name}}</text>
-            <text a:else class="fontColorF">第 {{ item.rank }} 名</text>
+            <text a:if="{{getRole_four}}" class="fontColorB">第 {{ item.rank }} 名:{{item.employee_name}}</text>
+            <text a:else class="fontColorB">第 {{ item.rank }} 名</text>
           </block>
-          <text a:else class="fontColorF">不参与排名</text>
+          <text a:else class="fontColorB">不参与排名</text>
         </view>
         <image mode="scaleToFill" src="../../../image/right.png" class="img-right"></image>
       </view>
@@ -84,22 +84,22 @@
     <view class="main-main flex-box flex-center-center" data-index="7" catchTap="openView">
       <view class="flex-1">
         <view>{{userData.task.reward.point}}</view>
-        <view class="fontColorF" style="font-size:28rpx">奖分</view>
+        <view class="fontColorB" style="font-size:28rpx">奖分</view>
         <view class="font-flex-word numPoint">目标{{userData.task.reward.target_point}}</view>
       </view>
       <view class="flex-1">
         <view>{{userData.task.deduction.point}}</view>
-        <view class="fontColorF" style="font-size:28rpx">扣分</view>
+        <view class="fontColorB" style="font-size:28rpx">扣分</view>
         <view class="font-flex-word numPoint">目标{{userData.task.deduction.target_point}}</view>
       </view>
       <view class="flex-1">
         <view>{{userData.ratio.ratio}}</view>
-        <view class="fontColorF" style="font-size:28rpx">奖扣比例</view>
+        <view class="fontColorB" style="font-size:28rpx">奖扣比例</view>
         <view class="font-flex-word numPoint">目标{{userData.ratio.target_ratio}}</view>
       </view>
       <view class="flex-1">
         <view>{{userData.task.exec.count}}</view>
-        <view class="fontColorF" style="font-size:28rpx">奖扣人次</view>
+        <view class="fontColorB" style="font-size:28rpx">奖扣人次</view>
         <view class="font-flex-word numPoint">目标{{userData.task.exec.target_count}}</view>
       </view>
     </view>

pages/workbench/jk_A/jk_A.axml

@@ -49,8 +49,8 @@
               </view>
             </view>
             <block a:if="{{item.selectRule}}">
-              <view class="fontColorT input_text" a:if="{{item.selectRule.range_type==1&&item.selectRule.min_point==item.selectRule.max_point}}">固定：{{item.selectRule.min_point}} {{item.selectRule.pt_Obj[0].name}}</view>
-              <view class="fontColorT input_text" a:else> 范围(可修改)：{{item.selectRule.min_point}}至{{item.selectRule.max_point}}
+              <view class="fontColorD input_text" a:if="{{item.selectRule.range_type==1&&item.selectRule.min_point==item.selectRule.max_point}}">固定：{{item.selectRule.min_point}} {{item.selectRule.pt_Obj[0].name}}</view>
+              <view class="fontColorD input_text" a:else> 范围(可修改)：{{item.selectRule.min_point}}至{{item.selectRule.max_point}}
                 <text>{{item.selectRule.pt_Obj[0].name}}</text></view>
             </block>
           </view>

pages/workbench/jk_B/jk_B.axml

@@ -53,8 +53,8 @@
               </view>
             </view>
             <block a:if="{{item.selectRule}}">
-              <view class="fontColorT input_text" a:if="{{item.selectRule.range_type==1&&item.selectRule.min_point==item.selectRule.max_point}}">固定：{{item.selectRule.min_point}} {{item.selectRule.pt_Obj[0].name}}</view>
-              <view class="fontColorT input_text" a:else> 范围(可修改)：{{item.selectRule.min_point}}至{{item.selectRule.max_point}}
+              <view class="fontColorD input_text" a:if="{{item.selectRule.range_type==1&&item.selectRule.min_point==item.selectRule.max_point}}">固定：{{item.selectRule.min_point}} {{item.selectRule.pt_Obj[0].name}}</view>
+              <view class="fontColorD input_text" a:else> 范围(可修改)：{{item.selectRule.min_point}}至{{item.selectRule.max_point}}
                 <text>{{item.selectRule.pt_Obj[0].name}}</text></view>
             </block>
           </view>

pages/workbench/my_approve/my_approve.axml

@@ -8,7 +8,7 @@
       </view>
       <button size="mini" type="primary" catchTap="openPl">批量审批</button>
     </form>
-    <view class="yellowText" a:if="{{config.event_review_status==1}}">复核开启后，积分需管理员复核后才计入排名和统计</view>
+    <view class="orangeText" a:if="{{config.event_review_status==1}}">复核开启后，积分需管理员复核后才计入排名和统计</view>
     <view class="flex-box flex-v-ce selectItems border-bottom">
       <view data-index="1" class="{{activeIndex == 1? 'active':''}} flex-1" catchTap="activeItem">待我审批</view>
       <view data-index="2" class="{{activeIndex == 2? 'active':''}} flex-1" catchTap="activeItem">我已审批</view>

pages/workbench/prize_buckle/prize_buckle.axml

@@ -40,8 +40,8 @@
     <view class="headed-box margin-bottom">
       <view class="flex-box flex-v-ce">
         <view class="title flex-1" style="padding-bottom:0rpx">月奖扣执行情况</view>
-        <view class="fontColorT text1">奖分</view>
-        <view class="fontColorT text2">扣分</view>
+        <view class="fontColorD text1">奖分</view>
+        <view class="fontColorD text2">扣分</view>
       </view>
       <view class="f2-chart">
         <f2 onInit="onInitChart"></f2>
@@ -50,8 +50,8 @@
     <view class="headed-box margin-bottom">
       <view class="flex-box flex-v-ce">
         <view class="title flex-1" style="padding-bottom:0rpx">月奖扣人次</view>
-        <view class="fontColorT text1">奖分人次</view>
-        <view class="fontColorT text2">扣分人次</view>
+        <view class="fontColorD text1">奖分人次</view>
+        <view class="fontColorD text2">扣分人次</view>
       </view>
       <view class="f2-chart">
         <f2 onInit="onInitChart2" a:if="{{showtu}}"></f2>

pages/workbench/statistics_B/statistics_B.axml

@@ -27,13 +27,14 @@
         </view>
     </view>
   </view>
-  <!-- <view class="main margin-bottom">
-     <view class="title">积分构成</view>
-     <view class="f2-chart" a:if="{{pieData.length>0}}">
+  <view class="main margin-bottom">
+     <view class="title">B分构成</view>
+     <view class="f2-chart" a:if="{{pieData.length>0}}" style="height:800rpx">
         <f2 onInit="onInitChart2"></f2>
     </view>
+    <view style="padding-left:18px" a:if="{{pieData.length==8}}">...</view>
     <no-data a:if="{{pieData.length==0}}" content="无数据" />
-  </view> -->
+  </view>
   <view class="main margin-bottom">
       <view class="flex-box">
          <view class="title flex-1">奖分最多</view>

pages/workbench/statistics_B/statistics_B.js

@@ -6,11 +6,13 @@ var chart2;
 Page({
   data: {
     date: app.globalData.month,
+    // date:'2021-07' ,
     data_b: [],
     chartData: [],//折线图数据
     pieData: [1],//饼型图数据
     isShowTb:true,
-    employee_id:0,
+    employee_id:app.globalData.userData.id||0,
+
   },
   onLoad(e) {
     if(e.employee_id){
@@ -66,14 +68,13 @@ Page({
       }
     });
     chart2.legend({
-      position: 'right',
-      itemFormatter: function itemFormatter(val, index) {
+      position: 'bottom',
+      itemFormatter: function itemFormatter(val) {
         var str = '';
         that.data.pieData.forEach(item => {
           if (item.name == val) {
-            str = val + '  ' + item.point + '分';
+            str =item.str;
           }
-          
         })
         return str;
       }
@@ -86,10 +87,9 @@ Page({
     chart2.axis(false);
     chart2.interval()
       .position('a*percent')
-      .color('name', ['#1890FF', '#13C2C2', '#2FC25B', '#FACC14', '#F04864', '#8543E0'])
+      .color('name', ['#1890FF', '#8543E0', '#2FC25B', '#FACC14', '#F04864', '#13C2C2'])
       .adjust('stack')
-      .style({ lineWidth: 1, stroke: '#fff', lineJoin: 'round', lineCap: 'round' }).animate({
-        appear: { duration: 1200, easing: 'bounceOut' }
+      .style({ lineWidth: 1, stroke: '#fff', lineJoin: 'round', lineCap: 'round' }).animate({appear: { duration: 1200, easing: 'bounceOut' }
       });
     chart2.render();
     // 注意：需要把chart return 出来
@@ -145,9 +145,11 @@ Page({
       }
       start_date =n+"-"+y;
     }
-    var incident = app.$get("api/integral/statistics/b", { employee_id: that.data.employee_id, start_date: start_date, end_date: that.data.date, show_type: '2' });
-    var pei = app.$get("api/integral/statistics/pie/b", { employee_id: that.data.employee_id, month: that.data.date });
-    Promise.all([incident, pei]).then(resArr => {
+    let employee_id=that.data.employee_id||app.globalData.userData.id
+
+    var incident = app.$get("api/integral/statistics/b", { employee_id: employee_id, start_date: start_date, end_date: that.data.date, show_type: '2' });
+    var pei = app.$get("api/integral/statistics/pie/b", { employee_id: employee_id, month: that.data.date },'application/vnd.test.v2+json');
+    Promise.all([incident,pei]).then(resArr => {
       if (resArr[0].data.code == 1) {
         const { b, chart, good, bad } = resArr[0].data.data
         const points = chart.reward.map((rewardItem, index) => {
@@ -160,18 +162,21 @@ Page({
           data_bad: bad,
         });
       }
-      // if (resArr[1].data.code == 1) {
-      //   const pieData = resArr[1].data.data.list.map((item) => {
-      //     return { name: item.name, percent: item.point < 0 ? 0 : item.point, a:"1",point:item.point }
-      //   })
-      //   var isData=pieData.every(itme=>{
-      //       return itme.percent == 0;
-      //    })
-      //   that.setData({
-      //     pieData:isData?[]:pieData
-      //   });
-      //   chart2.changeData(pieData);
-      // }
+      if (resArr[1].data.code == 1) {
+        let pieData=[];
+        resArr[1].data.data.list.map((item,index) => {
+          if(index<8){
+              pieData.push({ name: item.name,a:'1', percent:item.reward, str:item.name + ' ' + '奖' + item.reward + ' ' + '扣' + item.deduction + ' ' + item.ratio + '%'})
+          }
+        })
+        var isData=pieData.every(itme=>{
+            return itme.percent == 0;
+         })
+        that.setData({
+          pieData:isData?[]:pieData
+        });
+        chart2.changeData(pieData);
+      }
     }).catch(e => {
       console.error(e)
     })