订单模块接口联调

src/main/resources/static/js/common/serviceapi/order.service.js

@@ -200,7 +200,7 @@ var OrderApi = {
         /* 机构用户确认订单操作*/
         AffirmOrderOrder: function (params, callback) {
             Http.AjaxService({
-                url:'/order/affirmOrder',
+                url:'/order/club/confirm',
                 type:'POST',
                 data:params,
                 json:false,

src/main/resources/static/js/common/serviceapi/supplier.service.js

@@ -18,10 +18,11 @@ var SupplierApi = {
         },
         ShipmentsInfo: function (params, callback) {//发货商品初始化
             Http.AjaxService({
-                url:'/supplier/shipmentsInfo',
+                url:'/order/shop/ship/info',
                 type:'GET',
                 data:params,
-                json:true
+                json:true,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -29,10 +30,11 @@ var SupplierApi = {
         },
         MyOrderList: function (params, callback) {//供应商订单列表
             Http.AjaxService({
-                url:'/supplier/myOrderList',
+                url:'/order/shop/list',
                 type:'GET',
                 data:params,
-                json:true
+                json:true,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -93,10 +95,11 @@ var SupplierApi = {
         },
         addLogistics: function (params, callback) {//发货/添加物流页 确定提交订单列表
             Http.AjaxService({
-                url:'/supplier/addLogistics',
+                url:'/order/shop/ship/delivery',
                 type:'post',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -104,10 +107,11 @@ var SupplierApi = {
         },
         shipmentsRecord: function (params, callback) {//发货/添加物流页 确定提交订单列表
             Http.AjaxService({
-                url:'/supplier/shipmentsRecord',
+                url:'/order/shop/ship/delivery/record',
                 type:'GET',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -127,10 +131,11 @@ var SupplierApi = {
         },
         logisticsInfo: function (params, callback) {//记录的查看物流
             Http.AjaxService({
-                url:'/supplier/logisticsInfo',
+                url:'/order/shop/ship/logistics/info',
                 type:'GET',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -230,23 +235,13 @@ var SupplierApi = {
                 callback(res);
             });
         },
-        SearchSupplierProduct: function (params, callback) {//编辑我的商品回显数据
-            Http.AjaxService({
-                url:'/supplier/productSearch',
-                type:'get',
-                data:params,
-                json:false
-            })
-            .then(function(res){
-                callback(res);
-            });
-        },
         GetSupplierLogisticsRecord: function (params, callback) {//发货-添加商品资质初始化查询商品
             Http.AjaxService({
-                url:'/supplier/logisticsRecord',
+                url:'/order/shop/ship/logistics/record',
                 type:'get',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -254,10 +249,11 @@ var SupplierApi = {
         },
         GetSupplierQualificationData: function (params, callback) {//发货-商品资质回显
             Http.AjaxService({
-                url:'/supplier/qualification/data',
+                url:'/order/shop/qualification/list',
                 type:'get',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -265,10 +261,11 @@ var SupplierApi = {
         },
         GetSupplierQualificationUpdata: function (params, callback) {//发货-保存商品资质
             Http.AjaxService({
-                url:'/supplier/qualification',
+                url:'/order/shop/qualification/save',
                 type:'post',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -288,9 +285,10 @@ var SupplierApi = {
         },
         kdList: function ( callback) {//快递公司
             Http.AjaxService({
-                url:'/supplier/logisticsCompany',
+                url:'/order/shop/ship/company',
                 type:'GET',
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -298,10 +296,11 @@ var SupplierApi = {
         },
         addLogisticsInfo: function (params, callback) {//追加物流
             Http.AjaxService({
-                url:'/supplier/addLogisticsInfo',
+                url:'/order/shop/ship/logistics/add',
                 type:'post',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -309,10 +308,11 @@ var SupplierApi = {
         },
         cancelShipment: function (params, callback) {//查看物流/撤销发货
             Http.AjaxService({
-                url:'/supplier/cancelShipment',
+                url:'/order/shop/ship/delivery/cancel',
                 type:'post',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -320,10 +320,11 @@ var SupplierApi = {
         },
         shopOrderDetails: function (params, callback) {//我的订单/查看详情
             Http.AjaxService({
-                url:'/supplier/shopOrderDetails',
+                url:'/order/shop/detail',
                 type:'GET',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -398,10 +399,11 @@ var SupplierApi = {
         },
         settlementList : function(params,callback) {//结算管理列表
             Http.AjaxService({
-                url:'/supplier/settlementList',
+                url:'/order/shop/settlement/list',
                 type:'get',
                 data:params,
-                json:true
+                json:true,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -420,10 +422,11 @@ var SupplierApi = {
         },
         salesList : function(params,callback) {//售货清单
             Http.AjaxService({
-                url:'/supplier/salesList',
+                url:'/order/shop/sales/list',
                 type:'get',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);

src/main/resources/static/js/supplier-center/order/delivergoods.js

@@ -2,7 +2,7 @@
 var delivergoods = new Vue({
     el: '#delivergoods',
     data: {
-        ShopID: '',
+        shopOrderId: '',
         userInfo: {},
         productList: [],
         submitIds: [],//去结算商品Ids
@@ -12,12 +12,12 @@ var delivergoods = new Vue({
         open: false,
     },
     methods: {
-    returnBack:function(){
-        window.location.href='/supplier/order/list.html'
-    },
-    opentittle: function () {
-        this.open = !this.open;
-    },
+        returnBack:function(){
+            window.location.href='/supplier/order/list.html'
+        },
+        opentittle: function () {
+            this.open = !this.open;
+        },
         computedPrice: function (order) { //单选
             var _self = this;
                     if(event.target.checked){
@@ -48,24 +48,23 @@ var delivergoods = new Vue({
                 }
         },
         delivery:function () {
-        var _this = this;
-        if(_this.submitIds.length==0){
-           CAIMEI.Modal('请至少选择一项商品进行发货','确定','取消',function () {})
-        }else {
-         CAIMEI.Modal('确定发货吗？确定后将不能修改','取消','确定',function () {
-             var orderlist= JSON.stringify(_this.submitIds);
-             var user = JSON.stringify(_this.userInfo);
-               CAIMEI.Storage.setItem('orderList',orderlist);
-               CAIMEI.Storage.setItem('userInfo_deliver',user);
-                setTimeout(function(){
-                    window.location.href = '/supplier/order/logistics.html';
-                },200)
-         })
-
-        }
+            var _this = this;
+            if(_this.submitIds.length==0){
+                CAIMEI.dialog('请至少选择一项商品进行发货',false);
+            }else {
+                 CAIMEI.Modal('确定发货吗？确定后将不能修改','取消','确定',function () {
+                     var orderlist= JSON.stringify(_this.submitIds);
+                     var user = JSON.stringify(_this.userInfo);
+                       CAIMEI.Storage.setItem('orderList',orderlist);
+                       CAIMEI.Storage.setItem('userInfo_deliver',user);
+                        setTimeout(function(){
+                            window.location.href = '/supplier/order/logistics.html';
+                        },200)
+                 })
+            }
         },
         changeCountSub:function(order) {//商品数量减
-        var _this = this;
+            var _this = this;
             if(_this.inputVal > 1) {
                 _this.inputVal--;
             }
@@ -81,30 +80,31 @@ var delivergoods = new Vue({
             }
             order.inputVal = _this.inputVal;
         },
-         numberChange: function(order){
+        numberChange: function(order){
             var _this = this;
            order.inputVal = _this.inputVal
         },
-
-    },
-    created:function(){
-
+        getDataInfo:function (){
+            var _self = this;
+            SupplierApi.ShipmentsInfo({shopOrderId: _self.shopOrderId}, function (response) {
+                if (response.code == 0) {
+                    var data = response.data
+                    _self.userInfo = data.userInfo;
+                    data.orderProductList.forEach(function(order){
+                        order.inputVal = order.notOutStore - order.actualCancelNum;
+                        _self.inputVal=order.inputVal
+                    });
+                    _self.productList = data.orderProductList;
+                }
+            })
+        }
     },
     mounted: function () {
         var _this = this;
-        _this.ShopID=CAIMEI.getUrlParam('shopOrderID');
+        _this.shopOrderId=CAIMEI.getUrlParam('shopOrderId');
         if (isPC) {
             _this.open = true;
         }
-        SupplierApi.ShipmentsInfo({shopOrderId: _this.ShopID}, function (res) {
-            if (res.code == 0) {
-                _this.userInfo = res.data.userInfo;
-                res.data.orderProductList.forEach(function(order){
-                       order.inputVal = order.notOutStore - order.actualCancelNum;
-                       _this.inputVal=order.inputVal
-                    });
-                _this.productList = res.data.orderProductList;
-            }
-        })
+        _this.getDataInfo();
     },
 })

src/main/resources/static/js/supplier-center/order/detail.js

@@ -2,45 +2,64 @@
 var seeDetail = new Vue({
     el:'#seeDetail',
     data:{
-        shopID:'',
+        shopOrderId:'',
         userInfo:{},
         order:{},
         orderList:[],
         payShopRecord:[],
         isFiexd:true
     },
+    filters: {
+        NumFormat:function(text) {//处理金额
+            return Number(text).toFixed(2);
+        },
+        sendOutStatusType:function(value) {
+            if (value === null) {
+                return '未发货';
+            } else if(value === 1) {
+                return '待发货';
+            } else if(value === 2) {
+                return '部分发货';
+            } else{
+                return '已发货';
+            }
+        },
+        payStatusType:function(value) {
+            if (value === 1) {
+                return '待结算';
+            } else if (value === 2) {
+                return '部分结算';
+            } else {
+                return '已结算';
+            }
+        }
+    },
     methods:{
-        delivery:function (orderID) {//发货
-            window.location.href='/supplier/order/delivery.html?shopOrderID='+orderID;
+        delivery:function (orderId) {//发货
+            window.location.href='/supplier/order/delivery.html?shopOrderId='+orderId;
         },
-        record:function (shopOrderID) {//发货记录
-            window.location.href = '/supplier/order/delivery_record.html?shopOrderID='+shopOrderID;
+        record:function (shopOrderId) {//发货记录
+            window.location.href = '/supplier/order/delivery_record.html?shopOrderId='+shopOrderId;
         },
-        Checklist:function (shopOrderID) {//售货清单
-             window.open('/supplier/order/sales.html?shopOrderID='+shopOrderID)
+        Checklist:function (shopOrderId) {//售货清单
+             window.open('/supplier/order/sales.html?shopOrderId='+shopOrderId)
         },
         seeshopDetails:function () {
-        var _this=this;
-            SupplierApi.shopOrderDetails({shopOrderId:_this.shopID},function (res) {//列表初始化
-            if(res.code==0){
-                _this.order = res.data.shopOrder
-                _this.userInfo = res.data.shopOrder.userInfo;
-                _this.orderList =res.data.shopOrder.orderProductList;
-                _this.payShopRecord = res.data.payShopRecord;
-                // if(res.data.payShopRecord==''){
-                // _this.payflag = false;
-                //  _this.payShopRecord = [];
-                // }else {
-                // _this.payflag = true;
-                //  _this.payShopRecord = res.data.payShopRecord;
-                // }
-            }
-         })
+            var _self = this;
+            SupplierApi.shopOrderDetails({shopOrderId:_self.shopOrderId},function (response) {//列表初始化
+                if(response.code==0){
+                    var data = response.data;
+                    _self.order = data.shopOrder;
+                    _self.userInfo = data.shopOrder.userInfo;
+                    _self.orderList =data.shopOrder.orderProductList;
+                    _self.payShopRecord = data.payShopRecord;
+                }
+             })
         },
     },
     mounted:function () {
        var _self = this;
-        _self.shopID=CAIMEI.getUrlParam('shopOrderID');
+        _self.shopOrderId=CAIMEI.getUrlParam('shopOrderId');
         _self.seeshopDetails();
 
         if(isPC){

src/main/resources/static/js/supplier-center/order/logistics-add.js

@@ -2,16 +2,17 @@
 var addlogistics = new Vue({
     el:'#addlogistics',
     data:{
-         open:false,
-         userInfo:{},
-         orderList:[],
-         logisticsBatch:{},
-         GoodsImagesList:[],
-         formData:new FormData(),
-         txtVal: 0,
-         desc:'',
-         kdlist:[],
-         logisticList:[
+        open:false,
+        userInfo:{},
+        orderList:[],
+        shopOrderId:0,
+        logisticsBatch:{},
+        GoodsImagesList:[],
+        formData:new FormData(),
+        txtVal: 0,
+        desc:'',
+        kdlist:[],
+        logisticList:[
              {
                 value:'',
                 name:'',
@@ -20,20 +21,20 @@ var addlogistics = new Vue({
                 ]
              }
          ],
-         params:{
+        params:{
             logistics:[],//物流
-            logisticsBatchID:'',
+            logisticsBatchId:'',
             remarkImage:'',
             remark:''
-         },
-         select:'',
-         electShow:false,
+        },
+        select:'',
+        electShow:false,
     },
     methods:{
-     bigImage:function(){
+        bigImage:function(){
             var viewer = new Viewer(document.getElementById('uploadGoodsImages'));
         },
-         uploadGoodsImagesFn: function(event){//上传商品图片
+        uploadGoodsImagesFn: function(event){//上传商品图片
             var _this = this;
             var inputDOM = _this.$refs.goodsImages;
             var file = inputDOM.files;
@@ -44,16 +45,16 @@ var addlogistics = new Vue({
                 event.target.value = '';
             });
         },
-         removeGoodsImagesFn: function(index){//删除商品图片
+        removeGoodsImagesFn: function(index){//删除商品图片
             var _this = this;
             _this.GoodsImagesList.splice(index,1);
              _this.params.remarkImage =_this.GoodsImagesList.join('##').substring();
-         },
-         selshow:function(event,index){
+        },
+        selshow:function(event,index){
             this.select = index;
             this.electShow = !this.electShow
-         },
-         addBtn:function () { //添加物流
+        },
+        addBtn:function () { //添加物流
              var _this = this;
              var obj = {
                         value:'',
@@ -63,43 +64,45 @@ var addlogistics = new Vue({
                         ]
                   };
               _this.logisticList.push(obj);
-         },
-         addNum:function(item,index){
+        },
+        addNum:function(item,index){
             var _this = this;
             var obj = {number:''};
             item.numList.push(obj);
-         },
-         subBtn:function (list) {
+        },
+        subBtn:function (list) {
             var _this = this;
              _this.logisticList.splice(_this.kdlist.indexOf(list), 1);
-         },
-         reduceBtn:function(item){
+        },
+        reduceBtn:function(item){
             var _this = this;
              item.numList.splice(item.numList.indexOf(item.numList), 1);
-         },
-         parameter:function(){//参数信息
-           var _this = this;
+        },
+        parameter:function(){//参数信息
+            var _this = this;
             _this.logisticList.forEach(function (pros) {
-                    var obj = {};
-                    var Code = pros.value;
-                    var yName = pros.name;
-                    var numList = pros.numList;
-                    numList.forEach(function (item) {
-                        var logisNum = item.number;
-                         obj={
-                            logisticsCompanyCode:Code,
-                            logisticsCompanyName:yName,
-                            number:logisNum
-                        };
-                        if(obj.logisticsCompanyCode==""&&obj.logisticsCompanyName==""){
-                            CAIMEI.Alert('请选择快递公司','确定')
-                        }else if(obj.number==""){
-                            CAIMEI.Alert('请输入快递单号','确定')
-                        }else {
-                         _this.params.logistics.push(obj);
-                        }
-                     })
-              })
+                var obj = {};
+                var Code = pros.value;
+                var yName = pros.name;
+                var numList = pros.numList;
+                var logisticsArray = [];
+                numList.forEach(function (item) {
+                    var logisNum = item.number;
+                     obj={
+                        logisticsCompanyCode:Code,
+                        logisticsCompanyName:yName,
+                        number:logisNum
+                    };
+                    if(obj.logisticsCompanyCode==""&&obj.logisticsCompanyName==""){
+                        CAIMEI.dialog('请选择快递公司',false);
+                    }else if(obj.number==""){
+                        CAIMEI.dialog('请输入快递单号',false);
+                    }else {
+                        logisticsArray.push(obj);
+                        _this.params.logistics = JSON.stringify(logisticsArray)
+                    }
+                 })
+            })
          },
          ChangeLogistics:function(event,item,index){
              var donClass = '#logistics'+index;
@@ -110,49 +113,57 @@ var addlogistics = new Vue({
          turnBtn:function () {//提交发货
             var _this = this;
             console.log(_this.params)
-            var shopOrderId = $('.pro-information li').attr('shopOrderID');
-                _this.parameter();
-                 var params = JSON.stringify(_this.params);
-                SupplierApi.addLogisticsInfo({params:params},function (res) {
-                    if(res.code == 0) {
-                        CAIMEI.dialog('发货成功');
-                        window.location.href = '/supplier/order/delivery_record.html?shopOrderID='+shopOrderId;
-                      }else {
-
-                      }
-                 })
+            var shopOrderId = $('.pro-information li').attr('shopOrderId');
+            _this.parameter();
+             // var params = JSON.stringify(_this.params);
+            SupplierApi.addLogisticsInfo(_this.params,function (response) {
+                if(response.code == 0) {
+                    CAIMEI.dialog('发货成功',true,function () {
+                        window.location.href = '/supplier/order/delivery_record.html?shopOrderId='+shopOrderId;
+                    })
+                }else {
+                    CAIMEI.Alert(response.msg,'确定',false);
+                }
+             })
          },
+        getLogisticsInfo(shopOrderId){// 初始化
+            var _self = this;
+            SupplierApi.logisticsInfo({logisticsBatchId:_self.params.logisticsBatchId,shopOrderId: _self.shopOrderId},function (response) {
+                if(response.code==0){
+                    var data = response.data;
+                    _self.userInfo = data.userInfo;
+                    _self.logisticsBatch = data.logisticsBatch;
+                    _self.params.remark =_self.logisticsBatch.remark;
+                    if( _self.logisticsBatch.remarkImages!=null&& _self.logisticsBatch.remarkImages!=''){
+                        _self.GoodsImagesList =  _self.logisticsBatch.remarkImages;
+                        _self.params.remarkImage = _self.GoodsImagesList.join('##').substring();
+                    }
+                    _self.orderList = data.logisticsBatch.logisticsRecordList;
+                }
+            })
+        },
+        getShipCompany:function (){// 物流公司列表
+            var _self = this;
+            SupplierApi.kdList(function (response) {
+                if(response.code==0){
+                    var data = response.data;
+                    data.forEach(function(item){
+                        _self.kdlist.push(item);
+                    });
+                    console.log(_self.kdlist.length);
+                }
+            });
+        }
+
     },
     mounted:function () {
-      var _self = this;
-      var shopOrderId=CAIMEI.getUrlParam('shopOrderId');
-      var logisticsBatchId=CAIMEI.getUrlParam('logisticsBatchId');
-      _self.params.logisticsBatchID =logisticsBatchId;
-      SupplierApi.logisticsInfo({logisticsBatchId:logisticsBatchId,shopOrderId:shopOrderId},function (res) {
-        if(res.code==0){
-            _self.userInfo = res.data.userInfo;
-            _self.logisticsBatch = res.data.logisticsBatch;
-            _self.params.remark =_self.logisticsBatch.remark;
-            if( _self.logisticsBatch.remarkImages!=null&& _self.logisticsBatch.remarkImages!=''){
-                 _self.GoodsImagesList =  _self.logisticsBatch.remarkImages;
-                 _self.params.remarkImage = _self.GoodsImagesList.join('##').substring();
-            }
-            _self.orderList = res.data.logisticsBatch.logisticsRecordList;
-            console.log( _self.params.remarkImage)
-        }
-      })
-      SupplierApi.kdList(function (res) {
-         if(res.code==0){
-            var data = res.data;
-            data.forEach(function(item){
-               _self.kdlist.push(item);
-            });
-          console.log(_self.kdlist.length);
-         }
-      });
-      if(isPC){
+        var _self = this;
+        _self.shopOrderId= CAIMEI.getUrlParam('shopOrderId');
+        _self.params.logisticsBatchId = Number(CAIMEI.getUrlParam('logisticsBatchId'));
+        _self.getLogisticsInfo();
+        _self.getShipCompany();
+        if(isPC){
             _self.open=true;
         }
-
     }
 })

src/main/resources/static/js/supplier-center/order/logistics-detail.js

@@ -13,16 +13,20 @@ var logisticsDetail  = new Vue({
         bigImage:function(){
             var viewer = new Viewer(document.getElementById('uploadGoodsImages'));
         },
-    },
-    mounted:function () {
-    var _self=this;
-     _self.params.logisticsBatchId=CAIMEI.getUrlParam('logisticsBatchId');
-     _self.params.shopOrderId=CAIMEI.getUrlParam('shopOrderId');
-        SupplierApi.logisticsInfo(_self.params,function (res) {
+        getDataInfo:function (){
+            var _self= this;
+            SupplierApi.logisticsInfo(_self.params,function (res) {
                 if(res.code==0){
                     _self.userInfo = res.data.userInfo;
-                    _self.listData = res.data.logisticsBatch
+                    _self.listData = res.data.logisticsBatch;
                 }
-        })
+            })
+        }
+    },
+    mounted:function () {
+        var _self=this;
+        _self.params.logisticsBatchId=CAIMEI.getUrlParam('logisticsBatchId');
+        _self.params.shopOrderId=CAIMEI.getUrlParam('shopOrderId');
+        _self.getDataInfo();
     }
 })

src/main/resources/static/js/supplier-center/order/logistics.js

@@ -18,43 +18,41 @@ var logistics = new Vue({
                 ]
              }
          ],
-         params:{
-            logistics:[],//物流
-            record:[],
-            info:{
-                image:'',
-                note:'',//备注
-                shopOrderId:'',//商品id
-            },
-         },
-         select:'',
-         electShow:false,
+        params:{
+            shopOrderId:0,	// 子订单Id
+            note:'',		// 备注
+            image:'',		// 备注图片
+            logistics:'',	// 物流信息
+            products:''		//子订单商品信息
+        },
+        select:'',
+        electShow:false,
     },
     methods:{
         bigImage:function(){
             var viewer = new Viewer(document.getElementById('uploadGoodsImages'));
         },
-         uploadGoodsImagesFn: function(event){//上传商品图片
+        uploadGoodsImagesFn: function(event){//上传商品图片
             var _this = this;
             var inputDOM = _this.$refs.goodsImages;
             var file = inputDOM.files;
             _this.formData.append('file', file[0]);
             SupplierApi.uploadimg(_this.formData,function(response){
                _this.GoodsImagesList.push(response.data);
-               _this.params.info.image =_this.GoodsImagesList.join('##').substring();
+               _this.params.image =_this.GoodsImagesList.join('##').substring();
                 event.target.value = '';
             });
         },
-         removeGoodsImagesFn: function(index){//删除商品图片
+        removeGoodsImagesFn: function(index){//删除商品图片
             var _this = this;
             _this.GoodsImagesList.splice(index,1);
-             _this.params.info.image =_this.GoodsImagesList.join('##').substring();
-         },
-         selshow:function(event,index){
+            _this.params.image =_this.GoodsImagesList.join('##').substring();
+        },
+        selshow:function(event,index){
             this.select = index;
             this.electShow = !this.electShow
-         },
-         addBtn:function () { //添加物流
+        },
+        addBtn:function () { //添加物流
              var _this = this;
              var obj = {
                         value:'',
@@ -64,89 +62,92 @@ var logistics = new Vue({
                         ]
                   };
               _this.logisticList.push(obj);
-         },
-         addNum:function(item,index){
+        },
+        addNum:function(item,index){
             var _this = this;
             var obj = {number:''};
             item.numList.push(obj);
-         },
-         subBtn:function (list) {
+        },
+        subBtn:function (list) {
             var _this = this;
              _this.logisticList.splice(_this.kdlist.indexOf(list), 1);
-         },
-         reduceBtn:function(item){
+        },
+        reduceBtn:function(item){
             var _this = this;
              item.numList.splice(item.numList.indexOf(item.numList), 1);
-         },
-         parameter:function(){//参数信息
-           var _this = this;
-           var record=[];
+        },
+        parameter:function(){//参数信息
+            var _this = this;
+            var record=[];
             $('.pro-information li').each(function(){//发货数
-                  var productobj={};
-                  productobj.orderProductId = $(this).attr('orderproductid');
-                  productobj.num = $(this).find('.del-num').text();
-                    record.push(productobj)
+                var productobj={};
+                productobj.orderProductId = Number($(this).attr('orderproductid'));
+                productobj.num = Number($(this).find('.del-num').text());
+                record.push(productobj)
             });
-             _this.params.record=record
-            _this.params.info.shopOrderId = $('.pro-information li').attr('shopOrderID');
+            _this.params.products = JSON.stringify(record);
+            _this.params.shopOrderId = $('.pro-information li').attr('shopOrderId');
             _this.logisticList.forEach(function (pros) {
-                    var obj = {};
-                    var Code = pros.value;
-                    var yName = pros.name;
-                    var numList = pros.numList;
-                    numList.forEach(function (item) {
-                        var logisNum = item.number;
-                         obj={
-                            logisticsCompanyCode:Code,
-                            logisticsCompanyName:yName,
-                            number:logisNum
-                        };
-                         if(obj.logisticsCompanyCode==""&&obj.logisticsCompanyName==""){
-                            CAIMEI.Alert('请选择快递公司','确定')
-                        }else if(obj.number==""){
-                            CAIMEI.Alert('请输入快递单号','确定')
-                        }else {
-                         _this.params.logistics.push(obj);
-                        }
-                     })
-              })
-         },
-         ChangeLogistics:function(event,item,index){
+                var obj = {};
+                var Code = pros.value;
+                var yName = pros.name;
+                var numList = pros.numList;
+                var logisticsArray = [];
+                numList.forEach(function (item) {
+                    var logisNum = item.number;
+                    obj={
+                        logisticsCompanyCode:Code,
+                        logisticsCompanyName:yName,
+                        number:logisNum
+                    };
+                    if(obj.logisticsCompanyCode==""&&obj.logisticsCompanyName==""){
+                         CAIMEI.dialog('请选择快递公司',false);
+                    }else if(obj.number==""){
+                         CAIMEI.dialog('请输入快递单号',false);
+                    }else {
+                        logisticsArray.push(obj);
+                        _this.params.logistics = JSON.stringify(logisticsArray)
+                    }
+                })
+            })
+        },
+        ChangeLogistics:function(event,item,index){
              var donClass = '#logistics'+index;
              var domLogistics =  document.querySelector(donClass);
              item.name = domLogistics.options[domLogistics.selectedIndex].text;
              item.value =event.target.value;
-         },
-         turnBtn:function () {//提交发货
-            var _this = this;
-             _this.parameter();
-             console.log(_this.params)
-            var params = JSON.stringify(_this.params);
-            SupplierApi.addLogistics({params:params},function (res) {
-                if(res.code == 0) {
-                setTimeout(function () {
-                        CAIMEI.dialog('发货成功')
-                    },1000)
-                     window.location.href = '/supplier/order/delivery_record.html?shopOrderID='+_this.params.info.shopOrderId;
-                  }else {
-
-                  }
+        },
+        turnBtn:function () {//提交发货
+            var _self = this;
+            _self.parameter();
+            console.log('params',this.params);
+            SupplierApi.addLogistics(_self.params,function (response) {
+                if(response.code == 0) {
+                    CAIMEI.dialog('发货成功',true,function () {
+                        window.location.href = '/supplier/order/delivery_record.html?shopOrderId='+_self.params.shopOrderId;
+                    })
+                }else {
+                    CAIMEI.Alert(response.msg,'确定',false);
+                }
              })
-         },
+        },
+        getShipCompany:function (){// 物流公司列表
+            var _self = this;
+            SupplierApi.kdList(function (response) {
+                if(response.code==0){
+                    var data = response.data;
+                    data.forEach(function(item){
+                        _self.kdlist.push(item);
+                    });
+                    console.log(_self.kdlist.length);
+                }
+            });
+        }
     },
     mounted:function () {
-      var _self = this;
-          SupplierApi.kdList(function (res) {
-             if(res.code==0){
-                var data = res.data;
-                data.forEach(function(item){
-                   _self.kdlist.push(item);
-                });
-              console.log(_self.kdlist.length);
-             }
-          });
+        var _self = this;
         _self.userInfo =JSON.parse(CAIMEI.Storage.getItem('userInfo_deliver'));
         _self.orderList = JSON.parse(CAIMEI.Storage.getItem('orderList'));
-
+        _self.getShipCompany();
     }
 })

src/main/resources/static/js/supplier-center/order/orderlist.js

@@ -3,25 +3,25 @@ var orderList = new Vue({
     el:'#orderList',
     data:{
         Status:[
-            {name:'所有',value:'0'},
-            {name:'待发货',value:'1'},
-            {name:'部分发货',value:'2'},
-            {name:'已发货',value:'3'},
+            {name:'所有',value:0},
+            {name:'待发货',value:1},
+            {name:'部分发货',value:2},
+            {name:'已发货',value:3},
         ],
         pay:[
-            {name:'所有',value:'0'},
-            {name:'待结算',value:'1'},
-            {name:'部分结算',value:'2'},
-            {name:'已结算',value:'3'},
+            {name:'所有',value:0},
+            {name:'待结算',value:1},
+            {name:'部分结算',value:2},
+            {name:'已结算',value:3},
         ],
         params:{
-            ShopID:'',
+            shopId:'',
             pageNum: 1,
             pageSize: 10,
             sendOutStatus: '',//发货状态
             payStatus:'',//结算状态
             shopOrderNo:'',//订单编号
-            shouHuoRen: '',//收货人
+            receiver: '',//收货人
         },
          pageInput: '1',
          listRecord: 0,
@@ -50,72 +50,100 @@ var orderList = new Vue({
             return [1, 0, index - 2, index - 1, index, index + 1, index + 2, 0, total];
         }
     },
+    filters: {
+        NumFormat:function(text) {//处理金额
+            return Number(text).toFixed(2);
+        },
+        sendOutStatusType:function(value) {
+            if (value === null) {
+                return '未发货';
+            } else if(value === 1) {
+                return '待发货';
+            } else if(value === 2) {
+                return '部分发货';
+            } else{
+                return '已发货';
+            }
+        },
+        payStatusType:function(value) {
+            if (value === 1) {
+                return '待结算';
+            } else if (value === 2) {
+                return '部分结算';
+            } else {
+                return '已结算';
+            }
+        }
+    },
     methods:{
-         toPagination: function (pageNum) {
+        toPagination: function (pageNum) {
             if (pageNum <= this.pageTotal) {
                 this.params.pageNum = pageNum;
                 this.MyOrderList(this.params);
             }
         },
-     checkNum: function () {
-        if (this.pageInput > this.pageTotal) {
-            this.pageInput = this.pageTotal;
-        } else if (this.pageInput < 1) {
-            this.pageInput = 1;
-        }
-    },
-    MyOrderList:function () {
-       var _this = this;
-        SupplierApi.MyOrderList(_this.params,function (res) {
-            if(res.code==0){
-                  _this.isRequset = false;
-                 if(res.data.results.length > 0){
-                     _this.results = res.data.results;
-                     _this.listRecord = res.data.totalRecord;
-                 }else {
-                     _this.results = res.data.results;
-                     _this.listRecord = res.data.totalRecord;
-                 }
+         checkNum: function () {
+            if (this.pageInput > this.pageTotal) {
+                this.pageInput = this.pageTotal;
+            } else if (this.pageInput < 1) {
+                this.pageInput = 1;
             }
-        })
-    },
-    getpayStatus:function () { //结算状态
-        var _this = this;
-        if(event.target.value==0){
-            _this.params.payStatus = '';
-        }else {
-            _this.params.payStatus = event.target.value;
-        }
-    },
-    getstatus:function () { //发货状态
-      var _this = this;
-        if(event.target.value==0){
-         _this.params.sendOutStatus='';
-        }else {
-         _this.params.sendOutStatus=event.target.value;
-        }
-    },
-    serchBtn:function () {
-        var _this=this;
-            _this.MyOrderList()
-    },
-    delivery:function (orderID) {//发货
-        window.location.href='/supplier/order/delivery.html?shopOrderID='+orderID;
-    },
-    record:function (shopOrderID) {//发货记录
-        window.location.href = '/supplier/order/delivery_record.html?shopOrderID='+shopOrderID;
-    },
-    Checklist:function (shopOrderID) {//售货清单
-         window.open('/supplier/order/sales.html?shopOrderID='+shopOrderID)
-    },
-    seedetail:function (shopOrderID) {
-        window.location.href = '/supplier/order/detail.html?shopOrderID='+shopOrderID;
-    },
+        },
+        MyOrderList:function () {
+           var _self = this;
+            SupplierApi.MyOrderList(_self.params,function (response) {
+                if(response.code==0){
+                    var data = response.data
+                    _self.isRequset = false;
+                     if(data.list.length > 0){
+                         _self.results = data.list;
+                         _self.listRecord = data.total;
+                     }else {
+                         _self.results = data.list;
+                         _self.listRecord = data.total;
+                     }
+                }else{
+                    CAIMEI.Alert(response.msg, '确定', false);
+                }
+            })
+        },
+        getpayStatus:function () { //结算状态
+            var _this = this;
+            if(event.target.value==0){
+                _this.params.payStatus = '';
+            }else {
+                _this.params.payStatus = event.target.value;
+            }
+        },
+        getstatus:function () { //发货状态
+          var _this = this;
+            if(event.target.value==0){
+             _this.params.sendOutStatus='';
+            }else {
+             _this.params.sendOutStatus=event.target.value;
+            }
+        },
+        serchBtn:function () {
+            var _this=this;
+                _this.MyOrderList()
+        },
+        delivery:function (orderId) {//发货
+            window.location.href='/supplier/order/delivery.html?shopOrderId='+orderId;
+        },
+        record:function (shopOrderId) {//发货记录
+            window.location.href = '/supplier/order/delivery_record.html?shopOrderId='+shopOrderId;
+        },
+        Checklist:function (shopOrderId) {//售货清单
+             window.open('/supplier/order/sales.html?shopOrderId='+shopOrderId)
+        },
+        seedetail:function (shopOrderId) {
+            window.location.href = '/supplier/order/detail.html?shopOrderId='+shopOrderId;
+        },
     },
     mounted:function () {
         var _self = this;
         if(globalUserData){
-            _self.params.ShopID = globalUserData.shopId;
+            _self.params.shopId = globalUserData.shopId;
         }
        _self.MyOrderList();
         if(isPC){

src/main/resources/static/js/supplier-center/order/qualifications.js

@@ -88,7 +88,7 @@ var addlogistics = new Vue({
                 if(response.code == 0 ){
                     CAIMEI.dialog('保存资质成功');
                     setTimeout(function(){
-                        window.location.href = '/supplier/order/delivery_record.html?shopOrderID='+_this.shopOrderId;
+                        window.location.href = '/supplier/order/delivery_record.html?shopOrderId='+_this.shopOrderId;
                     },2000);
                 }else{
                     CAIMEI.Alert(response.msg, '确定', false);

src/main/resources/static/js/supplier-center/order/record.js

@@ -37,41 +37,41 @@ var deliveryRecode = new Vue({
         }
     },
     methods:{
-     bigImage:function(){
+        bigImage:function(){
             var viewer = new Viewer(document.getElementById('uploadGoodsImages'));
         },
-         toPagination: function (pageNum) {
+        toPagination: function (pageNum) {
             if (pageNum <= this.pageTotal) {
                 this.params.pageNum = pageNum;
                 this.shipmentsRecord(this.params);
             }
         },
-     checkNum: function () {
-        if (this.pageInput > this.pageTotal) {
-            this.pageInput = this.pageTotal;
-        } else if (this.pageInput < 1) {
-            this.pageInput = 1;
-        }
-    },
+        checkNum: function () {
+            if (this.pageInput > this.pageTotal) {
+                this.pageInput = this.pageTotal;
+            } else if (this.pageInput < 1) {
+                this.pageInput = 1;
+            }
+        },
         shipmentsRecord:function () {
-        var _this = this
-            SupplierApi.shipmentsRecord(_this.params, function (res) {
-            if(res.code==0){
-                _this.userInfo = res.data.userInfo;
-                _this.listRecord = res.data.logisticsBatchPage.totalRecord;
-                var logisticsBatchPage = res.data.logisticsBatchPage;
-                if(logisticsBatchPage.results==''){
-                     _this.results = [];
-                     _this.isShow = true
-                }else {
-                    _this.results = logisticsBatchPage.results;
-                    _this.isShow = false
+            var _self = this
+                SupplierApi.shipmentsRecord(_self.params, function (response) {
+                if(response.code==0){
+                    var data = response.data;
+                    _self.userInfo = data.userInfo;
+                    _self.listRecord = data.logisticsBatchPage.total;
+                    if(data.logisticsBatchPage.list && data.logisticsBatchPage.list.length>0){
+                        _self.results = data.logisticsBatchPage.list;
+                        _self.isShow = false;
+                    }else {
+                        _self.results = [];
+                        _self.isShow = true;
+                    }
                 }
-            }
-         })
+             })
         },
-        seelogistic:function (logisticsBatchID,shopOrderID) {//查看物流
-           window.location.href='/supplier/order/logistics/detail.html?logisticsBatchId='+logisticsBatchID+'&shopOrderId='+shopOrderID+''
+        seelogistic:function (logisticsBatchId,shopOrderId) {//查看物流
+           window.location.href='/supplier/order/logistics/detail.html?logisticsBatchId='+logisticsBatchId+'&shopOrderId='+shopOrderId+''
         },
         addlogistic:function (logisticsBatchID,shopOrderID) {
             setTimeout(function(){
@@ -93,7 +93,7 @@ var deliveryRecode = new Vue({
     },
     mounted:function () {
         var _self = this;
-         _self.params.shopOrderId=CAIMEI.getUrlParam('shopOrderID');
+         _self.params.shopOrderId=CAIMEI.getUrlParam('shopOrderId');
          _self.shipmentsRecord();
          if(!isPC){
             //移动端上垃加载更多

src/main/resources/static/js/supplier-center/order/saleslist.js

@@ -10,7 +10,7 @@ var saleslist = new Vue({
     },
     mounted:function () {
      var _this = this;
-     _this.shopOrderId=CAIMEI.getUrlParam('shopOrderID');
+     _this.shopOrderId=CAIMEI.getUrlParam('shopOrderId');
      SupplierApi.salesList({shopOrderId:_this.shopOrderId},function (res) {
          if(res.code==0){
             _this.shopOrder = res.data.shopOrder;

src/main/resources/static/js/supplier-center/order/settlement.js

@@ -3,7 +3,7 @@ var settlement = new Vue({
     el:'#settlement',
     data:{
         params:{
-            shopID:'',
+            shopId:'',
             pageNum: 1,
             pageSize: 10,
             shopOrderNo:'',
@@ -35,6 +35,20 @@ var settlement = new Vue({
             return [1, 0, index - 2, index - 1, index, index + 1, index + 2, 0, total];
         }
     },
+    filters: {
+        NumFormat: function (text) {//处理金额
+            return Number(text).toFixed(2);
+        },
+        payStatusType:function(value) {
+            if (value === 1) {
+                return '待结算';
+            } else if (value === 2) {
+                return '部分结算';
+            } else {
+                return '已结算';
+            }
+        }
+    },
     methods:{
          toPagination: function (pageNum) {
             if (pageNum <= this.pageTotal) {
@@ -49,18 +63,21 @@ var settlement = new Vue({
                 this.pageInput = 1;
             }
         },
-        settlementList:function () {
+        settlementList:function () {//获取结算列表数据
             var _this = this;
-            SupplierApi.settlementList(_this.params,function (res) {
-                if(res.code==0){
-                    if(res.data.results!=''){
-                        _this.list = res.data.results;
-                        _this.listRecord = res.data.totalRecord;
+            SupplierApi.settlementList(_this.params,function (response) {
+                if(response.code==0){
+                    var data = response.data;
+                    if( data.list && data.list.length>0 ){
+                        _this.list = data.list;
+                        _this.listRecord = data.total;
                     }else {
-                        _this.list = res.data.results;
-                        _this.listRecord = res.data.totalRecord;
+                        _this.list = data.list;
+                        _this.listRecord = data.total;
                     }
                     _this.requestFlag = true;
+                }else{
+                    CAIMEI.Alert(response.msg, '确定', false);
                 }
             })
         },
@@ -76,7 +93,7 @@ var settlement = new Vue({
     mounted:function () {
         var _self= this;
         if(globalUserData){
-              _self.params.shopID = globalUserData.shopId;
+              _self.params.shopId = globalUserData.shopId;
             }
         _self.settlementList();
             if(!isPC){

src/main/resources/static/js/user-center/operation/form.js

@@ -34,7 +34,6 @@ var operationPage = new Vue({
                         _self.loginLoading = false;
                     });
                 }else{
-                    console.log('222222222222222');
                     CAIMEI.Alert(response.msg,'确定',false);
                     _self.loginLoading = false;
                 }

src/main/resources/static/js/user-center/order/list.js

@@ -176,7 +176,7 @@ var orderPage = new Vue({
         hanldConfirmOrderFn:function(orderId){//确认订单
             var _self = this;
             CAIMEI.Modal('是否确认订单？','取消','确定',function () {
-                OrderApi.AffirmOrderOrder({orderID:orderId},function(response){
+                OrderApi.AffirmOrderOrder({orderId:orderId},function(response){
                     if(response.code == 0){
                         CAIMEI.dialog('确认成功',true,function () {
                             _self.GetQueryOrderListData();

src/main/resources/templates/supplier-center/order/delivery-record.html

@@ -2,7 +2,7 @@
 <html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
-    <title>采美365网</title>
+    <title>采美365网-订单发货记录</title>
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/supplier-center/order/record.css(v=${version})}" rel="stylesheet" type="text/css">
@@ -40,51 +40,50 @@
                 </div>
                 <div class="record-product">
                     <div class="protitle">发货记录</div>
-
                    <template v-if="results.length>0">
-                    <div class="product" v-for="r in results">
-                        <ul class="product-title">
-                            <li>商品信息</li>
-                            <li>购买数量</li>
-                            <li>已发数量</li>
-                            <li>未发数量</li>
-                            <li>本次发货</li>
-                        </ul>
-                        <ul class="product-info">
-                            <li v-for="order in r.logisticsRecordList">
-                                <div class="product-img">
-                                    <img :src="order.image"/>
-                                    <h3>{{order.productName}}</h3>
+                        <div class="product" v-for="r in results">
+                            <ul class="product-title">
+                                <li>商品信息</li>
+                                <li>购买数量</li>
+                                <li>已发数量</li>
+                                <li>未发数量</li>
+                                <li>本次发货</li>
+                            </ul>
+                            <ul class="product-info">
+                                <li v-for="order in r.logisticsRecordList">
+                                    <div class="product-img">
+                                        <img :src="order.image"/>
+                                        <h3>{{order.productName}}</h3>
+                                    </div>
+                                    <div>{{order.buyNum}}</div>
+                                    <div>{{order.shipmentsNum}}</div>
+                                    <div>{{order.notShippedNum}}</div>
+                                    <div>{{order.num}}</div>
+                                </li>
+                                <p class="record-time">发货时间：{{r.deliveryTime}}</p>
+                                <div class="img-remark">
+                                    <span>图片备注：</span>
+                                    <ul v-if="r.remarkImages!=null" id="uploadGoodsImages">
+                                        <li v-for="cmImg in r.remarkImages" >
+                                            <img :src="cmImg" @click="bigImage">
+                                        </li>
+                                    </ul>
+                                    <span v-else style="color: #22272e">暂无图片备注</span>
                                 </div>
-                                <div>{{order.buyNum}}</div>
-                                <div>{{order.shipmentsNum}}</div>
-                                <div>{{order.notShippedNum}}</div>
-                                <div>{{order.num}}</div>
-                            </li>
-                            <p class="record-time">发货时间：{{r.deliveryTime}}</p>
-                            <div class="img-remark">
-                                <span>图片备注：</span>
-                                <ul v-if="r.remarkImages!=null" id="uploadGoodsImages">
-                                    <li v-for="cmImg in r.remarkImages" >
-                                        <img :src="cmImg" @click="bigImage">
-                                    </li>
-                                </ul>
-                                <span v-else style="color: #22272e">暂无图片备注</span>
+                                <p class="remark">文字备注：
+                                    <span v-if="r.remark!=''&&r.remark!=null">{{r.remark}}</span>
+                                    <span v-else>暂无备注</span>
+                                </p>
+                            </ul>
+                            <div class="record-button">
+                                <button class="view-logistics" type="button" @click="seelogistic(r.id,r.shopOrderId)">查看物流</button>
+                                <button class="add-logistics" type="button" @click="addlogistic(r.id,r.shopOrderId)">添加物流</button>
+                                <button class="add-logistics" type="button" @click="qualificationsDetails(r.id,r.shopOrderId)">商品资质</button>
+                                <button class="cancellation-logistics" type="button" v-if="r.mailer == 1"
+                                        @click="Revoke(r.id,r.shopOrderId)">撤销发货
+                                </button>
                             </div>
-                            <p class="remark">文字备注：
-                                <span v-if="r.remark!=''&&r.remark!=null">{{r.remark}}</span>
-                                <span v-else>暂无备注</span>
-                            </p>
-                        </ul>
-                        <div class="record-button">
-                            <button class="view-logistics" type="button" @click="seelogistic(r.id,r.shopOrderID)">查看物流</button>
-                            <button class="add-logistics" type="button" @click="addlogistic(r.id,r.shopOrderID)">添加物流</button>
-                            <button class="add-logistics" type="button" @click="qualificationsDetails(r.id,r.shopOrderID)">商品资质</button>
-                            <button class="cancellation-logistics" type="button" v-if="r.mailer == 1"
-                                    @click="Revoke(r.id,r.shopOrderID)">撤销发货
-                            </button>
                         </div>
-                    </div>
                     </template>
                     <template v-else>
                        <div class="no-delivery-record">

src/main/resources/templates/supplier-center/order/delivery.html

@@ -38,7 +38,7 @@
                     </p>
                     <div class="user">
                         <p>买家名称：<span>{{userInfo.name}}</span></p>
-                        <p>收货人：<span>{{userInfo.shouHuoRen}}</span></p>
+                        <p>收货人：<span>{{userInfo.receiver}}</span></p>
                         <p>联系方式：<span>{{userInfo.mobile}}</span></p>
                     </div>
                     <p class="address">收货地址：<span>{{userInfo.address}}</span></p>
@@ -54,7 +54,7 @@
                             </div>
                             <div class="goods">
                                 <div class="goods_img">
-                                    <img :src="order.productImage"/>
+                                    <img :src="order.image"/>
                                 </div>
                                 <div class="goods_item">
                                     <h3 class="sp-order-name">{{order.name}}</h3>

src/main/resources/templates/supplier-center/order/detail.html

@@ -36,7 +36,7 @@
                     </p>
                     <div class="user">
                         <p>买家名称：<span>{{userInfo.name}}</span></p>
-                        <p>收货人：<span>{{userInfo.shouHuoRen}}</span></p>
+                        <p>收货人：<span>{{userInfo.receiver}}</span></p>
                         <p>联系方式：<span>{{userInfo.mobile}}</span></p>
                     </div>
                     <p class="address">收货地址：<span>{{userInfo.address}}</span></p>
@@ -56,8 +56,8 @@
                         <ul class="pro-information">
                             <li v-for="pro in orderList ">
                                 <div class="product-img">
-                                    <img :src="pro.productImage"/>
-                                    <h3>{{pro.aliasName}}</h3>
+                                    <img :src="pro.image"/>
+                                    <h3>{{pro.name}}</h3>
                                 </div>
                                 <div>￥{{pro.price}}</div>
                                 <div>{{pro.num}}({{pro.presentNum}})</div>
@@ -74,26 +74,21 @@
                            </div>
                           <div class="order-item pay">
                                 <p>结算状态：&nbsp;
-                                    <span v-if="order.payStatus==1||order.payStatus==null"> 待结算</span>
-                                    <span v-if="order.payStatus==2"> 部分结算</span>
-                                    <span v-if="order.payStatus==3"> 已结算</span>
+                                    <span>{{ order.payStatus | payStatusType }}</span>
                                  </p>
                                  <p>发货状态：&nbsp;
-                                    <span v-if="order.sendOutStatus==1">待发货</span>
-                                    <span v-if="order.sendOutStatus==null">未发货</span>
-                                    <span v-if="order.sendOutStatus==2">部分发货</span>
-                                    <span v-if="order.sendOutStatus==3">已发货</span>
-                                  </p>
+                                     <span>{{ order.sendOutStatus | sendOutStatusType }}</span>
+                                 </p>
                           </div>
                           <div class="order-item">
-                                    <p>商品金额：<span class="red">￥{{order.productAmount?order.productAmount.toFixed(2):'0.00'}}</span> </p>
-                                    <p>结算商品金额：<span class="red">￥{{order.shopProductAmount?order.shopProductAmount.toFixed(2):'0.00'}}</span> </p>
-                                    <p>结算税费：<span class="red">￥{{order.shopTaxFee?order.shopTaxFee.toFixed(2):'0.00'}}</span> </p>
-                                    <p>结算运费：<span class="red">￥{{order.shopPostFee?order.shopPostFee.toFixed(2):'0.00'}}</span> </p>
+                                    <p>商品金额：<span class="red">￥{{ order.productAmount | NumFormat }}</span> </p>
+                                    <p>结算商品金额：<span class="red">￥{{ order.shopProductAmount | NumFormat }}</span> </p>
+                                    <p>结算税费：<span class="red">￥{{ order.shopTaxFee | NumFormat }}</span> </p>
+                                    <p>结算运费：<span class="red">￥{{ order.shopPostFee | NumFormat }}</span> </p>
                             </div>
                             <div class="order-item">
-                                    <p>总结算金额：<span class="red">￥{{order.shouldPayShopAmount?order.shouldPayShopAmount.toFixed(2):'0.00'}}</span> </p>
-                                    <p>已结算金额：<span class="red">￥{{order.payedShopAmount?order.payedShopAmount.toFixed(2):'0.00'}}</span> </p>
+                                    <p>总结算金额：<span class="red">￥{{ order.shouldPayShopAmount | NumFormat }}</span> </p>
+                                    <p>已结算金额：<span class="red">￥{{ order.payedShopAmount | NumFormat }}</span> </p>
                              </div>
                          </div>
                     </div>
@@ -110,13 +105,12 @@
                          </div>
                     </div>
                      <div class="section-botton shadow" :class="isFiexd ? 'fiexd' : 'float'">
-                            <div class="inner">
-                             <a class="btn" href="javascript: void(0);" v-if="order.sendOutStatus!=3" :value="order.shopOrderID" @click="delivery(order.shopOrderID)">发货</a>
-                             <a class="btn" href="javascript: void(0);" @click="record(order.shopOrderID)">发货记录</a>
-                             <a class="btn" href="javascript: void(0);" @click="Checklist(order.shopOrderID)" target="_blank">售货清单</a>
-                            </div>
+                        <div class="inner">
+                         <a class="btn" href="javascript: void(0);" v-if="[1,2].indexOf(order.sendOutStatus)!=-1" :value="order.shopOrderId" @click="delivery(order.shopOrderId)">发货</a>
+                         <a class="btn" href="javascript: void(0);" v-if="[2,3].indexOf(order.sendOutStatus)!=-1" @click="record(order.shopOrderId)">发货记录</a>
+                         <a class="btn" href="javascript: void(0);" @click="Checklist(order.shopOrderId)" target="_blank">售货清单</a>
                         </div>
-
+                    </div>
                 </div>
             </div>
         </div>

src/main/resources/templates/supplier-center/order/list.html

@@ -31,7 +31,7 @@
                 <div class="new-s-item">
                         <form action="">
                             <div class='order-border'><span>订单编号：</span><input type="text" id="order-number" v-model="params.shopOrderNo" class="Buyer" placeholder="请输入订单编号"></div>
-                            <div class='order-border'><span>买家名称：</span><input type="text" id="name-buyer" v-model="params.shouHuoRen" class="Buyer" placeholder="请输入买家名称"> </div>
+                            <div class='order-border'><span>买家名称：</span><input type="text" id="name-buyer" v-model="params.receiver" class="Buyer" placeholder="请输入买家名称"> </div>
                             <div>
                                 结算状态：
                                 <select name="" id="settlement-status" class="state" @change="getpayStatus($event)">
@@ -64,30 +64,25 @@
                                 <div class="order-content">
                                     <div class="order-item pay">
                                         <p>结算状态：&nbsp;
-                                            <span v-if="order.payStatus==1||order.payStatus==null"> 待结算</span>
-                                            <span v-if="order.payStatus==2"> 部分结算</span>
-                                            <span v-if="order.payStatus==3"> 已结算</span>
+                                            <span>{{ order.payStatus | payStatusType }}</span>
                                         </p>
                                         <p>发货状态：&nbsp;
-                                            <span v-if="order.sendOutStatus==1">待发货</span>
-                                            <span v-if="order.sendOutStatus==null">未发货</span>
-                                            <span v-if="order.sendOutStatus==2">部分发货</span>
-                                            <span v-if="order.sendOutStatus==3">已发货</span>
+                                            <span>{{ order.sendOutStatus | sendOutStatusType }}</span>
                                         </p>
                                     </div>
                                     <div class="order-item">
-                                        <p>商品金额：<span class="red">￥{{order.productAmount.toFixed(2)}}</span> </p>
-                                        <p>结算商品金额：<span class="red">￥{{order.shopProductAmount.toFixed(2)}}</span> </p>
-                                        <p>结算税费：<span class="red">￥{{order.shopTaxFee.toFixed(2)}}</span> </p>
-                                        <p>结算运费：<span class="red">￥{{order.shopPostFee.toFixed(2)}}</span> </p>
+                                        <p>商品金额：<span class="red">￥{{order.productAmount| NumFormat}}</span> </p>
+                                        <p>结算商品金额：<span class="red">￥{{order.shopProductAmount| NumFormat}}</span> </p>
+                                        <p>结算税费：<span class="red">￥{{order.shopTaxFee| NumFormat}}</span> </p>
+                                        <p>结算运费：<span class="red">￥{{order.shopPostFee| NumFormat}}</span> </p>
                                     </div>
                                     <div class="order-item">
-                                        <p>总结算金额：<span class="red">￥{{order.shouldPayShopAmount.toFixed(2)}}</span> </p>
-                                        <p>已结算金额：<span class="red">￥{{order.payedShopAmount.toFixed(2)}}</span> </p>
+                                        <p>总结算金额：<span class="red">￥{{order.shouldPayShopAmount| NumFormat}}</span> </p>
+                                        <p>已结算金额：<span class="red">￥{{order.payedShopAmount| NumFormat}}</span> </p>
                                     </div>
                                     <div class="order-product" v-for="proitem in order.orderProductList">
                                         <div class="product-img">
-                                            <img :src="proitem.productImage"/>
+                                            <img :src="proitem.image"/>
                                         </div>
                                         <div class="product-info">
                                             <h3>{{proitem.name}}</h3>
@@ -96,17 +91,17 @@
                                             <span class="num">已发货：&nbsp;{{proitem.shipmentsNum}}</span>
                                             <span class="num" v-if="order.returnedNum!=null&&order.returnedNum!=0">已退/已取消：&nbsp;{{proitem.actualCancelNum}}</span>
                                             </p>
-                                            <p >单价：&nbsp;<span>￥{{proitem.price.toFixed(2)}}</span> </p>
-                                            <p>合计：&nbsp;<span class="red">￥{{proitem.totalAmount.toFixed(2)}}</span> </p>
+                                            <p >单价：&nbsp;<span>￥{{proitem.price| NumFormat}}</span> </p>
+                                            <p>合计：&nbsp;<span class="red">￥{{proitem.totalAmount| NumFormat}}</span> </p>
                                         </div>
 
                                     </div>
                                     <div class="order-botton">
                                        <div>
-                                            <a class="btn" href="javascript: void(0);" v-if="order.sendOutStatus!=3" :value="order.shopOrderID" @click="delivery(order.shopOrderID)">发货</a>
-                                            <a class="btn" href="javascript: void(0);" @click="record(order.shopOrderID)">发货记录</a>
-                                            <a class="btn" href="javascript: void(0);" @click="Checklist(order.shopOrderID)" target="_blank">售货清单</a>
-                                            <a class="btn deatil" href="javascript: void(0);" @click="seedetail(order.shopOrderID)" >查看详情</a>
+                                            <a class="btn" href="javascript: void(0);" v-if="[1,2].indexOf(order.sendOutStatus)!=-1" :value="order.shopOrderId" @click="delivery(order.shopOrderId)">发货</a>
+                                            <a class="btn" href="javascript: void(0);" v-if="[2,3].indexOf(order.sendOutStatus)!=-1" @click="record(order.shopOrderId)">发货记录</a>
+                                            <a class="btn" href="javascript: void(0);" @click="Checklist(order.shopOrderId)" target="_blank">售货清单</a>
+                                            <a class="btn deatil" href="javascript: void(0);" @click="seedetail(order.shopOrderId)" >查看详情</a>
                                        </div>
 
                                     </div>
@@ -114,7 +109,7 @@
                                  <div class="userinfo" >
                                         <div class="username">
                                              <p>买家名称：<span class="blcak">{{order.userInfo.name}}</span> </p>
-                                             <p >收货人：<span class="blcak">{{order.userInfo.shouHuoRen}}</span> </p>
+                                             <p >收货人：<span class="blcak">{{order.userInfo.receiver}}</span> </p>
                                              <p >联系方式：<span class="blcak">{{order.userInfo.mobile}}</span> </p>
                                         </div>
                                         <div class="address">

src/main/resources/templates/supplier-center/order/logistics-add.html

@@ -53,7 +53,7 @@
                             <li>本次发货</li>
                         </ul>
                         <ul class="pro-information">
-                            <li :orderProductId = 'order.orderProductID' :shopOrderID="order.shopOrderID" v-for="order in orderList ">
+                            <li :orderProductId = 'order.orderProductID' :shopOrderId="order.shopOrderId" v-for="order in orderList ">
                                 <div class="product-img">
                                     <img :src="order.image"/>
                                     <h3>{{order.productName}}</h3>
@@ -83,7 +83,7 @@
                                 <div :key="numIndex" v-for="(num,numIndex) in item.numList">
                                     <i class="red">*</i>
                                     物流编号：
-                                    <input class="logistics-order-number company" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入物流编号" type="text" v-model="num.number">
+                                    <input class="logistics-order-number company" placeholder="请输入物流编号" type="text" v-model="num.number">
                                     <button class="add-company companyBtn icon mIcon" @click="addNum(item,numIndex)"
                                             v-if="numIndex==0">
                                     </button>

src/main/resources/templates/supplier-center/order/logistics-detail.html

@@ -33,7 +33,7 @@
                     </p>
                     <div class="user">
                         <p>买家名称：<span>{{userInfo.name}}</span></p>
-                        <p>收货人：<span>{{userInfo.shouHuoRen}}</span></p>
+                        <p>收货人：<span>{{userInfo.receiver}}</span></p>
                         <p>联系方式：<span>{{userInfo.mobile}}</span></p>
                     </div>
                     <p class="address">收货地址：<span>{{userInfo.address}}</span></p>

src/main/resources/templates/supplier-center/order/logistics.html

@@ -11,7 +11,6 @@
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
-
 <!-- 我的采美 -->
 <div id="logistics">
     <div class="navLayout">
@@ -33,7 +32,7 @@
                     </p>
                     <div class="user">
                         <p>买家名称：<span>{{userInfo.name}}</span></p>
-                        <p>收货人：<span>{{userInfo.shouHuoRen}}</span></p>
+                        <p>收货人：<span>{{userInfo.receiver}}</span></p>
                         <p>联系方式：<span>{{userInfo.mobile}}</span></p>
                     </div>
                     <p class="address">收货地址：<span>{{userInfo.address}}</span></p>
@@ -51,10 +50,10 @@
                             <li>本次发货</li>
                         </ul>
                         <ul class="pro-information">
-                            <li v-for="order in orderList " :shopOrderID="order.shopOrderID"
-                                :orderProductId='order.orderProductID'>
+                            <li v-for="order in orderList " :shopOrderId="order.shopOrderId"
+                                :orderProductId='order.orderProductId'>
                                 <div class="product-img">
-                                    <img :src="order.productImage"/>
+                                    <img :src="order.image"/>
                                     <h3>{{order.name}}</h3>
                                 </div>
                                 <div>{{order.num}}</div>
@@ -85,11 +84,8 @@
                                 <div v-for="(num,numIndex) in item.numList" :key="numIndex">
                                     <span class="red">*</span>
                                     物流编号：
-                                    <input type="text" v-model="num.number" class="logistics-order-number company"
-                                           oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入物流编号">
-                                    <button class="add-company companyBtn icon mIcon"  @click="addNum(item,numIndex)"
-                                            v-if="numIndex==0">
-                                    </button>
+                                    <input type="text" v-model="num.number" class="logistics-order-number company" placeholder="请输入物流编号">
+                                    <button class="add-company companyBtn icon mIcon"  @click="addNum(item,numIndex)" v-if="numIndex==0"></button>
                                     <button class="sub-company companyBtn icon mIcon" v-else @click="reduceBtn(item)"></button>
                                 </div>
                             </div>
@@ -118,8 +114,8 @@
                     </div>
                     <div class="remarks">
                         <span class="rema">备注：</span>
-                        <textarea maxlength="200" placeholder="文字备注，200字以内" v-model="params.info.note"></textarea>
-                        <div class="size-num">{{params.info.note.length}}/200</div>
+                        <textarea maxlength="200" placeholder="文字备注，200字以内" v-model="params.note"></textarea>
+                        <div class="size-num">{{ params.note.length }}/200</div>
                     </div>
                     <div class="defineBtn">
                         <div>
@@ -131,14 +127,12 @@
             </div>
         </div>
     </div>
-    </div>
-
-    <!-- 引入底部 -->
-    <template th:replace="components/footer"></template>
+</div>
+<!-- 引入底部 -->
+<template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
-    <script charset="utf-8" type="text/javascript"
-            th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
-    <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/logistics.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript"th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/order/logistics.js(v=${version})}"></script>
 </body>
 </html>

src/main/resources/templates/supplier-center/order/settlement.html

@@ -53,19 +53,19 @@
                         <li>已结算金额</li>
                     </ul>
                     <div class="mentlist" >
-                     <div v-for="res in list">
-                        <ul v-for="item in res.orderProductList">
-                            <li class="samewidth"><a :href="'/supplier/order/detail.html?shopOrderID='+res.shopOrderID">{{item.shopOrderNo}}</a></li>
-                            <li class="samewidth">{{res.orderTime}}</li>
-                            <li class="samewidth">{{res.name}}</li>
+                     <div v-for="order in list">
+                        <ul v-for="item in order.orderProductList">
+                            <li class="samewidth"><a :href="'/supplier/order/detail.html?shopOrderId='+order.shopOrderId">{{item.shopOrderNo}}</a></li>
+                            <li class="samewidth">{{order.orderTime}}</li>
+                            <li class="samewidth">{{order.name}}</li>
                             <li>{{item.name}}</li>
                             <li>
-                                <span v-if="res.payStatus==1||res.payStatus==null" class="status-red">待结算</span>
-                                <span v-if="res.payStatus==2" class="status-yellow">部分结算</span>
-                                <span v-if="res.payStatus==3" class="status-blue">已结算</span>
+                                <span v-if="order.payStatus==1 || order.payStatus==null" class="status-red">待结算</span>
+                                <span v-if="order.payStatus==2" class="status-yellow">部分结算</span>
+                                <span v-if="order.payStatus==3" class="status-blue">已结算</span>
                             </li>
-                            <li>¥ {{res.shouldPayShopAmount ?res.shouldPayShopAmount.toFixed(2) :'0.00'}}</li>
-                            <li>¥ {{res.payedShopAmount ?res.payedShopAmount.toFixed(2) :'0.00'}}</li>
+                            <li>¥ {{ order.shouldPayShopAmount | NumFormat }}</li>
+                            <li>¥ {{ order.payedShopAmount | NumFormat }}</li>
                         </ul>
                         </div>
                     </div>