Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/course/lesson-form.vue

@@ -347,7 +347,7 @@
             </div>
           </div>
         </div>
-        <q-card-actions align="right" class="bg-white" v-if="isShowSignBtn">
+        <q-card-actions align="right" class="bg-white" v-if="isShowSignBtn&&isSigned">
           <q-btn label="取消" flat color="grey-10"
             style="font-weight:400 !important" @click="isShowSign=false" />
           <q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important"
@@ -418,6 +418,7 @@
         dayObj:{},
         isShowSignBtn:false, //是否显示签到提交按钮
         comChecked:{}, //点击选中复制
+        isSigned:true
       }
     },
     created() {
@@ -587,6 +588,17 @@
              }else{
                this.isShowSignBtn=false;
              }
+             var count=0;
+             this.dayObj.GuestList.forEach(x=>{
+               if(x.IsCheck==-1){
+                 count++;
+               }
+             })
+             if(count==this.dayObj.GuestList.length){
+                this.isSigned=true;
+             }else{
+                this.isSigned=false;
+             }
              this.dayObj.GuestList.forEach(x=>{
                if(this.isShowSignBtn&&x.IsCheck==-1){
                  x.IsCheck=0;

src/pages/course/classManage.vue

@@ -49,7 +49,7 @@
             <i class="iconfont icon-ren-" style="color:#3FC4FF;margin-left:30px;"></i>当前 <span
               style="color:#3FC4FF">{{props.row.OrderStudentCount}}</span>
             <q-linear-progress rounded size="20px"
-              :value="getProgress(props.row.OrderStudentCount,props.row.ClassPersion)" color="warning"
+              :value="getProgress(props.row.OrderStudentCount,props.row.ClassPersion)" style="background-color:#EEEEEF;color:#3FC4FF"
               class="q-mt-sm" />
           </q-td>
         </template>