Merge remote-tracking branch 'origin/feature-201825-wangcz' into feature-201825-wangcz

src/main/webapp/WEB-INF/views/normal/adminWithNav.html

@@ -32,6 +32,11 @@
 			<li class="nav-header">B2B</li>
 			<li class="nav-node"><a href="#/b2b/manage"><i
 					class="fa fa-home"></i><span> b2b后台管理</span></a></li>
+
+			<li class="nav-header">数据管理</li>
+			<li class="nav-node"><a href="#/statsData"><i
+					class="fa fa-home"></i><span> 数据中心</span></a></li>
+
 			<li class="nav-header">交易管理</li>
 			<li class="nav-node"><a href="#trade/buyerOrder"><i
 					class="fa fa-home"></i><span> 买家销售单跟踪</span></a></li>
@@ -51,7 +56,6 @@
 					class="fa fa-home"></i><span> 评价管理</span></a></li>
 			<li class="nav-node"><a href="#trade/record_chart"><i
 					class="fa fa-th"></i><span> 交易记录表</span></a></li>
-
 			<li class="nav-header">财务结算中心</li>
 			<li class="nav-node"><a href="#check/check_vender"><i
 					class="fa fa-user"></i><span> 付款申请</span></a></li>

src/main/webapp/resources/js/admin/controllers/statsDataCtrl.js

