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 };
-        const mult = Math.pow(10, prec);
-        return ceil ?
-          Math.ceil(num / mult) * mult :
-          Math.floor(num / mult) * mult;
-
+      const len = String(num).length;
+      if (len <= prec) {
+        return num
+      }
+      const mult = Math.pow(10, prec);
+      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 };
-        const mult = Math.pow(10, prec);
-        return ceil ?
-          Math.ceil(num / mult) * mult :
-          Math.floor(num / mult) * mult;
-
+      const len = String(num).length;
+      if (len <= prec) {
+        return num
+      }
+      const mult = Math.pow(10, prec);
+      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/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
         }