diff --git a/manager/src/config/index.js b/manager/src/config/index.js
index 8f1ce647..851ed1eb 100644
--- a/manager/src/config/index.js
+++ b/manager/src/config/index.js
@@ -17,10 +17,10 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    common: 'https://common-api.pickmall.cn',
+    common: 'http://192.168.0.103:8890/',
     buyer: 'https://buyer-api.pickmall.cn',
     seller: 'https://store-api.pickmall.cn',
-    manager: 'https://admin-api.pickmall.cn'
+    manager: 'http://192.168.0.103:8887'
   },
   api_prod: {
     common: 'https://common-api.pickmall.cn',
diff --git a/manager/src/views/goods/goods-review/index.vue b/manager/src/views/goods/goods-review/index.vue
index 3797b23b..c837f4ae 100644
--- a/manager/src/views/goods/goods-review/index.vue
+++ b/manager/src/views/goods/goods-review/index.vue
@@ -53,7 +53,7 @@
         <div class="right-container">
           <div class="border-b">{{ infoData.goodsName }}</div>
           <div class="border-b">
-            <div class="div-height"> 店铺名称：{{ infoData.sellerName }}</div>
+            <div class="div-height"> 店铺名称：{{ infoData.storeName }}</div>
             <div class="div-height"> 订单号：{{ infoData.orderNo }}</div>
           </div>
 
diff --git a/manager/src/views/home/home.vue b/manager/src/views/home/home.vue
index 147b1f0e..2802c29e 100644
--- a/manager/src/views/home/home.vue
+++ b/manager/src/views/home/home.vue
@@ -72,11 +72,11 @@
           <div class="counts">{{$store.state.notices.refund|| 0}}</div>
           <div>待审核售后</div>
         </div>
-        <div class="todo-item" @click="navigateTo('distribution')">
+        <div class="todo-item" >
           <div class="counts">{{$store.state.notices.distributionCash|| 0}}</div>
           <div>待审核分销提现</div>
         </div>
-        <div class="todo-item" @click="navigateTo('billList')">
+        <div class="todo-item" @click="navigateTo('accountStatementBill')">
           <div class="counts">{{$store.state.notices.waitPayBill|| 0}}</div>
           <div>待审核分账</div>
         </div>
diff --git a/manager/src/views/lili-components/multiple-region.vue b/manager/src/views/lili-components/multiple-region.vue
deleted file mode 100644
index 3ac9b970..00000000
--- a/manager/src/views/lili-components/multiple-region.vue
+++ /dev/null
@@ -1,127 +0,0 @@
-<template>
-  <Modal :mask-closable="false" :value="switched" v-model="switched" title="选择地址" @on-ok="submit" @on-cancel="cancel">
-    <div class="flex">
-      <Spin size="large" fix v-if="spinShow"></Spin>
-      <Tree ref="tree" class="tree" :data="data" expand-node show-checkbox multiple></Tree>
-    </div>
-  </Modal>
-</template>
-<script>
-import { getAllCity } from "@/api/index";
-export default {
-  data() {
-    return {
-      switched: false, // 控制模态框显隐
-      spinShow: false, // 加载状态
-      data: [], // 地区数据
-      selectedWay: [], // 选择的地区
-      callBackData: "", // 打开组件的回显数据
-    };
-  },
-  mounted() {
-    this.init();
-  },
-  methods: {
-    cancel() {
-      this.switched = false;
-      // this.$emit("close",true)
-    },
-    open(val) {
-      if (val) {
-        this.callBackData = val;
-        this.data = JSON.parse(JSON.stringify(this.data));
-        val.areaId.split(",").forEach((ids) => {
-          this.data.forEach((item) => {
-            if (item.id == ids) {
-              item.selected = true;
-
-            }
-            item.children &&
-              item.children.forEach((child) => {
-                if (child.id == ids) {
-                  child.checked = true;
-                }
-              });
-          });
-        });
-
-        console.log(this.data);
-      }
-
-      this.switched = true;
-    },
-
-    submit() {
-      // 筛选出省市
-      let list = this.$refs.tree.getCheckedAndIndeterminateNodes();
-      let sort = [];
-      list.forEach((item) => {
-        item.selectedList = [];
-        if (item.level == "province") {
-          sort.push({
-            ...item,
-          });
-        }
-        sort.forEach((sortItem, sortIndex) => {
-          if (item.level != "province" && sortItem.id == item.parentId) {
-            sortItem.selectedList.push({
-              ...item,
-            });
-          }
-        });
-      });
-
-      this.$emit(
-        "selected",
-        list.filter((item) => {
-          return item.level == "province";
-        })
-      );
-
-      this.cancel();
-    },
-
-    init() {
-      getAllCity().then((res) => {
-        if (res.result) {
-          res.result.forEach((item) => {
-            item.children.forEach((child) => {
-              child.title = child.name;
-            });
-
-            let data = {
-              title: item.name,
-
-              ...item,
-            };
-            this.data.push(data);
-            this.selectedWay.push({ name: data.title, id: data.id });
-          });
-        }
-      });
-    },
-  },
-};
-</script>
-<style scoped lang="scss">
-.flex {
-  display: flex;
-  position: relative;
-}
-.tree {
-  flex: 2;
-}
-.form {
-  flex: 8;
-}
-.button-list {
-  margin-left: 80px;
-  > * {
-    margin: 0 4px;
-  }
-}
-/deep/ .ivu-modal-body {
-  height: 400px !important;
-  overflow: auto;
-}
-</style>
diff --git a/manager/src/views/order/after-order/afterSaleOrder.vue b/manager/src/views/order/after-order/afterSaleOrder.vue
index 0373eb7d..3fa356f1 100644
--- a/manager/src/views/order/after-order/afterSaleOrder.vue
+++ b/manager/src/views/order/after-order/afterSaleOrder.vue
@@ -48,10 +48,10 @@
                   style="width: 200px"
                 ></DatePicker>
               </Form-item>
-              <Form-item label="商家名称" prop="sellerName">
+              <Form-item label="商家名称" prop="storeName">
                 <Input
                   type="text"
-                  v-model="searchForm.sellerName"
+                  v-model="searchForm.storeName"
                   placeholder="请输入商家名称"
                   clearable
                   style="width: 200px"
@@ -143,7 +143,7 @@
           orderSn: "",
           memberName: "",
           serviceStatus: "",
-          sellerName:"",
+          storeName:"",
           sn: "",
 
         },
