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

src/components/LeaderManagement/leaderPerformance.vue

@@ -296,7 +296,7 @@
           </span>
         </li>
         <li>
-          <span v-if="msg.Type==3||msg.Type==1">
+          <span v-if="msg.Type==3||msg.Type==6">
             <em>年份：</em>
             <el-date-picker v-model="msg.MonthStr" type="year" value-format="yyyy" placeholder="选择年">
             </el-date-picker>
@@ -324,7 +324,7 @@
             <el-select v-model="msg.Type" :placeholder="$t('system.ph_choice')">
               <el-option label="月榜" :value='2'></el-option>
               <el-option label="年榜" :value='3'></el-option>
-              <el-option label="总榜" :value='1'></el-option>
+              <el-option label="总榜" :value='6'></el-option>
               <el-option label="人均" :value='4'></el-option>
               <el-option label="回佣人均" :value='5'></el-option>
               </el-option>
@@ -357,7 +357,7 @@
               {{$t('leader.leader_Year')}}
               <i></i>
             </li>
-            <li :class="msg.Type==1?'Day_active':''" @click="msg.Type=1,getStatis()">
+            <li :class="msg.Type==6?'Day_active':''" @click="msg.Type=6,getStatis()">
               {{$t('leader.leader_All')}}
               <i></i>
             </li>