From fa7cad96c6e44ffc189ff0fa3427195402452da3 Mon Sep 17 00:00:00 2001
From: duLingLing <dll19920503@qq.com>
Date: Wed, 27 Nov 2019 18:21:13 +0800
Subject: [PATCH] =?UTF-8?q?Upd=EF=BC=9A=E4=BF=AE=E5=BE=A9=E4=BA=A4?=
 =?UTF-8?q?=E6=98=93=E6=8E=92=E5=90=8D=E6=95=B8=E6=93=9A=E4=BA=94=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../ui/static/analysis/customer_analysis.js   | 21 ++++++++++++-------
 .../analysis/templates/customer_analysis.html |  4 ++--
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 149192152..d93a4f177 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.2.93</version>
+    <version>1.2.94</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.4.0</jib-maven-plugin.version>
diff --git a/src/main/ui/static/analysis/customer_analysis.js b/src/main/ui/static/analysis/customer_analysis.js
index 13878c95b..e8246644a 100644
--- a/src/main/ui/static/analysis/customer_analysis.js
+++ b/src/main/ui/static/analysis/customer_analysis.js
@@ -128,15 +128,20 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
             $http.get('/analysis/customers/ranking/'+$scope.params.openid_type, {params: params}).then(function (resp) {
                 $scope.customer_loading = false;
                 $scope.customers = resp.data.data;
-                $scope.checkoutCustomer($scope.customers[0]);
-                $scope.generatorEcharts($scope.customers[0].customer_id);
-                $scope.customers_type = resp.data.openid_type;
-                $scope.pagination = resp.data.pagination;
                 if($scope.customers.length>0){
-                    $scope.order_params.customer_id = $scope.customers[0].customer_id;
-                    $scope.customer_loading = false;
-                    $scope.listCustomerOrders(1);
-                }else{
+                    $scope.checkoutCustomer($scope.customers[0]);
+                    $scope.generatorEcharts($scope.customers[0].customer_id);
+                    $scope.customers_type = resp.data.openid_type;
+                    $scope.pagination = resp.data.pagination;
+                    if($scope.customers.length>0){
+                        $scope.order_params.customer_id = $scope.customers[0].customer_id;
+                        $scope.customer_loading = false;
+                        $scope.listCustomerOrders(1);
+                    }else{
+                        $scope.orders=[];
+                    }
+                }
+                else{
                     $scope.orders=[];
                 }
 
diff --git a/src/main/ui/static/analysis/templates/customer_analysis.html b/src/main/ui/static/analysis/templates/customer_analysis.html
index 23f0f3fcb..703993d80 100644
--- a/src/main/ui/static/analysis/templates/customer_analysis.html
+++ b/src/main/ui/static/analysis/templates/customer_analysis.html
@@ -181,7 +181,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="box" ng-if="one_customer">
+                <div class="box" ng-if="one_customer&&orders.length>0">
                     <div class="box-header">
                         <h3 class="box-title">用户画像</h3>
                     </div>
@@ -248,7 +248,7 @@
         </div>
     </div>
 
-    <div class="row">
+    <div class="row" ng-if="orders">
         <div class="col-sm-12">
             <div class="box box-default">
                 <div class="box-body table-responsive">