src/api/modules/mer_admin.js

@@ -16,14 +16,14 @@ export const mer_admin = {
   loginByAccount: (params) => {
     return $http.post(`/auth/login`, {
       ...params,
-            type: 1
+      type: 1,
-        })
+    });
   },
   loginByMobile: (params) => {
     return $http.post(`/merchant-api/auth/sms/login`, {
       ...params,
-            type: 2
+      type: 2,
-        })
+    });
   },
   getYZM(mobile) {
     return $http.get(`/merchant-api/auth/login/code?mobile=${mobile}`);
@@ -50,7 +50,11 @@ export const mer_admin = {
   },
   //商户商品分类
   getProductCategory: () => {
-        return $http.get(`/merchant-api/product/category/list?shopId=${JSON.parse(sessionStorage.getItem('userInfo')).shopId}`);
+    return $http.get(
+      `/merchant-api/product/category/list?shopId=${
+        JSON.parse(sessionStorage.getItem("userInfo")).shopId
+      }`
+    );
   },
   //上架或下架
   putOnShelvesProducts: (data) => {
@@ -66,11 +70,15 @@ export const mer_admin = {
   },
   //获取销售单位
   getSaleUnit: (data) => {
-        return $http.request({ url: `/merchant-api/product/unit/list`, method: 'get', params: data });
+    return $http.request({
+      url: `/merchant-api/product/unit/list`,
+      method: "get",
+      params: data,
+    });
   },
   //文件上传
   uploadFile: () => {
-        return `${window.SITE_CONFIG['baseUrl']}/merchant-api/file/upload`
+    return `${window.SITE_CONFIG["baseUrl"]}/merchant-api/file/upload`;
   },
   //直接获取城市数据
   getCityOptions: () => {
@@ -87,8 +95,8 @@ export const mer_admin = {
   //删除模板
   removeShippingTemplate: (id) => {
     return $http.post(`/merchant-api/shippingTemplates/delete`, {
-            id
+      id,
-        })
+    });
   },
   //更新模板
   updateShippingTemplate: (data) => {
@@ -97,25 +105,25 @@ export const mer_admin = {
   //获取模板分页
   getShippingTemplatePage: (data) => {
     return $http.request({
-            method: 'get',
+      method: "get",
-            url: '/merchant-api/shippingTemplates/page',
+      url: "/merchant-api/shippingTemplates/page",
-            params: data
+      params: data,
-        })
+    });
   },
   //获取配送模板列表
   getShippingTemplateList: (data) => {
     return $http.request({
-            method: 'get',
+      method: "get",
-            url: '/merchant-api/shippingTemplates/list',
+      url: "/merchant-api/shippingTemplates/list",
-            params: data
+      params: data,
-        })
+    });
   },
   //获取模板详情
   getShippingTemplateInfo: (id) => {
     return $http.request({
-            method: 'get',
+      method: "get",
-            url: '/merchant-api/shippingTemplates/detail',
+      url: "/merchant-api/shippingTemplates/list",
-            params: { id }
+      params: { id },
-        })
+    });
-    }
+  },
-}
+};

src/views/modules/logistics-fare/logistics-template/index.vue

@@ -11,12 +11,9 @@
       <div slot="tableTop" class="mb-2">
         <el-form inline>
           <el-form-item label="模板名称：">
-            <el-input
+            <el-input placeholder="请输入模板名称"></el-input>
-              placeholder="请输入模板名称"
-              v-model="searchForm.name"
-            ></el-input>
           </el-form-item>
-          <el-button type="primary" @click="$refs.oTable.reload();">搜索</el-button>
+          <el-button type="primary">搜索</el-button>
         </el-form>
         <el-button type="primary" @click="addFareTemplate"
           >添加运费模板</el-button