@@ -151,7 +151,7 @@
         form: {
           // 添加或编辑表单对象初始化数据
           sn: "",
-          sellerName: "",
+          storeName: "",
           startTime: "",
           endTime: "",
           billPrice: "",
diff --git a/manager/src/views/order/flow/paymentLog.vue b/manager/src/views/order/flow/paymentLog.vue
index cd247e4a..528c3eba 100644
--- a/manager/src/views/order/flow/paymentLog.vue
+++ b/manager/src/views/order/flow/paymentLog.vue
@@ -2,35 +2,41 @@
   <div class="search">
     <Row>
       <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Form-item label="订单号" prop="sn">
-                <Input type="text" v-model="searchForm.sn" placeholder="订单/交易号" clearable style="width: 200px"/>
-              </Form-item>
-              <Form-item label="付款状态" prop="orderStatus">
-                <Select v-model="searchForm.payStatus" placeholder="请选择" clearable style="width: 200px">
-                  <Option value="UNPAID">未付款</Option>
-                  <Option value="PAID">已付款</Option>
-                </Select>
-              </Form-item>
-              <Form-item label="支付时间">
-                <DatePicker v-model="searchForm" type="datetimerange" format="yyyy-MM-dd" clearable
-                            @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-            </Form>
-          </Row>
-          <Row class="padding-row">
-            <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
-                   @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
-                  @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
-                  size="small" show-total show-elevator show-sizer></Page>
-          </Row>
-        </Card>
+      <Card>
+        <Row @keydown.enter.native="handleSearch">
+          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+            <Form-item label="订单号" prop="sn">
+              <Input type="text" v-model="searchForm.sn" placeholder="订单/交易号" clearable style="width: 200px" />
+            </Form-item>
+            <Form-item label="付款状态" prop="orderStatus">
+              <Select v-model="searchForm.payStatus" placeholder="请选择" clearable style="width: 200px">
+                <Option value="UNPAID">未付款</Option>
+                <Option value="PAID">已付款</Option>
+              </Select>
+            </Form-item>
+            <Form-item label="支付方式" prop="orderStatus">
+              <Select v-model="searchForm.paymentMethod" placeholder="请选择" clearable style="width: 200px">
+                <Option value="WECHAT">微信</Option>
+                <Option value="ALIPAY">支付宝</Option>
+                <Option value="WALLET">余额</Option>
+                <Option value="BANK_TRANSFER">银行转账</Option>
+                <Option value="">暂未付款</Option>
+              </Select>
+            </Form-item>
+            <Form-item label="支付时间">
+              <DatePicker v-model="searchForm" type="datetimerange" format="yyyy-MM-dd" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
+            </Form-item>
+            <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          </Form>
+        </Row>
+        <Row class="padding-row">
+          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+        </Row>
+        <Row type="flex" justify="end" class="page">
+          <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+            size="small" show-total show-elevator show-sizer></Page>
+        </Row>
+      </Card>
       </Col>
     </Row>
   </div>
@@ -68,16 +74,57 @@ export default {
         {
           title: "支付方式",
           key: "paymentMethod",
-          width: 100,
+          width: 120,
+          align: "center",
           render: (h, params) => {
             if (params.row.paymentMethod === "WECHAT") {
-              return h("div", [h("span", {}, "微信")]);
+              return h("div", [
+                h(
+                  "Tag",
+                  {
+                    props: {
+                      color: "green",
+                    },
+                  },
+                  "微信"
+                ),
+              ]);
             } else if (params.row.paymentMethod === "ALIPAY") {
-              return h("div", [h("span", {}, "支付宝")]);
+              return h("div", [
+                h(
+                  "Tag",
+                  {
+                    props: {
+                      color: "blue",
+                    },
+                  },
+                  "支付宝"
+                ),
+              ]);
             } else if (params.row.paymentMethod === "WALLET") {
-              return h("div", [h("span", {}, "余额支付")]);
+              return h("div", [
+                h(
+                  "Tag",
+                  {
+                    props: {},
+                  },
+                  "余额支付"
+                ),
+              ]);
             } else if (params.row.paymentMethod === "BANK_TRANSFER") {
-              return h("div", [h("span", {}, "银行转帐")]);
+              return h("div", [
+                h(
+                  "Tag",
+                  {
+                    props: {
+                      color: "orange",
+                    },
+                  },
+                  "银行转帐"
+                ),
+              ]);
+            } else {
+              return h("div", [h("Tag", {}, "暂未付款")]);
             }
           },
         },
@@ -85,19 +132,24 @@ export default {
           title: "第三方流水",
           key: "receivableNo",
           minWidth: 130,
+          render: (h, params) => {
+            return h("div", [
+              h("span", {}, params.row.receivableNo || "暂无流水号"),
+            ]);
+          },
         },
         {
           title: "客户端",
           key: "clientType",
           width: 130,
           render: (h, params) => {
-            if (params.row.clientType === "WECHAT_MP") {
+            if (params.row.clientType === "WECHAT_MP" || params.row.clientType === '小程序') {
               return h("div", [h("span", {}, "小程序")]);
             } else if (params.row.clientType === "APP") {
               return h("div", [h("span", {}, "APP")]);
             } else if (params.row.clientType === "PC") {
               return h("div", [h("span", {}, "PC网页")]);
-            } else if (params.row.clientType === "H5") {
+            } else if (params.row.clientType === "H5" || params.row.clientType === 'wap') {
               return h("div", [h("span", {}, "移动端")]);
             }
           },
@@ -106,6 +158,11 @@ export default {
           title: "支付时间",
           key: "paymentTime",
           width: 200,
+          render: (h, params) => {
+            return h("div", [
+              h("span", {}, params.row.paymentTime || "暂无支付时间"),
+            ]);
+          },
         },
         {
           title: "订单金额",
@@ -204,7 +261,7 @@ export default {
       });
       this.total = this.data.length;
       this.loading = false;
-    }
+    },
   },
   mounted() {
     this.init();
diff --git a/manager/src/views/seller/shop/shopAuditList.vue b/manager/src/views/seller/shop/shopAuditList.vue
index fc6332ec..701f5f30 100644
--- a/manager/src/views/seller/shop/shopAuditList.vue
+++ b/manager/src/views/seller/shop/shopAuditList.vue
@@ -99,6 +99,15 @@
             key: "storeAddressPath",
             width: 300,
             sortable: false,
+            render: (h, params) => {
+            return h(
+              "Tag",
+              {
+
+              },
+              params.row.storeAddressPath ||  "暂未填写"
+            );
+          },
           },
           {
             title: "是否自营",
diff --git a/manager/src/views/seller/shop/shopList.vue b/manager/src/views/seller/shop/shopList.vue
index 4872459f..05961284 100644
--- a/manager/src/views/seller/shop/shopList.vue
+++ b/manager/src/views/seller/shop/shopList.vue
@@ -111,7 +111,16 @@ export default {
           title: "店铺地址",
           key: "storeAddressPath",
           width: 300,
-          tooltip: true
+          tooltip: true,
+          render: (h, params) => {
+            return h(
+              "Tag",
+              {
+
+              },
+              params.row.storeAddressPath ||  "暂未填写"
+            );
+          },
         },
         {
           title: "是否自营",
diff --git a/seller/src/store/modules/app.js b/seller/src/store/modules/app.js
index a0c3d292..8e896575 100644
--- a/seller/src/store/modules/app.js
+++ b/seller/src/store/modules/app.js
@@ -6,6 +6,7 @@ import Vue from 'vue';
 
 const app = {
     state: {
+        shipTemplates:"",
         styleStore:"", //移动端楼层装修中选择风格存储
         loading: false, // 全局加载动画
         added: false, // 加载路由标识
@@ -30,7 +31,7 @@ const app = {
                 path: '',
                 name: 'home_index'
             }
-        ], 
+        ],
         // 面包屑数组 左侧菜单
         menuList: [],
         routers: [
diff --git a/seller/src/views/lili-components/multiple-region.vue b/seller/src/views/lili-components/multiple-region.vue
index b73b2c96..34b78ed7 100644
--- a/seller/src/views/lili-components/multiple-region.vue
+++ b/seller/src/views/lili-components/multiple-region.vue
@@ -7,7 +7,7 @@
   </Modal>
 </template>
 <script>
-import { getChildRegion, getAllCity } from "@/api/index";
+import { getAllCity } from "@/api/index";
 export default {
   data() {
     return {
@@ -22,46 +22,84 @@ export default {
     this.init();
   },
   methods: {
+    /**
+     * 关闭
+     */
     cancel() {
       this.switched = false;
-      // this.$emit("close",true)
-    },
-    open(val) {
-      if (val) {
-        this.callBackData = val;
-        this.data = JSON.parse(JSON.stringify(this.data));
-        val.areaId.split(",").forEach((ids) => {
-          this.data.forEach((item) => {
-            if (item.id == ids) {
-              item.selected = true;
 
-            }
-            item.children &&
-              item.children.forEach((child) => {
+      // 关闭的时候所有数据设置成disabled为true
+      this.data.forEach((item) => {
+        this.$set(item, "disabled", false);
+        item.children.forEach((child) => {
+          this.$set(child, "disabled", false);
+        });
+      });
+    },
+
+    /**
+     * 打开地图选择器
+     * @param {val} 回调的数据
+     * @param {index} 当前操作的运费模板的索引
+     */
+    open(val, index) {
+      if (val) {
+        //已选中的地址
+        let checkedData = this.$store.state.shipTemplate;
+
+        // 禁止选中的地址
+        let disabledData = checkedData.filter((item, i) => {
+          return i != index;
+        });
+
+        disabledData.forEach((dis) => {
+          // 循环出已经选中的地址id
+          dis.areaId.split(",").forEach((ids) => {
+            // 循环出省份
+            this.data.forEach((item) => {
+              // 如果当前省份下市区全部选中则选中该省份
+              if (dis.selectedAll) {
+                dis.area.split(",").forEach((area) => {
+                  if (area == item.name) {
+                    this.$set(item, "disabled", true);
+                  }
+                });
+              }
+              // 将市区继续循环
+              item.children.forEach((child, childIndex) => {
+                // 判断当前市区是否是已选中状态
                 if (child.id == ids) {
-                  child.checked = true;
+                  this.$set(child, "disabled", true);
                 }
               });
+            });
           });
         });
       }
-
-      this.switched = true;
+      this.switched ? (this.switched = true) : (this.switched = true);
     },
 
+    /**
+     * 提交并筛选出省市
+     */
     submit() {
       // 筛选出省市
       let list = this.$refs.tree.getCheckedAndIndeterminateNodes();
+
       let sort = [];
-      list.forEach((item) => {
+      list.forEach((item, i) => {
         item.selectedList = [];
-        if (item.level == "province") {
+        item.selectedAll = false;
+        // 筛选出当前的省份
+        if (item.level == "province" && !item.disabled) {
           sort.push({
             ...item,
           });
         }
+
+        // 筛选出当前选中的市
         sort.forEach((sortItem, sortIndex) => {
-          if (item.level != "province" && sortItem.id == item.parentId) {
+          if (item.level != "province" && sortItem.id == item.parentId && !item.disabled) {
             sortItem.selectedList.push({
               ...item,
             });
@@ -69,12 +107,24 @@ export default {
         });
       });
 
-      this.$emit(
-        "selected",
-        list.filter((item) => {
-          return item.level == "province";
-        })
-      );
+      // 判断如果当前省是否全选
+      this.data.forEach((whether) => {
+        sort.forEach((item) => {
+          // 如果当前省匹配
+          if (
+            item.id == whether.id &&
+            item.selectedList.length == whether.children.length
+          ) {
+            // 给一个全选子级的标识符
+            item.selectedList.forEach((child) => {
+              this.$set(child, "selectedAll", true);
+            });
+            this.$set(item, "selectedAll", true);
+          }
+        });
+      });
+
+      this.$emit("selected", sort);
 
       this.cancel();
     },
@@ -93,8 +143,10 @@ export default {
               ...item,
             };
             this.data.push(data);
+
             this.selectedWay.push({ name: data.title, id: data.id });
           });
+          console.log(this.data);
         }
       });
     },
diff --git a/seller/src/views/shop/ship/shipTemplate.vue b/seller/src/views/shop/ship/shipTemplate.vue
index 60541d26..47ca9744 100644
--- a/seller/src/views/shop/ship/shipTemplate.vue
+++ b/seller/src/views/shop/ship/shipTemplate.vue
@@ -2,27 +2,28 @@
   <div class="search">
     <Row>
       <Col>
-        <Card>
-          <Row>
-            <Button @click="refresh" >刷新</Button>
-            <Button @click="add" type="primary">添加</Button>
-          </Row>
-          <Tabs @on-click="handleClickType" v-model="currentTab" style="margin-top: 10px">
-            <TabPane label="运费模板" name="INFO">
-              <table class="ncsc-default-table order m-b-30" :key="index" v-for="(item,index) in shipInfo">
-                <tbody>
+      <Card>
+        <Row>
+          <Button @click="refresh">刷新</Button>
+          <Button @click="add" type="primary">添加</Button>
+        </Row>
+        <Tabs @on-click="handleClickType" v-model="currentTab" style="margin-top: 10px">
+          <TabPane label="运费模板" name="INFO">
+            <table class="ncsc-default-table order m-b-30" :key="index" v-for="(item,index) in shipInfo">
+              <tbody>
                 <tr>
                   <td class="sep-row" colspan="20"></td>
                 </tr>
                 <tr>
-                  <th colspan="20"><h3>{{item.name}}</h3>
+                  <th colspan="20">
+                    <h3>{{item.name}}</h3>
                     <span class="fr m-r-5">
-                  <time style="margin-right: 20px" title="最后编辑时间">
-                    <i class="icon-time"></i>{{item.updateTime}}
-                  </time>
-                   <Button @click="edit(item)" type="info" >修改</Button>
-                   <Button @click="remove(item.id)" type="error">删除</Button>
-                 </span>
+                      <time style="margin-right: 20px" title="最后编辑时间">
+                        <i class="icon-time"></i>{{item.updateTime}}
+                      </time>
+                      <Button @click="edit(item)" type="info">修改</Button>
+                      <Button @click="remove(item.id)" type="error">删除</Button>
+                    </span>
                   </th>
                 </tr>
                 <tr>
@@ -54,28 +55,28 @@
                     <span class="yuan">￥</span><span class="integer">{{children.continuedPrice}}</span>
                   </td>
                 </tr>
-                </tbody>
+              </tbody>
 
-              </table>
+            </table>
 
-            </TabPane>
-            <TabPane v-if="csTab" :label=title :name=operation>
-              <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
-                <FormItem label="模板名称" prop="name">
-                  <Input v-model="form.name" maxlength="10" clearable style="width: 20%"/>
-                </FormItem>
-                <FormItem label="计价方式" prop="pricingMethod">
-                  <RadioGroup type="button" button-style="solid" v-model="form.pricingMethod">
-                    <Radio label="WEIGHT">按重量</Radio>
-                    <Radio label="NUM">按件数</Radio>
-                  </RadioGroup>
-                </FormItem>
-                <FormItem label="详细设置">
-                  <div class="ncsu-trans-type" data-delivery="TRANSTYPE">
-                    <div class="entity">
-                      <div class="tbl-except">
-                        <table cellspacing="0" class="ncsc-default-table">
-                          <thead>
+          </TabPane>
+          <TabPane v-if="csTab" :label=title :name=operation>
+            <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+              <FormItem label="模板名称" prop="name">
+                <Input v-model="form.name" maxlength="10" clearable style="width: 20%" />
+              </FormItem>
+              <FormItem label="计价方式" prop="pricingMethod">
+                <RadioGroup type="button" button-style="solid" v-model="form.pricingMethod">
+                  <Radio label="WEIGHT">按重量</Radio>
+                  <Radio label="NUM">按件数</Radio>
+                </RadioGroup>
+              </FormItem>
+              <FormItem label="详细设置">
+                <div class="ncsu-trans-type" data-delivery="TRANSTYPE">
+                  <div class="entity">
+                    <div class="tbl-except">
+                      <table cellspacing="0" class="ncsc-default-table">
+                        <thead>
                           <tr style="border-bottom: 1px solid #ddd;">
                             <th class="w10"></th>
                             <th class="tl">运送到</th>
@@ -86,96 +87,72 @@
                             <th class="w110">续费</th>
                             <th class="w150">操作</th>
                           </tr>
-                          </thead>
-                          <tbody>
+                        </thead>
+                        <tbody>
                           <tr class="bd-line" data-group="n1" v-for="(item,index) in form.freightTemplateChildList">
                             <td></td>
                             <td class="tl cell-area">
-                                <span class="area-group">
-                                <p style="display:inline-block">{{item.area}}</p></span>
+                              <span class="area-group">
+                                <p style="display:inline-block;white-space:pre;">{{item.area}}</p>
+                              </span>
                             </td>
                             <td></td>
                             <td>
-                              <Input class="text w40" type="text" v-model="item.firstCompany" maxlength="3" clearable/>
+                              <Input class="text w40" type="text" v-model="item.firstCompany" maxlength="3" clearable />
                             </td>
                             <td>
-                              <Input class="text w60" type="text" v-model="item.firstPrice" maxlength="6" clearable/><em
-                              class="add-on">
-                              元
-                            </em>
+                              <Input class="text w60" type="text" v-model="item.firstPrice" maxlength="6" clearable /><em class="add-on">
+                                元
+                              </em>
                             </td>
                             <td>
-                              <Input class="text w40" type="text" v-model="item.continuedCompany" maxlength="6"
-                                     clearable/>
+                              <Input class="text w40" type="text" v-model="item.continuedCompany" maxlength="6" clearable />
                             </td>
                             <td>
-                              <Input class="text w60" type="text" v-model="item.continuedPrice" maxlength="6"
-                                     clearable/><em class="add-on">
-                              元
-                            </em>
+                              <Input class="text w60" type="text" v-model="item.continuedPrice" maxlength="6" clearable /><em class="add-on">
+                                元
+                              </em>
                             </td>
                             <td class="nscs-table-handle">
-                              <Button
-                                @click="editRegion(item)"
-                                type="info"
-                                size="small"
-                                style="margin-bottom: 5px"
-                              >修改
+                              <Button @click="editRegion(item,index)" type="info" size="small" style="margin-bottom: 5px">修改
                               </Button>
-                              <Button
-                                @click="removeTemplateChildren(index)"
-                                :loading="submitLoading"
-                                type="error"
-                                size="small"
-                                style="margin-bottom: 5px"
-                              >删除
+                              <Button @click="removeTemplateChildren(index)" :loading="submitLoading" type="error" size="small" style="margin-bottom: 5px">删除
                               </Button>
                             </td>
                           </tr>
-                          </tbody>
-                        </table>
-                      </div>
-                      <div class="tbl-attach p-5">
-                        <div class="div-error" v-if="saveError">
-                          <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
-                          <Icon type="ios-information-circle-outline"/>
-                          指定地区城市为空或指定错误
-                          <Icon type="ios-information-circle-outline"/>
-                          首费应输入正确的金额
-                          <Icon type="ios-information-circle-outline"/>
-                          续费应输入正确的金额
-                          <Icon type="ios-information-circle-outline"/>
-                          首(续)件(重)费应输入大于0的整数
-                        </div>
-                        <Button
-                          @click="addShipTemplateChildren(index)"
-                          :loading="submitLoading"
-                          type="info"
-                          size="small"
-                          icon="ios-create-outline"
-                          style="margin-bottom: 5px"
-                        >为指定城市设置运费模板
-                        </Button>
+                        </tbody>
+                      </table>
+                    </div>
+                    <div class="tbl-attach p-5">
+                      <div class="div-error" v-if="saveError">
+                        <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
+                        <Icon type="ios-information-circle-outline" />
+                        指定地区城市为空或指定错误
+                        <Icon type="ios-information-circle-outline" />
+                        首费应输入正确的金额
+                        <Icon type="ios-information-circle-outline" />
+                        续费应输入正确的金额
+                        <Icon type="ios-information-circle-outline" />
+                        首(续)件(重)费应输入大于0的整数
                       </div>
+
                     </div>
                   </div>
-                </FormItem>
-                <Form-item>
-                  <Button
-                    @click="handleSubmit"
-                    :loading="submitLoading"
-                    type="primary"
-                    style="margin-right:5px"
-                  >保存
-                  </Button>
-                </Form-item>
-              </Form>
-            </TabPane>
-          </Tabs>
-        </Card>
+                </div>
+              </FormItem>
+              <Form-item>
+                <Button @click="addShipTemplateChildren(index)" :loading="submitLoading" icon="ios-create-outline" >为指定城市设置运费模板
+                </Button>
+                <Button @click="handleSubmit" :loading="submitLoading" type="primary" style="margin-right:5px">保存
+                </Button>
+              </Form-item>
+            </Form>
+          </TabPane>
+        </Tabs>
+      </Card>
       </Col>
     </Row>
-    <multiple-region ref="region" @selected="handleSelect"  @closed="handleClose">
+    <multiple-region ref="region" @selected="handleSelect" @closed="handleClose">
 
     </multiple-region>
 
@@ -183,401 +160,439 @@
 </template>
 
 <script>
-  import * as API_Shop from "@/api/shops";
-  import multipleRegion from "@/views/lili-components/multiple-region";
+import * as API_Shop from "@/api/shops";
+import multipleRegion from "@/views/lili-components/multiple-region";
 
+export default {
+  name: "shipTemplate",
+  components: {
+    multipleRegion,
+  },
 
-  export default {
-    name: "shipTemplate",
-    components: {
-      multipleRegion
+  data() {
+    return {
+      selectedIndex:0, //选中的地址模板下标
+      item: "", //运费模板子模板
+      shipInfo: {}, // 运费模板数据
+      title: "添加运费模板", // 模态框标题
+      operation: "add", // 操作状态
+      currentTab: "", // 当前模板tab
+      saveError: false, // 是否显示错误提示
+      csTab: false, // 添加运费模板显示
+      form: {
+        // 添加或编辑表单对象初始化数据
+        name: "",
+        pricingMethod: "WEIGHT",
+      },
+      formValidate: {
+        name: [
+          {
+            required: true,
+            message: "请输入模板名称",
+            trigger: "blur",
+          },
+        ],
+        pricingMethod: [
+          // 计费方式
+          {
+            required: true,
+            message: "请选择计费方式",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    init() {
+      this.getData();
     },
-
-    data() {
-      return {
-        item: "", //运费模板子模板
-        shipInfo: {}, // 运费模板数据
-        title: "添加运费模板", // 模态框标题
-        operation: "add", // 操作状态
-        currentTab: "", // 当前模板tab
-        saveError: false, // 是否显示错误提示
-        csTab: false, // 添加运费模板显示
-        form: {
-          // 添加或编辑表单对象初始化数据
-          name: "",
-          pricingMethod: "WEIGHT"
-        },
-        formValidate: {
-          name: [
-            {
-              required: true,
-              message: "请输入模板名称",
-              trigger: "blur",
-            },
-          ],
-          pricingMethod: [ // 计费方式
-            {
-              required: true,
-              message: "请选择计费方式",
-              trigger: "blur",
-            },
-          ],
-        },
-      };
-    },
-    methods: {
-      init() {
+    //切换tabPane
+    handleClickType(v) {
+      if (v == "INFO") {
         this.getData();
-      },
-      //切换tabPane
-      handleClickType(v) {
-        if (v == "INFO") {
-          this.getData();
-          this.csTab = false
-        }
-      },
-      //添加运费模板
-      add() {
-        this.title = "添加运费模板"
-        this.csTab = true
-        this.operation = "ADD"
-        this.currentTab = "ADD"
-        this.saveError = false;
-        this.form = {
-          pricingMethod: "WEIGHT",
-          name: "",
-          freightTemplateChildList: [{
+        this.csTab = false;
+      }
+    },
+    //添加运费模板
+    add() {
+      this.title = "添加运费模板";
+      this.csTab = true;
+      this.operation = "ADD";
+      this.currentTab = "ADD";
+      this.saveError = false;
+      this.form = {
+        pricingMethod: "WEIGHT",
+        name: "",
+        freightTemplateChildList: [
+          {
             area: "",
             areaId: "",
             firstCompany: "1",
             firstPrice: "",
             continuedCompany: "1",
-            continuedPrice: ""
-          }]
+            continuedPrice: "",
+            selectedAll:false
+          },
+        ],
+      };
+    },
+    //修改运费模板
+    edit(item) {
+      this.title = "修改运费模板";
+      this.csTab = true;
+      this.operation = "EDIT";
+      this.currentTab = "EDIT";
+      this.saveError = false;
+      //给form赋值
+      this.form = item;
+    },
+    //选择地区
+    editRegion(item,index) {
+      this.selectedIndex = index
+      this.item = item;
 
-        }
+      this.$store.state.shipTemplate =  this.form.freightTemplateChildList
+      this.$refs.region.open(item,index);
+    },
+    //刷细数据
+    refresh() {
+      this.csTab = false;
+      this.operation = "INFO";
+      this.currentTab = "INFO";
+      this.getData();
+    },
+    //运费模板数据
+    getData() {
+      API_Shop.getShipTemplate().then((res) => {
+        this.shipInfo = res.result;
+      });
+    },
 
-      },
-      //修改运费模板
-      edit(item) {
-        this.title = "修改运费模板"
-        this.csTab = true
-        this.operation = "EDIT"
-        this.currentTab = "EDIT"
-        this.saveError = false;
-        //给form赋值
-        this.form = item
-      },
-      //选择地区
-      editRegion(item){
-        this.item = item
+    /**
+     * 选择地址回调
+     */
+    handleSelect(v) {
+      console.log(v);
+      let area = "";
+      let areaId = "";
+      if (v != "") {
+        v.forEach((child) => {
+          if (child.selectedList != "") {
+            // 只显示省份
 
-        this.$refs.region.open(item)
-      },
-      //刷细数据
-      refresh() {
-        this.csTab = false
-        this.operation = "INFO"
-        this.currentTab = "INFO"
-        this.getData()
-      },
-      //运费模板数据
-      getData() {
-        API_Shop.getShipTemplate().then((res) => {
-          this.shipInfo = res.result
-        });
-      },
-
-      handleSelect(v) {
-        let area = ""
-        let areaId= ""
-        if(v != ""){
-          v.forEach((child, index) => {
-            if(child.selectedList!=""){
-              child.selectedList.forEach((child, index) => {
-                area+=child.name +","
-                areaId+=child.id +","
-              })
+            if(child.selectedAll ){
+                area += child.name + ","
+                this.form.freightTemplateChildList[this.selectedIndex].selectedAll = true
             }
-          })
-        }
-        this.item.area = area
-        this.item.areaId= areaId
-      },
-      //添加或者修改运费模板
-      handleSubmit() {
-        const headers = {
-          "Content-Type": "application/json;charset=utf-8"
-        }
 
-        this.$refs.form.validate((valid) => {
-          const regNumber = /^\+?[1-9][0-9]*$/;
-          const regMoney = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/
-          if (valid) {
-            //校验运费模板详细信息
-            for (let i = 0; i < this.form.freightTemplateChildList.length; i++) {
-              if (this.form.freightTemplateChildList[i].area == ""
-                || this.form.freightTemplateChildList[i].firstCompany == ""
-                || this.form.freightTemplateChildList[i].firstPrice == ""
-                || this.form.freightTemplateChildList[i].continuedCompany == ""
-                || this.form.freightTemplateChildList[i].continuedPrice == "") {
-                this.saveError = true;
-                return
-              }
-              if (regNumber.test(this.form.freightTemplateChildList[i].firstCompany) == false
-                || regNumber.test(this.form.freightTemplateChildList[i].continuedCompany) == false
-                || regMoney.test(this.form.freightTemplateChildList[i].firstPrice) == false
-                || regMoney.test(this.form.freightTemplateChildList[i].continuedPrice) == false) {
-                this.saveError = true;
+            child.selectedList.forEach((son) => {
+              if (child.selectedAll) {
+                areaId += son.id + ",";
                 return;
+              } else {
+                // 显示城市
+                area += son.name + ",";
+                areaId += son.id + ",";
               }
-            }
-            if (this.operation == "ADD") {
-              API_Shop.addShipTemplate(this.form, headers).then((res) => {
-                if (res.success) {
-                  this.$Message.success("新增成功");
-                  this.operation = "INFO"
-                  this.currentTab = "INFO"
-                  this.csTab = false
-                  this.getData()
-                }
-              });
-            } else {
-              API_Shop.editShipTemplate(this.form.id, this.form, headers).then((res) => {
-                if (res.success) {
-                  this.$Message.success("新增成功");
-                  this.operation = "INFO"
-                  this.currentTab = "INFO"
-                  this.csTab = false
-                  this.getData()
-                }
-              });
-            }
-          }
-        })
-      },
-      //添加子模板
-      addShipTemplateChildren() {
-        const params = {
-          area: '',
-          areaId: "",
-          firstCompany: '1',
-          firstPrice: '',
-          continuedCompany: '1',
-          continuedPrice: ''
-        }
-        this.form.freightTemplateChildList.push(params)
-      },
-      //删除一个子模板
-      removeTemplateChildren(index) {
-        if (Object.keys(this.form.freightTemplateChildList).length == 1) {
-          this.$Message.success("必须保留一个子模板");
-          return
-        }
-        this.form.freightTemplateChildList.splice(index, 1);
-      },
-      //删除运费模板
-      remove(id) {
-        this.$Modal.confirm({
-          title: "确认删除",
-          // 记得确认修改此处
-          content: "您确认要删除此运费模板 ?",
-          loading: true,
-          onOk: () => {
-            API_Shop.deleteShipTemplate(id).then((res) => {
-              if (res.success) {
-                this.$Message.success("删除成功");
-              }
-              this.$Modal.remove();
-              this.getData();
             });
-
-
           }
         });
       }
-
-
+      this.item.area = area;
+      this.item.areaId = areaId;
     },
-    mounted() {
-      this.init();
+    //添加或者修改运费模板
+    handleSubmit() {
+      const headers = {
+        "Content-Type": "application/json;charset=utf-8",
+      };
+
+      this.$refs.form.validate((valid) => {
+        const regNumber = /^\+?[1-9][0-9]*$/;
+        const regMoney = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
+        if (valid) {
+          //校验运费模板详细信息
+          for (let i = 0; i < this.form.freightTemplateChildList.length; i++) {
+            if (
+              this.form.freightTemplateChildList[i].area == "" ||
+              this.form.freightTemplateChildList[i].firstCompany == "" ||
+              this.form.freightTemplateChildList[i].firstPrice == "" ||
+              this.form.freightTemplateChildList[i].continuedCompany == "" ||
+              this.form.freightTemplateChildList[i].continuedPrice == ""
+            ) {
+              this.saveError = true;
+              return;
+            }
+            if (
+              regNumber.test(
+                this.form.freightTemplateChildList[i].firstCompany
+              ) == false ||
+              regNumber.test(
+                this.form.freightTemplateChildList[i].continuedCompany
+              ) == false ||
+              regMoney.test(this.form.freightTemplateChildList[i].firstPrice) ==
+                false ||
+              regMoney.test(
+                this.form.freightTemplateChildList[i].continuedPrice
+              ) == false
+            ) {
+              this.saveError = true;
+              return;
+            }
+          }
+          if (this.operation == "ADD") {
+            API_Shop.addShipTemplate(this.form, headers).then((res) => {
+              if (res.success) {
+                this.$Message.success("新增成功");
+                this.operation = "INFO";
+                this.currentTab = "INFO";
+                this.csTab = false;
+                this.getData();
+              }
+            });
+          } else {
+            API_Shop.editShipTemplate(this.form.id, this.form, headers).then(
+              (res) => {
+                if (res.success) {
+                  this.$Message.success("新增成功");
+                  this.operation = "INFO";
+                  this.currentTab = "INFO";
+                  this.csTab = false;
+                  this.getData();
+                }
+              }
+            );
+          }
+        }
+      });
     },
-  };
+    //添加子模板
+    addShipTemplateChildren() {
+      const params = {
+        area: "",
+        areaId: "",
+        firstCompany: "1",
+        firstPrice: "",
+        continuedCompany: "1",
+        continuedPrice: "",
+        selectedAll:false
+      };
+      this.form.freightTemplateChildList.push(params);
+    },
+    //删除一个子模板
+    removeTemplateChildren(index) {
+      if (Object.keys(this.form.freightTemplateChildList).length == 1) {
+        this.$Message.error("必须保留一个子模板");
+        return;
+      }
+      this.form.freightTemplateChildList.splice(index, 1);
+    },
+    //删除运费模板
+    remove(id) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "您确认要删除此运费模板 ?",
+        loading: true,
+        onOk: () => {
+          API_Shop.deleteShipTemplate(id).then((res) => {
+            if (res.success) {
+              this.$Message.success("删除成功");
+            }
+            this.$Modal.remove();
+            this.getData();
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
 </script>
 <style lang="scss" scoped>
-  .ncsc-default-table thead th {
-    line-height: 20px;
-    color: #555;
-    background-color: #FAFAFA;
+.ncsc-default-table thead th {
+  line-height: 20px;
+  color: #555;
+  background-color: #fafafa;
+  text-align: center;
+  height: 20px;
+  padding: 9px 0;
+  border-bottom: solid 1px #ddd;
+}
+
+.ncsc-default-table {
+  line-height: 20px;
+  width: 100%;
+  border-collapse: collapse;
+
+  tbody th {
+    background-color: #fafafa;
+    border: solid #e6e6e6;
+    border-width: 1px 0;
+    padding: 4px 0;
+  }
+
+  tbody td {
+    color: #999;
+    background-color: #fff;
     text-align: center;
-    height: 20px;
-    padding: 9px 0;
-    border-bottom: solid 1px #DDD;
+    padding: 6px 0;
   }
+}
 
-  .ncsc-default-table {
-    line-height: 20px;
-    width: 100%;
-    border-collapse: collapse;
+.order tbody tr td {
+  border-bottom: 1px solid #e6e6e6;
+  vertical-align: top;
+}
 
-    tbody th {
-      background-color: #FAFAFA;
-      border: solid #E6E6E6;
-      border-width: 1px 0;
-      padding: 4px 0;
+.order tbody tr td.bdr {
+  border-right: 1px solid #e6e6e6;
+}
 
-    }
+.order tbody tr th {
+  border: solid 1px #ddd;
+}
 
-    tbody td {
-      color: #999;
-      background-color: #FFF;
-      text-align: center;
-      padding: 6px 0;
-    }
-  }
+.order tbody tr td.sep-row {
+  height: 14px;
+  border: 0;
+}
 
+.w10 {
+  width: 10px !important;
+}
 
-  .order tbody tr td {
-    border-bottom: 1px solid #E6E6E6;
-    vertical-align: top;
-  }
+.tl {
+  text-align: left !important;
+}
 
-  .order tbody tr td.bdr {
-    border-right: 1px solid #E6E6E6;
-  }
+.order tbody tr td.bdl {
+  border-left: 1px solid #e6e6e6;
+}
 
-  .order tbody tr th {
-    border: solid 1px #DDD;
-  }
+.order tbody tr th h3 {
+  font-size: 14px;
+  line-height: 20px;
+  color: #555;
+  vertical-align: middle;
+  display: inline-block;
+  margin: 0 10px;
+}
 
-  .order tbody tr td.sep-row {
-    height: 14px;
-    border: 0;
-  }
+.m-r-5 {
+  margin-right: 5px !important;
+}
 
-  .w10 {
-    width: 10px !important;
-  }
+.fr {
+  float: right !important;
+}
 
-  .tl {
-    text-align: left !important;
-  }
+.m-b-30 {
+  margin-bottom: 10px !important;
+}
 
-  .order tbody tr td.bdl {
-    border-left: 1px solid #E6E6E6;
-  }
+Button {
+  margin: 3px 5px 0px 5px;
+}
 
-  .order tbody tr th h3 {
-    font-size: 14px;
-    line-height: 20px;
-    color: #555;
-    vertical-align: middle;
-    display: inline-block;
-    margin: 0 10px;
-  }
+thead {
+  display: table-header-group;
+  vertical-align: middle;
+  border-color: inherit;
+}
 
-  .m-r-5 {
-    margin-right: 5px !important;
-  }
+tr {
+  display: table-row;
+  vertical-align: inherit;
+  border-color: inherit;
+}
 
-  .fr {
-    float: right !important;
-  }
+caption,
+th {
+  text-align: left;
+}
 
-  .m-b-30 {
-    margin-bottom: 10px !important;
-  }
+.tl {
+  text-align: left !important;
+}
 
-  Button {
-    margin: 3px 5px 0px 5px;
-  }
+colgroup {
+  display: table-column-group;
+}
 
-  thead {
-    display: table-header-group;
-    vertical-align: middle;
-    border-color: inherit;
-  }
+button,
+input,
+select,
+textarea {
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
+}
 
-  tr {
-    display: table-row;
-    vertical-align: inherit;
-    border-color: inherit;
-  }
+.bd-line td {
+  border-bottom: solid 1px #eee;
+}
 
-  caption, th {
-    text-align: left;
-  }
+.w40 {
+  width: 60px !important;
+}
 
-  .tl {
-    text-align: left !important;
-  }
+.w60 {
+  width: 80px !important;
+}
 
-  colgroup {
-    display: table-column-group;
-  }
+Input[type="text"],
+Input[type="password"],
+Input.text,
+Input.password {
+  display: inline-block;
+  min-height: 20px;
+  padding: 10px;
+  border: solid 1px #e6e9ee;
+  outline: 0 none;
+}
 
-  button, input, select, textarea {
-    font-family: inherit;
-    font-size: inherit;
-    line-height: inherit;
-  }
+.add-on {
+  line-height: 28px;
+  background-color: #f6f7fb;
+  vertical-align: top;
+  display: inline-block;
+  text-align: center;
+  width: 30px;
+  height: 30px;
+  border: solid #e6e9ee;
+  border-width: 1px 1px 1px 0;
+}
 
-  .bd-line td {
-    border-bottom: solid 1px #EEE;
-  }
+ncsc-default-table {
+  line-height: 20px;
+  width: 100%;
+  border-collapse: collapse;
+  clear: both;
+}
 
-  .w40 {
-    width: 60px !important;
-  }
+.ncsu-trans-type {
+  background-color: #fff;
+  border: solid #ddd 1px;
+}
 
-  .w60 {
-    width: 80px !important;
-  }
+i,
+cite,
+em {
+  font-style: normal;
+}
 
-  Input[type="text"], Input[type="password"], Input.text, Input.password {
-    display: inline-block;
-    min-height: 20px;
-    padding: 10px;
-    border: solid 1px #E6E9EE;
-    outline: 0 none;
-  }
+.cell-area {
+  width: 50%;
+}
 
-  .add-on {
-    line-height: 28px;
-    background-color: #F6F7Fb;
-    vertical-align: top;
-    display: inline-block;
-    text-align: center;
-    width: 30px;
-    height: 30px;
-    border: solid #E6E9EE;
-    border-width: 1px 1px 1px 0;
-  }
-
-  ncsc-default-table {
-    line-height: 20px;
-    width: 100%;
-    border-collapse: collapse;
-    clear: both;
-  }
-
-  .ncsu-trans-type {
-    background-color: #FFF;
-    border: solid #DDD 1px;
-  }
-
-  i, cite, em {
-    font-style: normal;
-  }
-
-  .cell-area {
-    width: 50%;
-  }
-
-  .div-error {
-    margin-left: 7px;
-    margin-bottom: -8px;
-    font-size: 15px;
-    color: #F00;
-  }
+.div-error {
+  margin-left: 7px;
+  margin-bottom: -8px;
+  font-size: 15px;
+  color: #f00;
+}
 </style>