联合丽格V1.0.2

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

@@ -28,7 +28,7 @@
     .product-info .num{margin-right: 80px;}
     .order-product .product-img img{width: 100%;height: 100%;}
     .order-product .product-info{float: right;width: 87%;}
-    .order-product{overflow: hidden;margin-bottom: 10px}
+    .order-product{overflow: hidden;margin-bottom: 10px;box-sizing: border-box;padding: 20px 0;border-top: 1px solid #E2E7EF;}
     .product-info p{color: #627386;margin-top: 7px;}
     .userinfo{background-color: #f0f3f7;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);padding: 10px 20px;color: #627386;}
     .userinfo p{display: inline-block;margin: 10px 55px 10px 0;}

src/main/resources/static/js/shopping/confirm.js

@@ -157,14 +157,14 @@ var shoppingConfirm = new Vue({
         }
     },
     methods: {
-        handleCheckboxChange: function(){
+        handleCheckboxChange(){
             console.log(this.agreementActive)
         },
-        blurHandle: function(event) {
+        blurHandle(event) {
             var el = event.currentTarget;
             verifyHandle(el);
         },
-        getFreight: function(){// 获取邮费
+        getFreight(){// 获取邮费
             var _self = this;
             console.log(_self.postageParam, '邮费接口调用')
             OrderApi.GetOrderPostage(_self.postageParam,function (r) {
@@ -251,7 +251,7 @@ var shoppingConfirm = new Vue({
                 }
             })
         },
-        getProvinceOptions: function(){ // 获取全部省份
+        getProvinceOptions(){ // 获取全部省份
             var _self = this;
             OrderApi.GetAddressSelect({},function(res){
                 if(res.code === 0 && res.data){
@@ -261,7 +261,7 @@ var shoppingConfirm = new Vue({
                 }
             });
         },
-        getCityOptions: function(parentId,callback){// 获取地区
+        getCityOptions(parentId,callback){// 获取地区
             var _self = this;
             if(parentId && parentId>0){
                 _self.cityOptions = [];
@@ -278,7 +278,7 @@ var shoppingConfirm = new Vue({
                 });
             }
         },
-        getTownOptions: function(parentId, callback){
+        getTownOptions(parentId, callback){
             var _self = this;
             if(parentId && parentId>0){
                 _self.townOptions = [];
@@ -336,7 +336,7 @@ var shoppingConfirm = new Vue({
             });
             if(!isPC){fixedBody();}
         },
-        saveAddressForm: function(){// 更新保存地址
+        saveAddressForm(){// 更新保存地址
             var _self = this;
             var pass = verifyForm();
             if (_self.saveLoading) { return false; }
@@ -361,7 +361,7 @@ var shoppingConfirm = new Vue({
                 _self.saveAddress(params);
             });
         },
-        saveAddress: function(params){// 更新保存地址
+        saveAddress(params){// 更新保存地址
             var _self = this;
             OrderApi.AddSaveAddress(params,function(r){
                 if(r.code === 0){
@@ -375,7 +375,7 @@ var shoppingConfirm = new Vue({
                 }
             });
         },
-        setDefaultAddress: function(addressId){// 列表直接设为默认地址
+        setDefaultAddress(addressId){// 列表直接设为默认地址
             var _self = this;
             OrderApi.DefaultAddress({addressId:addressId,userId:_self.userId},function (r) {
                 if(r.code === 0 ){
@@ -386,7 +386,7 @@ var shoppingConfirm = new Vue({
                 }
             });
         },
-        deleteAddress: function(addressId){// 列表删除单个地址
+        deleteAddress(addressId){// 列表删除单个地址
             var _self = this;
             CAIMEI.Modal('确定要删除该地址？','取消','确定',function () {
                 OrderApi.DeleteAddress({addressId:addressId,userId:_self.userId},function (r) {
@@ -400,7 +400,7 @@ var shoppingConfirm = new Vue({
                 })
             });
         },
-        chooseAddress: function(selectedId){
+        chooseAddress(selectedId){
             this.address.selectedId = selectedId;
         },
         // 确认地址并重新查运费

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

@@ -13,13 +13,13 @@ var delivergoods = new Vue({
         order:{}
     },
     methods: {
-        returnBack:function(){
+        returnBack(){
             window.location.href='/supplier/order/list.html'
         },
-        opentittle: function () {
+        opentittle () {
             this.open = !this.open;
         },
-        computedPrice: function (order) { //单选
+        computedPrice (order) { //单选
             var _self = this;
                     if(event.target.checked){
                          _self.submitIds.push(order);
@@ -33,7 +33,7 @@ var delivergoods = new Vue({
                        _self.allChecked=false;
                     }
         },
-        ckeckAll: function () { //全選
+        ckeckAll () { //全選
             var _self = this;
                 if (_self.allChecked) {
                     _self.submitIds = [];
@@ -48,7 +48,7 @@ var delivergoods = new Vue({
                     _self.submitIds = [];
                 }
         },
-        delivery:function () {
+        delivery () {
             var _this = this;
             if(_this.submitIds.length===0){
                 CAIMEI.dialog('请至少选择一项商品进行发货',false);
@@ -64,38 +64,41 @@ var delivergoods = new Vue({
                  })
             }
         },
-        changeCountSub:function(order) {//商品数量减
-            var _this = this;
+        changeCountSub(order) {//商品数量减
             if(order.inputVal > 1) {
                 order.inputVal--;
             }
         },
-        changeaddCount:function (order) {//商品数量加
-            var _this = this;
-            var num=order.notOutStore - order.actualCancelNum;
+        changeaddCount (order) {//商品数量加
+            const num = order.notOutStore - order.actualCancelNum;
             if(order.inputVal>=num){
-                order.inputVal =num
+                order.inputVal = num
             }else {
                 order.inputVal++
             }
         },
-        numberChange: function(order){
+        numberChange(order){
             var _this = this;
             console.log('监听手动输入发货数量')
         },
-        getDataInfo:function (){
+        getDataInfo (){
             var _self = this;
             SupplierApi.ShipmentsInfo({shopOrderId: _self.shopOrderId}, function (response) {
                 if (response.code === 0) {
                     var data = response.data
                     _self.order = data;
                     _self.userInfo = data.userInfo;
-                    data.orderProductList.forEach(function(order){
-                        order.inputVal = order.notOutStore - order.actualCancelNum;
-                    });
-                    _self.productList = data.orderProductList;
+                    _self.productList = _self.productData(data.orderProductList)
+                    console.log('productList',_self.productList)
                 }
             })
+        },
+        productData(data){
+            let array = []
+            array = data.map((el) =>{
+                return {...el, ...{ inputVal: el.notOutStore - el.actualCancelNum }}
+            })
+            return array
         }
     },
     mounted: function () {

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

@@ -122,6 +122,7 @@ const seeDetail = new Vue({
         },
         // 确认收款金额
         handeleDialogFormVisible() {
+            this.chengeOrder.amount = ''
             this.dialogFormVisible = true
         },
         // 确认本次收款金额

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

@@ -106,7 +106,7 @@ const seeDetail = new Vue({
                 SupplierApi.orderUpdate(JSON.stringify(_self.params), function (response) {//列表初始化
                     if (response.code === 0) {
                         CAIMEI.dialog('修改成功',true,function () {
-                            window.location.href = '/supplier/order/details.html?shopOrderId='+_self.shopOrderId;
+                            window.location.href = '/supplier/order/detail.html?shopOrderId='+_self.shopOrderId;
                         })
                     }
                 })

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

@@ -134,6 +134,7 @@ var orderList = new Vue({
         // 确认收款金额
         handeleDialogFormVisible(order) {
             this.handleOrder = order
+            this.chengeOrder.amount = ''
             this.chengeOrder.shopOrderId = order.shopOrderId
             this.dialogFormVisible = true
         },

src/main/resources/static/js/supplier-center/shop/mixins/checkeMixins.js

@@ -51,7 +51,7 @@ var checkeMixins = function () {
                 var _this = this;
                 var KeyString = '',TagString='';
                 console.log(_this.releaseParams);
-                if(_this.releaseParams.name == ''){
+                if(_this.releaseParams.name === ''){
                     _this.vShow_Name = true;
                     _this.fromMessage = '请输入商品显示名';
                     _this.scrollIntoView();
@@ -60,7 +60,7 @@ var checkeMixins = function () {
                     },2000);
                     return
                 }
-                if(_this.releaseParams.aliasName == ''){
+                if(_this.releaseParams.aliasName === ''){
                     _this.vShow_AliasName = true;
                     _this.fromMessage = '请输入内部商品名';
                     _this.scrollIntoView();
@@ -69,7 +69,7 @@ var checkeMixins = function () {
                     },2000);
                     return;
                 }
-                if(_this.releaseParams.commodityType == ''){
+                if(_this.releaseParams.commodityType === ''){
                     _this.vShow_attribute=true;
                     _this.fromMessage = '请选择商品属性';
                     _this.scrollIntoView();
@@ -78,8 +78,8 @@ var checkeMixins = function () {
                     },2000);
                     return;
                 }
-                if(_this.releaseParams.commodityType == 2){
-                    if(_this.releaseParams.trainingMethod == 0){
+                if(_this.releaseParams.commodityType === 2){
+                    if(_this.releaseParams.trainingMethod === 0){
                         _this.vShow_trainingMethod=true;
                         _this.fromMessage = '请选择培训方式';
                         _this.scrollIntoView();
@@ -88,7 +88,7 @@ var checkeMixins = function () {
                         },2000);
                         return;
                     }
-                    if(_this.releaseParams.trainingType == 0){
+                    if(_this.releaseParams.trainingType === 0){
                         _this.vShow_trainingType=true;
                         _this.fromMessage = '请选择培训费用';
                         _this.scrollIntoView();
@@ -97,8 +97,8 @@ var checkeMixins = function () {
                         },2000);
                         return;
                     }
-                    if(_this.releaseParams.trainingType == 1){
-                        if(_this.releaseParams.trainingFee == ''){
+                    if(_this.releaseParams.trainingType === 1){
+                        if(_this.releaseParams.trainingFee === ''){
                             _this.vShow_trainingType=true;
                             _this.fromMessage = '请填写包含食宿，交通等各项费用的培训总金额';
                             _this.scrollIntoView();
@@ -109,7 +109,7 @@ var checkeMixins = function () {
                         }
                     }
                 }
-                if(_this.releaseParams.bigTypeId == ''){
+                if(_this.releaseParams.bigTypeId === ''){
                     _this.vShow_TinyTypeID = true;
                     _this.fromMessage = '请选择商品分类';
                     _this.scrollIntoView();
@@ -118,8 +118,8 @@ var checkeMixins = function () {
                     },2000);
                     return;
                 }
-                if(_this.classificationTwoList!=''&& _this.classificationTwoList!=null){
-                    if(_this.releaseParams.smallTypeId == ''){
+                if(_this.classificationTwoList!==''&& _this.classificationTwoList!=null){
+                    if(_this.releaseParams.smallTypeId === ''){
                         _this.vShow_TinyTypeID = true;
                         _this.fromMessage = '请选择二级分类';
                         _this.scrollIntoView();
@@ -129,8 +129,8 @@ var checkeMixins = function () {
                         return;
                     }
                 }
-                if(_this.classificationThreeList!='' && _this.classificationThreeList!=null){
-                    if(_this.releaseParams.tinyTypeId == ''){
+                if(_this.classificationThreeList!=='' && _this.classificationThreeList!=null){
+                    if(_this.releaseParams.tinyTypeId === ''){
                         _this.vShow_TinyTypeID = true;
                         _this.fromMessage = '请选择三级分类';
                         _this.scrollIntoView();
@@ -140,7 +140,7 @@ var checkeMixins = function () {
                         return;
                     }
                 }
-                if(_this.releaseParams.brandId == ''){
+                if(_this.releaseParams.brandId === ''){
                     _this.vShow_BrandID = true;
                     _this.fromMessage = '请选择商品品牌';
                     _this.scrollIntoView();
@@ -158,8 +158,8 @@ var checkeMixins = function () {
                     },2000);
                     return;
                 }
-                if(_this.releaseParams.productType == 2){
-                    if(_this.releaseParams.machineType == ''){
+                if(_this.releaseParams.productType === 2){
+                    if(_this.releaseParams.machineType === ''){
                         _this.vShow_GoodsType = true;
                         _this.fromMessage = '请选择器械类型';
                         _this.scrollIntoView();
@@ -168,7 +168,7 @@ var checkeMixins = function () {
                         },3000);
                         return;
                     }
-                    if(_this.releaseParams.qualificationImg == ''){
+                    if(_this.releaseParams.qualificationImg === ''){
                         _this.vShow_QualificationImg = true;
                         _this.fromMessage = '请上传资质图片';
                         _this.scrollIntoView();
@@ -177,7 +177,7 @@ var checkeMixins = function () {
                         },3000);
                         return;
                     }
-                    if(_this.releaseParams.qualificationNo == ''){
+                    if(_this.releaseParams.qualificationNo === ''){
                         _this.vShow_QualificationNo = true;
                         _this.fromMessage = '请输入证书编号';
                         _this.scrollIntoView();
@@ -186,7 +186,7 @@ var checkeMixins = function () {
                         },3000);
                         return;
                     }
-                    if(_this.releaseParams.productName == ''){
+                    if(_this.releaseParams.productName === ''){
                         _this.vShow_ProductName = true;
                         _this.fromMessage = '请输入产品名称';
                         _this.scrollIntoView();
@@ -195,7 +195,7 @@ var checkeMixins = function () {
                         },3000);
                         return;
                     }
-                    if(_this.releaseParams.qualificationTime == ''){
+                    if(_this.releaseParams.qualificationTime === ''){
                         _this.vShow_QualificationTime = true;
                         _this.fromMessage = '请选择证书有效期';
                         _this.scrollIntoView();
@@ -206,7 +206,7 @@ var checkeMixins = function () {
                     }
                 }
                 //商品标签
-                if(_this.tagsList =='') {
+                if(_this.tagsList ==='') {
                     _this.vShow_Tags = true;
                     _this.fromMessage = '请添加商品标签';
                     _this.scrollIntoView();
@@ -327,7 +327,7 @@ var checkeMixins = function () {
             blur_name: function(e){//商品名失去焦点
                 var _this = this;
                 _this.vShow_Name = false;
-                if(e.target.value == ''){
+                if(e.target.value === ''){
                     _this.vShow_Name = true;
                     _this.fromMessage = '请输入商品显示名';
                     setTimeout(function(){
@@ -340,7 +340,7 @@ var checkeMixins = function () {
             blur_aliasName: function(e){//内部商品名失去焦点
                 var _this = this;
                 _this.vShow_AliasName = false;
-                if(e.target.value == ''){
+                if(e.target.value === ''){
                     _this.vShow_AliasName = true;
                     _this.fromMessage = '请输入内部商品名';
                     setTimeout(function(){
@@ -352,7 +352,7 @@ var checkeMixins = function () {
             },
             blur_taxPoint: function(event){
                 var E_TaxPoint = event.target.value;
-                if(E_TaxPoint!=''){
+                if(E_TaxPoint!==''){
                     this.releaseParams.taxPoint = parseFloat(E_TaxPoint);
                 }else{
                     this.releaseParams.taxPoint = '';
@@ -379,7 +379,7 @@ var checkeMixins = function () {
             },
             input_trainingFee: function(event){
                 var E_Number = event.target.value;
-                if(E_Number!=''){
+                if(E_Number!==''){
                     this.releaseParams.trainingFee = parseInt(E_Number.replace(/[^0-9]/g,''));
                 }else{
                     this.releaseParams.trainingFee = '';
@@ -388,7 +388,7 @@ var checkeMixins = function () {
             input_minBuyNumber: function(event){
                 this.vShow_MinBuyNumber = false;
                 var E_Number = event.target.value;
-                if(E_Number!=''){
+                if(E_Number!==''){
                     this.releaseParams.minBuyNumber = parseInt(E_Number.replace(/[^0-9]/g,''));
                 }else{
                     this.releaseParams.minBuyNumber = '';
@@ -397,7 +397,7 @@ var checkeMixins = function () {
             input_stock: function(event){
                 this.vShow_Stock = false;
                 var E_stock = event.target.value;
-                if(E_stock!=''){
+                if(E_stock!==''){
                     this.releaseParams.stock = parseInt(E_stock.replace(/[^0-9]/g,''));
                 }else{
                     this.releaseParams.stock = '';

src/main/resources/static/js/supplier-center/shop/mixins/releaseMixins.js

@@ -136,8 +136,8 @@ var releaseMixins = function () {
                     CAIMEI.returnedTarget();
                     _this.releaseParams = Object.assign(_this.releaseParams,{params:JSON.stringify(_this.params)});
                 }
-                this.releaseParams.skus = JSON.stringify(this.skuParams);
-                this.releaseParams.mallSkus = JSON.stringify(this.mallSkusParams);
+                this.releaseParams.skus = this.platformsFlag ? JSON.stringify(this.skuParams) : [];
+                this.releaseParams.mallSkus = this.platformsMallFlag ? JSON.stringify(this.mallSkusParams) : [];
                 this.addSupplierReleaseProduct(_this.releaseParams);
             },
             addSupplierReleaseProduct(params){// 发布商品

src/main/resources/templates/shopping/confirm.html

@@ -311,8 +311,8 @@
             <div class="invoiceForm" v-show="orderInvoice.type==1">
                 <div class="formLine">
                     <p class="label"><em>*</em>发票类型：</p>
-                    <label class="diyBox"><input type="radio" name="invoiceTit" v-model="orderInvoice.headingType" value="0"><i class="icon mIcon">个人</i></label>
-                    <label class="diyBox"><input type="radio" name="invoiceTit" v-model="orderInvoice.headingType" value="1"><i class="icon mIcon">单位</i></label>
+                    <label class="diyBox"><input type="radio" name="invoiceTit" v-model="orderInvoice.headingType" :value="0"><i class="icon mIcon">个人</i></label>
+                    <label class="diyBox"><input type="radio" name="invoiceTit" v-model="orderInvoice.headingType" :value="1"><i class="icon mIcon">单位</i></label>
                     <span class="errTips icon mIcon"></span>
                 </div>
                 <div class="formLine">