Merge branch 'master' into lwh-dev

pages/login/login.vue

@@ -30,7 +30,7 @@
 			</view>
 		</view>
 		<view class="quick-title" @click="handleClickAgree">
-			<view class="icon-view" :class="{ 'icon-agree': agree }"><u-icon name="checkbox-mark" v-if="agree"></u-icon></view>
+			<view class="icon-view" :class="{ 'icon-agree': agree }"><u-icon name="checkmark-circle-fill" v-if="agree" size="44" color="#02A074"></u-icon></view>
 			<view class="agree-text-view">
 				我已阅读并同意
 				<text class="name-text" @tap.stop.prevent="handleClick('protocol')">《用户服务协议》</text>
@@ -317,7 +317,7 @@ export default {
 			height: 36rpx;
 			font-size: 18rpx;
 			border-radius: 50%;
-			border: 2rpx solid #3383fe;
+			border: 2rpx solid #333333;
 			display: flex;
 			justify-content: center;
 			align-items: center;
@@ -326,8 +326,9 @@ export default {
 		}
 
 		.icon-agree {
-			background-color: #3383fe;
-			color: #ffffff;
+			// background-color: #3383fe;
+			// color: #ffffff;
+			border: 0rpx;
 		}
 		.name-text {
 			color: #3383fe;

pages/workpoint/project-bill/components/cell-project-bill.vue

@@ -53,9 +53,9 @@ export default {
         imagekName: (this.member.memberName || '').substring((this.member.memberName || '').length - 2),
         memberId: this.member.memberId,
         memberName: this.member.memberName,
-        settleAmount: formatCount(Number(this.member.settleAmount || 0)), // 已结工资
+        settleAmount: formatCount(Math.abs(Number(this.member.settleAmount || 0))), // 已结工资
         borrowingAmount: formatCount(Number(this.member.contractorAmount || 0)), // 借支金额
-        unsettleAmount: formatCount(all - Number(this.member.settleAmount || 0)), // 未结工资
+        unsettleAmount: formatCount(all + Number(this.member.settleAmount || 0)), // 未结工资
         normalWorkTime: this.member.normalWorkTime, // 上班工时
         overWorkTIme: this.member.overWorkTIme, // 加班工量
         contractorNum: this.member.contractorNum, // 包工笔数
@@ -122,7 +122,7 @@ export default {
       display: flex;
       align-items: center;
       flex-direction: column;
-      justify-content: center;
+      justify-content: flex-start;
       font-size: 28rpx;
       font-weight: bold;
       color: #333333;

pages/workpoint/project-bill/components/summary-count.vue

@@ -5,7 +5,7 @@
         <view class="value-view">{{values[item.key]}}</view>
         <view class="label-view" @click="handleClickInfo(item.showTip)" :hover-class="item.showTip ? 'u-hover-class' : ''">
           <view>{{item.name}}</view>
-          <u-icon class="icon-view" v-if="item.showTip" name="info-circle-fill" color="#02A074" size="24"></u-icon>
+          <u-icon class="icon-view" v-if="item.showTip" name="info-circle-fill" color="#bdbdbd" size="24"></u-icon>
         </view>
       </view>
     </view>
@@ -39,9 +39,9 @@ export default {
       let all = parseFloat(this.detail.contractorAmount || 0) + parseFloat(this.detail.timeAmount || 0)
       return {
         all: keepWFull(all), // 项目工资
-        settleAmount: keepWFull(parseFloat(this.detail.settleAmount || 0)), // 已结工资
+        settleAmount: keepWFull(Math.abs(parseFloat(this.detail.settleAmount || 0))), // 已结工资
         borrowingAmount: keepWFull(parseFloat(this.detail.contractorAmount || 0)), // 借支金额
-        unsettleAmount: keepWFull(all - parseFloat(this.detail.settleAmount || 0)), // 未结工资
+        unsettleAmount: keepWFull(all + parseFloat(this.detail.settleAmount || 0)), // 未结工资
         normalWorkTime: this.detail.normalWorkTime, // 上班工时
         overWorkTIme: this.detail.overWorkTIme, // 加班工量
         contractorNum: this.detail.contractorNum, // 包工笔数