@@ -34,26 +31,223 @@ export default {
   data() {
     return {
       dataList: [],
-      searchForm: {
-        name: "",
-      },
     };
   },
   methods: {
     queryList(pageNo, pageSize) {
-      this.$api.mer_admin
+      setTimeout(() => {
-        .getShippingTemplatePage({
+        this.$refs.oTable.complete([
-          pageNumber: pageNo,
+          {
-          pageSize: pageSize,
+            templateName: "运费模板名称（全国包邮）",
-          ...this.searchForm,
+            lastEditTime: "2022-02-15 12:02",
-        })
+            tableData: [
-        .then((res) => {
+              {
-          console.log(res);
+                a: "中国",
-          this.$refs.oTable.complete(res.data.data.data,Number(res.data.data.total));
+                b: 1,
-        })
+                c: 0.0,
-        .catch(err=>{
+                d: 1,
-          this.$refs.oTable.complete(false);
+                e: 0.0,
-        })
+              },
+            ],
+          },
+          {
+            templateName: "运费模板名称（全国包邮）",
+            lastEditTime: "2022-02-15 12:02",
+            tableData: [
+              {
+                a: "中国",
+                b: 1,
+                c: 0.0,
+                d: 1,
+                e: 0.0,
+              },
+            ],
+          },
+          {
+            templateName: "运费模板名称（全国包邮）",
+            lastEditTime: "2022-02-15 12:02",
+            tableData: [
+              {
+                a: "中国",
+                b: 1,
+                c: 0.0,
+                d: 1,
+                e: 0.0,
+              },
+            ],
+          },
+          {
+            templateName: "运费模板名称（全国包邮）",
+            lastEditTime: "2022-02-15 12:02",
+            tableData: [
+              {
+                a: "中国",
+                b: 1,
+                c: 0.0,
+                d: 1,
+                e: 0.0,
+              },
+            ],
+          },
+          {
+            templateName: "运费模板名称（全国包邮）",
+            lastEditTime: "2022-02-15 12:02",
+            tableData: [
+              {
+                a: "中国",
+                b: 1,
+                c: 0.0,
+                d: 1,
+                e: 0.0,
+              },
+            ],
+          },
+          {
+            templateName: "运费模板名称（全国包邮）",
+            lastEditTime: "2022-02-15 12:02",
+            tableData: [
+              {
+                a: "中国",
+                b: 1,
+                c: 0.0,
+                d: 1,
+                e: 0.0,
+              },
+            ],
+          },
+          {
+            templateName: "运费模板名称（全国包邮）",
+            lastEditTime: "2022-02-15 12:02",
+            tableData: [
+              {
+                a: "中国",
+                b: 1,
+                c: 0.0,
+                d: 1,
+                e: 0.0,
+              },
+            ],
+          },
+          {
+            templateName: "运费模板名称（全国包邮）",
+            lastEditTime: "2022-02-15 12:02",
+            tableData: [
+              {
+                a: "中国",
+                b: 1,
+                c: 0.0,
+                d: 1,
+                e: 0.0,
+              },
+            ],
+          },
+          {
+            templateName: "运费模板名称（全国包邮）",
+            lastEditTime: "2022-02-15 12:02",
+            tableData: [
+              {
+                a: "中国",
+                b: 1,
+                c: 0.0,
+                d: 1,
+                e: 0.0,
+              },
+            ],
+          },
+          {
+            templateName: "运费模板名称（全国包邮）",
+            lastEditTime: "2022-02-15 12:02",
+            tableData: [
+              {
+                a: "中国",
+                b: 1,
+                c: 0.0,
+                d: 1,
+                e: 0.0,
+              },
+            ],
+          },
+          {
+            templateName: "运费模板名称（全国包邮）",
+            lastEditTime: "2022-02-15 12:02",
+            tableData: [
+              {
+                a: "中国",
+                b: 1,
+                c: 0.0,
+                d: 1,
+                e: 0.0,
+              },
+            ],
+          },
+          {
+            templateName: "运费模板名称（全国包邮）",
+            lastEditTime: "2022-02-15 12:02",
+            tableData: [
+              {
+                a: "中国",
+                b: 1,
+                c: 0.0,
+                d: 1,
+                e: 0.0,
+              },
+            ],
+          },
+          {
+            templateName: "运费模板名称（全国包邮）",
+            lastEditTime: "2022-02-15 12:02",
+            tableData: [
+              {
+                a: "中国",
+                b: 1,
+                c: 0.0,
+                d: 1,
+                e: 0.0,
+              },
+            ],
+          },
+          {
+            templateName: "运费模板名称（全国包邮）",
+            lastEditTime: "2022-02-15 12:02",
+            tableData: [
+              {
+                a: "中国",
+                b: 1,
+                c: 0.0,
+                d: 1,
+                e: 0.0,
+              },
+            ],
+          },
+          {
+            templateName: "运费模板名称（全国包邮）",
+            lastEditTime: "2022-02-15 12:02",
+            tableData: [
+              {
+                a: "中国",
+                b: 1,
+                c: 0.0,
+                d: 1,
+                e: 0.0,
+              },
+            ],
+          },
+          {
+            templateName: "运费模板名称（全国包邮）",
+            lastEditTime: "2022-02-15 12:02",
+            tableData: [
+              {
+                a: "中国",
+                b: 1,
+                c: 0.0,
+                d: 1,
+                e: 0.0,
+              },
+            ],
+          },
+          
+        ]);
+      }, 1000);
     },
     addFareTemplate() {
       this.$refs.addTemplate.toggle().add();
@@ -66,22 +260,13 @@ export default {
           type: "jsx",
           render: (row) => {
             console.log(row);
-              this.$api.mer_admin.getShippingTemplateInfo(row.id)
+
-              .then(res=>{
-                console.log(res);
-                // this.$set(row,tableData,);
-              })
-              const appointMapper={
-                0:'（全国包邮）',
-                1:'（部分包邮）',
-                2:'（自定义运费）'
-              }
             return (
               <div class="mb-5">
                 <div class="flex justify-between items-center bg-gray-100 px-4">
-                  <div>{row.name}{appointMapper[row.appoint]}</div>
+                  <div>{row.templateName}</div>
                   <div class="flex justify-between items-center">
-                    <div class="mr-5">最后编辑时间：{row.updateTime}</div>
+                    <div class="mr-5">最后编辑时间：{row.lastEditTime}</div>
                     <div>
                       <el-button type="text">复制模板</el-button>
                       <el-button type="text">修改</el-button>

src/views/modules/logistics-fare/logistics-template/popup/add-template.vue

@@ -67,43 +67,6 @@ export default {
   },
   mounted() {},
   methods: {
-    computedCityOptions() {
-      function filterTree(tree, filterArray) {
-        return tree
-          .filter((node) => !filterArray.includes(node.code)) // 过滤掉在数组中的节点
-          .map((node) => {
-            // 递归处理子节点
-            const filteredChildren = filterTree(
-              node.children || [],
-              filterArray
-            );
-
-            // 构建新的节点对象
-            const newNode = {
-              ...node,
-              // 只有当有子节点时才保留 children 属性
-              ...(filteredChildren.length > 0 && {
-                children: filteredChildren,
-              }),
-            };
-
-            return newNode;
-          });
-      }
-      let selectedArray = [];
-      for (let item of this.modalData.shippingTemplatesRegionListAppend) {
-        console.log(item);
-
-        selectedArray = selectedArray.concat(item.cityCodes);
-      }
-      console.log("执行", selectedArray);
-      console.log(
-        "过滤后",
-        filterTree(this.$api.mer_admin.getCityOptions(), selectedArray)
-      );
-
-      return filterTree(this.$api.mer_admin.getCityOptions(), selectedArray);
-    },
     toggle(e) {
       if (this.modalConfig.show == false) {
         this.modalConfig.show = true;
@@ -118,7 +81,7 @@ export default {
         add: (item) => {
           console.log(item);
           this.$nextTick(() => {
-            this.modalData = JSON.parse(JSON.stringify(BASE_DATA));
+            this.modalData = BASE_DATA;
           });
           this.isAdd = true;
         },
@@ -138,8 +101,6 @@ export default {
           prop: "templateName",
           type: "Input",
           maxlength: "30",
-          width: "300px",
-          clearable: true,
           placeholder: "请输入模板名称",
           rules: {
             required: true,
@@ -184,7 +145,6 @@ export default {
             );
           },
         },
-        //自定义运费
         {
           label: "自定义运费配置",
           type: "jsx-out",
@@ -196,42 +156,23 @@ export default {
                 width: "300px",
                 field: "cityCodes",
                 type: "jsx",
-                render: ({ row, $rowIndex }) => {
+                render: ({ row }) => {
                   const change = (e) => {
                     console.log(e);
-                    console.log(
-                      this.$refs.cityCode
-                        .getCheckedNodes()
-                        .filter((item) => !(item.parent && item.parent.checked))
-                    );
                   };
                   return (
-                    <el-form-item
-                      label-width="0"
-                      prop={
-                        "shippingTemplatesRegionListAppend." +
-                        $rowIndex +
-                        ".cityCodes"
-                      }
-                      rules={{
-                        required: true,
-                        message: "请选择运送城市",
-                      }}
-                    >
                     <el-cascader
-                        ref="cityCode"
                       style="width:100%;"
                       v-model={row.cityCodes}
                       onChange={change}
                       options={this.$api.mer_admin.getCityOptions()}
                       show-all-levels={false}
                       collapse-tags={true}
-                        placeholder="点击选择运送城市"
                       props={{
                         props: {
                           multiple: true,
                           checkStrictly: false,
-                            emitPath: false,
+                          emitPath: true,
                           label: "name",
                           value: "code",
                         },
@@ -239,15 +180,11 @@ export default {
                       clearable
                       filterable
                     ></el-cascader>
-                    </el-form-item>
                   );
                 },
               },
               {
-                title:
+                title: "首重（kg）",
-                  this.modalData.calculateMethod == "按重量"
-                    ? "首重（kg）"
-                    : "首件（个）",
                 field: "first",
                 type: "jsx",
                 render: ({ row }) => {
@@ -256,9 +193,7 @@ export default {
                       style="width:100%;"
                       min={0}
                       controls={false}
-                      precision={
+                      precision={2}
-                        this.modalData.calculateMethod == "按重量" ? 2 : 0
-                      }
                       v-model={row.first}
                     ></el-input-number>
                   );
@@ -281,10 +216,7 @@ export default {
                 },
               },
               {
-                title:
+                title: "续重（kg）",
-                  this.modalData.calculateMethod == "按重量"
-                    ? "续重（kg）"
-                    : "续件数（个）",
                 field: "renewal",
                 type: "jsx",
                 render: ({ row }) => {
@@ -293,9 +225,7 @@ export default {
                       style="width:100%;"
                       min={0}
                       controls={false}
-                      precision={
+                      precision={2}
-                        this.modalData.calculateMethod == "按重量" ? 2 : 0
-                      }
                       v-model={row.renewal}
                     ></el-input-number>
                   );
@@ -387,23 +317,14 @@ export default {
                     }}
                     label="默认运费"
                   >
-                    <el-input-number
+                    <el-input
                       v-model={
                         this.modalData.shippingTemplatesRegionList[0].first
                       }
-                      min={0}
+                    ></el-input>
-                      controls={false}
-                      precision={
-                        this.modalData.calculateMethod == "按重量" ? 2 : 0
-                      }
-                    ></el-input-number>
                   </el-form-item>
                   <span style="transform:translateY(-12px);">
-                    &nbsp;
+                    &nbsp;kg内&nbsp;
-                    {this.modalData.calculateMethod == "按重量"
-                      ? "kg内"
-                      : "件内"}
-                    &nbsp;
                   </span>
                   <el-form-item
                     label-width="0"
@@ -415,14 +336,11 @@ export default {
                     }}
                     label=""
                   >
-                    <el-input-number
+                    <el-input
                       v-model={
                         this.modalData.shippingTemplatesRegionList[0].firstPrice
                       }
-                      min={0}
+                    ></el-input>
-                      controls={false}
-                      precision={2}
-                    ></el-input-number>
                   </el-form-item>
                   <span style="transform:translateY(-12px);">
                     &nbsp;元，每增加&nbsp;
@@ -437,21 +355,14 @@ export default {
                     }}
                     label=""
                   >
-                    <el-input-number
+                    <el-input
                       v-model={
                         this.modalData.shippingTemplatesRegionList[0].renewal
                       }
-                      min={0}
+                    ></el-input>
-                      controls={false}
-                      precision={
-                        this.modalData.calculateMethod == "按重量" ? 2 : 0
-                      }
-                    ></el-input-number>
                   </el-form-item>
                   <span style="transform:translateY(-12px);">
-                    &nbsp;
+                    &nbsp;kg，增加运费&nbsp;
-                    {this.modalData.calculateMethod == "按重量" ? "kg" : "件"}
-                    ，增加运费&nbsp;
                   </span>
                   <el-form-item
                     label-width="0"
@@ -463,15 +374,12 @@ export default {
                     }}
                     label=""
                   >
-                    <el-input-number
+                    <el-input
-                      min={0}
-                      controls={false}
-                      precision={2}
                       v-model={
                         this.modalData.shippingTemplatesRegionList[0]
                           .renewalPrice
                       }
-                    ></el-input-number>
+                    ></el-input>
                   </el-form-item>
                   <span style="transform:translateY(-12px);">
                     &nbsp;元&nbsp;
@@ -529,7 +437,7 @@ export default {
                         props: {
                           multiple: true,
                           checkStrictly: false,
-                          emitPath: false,
+                          emitPath: true,
                           label: "name",
                           value: "code",
                         },
@@ -594,7 +502,7 @@ export default {
                   return (
                     <div class="flex justify-start items-center">
                       <el-select
-                        style="width:120px;"
+                        style="width:80px;"
                         v-model={row.conditionType}
                       >
                         <el-option label="件数" value="件数"></el-option>
@@ -694,56 +602,7 @@ export default {
           type: "primary",
           loading: this.isLoading,
           submit: true,
-          handle: debounce(() => {
+          handle: debounce(() => {}, 300),
-            console.log(this.modalData);
-            if (this.isAdd) {
-              this.$api.mer_admin.addShippingTemplate({
-                linkId: JSON.parse(sessionStorage.getItem("userInfo")).shopId,
-                defaults: 0,//默认值，待确认
-                sort: 0,//默认值，待确认
-                type:2,//默认值，待确认
-                name: this.modalData.templateName,
-                groups: {
-                  按重量: 2,
-                  按件数: 1,
-                  按体积: 3,
-                }[this.modalData.calculateMethod],
-                appoint: {
-                  全国包邮: 0,
-                  自定义运费: 2,
-                }[this.modalData.fareConfig],
-                shippingTemplatesRegionList:
-                  this.modalData.fareConfig == "全国包邮"
-                    ? null
-                    : [
-                        ...this.modalData.shippingTemplatesRegionList,
-                        ...JSON.parse(
-                          JSON.stringify(
-                            this.modalData.shippingTemplatesRegionListAppend.map(
-                              (item) => {
-                                item.cityCodes = item.cityCodes.join(",");
-                                return item;
-                              }
-                            )
-                          )
-                        ),
-                      ],
-                shippingTemplatesConditionList:
-                  this.modalData.fareConfig == "全国包邮"
-                    ? null
-                    : JSON.parse(
-                        JSON.stringify(
-                          this.modalData.shippingTemplatesConditionList.map(
-                            (item) => {
-                              item.cityCodes = item.cityCodes.join(",");
-                              return item;
-                            }
-                          )
-                        )
-                      ),
-              });
-            }
-          }, 300),
         },
       ];
     },