Merge branch 'master' of http://gitlab.roboming.com/fengzhaoyu/schedule

pages/attendingSituation/attendingSituation.acss

@@ -95,13 +95,13 @@ page {
     background: #E60012 ;
 }
 .participatorStaus {
-    width: 20rpx;
+    width: 9px;
     text-align: center;
-    line-height: 20rpx;
+    line-height: 9px;
     color: #fff;
     font-size: 14rpx;
     border: 1rpx solid #fff;
-    height: 20rpx;
+    height: 9px;
     border-radius: 50%;
     position: absolute;
     bottom: 2rpx;

pages/createOrEditSchedule/createOrEditSchedule.acss

@@ -228,18 +228,21 @@ page {
 }
 
 .conflictTip {
-    font-size: 24rpx;
+    font-size: 14rpx;
     text-align: center;
-    width: 19rpx;
-    line-height: 19rpx;
-    height: 19rpx;
+    border: 1rpx solid #fff;
+    width: 9px;
+    line-height: 9px;
+    height: 9px;
     display: inline-block;
     border-radius: 50%;
-    background: #E60012;
     position: absolute;
+    background: #f25643;
     color: rgb(211, 190, 192);
-    bottom: -1rpx;
-    right: 13rpx;
+    bottom: -2rpx;
+    right: 12rpx;
+    color: rgb(204, 201, 201);
+    /* border: 1rpx solid #fff; */
 }
 
 .participants {

pages/createOrEditSchedule/createOrEditSchedule.axml

@@ -73,7 +73,7 @@
                 <image a:if="{{!!item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}"/>
                 <text a:else class="name">{{item.username.substring(item.username.length - 2, item.username.length)}}</text>
               </text>
-              <text a:if="{{conflictPeople.includes(item.userId)}}" class="conflictTip"></text>
+              <view a:if="{{conflictPeople.includes(item.userId)}}" class="conflictTip iconfont iconduigou "></view>
             </text>
           </view>
           <view class="addPeople iconfont icontianjia1" onTap="addParticipants">

pages/createOrEditSchedule/createOrEditSchedule.js

@@ -664,7 +664,7 @@ create.Page({
   },
   // 展示弹窗
   showModel: throttle(function (e) {
-    if (!!this.data.scheduleItem) {
+    if (!!this.data.scheduleItem&&this.store.data.userList.length>1) {
       this.setData({
         isShowPopupWindowList: true
       })

pages/participantsDetail/participantsDetail.acss

@@ -28,10 +28,15 @@ page {
     position: relative;
 }
 .conflict {
+    font-size: 14rpx;
     position: absolute;
-    width: 18rpx;
-    height: 18rpx;
-    background: red;
+    width: 9px;
+    height: 9px;
+    line-height: 9px;
+    text-align: center;
+    color: #fff;
+    border: 1rpx solid #fff;
+    background: #f25643;
     bottom: 3rpx;
     right: -2rpx;
     border-radius: 50%;

pages/participantsDetail/participantsDetail.axml

@@ -3,7 +3,7 @@
     <view class="headImg">
       <image a:if="{{!!item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}"/>
       <text a:else>{{item.username.substring(0, 1)}}</text>
-      <text  a:if="{{conflictPeople.includes(item.userId)}}"class="conflict"></text>
+      <text  a:if="{{conflictPeople.includes(item.userId)}}" class="conflict iconfont iconduigou"></text>
     </view>
     <view class="info">
       <text class="name">{{item.username}}</text>

pages/place/place.js

@@ -2,7 +2,6 @@ import create from 'dd-store'
 import exampleStore from '/stores/exampleStore'
 import { queryAvailableMeetingRoomByTime } from './../../api/request'
 import { throttle } from './../../utils/utils.js'
-
 create.Page({
   store: exampleStore,
   useAll: true,

pages/scheduleDetail/scheduleDetail.acss

@@ -312,8 +312,8 @@ page {
 
 .participatorStaus {
     border: 1rpx solid #fff;
-    width: 20rpx;
-    height: 20rpx;
+    width: 9px;
+    height: 9px;
     color: #fff;
     font-size: 14rpx;
     line-height: 20rpx;