运费V1.0.4

src/main/resources/static/css/base/base.pc.css

@@ -7,7 +7,7 @@ header{box-shadow: 0 2px 10px #ebecef;}
 .h5Only{display:none!important;}
 /*微信二维码样式*/
 iframe{width:320px !important;height: 280px !important}
-#globalHead.fiexd{width: 100%;height: auto;position: fixed;top: 0;left: 0;z-index: 99999;}
+#globalHead.fiexd{width: 100%;height: auto;position: fixed;top: 0;left: 0;z-index: 1999;}
 .impowerBox{width:320px !important;}
 .impowerBox .qrcode {width: 200px !important;}
 .impowerBox .title {display: none;}

src/main/resources/static/css/supplier-center/dashboard.css

@@ -86,9 +86,12 @@
      .message {width: 8vw;height: 8vw;cursor: pointer;position: relative;top: -27vw;right: -88vw;}
      .msg_num {width: 4vw;height: 4vw;line-height: 4vw;display: block;background: red;border-radius: 50%;color: #fff;font-size: 2.7vw;text-align: center;position: relative;top: 3.7vw;right: 3.2vw;z-index: 1;}
      .mIcon.msg:before {width: 4vw;height: 4vw;background-position: -18.4vw -62vw;position: absolute;right:5.87vw;top: 5.87vw;}
-     .product {margin: 1.3vw 0;background: #fff;height: 29.8vw;}
+     .product {margin: 1.3vw 0;background: #fff;height: auto;}
+     .product-title{width: 100%;float: left;margin-bottom: 6vw;}
+     .product-title p{float: left;}
+     .product-title .product-sel{float: right;margin: 1vw 1vw 0 0;}
      .product p {font-size: 3.4vw;font-weight: normal;font-stretch: normal;line-height: 5.6vw;letter-spacing: 0px;color: #22272e;padding: 2.7vw 3.3vw;}
-     .product ul {height:10.6vw;line-height:17vw;background-color: #ffffff;padding: 4vw;}
+     .product ul {height:10.6vw;line-height:17vw;background-color: #ffffff;padding: 4vw;width: 100%;float: left;}
      .product li {display: inline-block;width: 32%;text-align: center;color: #333333;position: relative;cursor: pointer;}
      .mIcon.confirm:before {width: 9vw;height: 9vw;background-position: -66.7vw -60vw;right: 13.9vw;top: -2.53vw;position: absolute}
      .mIcon.other:before {background-position: -74vw -60vw;}
@@ -108,11 +111,11 @@
      .shop-ranke ul li .shop-img {display: inline-block;vertical-align: top;margin-left: 2.7vw;}
      .shop-ranke ul li .shop-img img {width: 9.3vw;height: 9.3vw;display: inline-block;}
      .shop-ranke ul li p {width: 42.7vw;font-size: 3.1vw;height: 16vw;color: #333;padding-left: 2.7vw;display: inline-block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
-     .mIcon.rank0:before {background-position: -25.3vw -60.3vw;}
-     .mIcon.rank1:before {background-position: -33.9vw -60.3vw;}
-     .mIcon.rank2:before {background-position: -42.1vw -60.3vw;}
-     .mIcon.rank3:before {background-position: -50.1vw -60.3vw;}
-     .mIcon.rank4:before {background-position: -58.7vw -60.3vw;}
+     .mIcon.rank0:before {background-position: -20.3vw -60.3vw;}
+     .mIcon.rank1:before {background-position: -28.9vw -60.3vw;}
+     .mIcon.rank2:before {background-position: -38.1vw -60.3vw;}
+     .mIcon.rank3:before {background-position: -47.1vw -60.3vw;}
+     .mIcon.rank4:before {background-position: -55.7vw -60.3vw;}
      .mIcon.rank:before {position: absolute;width: 8vw;height: 8vw;top: 1.69vw;left: 0;}
      .confirm span {padding: 1.3vw;width: 3vw;height: 3vw;line-height: 3vw;display: inline-block;background: #f55c5c;border-radius: 50%;color: #fff;font-size: 3vw;text-align: center;position: relative;top: -8.8vw;right: 6.7vw}
      .confirm.other span {right: 3.5vw}

src/main/resources/static/css/supplier-center/shop/freight.css

@@ -3,7 +3,7 @@ li{list-style: none}
     table, td, th{border: none;}
     input::placeholder{color: #9aa5b5;font-size: 12px;}
     textarea::placeholder{color: #9aa5b5;}
-    .freight-content{width: 100%;min-height: 652px; box-sizing: border-box;padding:40px 56px;background: #fff;}
+    .freight-content{width: 100%;min-height: 652px; box-sizing: border-box;padding:40px 56px 0 56px;background: #fff;}
     .crumbs{color: #22272e;font-size: 16px;}
     .head-top{overflow: hidden;}
     .head-top>div {float: left; height: 40px;font-size: 12px;color: #627386;line-height: 40px;margin-right: 10px;margin-bottom: 10px}

src/main/resources/static/css/supplier-center/shop/release.css

@@ -168,6 +168,28 @@ div{box-sizing: border-box;}
         background-position: -114px -140px;
         height: 20px
     }
+    /* 运费模板弹窗 */
+    .el-message{min-width: 280px !important;}
+    .el-dialog__body{padding: 10px 20px !important;box-sizing: border-box;max-height: 620px;}
+    .el-form-content{width: 100%;max-height: 500px;overflow: hidden;overflow-y: scroll;box-sizing: border-box;padding: 0 12px;}
+    .el-form-list{width: 100%;height: auto;border: 1px solid #B8BFCA;border-radius: 2px;margin-bottom: 10px;}
+    .el-form-list:last-child{margin-bottom: 0;}
+    .el-form-list-title{width: 100%;box-sizing: border-box;padding: 0 13px;line-height: 40px;background: #F5F5F5;font-size: 14px;color: #333333; position: relative;}
+    .el-form-list-title .el-form-close{width: 20px;height: 20px;line-height: 20px;background: #F94B4B;text-align: center;color: #FFFFFF;cursor: pointer;position: absolute;right: 0;top: 0;}
+    .el-form-list-roles{box-sizing: border-box;padding: 0 13px;}
+    .el-form-list-roles.rol3{border-top: 1px solid #B8BFCA;border-bottom: 1px solid #B8BFCA;}
+    .el-form-role3,.el-form-role5{align-items: center;box-sizing: border-box;display: flex;justify-content: space-between;padding: 12px 0;}
+    .el-form-role3-ns,.el-form-role5-ns{width: 550px;line-height: 24px;}
+    .el-form-add{ width: 100%;box-sizing: border-box;line-height: 24px;font-size: 14px;color: #FF5B00;}
+    /* 运费规则弹窗 */
+    .el-form-areas-content{width: 100%;max-height: 600px;overflow: hidden;overflow-y: scroll;box-sizing: border-box;padding: 0 12px;}
+    .el-area-wup{margin-bottom: 20px;}
+    .el-area-box{display: flex;flex-wrap: wrap;}
+    .el-area-checkbox{align-items: center;display: flex;flex: 0 0 auto;margin: 10px 16px 0 0;}
+    .el-area-label{ margin-left: 8px;cursor: pointer;}
+    .el-area-label.disabled{ color: #9AA5B5;cursor: not-allowed;}
+    /* 运费规则弹窗 */
+    .box-row-col{width: 100%;height: 118px;background: #F7F7F7;box-sizing: border-box;padding: 16px;}
 }
 
 /*移动*/

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

@@ -927,6 +927,21 @@ var SupplierApi = {
                 callback(res);
             });
         },
+        /**
+         * @发布商品获取所有运费模板
+         * @param:shopId  运费模板Id
+         */
+        getFreightAll : function (params, callback) {
+            Http.AjaxService({
+                url:'/commodity/shop/product/getFreight',
+                type:'GET',
+                data:params,
+                json:true,
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
         /**
          * @复制运费模板
          * @param:id  运费模板Id

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

@@ -2,14 +2,14 @@ const defaultProductParam = {
         productCount:0, 	// 商品数量
         productId:0,		// 商品Id
         skuId:0,
-        townId:null,          //地址ID
+        cityId:null,          //地址ID
         source:1,			// 来源：1WWW 2小程序
         userId:0			// 用户Id
 };
 const defaultCartParam = {
         skuIds:0,		    // 商品SkuId(逗号隔开)
         source:1,			// 来源：1WWW 2小程序
-        townId:null,          //地址ID
+        cityId:null,          //地址ID
         userId:0			// 用户Id
 };
 const defaultConfirmParam = {
@@ -51,7 +51,7 @@ var shoppingConfirm = new Vue({
         supportParm:{// 组合商品立即购买确认订单参数
             productInfo:'',
             source:2,			// 来源：1WWW 2小程序
-            townId:'',          //地址ID
+            cityId:'',          //地址ID
             userId:0			// 用户Id
         },
         address: {
@@ -228,9 +228,9 @@ var shoppingConfirm = new Vue({
                         _self.address.id = res.data.list[0].addressId;
                         _self.confirmParam.addressId = res.data.list[0].addressId;
                         _self.address.townId = res.data.list[0].townId;
-                        _self.productParam.townId = res.data.list[0].townId;
-                        _self.cartParam.townId = res.data.list[0].townId;
-                        _self.supportParm.townId = res.data.list[0].townId;
+                        _self.productParam.cityId = res.data.list[0].cityId;
+                        _self.cartParam.cityId = res.data.list[0].cityId;
+                        _self.supportParm.cityId = res.data.list[0].cityId;
                         _self.address.cityId = res.data.list[0].cityId;
                         _self.address.provinceId = res.data.list[0].provinceId;
                         _self.address.name = res.data.list[0].receiver;
@@ -373,9 +373,9 @@ var shoppingConfirm = new Vue({
                     // 重新请求查询运费
                     setTimeout(()=>{
                         _self.confirmParam.addressId = data.addressId
-                        _self.productParam.townId = data.townId
-                        _self.cartParam.townId = data.townId
-                        _self.supportParm.townId = data.townId
+                        _self.productParam.cityId = data.cityId
+                        _self.cartParam.cityId = data.cityId
+                        _self.supportParm.cityId = data.cityId
                         if(_self.urlType === 1) {//购物车提交
                             _self.balance.flag = false
                             _self.getCartCreateOrderInfo()
@@ -441,9 +441,9 @@ var shoppingConfirm = new Vue({
                     _self.address.id = item.addressId;
                     _self.confirmParam.addressId = item.addressId;
                     _self.address.townId = item.townId;
-                    _self.productParam.townId = item.townId;
-                    _self.cartParam.townId = item.townId;
-                    _self.supportParm.townId = item.townId;
+                    _self.productParam.cityId = item.cityId;
+                    _self.cartParam.cityId = item.cityId;
+                    _self.supportParm.cityId = item.cityId;
                     _self.address.cityId = item.cityId;
                     _self.address.provinceId = item.provinceId;
                     _self.address.name = item.receiver;
@@ -693,33 +693,12 @@ var shoppingConfirm = new Vue({
             }else if(this.confirmParam.orderInvoice.type*1 === 2){
                 this.confirmParam.orderInvoice = Object.assign(this.confirmParam.orderInvoice,'',{type:2});
             }
-            //商品信息
-            this.confirmParam.orderInfo = this.listData.map(el => {
-                const productInfo = [];
-                el.postageFlag = el.handlePostageFlag
-                el.cartList.forEach(cart => {
-                    productInfo.push({
-                        skuId:cart.skuId,
-                        productId:cart.productId,
-                        productNum:cart.number,
-                        presentNum:0,
-                        productType:cart.giftType
-                    })
-                })
-                return {
-                    splitCode:el.splitCode,
-                    shopId:el.shopId,
-                    note:el.note ? el.note : '',
-                    postage:parseInt(el.postage).toFixed(2),
-                    postageFlag: parseInt(el.postageFlag),
-                    isColdChina:el.isColdChina ? 1 : 0,
-                    productInfo:productInfo
-                }
-            });
             if(this.orderInvoice.type!==0){
                 this.orderInvoice.type = parseInt(this.orderInvoice.type)
                 this.confirmParam.orderInvoice = this.orderInvoice;
             }
+            //商品信息
+            this.confirmParam.orderInfo = this.hanldeProcessing()
             this.confirmParam.payInfo.orderShouldPayFee = parseFloat(this.hanldShouldPayFee).toFixed(2);
             this.confirmParam.payInfo = JSON.stringify(this.confirmParam.payInfo);
             this.confirmParam.orderInfo = JSON.stringify(this.confirmParam.orderInfo);
@@ -727,6 +706,31 @@ var shoppingConfirm = new Vue({
             console.log('confirmParam',this.confirmParam);
             this.handleConfirmOrder();
         },
+        // 处理数据格式
+        hanldeProcessing() {
+            return this.listData.map(el => {
+                let productInfo = []
+                el.cartList.forEach(pros => {
+                    productInfo.push({
+                        skuId: pros.skuId,
+                        productNum: pros.number,
+                        presentNum: 0,
+                        productType: pros.giftType
+                    })
+                })
+                return {
+                    splitCode: el.splitCode,
+                    shopId: el.shopId,
+                    note: el.note ? el.note : '',
+                    postage: el.isColdChina
+                        ? parseInt(el.postage + el.coldChain).toFixed(2)
+                        : parseInt(el.postage).toFixed(2),
+                    postageFlag: parseInt(el.handlePostageFlag),
+                    isColdChina: el.isColdChina ? 1 : 0,
+                    productInfo: productInfo
+                }
+            })
+        },
         handleConfirmOrder(){// 提交
             const _self = this;
             OrderApi.ConfirmOrder(_self.confirmParam,function (res) {

src/main/resources/static/js/supplier-center/dashboard.js

@@ -16,13 +16,17 @@
         isShow:false,
         orderNumData:[],//统计订单金额
         paytotalfeeData:[],//统计订单数量
-        platform:1
+        productOrganize:0
     },
      methods: {
-         dashboardDataInfo:function(){
+        // 切换平台
+         handleChange(){
+             this.dashboardDataInfo()
+         },
+         dashboardDataInfo(){
              var _this = this;
-             SupplierApi.homePageData({userId:_this.userId},function (res) {
-                 if(res.code==0){
+             SupplierApi.homePageData({userId:_this.userId,productOrganize:this.productOrganize},function (res) {
+                 if(res.code===0){
                      _this.isRequset = false;
                      _this.homeData = res.data;
                      _this.goodImage = _this.homeData.user.image ? _this.homeData.user.image : '/img/supplier/icon_default_opea@2x.png';
@@ -36,7 +40,7 @@
                      if (res.data.unReadMessageCount>99){
                          res.data.unReadMessageCount = '99+';
                          _this.msgFlag = true
-                     }else if(res.data.unReadMessageCount == 0){
+                     }else if(res.data.unReadMessageCount === 0){
                          _this.msgFlag = false
                      }else {
                          _this.msgFlag = true
@@ -51,7 +55,7 @@
                  }
              })
          },
-         uploadGoodsImagesFn:function (event) {//更换头像
+         uploadGoodsImagesFn (event) {//更换头像
               var _this = this;
                 var inputDOM = _this.$refs.goodImage;
                 var file = inputDOM.files;
@@ -64,7 +68,7 @@
                     })
                 });
          },
-         toggleThisLadder: function(event){
+         toggleThisLadder(event){
                 var el = event.currentTarget;
                 if($(el).hasClass("on")){
                     $(el).removeClass("on").siblings('.mFixed').hide();
@@ -74,19 +78,19 @@
                     if(!isPC){fixedBody();}
                 }
          },
-         hideThisLadder: function(event){
+         hideThisLadder(event){
                 var el = event.currentTarget;
                 $(el).parents('.priceTag').find('.tag').removeClass("on").siblings('.mFixed').hide();
                 if(!isPC){looseBody();}
          },
-         opentitle:function () {
+         opentitle () {
              var _this = this;
              _this.titleSshow =!this.titleSshow;
          },
-         perfect:function () {
+         perfect () {
             window.location.href='/supplier/setting/information.html';
          },
-         EchartsCreated2d:function(){
+         EchartsCreated2d(){
              // 基于准备好的dom，初始化echarts实例
              var _this = this;
              var myChart = echarts.init(document.getElementById('StatisticsEacths'));

src/main/resources/static/js/supplier-center/shop/freight.js

@@ -9,7 +9,7 @@ var myGoods = new Vue({
         listQuery:{
             shopId:'',
             pageNum:1,
-            pageSize:2,
+            pageSize:3,
         },
         freightList:[],
         total:0,
@@ -48,14 +48,15 @@ var myGoods = new Vue({
             this.listQuery.pageNum = val;
             this.getList();
         },
-        getList(){//我的商品数据初始化
+        // 获取运费模板管理数据
+        getList(){
             const _this = this;
             SupplierApi.getFreightTemp(this.listQuery,function(response){
                 if(response.code === 0){
                     const data  = response.data
                     _this.freightList = data.results
-                    console.log('freightList',_this.freightList)
                     _this.total = data.totalRecord;
+                    console.log('total',_this.total)
                     _this.listLoading = false
                 }else{
                     CAIMEI.Alert(response.msg, '确定');
@@ -63,46 +64,72 @@ var myGoods = new Vue({
                 }
             })
         },
+        // 调用复制运费模板
+        getFreightTemplateById(id){
+            const _this = this
+            SupplierApi.getFreightTemplateById({id:id},function(response){
+                if(response.code === 0){
+                    _this.getList()
+                }else{
+                    CAIMEI.Alert(response.msg, '确定');
+                }
+            })
+        },
+        // 调用删除运费模板
+        delFreight(id){
+            const _this = this
+            SupplierApi.delFreight({id:id},function(response){
+                if(response.code === 0){
+                    _this.$message({ message: '操作成功',type: 'success'});
+                    _this.getList()
+                }else{
+                    CAIMEI.Alert(response.msg, '确定');
+                }
+            })
+        },
+        // 调用修改运费模板
+        freightTemplateDetail(id){
+            const _this = this
+            SupplierApi.freightTemplateDetail({id:id},function(response){
+                if(response.code === 0){
+                    _this.freightTemp = response.data
+                    _this.freightRuleList = response.data.freightRuleList
+                    _this.dialogFormVisible = true
+                }else{
+                    CAIMEI.Alert(response.msg, '确定');
+                }
+            })
+        },
         // 复制运费模板
         handleCopy(freight){
+            const _this = this
             this.$confirm('确定复制该模板吗？', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning'
             }).then(() => {
-                this.$message({
-                    type: 'success',
-                    message: '复制成功!'
-                });
+                _this.getFreightTemplateById(freight.id)
             }).catch(() => {
-                this.$message({
-                    type: 'info',
-                    message: '已取消复制'
-                });
+                console.log('用户取消复制')
             });
         },
-        // 修改运费模板
-        handleEdit(freight){
-            console.log('修改运费模板')
-        },
         // 删除运费模板
         handleDele(freight){
-            console.log('删除运费模板')
+            const _this = this
             this.$confirm('确定删除该模板吗？', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning'
             }).then(() => {
-                this.$message({
-                    type: 'success',
-                    message: '删除成功!'
-                });
+                _this.delFreight(freight.id)
             }).catch(() => {
-                this.$message({
-                    type: 'info',
-                    message: '已取消删除'
-                });
+                console.log('用户取消删除')
             });
+        },
+        // 修改运费模板
+        handleEdit(freight){
+            console.log('修改运费模板')
+            this.freightTemplateDetail(freight.id)
         }
     },
     mounted: function () {

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

@@ -23,7 +23,7 @@ var checkeMixins = function () {
                 vShow_QualificationNo:false,
                 vShow_ProductName:false,
                 vShow_QualificationTime:false,
-                vShow_byFlag:false // 物流方式
+                vShow_freePostFlag:false // 物流方式
             }
         },
         mounted: function() {
@@ -274,6 +274,16 @@ var checkeMixins = function () {
                     },3000);
                     return;
                 }
+                if(_this.releaseParams.freePostFlag === 1){
+                    if(!_this.releaseParams.freightTemplateId){
+                        _this.vShow_freePostFlag = true;
+                        _this.fromMessage = '请选择运费模板';
+                        setTimeout(function(){
+                            _this.vShow_freePostFlag = false;
+                        },3000);
+                        return;
+                    }
+                }
                 _this.activeNum++;
                 _this.scrollIntoView();
                 if(_this.vShow_detailInfoEditor){

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

@@ -7,11 +7,10 @@ const freightDefault = () =>{
         ruleTax:'', // 运费规则文案
         freightAreaList:[], // 运费规则地区id集合
         freightAmount:'',// 运费金额
-        freeType:'', //是否指定条件包邮 0无条件 1指定条件包邮
+        freeType:0, //是否指定条件包邮 0无条件 1指定条件包邮
         freeCondition:'',// 包邮条件 0 满足件数 1 满足金额
         productNum:'', // 包邮商品件数
-        allAmount:'', // 包邮商品金额
-        checked:false, // false 未勾选 true 已勾选
+        allAmount:'' // 包邮商品金额
     }
 }
 const freightMixins = function () {
@@ -27,12 +26,14 @@ const freightMixins = function () {
                 rulesFormVisible:false, // 控制运费规则弹窗显示
                 areasFormVisible:false, // 控制省市区弹窗显示
                 urbanFormVisible:false, // 控制数去弹窗显示
+                rulesChecked:false,// 控制指定条件包邮
                 freightTemp:{
                     id:'',
                     name:'',
                     shopId:'',
                     freightRuleList:[]
                 },
+                freightRuleList:[],
                 freightRulesForm:{}, // 记录运费规则
                 freightAreasType:'', // 设置省市类型
                 cityUrbanForm:{}, // 市区
@@ -47,7 +48,7 @@ const freightMixins = function () {
         },
         mounted () {
             this.freightTemp.shopId = globalUserData.shopId
-            this.freightTemp.freightRuleList.push(freightDefault())
+            this.freightRuleList.push(freightDefault())
         },
         methods: {
             disabled(value){
@@ -68,22 +69,24 @@ const freightMixins = function () {
             // 新增运费模板
             handleAddFreight(){
                 this.freightTemp.name = ''
-                this.freightTemp.freightRuleList = []
-                this.freightTemp.freightRuleList.push(freightDefault())
+                this.freightRuleList = []
+                this.freightRuleList.push(freightDefault())
                 this.handleInitAreas()
                 this.dialogFormVisible = true
             },
             // 新增运费规则
             handleAddRole(){
-                this.freightTemp.freightRuleList.push(freightDefault())
+                this.freightRuleList.push(freightDefault())
             },
             // 删除运费规则
             handleDelRole(index){
-                this.freightTemp.freightRuleList.splice(index, 1)
+                this.freightRuleList.splice(index, 1)
             },
             // 修改运费规则
             changeFreightRole(freight,index){
+                console.log('freight',freight)
                 this.freightRulesForm = freight
+                this.rulesChecked = freight.freeType === 1
                 this.rulesFormVisible = true
             },
             // 设置运费规则
@@ -106,7 +109,7 @@ const freightMixins = function () {
             handleConfirmRoles(){
                 this.$refs['ruleForm'].validate(valid => {
                     if (valid) {
-                        if(this.freightRulesForm.checked){
+                        if(this.rulesChecked){
                             this.freightRulesForm.ruleTax = `固定运费${this.freightRulesForm.freightAmount}元 / ${this.freightRulesForm.freeCondition === 0 ? `满${this.freightRulesForm.productNum}件包邮` : `满￥${this.freightRulesForm.allAmount}包邮` }`
                         }else{
                             this.freightRulesForm.ruleTax = `固定运费${this.freightRulesForm.freightAmount}元`
@@ -136,6 +139,7 @@ const freightMixins = function () {
                 this.freightAreasType = type
                 this.areaRulesForm = freight
                 this.areaRulesIndex = index+1
+                this.getFreightArea(freight.freightId,freight.id)
                 this.areasFormVisible = true
             },
             // 设置省市区
@@ -253,7 +257,7 @@ const freightMixins = function () {
                     }
                 })
                 console.log('newCheckedCities',newCheckedCities)
-                this.areaRulesForm.freightAreaList = JSON.stringify(this.handleTotalUrban())
+                this.areaRulesForm.freightAreaList = this.handleTotalUrban()
                 console.log('freightAreaList',this.areaRulesForm.freightAreaList)
                 this.areaRulesForm.areaTax = newCheckedCities.join('、')
                 console.log('areaTax',this.areaRulesForm.freightAreaList)
@@ -322,9 +326,8 @@ const freightMixins = function () {
             // 取消保存运费模板
             handleCanleFreights(){
                 // 取消保存运费模板, 全部初始化
-                this.freightTemp.name = ''
-                this.freightTemp.freightRuleList = []
-                this.freightTemp.freightRuleList.push(freightDefault())
+                this.freightRuleList = []
+                this.freightRuleList.push(freightDefault())
                 this.handleInitAreas()
                 this.dialogFormVisible = false
             },
@@ -332,7 +335,7 @@ const freightMixins = function () {
             handleConfirmShelf(){
                 let freightFlag = false
                 let aresFlag = false
-                this.freightTemp.freightRuleList.forEach(freight =>{
+                this.freightRuleList.forEach(freight =>{
                     if(!freight.ruleTax){
                         freightFlag = true
                     }
@@ -355,24 +358,20 @@ const freightMixins = function () {
                     this.$message({ message: '运费规则对应的省市不能为空',type: 'warning'});
                     return false
                 }
-                let params = JSON.stringify(this.freightTemp.freightRuleList)
-                console.log('params',params)
-                this.saveFreightTemplate(this.freightTemp,params)
-            },
-            // 处理数据
-            checkedStringify(params){
-
+                this.freightTemp.freightRuleList = JSON.stringify(this.freightRuleList)
+                this.saveFreightTemplate(this.freightTemp)
             },
             // 保存运费模板
             saveFreightTemplate(params){
                 const _this = this;
-                params.freightRuleList = JSON.stringify(params.freightRuleList)
                 console.log('params',params)
                 SupplierApi.saveFreightTemplate(params,function(response){
                     if(response.code === 0){
-                        this.$message({ message: '保存成功',type: 'success'});
+                        _this.$message({ message: '保存运费模板成功',type: 'success'});
+                        _this.getList()
+                        _this.handleCanleFreights()
                     }else{
-                        this.$message({ message: `${response.msg}`,type: 'warning'});
+                        _this.$message({ message: `${response.msg}`,type: 'warning'});
                     }
                 })
             },

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

@@ -7,8 +7,8 @@ var getInfoMixins = function () {
             }
         },
         methods: {
-            GetEditReleaseProductInfo: function(productId){
-                var _this = this;
+            GetEditReleaseProductInfo(productId){
+                const _this = this;
                 SupplierApi.EditReleaseProductInfo({productId:productId},function(response){
                     if(response.code === 0){
                         console.log(response);
@@ -38,7 +38,8 @@ var getInfoMixins = function () {
                         _this.releaseParams.minBuyNumber = data.minBuyNumber;
                         _this.releaseParams.stock = data.stock;
                         _this.releaseParams.step = data.step;
-                        _this.releaseParams.byFlag = data.byFlag;
+                        _this.releaseParams.freePostFlag = data.freePostFlag;
+                        _this.releaseParams.freightTemplateId = data.freightTemplateId;
                         _this.releaseParams.allAreaFlag = data.allAreaFlag;
                         _this.releaseParams.productName = data.productName;
                         _this.releaseParams.qualificationNo = data.qualificationNo;
@@ -113,6 +114,17 @@ var getInfoMixins = function () {
                     }
                 })
             },
+            // 获取所有运费模板
+            getFreightAll(shopId){
+                const _this = this
+                SupplierApi.getFreightAll({shopId:shopId},function(response){
+                    if(response.code === 0){
+                        _this.freightOptions = response.data
+                    }else{
+                        CAIMEI.Alert(response.msg, '确定');
+                    }
+                })
+            },
             setNewSkuArray(arr){// 回显处理Sku数据
                 if(arr.length > 0){
                     return arr.map((el)=>({
@@ -128,8 +140,8 @@ var getInfoMixins = function () {
                 }
             },
             setTagArray(arr){//回显处理商品标签
-                var arrSplit = arr.split(',');
-                var _ARRAY = [];
+                const arrSplit = arr.split(',');
+                const _ARRAY = [];
                 arrSplit.forEach(function(item){
                     var _OBJ = {tag:item};
                     _ARRAY.push(_OBJ)
@@ -261,6 +273,7 @@ var getInfoMixins = function () {
                     this.productId = Number(CAIMEI.getUrlParam('productId'));
                     this.GetEditReleaseProductInfo(this.productId);
                 }
+                this.getFreightAll(this.releaseParams.shopId)
             }
         }
     }

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

@@ -23,23 +23,7 @@ var releaseMixins = function () {
                 isSkuRule:false,
                 isMallSkuRule:false,
                 isPlatforms:false,
-                options: [{
-                    value: '选项1',
-                    label: '黄金糕'
-                }, {
-                    value: '选项2',
-                    label: '双皮奶',
-                    disabled: true
-                }, {
-                    value: '选项3',
-                    label: '蚵仔煎'
-                }, {
-                    value: '选项4',
-                    label: '龙须面'
-                }, {
-                    value: '选项5',
-                    label: '北京烤鸭'
-                }],
+                freightOptions: [],
             }
         },
         mounted: function() {
@@ -131,11 +115,7 @@ var releaseMixins = function () {
             },
             // 刷新运费模板
             handleRefresh(){
-
-            },
-            // 新增运费模板
-            handleAddFreight(){
-
+                this.getFreightAll(this.releaseParams.shopId)
             },
             addSupplierReleaseInfo(){
                 var _this = this;

src/main/resources/static/js/supplier-center/shop/release.js

@@ -5,7 +5,7 @@ $('.navLayout').find('.navList').removeClass("on").find('.con').hide().find('a')
 $('.navLayout').find('.navList').eq(1).addClass("on").find('.con').show().find('a').eq(2).addClass("on");
 var releaseContainer = new Vue({
     el:"#releaseContainer",
-    mixins: [getInfoMixins,checkeMixins,releaseMixins,cmSysVitaMixins],
+    mixins: [getInfoMixins,checkeMixins,freightMixins,releaseMixins,cmSysVitaMixins],
     data: {
         NODE_ENV_BASE_URL:'',
         releaseType:'',
@@ -45,7 +45,8 @@ var releaseContainer = new Vue({
             minBuyNumber:'',//起订量
             stock:'',//库存
             step:1,//购买数量
-            byFlag:0,//运费
+            freePostFlag:0,// 0 包邮 1 使用运费模板 2 到付
+            freightTemplateId:"", // 运费模板Id
             allAreaFlag:1,//销售区域
             provinceIds:0,//指定区域
             detailInfo:'',//商品详情信息
@@ -64,7 +65,6 @@ var releaseContainer = new Vue({
             productName:'',//资质产品名称
             qualificationTime:'',//证书有效日期
             groundMall:'0',
-            freightsTemp:'',
             skus:[],// sku
             mallSkus:[] //外部Sku
         },
@@ -364,13 +364,13 @@ var releaseContainer = new Vue({
             }
             this.isTaxPonitEditPopup = false;
         },
-        radioChangeStep: function(event){//选择指定购买数量
+        radioChangeStep(event){//选择指定购买数量
             this.releaseParams.step= event.target.value;
         },
-        radioChangeByFlag: function(event){//选择运费
-            this.releaseParams.byFlag= event.target.value;
+        radioChangeByFlag(event){//选择运费
+            this.releaseParams.freePostFlag= event.target.value;
         },
-        radioChangeAllAreaFlag: function(event){//选择指定区域
+        radioChangeAllAreaFlag(event){//选择指定区域
             var _this = this;
             _this.releaseParams.areaFlag= event.target.value;
             if( _this.releaseParams.areaFlag == '0'){
@@ -381,13 +381,13 @@ var releaseContainer = new Vue({
                 _this.isProvince=false;
             }
         },
-        radioChangeNewvalidFlag: function(event){//选择新品展示
+        radioChangeNewvalidFlag(event){//选择新品展示
             this.releaseParams.newProductType= event.target.value;
         },
-        addProvinceFn: function(item){//选择指定区域
+        addProvinceFn(item){//选择指定区域
             item.isChecked = ! item.isChecked;
         },
-        GetProvinceFn: function(){//查询指定区域
+        GetProvinceFn(){//查询指定区域
             var _this = this;
             PublicApi.GetProvince({},function(response){
                 if(response.code == 0){

src/main/resources/templates/components/head-link.html

@@ -12,5 +12,5 @@
     <link th:href="@{/css/base/base.h5.css(v=${version})}" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
     <link th:href="@{/css/base/base.pc.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"/>
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
     <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>

src/main/resources/templates/index.html

@@ -13,7 +13,7 @@
     <link th:href="@{/css/index/index_new.pc.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
     <link th:href="@{/lib/css/swiper-bundle.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
     <link rel="stylesheet" href="https://unpkg.com/vant@2.12/lib/index.css" />
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css" />
     <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css" />
     <template th:replace="components/analysis"></template>
 </head>

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

@@ -6,7 +6,7 @@
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/base/form.css(v=${version})}" rel="stylesheet" type="text/css">
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"/>
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
     <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
     <link th:href="@{/css/shopping/shopping.css(v=${version})}" rel="stylesheet" type="text/css">
     <template th:replace="components/analysis"></template>

src/main/resources/templates/supplier-center/article/article-edit.html

@@ -5,7 +5,7 @@
     <title>采美365网-采美文章-编辑文章</title>
     <template th:replace="components/head-link"></template>
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css" />
     <link rel="stylesheet" th:href="@{/lib/element-ui/element-ui-min.css}" />
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:if="${pageId==1026}" th:href="@{/css/base/form.css(v=${version})}" rel="stylesheet" type="text/css">

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

@@ -5,7 +5,7 @@
     <title>采美365网-文章管理-文章列表</title>
     <template th:replace="components/head-link"></template>
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css" />
     <link rel="stylesheet" th:href="@{/lib/element-ui/element-ui-min.css}" />
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
 <!--    <link th:if="${pageId==1026}" th:href="@{/css/base/form.css(v=${version})}" rel="stylesheet" type="text/css">-->

src/main/resources/templates/supplier-center/components/freight-dialog.html

@@ -0,0 +1,161 @@
+<!--运费模板弹窗-->
+<el-dialog title="创建运费模板" :visible.sync="dialogFormVisible" :close-on-click-modal="false" :close-on-press-escape="false"  width="750px">
+  <div class="el-form-content">
+    <el-form ref="dataForm" :rules="rules" :model="freightTemp" label-position="right" label-width="0">
+      <el-row :gutter="24" class="box-row" style="margin-bottom: 10px;margin-left: 0;margin-right: 0;">
+        <span style="font-weight: bold;">模板名称:</span>
+      </el-row>
+      <el-form-item style="margin-left: 0;margin-bottom: 10px;">
+        <el-input v-model="freightTemp.name" placeholder="请输入模板名称"  maxlength="30"></el-input>
+      </el-form-item>
+      <el-row :gutter="24" class="box-row" style="margin-bottom: 10px;margin-left: 0;margin-right: 0;">
+        <span style="font-weight: bold;">设置运费:</span>
+        <span style="color: #F94B4B;">（注意：未设置的其他省市默认包邮）</span>
+      </el-row>
+      <el-form-item style="margin-bottom: 10px;">
+        <div class="el-form-list" v-for="(freight,index) in freightRuleList" :key="index">
+          <div class="el-form-list-title">
+            运费规则{{index+1}}
+            <div class="el-form-close" v-if="index>0" @click="handleDelRole(index)"><i class="el-icon-close"></i></div>
+          </div>
+          <div class="el-form-list-roles rol3">
+            <div class="el-form-role3">
+              <template v-if="freight.areaTax">
+                <div class="el-form-role3-ns">
+                  <span style="color: #333333;">{{ freight.areaTax }}</span>
+                </div>
+                <el-button plain size="mini" @click="changeFreightAreas('edit',freight,index)">修改省市</el-button>
+              </template>
+              <template  v-else>
+                <div class="el-form-role3-ns">
+                  <span style="color: #9AA5B5;">对应地区</span>
+                </div>
+                <el-button plain size="mini" @click="sittingFreightAreas('add',freight,index)">选择省市</el-button>
+              </template>
+            </div>
+          </div>
+          <div class="el-form-list-roles">
+            <div class="el-form-role5">
+              <template v-if="freight.ruleTax">
+                <div class="el-form-role5-ns">
+                  <span style="color: #333333;">{{ freight.ruleTax }}</span>
+                </div>
+                <el-button plain size="mini" @click="changeFreightRole(freight,index)">修改规则</el-button>
+              </template>
+              <template  v-else>
+                <div class="el-form-role5-ns">
+                  <span style="color: #9AA5B5;">对应运费规则</span>
+                </div>
+                <el-button plain size="mini" @click="sittingFreightRole(freight,index)">设置规则</el-button>
+              </template>
+            </div>
+          </div>
+        </div>
+      </el-form-item>
+      <div class="el-form-add" v-if="freightRuleList.length < 10">
+        <el-button type="text" icon="el-icon-circle-plus-outline" @click="handleAddRole" style="padding: 0 0;">添加运费规则</el-button>
+      </div>
+    </el-form>
+  </div>
+  <div slot="footer" class="dialog-footer">
+    <el-button @click="handleCanleFreights">取消</el-button>
+    <el-button type="primary" @click="handleConfirmShelf">确定</el-button>
+  </div>
+</el-dialog>
+<!--设置省市区弹窗-->
+<el-dialog title="选择省市" :visible.sync="areasFormVisible" :close-on-click-modal="false" :close-on-press-escape="false" width="750px">
+  <div class="el-form-content">
+    <el-row :gutter="24" class="box-row" style="margin-bottom: 10px;margin-left: 0;margin-right: 0;">
+      <div class="el-area-wup" v-for="(area,index) in areaData" :key="index">
+        <div class="el-area-box">
+          <div class="el-area-checkbox">
+            <el-checkbox :indeterminate="area.isIndeterminate" v-model="area.checked" :disabled="disabled(area)" @change="handleCheckAllChange(area,$event)"></el-checkbox>
+            <div class="el-area-label" :class="disabled(area) ? 'disabled' : ''">{{ area.name }}</div>
+          </div>
+        </div>
+        <div class="el-area-box">
+          <div class="el-area-checkbox" v-for="city in area.provinceList" :key="city">
+            <el-checkbox :indeterminate="city.isIndeterminate" v-model="city.checked"  :disabled="disabled(city)" @change="handleCheckedCitiesChange(city,area,$event)"></el-checkbox>
+            <div class="el-area-label" :class="disabled(city) ? 'disabled' : ''" @click="handleUrbanForm(city,area,disabled(city))">
+              {{ city.name }}
+              ({{ city.checkedCities.length }}/{{ city.cityList.length }})
+              <i class="el-icon-arrow-right"></i>
+            </div>
+          </div>
+        </div>
+      </div>
+    </el-row>
+  </div>
+  <div slot="footer" class="dialog-footer">
+    <el-button @click="handleCanleAreas">取消</el-button>
+    <el-button type="primary" @click="handleConfirmAreas">确定</el-button>
+  </div>
+</el-dialog>
+<!--设置市区弹窗-->
+<el-dialog :title="cityUrbanForm.name" :visible.sync="urbanFormVisible" :close-on-click-modal="false" :close-on-press-escape="false" width="750px" style="margin: 100px auto;">
+  <el-row :gutter="24" class="box-row" style="margin-bottom: 10px;margin-left: 0;margin-right: 0;">
+    <div class="el-area-wup">
+      <div class="el-area-box">
+        <div class="el-area-checkbox">
+          <el-checkbox :indeterminate="cityUrbanForm.isIndeterminate" v-model="cityUrbanForm.checked" :disabled="disabled(cityUrbanForm)" @change="handleUrbanChange">全选</el-checkbox>
+        </div>
+      </div>
+      <div class="el-area-box">
+        <div class="el-area-checkbox" v-for="urban in cityUrbanForm.cityList" :key="urban">
+          <el-checkbox :indeterminate="urban.isIndeterminate" v-model="urban.checked" :disabled="disabled(urban)" @change="handleCheckedUrbanChange(urban,$event)">{{ urban.name }}</el-checkbox>
+        </div>
+      </div>
+    </div>
+  </el-row>
+  <div slot="footer" class="dialog-footer">
+    <el-button @click="urbanFormVisible = false">取消</el-button>
+    <el-button type="primary" @click="handleConfirmUrban">确定</el-button>
+  </div>
+</el-dialog>
+<!--运费规则弹窗-->
+<el-dialog title="运费规则" :visible.sync="rulesFormVisible" :close-on-click-modal="false" :close-on-press-escape="false" width="750px" style="margin: 100px auto;">
+  <el-form ref="ruleForm" :rules="rules" :model="freightRulesForm" label-position="right" label-width="0">
+    <el-row :gutter="24" class="box-row" style="margin-bottom: 10px;margin-left: 0;margin-right: 0;">
+      <span style="font-weight: bold;">运费方式:</span>
+      <span>固定运费</span>
+    </el-row>
+    <el-row :gutter="24" class="box-row" style="margin-bottom: 10px;margin-left: 0;margin-right: 0;">
+      <span style="font-weight: bold;">运费金额:</span>
+    </el-row>
+    <el-form-item prop="freightAmount" :rules="rules.freightAmount" style="margin-left: 0;">
+      <el-input v-model="freightRulesForm.freightAmount">
+        <template slot="append">元</template>
+      </el-input>
+    </el-form-item>
+    <el-row :gutter="24" class="box-row" style="margin-bottom: 10px;margin-left: 0;margin-right: 0;">
+        <span>
+            <el-checkbox v-model="rulesChecked" @change="handleFreightFreeType"></el-checkbox>
+            指定条件包邮
+        </span>
+    </el-row>
+    <div class="box-row-col" v-if="rulesChecked">
+      <el-row :gutter="24" class="box-row" style="margin-bottom: 10px;margin-left: 0;margin-right: 0;">
+        <el-radio v-model="freightRulesForm.freeCondition" :label="0">满足件数</el-radio>
+        <el-radio v-model="freightRulesForm.freeCondition" :label="1">满足金额</el-radio>
+      </el-row>
+      <el-row :gutter="24" class="box-row" style="margin-bottom: 10px;margin-left: 0;margin-right: 0;" v-if="freightRulesForm.freeCondition === 0">
+        满
+        <el-input v-model="freightRulesForm.productNum" style="width: 180px">
+          <template slot="append">件</template>
+        </el-input>
+        可包邮
+      </el-row>
+      <el-row :gutter="24" class="box-row" style="margin-bottom: 10px;margin-left: 0;margin-right: 0;"  v-if="freightRulesForm.freeCondition === 1">
+        满
+        <el-input v-model="freightRulesForm.allAmount" style="width: 180px">
+          <template slot="append">元</template>
+        </el-input>
+        可包邮
+      </el-row>
+    </div>
+  </el-form>
+  <div slot="footer" class="dialog-footer">
+    <el-button @click="rulesFormVisible = false">取消</el-button>
+    <el-button type="primary" @click="handleConfirmRoles">确定</el-button>
+  </div>
+</el-dialog>

src/main/resources/templates/supplier-center/dashboard.html

@@ -63,13 +63,13 @@
                         <span class="ziliao">资料完整度：<span>{{homeData.dataIntegrity}}</span></span>
                     </div>
                 </div>
-                <div class="product">
+                <div class="product clear">
                     <div class="product-title">
                         <p>商品数据</p>
                         <div class="product-sel">
                             <span>所属平台</span>
-                            <el-select v-model="platform" class="state" clearable @change="">
-                                <el-option label="【采美平台】" :value="1" ></el-option>
+                            <el-select v-model="productOrganize" class="state" clearable @change="handleChange">
+                                <el-option label="【采美平台】" :value="0" ></el-option>
                                 <el-option label="【丽格集采平台】" :value="4"></el-option>
                             </el-select>
                         </div>

src/main/resources/templates/supplier-center/encyclopedia/edit.html

@@ -7,7 +7,7 @@
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"/>
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
     <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
     <link th:href="@{/css/supplier-center/encyclopedia/edit.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>

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

@@ -7,7 +7,7 @@
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"/>
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
     <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
     <link th:href="@{/css/supplier-center/encyclopedia/list.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>

src/main/resources/templates/supplier-center/encyclopedia/old/instrument-edit.html

@@ -7,7 +7,7 @@
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:if="${pageId==1026}" th:href="@{/css/base/form.css(v=${version})}" rel="stylesheet" type="text/css">
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css" />
     <link rel="stylesheet" th:href="@{/lib/element-ui/element-ui-min.css}" />
     <link th:href="@{/css/supplier-center/encyclopedia/edit-page-style.css}" rel="stylesheet" type="text/css">
     <template th:replace="components/analysis"></template>

src/main/resources/templates/supplier-center/encyclopedia/old/instrument-list.html

@@ -6,7 +6,7 @@
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css" />
     <link rel="stylesheet" th:href="@{/lib/element-ui/element-ui-min.css}" />
     <link th:href="@{/css/supplier-center/encyclopedia/article-list.css(v=${version})}" rel="stylesheet" type="text/css">
     <template th:replace="components/analysis"></template>

src/main/resources/templates/supplier-center/encyclopedia/old/product-edit.html

@@ -7,7 +7,7 @@
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:if="${pageId==1026}" th:href="@{/css/base/form.css(v=${version})}" rel="stylesheet" type="text/css">
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css" />
     <link rel="stylesheet" th:href="@{/lib/element-ui/element-ui-min.css}" />
     <link th:href="@{/css/supplier-center/encyclopedia/edit-page-style.css}" rel="stylesheet" type="text/css">
     <template th:replace="components/analysis"></template>

src/main/resources/templates/supplier-center/encyclopedia/old/product-list.html

@@ -5,7 +5,7 @@
     <title>采美365网-采美百科-产品</title>
     <template th:replace="components/head-link"></template>
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css" />
     <link rel="stylesheet" th:href="@{/lib/element-ui/element-ui-min.css}" />
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/supplier-center/encyclopedia/article-list.css(v=${version})}" rel="stylesheet" type="text/css">

src/main/resources/templates/supplier-center/encyclopedia/old/recommend-edit.html

@@ -6,7 +6,7 @@
   <template th:replace="components/head-link"></template>
   <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
   <!--element ui 样式表-->
-  <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
+  <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css" />
   <link rel="stylesheet" th:href="@{/lib/element-ui/element-ui-min.css}" />
   <link th:href="@{/css/supplier-center/encyclopedia/recommend-edit.css(v=${version})}" rel="stylesheet" type="text/css">
   <template th:replace="components/analysis"></template>

src/main/resources/templates/supplier-center/encyclopedia/preview.html

@@ -10,7 +10,7 @@
   <link href="/lib/jquery-confirm.min.css" rel="stylesheet" type="text/css">
   <link rel="stylesheet" href="/lib/swiper.min.css">
   <!--element ui 样式表-->
-  <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"/>
+  <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
   <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
   <link rel="stylesheet" th:href="@{/css/encyclopedia/common.css(v=${version})}">
   <link rel="stylesheet" th:href="@{/css/encyclopedia/preview.css(v=${version})}">

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

@@ -6,7 +6,7 @@
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"/>
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
     <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
     <link th:href="@{/css/supplier-center/order/detail.css(v=${version})}" rel="stylesheet" type="text/css">
     <template th:replace="components/analysis"></template>

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

@@ -6,7 +6,7 @@
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"/>
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
     <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
     <link th:href="@{/css/supplier-center/order/orderlist.css(v=${version})}" rel="stylesheet" type="text/css">
     <template th:replace="components/analysis"></template>

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

@@ -6,7 +6,7 @@
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"/>
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
     <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
     <link th:href="@{/css/supplier-center/order/order-edit.css(v=${version})}" rel="stylesheet" type="text/css">
     <template th:replace="components/analysis"></template>

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

@@ -6,7 +6,7 @@
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"/>
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
     <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
     <link th:href="@{/css/supplier-center/order/order-return.css(v=${version})}" rel="stylesheet" type="text/css">
     <template th:replace="components/analysis"></template>

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

@@ -6,7 +6,7 @@
   <template th:replace="components/head-link"></template>
   <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
   <!--element ui 样式表-->
-  <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"/>
+  <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
   <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
   <link th:href="@{/css/supplier-center/order/remarks-add-pay.css(v=${version})}" rel="stylesheet" type="text/css">
   <template th:replace="components/analysis"></template>

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

@@ -6,7 +6,7 @@
   <template th:replace="components/head-link"></template>
   <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
   <!--element ui 样式表-->
-  <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"/>
+  <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
   <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
   <link th:href="@{/css/supplier-center/order/remarks-add.css(v=${version})}" rel="stylesheet" type="text/css">
   <template th:replace="components/analysis"></template>

src/main/resources/templates/supplier-center/order/remarks-details.html

@@ -6,7 +6,7 @@
   <template th:replace="components/head-link"></template>
   <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
   <!--element ui 样式表-->
-  <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"/>
+  <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
   <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
   <link th:href="@{/css/supplier-center/order/remarks-details.css(v=${version})}" rel="stylesheet" type="text/css">
   <template th:replace="components/analysis"></template>

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

@@ -7,7 +7,7 @@
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/supplier-center/order/settlement.css(v=${version})}" rel="stylesheet" type="text/css">
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"/>
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
     <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
     <template th:replace="components/analysis"></template>
 </head>
@@ -185,6 +185,7 @@
                             :small="false"
                             @current-change="handleCurrentChange"
                             :current-page="listQuery.pageNum"
+                            :page-size="listQuery.pageSize"
                             :layout="layout"
                             :total="total"
                     >

src/main/resources/templates/supplier-center/shop/freight.html

@@ -7,8 +7,6 @@
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/supplier-center/shop/freight.css(v=${version})}" rel="stylesheet" type="text/css">
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"/>
-    <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
     <template th:replace="components/analysis"></template>
 </head>
 <body>
@@ -37,13 +35,13 @@
                             <div class="freight-list-title">
                                 <div class="list-name">{{ freight.name }}</div>
                                 <div class="list-right">
-                                    <span class="none">最后编辑时间：{{ freight.endTime }}</span>
+                                    <span class="none">最后编辑时间：{{ freight.addTime }}</span>
                                     <span class="copy"><a href="JavaScript:void(0);" @click="handleCopy(freight)">复制模板</a> |</span>
                                     <span><a href="JavaScript:void(0);" @click="handleEdit(freight)">修改</a> | </span>
                                     <span><a href="JavaScript:void(0);" @click="handleDele(freight)">删除</a></span>
                                 </div>
                             </div>
-                            <el-table :data="freight.list"
+                            <el-table :data="freight.freightRuleList"
                                       border
                                       :highlight-current-row="false"
                                       :cell-style="tableCellStyle"
@@ -51,194 +49,35 @@
                             >
                                 <el-table-column label="配送地区" align="center" prop="areas" >
                                     <template slot-scope="{row}">
-                                        {{ row.areas}}
+                                        {{ row.areaTax}}
                                     </template>
                                 </el-table-column>
                                 <el-table-column label="运费" align="center" prop="text" width="350">
                                     <template slot-scope="{row}">
-                                        {{ row.text}}
+                                        {{ row.ruleTax}}
                                     </template>
                                 </el-table-column>
 
                             </el-table>
                         </div>
-                        <div class="pagination">
-                            <el-pagination
-                                    background
-                                    :small="false"
-                                    @current-change="handleCurrentChange"
-                                    :current-page="listQuery.pageNum"
-                                    :layout="layout"
-                                    :total="total"
-                            >
-                            </el-pagination>
-                        </div>
                     </div>
                     <div  class="empty" v-else>
                         <img src="/img/supplier/icon-freight-empty@2x.png">
                         <div class="msg"><p>暂无任何运费模板</p></div>
                     </div>
-                    <!--运费模板弹窗-->
-                    <el-dialog title="创建运费模板" :visible.sync="dialogFormVisible" :close-on-click-modal="false" :close-on-press-escape="false"  width="750px">
-                        <div class="el-form-content">
-                            <el-form ref="dataForm" :rules="rules" :model="freightTemp" label-position="right" label-width="0">
-                                <el-row :gutter="24" class="box-row" style="margin-bottom: 10px;margin-left: 0;margin-right: 0;">
-                                    <span style="font-weight: bold;">模板名称:</span>
-                                </el-row>
-                                <el-form-item style="margin-left: 0;margin-bottom: 10px;">
-                                    <el-input v-model="freightTemp.name" placeholder="请输入模板名称"  maxlength="30"></el-input>
-                                </el-form-item>
-                                <el-row :gutter="24" class="box-row" style="margin-bottom: 10px;margin-left: 0;margin-right: 0;">
-                                    <span style="font-weight: bold;">设置运费:</span>
-                                    <span style="color: #F94B4B;">（注意：未设置的其他省市默认包邮）</span>
-                                </el-row>
-                                <el-form-item style="margin-bottom: 10px;">
-                                    <div class="el-form-list" v-for="(freight,index) in freightTemp.freightRuleList" :key="index">
-                                        <div class="el-form-list-title">
-                                            运费规则{{index+1}}
-                                            <div class="el-form-close" v-if="index>0" @click="handleDelRole(index)"><i class="el-icon-close"></i></div>
-                                        </div>
-                                        <div class="el-form-list-roles rol3">
-                                            <div class="el-form-role3">
-                                                <template v-if="freight.areaTax">
-                                                    <div class="el-form-role3-ns">
-                                                        <span style="color: #333333;">{{ freight.areaTax }}</span>
-                                                    </div>
-                                                    <el-button plain size="mini" @click="changeFreightAreas('edit',freight,index)">修改省市</el-button>
-                                                </template>
-                                                <template  v-else>
-                                                    <div class="el-form-role3-ns">
-                                                        <span style="color: #9AA5B5;">对应地区</span>
-                                                    </div>
-                                                    <el-button plain size="mini" @click="sittingFreightAreas('add',freight,index)">选择省市</el-button>
-                                                </template>
-                                            </div>
-                                        </div>
-                                        <div class="el-form-list-roles">
-                                            <div class="el-form-role5">
-                                                <template v-if="freight.ruleTax">
-                                                    <div class="el-form-role5-ns">
-                                                        <span style="color: #333333;">{{ freight.ruleTax }}</span>
-                                                    </div>
-                                                    <el-button plain size="mini" @click="changeFreightRole(freight,index)">修改规则</el-button>
-                                                </template>
-                                                <template  v-else>
-                                                    <div class="el-form-role5-ns">
-                                                        <span style="color: #9AA5B5;">对应运费规则</span>
-                                                    </div>
-                                                    <el-button plain size="mini" @click="sittingFreightRole(freight,index)">设置规则</el-button>
-                                                </template>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </el-form-item>
-                                <div class="el-form-add" v-if="freightTemp.freightRuleList.length < 10">
-                                    <el-button type="text" icon="el-icon-circle-plus-outline" @click="handleAddRole" style="padding: 0 0;">添加运费规则</el-button>
-                                </div>
-                            </el-form>
-                        </div>
-                        <div slot="footer" class="dialog-footer">
-                            <el-button @click="handleCanleFreights">取消</el-button>
-                            <el-button type="primary" @click="handleConfirmShelf">确定</el-button>
-                        </div>
-                    </el-dialog>
-                    <!--设置省市区弹窗-->
-                    <el-dialog title="选择省市" :visible.sync="areasFormVisible" :close-on-click-modal="false" :close-on-press-escape="false" width="750px">
-                        <div class="el-form-content">
-                            <el-row :gutter="24" class="box-row" style="margin-bottom: 10px;margin-left: 0;margin-right: 0;">
-                                <div class="el-area-wup" v-for="(area,index) in areaData" :key="index">
-                                    <div class="el-area-box">
-                                        <div class="el-area-checkbox">
-                                            <el-checkbox :indeterminate="area.isIndeterminate" v-model="area.checked" :disabled="disabled(area)" @change="handleCheckAllChange(area,$event)"></el-checkbox>
-                                            <div class="el-area-label" :class="disabled(area) ? 'disabled' : ''">{{ area.name }}</div>
-                                        </div>
-                                    </div>
-                                    <div class="el-area-box">
-                                        <div class="el-area-checkbox" v-for="city in area.provinceList" :key="city">
-                                            <el-checkbox :indeterminate="city.isIndeterminate" v-model="city.checked"  :disabled="disabled(city)" @change="handleCheckedCitiesChange(city,area,$event)"></el-checkbox>
-                                            <div class="el-area-label" :class="disabled(city) ? 'disabled' : ''" @click="handleUrbanForm(city,area,disabled(city))">
-                                                {{ city.name }}
-                                                ({{ city.checkedCities.length }}/{{ city.cityList.length }})
-                                                <i class="el-icon-arrow-right"></i>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </el-row>
-                        </div>
-                        <div slot="footer" class="dialog-footer">
-                            <el-button @click="handleCanleAreas">取消</el-button>
-                            <el-button type="primary" @click="handleConfirmAreas">确定</el-button>
-                        </div>
-                    </el-dialog>
-                    <!--设置市区弹窗-->
-                    <el-dialog :title="cityUrbanForm.name" :visible.sync="urbanFormVisible" :close-on-click-modal="false" :close-on-press-escape="false" width="750px" style="margin: 100px auto;">
-                        <el-row :gutter="24" class="box-row" style="margin-bottom: 10px;margin-left: 0;margin-right: 0;">
-                            <div class="el-area-wup">
-                                <div class="el-area-box">
-                                    <div class="el-area-checkbox">
-                                        <el-checkbox :indeterminate="cityUrbanForm.isIndeterminate" v-model="cityUrbanForm.checked" :disabled="disabled(cityUrbanForm)" @change="handleUrbanChange">全选</el-checkbox>
-                                    </div>
-                                </div>
-                                <div class="el-area-box">
-                                    <div class="el-area-checkbox" v-for="urban in cityUrbanForm.cityList" :key="urban">
-                                        <el-checkbox :indeterminate="urban.isIndeterminate" v-model="urban.checked" :disabled="disabled(urban)" @change="handleCheckedUrbanChange(urban,$event)">{{ urban.name }}</el-checkbox>
-                                    </div>
-                                </div>
-                            </div>
-                        </el-row>
-                        <div slot="footer" class="dialog-footer">
-                            <el-button @click="urbanFormVisible = false">取消</el-button>
-                            <el-button type="primary" @click="handleConfirmUrban">确定</el-button>
-                        </div>
-                    </el-dialog>
-                    <!--运费规则弹窗-->
-                    <el-dialog title="运费规则" :visible.sync="rulesFormVisible" :close-on-click-modal="false" :close-on-press-escape="false" width="750px" style="margin: 100px auto;">
-                        <el-form ref="ruleForm" :rules="rules" :model="freightRulesForm" label-position="right" label-width="0">
-                            <el-row :gutter="24" class="box-row" style="margin-bottom: 10px;margin-left: 0;margin-right: 0;">
-                                <span style="font-weight: bold;">运费方式:</span>
-                                <span>固定运费</span>
-                            </el-row>
-                            <el-row :gutter="24" class="box-row" style="margin-bottom: 10px;margin-left: 0;margin-right: 0;">
-                                <span style="font-weight: bold;">运费金额:</span>
-                            </el-row>
-                            <el-form-item prop="freightAmount" :rules="rules.freightAmount" style="margin-left: 0;">
-                                <el-input v-model="freightRulesForm.freightAmount">
-                                    <template slot="append">元</template>
-                                </el-input>
-                            </el-form-item>
-                            <el-row :gutter="24" class="box-row" style="margin-bottom: 10px;margin-left: 0;margin-right: 0;">
-                                <span>
-                                    <el-checkbox v-model="freightRulesForm.checked" @change="handleFreightFreeType"></el-checkbox>
-                                    指定条件包邮
-                                </span>
-                            </el-row>
-                            <div class="box-row-col" v-if="freightRulesForm.checked">
-                                <el-row :gutter="24" class="box-row" style="margin-bottom: 10px;margin-left: 0;margin-right: 0;">
-                                    <el-radio v-model="freightRulesForm.freeCondition" :label="0">满足件数</el-radio>
-                                    <el-radio v-model="freightRulesForm.freeCondition" :label="1">满足金额</el-radio>
-                                </el-row>
-                                <el-row :gutter="24" class="box-row" style="margin-bottom: 10px;margin-left: 0;margin-right: 0;" v-if="freightRulesForm.freeCondition === 0">
-                                    满
-                                    <el-input v-model="freightRulesForm.productNum" style="width: 180px">
-                                        <template slot="append">件</template>
-                                    </el-input>
-                                    可包邮
-                                </el-row>
-                                <el-row :gutter="24" class="box-row" style="margin-bottom: 10px;margin-left: 0;margin-right: 0;"  v-if="freightRulesForm.freeCondition === 1">
-                                    满
-                                    <el-input v-model="freightRulesForm.allAmount" style="width: 180px">
-                                        <template slot="append">元</template>
-                                    </el-input>
-                                    可包邮
-                                </el-row>
-                            </div>
-                        </el-form>
-                        <div slot="footer" class="dialog-footer">
-                            <el-button @click="rulesFormVisible = false">取消</el-button>
-                            <el-button type="primary" @click="handleConfirmRoles">确定</el-button>
-                        </div>
-                    </el-dialog>
+                    <template th:replace="supplier-center/components/freight-dialog"></template>
+                </div>
+                <div class="pagination">
+                    <el-pagination
+                            background
+                            :small="false"
+                            @current-change="handleCurrentChange"
+                            :current-page="listQuery.pageNum"
+                            :page-size="listQuery.pageSize"
+                            :layout="layout"
+                            :total="total"
+                    >
+                    </el-pagination>
                 </div>
             </div>
         </div>

src/main/resources/templates/supplier-center/shop/goods.html

@@ -7,7 +7,7 @@
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/supplier-center/shop/goods.css(v=${version})}" rel="stylesheet" type="text/css">
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"/>
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
     <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
     <template th:replace="components/analysis"></template>
 </head>
@@ -264,6 +264,7 @@
                             :small="false"
                             @current-change="handleCurrentChange"
                             :current-page="listQuery.pageNum"
+                            :page-size="listQuery.pageSize"
                             :layout="layout"
                             :total="total"
                     >

src/main/resources/templates/supplier-center/shop/release.html

@@ -425,33 +425,31 @@
                                 <div class="release-input">
                                     <div class="release-props">
                                         <label class="release-radio">
-                                            <input type="radio" name="byFlag" v-model="releaseParams.byFlag" value="0"  @click="radioChangeByFlag">
+                                            <input type="radio" name="freePostFlag" v-model="releaseParams.freePostFlag" :value="0"  @click="radioChangeByFlag">
                                             <i class="icon mIcon">包邮</i>
                                         </label>
                                         <label class="release-radio">
-                                            <input type="radio" name="byFlag" v-model="releaseParams.byFlag" value="1" checked @click="radioChangeByFlag">
+                                            <input type="radio" name="freePostFlag" v-model="releaseParams.freePostFlag" :value="1" checked @click="radioChangeByFlag">
                                             <i class="icon mIcon">使用运费模板</i>
                                         </label>
                                         <label class="release-radio">
-                                            <input type="radio" name="byFlag" v-model="releaseParams.byFlag" value="2" checked @click="radioChangeByFlag">
+                                            <input type="radio" name="freePostFlag" v-model="releaseParams.freePostFlag" :value="2" checked @click="radioChangeByFlag">
                                             <i class="icon mIcon">到付</i>
                                         </label>
                                     </div>
                                 </div>
-                                <div class="release-tips" v-show="vShow_byFlag">{{fromMessage}}</div>
                             </div>
-                            <div class="release-from clear" v-if="releaseParams.byFlag === '1'">
+                            <div class="release-from clear" v-if="releaseParams.freePostFlag === 1">
                                 <div class="release-label"><span class="star">*</span>选择模板:</div>
                                 <div class="release-input">
                                     <div class="release-props">
                                         <div class="release-select">
-                                            <el-select v-model="releaseParams.freightsTemp" placeholder="请选择" style="width: 320px;">
+                                            <el-select v-model="releaseParams.freightTemplateId" placeholder="请选择" style="width: 320px;">
                                                 <el-option
-                                                        v-for="item in options"
-                                                        :key="item.value"
-                                                        :label="item.label"
-                                                        :value="item.value"
-                                                        :disabled="item.disabled">
+                                                        v-for="freight in freightOptions"
+                                                        :key="freight.value"
+                                                        :label="freight.name"
+                                                        :value="freight.id">
                                                 </el-option>
                                             </el-select>
                                         </div>
@@ -463,11 +461,12 @@
                                         </div>
                                     </div>
                                 </div>
+                                <div class="release-tips" v-show="vShow_freePostFlag">{{fromMessage}}</div>
                                 <div class="release-input-add">
                                     <el-button type="primary" @click="handleAddFreight">新增运费模板</el-button>
                                 </div>
-                                <div class="release-tips" v-show="vShow_byFlag">{{fromMessage}}</div>
                             </div>
+                            <template th:replace="supplier-center/components/freight-dialog"></template>
                             <div class="release-from clear">
                                 <div class="from-button secondbtn">
                                     <a href="javascript: void(0);" class="btn prev" @click="PrevStep">上一步</a>
@@ -551,11 +550,11 @@
                                 <div class="release-input">
                                     <div class="release-props">
                                         <label class="release-radio">
-                                            <input type="radio" name="byFlag" v-model="releaseParams.newProductType" value="1"  @click="radioChangeNewvalidFlag">
+                                            <input type="radio" name="newProductType" v-model="releaseParams.newProductType" value="1"  @click="radioChangeNewvalidFlag">
                                             <i class="icon mIcon">参与</i>
                                         </label>
                                         <label class="release-radio">
-                                            <input type="radio" name="byFlag" v-model="releaseParams.newProductType" value="2" checked @click="radioChangeNewvalidFlag">
+                                            <input type="radio" name="newProductType" v-model="releaseParams.newProductType" value="2" checked @click="radioChangeNewvalidFlag">
                                             <i class="icon mIcon">不参与</i>
                                         </label>
                                     </div>
@@ -597,6 +596,7 @@
 <script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/lib/ckeditor5-new/ckeditor.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/shop/mixins/freightMixins.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/shop/mixins/getInfoMixins.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/shop/mixins/checkeMixins.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/shop/mixins/releaseMixins.js(v=${version})}"></script>

src/main/resources/templates/supplier_login/index.html

@@ -16,7 +16,7 @@
     <link th:href="@{/css/supplier-login/login.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
     <link th:href="@{/css/supplier-login/login-h5.css(v=${version})}" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css" />
     <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css" />
     <link rel="stylesheet" href="https://unpkg.com/vant@2.12/lib/index.css" />

src/main/resources/templates/supplier_login/text_info.html

@@ -15,7 +15,7 @@
     <link th:href="@{/css/supplier-login/text_info.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
     <link th:href="@{/css/supplier-login/login-h5.css(v=${version})}" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css" />
     <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css" />
     <link rel="stylesheet" href="https://unpkg.com/vant@2.12/lib/index.css" />

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

@@ -6,7 +6,7 @@
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"/>
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
     <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
     <link th:href="@{/css/user-center/order/detail.css(v=${version})}" rel="stylesheet" type="text/css">
     <template th:replace="components/analysis"></template>

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

@@ -6,7 +6,7 @@
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"/>
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
     <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
     <link th:href="@{/css/user-center/order/orderlist.css(v=${version})}" rel="stylesheet" type="text/css">
     <template th:replace="components/analysis"></template>

src/main/resources/templates/user-center/order/remarks-add-pay.html

@@ -6,7 +6,7 @@
   <template th:replace="components/head-link"></template>
   <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
   <!--element ui 样式表-->
-  <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"/>
+  <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
   <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
   <link th:href="@{/css/user-center/order/remarks-add-pay.css(v=${version})}" rel="stylesheet" type="text/css">
   <template th:replace="components/analysis"></template>