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

src/components/finance/marketCommissionfrom.vue

@@ -359,7 +359,7 @@ export default {
                 }
                 else {
                     const needle = val.toLowerCase();
-                    this.myCourseList = this.allCourseList.filter(v => v.CateName.toLowerCase().indexOf(needle) > -1);
+                    this.myCourseList = this.allCourseList.filter(v => v.CourseName.toLowerCase().indexOf(needle) > -1);
                 }
             })
         },

src/pages/financial/market/commissionRule.vue

@@ -183,13 +183,13 @@
            
             <tr>
               <td rowspan="2" width="100" style="min-width: 100px;">提成比例</td>
-              <th style="min-width: 260px;"
+              <th style="min-width: 220px;"
                 v-for="( son , sIndex ) in item.RateList"
                 :key="sIndex"
               >{{ son.StartValue }} <span>{{son.EndValue && son.EndValue!=-1?'<业绩<=':'<业绩'}}</span><span v-if="son.EndValue && son.EndValue!=-1">{{ son.EndValue }}</span></th>
             </tr>
             <tr style="">
-              <td style="min-width: 260px;" v-for="( son , sIndex ) in item.RateList" :key="sIndex">{{ son.Rate }}%</td>
+              <td style="min-width: 220px;" v-for="( son , sIndex ) in item.RateList" :key="sIndex">{{ son.Rate }}%</td>
        
             </tr>
           </table>