bug修复

src/store/modules/user.js

@@ -42,7 +42,7 @@ const user = {
       return new Promise((resolve, reject) => {
         getssoUrl(data).then(response => {
           const date = response.data
-          debugger
+          //debugger
           if (response.code == 1) {
             commit('SET_SSOURL', date.access_token)
           }

src/views/dashboard/LineChart.vue

@@ -57,33 +57,31 @@ export default {
     this.chart = null
   },
   methods: {
-    moneyMax(num){
+    moneyMax(num) {
       let prec = 2
       let ceil = true
       const len = String(num).length;
-        if (len <= prec) { return num };
+      if (len <= prec) {
+        return num
+      }
       const mult = Math.pow(10, prec);
-        return ceil ?
-          Math.ceil(num / mult) * mult :
-          Math.floor(num / mult) * mult;
-
+      return ceil ? Math.ceil(num / mult) * mult : Math.floor(num / mult) * mult;
     },
     numberMax(num1,num2){
       let num = ''
-      if(num1>=num2){
+      if (num1 >= num2) {
         num = num1
-      }else{
+      } else {
         num = num2
       }
       let prec = 2
       let ceil = true
       const len = String(num).length;
-        if (len <= prec) { return num };
+      if (len <= prec) {
+        return num
+      }
       const mult = Math.pow(10, prec);
-        return ceil ?
-          Math.ceil(num / mult) * mult :
-          Math.floor(num / mult) * mult;
-
+      return ceil ? Math.ceil(num / mult) * mult : Math.floor(num / mult) * mult;
     },
     initChart() {
       this.chart = echarts.init(this.$el, 'macarons')
@@ -92,7 +90,6 @@ export default {
       }
     },
     setOptions({ expectedData, actualData, moneyData, months} = {}) {
-      console.log(months)
       this.chart.setOption({
         xAxis: {
           data: months,
@@ -131,7 +128,7 @@ export default {
           	name: '收益',
           	min: 0,
           	max: this.moneyMax(this.chartData.maxMoneyData),
-          	interval: (this.moneyMax(this.chartData.maxMoneyData)/5),
+          	interval: (this.moneyMax(this.chartData.maxMoneyData) / 5),
           	axisLabel: {
           		formatter: '{value} 元'
           	}

src/views/entry/newyuncang.vue

@@ -31,8 +31,11 @@
 
         <swiper :options="swiperOption" v-if="bannerList && bannerList.length > 0">
           <swiper-slide v-for="(item,index) in bannerList" :key="index">
-            <a :href=" '//' + item.redirect_url" target="_blank"><img style="width: 100%;height: 562px;" :src="item.image_url"
-                                                                      alt=""></a>
+<!--            <a :href=" '//' + item.redirect_url" target="_blank">-->
+            <a :href=" aLinkRes(item.redirect_url) " target="_blank">
+              <img style="width: 100%;height: 562px;" :src="item.image_url" alt="">
+            </a>
+            <p></p>
           </swiper-slide>
         </swiper>
       </section>
@@ -493,7 +496,14 @@
             }
             // banner图
             if (res.data.cloud_banner_lst && res.data.cloud_banner_lst.banners_json && res.data.cloud_banner_lst.banners_json.length > 0) {
-              this.bannerList = res.data.cloud_banner_lst.banners_json;
+              // this.bannerList = res.data.cloud_banner_lst.banners_json;
+              let bannerArr = []
+              res.data.cloud_banner_lst.banners_json.forEach(element => {
+                if(element.image_url) {
+                  bannerArr.push(element);
+                }
+              });
+              this.bannerList = bannerArr
             }
             // logo 图
             if (res.data.cloud_supplier_lst && res.data.cloud_supplier_lst.detail_json) {
@@ -505,6 +515,17 @@
           }
         })
       },
+      /** banner 图是否能跳转链接 处理 */
+      aLinkRes(link) {
+        let resLink = ''
+        if ( link ) {
+          resLink = ''
+        }else {
+          resLink = 'javascript:void(0);'
+        }
+
+        return resLink
+      },
       // 监听浏览器滚动
       handleScroll() {
         let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop

src/views/index.vue

@@ -55,7 +55,7 @@
     <panel-group @handleSetLineChartData="handleSetLineChartData" :panel-data="panelData"/>
 
     <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
-      <line-chart :chart-data="lineChartData" />
+      <line-chart :chart-data="lineChartData"/>
     </el-row>
 
     <!-- <el-row :gutter="32"> -->
@@ -81,14 +81,14 @@
 </template>
 
 <script>
-import { getStatistics } from "@/api/login";
-import PanelGroup from './dashboard/PanelGroup'
-import LineChart from './dashboard/LineChart'
-import RaddarChart from './dashboard/RaddarChart'
-import PieChart from './dashboard/PieChart'
-import BarChart from './dashboard/BarChart'
-
-const lineChartData = {
+  import {getStatistics} from "@/api/login";
+  import PanelGroup from './dashboard/PanelGroup'
+  import LineChart from './dashboard/LineChart'
+  import RaddarChart from './dashboard/RaddarChart'
+  import PieChart from './dashboard/PieChart'
+  import BarChart from './dashboard/BarChart'
+
+  const lineChartData = {
     newVisitis: {
       expectedData: [100, 120, 161, 134, 105, 160, 161],
       actualData: [120, 82, 91, 154, 162, 140, 145]
@@ -108,9 +108,9 @@ const lineChartData = {
     //   // expectedData: [130, 140, 141, 142, 145, 150, 160], //期望
     //   actualData: [120, 82, 91, 154, 162, 140, 130]  //实际
     // }
-}
+  }
 
-export default {
+  export default {
     name: 'Index',
     components: {
       PanelGroup,
@@ -121,21 +121,21 @@ export default {
     },
     data() {
       return {
-      panelData:{
-        goods_total:0, //商品总数
-        order_total:0,//订单总数
-        total_price:0,//金额总数
-        refund_total:0,//售后总数
+        panelData: {
+          goods_total: 0, //商品总数
+          order_total: 0,//订单总数
+          total_price: 0,//金额总数
+          refund_total: 0,//售后总数
 
         },
 
         lineChartData: {
-        moneyData:[], //金额折线
-        actualData:[], //订单折线
+          moneyData: [], //金额折线
+          actualData: [], //订单折线
           // countData:[],
-        maxChannelData:0, //左边订单数量最大值
-        maxMoneyData:0,  //金额最大值
-        months:[]   //下面日志
+          maxChannelData: 0, //左边订单数量最大值
+          maxMoneyData: 0,  //金额最大值
+          months: []   //下面日志
         }
       }
     },
@@ -143,45 +143,47 @@ export default {
       this.GetStatistics();
     },
     methods: {
-    //首页统计
-    GetStatistics(){
+      /** 首页所有数据
+       * order_total（总订单数量，总金额）
+       * */
+      GetStatistics() {
         getStatistics().then(response => {
           let money = []
           let count = []
           let actual = []
-        if(response.data && response.data.line && response.data.line.length > 0) {
-          response.data.line.forEach(function(item, index) {
-            money.unshift(item.price)
+          if (response.data && response.data.line && response.data.line.length > 0) {
+            response.data.line.forEach(function (item, index) {
+              money.unshift(item.price/100) // 后台返回单位是 分，所以需要除以100
               actual.unshift(item.date)
               count.unshift(item.count)
             })
           }
 
           //最大订单数
-        var maxOrderNum=this.lineChartData.maxChannelData;
-        for(var n=1;n<count.length;n++){
-          if(count[n]>maxOrderNum){
-            maxOrderNum=count[n];
+          var maxOrderNum = this.lineChartData.maxChannelData;
+          for (var n = 1; n < count.length; n++) {
+            if (count[n] > maxOrderNum) {
+              maxOrderNum = count[n];
             }
           }
           this.lineChartData.maxChannelData = maxOrderNum
-        //最大金额
-        var maxMoney=this.lineChartData.maxMoneyData;
-        for(var n=1;n<money.length;n++){
-          if(money[n]>maxMoney){
-            maxMoney=money[n];
+          //最大金额,后台返回单位是 分，所以需要除以100
+          var maxMoney = this.lineChartData.maxMoneyData/100;
+          for (var n = 1; n < money.length; n++) {
+            if (money[n] > maxMoney) {
+              maxMoney = money[n];
             }
           }
 
           this.lineChartData.maxMoneyData = maxMoney
           this.lineChartData.moneyData = money
           this.lineChartData.actualData = count
-         this.lineChartData.months= actual
+          this.lineChartData.months = actual
 
-        this.panelData.goods_total= response.data.goods_total
-        this.panelData.refund_total= response.data.rettotal
-        this.panelData.order_total= response.data.order_total.count
-        this.panelData.total_price= response.data.order_total.total_price / 100
+          this.panelData.goods_total = response.data.goods_total
+          this.panelData.refund_total = response.data.rettotal
+          this.panelData.order_total = response.data.order_total.count
+          this.panelData.total_price = response.data.order_total.total_price / 100
         });
       },
       handleSetLineChartData(type) {
@@ -189,41 +191,49 @@ export default {
         this.lineChartData = lineChartData[type]
       }
     }
-}
+  }
 </script>
 
 <style lang="scss" scoped type="text/stylus">
 
-.dashboard-promote .el-row{
+  .dashboard-promote .el-row {
     margin-bottom: 20px;
     font-size: 14px;
-}
-.dashboard-promote .el-row .jz{
+  }
+
+  .dashboard-promote .el-row .jz {
     height: 500px;
-}
-.dashboard-promote .el-row .kj{
+  }
+
+  .dashboard-promote .el-row .kj {
     height: 300px;
-}
-.dashboard-promote .el-row .xx{
+  }
+
+  .dashboard-promote .el-row .xx {
     height: 200px;
-}
+  }
 
-.git-res{
+  .git-res {
     margin-top: 20px;
-}
-.git-res .el-link{
+  }
+
+  .git-res .el-link {
     margin-right: 30px;
-}
+  }
 
-ul,li{ padding:0;margin:0;list-style:none}
+  ul, li {
+    padding: 0;
+    margin: 0;
+    list-style: none
+  }
 
-.product li{
+  .product li {
     margin-bottom: 20px;
     float: left;
     width: 150px;
-}
+  }
 
-.dashboard-editor-container {
+  .dashboard-editor-container {
     padding: 32px;
     background-color: rgb(240, 242, 245);
     position: relative;
@@ -233,11 +243,11 @@ ul,li{ padding:0;margin:0;list-style:none}
       padding: 16px 16px 0;
       margin-bottom: 32px;
     }
-}
+  }
 
-@media (max-width:1024px) {
+  @media (max-width: 1024px) {
     .chart-wrapper {
       padding: 8px;
     }
-}
+  }
 </style>

src/views/system/asset/settlementbill/index.vue

@@ -206,7 +206,7 @@
             if (res.data.order) {
               this.orderStatus = res.data.order.status;
               this.orderSn = res.data.order.order_sn;
-              this.settlementStatus = res.data.order.withdraw_status == 1 ? '已结算' : '未结算';
+              this.settlementStatus = res.data.order.settlement_status == 1 ? '已结算' : '未结算';
               this.realName = res.data.order.real_name;
               this.mobile = res.data.order.mobile;
             }

src/views/system/order/index.vue

@@ -51,7 +51,7 @@
 
           <el-form-item label="结算状态:" prop="settlement_status" v-show="activeName == 'fourth' ">
             <el-select v-model="form.settlement_status" placeholder="请选择结算状态" style="width:150px;">
-              <el-option label="全部" value=""></el-option>
+              <el-option label="全部" value="-1"></el-option>
               <el-option label="已结算" value="1"></el-option>
               <el-option label="未结算" value="0"></el-option>
             </el-select>
@@ -132,7 +132,7 @@
             </div>
             <div style="float:right;">
               <span>结算状态：</span>
-              <span>{{ withdrwaFormat(item.order.withdraw_status) }}</span>
+              <span>{{ settlementFormat(item.order.settlement_status) }}</span>
             </div>
           </div>
           <div class="item-table">
@@ -451,7 +451,7 @@
         }
       },
       /** 结算状态 */
-      withdrwaFormat(status) {
+      settlementFormat(status) {
         let res = '';
         if(status == 0) {
           res = '未结算'
@@ -529,7 +529,6 @@
       },
       // 搜索 操作
       search() {
-        debugger
         this.currentPage = 1;
         this.getListOrder();
       },
@@ -556,7 +555,7 @@
           params['mobile'] = this.form.Tel
         }
 
-        if (this.form.settlement_status) {
+        if (this.form.settlement_status == '0' || this.form.settlement_status == '1') {
           params['settlement_status'] = this.form.settlement_status
         }