@@ -1,9 +1,8 @@
 define([ 'app/app' ], function(app) {
     //在售商品信息统计
-    app.register.controller('statsDataCtrl', ['$scope', 'Goods', 'toaster', 'ComponentActive', 'BrandActive', 'CommonCountAPI', function($scope, toaster, ComponentActive, BrandActive, Goods, CommonCountAPI) {
+    app.register.controller('statsDataCtrl', ['$scope', 'Goods', 'toaster', 'ComponentActive', 'BrandActive', 'CommonCountAPI', 'User', '$http', function($scope, Goods, toaster, ComponentActive, BrandActive, CommonCountAPI, User, $http) {
 
         $scope.dateArea = 'autoMonth';
-
         var _formatDate = function (date, fmt) {
             if (!date) {
                 return null;
@@ -93,46 +92,85 @@ define([ 'app/app' ], function(app) {
             }
 
         };
-        // 在售商品信息汇总
-        // Goods.getStatistics({}, {}, function(data) {
-        //     $scope.statistics = data;
-        // }, function(res) {
-        //     toaster.pop('error', '提示', '获取数据失败，请刷新页面');
-        // });
 
-        // // 各月新增器件数量
-        // ComponentActive.getIncreaseCount({}, function(data) {
-        //     $scope.increaseCmpCount = data;
-        // }, function (response) {
-        //     toaster.pop('error', '数据获取失败，请重试');
-        // });
-        //
-        // //各月新增品牌数量
-        // BrandActive.getIncreaseCount({}, function(data) {
-        //     $scope.increaseBrandCount = data;
-        // }, function (response) {
-        //     toaster.pop('error', '数据获取失败，请重试');
-        // });
-        //
-        // //各月新增批次数量
-        // Goods.getIncreaseBatch({}, function(data) {
-        //     $scope.increaseBatchCount = data;
-        // }, function (response) {
-        //     toaster.pop('error', '数据获取失败，请重试');
-        // });
-        //
-        // //各月新增在售器件数量
-        // Goods.getIncreaseCmp({}, function(data) {
-        //     $scope.increaseInSaleCmpCount = data;
-        // }, function (response) {
-        //     toaster.pop('error', '数据获取失败，请重试');
-        // });
-        //
-        // // 首页轮播数据统计
-        // CommonCountAPI.getActived({}, function (data) {
-        //     $scope.count = data;
-        // }, function (response) {
-        //     toaster.pop('error', '数据获取失败，请重试');
-        // });
+        User.isDevOrProd(null, function (data) {
+            $scope.urlPrex = data.data == 'success' ? 'https://sso.ubtob.com' : 'http://192.168.253.6:32323';
+            $scope.uasUrl = data.data == 'success' ? 'http://uas.ubtob.com/' : 'http://192.168.253.12:9000/b2b-test/';
+            $scope.commonUrl = data.data == 'success' ? 'https://api-inquiry.usoftmall.com/' : 'http://218.17.158.219:24000/';
+            $http({
+                method: 'get',
+                dataType: 'json',
+                url: $scope.commonUrl + '/inquiry/public/getInquiryCountData',
+                params: {startDate: '2018-07-01', endDate: '2018-08-29'}
+            }).success(function (data) {
+                $scope.inquiryData = data
+            }).error(function () {
+                toaster.pop('error', '获取未处理审批数据失败');
+            });
+        }, function (response) {
+            toaster.pop('error', '获取运行环境失败');
+        });
+
+        Goods.getStatistics({}, {}, function(data) {
+            $scope.statistics = data;
+        }, function(res) {
+            toaster.pop('error', '提示', '获取数据失败，请刷新页面');
+        });
+
+        // 器件申请用户数
+        Goods.getComponentSubmitCmp({fromDate: $scope.startDate, toDate: $scope.endDate}, function (data) {
+            $scope.componentSubmit = data
+        }, function (res) {
+            toaster.pop('error', '数据获取失败，请重试')
+        });
+
+        // 上传产品用户数
+        Goods.getProductsCmp({fromDate: $scope.startDate, toDate: $scope.endDate}, function (data) {
+            $scope.productsCount = data
+        }, function (res) {
+            toaster.pop('error', '数据获取失败，请重试')
+        });
+
+        // 品牌申请用户数
+        Goods.getBrandSubmitCmp({fromDate: $scope.startDate, toDate: $scope.endDate}, function (data) {
+            $scope.brandSubmit = data
+        }, function (res) {
+            toaster.pop('error', '数据获取失败，请重试')
+        });
+
+        // 各月新增器件数量
+        ComponentActive.getIncreaseCount({}, function(data) {
+            $scope.increaseCmpCount = data;
+        }, function (response) {
+            toaster.pop('error', '数据获取失败，请重试');
+        });
+
+        //各月新增品牌数量
+        BrandActive.getIncreaseCount({}, function(data) {
+            $scope.increaseBrandCount = data;
+        }, function (response) {
+            toaster.pop('error', '数据获取失败，请重试');
+        });
+
+        //各月新增批次数量
+        Goods.getIncreaseBatch({}, function(data) {
+            $scope.increaseBatchCount = data;
+        }, function (response) {
+            toaster.pop('error', '数据获取失败，请重试');
+        });
+
+        //各月新增在售器件数量
+        Goods.getIncreaseCmp({}, function(data) {
+            $scope.increaseInSaleCmpCount = data;
+        }, function (response) {
+            toaster.pop('error', '数据获取失败，请重试');
+        });
+
+        // 首页轮播数据统计
+        CommonCountAPI.getActived({}, function (data) {
+            $scope.count = data;
+        }, function (response) {
+            toaster.pop('error', '数据获取失败，请重试');
+        });
     }]);
 });

src/main/webapp/resources/js/admin/controllers/trade/goodsStatisticsCtrl.js

@@ -1,6 +1,6 @@
 define([ 'app/app' ], function(app) {
 	//在售商品信息统计
-	app.register.controller('goodsStatisticsCtrl', ['$scope', 'Goods', 'toaster', 'ComponentActive', 'BrandActive', 'CommonCountAPI', function($scope, toaster, ComponentActive, BrandActive, Goods, CommonCountAPI) {
+	app.register.controller('goodsStatisticsCtrl', ['$scope', 'Goods', 'toaster', 'ComponentActive', 'BrandActive', 'CommonCountAPI', function($scope, Goods, toaster, ComponentActive, BrandActive, CommonCountAPI) {
 		// 在售商品信息汇总
 		Goods.getStatistics({}, {}, function(data) {
 			$scope.statistics = data;

src/main/webapp/resources/js/common/query/goods.js

@@ -203,6 +203,22 @@ define([ 'ngResource' ], function() {
 				method : 'GET',
 				isArray : true
 			},
+            // 上传产品用户数
+            getProductsCmp: {
+                url : rootPath + '/trade/products/apply/count',
+                method : 'GET'
+            },
+            // 器件申请用户数
+            getComponentSubmitCmp: {
+                url : rootPath + '/produce/componentSubmit/submit/count',
+                method : 'GET',
+                isArray : true
+            },
+            // 品牌申请用户数
+            getBrandSubmitCmp: {
+                url : rootPath + '/produce/brandSubmit/submit/count',
+                method : 'GET'
+            },
 			getDownLoadStatus: {
 				url : 'release/product/release/failure/status',
 				method : 'GET'

src/main/webapp/resources/view/admin/stats_data.html

@@ -5,29 +5,25 @@
     .fr{
         float:right;
     }
-    #rootStats ul>li.newItem {
-        display: inline-block;
-        width: 22%;
-        border: 1px solid #ccc;
-        padding: 10px;
-        margin: 0 10px;
-    }
 
-    #rootStats ul>li.newItem .month,.count {
-        border: 1px solid #ccc;
-        padding: 5px;
-        font-family: sans-serif;
-        font-size: 15px;
+    #rootStats .fullscreen{
+        padding: 0 10px;
     }
 
-    #rootStats .newTitle {
-        font-weight: 600;
-    }
     #rootStats .fullscreen .title span{
         font-weight: bold;
         margin-bottom:10px;
         color:#333;
     }
+    #rootStats .form-group{
+        margin-bottom:10px;
+    }
+    #rootStats .col-sm-6{
+        padding-right:0;
+    }
+    #rootStats .col-sm-6{
+        padding-left:0;
+    }
 
     /*搜索时间筛选 start*/
     #rootStats .screen {
@@ -37,6 +33,7 @@
         font-size: 14px;
         font-weight: normal;
         margin-right:10px;
+        width:750px;
     }
     #rootStats .com-check-radio{
         font-size: 14px;
@@ -88,111 +85,164 @@
             <i class="icon-user"></i> 信息统计
         </div>
         <div class="box-content row">
-            <div class="fullscreen" style="padding: 10px;">
+            <div class="fullscreen">
                 <div class="col-sm-4 f14">
                     <div class="form-group row title">
                         <span class="col-sm-6 text-right">经营目标统计：</span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">在售产品型号数量：</span>
-                        <span class="col-sm-4" ng-bind="statistics.codes | number"></span>
+                        <span class="col-sm-6 text-right">注册总数量：</span>
+                        <span class="col-sm-6" ng-bind="statistics.codes | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">在售产品类目数量：</span>
-                        <span class="col-sm-4" ng-bind="statistics.kinds | number"></span>
+                        <span class="col-sm-6 text-right">当月注册总量：</span>
+                        <span class="col-sm-6" ng-bind="statistics.kinds | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">在售产品品牌数量：</span>
-                        <span class="col-sm-4" ng-bind="statistics.brands | number"></span>
+                        <span class="col-sm-6 text-right">上月注册总量：</span>
+                        <span class="col-sm-6" ng-bind="statistics.brands | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">库存合计：</span>
-                        <span class="col-sm-4" ng-bind="statistics.reserves | number"></span>
+                        <span class="col-sm-6 text-right">商城开店总数：</span>
+                        <span class="col-sm-6" ng-bind="statistics.reserves | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">含税金额合计(RMB)：</span>
-                        <span class="col-sm-5 text-num">￥
+                        <span class="col-sm-6 text-right">商城本月开店数：</span>
+                        <span class="col-sm-6">
 							<span ng-bind="statistics.sumPriceRMB | number"></span>
 						</span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">未税金额合计(RMB)：</span>
-                        <span class="col-sm-5 text-num">￥
+                        <span class="col-sm-6 text-right">商城上月开店总数：</span>
+                        <span class="col-sm-6">
 							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
 						</span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">含税金额合计：</span>
-                        <span class="col-sm-4">批次RMB最高单价*库存数量</span>
+                        <span class="col-sm-6 text-right">当前器件总数：</span>
+                        <span class="col-sm-6">
+							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
+						</span>
                     </div>
+                    <div class="form-group row">
+                        <span class="col-sm-6 text-right">本月新增器件总数：</span>
+                        <span class="col-sm-6">
+							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
+						</span>
+                    </div>
+                    <div class="form-group row">
+                        <span class="col-sm-6 text-right">上月新增器件总数：</span>
+                        <span class="col-sm-6">
+							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
+						</span>
+                    </div>
+                    <div class="form-group row">
+                        <span class="col-sm-6 text-right">B2B年度交易总额折合RMB：</span>
+                        <span class="col-sm-6">
+							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
+						</span>
+                    </div>
+                    <div class="form-group row">
+                        <span class="col-sm-6 text-right">企业信息库总数：</span>
+                        <span class="col-sm-6">
+							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
+						</span>
+                    </div>
+                    <div class="form-group row">
+                        <span class="col-sm-6 text-right">优软云个人用户数：</span>
+                        <span class="col-sm-6">
+							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
+						</span>
+                    </div>
+                    <div class="form-group row">
+                        <span class="col-sm-6 text-right">手机UU用户数：</span>
+                        <span class="col-sm-6">
+							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
+						</span>
+                    </div>
+                    <!--<div class="form-group row">-->
+                    <!--<span class="col-sm-6 text-right">商城本月开店数：</span>-->
+                    <!--<span class="col-sm-5 text-num">-->
+                    <!--<span ng-bind="statistics.sumPriceRMB | number"></span>-->
+                    <!--</span>-->
+                    <!--</div>-->
                 </div>
                 <div class="col-sm-4 f14">
+                    <div class="form-group row title">
+                        <span class="col-sm-6 text-right">器件信息统计：</span>
+                    </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">在售产品型号数量：</span>
-                        <span class="col-sm-4" ng-bind="statistics.codes | number"></span>
+                        <span class="col-sm-6 text-right">当前器件总数：</span>
+                        <span class="col-sm-6" ng-bind="statistics.codes | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">在售产品类目数量：</span>
-                        <span class="col-sm-4" ng-bind="statistics.kinds | number"></span>
+                        <span class="col-sm-6 text-right">本月新增器件数：</span>
+                        <span class="col-sm-6" ng-bind="statistics.kinds | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">在售产品品牌数量：</span>
-                        <span class="col-sm-4" ng-bind="statistics.brands | number"></span>
+                        <span class="col-sm-6 text-right">当前品牌数：</span>
+                        <span class="col-sm-6" ng-bind="statistics.brands | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">库存合计：</span>
-                        <span class="col-sm-4" ng-bind="statistics.reserves | number"></span>
+                        <span class="col-sm-6 text-right">本月新增品牌数：</span>
+                        <span class="col-sm-6" ng-bind="statistics.reserves | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">含税金额合计(RMB)：</span>
-                        <span class="col-sm-5 text-num">￥
+                        <span class="col-sm-6 text-right">当前类目总数：</span>
+                        <span class="col-sm-6">
 							<span ng-bind="statistics.sumPriceRMB | number"></span>
 						</span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">未税金额合计(RMB)：</span>
-                        <span class="col-sm-5 text-num">￥
+                        <span class="col-sm-6 text-right">本月更新器件数：</span>
+                        <span class="col-sm-6">
 							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
 						</span>
                     </div>
-                    <div class="form-group row">
-                        <span class="col-sm-6 text-right">含税金额合计：</span>
-                        <span class="col-sm-4">批次RMB最高单价*库存数量</span>
-                    </div>
+                    <!--<div class="form-group row">-->
+                    <!--<span class="col-sm-6 text-right">商城本月开店数：</span>-->
+                    <!--<span class="col-sm-5 text-num">-->
+                    <!--<span ng-bind="statistics.sumPriceRMB | number"></span>-->
+                    <!--</span>-->
+                    <!--</div>-->
                 </div>
                 <div class="col-sm-4 f14">
+                    <div class="form-group row title">
+                        <span class="col-sm-6 text-right">在售商品统计：</span>
+                    </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">在售产品型号数量：</span>
-                        <span class="col-sm-4" ng-bind="statistics.codes | number"></span>
+                        <span class="col-sm-6 text-right">在售商品型号总数：</span>
+                        <span class="col-sm-6" ng-bind="statistics.codes | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">在售产品类目数量：</span>
-                        <span class="col-sm-4" ng-bind="statistics.kinds | number"></span>
+                        <span class="col-sm-6 text-right">在售商品类目：</span>
+                        <span class="col-sm-6" ng-bind="statistics.kinds | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">在售产品品牌数量：</span>
-                        <span class="col-sm-4" ng-bind="statistics.brands | number"></span>
+                        <span class="col-sm-6 text-right">在售商品品牌总数：</span>
+                        <span class="col-sm-6" ng-bind="statistics.brands | number"></span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">库存合计：</span>
-                        <span class="col-sm-4" ng-bind="statistics.reserves | number"></span>
+                        <span class="col-sm-6" ng-bind="statistics.reserves | number"></span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">含税金额合计(RMB)：</span>
-                        <span class="col-sm-5 text-num">￥
+                        <span class="col-sm-6 text-num">￥
 							<span ng-bind="statistics.sumPriceRMB | number"></span>
 						</span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">未税金额合计(RMB)：</span>
-                        <span class="col-sm-5 text-num">￥
-							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
-						</span>
-                    </div>
-                    <div class="form-group row">
-                        <span class="col-sm-6 text-right">含税金额合计：</span>
-                        <span class="col-sm-4">批次RMB最高单价*库存数量</span>
+                        <span class="col-sm-6 text-right">未税金额合计RMB：</span>
+                        <span class="col-sm-6" ng-bind="statistics.reserves | number"></span>
                     </div>
+
+                    <!--<div class="form-group row">-->
+                    <!--<span class="col-sm-6 text-right">商城本月开店数：</span>-->
+                    <!--<span class="col-sm-5 text-num">-->
+                    <!--<span ng-bind="statistics.sumPriceRMB | number"></span>-->
+                    <!--</span>-->
+                    <!--</div>-->
                 </div>
             </div>
         </div>
@@ -260,111 +310,126 @@
             </div>
         </div>
         <div class="box-content row">
-            <div class="fullscreen" style="padding: 10px;">
-                <div class="col-sm-4 f14">
+            <div class="fullscreen">
+                <div class="col-sm-2 f14">
                     <div class="form-group row title">
-                        <span class="col-sm-6 text-right">经营目标统计：</span>
+                        <span class="col-sm-6 text-right">新增用户数：</span>
+                        <span class="col-sm-6" ng-bind="statistics.codes | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">在售产品型号数量：</span>
-                        <span class="col-sm-4" ng-bind="statistics.codes | number"></span>
+                        <span class="col-sm-6 text-right">B2B新增用户数：</span>
+                        <span class="col-sm-6" ng-bind="statistics.codes | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">在售产品类目数量：</span>
-                        <span class="col-sm-4" ng-bind="statistics.kinds | number"></span>
+                        <span class="col-sm-6 text-right">商城新增企业用户数：</span>
+                        <span class="col-sm-6" ng-bind="statistics.kinds | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">在售产品品牌数量：</span>
-                        <span class="col-sm-4" ng-bind="statistics.brands | number"></span>
+                        <span class="col-sm-6 text-right">商城新增个人用户数：</span>
+                        <span class="col-sm-6" ng-bind="statistics.brands | number"></span>
                     </div>
-                    <div class="form-group row">
-                        <span class="col-sm-6 text-right">库存合计：</span>
-                        <span class="col-sm-4" ng-bind="statistics.reserves | number"></span>
+                    <!--<div class="form-group row">-->
+                        <!--<span class="col-sm-6 text-right">商城本月开店数：</span>-->
+                        <!--<span class="col-sm-5 text-num">-->
+							<!--<span ng-bind="statistics.sumPriceRMB | number"></span>-->
+						<!--</span>-->
+                    <!--</div>-->
+                </div>
+                <div class="col-sm-2 f14">
+                    <div class="form-group row title">
+                        <span class="col-sm-6 text-right">在线用户数：</span>
+                        <span class="col-sm-6" ng-bind="statistics.codes | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">含税金额合计(RMB)：</span>
-                        <span class="col-sm-5 text-num">￥
-							<span ng-bind="statistics.sumPriceRMB | number"></span>
-						</span>
+                        <span class="col-sm-6 text-right">已开店企业用户数：</span>
+                        <span class="col-sm-6" ng-bind="statistics.codes | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">未税金额合计(RMB)：</span>
-                        <span class="col-sm-5 text-num">￥
-							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
-						</span>
+                        <span class="col-sm-6 text-right">未开店企业用户数：</span>
+                        <span class="col-sm-6" ng-bind="statistics.kinds | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">含税金额合计：</span>
-                        <span class="col-sm-4">批次RMB最高单价*库存数量</span>
+                        <span class="col-sm-6 text-right">个人用户数：</span>
+                        <span class="col-sm-6" ng-bind="statistics.brands | number"></span>
                     </div>
+                    <!--<div class="form-group row">-->
+                    <!--<span class="col-sm-6 text-right">商城本月开店数：</span>-->
+                    <!--<span class="col-sm-5 text-num">-->
+                    <!--<span ng-bind="statistics.sumPriceRMB | number"></span>-->
+                    <!--</span>-->
+                    <!--</div>-->
                 </div>
-                <div class="col-sm-4 f14">
-                    <div class="form-group row">
-                        <span class="col-sm-6 text-right">在售产品型号数量：</span>
-                        <span class="col-sm-4" ng-bind="statistics.codes | number"></span>
-                    </div>
-                    <div class="form-group row">
-                        <span class="col-sm-6 text-right">在售产品类目数量：</span>
-                        <span class="col-sm-4" ng-bind="statistics.kinds | number"></span>
-                    </div>
-                    <div class="form-group row">
-                        <span class="col-sm-6 text-right">在售产品品牌数量：</span>
-                        <span class="col-sm-4" ng-bind="statistics.brands | number"></span>
+                <div class="col-sm-2 f14">
+                    <div class="form-group row title">
+                        <span class="col-sm-6 text-right">上传产品用户数：</span>
+                        <span class="col-sm-6" ng-bind="statistics.codes | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">库存合计：</span>
-                        <span class="col-sm-4" ng-bind="statistics.reserves | number"></span>
+                        <span class="col-sm-6 text-right">上传产品个数：</span>
+                        <span class="col-sm-6" ng-bind="statistics.codes | number"></span>
                     </div>
-                    <div class="form-group row">
-                        <span class="col-sm-6 text-right">含税金额合计(RMB)：</span>
-                        <span class="col-sm-5 text-num">￥
-							<span ng-bind="statistics.sumPriceRMB | number"></span>
-						</span>
-                    </div>
-                    <div class="form-group row">
-                        <span class="col-sm-6 text-right">未税金额合计(RMB)：</span>
-                        <span class="col-sm-5 text-num">￥
-							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
-						</span>
+                    <!--<div class="form-group row">-->
+                    <!--<span class="col-sm-6 text-right">商城本月开店数：</span>-->
+                    <!--<span class="col-sm-5 text-num">-->
+                    <!--<span ng-bind="statistics.sumPriceRMB | number"></span>-->
+                    <!--</span>-->
+                    <!--</div>-->
+                </div>
+                <div class="col-sm-2 f14">
+                    <div class="form-group row title">
+                        <span class="col-sm-6 text-right">询价用户数：</span>
+                        <span class="col-sm-6" ng-bind="inquiryData.inquiryUserAmount | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">含税金额合计：</span>
-                        <span class="col-sm-4">批次RMB最高单价*库存数量</span>
+                        <span class="col-sm-6 text-right">询价产品个数：</span>
+                        <span class="col-sm-6" ng-bind="inquiryData.inquiryAmount | number"></span>
                     </div>
+                    <!--<div class="form-group row">-->
+                    <!--<span class="col-sm-6 text-right">商城本月开店数：</span>-->
+                    <!--<span class="col-sm-5 text-num">-->
+                    <!--<span ng-bind="statistics.sumPriceRMB | number"></span>-->
+                    <!--</span>-->
+                    <!--</div>-->
                 </div>
-                <div class="col-sm-4 f14">
-                    <div class="form-group row">
-                        <span class="col-sm-6 text-right">在售产品型号数量：</span>
-                        <span class="col-sm-4" ng-bind="statistics.codes | number"></span>
-                    </div>
-                    <div class="form-group row">
-                        <span class="col-sm-6 text-right">在售产品类目数量：</span>
-                        <span class="col-sm-4" ng-bind="statistics.kinds | number"></span>
+                <div class="col-sm-2 f14">
+                    <div class="form-group row title">
+                        <span class="col-sm-6 text-right">报价用户数：</span>
+                        <span class="col-sm-6" ng-bind="inquiryData.offerAmount | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">在售产品品牌数量：</span>
-                        <span class="col-sm-4" ng-bind="statistics.brands | number"></span>
+                        <span class="col-sm-6 text-right">报价产品个数：</span>
+                        <span class="col-sm-6" ng-bind="inquiryData.offerEnAmount | number"></span>
                     </div>
-                    <div class="form-group row">
-                        <span class="col-sm-6 text-right">库存合计：</span>
-                        <span class="col-sm-4" ng-bind="statistics.reserves | number"></span>
+                    <!--<div class="form-group row">-->
+                    <!--<span class="col-sm-6 text-right">商城本月开店数：</span>-->
+                    <!--<span class="col-sm-5 text-num">-->
+                    <!--<span ng-bind="statistics.sumPriceRMB | number"></span>-->
+                    <!--</span>-->
+                    <!--</div>-->
+                </div>
+                <div class="col-sm-2 f14">
+                    <div class="form-group row title">
+                        <span class="col-sm-6 text-right">流失用户数：</span>
+                        <span class="col-sm-6" ng-bind="statistics.codes | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">含税金额合计(RMB)：</span>
-                        <span class="col-sm-5 text-num">￥
-							<span ng-bind="statistics.sumPriceRMB | number"></span>
-						</span>
+                        <span class="col-sm-6 text-right">半年未登录：</span>
+                        <span class="col-sm-6" ng-bind="statistics.codes | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">未税金额合计(RMB)：</span>
-                        <span class="col-sm-5 text-num">￥
-							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
-						</span>
+                        <span class="col-sm-6 text-right">一年未登录：</span>
+                        <span class="col-sm-6" ng-bind="statistics.kinds | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">含税金额合计：</span>
-                        <span class="col-sm-4">批次RMB最高单价*库存数量</span>
+                        <span class="col-sm-6 text-right">两年未登录：</span>
+                        <span class="col-sm-6" ng-bind="statistics.brands | number"></span>
                     </div>
+                    <!--<div class="form-group row">-->
+                    <!--<span class="col-sm-6 text-right">商城本月开店数：</span>-->
+                    <!--<span class="col-sm-5 text-num">-->
+                    <!--<span ng-bind="statistics.sumPriceRMB | number"></span>-->
+                    <!--</span>-->
+                    <!--</div>-->
                 </div>
             </div>
         </div>