Просмотр исходного кода

前端添加订单数据传值2

wangdy 8 лет назад
Родитель
Сommit
4b45a488be

+ 3 - 6
src/main/webapp/resources/js/usercenter/app.js

@@ -379,22 +379,19 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
 			controllerUrl : 'app/controllers/forstore/shipping_address_edit_ctrl'
 		})).state('firstRate', angularAMD.route({
 			// 初次评价
-			url : '/rate/firstRate',
-			params : {'order' : null},
+			url : '/rate/firstRate/:orderid',
 			templateUrl : 'static/view/usercenter/forstore/first_rate.html',
 			controller : 'firstRateCtrl',
 			controllerUrl : 'app/controllers/forstore/first_rate_ctrl'
 		})).state('addRate', angularAMD.route({
 			// 追加评价
-			url : '/rate/addRate',
-			params : {'order' : null},
+			url : '/rate/addRate:orderid',
 			templateUrl : 'static/view/usercenter/forstore/add_rate.html',
 			controller : 'addRateCtrl',
 			controllerUrl : 'app/controllers/forstore/add_rate_ctrl'
 		})).state('showRate', angularAMD.route({
 			// 查看评价
-			url : '/rate/showRate',
-			params : {'order' : null},
+			url : '/rate/showRate:orderid',
 			templateUrl : 'static/view/usercenter/forstore/show_rate.html',
 			controller : 'showRateCtrl',
 			controllerUrl : 'app/controllers/forstore/show_rate_ctrl'

+ 101 - 4
src/main/webapp/resources/js/usercenter/controllers/forstore/first_rate_ctrl.js

@@ -1,9 +1,106 @@
 define(['app/app'], function(app) {
-    app.register.controller('firstRateCtrl', ['$scope', '$rootScope', '$stateParams', function ($scope, $rootScope, $stateParams) {
-        $scope.text = 'first rate page';
+    'use strict';
+    app.register.controller('firstRateCtrl', ['$scope', '$rootScope', '$stateParams','$filter','Order', 'toaster', function ($scope, $rootScope, $stateParams , $filter , Order , toaster) {
 
+        if ($stateParams.orderid && $stateParams.orderid != '') {
+            $scope.orderid = $stateParams.orderid;
+            if(!$scope.orderid) {
+                toaster.pop('warning', '没有传入有效的订单信息');
+            }
+            Order.get({orderid : $scope.orderid}, function (data) {
+                if(data.length != 1) {
+                    toaster.pop('warning', '获取订单信息失败');
+                    return ;
+                }
+                $scope.order = data[0];
+            });
+        }
+    }]);
+});
+
+
+/*
+
+define(['app/app', 'calendar'], function(app) {
+    'use strict';
+    app.register.controller('buyerQueryLogisticsCtrl', ['$scope', '$rootScope', 'BaseService', 'KdnLogistics', '$stateParams', '$filter', 'Logistics', "Order", 'toaster', function($scope, $rootScope, BaseService, KdnLogistics, $stateParams, $filter, Logistics, Order, toaster) {
+
+        $rootScope.active = 'buyer_order';
+
+        // 加密过滤器
+        var enIdFilter = $filter('EncryptionFilter');
 
+        /!**
+         *  查询物流信息(接口需要真实运单号)
+         *
+         *  @param  kdnCompanyName	快递公司名称
+         *  @param	logisticsCode	运单号
+         *
+         *!/
+        if ($stateParams.orderid && $stateParams.orderid != '') {
+            $scope.orderid = $stateParams.orderid;
+            if(!$scope.orderid) {
+                toaster.pop('warning', '没有传入有效的订单信息');
+            }
+            Order.get({orderid : $scope.orderid}, function (data) {
+                if(data.length != 1) {
+                    toaster.pop('warning', '获取订单信息失败');
+                    return ;
+                }
+                $scope.order = data[0];
+                $scope.address = JSON.parse($scope.order.jsonAddress);
+                console.log("$scope.order", $scope.order);
+                Logistics.findLogisticsById({lgtid: data[0].lgtId}, function(data){
+                    $scope.logistics = data;
+                    var params = {};
+                    params.companyName = $scope.logistics.companyName;
+                    params.logisticsCode = $scope.logistics.number;
+                    KdnLogistics.kdnQuery(params, {}, function(response){
+                        if(!response.errorInfo) {
+                            $scope.logisticsInfo = eval ("(" + response.traces + ")");
+                            statusOfLogistics($scope.logisticsInfo[$scope.logisticsInfo.length - 1].AcceptStation);
+                            $scope.hasInfo = true;
+                        }
+                    }, function(){
+                        $scope.logisticsInfo = [];
+                        toaster.pop('info', '查询物流信息失败,请核对物流公司和运单号');
+                    });
+                }, function(){
+                    toaster.pop('info', '根据快递ID查询跟订单相关联的物流信息失败');
+                });
+            }, function() {
+                toaster.pop('warning', '获取订单信心失败。');
+            });
+        }
+
+        $scope.status = "tobereceiving";
+        // 判断物流信息状态
+        var statusOfLogistics = function(str) {
+            if(str.indexOf("揽件")!=-1 || str.indexOf("收件")!=-1 || str.indexOf("转运")!=-1||str.indexOf("运输")!=-1||str.indexOf("发往")!=-1||
+                str.indexOf("发出")!=-1||str.indexOf("收入")!=-1||str.indexOf("扫描")!=-1||str.indexOf("到达")!=-1){
+                $scope.status = "transit";
+            }
+            if(str.indexOf("派送")!=-1){
+                $scope.status = "send";
+            }
+            if(str.indexOf("签收")!=-1){
+                $scope.status = "signin";
+            }
+        }
+
+        /!**
+         *  日历组件
+         *
+         *!/
+        $('#date').calendar({
+            width: 270,
+            height: 220
+        });
 
-        console.log($stateParams.order);
     }]);
-});
+
+
+
+
+});
+*/

+ 5 - 5
src/main/webapp/resources/view/usercenter/forstore/buyer_order.html

@@ -741,14 +741,14 @@
 						</span>
 						<span class="oder_deal" ng-class="{'order-border-bottom-solid' : $index == order.orderDetails.length -1 || $index==2}">
                             <div ng-if="$index == 0">
-								<a ng-if="order.status == 522" class="operate-height" ui-sref="showRate({order: order})" style="display: block;">
-                                  <em class="order-operation">评价</em>
+                                <a ng-if="order.status == 520" class="operate-height" href="user#/rate/firstRate/{{order.orderid | EncryptionFilter}}" style="display: block;">
+                                  <em class="order-operation">评价</em>
                               	</a>
-								<a ng-if="order.status == 523" class="operate-height" ui-sref="addRate({order: order})" style="display: block;">
+								<a ng-if="order.status == 523" class="operate-height" href="user#/rate/addRate/{{order.orderid | EncryptionFilter}}" style="display: block;">
                                   <em class="order-operation">追加评价</em>
                               	</a>
-								<a ng-if="order.status == 520" class="operate-height" ui-sref="firstRate({order: order})" style="display: block;">
-                                  <em class="order-operation">评价</em>
+								<a ng-if="order.status == 522" class="operate-height" href="user#/rate/showRate/{{order.orderid | EncryptionFilter}}" style="display: block;">
+                                  <em class="order-operation">评价</em>
                               	</a>
                               <a class="operate-height" href="user#/order/pay/{{order.orderid | EncryptionFilter}}" ng-if="(order.status == 503 || order.status == 501) && order.auditPayFailReason == null" style="display: block;">
                                   <em class="order-operation">立即付款</em>

+ 7 - 154
src/main/webapp/resources/view/usercenter/forstore/first_rate.html

@@ -142,166 +142,18 @@
         <tbody>
             <tr ng-repeat="detail in order.orderDetails">
                 <td>
-                    <img src="static/img/user/images/default.png" alt="">
-                    <div class="first-rate-item-info">
-                        类目:<a href="product/kind/{{::detail.kindUuid}}" target="_blank"><em ng-bind="::detail.kiName" title="{{::detail.kiName}}"></em></a><br/>
-                        型号:<a href="store/{{::order.storeid}}/{{::detail.batchCode}}" target="_blank"><em ng-bind="::detail.cmpCode" title="{{::detail.cmpCode}}"></em></a><br/>
-                        品牌:<a href="product/brand/{{::detail.branduuid}}/" target="_blank"><em ng-bind="::detail.brName" title="{{::detail.brName}}"></em></a>
+                    <a href="store/{{::order.storeid}}/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
 
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">类目:专用处理器</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">型号:445NNSJASDASKDJA</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">品牌:mnnnnnk</span></span>
-                    </div>
-                    <div class="first-rate-item-rate">
-                        <div class="rate-item">
-                            <label for="1">
-                                <span>好评</span>
-                                <input type="radio" id="1">
-                            </label>
-                            <label for="2">
-                                <span>中评</span>
-                                <input type="radio" id="2">
-                            </label>
-                            <label for="3">
-                                <span>差评</span>
-                                <input type="radio" id="3">
-                            </label>
-                        </div>
-                        <div class="first-rate-item-textBox">
-                            <textarea placeholder="请输入您对产品的评价" name="" id="" cols="30" rows="10"></textarea>
-                        </div>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <img src="static/img/user/images/default.png" alt="">
                     <div class="first-rate-item-info">
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">类目:专用处理器</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">型号:445NNSJASDASKDJA</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">品牌:mnnnnnk</span></span>
+                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">类目:<a href="product/kind/{{::detail.kindUuid}}" target="_blank"><em ng-bind="::detail.kiName" title="{{::detail.kiName}}"></em></a><br/></span></span>
+                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">型号:<a href="store/{{::order.storeid}}/{{::detail.batchCode}}" target="_blank"><em ng-bind="::detail.cmpCode" title="{{::detail.cmpCode}}"></em></a><br/></span></span>
+                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">品牌:<a href="product/brand/{{::detail.branduuid}}/" target="_blank"><em ng-bind="::detail.brName" title="{{::detail.brName}}"></em></a></span></span>
                     </div>
                     <div class="first-rate-item-rate">
                         <div class="rate-item">
                             <label for="1">
                                 <span>好评</span>
-                                <input type="radio" id="1">
-                            </label>
-                            <label for="2">
-                                <span>中评</span>
-                                <input type="radio" id="2">
-                            </label>
-                            <label for="3">
-                                <span>差评</span>
-                                <input type="radio" id="3">
-                            </label>
-                        </div>
-                        <div class="first-rate-item-textBox">
-                            <textarea placeholder="请输入您对产品的评价" name="" id="" cols="30" rows="10"></textarea>
-                        </div>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <img src="static/img/user/images/default.png" alt="">
-                    <div class="first-rate-item-info">
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">类目:专用处理器</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">型号:445NNSJASDASKDJA</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">品牌:mnnnnnk</span></span>
-                    </div>
-                    <div class="first-rate-item-rate">
-                        <div class="rate-item">
-                            <label for="1">
-                                <span>好评</span>
-                                <input type="radio" id="1">
-                            </label>
-                            <label for="2">
-                                <span>中评</span>
-                                <input type="radio" id="2">
-                            </label>
-                            <label for="3">
-                                <span>差评</span>
-                                <input type="radio" id="3">
-                            </label>
-                        </div>
-                        <div class="first-rate-item-textBox">
-                            <textarea placeholder="请输入您对产品的评价" name="" id="" cols="30" rows="10"></textarea>
-                        </div>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <img src="static/img/user/images/default.png" alt="">
-                    <div class="first-rate-item-info">
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">类目:专用处理器</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">型号:445NNSJASDASKDJA</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">品牌:mnnnnnk</span></span>
-                    </div>
-                    <div class="first-rate-item-rate">
-                        <div class="rate-item">
-                            <label for="1">
-                                <span>好评</span>
-                                <input type="radio" id="1">
-                            </label>
-                            <label for="2">
-                                <span>中评</span>
-                                <input type="radio" id="2">
-                            </label>
-                            <label for="3">
-                                <span>差评</span>
-                                <input type="radio" id="3">
-                            </label>
-                        </div>
-                        <div class="first-rate-item-textBox">
-                            <textarea placeholder="请输入您对产品的评价" name="" id="" cols="30" rows="10"></textarea>
-                        </div>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <img src="static/img/user/images/default.png" alt="">
-                    <div class="first-rate-item-info">
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">类目:专用处理器</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">型号:445NNSJASDASKDJA</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">品牌:mnnnnnk</span></span>
-                    </div>
-                    <div class="first-rate-item-rate">
-                        <div class="rate-item">
-                            <label for="1">
-                                <span>好评</span>
-                                <input type="radio" id="1">
-                            </label>
-                            <label for="2">
-                                <span>中评</span>
-                                <input type="radio" id="2">
-                            </label>
-                            <label for="3">
-                                <span>差评</span>
-                                <input type="radio" id="3">
-                            </label>
-                        </div>
-                        <div class="first-rate-item-textBox">
-                            <textarea placeholder="请输入您对产品的评价" name="" id="" cols="30" rows="10"></textarea>
-                        </div>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <img src="static/img/user/images/default.png" alt="">
-                    <div class="first-rate-item-info">
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">类目:专用处理器</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">型号:445NNSJASDASKDJA</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">品牌:mnnnnnk</span></span>
-                    </div>
-                    <div class="first-rate-item-rate">
-                        <div class="rate-item">
-                            <label for="1">
-                                <span>好评</span>
-                                <input type="radio" id="1">
+                                <input type="radio" id="1" checked="checked">
                             </label>
                             <label for="2">
                                 <span>中评</span>
@@ -318,6 +170,7 @@
                     </div>
                 </td>
             </tr>
+
             <tr class="record-num">
                 <td colspan="6">
                     <span class="count-tip">显示<span ng-bind="$$kdnData.start">23</span>-<span ng-bind="$$kdnData.end">10</span>,共:<span ng-bind="$$kdnData.totalElements" style="color: #5078cb;">23</span>个</span>
@@ -327,7 +180,7 @@
     </table>
     <div class="submitBox">
         <label class="check-active">
-            <input ng-model="isSetTop" type="checkbox" id="check-act" class="ng-pristine ng-untouched ng-valid">
+            <input ng-model="isSetTop" type="checkbox" id="check-act" class="ng-pristine ng-untouched ng-valid" checked="checked">
             <label for="check-act"></label>
             <span style="font-size: 14px; color: black">匿名评价</span>
         </label>