Merge remote-tracking branch 'origin/main'

fuintAdmin/src/views/shopowner.vue

@@ -53,11 +53,6 @@
               class="el-icon-arrow-down el-icon--right"></i></div>
             <el-dropdown-menu slot="dropdown" >
               <el-dropdown-item v-for="(item,index) in amountList" :key="index" :command="item">{{item}}  </el-dropdown-item>
-<!--              <el-dropdown-item>昨日  </el-dropdown-item>-->
-<!--              <el-dropdown-item>本周  </el-dropdown-item>-->
-<!--              <el-dropdown-item>本月  </el-dropdown-item>-->
-<!--              <el-dropdown-item>本季度</el-dropdown-item>-->
-<!--              <el-dropdown-item>本年  </el-dropdown-item>-->
             </el-dropdown-menu>
           </el-dropdown>
           <div class="h-anniu" :class="{'q-anniu' : dataTimeShow == true}" @click="dataTimeShow = true"> 自定义
@@ -871,7 +866,6 @@ export default {
         xAxis: [
           {
             type: 'category',
-            // data: ['中建锦绣广场1站', '中建锦绣广场2站', '中建锦绣广场3站', '中建锦绣广场4站', '中建锦绣广场5站', '中建锦绣广场6站', '中建锦绣广场7站'],
             data: showTimes,
             axisPointer: {
               type: 'shadow'
@@ -882,9 +876,6 @@ export default {
           {
             type: 'value',
             name: '金额(元)',
-            // min: 0,
-            // max: 10000,
-            // interval: 2000,
             axisLabel: {
               formatter: '{value}'
             }