Merge branch 'dev_hxz'

src/views/index.vue

@@ -149,11 +149,14 @@ export default {
         let money = []
         let count = []
         let actual = []
-        response.data.line.forEach(function(item, index) {
-          money.unshift(item.price)
-          actual.unshift(item.date)
-          count.unshift(item.count)
-        })
+        if(response.data.line && response.data.line.length > 0) {
+          response.data.line.forEach(function(item, index) {
+            money.unshift(item.price)
+            actual.unshift(item.date)
+            count.unshift(item.count)
+          })
+        }
+
         //最大订单数
         var maxOrderNum=this.lineChartData.maxChannelData;
         for(var n=1;n<count.length;n++){
@@ -185,7 +188,7 @@ export default {
       });
     },
     handleSetLineChartData(type) {
-      console.log("type",type)
+      //console.log("type",type)
       this.lineChartData = lineChartData[type]
     }
   }

src/views/system/settings/setpsd.vue

@@ -417,12 +417,12 @@
             changePayPassword(this.payForm).then(res => {
               if(res.code === 1) {
                 this.$message({type:"success",message: '支付密码修改成功'});
+                this.clearAccountCodeDown();
+                this.isPay = false;
               }else {
                 let msg = res.msg || '修改失败';
                 this.$message({type:"error",message: msg});
               }
-              this.clearAccountCodeDown();
-              this.isPay = false;
             });
           }
         });