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

src/components/sale/orderlist.vue

@@ -66,7 +66,7 @@
                 <q-badge v-if="item.TargetJoinType==3" color="green" label="已续费" style="margin-left:5px;"
                   class="q-mr-xs" />
                 <div style="display:inline-block;">
-                  <q-badge v-if="(item.JoinType==4||item.JoinType==5) &&item.FirstOrderId>0" color="blue" label="关联拆分订单"
+                  <q-badge v-if="(item.JoinType==4||item.JoinType==5 ||item.TargetJoinType==4||item.TargetJoinType==5) &&item.FirstOrderId>0" color="blue" label="关联拆分订单"
                     style="margin-left:5px;cursor:pointer;">
                   </q-badge>
                   <q-popup-proxy>

src/pages/stuMan/stuClassManage.vue

@@ -80,7 +80,6 @@
             <span style="color:blue;cursor:pointer;" @click="goChapter(props.row.CouseId)">详情</span>
           </q-td>
         </template>
-
         <template v-slot:body-cell-ClassName="props">
           <q-td auto-width :props="props">
             <div style="display: flex;align-items: center;">
@@ -93,7 +92,6 @@
     
                 </div>
             </div>
-         
           </q-td>
         </template>
         <template v-slot:body-cell-OtherCourseName="props">
@@ -155,6 +153,8 @@
         </template>
         <template v-slot:body-cell-optioned="props">
           <q-td :props="props">
+            <q-btn v-if="props.row.ClassStatus==1" flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
+              @click="EditCourse(props.row)" />
             <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
               <q-list>
                 <q-item clickable v-close-popup @click="gotoOrder(props.row)">