物流信息页面调整

src/main/webapp/resources/js/usercenter/controllers/forstore/query_logistics_ctrl.js

@@ -8,6 +8,13 @@ define(['app/app', 'calendar'], function(app) {
         // 加密过滤器
         var enIdFilter = $filter('EncryptionFilter');
 
+        //配送方式列表
+        $scope.deliveryMethod = {
+            1301 : '第三方配送',
+            1302 : '卖家配送',
+            1303 : '上门自提'
+        };
+
         /**
          *  查询物流信息(接口需要真实运单号)
          *
@@ -27,7 +34,11 @@ define(['app/app', 'calendar'], function(app) {
                 }
                 $scope.order = data[0];
                 $scope.address = JSON.parse($scope.order.jsonAddress);
-                console.log("$scope.order", $scope.order);
+                if (!data[0].lgtId) {
+                    getOrderStatus($scope.order.status);
+                    $scope.logisticsInfo = [];
+                    return;
+                }
                 Logistics.findLogisticsById({lgtid: data[0].lgtId}, function(data){
                     $scope.logistics = data;
                     var params = {};
@@ -52,6 +63,15 @@ define(['app/app', 'calendar'], function(app) {
         }
 
         $scope.status = "tobereceiving";
+
+        var getOrderStatus = function (status) {
+            // 520-405,成功的订单
+            var success = '520-405';
+            if (success.indexOf(status) != -1) {
+                $scope.status = "signin";
+            }
+        };
+
         // 判断物流信息状态
         var statusOfLogistics = function(str) {
             if(str.indexOf("揽件")!=-1 || str.indexOf("收件")!=-1 || str.indexOf("转运")!=-1||str.indexOf("运输")!=-1||str.indexOf("发往")!=-1||

src/main/webapp/resources/js/vendor/controllers/forstore/query_logistics_ctrl.js

@@ -8,6 +8,13 @@ define(['app/app', 'calendar'], function(app) {
         // 加密过滤器
         var enIdFilter = $filter('EncryptionFilter');
 
+        //配送方式列表
+        $scope.deliveryMethod = {
+            1301 : '第三方配送',
+            1302 : '卖家配送',
+            1303 : '上门自提'
+        };
+
         /**
          *  查询物流信息(由于接口需要真实运单号)
          *
@@ -26,6 +33,11 @@ define(['app/app', 'calendar'], function(app) {
                 }else {
                     $scope.purchase = data.data;
                     $scope.address = JSON.parse($scope.purchase.jsonAddress);
+                    if (!data.data.lgtId) {
+                        getPurchaseStatus($scope.purchase.status);
+                        $scope.logisticsInfo = [];
+                        return;
+                    }
                     Logistics.findLogisticsById({lgtid: data.data.lgtId}, function(data){
                         $scope.logistics = data;
                         var params = {};
@@ -52,6 +64,14 @@ define(['app/app', 'calendar'], function(app) {
         }
 
         $scope.status = "tobereceiving";
+
+        var getPurchaseStatus = function (status) {
+            // 405-503-514-506-511-520,成功的订单
+            var success = '405-503-514-506-511-520';
+            if (success.indexOf(status) != -1) {
+                $scope.status = "signin";
+            }
+        };
         // 判断物流信息状态
         var statusOfLogistics = function(str) {
             if(str.indexOf("揽件")!=-1 || str.indexOf("收件")!=-1 || str.indexOf("转运")!=-1||str.indexOf("运输")!=-1||str.indexOf("发往")!=-1||

src/main/webapp/resources/view/common/modal/delivery_rule_modal.html

@@ -97,11 +97,11 @@
     <!--卖家首页-->
     <div class="content" ng-if="type=='center'">
         <p><i class="fa fa-exclamation-circle"></i><span>您的店铺尚未设置配送规则，无法计算运费，建议尽快设置！</span></p>
-        <div><a name="rule_cancel" ng-click="cancelDelete()">以后再说</a><a name="rule_href" ng-click="hrefToRule()">立即设置</a></div>
+        <div><a name="rule_cancel" ng-click="cancelDelete()">以后再说</a><a name="rule_href" ng-click="hrefToNext('vendor#vendor_deliveryRule')">立即设置</a></div>
     </div>
     <!--其他页面-->
     <div class="content" ng-if="type=='product'">
         <p><i class="fa fa-exclamation-circle"></i><span>您当前尚未设置配送规则，买家将无法下单，建议尽快设置！</span></p>
-        <div><a name="rule_href" ng-click="hrefToRule()">立即设置</a></div>
+        <div><a name="rule_href" ng-click="hrefToNext('vendor#vendor_deliveryRule')">立即设置</a></div>
     </div>
 </div>

src/main/webapp/resources/view/usercenter/forstore/query_logistics.html

@@ -245,9 +245,9 @@
                         </ul>
                     </div>
                     <div class="logistics-style">
-                        <span>配送方式：<em ng-bind="purchase.deliveryType=1301? '第三方物流': 'UU配送'">第三方配送</em></span>
-                        <span>物流公司：<em ng-bind="logistics.companyName"></em></span>
-                        <span>物流单号：<em ng-bind="logistics.number"></em></span>
+                        <span>配送方式：<em ng-bind="deliveryMethod[order.deliverytype]">第三方配送</em></span>
+                        <span>物流公司：<em ng-bind="logistics.companyName || '-'"></em></span>
+                        <span>物流单号：<em ng-bind="logistics.number || '-'"></em></span>
                     </div>
                     <div class="logistics_list01" style="margin-top: 0px;">
                         <!--<div class="log_menu"><span>您的买家已提货</span></div>-->
@@ -261,7 +261,7 @@
                             <dl ng-if="logisticsInfo.length != 0">
                                 <dd ng-if="logisticsInfo.length != 0" ng-repeat="info in logisticsInfo"><em ng-class="{ active : $index ==logisticsInfo.length - 1}"></em><span ng-bind="info.AcceptTime"></span><span ng-bind="info.AcceptStation"></span></dd>
                             </dl>
-                            <div class="empty">
+                            <div class="empty" ng-if="logisticsInfo.length == 0">
                                 <p class="empty-img">
                                     <img src="static/img/all/empty-cart.png">
                                 </p>

src/main/webapp/resources/view/vendor/forstore/query_logistics.html

@@ -244,9 +244,9 @@
                         </ul>
                     </div>
                     <div class="logistics-style">
-                        <span>配送方式：<em ng-bind="purchase.deliveryType='logistics'? '第三方物流': 'UU配送'">第三方配送</em></span>
-                        <span>物流公司：<em ng-bind="logistics.companyName"></em></span>
-                        <span>物流单号：<em ng-bind="logistics.number"></em></span>
+                        <span>配送方式：<em ng-bind="deliveryMethod[purchase.sendType]">第三方配送</em></span>
+                        <span>物流公司：<em ng-bind="logistics.companyName || '-'"></em></span>
+                        <span>物流单号：<em ng-bind="logistics.number || '-'"></em></span>
                     </div>
                     <div class="logistics_list01" style="margin-top: 0px;">
                         <!--<div class="log_menu"><span>您的买家已提货</span></div>-->