Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/StoreDesign/minititle.vue

 <style>
-  .mimitBody{
+  .mimititle .mimitBody{
     padding:20px;
     background-color: #fff;
     margin:10px 0 20px 0;
     display:table;
     width:100%;
   }
-  .mimitList{
+  .mimititle .mimitList{
     margin-bottom:15px;
     display: flex;
     flex-direction: row;
   }
-  .mimitBody .el-tag{
+  .mimititle .mimitBody .el-tag{
     min-width: 120px;
     padding-right: 50px;
   }
@@ -143,51 +143,4 @@
       this.getList();
     }
   };
-
 </script>
\ No newline at end of file
-<style>
-  .navNavIconImg {
-    width: 80px;
-    height: 80px;
-  }
-
-  .navNavIconImg NavIconImg {
-    width: 100%;
-    height: 100%;
-  }
-
-  .mimititle .blue {
-    color: #409EFF;
-
-  }
-
-  .mimititle .content .searchInput {
-    border: 1px solid #DCDFE6;
-    border-radius: 4px;
-  }
-
-  .mimititle .content .searchInput .el-input__inner {
-    border: none;
-    outline: none;
-    height: 30px;
-    line-height: 30px;
-  }
-
-  .mimititle .content .searchInput {
-    line-height: normal;
-    display: inline-table;
-    width: 100%;
-    border-collapse: separate;
-    border-spacing: 0;
-    width: 250px;
-    margin-right: 20px;
-  }
-
-  .mimititle .content {
-    background: #fff;
-    margin-top: 10px;
-    padding: 20px;
-    box-sizing: border-box;
-  }
-
-</style>

src/components/setup/addFreightRule.vue

-<style>
+<style scoped>
   .addFreightRule .form-box {
     background: #fff;
     padding: 20px 50% 20px 0;
@@ -12,6 +12,23 @@
     display: inline-block;
     font-size: 13px;
   }
+  .addFreightRule .gez_list{
+    width: 650px;
+    margin-bottom: 12px;
+    padding: 20px;
+    border: 1px solid #EBEEF5;
+    background-color: #FFF;
+    color: #303133;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+
+  }
+  .addFreightRule .imgstyle{
+    width: 32px;
+    height: 32px;
+    margin: 0 5px;
+  }
 </style>
 <template>
   <div class="addFreightRule">
@@ -22,17 +39,29 @@
               <el-input v-model="msg.RulesName"/>
             </el-form-item>
             <el-form-item label="计费方式">
-              <el-radio-group v-model="msg.LogisticsType" >
+              <el-radio-group v-model="msg.ChargeMode" >
                 <el-radio :label="1">按重计费</el-radio>
                 <el-radio :label="2">按件计费</el-radio>
               </el-radio-group>
             </el-form-item>
             <el-form-item label="运费规则"  class="is-required">
-                <span style="color: #409EFF;font-size: 14px;cursor: pointer;" @click="dialogFormVisible=true">+新增规则</span>
+              <div class="gez_list el-card" v-for="(item,index) in msg.Detail" :key="index">
+                <div style="width: 500px;">
+                  <span>首重/件(克/个):{{item.First}} <span>/</span> 首费(元):{{item.FirstPrice}} <span>/</span>续重/件(克/个):{{item.Second}}<span>/</span>续费(元){{item.SecondPrice}}</span>
+                </div>
+                <div style="width: 110px;display: flex;flex-direction: row;justify-content: space-around">
+                  <el-tooltip class="item" effect="dark" content="编辑" placement="top" >
+                    <img src="../../assets/img/setup/edit.png" alt="" class="imgstyle">
+                  </el-tooltip>
+                  <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                    <img src="../../assets/img/setup/del.png" alt="" class="imgstyle" @click="delete_b">
+                  </el-tooltip>
+                </div>
+              </div>
+                <span style="color: #409EFF;font-size: 14px;cursor: pointer;" @click="addOf">+新增规则</span>
             </el-form-item>
           </el-form>
 
-
         </div>
         <el-button type="primary" style="margin: 12px 0 " @click="preserve">保存</el-button>
         <el-button style="margin: 12px 0 " @click="cancel">取消</el-button>
@@ -41,56 +70,65 @@
 
     <!--新增规则弹窗-->
       <el-dialog title="新增规则" :visible.sync="dialogFormVisible" >
-        <el-form :model="msg.Detail" :rules="rules">
+        <el-form :model="Detail" :rules="rules">
           <el-row :gutter="0">
             <el-col :span="11">
               <el-form-item label="首重(克)：" label-width="100px" style="padding: 0px 1rem;" prop="MallName2">
-                <el-input v-model="msg.Detail.First" />
+                <el-input v-model="Detail.First" />
               </el-form-item>
             </el-col>
             <el-col :span="11">
               <el-form-item label="首费（元）" label-width="100px" style="padding: 0px 1rem;" >
-                <el-input v-model="msg.Detail.FirstPrice" />
+                <el-input v-model="Detail.FirstPrice" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="0">
             <el-col :span="11">
               <el-form-item label="续重(克)：" label-width="100px" style="padding: 0px 1rem;" >
-                <el-input v-model="msg.Detail.Second" />
+                <el-input v-model="Detail.Second" />
               </el-form-item>
             </el-col>
             <el-col :span="11">
               <el-form-item label="续费（元）" label-width="100px" style="padding: 0px 1rem;" >
-                <el-input v-model="msg.Detail.SecondPrice" />
+                <el-input v-model="Detail.SecondPrice" />
               </el-form-item>
             </el-col>
           </el-row>
+
+          <el-form-item label="地区选择">
+            <region_Choice @event1="change($event)"></region_Choice>
+          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="dialogFormVisible = false">取 消</el-button>
-          <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
+          <el-button type="primary" @click="Addto">确 定</el-button>
         </div>
       </el-dialog>
   </div>
 </template>
 
 <script>
+  import region_Choice from './view/regionChoice'
     export default {
         name: "addFreightRule",
         data(){
           return{
             msg:{
-              ID:"",
+              ID:0,
               RulesName:'',
-              jifei:1,
+              // jifei:1,
+              ChargeMode:1,
+              Detail:[],
+            },
+
             Detail:{
+              ID:0,
               First:0,
               FirstPrice:0,
               Second:0,
               SecondPrice:0,
-              }
-
+              List:[],
             },
             dialogFormVisible:false,
             rules: {
@@ -105,6 +143,9 @@
             },
           }
       },
+      components:{
+        region_Choice,
+      },
       methods:{
         cancel(){
           this.$router.go(-1);//返回上一层
@@ -114,11 +155,73 @@
         },
         addRule(){
 
+        },
+        change(data){
+          let List=[];
+          for(let i=0 ;i<data.length;i++){
+              if(data[i].ischeckAll==true && data[i].indeterminate==false){ //全选的情况 只穿省的ID
+                List.push({'ID':0,'RegionId':data[i].ID})
               }
+              if(data[i].indeterminate==true){//传市的ID
+
+                if(data[i].hasOwnProperty('cityList')==true){
+                  let citylist = data[i].cityList;
+                  for(let j= 0;j<citylist.length;j++){
+                    if(citylist[j].ischeckAll==true && citylist[j].indeterminate==false){
+                      List.push({'ID':0,'RegionId':citylist[j].ID})
+                    }
+                    if(citylist[j].indeterminate==true){
+                      if(citylist[j].hasOwnProperty('areaList')==true){
+                        let areaList = citylist[j].areaList;
+                        for(let z= 0;z<areaList.length;z++){
+                          if(areaList[z].ischeckAll==true){
+                            List.push({'ID':0,'RegionId':areaList[z].ID})
+                          }
+                        }
+                      }
+
                     }
                   }
+
+                }
+              }
+          }
+          this.Detail.List = List
+        },
+        delete_b(){
+
+        },
+        addOf(){
+          this.Detail.First=0;
+          this.Detail.FirstPrice=0;
+          this.Detail.Second=0;
+          this.Detail.SecondPrice=0;
+          this.Detail.List=[];
+          this.dialogFormVisible=true
+
+        },
+        Addto(){
+          this.dialogFormVisible=false
+          this.Detail.First=parseInt(this.Detail.First);
+          this.Detail.FirstPrice=parseInt(this.Detail.FirstPrice);
+          this.Detail.Second=parseInt(this.Detail.Second);
+          this.Detail.SecondPrice=parseInt(this.Detail.SecondPrice);
+
+          this.msg.Detail.push(this.Detail)
+
+        },
+        preserve(){
+          this.apipost("/api/MallBase/AddOrUpdateLogisticsRules",this.msg , res => {
+            if (res.data.resultCode == 1) {
+
+            } else {
+              this.Info(res.data.message);
+            }
+          })
+        }
+      },
+
+    }
 </script>
 
-<style scoped>
 
-</style>

src/router/index.js

@@ -115,6 +115,13 @@ export default new Router({
           name: 'basicSetUp',
           component: resolve => require(['@/components/setup/basicSetUp'], resolve),
         },
+        // 物流设置 规则设置
+        {
+          path: '/ruleSetup',
+          name: 'ruleSetup',
+          component: resolve => require(['@/components/setup/ruleSetup'], resolve),
+        },
+
         //店铺管理 导航图标
         {
           path: '/navigationIcon',