运费V1.0.4

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

@@ -280,7 +280,7 @@
 .cmbeans-alert-content-bean .icon-text{font-weight: bold;}
 .cmbeans-alert-content-tips{width: 100%;height: 5.6vw;line-height: 5.6vw;margin-top: 4vw;box-sizing: border-box;display: flex;flex-direction: column;align-items: center;}
 .cmbeans-alert-content-tips .tips{width: 27.2vw;height: 5.6vw;background-color: rgba(226, 91, 28, 0.1);border-radius: 2.8vw;line-height: 5.6vw;font-size: 2.6vw;color: #FF5B00;text-align: center;padding: 0 1.2vw;}
-#globalHead{position: sticky !important; top: 0 !important; left: 0 !important; z-index: 9999;}
+#globalHead{position: sticky !important; top: 0 !important; left: 0 !important; z-index: 1200;}
 
 /*ross宣传弹窗*/
 .ross-banner-fiexd{width: 100%;height: 113.8vw;position: fixed;z-index: 999;background: url("/img/ross/ross-bg@2x.png");left: 0;right: 0;bottom: -113.8vw;box-sizing: border-box;padding: 40vw 0 4vw 0;background-size: cover;animation: all 1s;}

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

@@ -3,10 +3,10 @@ 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 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}
+    .freight-content{width: 100%;min-height: 652px; box-sizing: border-box;padding:40px 56px 0 56px;background: #fff;}
     .freight-main{width: 100%; min-height: 600px; float: left;box-sizing: border-box; background: #fff;}
     .freight-list{width: 100%;height: auto;margin-bottom: 32px;margin-top: 24px;}
     .freight-list-title{width: 100%;height: 57px;border-top: 1px solid #B8BFCA;border-right: 1px solid #B8BFCA;border-left: 1px solid #B8BFCA;box-sizing: border-box;padding: 0 16px;}
@@ -39,7 +39,6 @@ li{list-style: none}
     .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;}
@@ -51,18 +50,45 @@ li{list-style: none}
 
 /*移动*/
  @media screen and (max-width:768px) {
-    .head-top{padding: 3vw 0;background: #fff;}
-    .head-top .form-row{margin:1.5vw 0;color: #627386;float: left;width: 50%;}
-    .state {width: 92% !important;margin: 0 2vw;}
-    #newBtn{float: left;margin: 2vw;}
-    .goods-main{margin-top: 2.7vw; padding-bottom: 15vw;}
-    .goods-tips{width: 100%;box-sizing: border-box;margin-top: 14px;}
-    .goods-tips .end-tips{width:100%;height:auto;background: #FFF3F3;border-radius: 2px;color: #F94B4B;font-size: 3.2vw;box-sizing: border-box;padding: 2vw;line-height: 5vw;}
-    .goods-tips .end-tips .tips{display:none;}
-    .empty{box-sizing:border-box;padding:15vw 0;text-align:center;color:#4A4F58;line-height:8vw;font-size:3.4vw;background: #fff;}
-    .empty img{width:40vw;height:40vw;}
-    .empty a{color:#FF5B00;}
+    table, td, th{border: none;}
+    .head-top{padding: 2vw 0;background: #fff;}
+    .freight-content{width: 100%;min-height: 150vw; box-sizing: border-box;padding:3vw;background: #fff;padding-bottom: 12vw;}
+    .freight-main{width: 100%; min-height: 100vw; float: left;box-sizing: border-box; background: #fff;}
+    .freight-list{width: 100%;height: auto;margin: 3vw 0;}
+    .freight-list-title{width: 100%;height: 18vw;border-top: 1px solid #B8BFCA;border-right: 1px solid #B8BFCA;border-left: 1px solid #B8BFCA;box-sizing: border-box;padding: 0 2vw;}
+    .freight-list-title .list-name{float: left;font-size: 3.4vw;color: #333333;line-height: 8vw;font-weight: bold;width: 100%;}
+    .freight-list-title .list-right{float: left;font-size: 3.2vw;line-height: 8vw;color: #666666;width: 100%; }
+    .freight-list-title .list-right span.none{color: #9AA5B5;margin-right: 2vw;}
+    .freight-list-title .list-right span.copy a{color: #2398FF;}
+    .el-table--border::after,.el-table--group::after,.el-table::before {background-color: #B8BFCA !important;}
+    .el-table--border,.el-table--group {border-color: #B8BFCA !important;}
+    .freight-main .empty{width: 100%;height: 60px;line-height: 60px;text-align: center;float: left;margin-top: 20px;}
+    .freight-main .empty p{font-size: 14px;color: #333;}
+    .freight-main .empty p a{color: #FF5B00;text-decoration: underline;margin: 0 3px;}
     footer{display: none;}
     .pagination{width: 100%;min-height: 2vw;position: fixed;bottom: 0;left: 0;background: #FFFFFF;z-index: 99;padding: 2vw;box-sizing: border-box;}
     .el-button--primary.is-plain{background:#FFE6DC !important;color: #FF5B00 !important;border-color: #FF5B00 !important;}
+
+    /* 运费模板弹窗 */
+    .el-message{min-width: 280px !important;}
+    .el-dialog__body{padding: 1vw 2vw !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 2vw;}
+    .box-row.el-row span{font-size: 3.2vw;}
+    .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-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: auto;background: #F7F7F7;box-sizing: border-box;padding: 16px;}
  }

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

@@ -182,7 +182,6 @@ div{box-sizing: border-box;}
     .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;}
@@ -308,5 +307,27 @@ div{box-sizing: border-box;}
     .select-main  .option-main{border: .27vw solid rgba(184,191,202,.5)}
     .select-main  .option-main  .option{padding:0 2.7vw;color: #9aa5b5}
     .selected.mIcon:before{width: 5.3vw;height: 5.3vw;background-position: -51.2vw -.27vw;position: absolute;top: 4vw;right: 2.7vw}
+    /* 运费模板弹窗 */
+    .el-message{min-width: 280px !important;}
+    .el-dialog__body{padding: 1vw 2vw !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 2vw;}
+    .box-row.el-row span{font-size: 3.2vw;}
+    .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-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: auto;background: #F7F7F7;box-sizing: border-box;padding: 16px;}
     footer{display: none;}
 }

src/main/resources/static/js/common/ajax.service.js

@@ -43,7 +43,7 @@ var Http = {
                 if(res.code=== -99){
                     CAIMEI.Storage.clear();
                     setBeforeUrl();
-                    // location.href = "/login.html";
+                    location.href = "/login.html";
                 }else{
                     def.resolve(res);
                 }

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

@@ -83,7 +83,7 @@ var myGoods = new Vue({
                     _this.$message({ message: '操作成功',type: 'success'});
                     _this.getList()
                 }else{
-                    CAIMEI.Alert(response.msg, '确定');
+                    _this.$alert(response.msg, '提示', { confirmButtonText: '确定'});
                 }
             })
         },

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

@@ -1,5 +1,10 @@
 <!--运费模板弹窗-->
-<el-dialog title="创建运费模板" :visible.sync="dialogFormVisible" :close-on-click-modal="false" :close-on-press-escape="false"  width="750px">
+<el-dialog title="创建运费模板"
+           :visible.sync="dialogFormVisible"
+           :close-on-click-modal="false"
+           :close-on-press-escape="false"
+           :width="isPC ? '750px' : '85vw'"
+>
   <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;">
@@ -63,7 +68,12 @@
   </div>
 </el-dialog>
 <!--设置省市区弹窗-->
-<el-dialog title="选择省市" :visible.sync="areasFormVisible" :close-on-click-modal="false" :close-on-press-escape="false" width="750px">
+<el-dialog title="选择省市"
+           :visible.sync="areasFormVisible"
+           :close-on-click-modal="false"
+           :close-on-press-escape="false"
+           :width="isPC ? '750px' : '85vw'"
+>
   <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">
@@ -92,7 +102,13 @@
   </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-dialog :title="cityUrbanForm.name"
+           :visible.sync="urbanFormVisible"
+           :close-on-click-modal="false"
+           :close-on-press-escape="false"
+           :width="isPC ? '750px' : '85vw'"
+           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">
@@ -113,7 +129,13 @@
   </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-dialog title="运费规则"
+           :visible.sync="rulesFormVisible"
+           :close-on-click-modal="false"
+           :close-on-press-escape="false"
+           :width="isPC ? '750px' : '85vw'"
+           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>

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

@@ -52,7 +52,7 @@
                                         {{ row.areaTax}}
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="运费" align="center" prop="text" width="350">
+                                <el-table-column label="运费" align="center" prop="text" :width="isPC ? '350' :'100'">
                                     <template slot-scope="{row}">
                                         {{ row.ruleTax}}
                                     </template>