From 0b931ba608faaa6fe51d77460f04c21640b30794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Sat, 28 Sep 2024 17:12:06 +0800
Subject: [PATCH 01/20] =?UTF-8?q?=E9=93=B6=E8=A1=8C=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/mer_admin.js                  | 266 ++++++-----
 src/router/full-routers.js                    | 301 ++++++------
 src/views/modules/bank-card/index.vue         | 199 ++++++++
 .../modules/bank-card/popup/add-or-update.vue | 452 ++++++++++++++++++
 4 files changed, 955 insertions(+), 263 deletions(-)
 create mode 100644 src/views/modules/bank-card/index.vue
 create mode 100644 src/views/modules/bank-card/popup/add-or-update.vue

diff --git a/src/api/modules/mer_admin.js b/src/api/modules/mer_admin.js
index 6948e3a..37cbd51 100644
--- a/src/api/modules/mer_admin.js
+++ b/src/api/modules/mer_admin.js
@@ -3,124 +3,148 @@ import city_data from "@/utils/country-level2-data.js";
 import qs from "qs";
 
 export const mer_admin = {
-    /** 
- * 登录
- * @param {object} params LoginParam
- * @param {number} params.type 
- * @param {string} params.role 
- * @param {string} params.username 
- * @param {string} params.password 
- * @param {string} params.mobile 
- * @param {string} params.code 
- * @returns
- */
-    loginByAccount: (params) => {
-        return $http.post(`/auth/login`, {
-            ...params,
-            type: 1
-        })
-    },
-    loginByMobile: (params) => {
-        return $http.post(`/merchant-api/auth/sms/login`, {
-            ...params,
-            type: 2
-        })
-    },
-    getYZM(mobile) {
-        return $http.get(`/merchant-api/auth/login/code?mobile=${mobile}`);
-    },
-    getInfo() {
-        return $http.get(`/merchant-api/auth/info`);
-    },
-    //商品管理
-    //保存商品信息
-    saveProduct: (data) => {
-        return $http.post(`/merchant-api/product/save`, data);
-    },
-    //保存商品基本信息
-    saveProductBase: (data) => {
-        return $http.post(`/merchant-api/product/save/basic`, data);
-    },
-    //返回商品分类以及列表(聚合)
-    getPolyProduct: (data) => {
-        return $http.post(`/merchant-api/product/polymerization/list`, data);
-    },
-    //商品分页
-    getProductPage: (data) => {
-        return $http.post(`/merchant-api/product/page`, data);
-    },
-    //商户商品分类
-    getProductCategory: () => {
-        return $http.get(`/merchant-api/product/category/list?shopId=${JSON.parse(sessionStorage.getItem('userInfo')).shopId}`);
-    },
-    //上架或下架
-    putOnShelvesProducts: (data) => {
-        return $http.post(`/merchant-api/product/batch/update/status`, data);
-    },
-    //批量删除商品
-    BatchDeleteProducts: (data) => {
-        return $http.post(`/merchant-api/product/batch/delete`, data);
-    },
-    //打折扣
-    setDiscounts: (data) => {
-        return $http.post(`merchant-api/activity/save`, data);
-    },
-    //获取销售单位
-    getSaleUnit: (data) => {
-        return $http.request({ url: `/merchant-api/product/unit/list`, method: 'get', params: data });
-    },
-    //文件上传
-    uploadFile: () => {
-        return `${window.SITE_CONFIG['baseUrl']}/merchant-api/file/upload`
-    },
-    //直接获取城市数据
-    getCityOptions: () => {
-        return city_data;
-    },
-    //省市县数据
-    getCity: () => {
-        return $http.get(`/merchant-api/common/pca`);
-    },
-    //添加运费模板
-    addShippingTemplate: (data) => {
-        return $http.post(`/merchant-api/shippingTemplates/add`, data);
-    },
-    //删除模板
-    removeShippingTemplate: (id) => {
-        return $http.post(`/merchant-api/shippingTemplates/delete`, qs.stringify({
-            id
-        }), {
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded'
-            }
-        })
-    },
-    //更新模板
-    updateShippingTemplate: (data) => {
-        return $http.post(`/merchant-api/shippingTemplates/update`, data);
-    },
-    //获取模板分页
-    getShippingTemplatePage: (data) => {
-        return $http.request({
-            method: 'get',
-            url: '/merchant-api/shippingTemplates/page',
-            params: data
-        })
-    },
-    //获取配送模板列表
-    getShippingTemplateList: (data) => {
-        return $http.request({
-            method: 'get',
-            url: '/merchant-api/shippingTemplates/list',
-            params: data
-        })
-    },
-    //获取模板详情
-    getShippingTemplateInfo: (id) => {
-        return $http.request({
-            method: 'get',
-            url: '/merchant-api/shippingTemplates/detail',
-            params: { id }
-        })
-    }
-}
\ No newline at end of file
+  /**
+   * 登录
+   * @param {object} params LoginParam
+   * @param {number} params.type
+   * @param {string} params.role
+   * @param {string} params.username
+   * @param {string} params.password
+   * @param {string} params.mobile
+   * @param {string} params.code
+   * @returns
+   */
+  loginByAccount: (params) => {
+    return $http.post(`/auth/login`, {
+      ...params,
+      type: 1,
+    });
+  },
+  loginByMobile: (params) => {
+    return $http.post(`/merchant-api/auth/sms/login`, {
+      ...params,
+      type: 2,
+    });
+  },
+  getYZM(mobile) {
+    return $http.get(`/merchant-api/auth/login/code?mobile=${mobile}`);
+  },
+  getInfo() {
+    return $http.get(`/merchant-api/auth/info`);
+  },
+  //商品管理
+  //保存商品信息
+  saveProduct: (data) => {
+    return $http.post(`/merchant-api/product/save`, data);
+  },
+  //保存商品基本信息
+  saveProductBase: (data) => {
+    return $http.post(`/merchant-api/product/save/basic`, data);
+  },
+  //返回商品分类以及列表(聚合)
+  getPolyProduct: (data) => {
+    return $http.post(`/merchant-api/product/polymerization/list`, data);
+  },
+  //商品分页
+  getProductPage: (data) => {
+    return $http.post(`/merchant-api/product/page`, data);
+  },
+  //商户商品分类
+  getProductCategory: () => {
+    return $http.get(
+      `/merchant-api/product/category/list?shopId=${
+        JSON.parse(sessionStorage.getItem("userInfo")).shopId
+      }`
+    );
+  },
+  //上架或下架
+  putOnShelvesProducts: (data) => {
+    return $http.post(`/merchant-api/product/batch/update/status`, data);
+  },
+  //批量删除商品
+  BatchDeleteProducts: (data) => {
+    return $http.post(`/merchant-api/product/batch/delete`, data);
+  },
+  //打折扣
+  setDiscounts: (data) => {
+    return $http.post(`merchant-api/activity/save`, data);
+  },
+  //获取销售单位
+  getSaleUnit: (data) => {
+    return $http.request({
+      url: `/merchant-api/product/unit/list`,
+      method: "get",
+      params: data,
+    });
+  },
+  //文件上传
+  uploadFile: () => {
+    return `${window.SITE_CONFIG["baseUrl"]}/merchant-api/file/upload`;
+  },
+  //直接获取城市数据
+  getCityOptions: () => {
+    return city_data;
+  },
+  //省市县数据
+  getCity: () => {
+    return $http.get(`/merchant-api/common/pca`);
+  },
+  //添加运费模板
+  addShippingTemplate: (data) => {
+    return $http.post(`/merchant-api/shippingTemplates/add`, data);
+  },
+  //删除模板
+  removeShippingTemplate: (id) => {
+    return $http.post(
+      `/merchant-api/shippingTemplates/delete`,
+      qs.stringify({
+        id,
+      }),
+      {
+        headers: {
+          "Content-Type": "application/x-www-form-urlencoded",
+        },
+      }
+    );
+  },
+  //更新模板
+  updateShippingTemplate: (data) => {
+    return $http.post(`/merchant-api/shippingTemplates/update`, data);
+  },
+  //获取模板分页
+  getShippingTemplatePage: (data) => {
+    return $http.request({
+      method: "get",
+      url: "/merchant-api/shippingTemplates/page",
+      params: data,
+    });
+  },
+  //获取配送模板列表
+  getShippingTemplateList: (data) => {
+    return $http.request({
+      method: "get",
+      url: "/merchant-api/shippingTemplates/list",
+      params: data,
+    });
+  },
+  //获取模板详情
+  getShippingTemplateInfo: (id) => {
+    return $http.request({
+      method: "get",
+      url: "/merchant-api/shippingTemplates/detail",
+      params: { id },
+    });
+  },
+  //银行卡分页
+  bankCardPage: (data) => {
+    return $http.request({
+      method: "get",
+      url: "/merchant-api/bank/page",
+      params: data,
+    });
+  },
+  //添加商家端银行卡
+  bankCardAdd: (data) => {
+    return $http.post(`/merchant-api/bank/com-create`, data);
+  },
+};
diff --git a/src/router/full-routers.js b/src/router/full-routers.js
index 1d24baa..b63962a 100644
--- a/src/router/full-routers.js
+++ b/src/router/full-routers.js
@@ -1,148 +1,165 @@
 import { getUUID } from "@/utils";
 export default {
-    "msg": "success",
-    "menuList": [
-        // {
-        //     "menuId": 999,
-        //     url: 'http://localhost:8082/',
-        //     type: 'iframe',
-        //     // isMicroApp: true,
-        //     name: '大屏展示',
-        //     icon: 's-data',
-        //     "type": 1,
-        // },
-        // new===
-        //放到首页
-        // {
-        //     "menuId": getUUID(),
-        //     "parentId": 0,
-        //     "parentName": null,
-        //     "name": "数据看板",
-        //     "url": "local-dashboard/dashboard",
-        //     "perms": "",
-        //     "type": 1,
-        //     "elIcon": "el-icon-data-analysis",
-        //     "orderNum": 0,
-        //     "open": null,
-        //     list: []
-        // },
+  msg: "success",
+  menuList: [
+    // {
+    //     "menuId": 999,
+    //     url: 'http://localhost:8082/',
+    //     type: 'iframe',
+    //     // isMicroApp: true,
+    //     name: '大屏展示',
+    //     icon: 's-data',
+    //     "type": 1,
+    // },
+    // new===
+    //放到首页
+    // {
+    //     "menuId": getUUID(),
+    //     "parentId": 0,
+    //     "parentName": null,
+    //     "name": "数据看板",
+    //     "url": "local-dashboard/dashboard",
+    //     "perms": "",
+    //     "type": 1,
+    //     "elIcon": "el-icon-data-analysis",
+    //     "orderNum": 0,
+    //     "open": null,
+    //     list: []
+    // },
+    {
+      menuId: getUUID(),
+      parentId: 0,
+      parentName: null,
+      name: "商品",
+      url: "local-course/resources",
+      perms: "",
+      type: 0,
+      elIcon: "el-icon-menu",
+      orderNum: 0,
+      open: null,
+      list: [
         {
-            "menuId": getUUID(),
-            "parentId": 0,
-            "parentName": null,
-            "name": "商品",
-            "url": "local-course/resources",
-            "perms": "",
-            "type": 0,
-            "elIcon": "el-icon-menu",
-            "orderNum": 0,
-            "open": null,
-            list: [{
-                "menuId": getUUID(),
-                "parentId": 0,
-                "parentName": null,
-                "name": "商品管理",
-                "url": "product/index",
-                "perms": "",
-                "type": 1,
-                "elIcon": "el-icon-menu",
-                "orderNum": 0,
-                "open": null,
-                list: []
-            }]
+          menuId: getUUID(),
+          parentId: 0,
+          parentName: null,
+          name: "商品管理",
+          url: "product/index",
+          perms: "",
+          type: 1,
+          elIcon: "el-icon-menu",
+          orderNum: 0,
+          open: null,
+          list: [],
         },
+      ],
+    },
+    {
+      menuId: getUUID(),
+      parentId: 0,
+      parentName: null,
+      name: "运费管理",
+      url: "",
+      perms: "",
+      type: 0,
+      elIcon: "el-icon-money",
+      orderNum: 0,
+      open: null,
+      list: [
         {
-            "menuId": getUUID(),
-            "parentId": 0,
-            "parentName": null,
-            "name": "运费管理",
-            "url": "",
-            "perms": "",
-            "type": 0,
-            "elIcon": "el-icon-money",
-            "orderNum": 0,
-            "open": null,
-            list: [{
-                "menuId": getUUID(),
-                "parentId": 0,
-                "parentName": null,
-                "name": "运费模板",
-                "url": "logistics-fare/logistics-template/index",
-                "perms": "",
-                "type": 1,
-                "elIcon": "el-icon-postcard",
-                "orderNum": 0,
-                "open": null,
-                list: []
-            }]
+          menuId: getUUID(),
+          parentId: 0,
+          parentName: null,
+          name: "运费模板",
+          url: "logistics-fare/logistics-template/index",
+          perms: "",
+          type: 1,
+          elIcon: "el-icon-postcard",
+          orderNum: 0,
+          open: null,
+          list: [],
         },
-        // {
-        //     "menuId": getUUID(),
-        //     "parentId": 0,
-        //     "parentName": null,
-        //     "name": "教务管理",
-        //     "url": "local-affairs",
-        //     "perms": "",
-        //     "type": 0,
-        //     "elIcon": "el-icon-office-building",
-        //     "orderNum": 0,
-        //     "open": null,
-        //     list: [
-        //         {
-        //             "menuId": getUUID(),
-        //             "parentId": 2,
-        //             "parentName": null,
-        //             "name": "年级管理",
-        //             "url": "local-affairs/grade",
-        //             "perms": "",
-        //             "type": 1,
-        //             "icon": "log",
-        //             "orderNum": 0,
-        //             "open": null,
-        //             "list": []
-        //         },
-        //         {
-        //             "menuId": getUUID(),
-        //             "parentId": 2,
-        //             "parentName": null,
-        //             "name": "班级管理",
-        //             "url": "local-affairs/class",
-        //             "perms": "",
-        //             "type": 1,
-        //             "icon": "log",
-        //             "orderNum": 0,
-        //             "open": null,
-        //             "list": []
-        //         },
-        //         {
-        //             "menuId": getUUID(),
-        //             "parentId": 2,
-        //             "parentName": null,
-        //             "name": "教师管理",
-        //             "url": "local-teacher/teacher",
-        //             "perms": "",
-        //             "type": 1,
-        //             "icon": "log",
-        //             "orderNum": 0,
-        //             "open": null,
-        //             "list": []
-        //         },
-        //         {
-        //             "menuId": getUUID(),
-        //             "parentId": 0,
-        //             "parentName": null,
-        //             "name": "学校管理",
-        //             "url": "local-school/school",
-        //             "perms": "",
-        //             "type": 1,
-        //             "elIcon": "el-icon-school",
-        //             "orderNum": 0,
-        //             "open": null,
-        //             list: []
-        //         },
-        //     ]
-        // },
-    ],
-    "code": 0,
-    "permissions": []
-}
\ No newline at end of file
+      ],
+    },
+    {
+      menuId: getUUID(),
+      parentId: 0,
+      parentName: null,
+      name: "银行卡管理",
+      url: "bank-card/index",
+      perms: "",
+      type: 0,
+      elIcon: "el-icon-menu",
+      orderNum: 0,
+      open: null,
+      list: [],
+    },
+    // {
+    //     "menuId": getUUID(),
+    //     "parentId": 0,
+    //     "parentName": null,
+    //     "name": "教务管理",
+    //     "url": "local-affairs",
+    //     "perms": "",
+    //     "type": 0,
+    //     "elIcon": "el-icon-office-building",
+    //     "orderNum": 0,
+    //     "open": null,
+    //     list: [
+    //         {
+    //             "menuId": getUUID(),
+    //             "parentId": 2,
+    //             "parentName": null,
+    //             "name": "年级管理",
+    //             "url": "local-affairs/grade",
+    //             "perms": "",
+    //             "type": 1,
+    //             "icon": "log",
+    //             "orderNum": 0,
+    //             "open": null,
+    //             "list": []
+    //         },
+    //         {
+    //             "menuId": getUUID(),
+    //             "parentId": 2,
+    //             "parentName": null,
+    //             "name": "班级管理",
+    //             "url": "local-affairs/class",
+    //             "perms": "",
+    //             "type": 1,
+    //             "icon": "log",
+    //             "orderNum": 0,
+    //             "open": null,
+    //             "list": []
+    //         },
+    //         {
+    //             "menuId": getUUID(),
+    //             "parentId": 2,
+    //             "parentName": null,
+    //             "name": "教师管理",
+    //             "url": "local-teacher/teacher",
+    //             "perms": "",
+    //             "type": 1,
+    //             "icon": "log",
+    //             "orderNum": 0,
+    //             "open": null,
+    //             "list": []
+    //         },
+    //         {
+    //             "menuId": getUUID(),
+    //             "parentId": 0,
+    //             "parentName": null,
+    //             "name": "学校管理",
+    //             "url": "local-school/school",
+    //             "perms": "",
+    //             "type": 1,
+    //             "elIcon": "el-icon-school",
+    //             "orderNum": 0,
+    //             "open": null,
+    //             list: []
+    //         },
+    //     ]
+    // },
+  ],
+  code: 0,
+  permissions: [],
+};
diff --git a/src/views/modules/bank-card/index.vue b/src/views/modules/bank-card/index.vue
new file mode 100644
index 0000000..67f4b60
--- /dev/null
+++ b/src/views/modules/bank-card/index.vue
@@ -0,0 +1,199 @@
+<template>
+  <div style="height: calc(100vh - 200px)">
+    <obj-table-plus
+      ref="oTable"
+      style="height: 100%"
+      :tableCols="tableCols"
+      :tableProp="tableProp"
+      @query="queryList"
+      v-model="dataList"
+      :tableEvent="tableEvent"
+    >
+      <template slot="tableTop">
+        <el-form :inline="true" :model="formInline" class="demo-form-inline">
+          <el-form-item label="银行卡状态：">
+            <el-select v-model="formInline.region" placeholder="请选择">
+              <el-option label="审核中" value="shanghai"></el-option>
+              <el-option label="未通过" value="beijing"></el-option>
+              <el-option label="已通过" value="beijing"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="$refs.oTable.reload()"
+              >查询</el-button
+            >
+          </el-form-item>
+        </el-form>
+        <div class="mb-2">
+          <el-button type="primary" size="small" @click="addProduct"
+            >添加银行卡</el-button
+          >
+          <!-- <el-button
+            :disabled="selectList.length <= 0"
+            type="danger"
+            size="small"
+            @click="deleteProduct"
+            >批量删除</el-button
+          > -->
+        </div>
+      </template>
+    </obj-table-plus>
+    <!-- 添加或编辑 -->
+    <add-or-update
+      @queryList="$refs.oTable.reload()"
+      ref="addOrUpdate"
+    ></add-or-update>
+  </div>
+</template>
+
+<script>
+import AddOrUpdate from "./popup/add-or-update.vue";
+export default {
+    components: { AddOrUpdate,},
+  data() {
+    return {
+      dataList: [],
+      formInline: {
+        user: "",
+        region: "",
+      },
+      tableProp: {
+        "auto-resize": true,
+        border: true,
+        height: "auto",
+        "row-id": "id",
+        "show-overflow": false,
+      },
+      productFilterType: "SALE",
+      selectList: [],
+    };
+  },
+  methods: {
+    addProduct() {
+      this.$refs.addOrUpdate.toggle().add();
+    },
+    deleteProduct() {
+      console.log(this.selectList);
+      let integers = this.selectList.map((item) => {
+        return item.id;
+      });
+      this.$confirm("此操作将删除该商品, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          console.log("111");
+          this.$api.mer_admin.BatchDeleteProducts(integers).then((res) => {
+            this.$refs.oTable.reload();
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+    queryList(pageNo, pageSize) {
+      this.$api.mer_admin
+        .bankCardPage({
+          pageNumber: pageNo,
+          pageSize: pageSize,
+          linkId: JSON.parse(sessionStorage.getItem("userInfo")).managerId
+            ? JSON.parse(sessionStorage.getItem("userInfo")).managerId
+            : JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
+        })
+        .then((res) => {
+          console.log(res);
+          this.$refs.oTable.complete(
+            res.data.data.data,
+            Number(res.data.data.total)
+          );
+        })
+        .catch((err) => {
+          this.$refs.oTable.complete(false);
+        });
+    },
+  },
+  computed: {
+    tableCols() {
+      return [
+        { type: "checkbox", width: "60px", fixed: "left" },
+        // { type: "seq", width: "60px", align: "center", title: "序号" },
+        {
+          title: "持卡人",
+          align: "center",
+          field: "cardId",
+        },
+        {
+          title: "证件号",
+          align: "certId",
+          field: "minSalePrice",
+        },
+        {
+          title: "手机号",
+          align: "center",
+          field: "legalMp",
+        },
+        {
+          title: "企业名称",
+          align: "center",
+          field: "name",
+        },
+        {
+          title: "状态",
+          align: "center",
+          field: "status",
+        },
+        {
+          title: "操作",
+          fixed: "right",
+          type: "jsx",
+          align: "center",
+          width: "140px",
+          render: ({ row }) => {
+            let edit = () => {
+              this.$refs.addOrUpdate.toggle(row).update();
+            };
+            let priceAdjustment = () => {
+              console.log(row);
+              this.$refs.AddPrice.toggle(row).update();
+            };
+            let changeInventory = () => {
+              this.$refs.addStock.toggle(row).update();
+            };
+            let setDiscounts = () => {
+              this.$refs.AddDiscount.toggle(row).update();
+            };
+            return (
+              <div>
+                <el-button
+                  size="mini"
+                  disabled={row.status != "DOWN"}
+                  type="primary"
+                  onClick={edit}
+                >
+                  编辑
+                </el-button>
+              </div>
+            );
+          },
+        },
+      ];
+    },
+    tableEvent() {
+      return {
+        "checkbox-all": ({ records, reserves }) => {
+          this.selectList = [...records, ...reserves];
+        },
+        "checkbox-change": ({ records, reserves }) => {
+          this.selectList = [...records, ...reserves];
+        },
+      };
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/modules/bank-card/popup/add-or-update.vue b/src/views/modules/bank-card/popup/add-or-update.vue
new file mode 100644
index 0000000..c7aef1e
--- /dev/null
+++ b/src/views/modules/bank-card/popup/add-or-update.vue
@@ -0,0 +1,452 @@
+<template>
+  <div>
+    <obj-modal
+      ref="modal"
+      labelWidth="150px"
+      :modalConfig="modalConfig"
+      :modalData="modalData"
+      :modalHandles="modalHandles"
+    >
+      <template slot="dialog__content">
+        <el-form :model="modalData" ref="modalForm">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                label-width="150px"
+                label="是否需冷藏"
+                prop="bankType"
+              >
+                <el-select
+                  style="width: 300px"
+                  v-model="modalData.bankType"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in [
+                      { label: '摊主银行卡', value: 1 },
+                      { label: '代理银行卡', value: 2 },
+                      { label: '专员银行卡', value: 3 },
+                      { label: '分销银行卡', value: 4 },
+                      { label: '用户银行卡', value: 5 },
+                    ]"
+                    :label="item.label"
+                    :value="item.value"
+                    :key="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label-width="150px" label="企业名称" prop="cas">
+                <el-input
+                  style="width: 300px"
+                  v-model="modalData.name"
+                  placeholder="请输入企业名称"
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label-width="150px" label="省份" prop="prov">
+                <el-cascader
+                  v-model="productPlace"
+                  style="width: 300px"
+                  :options="this.$api.mer_admin.getCityOptions()"
+                  @change="handleChange"
+                  clearable
+                  :props="{
+                    value: 'name',
+                    label: 'name',
+                    children: 'children',
+                  }"
+                ></el-cascader>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label-width="150px" label="地区" prop="cas">
+                <el-input
+                  style="width: 300px"
+                  v-model="modalData.area"
+                  placeholder="请输入地区"
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label-width="150px" label="社会信用码" prop="prov">
+                <el-input
+                  style="width: 300px"
+                  v-model="modalData.socialCreditCode"
+                  placeholder="请输入社会信用码"
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                label-width="150px"
+                label="社会信用码有效期"
+                prop="socialCreditCodeExpires"
+              >
+                <el-date-picker
+                  style="width: 300px"
+                  v-model="modalData.socialCreditCodeExpires"
+                  type="date"
+                  placeholder="选择日期"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                label-width="150px"
+                label="经营范围"
+                prop="businessScope"
+              >
+                <el-input
+                  style="width: 300px"
+                  v-model="modalData.businessScope"
+                  placeholder="请输入经营范围"
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                label-width="150px"
+                label="法人姓名"
+                prop="legalPerson"
+              >
+                <el-input
+                  style="width: 300px"
+                  v-model="modalData.legalPerson"
+                  placeholder="请输入法人姓名"
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                label-width="150px"
+                label="	法人身份证号码"
+                prop="legalCertId"
+              >
+                <el-input
+                  style="width: 300px"
+                  v-model="modalData.legalCertId"
+                  placeholder="请输入法人身份证号码"
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                label-width="150px"
+                label="法人身份证有效期"
+                prop="legalCertIdExpires"
+              >
+                <el-date-picker
+                  style="width: 300px"
+                  v-model="modalData.legalCertIdExpires"
+                  type="date"
+                  placeholder="选择日期"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                label-width="150px"
+                label="法人手机号"
+                prop="legalMp"
+              >
+                <el-input
+                  style="width: 300px"
+                  v-model="modalData.legalMp"
+                  placeholder="请输入法人手机号"
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label-width="150px" label="企业地址" prop="address">
+                <el-input
+                  style="width: 300px"
+                  v-model="modalData.address"
+                  placeholder="请输入企业地址"
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                label-width="150px"
+                label="银行代码"
+                prop="bankCode"
+              >
+                <el-input
+                  style="width: 300px"
+                  v-model="modalData.bankCode"
+                  placeholder="请输入银行代码"
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label-width="150px" label="银行卡号" prop="cardNo">
+                <el-input
+                  style="width: 300px"
+                  v-model="modalData.cardNo"
+                  placeholder="请输入银行卡号"
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                label-width="150px"
+                label="银行卡对应户名"
+                prop="cardName"
+              >
+                <el-input
+                  style="width: 300px"
+                  v-model="modalData.cardName"
+                  placeholder="请输入银行卡对应户名"
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                label-width="150px"
+                label="银行卡类型"
+                prop="bankAcctType"
+              >
+                <el-select
+                  style="width: 300px"
+                  v-model="modalData.bankAcctType"
+                  placeholder="请输入银行卡类型"
+                >
+                  <el-option
+                    v-for="item in [
+                      { label: '公账', value: 1 },
+                      { label: '私账', value: 2 },
+                    ]"
+                    :label="item.label"
+                    :value="item.value"
+                    :key="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item
+                label-width="150px"
+                label="营业执照号"
+                prop="licenseNumber"
+              >
+                <el-input
+                  style="width: 300px"
+                  v-model="modalData.licenseNumber"
+                  placeholder="请输入营业执照号"
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                label-width="150px"
+                label="营业执照图片"
+                prop="licensePicture"
+              >
+                <el-upload
+                  class="upload-demo"
+                  :action="this.$api.mer_admin.uploadFile()"
+                  :on-success="handleAvatarSuccess"
+                  :file-list="fileList"
+                  list-type="picture"
+                  :headers="{ token: 'Bearer' + this.$cookie.get('token') }"
+                >
+                  <el-button size="small" type="primary">点击上传</el-button>
+                </el-upload>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                label-width="150px"
+                label="法人身份证正面国徽"
+                prop="bankAcctType"
+              >
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </template>
+    </obj-modal>
+  </div>
+</template>
+<script>
+import { debounce, cloneDeep } from "lodash";
+import { Divider } from "element-ui";
+export default {
+  components: {},
+  data() {
+    return {
+      isAdd: true,
+      //表格属性
+      modalConfig: {
+        title: "添加银行卡",
+        show: false,
+        width: "80%",
+      },
+      modalData: {},
+      value1: [],
+      ProductData: {},
+      productPlace: "", //地区
+      fileList: [],
+    };
+  },
+  methods: {
+    queryTableData(pageNo, pageSize) {},
+    toggle(e) {
+      if (this.modalConfig.show == false) {
+        this.modalConfig.show = true;
+      } else {
+        this.modalConfig.show = false;
+        this.$refs.modal.resetFields();
+      }
+      if (e) {
+        this.init(cloneDeep(e));
+      }
+      return {
+        add: () => {
+          this.modalConfig.title = "添加银行卡";
+          this.$nextTick(() => {
+            this.modalData = {
+              linkId: JSON.parse(sessionStorage.getItem("userInfo")).managerId
+                ? JSON.parse(sessionStorage.getItem("userInfo")).managerId
+                : JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
+              bankType: "",
+              name: "",
+              prov: "",
+              area: "",
+              socialCreditCode: "",
+              socialCreditCodeExpires: "",
+              businessScope: "",
+              legalPerson: "",
+              legalCertId: "",
+              legalCertIdExpires: "",
+              legalMp: "",
+              address: "",
+              bankCode: "",
+              cardNo: "",
+              cardName: "",
+              licensePicture: "",
+              idCardFront: "",
+              idCardBack: "",
+              bankLicense: "",
+              handIdCardFront: "",
+              handIdCardBack: "",
+              bankAcctType: "",
+              licenseNumber: "",
+            };
+            this.$refs.modal.resetFields();
+          });
+          this.isAdd = true;
+        },
+        update: () => {
+          this.isAdd = false;
+        },
+      };
+    },
+    init(row) {},
+    handleChange(e) {
+      console.log(e);
+      this.modalData.prov = e.join("-");
+    },
+    handleAvatarSuccess(res) {
+      console.log(res);
+    },
+  },
+  computed: {
+    modalHandles() {
+      return [
+        {
+          label: "取消",
+          handle: () => {
+            this.toggle();
+          },
+        },
+        {
+          label: this.isAdd ? "确认添加" : "确认",
+          type: "primary",
+          loading: this.isLoading,
+          submit: true,
+          handle: () => {
+            let data = {
+              ...this.ProductData,
+              ruleObject: {
+                discount: this.modalData.discount,
+                limitCount: this.modalData.limitCount,
+              },
+              startTime: this.modalData.DiscountTime[0],
+              endTime: this.modalData.DiscountTime[1],
+            };
+            this.$confirm(
+              `此操作将 商品折扣=${this.modalData.discount}折 限购数 = ${this.modalData.limitCount}, 是否确认保存此折扣?`,
+              "提示",
+              {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+                center: true,
+              }
+            )
+              .then(() => {
+                this.$api.mer_admin.setDiscounts(data).then((res) => {
+                  this.toggle();
+                  this.$emit("queryList");
+                });
+              })
+              .catch(() => {
+                this.$message({
+                  type: "info",
+                  message: "已取消",
+                });
+              });
+          },
+        },
+      ];
+    },
+  },
+  asyncComputed: {},
+};
+</script>
+<style lang="scss" scoped>
+.introduce {
+  padding: 5px;
+  background: #fdf6ec;
+  text-align: center;
+}
+.introduce-center {
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file

From 977f2133d6024984ec831e328d18a7e38cf3db34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Sun, 29 Sep 2024 18:02:11 +0800
Subject: [PATCH 02/20] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=93=B6=E8=A1=8C?=
 =?UTF-8?q?=E5=8D=A1=E5=AF=B9=E6=8E=A5=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/mer_admin.js                  |   9 +
 src/router/full-routers.js                    |   2 +-
 src/views/modules/bank-card/index.vue         |  61 +-
 .../modules/bank-card/popup/add-or-update.vue | 758 ++++++++++--------
 .../modules/bank-card/popup/view-details.vue  | 571 +++++++++++++
 5 files changed, 1054 insertions(+), 347 deletions(-)
 create mode 100644 src/views/modules/bank-card/popup/view-details.vue

diff --git a/src/api/modules/mer_admin.js b/src/api/modules/mer_admin.js
index 37cbd51..378d992 100644
--- a/src/api/modules/mer_admin.js
+++ b/src/api/modules/mer_admin.js
@@ -147,4 +147,13 @@ export const mer_admin = {
   bankCardAdd: (data) => {
     return $http.post(`/merchant-api/bank/com-create`, data);
   },
+  //获取银行卡详情
+  bankCardDetail: (id) => {
+    return $http.request({
+      method: "get",
+      url: "/merchant-api/bank/detail",
+      params: { id },
+    });
+  },
+
 };
diff --git a/src/router/full-routers.js b/src/router/full-routers.js
index b63962a..fe7a742 100644
--- a/src/router/full-routers.js
+++ b/src/router/full-routers.js
@@ -88,7 +88,7 @@ export default {
       url: "bank-card/index",
       perms: "",
       type: 0,
-      elIcon: "el-icon-menu",
+      elIcon: "el-icon-picture-outline",
       orderNum: 0,
       open: null,
       list: [],
diff --git a/src/views/modules/bank-card/index.vue b/src/views/modules/bank-card/index.vue
index 67f4b60..cb509c4 100644
--- a/src/views/modules/bank-card/index.vue
+++ b/src/views/modules/bank-card/index.vue
@@ -12,10 +12,11 @@
       <template slot="tableTop">
         <el-form :inline="true" :model="formInline" class="demo-form-inline">
           <el-form-item label="银行卡状态：">
-            <el-select v-model="formInline.region" placeholder="请选择">
-              <el-option label="审核中" value="shanghai"></el-option>
-              <el-option label="未通过" value="beijing"></el-option>
-              <el-option label="已通过" value="beijing"></el-option>
+            <el-select v-model="formInline.status" placeholder="请选择">
+              <el-option label="全部" value=""></el-option>
+              <el-option label="审核中" value="0"></el-option>
+              <el-option label="未通过" value="1"></el-option>
+              <el-option label="已通过" value="2"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item>
@@ -43,19 +44,21 @@
       @queryList="$refs.oTable.reload()"
       ref="addOrUpdate"
     ></add-or-update>
+    <!-- 查看详情 -->
+    <viewDetails ref="viewDetails"></viewDetails>
   </div>
 </template>
 
 <script>
 import AddOrUpdate from "./popup/add-or-update.vue";
+import viewDetails from "./popup/view-details.vue";
 export default {
-    components: { AddOrUpdate,},
+  components: { AddOrUpdate, viewDetails },
   data() {
     return {
       dataList: [],
       formInline: {
-        user: "",
-        region: "",
+        status: "",
       },
       tableProp: {
         "auto-resize": true,
@@ -103,6 +106,7 @@ export default {
           linkId: JSON.parse(sessionStorage.getItem("userInfo")).managerId
             ? JSON.parse(sessionStorage.getItem("userInfo")).managerId
             : JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
+          status: this.formInline.status,
         })
         .then((res) => {
           console.log(res);
@@ -124,17 +128,17 @@ export default {
         {
           title: "持卡人",
           align: "center",
-          field: "cardId",
+          field: "cardName",
         },
         {
-          title: "证件号",
-          align: "certId",
-          field: "minSalePrice",
+          title: "银行卡号",
+          align: "center",
+          field: "cardId",
         },
         {
           title: "手机号",
           align: "center",
-          field: "legalMp",
+          field: "telNo",
         },
         {
           title: "企业名称",
@@ -145,6 +149,16 @@ export default {
           title: "状态",
           align: "center",
           field: "status",
+          type: "jsx",
+          render: ({ row }) => {
+            if (row.status == 0) {
+              return <span>审核中</span>;
+            } else if (row.status == 1) {
+              return <span>未通过</span>;
+            } else if (row.status == 2) {
+              return <span>已通过</span>;
+            }
+          },
         },
         {
           title: "操作",
@@ -152,29 +166,14 @@ export default {
           type: "jsx",
           align: "center",
           width: "140px",
-          render: ({ row }) => {
+          render: (row) => {
             let edit = () => {
-              this.$refs.addOrUpdate.toggle(row).update();
-            };
-            let priceAdjustment = () => {
-              console.log(row);
-              this.$refs.AddPrice.toggle(row).update();
-            };
-            let changeInventory = () => {
-              this.$refs.addStock.toggle(row).update();
-            };
-            let setDiscounts = () => {
-              this.$refs.AddDiscount.toggle(row).update();
+              this.$refs.viewDetails.toggle(row).update();
             };
             return (
               <div>
-                <el-button
-                  size="mini"
-                  disabled={row.status != "DOWN"}
-                  type="primary"
-                  onClick={edit}
-                >
-                  编辑
+                <el-button size="mini" type="primary" onClick={edit}>
+                  详情
                 </el-button>
               </div>
             );
diff --git a/src/views/modules/bank-card/popup/add-or-update.vue b/src/views/modules/bank-card/popup/add-or-update.vue
index c7aef1e..17f1a18 100644
--- a/src/views/modules/bank-card/popup/add-or-update.vue
+++ b/src/views/modules/bank-card/popup/add-or-update.vue
@@ -9,294 +9,412 @@
     >
       <template slot="dialog__content">
         <el-form :model="modalData" ref="modalForm">
-          <el-row>
-            <el-col :span="12">
-              <el-form-item
-                label-width="150px"
-                label="是否需冷藏"
-                prop="bankType"
-              >
-                <el-select
-                  style="width: 300px"
-                  v-model="modalData.bankType"
-                  placeholder="请选择"
+          <el-row v-show="process == 1">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="银行类型："
+                  prop="bankType"
                 >
-                  <el-option
-                    v-for="item in [
-                      { label: '摊主银行卡', value: 1 },
-                      { label: '代理银行卡', value: 2 },
-                      { label: '专员银行卡', value: 3 },
-                      { label: '分销银行卡', value: 4 },
-                      { label: '用户银行卡', value: 5 },
-                    ]"
-                    :label="item.label"
-                    :value="item.value"
-                    :key="item.value"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label-width="150px" label="企业名称" prop="cas">
-                <el-input
-                  style="width: 300px"
-                  v-model="modalData.name"
-                  placeholder="请输入企业名称"
+                  <el-select
+                    style="width: 300px"
+                    v-model="modalData.bankType"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in [
+                        { label: '摊主银行卡', value: 1 },
+                        { label: '代理银行卡', value: 2 },
+                        { label: '专员银行卡', value: 3 },
+                        { label: '分销银行卡', value: 4 },
+                        { label: '用户银行卡', value: 5 },
+                      ]"
+                      :label="item.label"
+                      :value="item.value"
+                      :key="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label-width="150px" label="企业名称" prop="cas">
+                  <el-input
+                    style="width: 300px"
+                    v-model="modalData.name"
+                    placeholder="请输入企业名称："
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label-width="150px" label="省份：" prop="prov">
+                  <el-select
+                    style="width: 300px"
+                    @change="handleChange"
+                    v-model="modalData.prov"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in this.$api.mer_admin.getCityOptions()"
+                      :key="item.name"
+                      :label="item.name"
+                      :value="item.name"
+                    >
+                    </el-option>
+                  </el-select>
+                  <!-- <el-cascader
+                    v-model="productPlace"
+                    style="width: 300px"
+                    :options="this.$api.mer_admin.getCityOptions()"
+                    @change="handleChange"
+                    clearable
+                    :props="{
+                      value: 'name',
+                      label: 'name',
+                      children: 'children',
+                    }"
+                  ></el-cascader> -->
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label-width="150px" label="地级市：" prop="cas">
+                  <el-input
+                    style="width: 300px"
+                    v-model="modalData.area"
+                    placeholder="请输入地区"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="社会信用码："
+                  prop="prov"
                 >
-                </el-input>
-              </el-form-item>
-            </el-col>
+                  <el-input
+                    style="width: 300px"
+                    v-model="modalData.socialCreditCode"
+                    placeholder="请输入社会信用码"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="社会信用码有效期："
+                  prop="socialCreditCodeExpires"
+                >
+                  <el-date-picker
+                    value-format="yyyy-MM-dd"
+                    style="width: 300px"
+                    v-model="modalData.socialCreditCodeExpires"
+                    type="date"
+                    placeholder="选择日期"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="经营范围："
+                  prop="businessScope"
+                >
+                  <el-input
+                    style="width: 300px"
+                    v-model="modalData.businessScope"
+                    placeholder="请输入经营范围"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="法人姓名："
+                  prop="legalPerson"
+                >
+                  <el-input
+                    style="width: 300px"
+                    v-model="modalData.legalPerson"
+                    placeholder="请输入法人姓名"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="	法人身份证号码："
+                  prop="legalCertId"
+                >
+                  <el-input
+                    style="width: 300px"
+                    v-model="modalData.legalCertId"
+                    placeholder="请输入法人身份证号码"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="法人身份证有效期："
+                  prop="legalCertIdExpires"
+                >
+                  <el-date-picker
+                    value-format="yyyy-MM-dd"
+                    style="width: 300px"
+                    v-model="modalData.legalCertIdExpires"
+                    type="date"
+                    placeholder="选择日期"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="法人手机号："
+                  prop="legalMp"
+                >
+                  <el-input
+                    style="width: 300px"
+                    v-model="modalData.legalMp"
+                    placeholder="请输入法人手机号"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="企业地址："
+                  prop="address"
+                >
+                  <el-input
+                    style="width: 300px"
+                    v-model="modalData.address"
+                    placeholder="请输入企业地址"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="银行代码："
+                  prop="bankCode"
+                >
+                  <el-input
+                    style="width: 300px"
+                    v-model="modalData.bankCode"
+                    placeholder="请输入银行代码"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="银行卡号："
+                  prop="cardNo"
+                >
+                  <el-input
+                    style="width: 300px"
+                    v-model="modalData.cardNo"
+                    placeholder="请输入银行卡号"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="银行卡对应户名："
+                  prop="cardName"
+                >
+                  <el-input
+                    style="width: 300px"
+                    v-model="modalData.cardName"
+                    placeholder="请输入银行卡对应户名"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="银行卡类型："
+                  prop="bankAcctType"
+                >
+                  <el-select
+                    style="width: 300px"
+                    v-model="modalData.bankAcctType"
+                    placeholder="请输入银行卡类型"
+                  >
+                    <el-option
+                      v-for="item in [
+                        { label: '公账', value: 1 },
+                        { label: '私账', value: 2 },
+                      ]"
+                      :label="item.label"
+                      :value="item.value"
+                      :key="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item
+                  label-width="150px"
+                  label="营业执照号："
+                  prop="licenseNumber"
+                >
+                  <el-input
+                    style="width: 300px"
+                    v-model="modalData.licenseNumber"
+                    placeholder="请输入营业执照号"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label-width="150px" label="省份" prop="prov">
-                <el-cascader
-                  v-model="productPlace"
-                  style="width: 300px"
-                  :options="this.$api.mer_admin.getCityOptions()"
-                  @change="handleChange"
-                  clearable
-                  :props="{
-                    value: 'name',
-                    label: 'name',
-                    children: 'children',
-                  }"
-                ></el-cascader>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label-width="150px" label="地区" prop="cas">
-                <el-input
-                  style="width: 300px"
-                  v-model="modalData.area"
-                  placeholder="请输入地区"
+          <el-row v-show="process == 2">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="营业执照图片："
+                  prop="licensePicture"
                 >
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label-width="150px" label="社会信用码" prop="prov">
-                <el-input
-                  style="width: 300px"
-                  v-model="modalData.socialCreditCode"
-                  placeholder="请输入社会信用码"
+                  <el-upload
+                    class="upload-demo"
+                    :action="this.$api.mer_admin.uploadFile()"
+                    :on-success="handleAvatarSuccess"
+                    :file-list="fileList"
+                    list-type="picture"
+                    :headers="{ token: this.$cookie.get('token') }"
+                  >
+                    <el-button size="small" type="primary">点击上传</el-button>
+                  </el-upload>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="法人身份证正面国徽："
+                  prop="bankAcctType"
                 >
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item
-                label-width="150px"
-                label="社会信用码有效期"
-                prop="socialCreditCodeExpires"
-              >
-                <el-date-picker
-                  style="width: 300px"
-                  v-model="modalData.socialCreditCodeExpires"
-                  type="date"
-                  placeholder="选择日期"
+                  <el-upload
+                    class="upload-demo"
+                    :action="this.$api.mer_admin.uploadFile()"
+                    :on-success="idCardFrontImg"
+                    :file-list="fileList"
+                    list-type="picture"
+                    :headers="{ token: this.$cookie.get('token') }"
+                  >
+                    <el-button size="small" type="primary">点击上传</el-button>
+                  </el-upload>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="法人身份证背面人像："
+                  prop="licensePicture"
                 >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item
-                label-width="150px"
-                label="经营范围"
-                prop="businessScope"
-              >
-                <el-input
-                  style="width: 300px"
-                  v-model="modalData.businessScope"
-                  placeholder="请输入经营范围"
+                  <el-upload
+                    class="upload-demo"
+                    :action="this.$api.mer_admin.uploadFile()"
+                    :on-success="idCardBackImg"
+                    :file-list="fileList"
+                    list-type="picture"
+                    :headers="{ token: this.$cookie.get('token') }"
+                  >
+                    <el-button size="small" type="primary">点击上传</el-button>
+                  </el-upload>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="开户银行许可证照："
+                  prop="bankAcctType"
                 >
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item
-                label-width="150px"
-                label="法人姓名"
-                prop="legalPerson"
-              >
-                <el-input
-                  style="width: 300px"
-                  v-model="modalData.legalPerson"
-                  placeholder="请输入法人姓名"
+                  <el-upload
+                    class="upload-demo"
+                    :action="this.$api.mer_admin.uploadFile()"
+                    :on-success="bankLicenseImg"
+                    :file-list="fileList"
+                    list-type="picture"
+                    :headers="{ token: this.$cookie.get('token') }"
+                  >
+                    <el-button size="small" type="primary">点击上传</el-button>
+                  </el-upload>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="手持身份证正面国徽(选传)："
+                  prop="licensePicture"
                 >
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item
-                label-width="150px"
-                label="	法人身份证号码"
-                prop="legalCertId"
-              >
-                <el-input
-                  style="width: 300px"
-                  v-model="modalData.legalCertId"
-                  placeholder="请输入法人身份证号码"
+                  <el-upload
+                    class="upload-demo"
+                    :action="this.$api.mer_admin.uploadFile()"
+                    :on-success="handIdCardFrontImg"
+                    :file-list="fileList"
+                    list-type="picture"
+                    :headers="{ token: this.$cookie.get('token') }"
+                  >
+                    <el-button size="small" type="primary">点击上传</el-button>
+                  </el-upload>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="手持身份证背面人像(选传)："
+                  prop="bankAcctType"
                 >
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item
-                label-width="150px"
-                label="法人身份证有效期"
-                prop="legalCertIdExpires"
-              >
-                <el-date-picker
-                  style="width: 300px"
-                  v-model="modalData.legalCertIdExpires"
-                  type="date"
-                  placeholder="选择日期"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item
-                label-width="150px"
-                label="法人手机号"
-                prop="legalMp"
-              >
-                <el-input
-                  style="width: 300px"
-                  v-model="modalData.legalMp"
-                  placeholder="请输入法人手机号"
-                >
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label-width="150px" label="企业地址" prop="address">
-                <el-input
-                  style="width: 300px"
-                  v-model="modalData.address"
-                  placeholder="请输入企业地址"
-                >
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item
-                label-width="150px"
-                label="银行代码"
-                prop="bankCode"
-              >
-                <el-input
-                  style="width: 300px"
-                  v-model="modalData.bankCode"
-                  placeholder="请输入银行代码"
-                >
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label-width="150px" label="银行卡号" prop="cardNo">
-                <el-input
-                  style="width: 300px"
-                  v-model="modalData.cardNo"
-                  placeholder="请输入银行卡号"
-                >
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item
-                label-width="150px"
-                label="银行卡对应户名"
-                prop="cardName"
-              >
-                <el-input
-                  style="width: 300px"
-                  v-model="modalData.cardName"
-                  placeholder="请输入银行卡对应户名"
-                >
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item
-                label-width="150px"
-                label="银行卡类型"
-                prop="bankAcctType"
-              >
-                <el-select
-                  style="width: 300px"
-                  v-model="modalData.bankAcctType"
-                  placeholder="请输入银行卡类型"
-                >
-                  <el-option
-                    v-for="item in [
-                      { label: '公账', value: 1 },
-                      { label: '私账', value: 2 },
-                    ]"
-                    :label="item.label"
-                    :value="item.value"
-                    :key="item.value"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item
-                label-width="150px"
-                label="营业执照号"
-                prop="licenseNumber"
-              >
-                <el-input
-                  style="width: 300px"
-                  v-model="modalData.licenseNumber"
-                  placeholder="请输入营业执照号"
-                >
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item
-                label-width="150px"
-                label="营业执照图片"
-                prop="licensePicture"
-              >
-                <el-upload
-                  class="upload-demo"
-                  :action="this.$api.mer_admin.uploadFile()"
-                  :on-success="handleAvatarSuccess"
-                  :file-list="fileList"
-                  list-type="picture"
-                  :headers="{ token: 'Bearer' + this.$cookie.get('token') }"
-                >
-                  <el-button size="small" type="primary">点击上传</el-button>
-                </el-upload>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item
-                label-width="150px"
-                label="法人身份证正面国徽"
-                prop="bankAcctType"
-              >
-              </el-form-item>
-            </el-col>
+                  <el-upload
+                    class="upload-demo"
+                    :action="this.$api.mer_admin.uploadFile()"
+                    :on-success="handIdCardBackImg"
+                    :file-list="fileList"
+                    list-type="picture"
+                    :headers="{ token: this.$cookie.get('token') }"
+                  >
+                    <el-button size="small" type="primary">点击上传</el-button>
+                  </el-upload>
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-row>
         </el-form>
       </template>
@@ -315,13 +433,14 @@ export default {
       modalConfig: {
         title: "添加银行卡",
         show: false,
-        width: "80%",
+        width: "1000px",
       },
       modalData: {},
       value1: [],
       ProductData: {},
       productPlace: "", //地区
       fileList: [],
+      process: 1,
     };
   },
   methods: {
@@ -331,7 +450,6 @@ export default {
         this.modalConfig.show = true;
       } else {
         this.modalConfig.show = false;
-        this.$refs.modal.resetFields();
       }
       if (e) {
         this.init(cloneDeep(e));
@@ -339,6 +457,9 @@ export default {
       return {
         add: () => {
           this.modalConfig.title = "添加银行卡";
+          this.process = 1;
+          this.productPlace = "";
+          this.fileList = [];
           this.$nextTick(() => {
             this.modalData = {
               linkId: JSON.parse(sessionStorage.getItem("userInfo")).managerId
@@ -380,10 +501,31 @@ export default {
     init(row) {},
     handleChange(e) {
       console.log(e);
-      this.modalData.prov = e.join("-");
+      // this.modalData.prov = e.join("-");
     },
     handleAvatarSuccess(res) {
       console.log(res);
+      this.modalData.licensePicture = res.data;
+    },
+    idCardFrontImg(res) {
+      console.log(res);
+      this.modalData.idCardFront = res.data;
+    },
+    idCardBackImg(res) {
+      console.log(res);
+      this.modalData.idCardBack = res.data;
+    },
+    bankLicenseImg(res) {
+      console.log(res);
+      this.modalData.bankLicense = res.data;
+    },
+    handIdCardFrontImg(res) {
+      console.log(res);
+      this.modalData.handIdCardFront = res.data;
+    },
+    handIdCardBackImg(res) {
+      console.log(res);
+      this.modalData.handIdCardBack = res.data;
     },
   },
   computed: {
@@ -396,42 +538,28 @@ export default {
           },
         },
         {
-          label: this.isAdd ? "确认添加" : "确认",
+          label: "上一步",
           type: "primary",
-          loading: this.isLoading,
-          submit: true,
+          disabled: () => this.process == 1,
           handle: () => {
-            let data = {
-              ...this.ProductData,
-              ruleObject: {
-                discount: this.modalData.discount,
-                limitCount: this.modalData.limitCount,
-              },
-              startTime: this.modalData.DiscountTime[0],
-              endTime: this.modalData.DiscountTime[1],
-            };
-            this.$confirm(
-              `此操作将 商品折扣=${this.modalData.discount}折 限购数 = ${this.modalData.limitCount}, 是否确认保存此折扣?`,
-              "提示",
-              {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-                center: true,
-              }
-            )
-              .then(() => {
-                this.$api.mer_admin.setDiscounts(data).then((res) => {
-                  this.toggle();
-                  this.$emit("queryList");
-                });
-              })
-              .catch(() => {
-                this.$message({
-                  type: "info",
-                  message: "已取消",
-                });
+            console.log(this.modalData);
+            this.process = 1;
+          },
+        },
+        {
+          label: this.process == 1 ? "下一步" : "确认添加",
+          type: "primary",
+          handle: () => {
+            if (this.process == 1) {
+              this.process = 2;
+            } else {
+              console.log(this.modalData);
+              this.$api.mer_admin.bankCardAdd(this.modalData).then((res) => {
+                console.log(res);
+                this.$emit("queryList");
+                this.toggle();
               });
+            }
           },
         },
       ];
diff --git a/src/views/modules/bank-card/popup/view-details.vue b/src/views/modules/bank-card/popup/view-details.vue
new file mode 100644
index 0000000..d94034c
--- /dev/null
+++ b/src/views/modules/bank-card/popup/view-details.vue
@@ -0,0 +1,571 @@
+<template>
+  <div>
+    <obj-modal
+      ref="modal"
+      labelWidth="150px"
+      :modalConfig="modalConfig"
+      :modalData="modalData"
+      :modalHandles="modalHandles"
+    >
+      <template slot="dialog__content">
+        <el-form :model="modalData" ref="modalForm">
+          <el-row v-show="process == 1">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="银行类型："
+                  prop="bankType"
+                >
+                  <el-select
+                    disabled
+                    style="width: 300px"
+                    v-model="modalData.bankType"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in [
+                        { label: '摊主银行卡', value: 1 },
+                        { label: '代理银行卡', value: 2 },
+                        { label: '专员银行卡', value: 3 },
+                        { label: '分销银行卡', value: 4 },
+                        { label: '用户银行卡', value: 5 },
+                      ]"
+                      :label="item.label"
+                      :value="item.value"
+                      :key="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label-width="150px" label="企业名称" prop="cas">
+                  <el-input
+                    readonly
+                    style="width: 300px"
+                    v-model="modalData.name"
+                    placeholder="请输入企业名称："
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label-width="150px" label="省份：" prop="prov">
+                  <el-select
+                    disabled
+                    style="width: 300px"
+                    @change="handleChange"
+                    v-model="modalData.prov"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in this.$api.mer_admin.getCityOptions()"
+                      :key="item.name"
+                      :label="item.name"
+                      :value="item.name"
+                    >
+                    </el-option>
+                  </el-select>
+                  <!-- <el-cascader
+                    v-model="productPlace"
+                    style="width: 300px"
+                    :options="this.$api.mer_admin.getCityOptions()"
+                    @change="handleChange"
+                    clearable
+                    :props="{
+                      value: 'name',
+                      label: 'name',
+                      children: 'children',
+                    }"
+                  ></el-cascader> -->
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label-width="150px" label="地级市：" prop="cas">
+                  <el-input
+                    readonly
+                    style="width: 300px"
+                    v-model="modalData.area"
+                    placeholder="请输入地区"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="社会信用码："
+                  prop="prov"
+                >
+                  <el-input
+                    readonly
+                    style="width: 300px"
+                    v-model="modalData.socialCreditCode"
+                    placeholder="请输入社会信用码"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="社会信用码有效期："
+                  prop="socialCreditCodeExpires"
+                >
+                  <el-date-picker
+                    disabled
+                    value-format="yyyy-MM-dd"
+                    style="width: 300px"
+                    v-model="modalData.socialCreditCodeExpires"
+                    type="date"
+                    placeholder="选择日期"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="经营范围："
+                  prop="businessScope"
+                >
+                  <el-input
+                    readonly
+                    style="width: 300px"
+                    v-model="modalData.businessScope"
+                    placeholder="请输入经营范围"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="法人姓名："
+                  prop="legalPerson"
+                >
+                  <el-input
+                    readonly
+                    style="width: 300px"
+                    v-model="modalData.legalPerson"
+                    placeholder="请输入法人姓名"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="	法人身份证号码："
+                  prop="legalCertId"
+                >
+                  <el-input
+                    readonly
+                    style="width: 300px"
+                    v-model="modalData.legalCertId"
+                    placeholder="请输入法人身份证号码"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="法人身份证有效期："
+                  prop="legalCertIdExpires"
+                >
+                  <el-date-picker
+                    disabled
+                    value-format="yyyy-MM-dd"
+                    style="width: 300px"
+                    v-model="modalData.legalCertIdExpires"
+                    type="date"
+                    placeholder="选择日期"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="法人手机号："
+                  prop="legalMp"
+                >
+                  <el-input
+                    readonly
+                    style="width: 300px"
+                    v-model="modalData.legalMp"
+                    placeholder="请输入法人手机号"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="企业地址："
+                  prop="address"
+                >
+                  <el-input
+                    readonly
+                    style="width: 300px"
+                    v-model="modalData.address"
+                    placeholder="请输入企业地址"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="银行代码："
+                  prop="bankCode"
+                >
+                  <el-input
+                    readonly
+                    style="width: 300px"
+                    v-model="modalData.bankCode"
+                    placeholder="请输入银行代码"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="银行卡号："
+                  prop="cardNo"
+                >
+                  <el-input
+                    readonly
+                    style="width: 300px"
+                    v-model="modalData.cardNo"
+                    placeholder="请输入银行卡号"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="银行卡对应户名："
+                  prop="cardName"
+                >
+                  <el-input
+                    readonly
+                    style="width: 300px"
+                    v-model="modalData.cardName"
+                    placeholder="请输入银行卡对应户名"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="银行卡类型："
+                  prop="bankAcctType"
+                >
+                  <el-select
+                    disabled
+                    style="width: 300px"
+                    v-model="modalData.bankAcctType"
+                    placeholder="请输入银行卡类型"
+                  >
+                    <el-option
+                      v-for="item in [
+                        { label: '公账', value: 1 },
+                        { label: '私账', value: 2 },
+                      ]"
+                      :label="item.label"
+                      :value="item.value"
+                      :key="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item
+                  label-width="150px"
+                  label="营业执照号："
+                  prop="licenseNumber"
+                >
+                  <el-input
+                    readonly
+                    style="width: 300px"
+                    v-model="modalData.licenseNumber"
+                    placeholder="请输入营业执照号"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-row>
+          <el-row v-show="process == 2">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="营业执照图片："
+                  prop="licensePicture"
+                >
+                  <el-image
+                    style="width: 100px; height: 100px"
+                    :src="modalData.licensePicture"
+                    :preview-src-list="[modalData.licensePicture]"
+                  >
+                  </el-image>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="法人身份证正面国徽："
+                  prop="idCardFront"
+                >
+                  <el-image
+                    style="width: 100px; height: 100px"
+                    :src="modalData.idCardFront"
+                    :preview-src-list="[modalData.idCardFront]"
+                  >
+                  </el-image>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="法人身份证背面人像："
+                  prop="idCardBack"
+                >
+                  <el-image
+                    style="width: 100px; height: 100px"
+                    :src="modalData.idCardBack"
+                    :preview-src-list="[modalData.idCardBack]"
+                  >
+                  </el-image>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="开户银行许可证照："
+                  prop="bankLicense"
+                >
+                  <el-image
+                    style="width: 100px; height: 100px"
+                    :src="modalData.bankLicense"
+                    :preview-src-list="[modalData.bankLicense]"
+                  >
+                  </el-image>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="手持身份证正面国徽(选传)："
+                  prop="handIdCardFront"
+                >
+                  <el-image
+                    style="width: 100px; height: 100px"
+                    :src="modalData.handIdCardFront"
+                    :preview-src-list="[modalData.handIdCardFront]"
+                  >
+                  </el-image>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="手持身份证背面人像(选传)："
+                  prop="handIdCardBack"
+                >
+                  <el-image
+                    style="width: 100px; height: 100px"
+                    :src="modalData.handIdCardBack"
+                    :preview-src-list="[modalData.handIdCardBack]"
+                  >
+                  </el-image>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-row>
+        </el-form>
+      </template>
+    </obj-modal>
+  </div>
+</template>
+<script>
+import { debounce, cloneDeep } from "lodash";
+import { Divider } from "element-ui";
+export default {
+  components: {},
+  data() {
+    return {
+      isAdd: true,
+      //表格属性
+      modalConfig: {
+        title: "详情",
+        show: false,
+        width: "1000px",
+      },
+      modalData: {},
+      ProductData: {},
+      productPlace: "", //地区
+      fileList: [],
+      process: 1,
+    };
+  },
+  methods: {
+    queryTableData(pageNo, pageSize) {},
+    toggle(e) {
+      if (this.modalConfig.show == false) {
+        this.modalConfig.show = true;
+      } else {
+        this.modalConfig.show = false;
+      }
+      if (e) {
+        this.init(cloneDeep(e.row));
+      }
+      return {
+        add: () => {
+          this.modalConfig.title = "添加银行卡";
+          this.process = 1;
+          this.productPlace = "";
+          this.$nextTick(() => {
+            this.modalData = {
+              linkId: JSON.parse(sessionStorage.getItem("userInfo")).managerId
+                ? JSON.parse(sessionStorage.getItem("userInfo")).managerId
+                : JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
+              bankType: "",
+              name: "",
+              prov: "",
+              area: "",
+              socialCreditCode: "",
+              socialCreditCodeExpires: "",
+              businessScope: "",
+              legalPerson: "",
+              legalCertId: "",
+              legalCertIdExpires: "",
+              legalMp: "",
+              address: "",
+              bankCode: "",
+              cardNo: "",
+              cardName: "",
+              licensePicture: "",
+              idCardFront: "",
+              idCardBack: "",
+              bankLicense: "",
+              handIdCardFront: "",
+              handIdCardBack: "",
+              bankAcctType: "",
+              licenseNumber: "",
+            };
+            this.$refs.modal.resetFields();
+          });
+          this.isAdd = true;
+        },
+        update: () => {
+          this.process = 1;
+          this.modalData.title = "详情";
+          this.isAdd = false;
+        },
+      };
+    },
+    init(row) {
+      console.log(row);
+      this.modalData = row;
+    },
+    handleChange(e) {
+      console.log(e);
+      // this.modalData.prov = e.join("-");
+    },
+    handleAvatarSuccess(res) {
+      console.log(res);
+      this.modalData.licensePicture = res.data;
+    },
+    idCardFrontImg(res) {
+      console.log(res);
+      this.modalData.idCardFront = res.data;
+    },
+    idCardBackImg(res) {
+      console.log(res);
+      this.modalData.idCardBack = res.data;
+    },
+    bankLicenseImg(res) {
+      console.log(res);
+      this.modalData.bankLicense = res.data;
+    },
+    handIdCardFrontImg(res) {
+      console.log(res);
+      this.modalData.handIdCardFront = res.data;
+    },
+    handIdCardBackImg(res) {
+      console.log(res);
+      this.modalData.handIdCardBack = res.data;
+    },
+  },
+  computed: {
+    modalHandles() {
+      return [
+        {
+          label: "取消",
+          handle: () => {
+            this.toggle();
+          },
+        },
+        {
+          label: "上一步",
+          type: "primary",
+          disabled: () => this.process == 1,
+          handle: () => {
+            console.log(this.modalData);
+            this.process = 1;
+          },
+        },
+        {
+          label: this.process == 1 ? "下一步" : "确定",
+          type: "primary",
+          handle: () => {
+            if (this.process == 1) {
+              this.process = 2;
+            } else {
+              this.toggle();
+            }
+          },
+        },
+      ];
+    },
+  },
+  asyncComputed: {},
+};
+</script>
+<style lang="scss" scoped>
+.introduce {
+  padding: 5px;
+  background: #fdf6ec;
+  text-align: center;
+}
+.introduce-center {
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file

From 95a020789bb722797b6189ca996c17cf93f1ab4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Tue, 8 Oct 2024 10:24:39 +0800
Subject: [PATCH 03/20] =?UTF-8?q?=E7=AB=AF=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config/index-prod.js                        | 2 +-
 src/views/modules/bank-card/popup/view-details.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/config/index-prod.js b/public/config/index-prod.js
index 7ce89d8..94d58e2 100644
--- a/public/config/index-prod.js
+++ b/public/config/index-prod.js
@@ -13,7 +13,7 @@
   window.SITE_CONFIG = {};
 
   // 在线api接口请求地址
-	window.SITE_CONFIG['baseUrl'] ="https://admin-test.damajishi.cn"
+	window.SITE_CONFIG['baseUrl'] ="http://admin-test.damajishi.cn:8899"
 
   // cdn地址 = 域名 + 版本号
   window.SITE_CONFIG['domain']  = './'; // 域名
diff --git a/src/views/modules/bank-card/popup/view-details.vue b/src/views/modules/bank-card/popup/view-details.vue
index d94034c..08b354e 100644
--- a/src/views/modules/bank-card/popup/view-details.vue
+++ b/src/views/modules/bank-card/popup/view-details.vue
@@ -534,7 +534,7 @@ export default {
           },
         },
         {
-          label: "上一步",
+          label: "上一页",
           type: "primary",
           disabled: () => this.process == 1,
           handle: () => {
@@ -543,7 +543,7 @@ export default {
           },
         },
         {
-          label: this.process == 1 ? "下一步" : "确定",
+          label: this.process == 1 ? "下一页" : "确定",
           type: "primary",
           handle: () => {
             if (this.process == 1) {

From 0ad0c4cf997485626832e2af5424917a0050f19c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Tue, 8 Oct 2024 11:04:11 +0800
Subject: [PATCH 04/20] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config/index-prod.js | 11 +++--
 public/config/index.js      | 18 +++----
 src/views/common/login.vue  | 95 +++++++++++++++++++++++++++++--------
 3 files changed, 92 insertions(+), 32 deletions(-)

diff --git a/public/config/index-prod.js b/public/config/index-prod.js
index 94d58e2..6096255 100644
--- a/public/config/index-prod.js
+++ b/public/config/index-prod.js
@@ -9,14 +9,15 @@
 /**
  * 生产环境
  */
-;(function () {
+(function () {
   window.SITE_CONFIG = {};
 
   // 在线api接口请求地址
-	window.SITE_CONFIG['baseUrl'] ="http://admin-test.damajishi.cn:8899"
+  window.SITE_CONFIG["baseUrl"] = "https://admin-test.damajishi.cn/";
 
   // cdn地址 = 域名 + 版本号
-  window.SITE_CONFIG['domain']  = './'; // 域名
-  window.SITE_CONFIG['version'] = '';   // 版本号(年月日时分)
-  window.SITE_CONFIG['cdnUrl']  = window.SITE_CONFIG.domain + window.SITE_CONFIG.version;
+  window.SITE_CONFIG["domain"] = "./"; // 域名
+  window.SITE_CONFIG["version"] = ""; // 版本号(年月日时分)
+  window.SITE_CONFIG["cdnUrl"] =
+    window.SITE_CONFIG.domain + window.SITE_CONFIG.version;
 })();
diff --git a/public/config/index.js b/public/config/index.js
index 5e4df22..415da64 100644
--- a/public/config/index.js
+++ b/public/config/index.js
@@ -9,16 +9,18 @@
 /**
  * 开发环境
  */
-;(function () {
+(function () {
   window.SITE_CONFIG = {};
   // api接口请求地址
-	window.SITE_CONFIG['baseUrl'] ="http://admin-test.damajishi.cn:8899"
-   // 在线api接口请求地址
+  window.SITE_CONFIG["baseUrl"] = "https://admin-test.damajishi.cn/";
+  // 在线api接口请求地址
   //  window.SITE_CONFIG['baseUrl'] = 'http://119.29.103.250:8082/red-memory';
-   // 在线api接口请求地址
-   window.SITE_CONFIG['baseUrlComment'] = 'http://123.60.109.11:8081/red-memory-user';
+  // 在线api接口请求地址
+  window.SITE_CONFIG["baseUrlComment"] =
+    "http://123.60.109.11:8081/red-memory-user";
   // cdn地址 = 域名 + 版本号
-  window.SITE_CONFIG['domain']  = './'; // 域名
-  window.SITE_CONFIG['version'] = '';   // 版本号(年月日时分)
-  window.SITE_CONFIG['cdnUrl']  = window.SITE_CONFIG.domain + window.SITE_CONFIG.version;
+  window.SITE_CONFIG["domain"] = "./"; // 域名
+  window.SITE_CONFIG["version"] = ""; // 版本号(年月日时分)
+  window.SITE_CONFIG["cdnUrl"] =
+    window.SITE_CONFIG.domain + window.SITE_CONFIG.version;
 })();
diff --git a/src/views/common/login.vue b/src/views/common/login.vue
index e9c01ae..b763c0e 100644
--- a/src/views/common/login.vue
+++ b/src/views/common/login.vue
@@ -13,15 +13,32 @@
         </div>
         <div class="login-main">
           <h3 class="login-title">大妈集市商户端登录</h3>
-          <el-tabs v-if="false" :stretch="true" v-model="loginWay" @tab-click="loginWayClick">
+          <el-tabs
+            v-if="false"
+            :stretch="true"
+            v-model="loginWay"
+            @tab-click="loginWayClick"
+          >
             <el-tab-pane label="账户登录" name="account_login">
-              <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
-                status-icon>
+              <el-form
+                :model="dataForm"
+                :rules="dataRule"
+                ref="dataForm"
+                @keyup.enter.native="dataFormSubmit()"
+                status-icon
+              >
                 <el-form-item prop="userName">
-                  <el-input v-model="dataForm.userName" placeholder="帐号"></el-input>
+                  <el-input
+                    v-model="dataForm.userName"
+                    placeholder="帐号"
+                  ></el-input>
                 </el-form-item>
                 <el-form-item prop="password">
-                  <el-input v-model="dataForm.password" type="password" placeholder="密码"></el-input>
+                  <el-input
+                    v-model="dataForm.password"
+                    type="password"
+                    placeholder="密码"
+                  ></el-input>
                 </el-form-item>
                 <!-- <el-form-item prop="captcha">
               <el-row :gutter="20">
@@ -35,45 +52,85 @@
               </el-row>
             </el-form-item> -->
                 <el-form-item>
-                  <el-button class="login-btn-submit" type="primary" @click="dataFormSubmit()">登录</el-button>
+                  <el-button
+                    class="login-btn-submit"
+                    type="primary"
+                    @click="dataFormSubmit()"
+                    >登录</el-button
+                  >
                 </el-form-item>
               </el-form>
             </el-tab-pane>
             <el-tab-pane label="验证码登录" name="code_login">
-              <el-form :model="loginByYZMForm" :rules="loginByYZMFormRule" ref="loginByYZMRef"
-                @keyup.enter.native="loginByYZMSubmit()" status-icon>
+              <el-form
+                :model="loginByYZMForm"
+                :rules="loginByYZMFormRule"
+                ref="loginByYZMRef"
+                @keyup.enter.native="loginByYZMSubmit()"
+                status-icon
+              >
                 <el-form-item prop="mobile">
-                  <el-input v-model="loginByYZMForm.mobile" placeholder="手机号码"></el-input>
+                  <el-input
+                    v-model="loginByYZMForm.mobile"
+                    placeholder="手机号码"
+                  ></el-input>
                 </el-form-item>
                 <el-form-item prop="code">
-                  <el-input v-model="loginByYZMForm.code" placeholder="短信验证码">
+                  <el-input
+                    v-model="loginByYZMForm.code"
+                    placeholder="短信验证码"
+                  >
                     <template slot="append">
-                      <el-button v-if="mobileCodeCountDown <= 0" @click="getCode">获取验证码</el-button>
+                      <el-button
+                        v-if="mobileCodeCountDown <= 0"
+                        @click="getCode"
+                        >获取验证码</el-button
+                      >
                       <el-button v-else>{{ mobileCodeCountDown }}s</el-button>
                     </template>
                   </el-input>
                 </el-form-item>
                 <el-form-item>
-                  <el-button class="login-btn-submit" type="primary" @click="loginByYZMSubmit()">登录</el-button>
+                  <el-button
+                    class="login-btn-submit"
+                    type="primary"
+                    @click="loginByYZMSubmit()"
+                    >登录</el-button
+                  >
                 </el-form-item>
               </el-form>
             </el-tab-pane>
           </el-tabs>
-          <el-form :model="loginByYZMForm" :rules="loginByYZMFormRule" ref="loginByYZMRef"
-            @keyup.enter.native="loginByYZMSubmit()" status-icon>
+          <el-form
+            :model="loginByYZMForm"
+            :rules="loginByYZMFormRule"
+            ref="loginByYZMRef"
+            @keyup.enter.native="loginByYZMSubmit()"
+            status-icon
+          >
             <el-form-item prop="mobile">
-              <el-input v-model="loginByYZMForm.mobile" placeholder="手机号码"></el-input>
+              <el-input
+                v-model="loginByYZMForm.mobile"
+                placeholder="手机号码"
+              ></el-input>
             </el-form-item>
             <el-form-item prop="code">
               <el-input v-model="loginByYZMForm.code" placeholder="短信验证码">
                 <template slot="append">
-                  <el-button v-if="mobileCodeCountDown <= 0" @click="getCode">获取验证码</el-button>
+                  <el-button v-if="mobileCodeCountDown <= 0" @click="getCode"
+                    >获取验证码</el-button
+                  >
                   <el-button v-else>{{ mobileCodeCountDown }}s</el-button>
                 </template>
               </el-input>
             </el-form-item>
             <el-form-item>
-              <el-button class="login-btn-submit" type="primary" @click="loginByYZMSubmit()">登录</el-button>
+              <el-button
+                class="login-btn-submit"
+                type="primary"
+                @click="loginByYZMSubmit()"
+                >登录</el-button
+              >
             </el-form-item>
           </el-form>
         </div>
@@ -125,7 +182,7 @@ export default {
     this.getCaptcha();
   },
   methods: {
-    loginWayClick(tab, event) { },
+    loginWayClick(tab, event) {},
     // 提交表单
     dataFormSubmit() {
       const _loginTypeMapper = {
@@ -344,7 +401,7 @@ export default {
   .login-captcha {
     overflow: hidden;
 
-    >img {
+    > img {
       width: 100%;
       cursor: pointer;
     }

From 3fc5c0b27d9d7eefc060ef2ba570ec0fc40405cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Tue, 8 Oct 2024 15:59:29 +0800
Subject: [PATCH 05/20] add

---
 src/utils/httpRequest.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/utils/httpRequest.js b/src/utils/httpRequest.js
index b5c86fe..15b2e25 100644
--- a/src/utils/httpRequest.js
+++ b/src/utils/httpRequest.js
@@ -35,18 +35,18 @@ http.interceptors.request.use(
   config => {
     config.headers["token"] =`Bearer ${Vue.cookie.get("token")}`; // 请求头带上token
     // 针对post请求加密
-    if (config.method.toLowerCase() === "post" && process.env.NODE_ENV === "production" ) {
-      //如果已经转成字符串了，就不用再转了
-      if (typeof config.data === "string") {
-        config.data = des.encryptByDES(config.data, "u48rE-RlGbua_K_m$*#z99lt");
-      } else {
-        //否则要转一次
-        config.data = des.encryptByDES(
-          JSON.stringify(config.data),
-          "u48rE-RlGbua_K_m$*#z99lt"
-        );
-      }
-    }
+    // if (config.method.toLowerCase() === "post" && process.env.NODE_ENV === "production" ) {
+    //   //如果已经转成字符串了，就不用再转了
+    //   if (typeof config.data === "string") {
+    //     config.data = des.encryptByDES(config.data, "u48rE-RlGbua_K_m$*#z99lt");
+    //   } else {
+    //     //否则要转一次
+    //     config.data = des.encryptByDES(
+    //       JSON.stringify(config.data),
+    //       "u48rE-RlGbua_K_m$*#z99lt"
+    //     );
+    //   }
+    // }
     if (process.env.NODE_ENV !== "production") {
       console.log(`【请求】${config.url}`, config);
     }

From 0f3c1774ecde7a9653c54022a4cbebe03ce7503c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Tue, 8 Oct 2024 18:06:38 +0800
Subject: [PATCH 06/20] add

---
 src/views/common/home.vue | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/views/common/home.vue b/src/views/common/home.vue
index 470580d..0d62a09 100644
--- a/src/views/common/home.vue
+++ b/src/views/common/home.vue
@@ -7,13 +7,11 @@
  * @FilePath: \background-front-end\src\views\common\home.vue
 -->
 <template>
-  <div class="mod-home">
-  </div>
+  <div class="mod-home"></div>
 </template>
 
 <script>
-export default {
-}
+export default {};
 </script>
 
 <style lang="scss" scoped>
@@ -21,19 +19,19 @@ export default {
   line-height: 1.5;
 }
 .el-carousel__item h3 {
-    color: #475669;
-    font-size: 18px;
-    opacity: 0.75;
-    line-height: 300px;
-    margin: 0;
-    color: #fff;
-  }
-  
-  .el-carousel__item:nth-child(2n) {
-    background-color: #99a9bf;
-  }
-  
-  .el-carousel__item:nth-child(2n+1) {
-    background-color: #d3dce6;
-  }
+  color: #475669;
+  font-size: 18px;
+  opacity: 0.75;
+  line-height: 300px;
+  margin: 0;
+  color: #fff;
+}
+
+.el-carousel__item:nth-child(2n) {
+  background-color: #99a9bf;
+}
+
+.el-carousel__item:nth-child(2n + 1) {
+  background-color: #d3dce6;
+}
 </style>

From 9e60dfcc0c563a05f040299f92c38c02db727f06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Sat, 12 Oct 2024 14:58:09 +0800
Subject: [PATCH 07/20] =?UTF-8?q?=E9=93=B6=E8=A1=8C=E5=8D=A1=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/bank-card/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/bank-card/index.vue b/src/views/modules/bank-card/index.vue
index cb509c4..cb8fa67 100644
--- a/src/views/modules/bank-card/index.vue
+++ b/src/views/modules/bank-card/index.vue
@@ -15,8 +15,8 @@
             <el-select v-model="formInline.status" placeholder="请选择">
               <el-option label="全部" value=""></el-option>
               <el-option label="审核中" value="0"></el-option>
-              <el-option label="未通过" value="1"></el-option>
-              <el-option label="已通过" value="2"></el-option>
+              <el-option label="未通过" value="2"></el-option>
+              <el-option label="已通过" value="1"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item>
@@ -153,9 +153,9 @@ export default {
           render: ({ row }) => {
             if (row.status == 0) {
               return <span>审核中</span>;
-            } else if (row.status == 1) {
-              return <span>未通过</span>;
             } else if (row.status == 2) {
+              return <span>未通过</span>;
+            } else if (row.status == 1) {
               return <span>已通过</span>;
             }
           },

From 37ec774348d687dd8602ae1e9900271dab7d0c71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Tue, 15 Oct 2024 18:02:25 +0800
Subject: [PATCH 08/20] =?UTF-8?q?=E9=93=B6=E8=A1=8C=E5=8D=A1=E7=A7=81?=
 =?UTF-8?q?=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/common.js                     |   2 +-
 .../modules/bank-card/popup/add-or-update.vue | 354 ++++++++++++++----
 src/views/modules/product/index.vue           |   2 +
 .../modules/product/popup/add-or-update.vue   |   2 +
 4 files changed, 291 insertions(+), 69 deletions(-)

diff --git a/src/api/modules/common.js b/src/api/modules/common.js
index 930cbe0..0d5c907 100644
--- a/src/api/modules/common.js
+++ b/src/api/modules/common.js
@@ -15,7 +15,7 @@ export const password = (password, newPassword) => {
 // 退出登录
 export const logout = () => {
     return $http({
-        url: '/auth/logout',
+        url: '/merchant-api/auth/logout',
         method: 'post',
         data: $http.adornData()
     })
diff --git a/src/views/modules/bank-card/popup/add-or-update.vue b/src/views/modules/bank-card/popup/add-or-update.vue
index 17f1a18..0fa56a6 100644
--- a/src/views/modules/bank-card/popup/add-or-update.vue
+++ b/src/views/modules/bank-card/popup/add-or-update.vue
@@ -9,7 +9,47 @@
     >
       <template slot="dialog__content">
         <el-form :model="modalData" ref="modalForm">
-          <el-row v-show="process == 1">
+          <el-row v-show="process == 1 && modalData.bankAcctType == 1">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="银行卡类型："
+                  prop="bankAcctType"
+                >
+                  <el-select
+                    @change="handleChange"
+                    style="width: 300px"
+                    v-model="modalData.bankAcctType"
+                    placeholder="请输入银行卡类型"
+                  >
+                    <el-option
+                      v-for="item in [
+                        { label: '公账', value: 1 },
+                        { label: '私账', value: 2 },
+                      ]"
+                      :label="item.label"
+                      :value="item.value"
+                      :key="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="银行卡对应户名："
+                  prop="cardName"
+                >
+                  <el-input
+                    style="width: 300px"
+                    v-model="modalData.cardName"
+                    placeholder="请输入银行卡对应户名"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row>
               <el-col :span="12">
                 <el-form-item
@@ -244,45 +284,6 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item
-                  label-width="150px"
-                  label="银行卡对应户名："
-                  prop="cardName"
-                >
-                  <el-input
-                    style="width: 300px"
-                    v-model="modalData.cardName"
-                    placeholder="请输入银行卡对应户名"
-                  >
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item
-                  label-width="150px"
-                  label="银行卡类型："
-                  prop="bankAcctType"
-                >
-                  <el-select
-                    style="width: 300px"
-                    v-model="modalData.bankAcctType"
-                    placeholder="请输入银行卡类型"
-                  >
-                    <el-option
-                      v-for="item in [
-                        { label: '公账', value: 1 },
-                        { label: '私账', value: 2 },
-                      ]"
-                      :label="item.label"
-                      :value="item.value"
-                      :key="item.value"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
             <el-row>
               <el-col :span="24">
                 <el-form-item
@@ -300,7 +301,7 @@
               </el-col>
             </el-row>
           </el-row>
-          <el-row v-show="process == 2">
+          <el-row v-show="process == 2 && modalData.bankAcctType == 1">
             <el-row>
               <el-col :span="12">
                 <el-form-item
@@ -416,6 +417,154 @@
               </el-col>
             </el-row>
           </el-row>
+          <el-row v-show="modalData.bankAcctType == 2">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="银行卡类型："
+                  prop="bankAcctType"
+                >
+                  <el-select
+                    @change="handleChange"
+                    style="width: 300px"
+                    v-model="modalData.bankAcctType"
+                    placeholder="请输入银行卡类型"
+                  >
+                    <el-option
+                      v-for="item in [
+                        { label: '公账', value: 1 },
+                        { label: '私账', value: 2 },
+                      ]"
+                      :label="item.label"
+                      :value="item.value"
+                      :key="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="银行卡对应户名："
+                  prop="cardName"
+                >
+                  <el-input
+                    style="width: 300px"
+                    v-model="modalData.cardName"
+                    placeholder="请输入银行卡对应户名"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="银行类型："
+                  prop="bankType"
+                >
+                  <el-select
+                    style="width: 300px"
+                    v-model="modalData.bankType"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in [
+                        { label: '摊主银行卡', value: 1 },
+                        { label: '代理银行卡', value: 2 },
+                        { label: '专员银行卡', value: 3 },
+                        { label: '分销银行卡', value: 4 },
+                        { label: '用户银行卡', value: 5 },
+                      ]"
+                      :label="item.label"
+                      :value="item.value"
+                      :key="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="	身份证号码："
+                  prop="certId"
+                >
+                  <el-input
+                    style="width: 300px"
+                    v-model="modalData.certId"
+                    placeholder="请输入身份证号码"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label-width="150px" label="手机号：" prop="telNo">
+                  <el-input
+                    style="width: 300px"
+                    v-model="modalData.telNo"
+                    placeholder="请输入法人手机号"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="银行卡号："
+                  prop="cardId"
+                >
+                  <el-input
+                    style="width: 300px"
+                    v-model="modalData.cardId"
+                    placeholder="请输入银行卡号"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="法人身份证正面国徽："
+                  prop="bankAcctType"
+                >
+                  <el-upload
+                    class="upload-demo"
+                    :action="this.$api.mer_admin.uploadFile()"
+                    :on-success="idCardFrontImg"
+                    :file-list="fileList"
+                    list-type="picture"
+                    :headers="{ token: this.$cookie.get('token') }"
+                  >
+                    <el-button size="small" type="primary">点击上传</el-button>
+                  </el-upload>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label-width="150px"
+                  label="法人身份证背面人像："
+                  prop="licensePicture"
+                >
+                  <el-upload
+                    class="upload-demo"
+                    :action="this.$api.mer_admin.uploadFile()"
+                    :on-success="idCardBackImg"
+                    :file-list="fileList"
+                    list-type="picture"
+                    :headers="{ token: this.$cookie.get('token') }"
+                  >
+                    <el-button size="small" type="primary">点击上传</el-button>
+                  </el-upload>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-row>
         </el-form>
       </template>
     </obj-modal>
@@ -486,7 +635,7 @@ export default {
               bankLicense: "",
               handIdCardFront: "",
               handIdCardBack: "",
-              bankAcctType: "",
+              bankAcctType: 1,
               licenseNumber: "",
             };
             this.$refs.modal.resetFields();
@@ -500,8 +649,7 @@ export default {
     },
     init(row) {},
     handleChange(e) {
-      console.log(e);
-      // this.modalData.prov = e.join("-");
+      this.modalData.prov = e.join("-");
     },
     handleAvatarSuccess(res) {
       console.log(res);
@@ -527,42 +675,112 @@ export default {
       console.log(res);
       this.modalData.handIdCardBack = res.data;
     },
+    handleChange(e) {
+      if (e == 1) {
+        this.modalData = {
+          linkId: JSON.parse(sessionStorage.getItem("userInfo")).managerId
+            ? JSON.parse(sessionStorage.getItem("userInfo")).managerId
+            : JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
+          bankType: "",
+          name: "",
+          prov: "",
+          area: "",
+          socialCreditCode: "",
+          socialCreditCodeExpires: "",
+          businessScope: "",
+          legalPerson: "",
+          legalCertId: "",
+          legalCertIdExpires: "",
+          legalMp: "",
+          address: "",
+          bankCode: "",
+          cardNo: "",
+          cardName: "",
+          licensePicture: "",
+          idCardFront: "",
+          idCardBack: "",
+          bankLicense: "",
+          handIdCardFront: "",
+          handIdCardBack: "",
+          bankAcctType: 1,
+          licenseNumber: "",
+        };
+        console.log(e);
+      } else {
+        this.modalData = {
+          linkId: JSON.parse(sessionStorage.getItem("userInfo")).managerId
+            ? JSON.parse(sessionStorage.getItem("userInfo")).managerId
+            : JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
+          bankType: "",
+          cardId: "",
+          cardName: "",
+          certId: "",
+          telNo: "",
+          idCardFront: "",
+          idCardBack: "",
+          bankAcctType: 2,
+        };
+      }
+    },
   },
   computed: {
     modalHandles() {
-      return [
-        {
-          label: "取消",
-          handle: () => {
-            this.toggle();
+      if (this.modalData.bankAcctType == 1) {
+        return [
+          {
+            label: "取消",
+            handle: () => {
+              this.toggle();
+            },
           },
-        },
-        {
-          label: "上一步",
-          type: "primary",
-          disabled: () => this.process == 1,
-          handle: () => {
-            console.log(this.modalData);
-            this.process = 1;
+          {
+            label: "上一步",
+            type: "primary",
+            disabled: () => this.process == 1,
+            handle: () => {
+              console.log(this.modalData);
+              this.process = 1;
+            },
           },
-        },
-        {
-          label: this.process == 1 ? "下一步" : "确认添加",
-          type: "primary",
-          handle: () => {
-            if (this.process == 1) {
-              this.process = 2;
-            } else {
+          {
+            label: this.process == 1 ? "下一步" : "确认添加",
+            type: "primary",
+            handle: () => {
+              if (this.process == 1) {
+                this.process = 2;
+              } else {
+                console.log(this.modalData);
+                this.$api.mer_admin.bankCardAdd(this.modalData).then((res) => {
+                  console.log(res);
+                  this.$emit("queryList");
+                  this.toggle();
+                });
+              }
+            },
+          },
+        ];
+      } else {
+        return [
+          {
+            label: "取消",
+            handle: () => {
+              this.toggle();
+            },
+          },
+          {
+            label: "确认添加",
+            type: "primary",
+            handle: () => {
               console.log(this.modalData);
               this.$api.mer_admin.bankCardAdd(this.modalData).then((res) => {
                 console.log(res);
                 this.$emit("queryList");
                 this.toggle();
               });
-            }
+            },
           },
-        },
-      ];
+        ];
+      }
     },
   },
   asyncComputed: {},
diff --git a/src/views/modules/product/index.vue b/src/views/modules/product/index.vue
index 928ce5d..bf23e1a 100644
--- a/src/views/modules/product/index.vue
+++ b/src/views/modules/product/index.vue
@@ -288,6 +288,8 @@ export default {
           width: "340px",
           render: ({ row }) => {
             let edit = () => {
+              console.log(row);
+              
               this.$refs.addOrUpdate.toggle(row).update();
             };
             let priceAdjustment = () => {
diff --git a/src/views/modules/product/popup/add-or-update.vue b/src/views/modules/product/popup/add-or-update.vue
index fc0c9f1..0fdf68a 100644
--- a/src/views/modules/product/popup/add-or-update.vue
+++ b/src/views/modules/product/popup/add-or-update.vue
@@ -208,6 +208,8 @@ export default {
           });
 
           this.isAdd = true;
+          console.log('112233');
+          
         },
         update: () => {
           this.modalConfig.title = "编辑商品";

From 4733d3c3b279dd4c62461b78af44aa417333d23f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Sun, 20 Oct 2024 17:00:39 +0800
Subject: [PATCH 09/20] =?UTF-8?q?=E5=93=81=E7=89=8C=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/full-routers.js                    |  27 ++++
 src/views/modules/brand/config/index.vue      | 108 +++++++++++++
 .../brand/config/popup/add-or-update.vue      | 148 ++++++++++++++++++
 src/views/modules/product/index.vue           | 144 +++++++++--------
 4 files changed, 358 insertions(+), 69 deletions(-)
 create mode 100644 src/views/modules/brand/config/index.vue
 create mode 100644 src/views/modules/brand/config/popup/add-or-update.vue

diff --git a/src/router/full-routers.js b/src/router/full-routers.js
index fe7a742..d307d85 100644
--- a/src/router/full-routers.js
+++ b/src/router/full-routers.js
@@ -93,6 +93,33 @@ export default {
       open: null,
       list: [],
     },
+    {
+      menuId: getUUID(),
+      parentId: 0,
+      parentName: null,
+      name: "品牌管理",
+      url: "",
+      perms: "",
+      type: 0,
+      elIcon: "el-icon-money",
+      orderNum: 0,
+      open: null,
+      list: [
+        {
+          menuId: getUUID(),
+          parentId: 0,
+          parentName: null,
+          name: "品牌管理",
+          url: "brand/config/index",
+          perms: "",
+          type: 1,
+          elIcon: "el-icon-postcard",
+          orderNum: 0,
+          open: null,
+          list: [],
+        },
+      ],
+    },
     // {
     //     "menuId": getUUID(),
     //     "parentId": 0,
diff --git a/src/views/modules/brand/config/index.vue b/src/views/modules/brand/config/index.vue
new file mode 100644
index 0000000..779b365
--- /dev/null
+++ b/src/views/modules/brand/config/index.vue
@@ -0,0 +1,108 @@
+<template>
+  <div style="height: calc(100vh - 200px)">
+    <div class="brandPage">
+      <span class="pattern"></span>
+      品牌管理
+    </div>
+    <div class="brandInfo">
+      <span class="pattern"></span>
+      品牌信息
+      <span @click="infoUpdate" class="brandInfo-update">编辑</span>
+    </div>
+    <div class="info-content">
+      <div class="info-item">品牌名称：</div>
+      <div class="info-item">品牌ID:</div>
+      <div class="info-item">品牌LOGO:</div>
+      <div class="info-item">品牌背景:</div>
+      <div class="info-item">品牌首页:</div>
+      <div class="info-item">宣传语:</div>
+      <div class="info-item">宣传视频:</div>
+    </div>
+    <div class="brandInfo">
+      <span class="pattern"></span>
+      账号信息
+    </div>
+    <div class="info-content">
+      <div class="info-item">管理员账号：</div>
+      <div class="info-item">
+        管理员密码:
+        <span @click="infoUpdate" class="brandInfo-update">修改</span>
+      </div>
+    </div>
+    <div class="brandInfo">
+      <span class="pattern"></span>
+      其他信息
+    </div>
+    <div class="info-content">
+      <div class="info-item">品牌联系人：</div>
+      <div class="info-item">联系方式:</div>
+    </div>
+    <div class="brandInfo">
+      <span class="pattern"></span>
+      推广营销工具
+    </div>
+    <div class="info-content">
+      <div class="info-item">
+        品牌分销推广:
+        <span @click="infoUpdate" class="brandInfo-update">配置</span>
+      </div>
+    </div>
+    <!-- 编辑品牌信息 -->
+    <addOrUpdate ref="addOrUpdate"></addOrUpdate>
+  </div>
+</template>
+
+<script>
+import addOrUpdate from "./popup/add-or-update.vue";
+export default {
+  components: { addOrUpdate },
+  data() {
+    return {};
+  },
+  methods: {
+    infoUpdate() {
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.toggle().update();
+      });
+      console.log("123");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.brandPage {
+  width: 100%;
+  font-size: 18px;
+  padding-bottom: 15px;
+  margin-bottom: 20px;
+  border-bottom: 2px solid rgba(28, 146, 152, 1);
+}
+.pattern {
+  display: inline-block;
+  width: 2px;
+  height: 15px;
+  background: rgba(28, 146, 152, 1);
+}
+.brandInfo {
+  //   margin-top: 20px;
+  font-size: 18px;
+}
+.brandInfo-update {
+  display: inline-block;
+  font-size: 15px;
+  color: rgba(28, 146, 152, 1);
+  margin-left: 10px;
+}
+.info-content {
+  display: flex;
+  // justify-content: space-between;
+  flex-wrap: wrap;
+  padding: 20px 10px;
+  .info-item {
+    width: 40%;
+    margin-bottom: 20px;
+    font-size: 18px;
+  }
+}
+</style>  
\ No newline at end of file
diff --git a/src/views/modules/brand/config/popup/add-or-update.vue b/src/views/modules/brand/config/popup/add-or-update.vue
new file mode 100644
index 0000000..ed99012
--- /dev/null
+++ b/src/views/modules/brand/config/popup/add-or-update.vue
@@ -0,0 +1,148 @@
+<template>
+  <div>
+    <obj-modal
+      ref="modal"
+      labelWidth="150px"
+      :modalCols="modalCols"
+      :modalConfig="modalConfig"
+      :modalData="modalData"
+      :modalHandles="modalHandles"
+    >
+    </obj-modal>
+  </div>
+</template>
+<script>
+import { debounce, cloneDeep } from "lodash";
+import { Divider } from "element-ui";
+export default {
+  components: {},
+  data() {
+    return {
+      isAdd: true,
+      //表格属性
+      modalConfig: {
+        title: "编辑品牌",
+        show: false,
+        width: "60%",
+      },
+      modalData: {},
+      value1: [],
+      ProductData: {},
+    };
+  },
+  methods: {
+    queryTableData(pageNo, pageSize) {},
+    toggle(e) {
+      if (this.modalConfig.show == false) {
+        this.modalConfig.show = true;
+      } else {
+        this.modalConfig.show = false;
+      }
+      if (e) {
+        this.init(cloneDeep(e));
+      }
+      return {
+        add: () => {
+          this.$nextTick(() => {
+            this.modalData = {};
+          });
+          this.isAdd = true;
+        },
+        update: () => {
+          this.isAdd = false;
+        },
+      };
+    },
+    init(row) {},
+  },
+  computed: {
+    modalCols() {
+      return [
+        {
+          label: "商品折扣（折）",
+          prop: "discount",
+          type: "Input",
+          width: "300px",
+          rules: { required: true, message: "请输入打折数" },
+          type: "jsx",
+          render: () => {
+            return (
+              <div>
+                <el-input-number
+                  min={0}
+                  max={9.9}
+                  v-model={this.modalData.discount}
+                ></el-input-number>
+                <span> 提示： 请输入≤9.9数字 如:8折=售价*0.8</span>
+              </div>
+            );
+          },
+        },
+        {
+          label: "限制购买(数量)",
+          prop: "limitCount",
+          type: "Input",
+          width: "300px",
+          rules: { required: true, message: "请输入价格" },
+          type: "jsx",
+          render: () => {
+            return (
+              <div>
+                <el-input-number
+                  min={1}
+                  max={99}
+                  v-model={this.modalData.limitCount}
+                  step={1}
+                  step-strictly
+                ></el-input-number>
+                <span> 提示： 请输入≤99数字 超出数量以原价购买</span>
+              </div>
+            );
+          },
+        },
+        {
+          label: "活动时间",
+          prop: "DiscountTime",
+          type: "Input",
+          width: "300px",
+          rules: { required: true, message: "请输入活动时间" },
+          type: "jsx",
+          render: () => {
+            return (
+              <el-date-picker
+                // format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                v-model={this.modalData.DiscountTime}
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></el-date-picker>
+            );
+          },
+        },
+      ];
+    },
+    modalHandles() {
+      return [
+        {
+          label: "取消",
+          handle: () => {
+            this.toggle();
+          },
+        },
+        {
+          label: this.isAdd ? "确认添加" : "确认",
+          type: "primary",
+          loading: this.isLoading,
+          submit: true,
+          handle: () => {},
+        },
+      ];
+    },
+  },
+  asyncComputed: {},
+};
+</script>
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/modules/product/index.vue b/src/views/modules/product/index.vue
index bf23e1a..959977d 100644
--- a/src/views/modules/product/index.vue
+++ b/src/views/modules/product/index.vue
@@ -1,73 +1,78 @@
 <template>
-  <div style="height: calc(100vh - 200px)">
-    <obj-table-plus
-      ref="oTable"
-      style="height: 100%"
-      :tableCols="tableCols"
-      :tableProp="tableProp"
-      @query="queryList"
-      v-model="dataList"
-      :tableEvent="tableEvent"
-    >
-      <template slot="tableTop">
-        <el-form :inline="true" :model="formInline" class="demo-form-inline">
-          <el-form-item label="平台分类">
-            <el-select v-model="formInline.region" placeholder="活动区域">
-              <el-option label="区域一" value="shanghai"></el-option>
-              <el-option label="区域二" value="beijing"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="商户分类">
-            <el-select v-model="formInline.region" placeholder="活动区域">
-              <el-option label="区域一" value="shanghai"></el-option>
-              <el-option label="区域二" value="beijing"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="商品搜索">
-            <el-input
-              v-model="formInline.user"
-              placeholder="商品搜索"
-            ></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="$refs.oTable.reload()"
-              >查询</el-button
+  <div>
+    <div v-if="shopId" style="height: calc(100vh - 200px)">
+      <obj-table-plus
+        ref="oTable"
+        style="height: 100%"
+        :tableCols="tableCols"
+        :tableProp="tableProp"
+        @query="queryList"
+        v-model="dataList"
+        :tableEvent="tableEvent"
+      >
+        <template slot="tableTop">
+          <el-form :inline="true" :model="formInline" class="demo-form-inline">
+            <el-form-item label="平台分类">
+              <el-select v-model="formInline.region" placeholder="活动区域">
+                <el-option label="区域一" value="shanghai"></el-option>
+                <el-option label="区域二" value="beijing"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="商户分类">
+              <el-select v-model="formInline.region" placeholder="活动区域">
+                <el-option label="区域一" value="shanghai"></el-option>
+                <el-option label="区域二" value="beijing"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="商品搜索">
+              <el-input
+                v-model="formInline.user"
+                placeholder="商品搜索"
+              ></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" @click="$refs.oTable.reload()"
+                >查询</el-button
+              >
+            </el-form-item>
+          </el-form>
+          <el-tabs v-model="activeName" @tab-click="handleClick">
+            <el-tab-pane label="在售" name="在售"></el-tab-pane>
+            <el-tab-pane label="仓库中" name="仓库中"></el-tab-pane>
+            <el-tab-pane label="折扣" name="折扣"></el-tab-pane>
+          </el-tabs>
+          <div class="mb-2">
+            <el-button type="primary" size="small" @click="addProduct"
+              >添加商品</el-button
             >
-          </el-form-item>
-        </el-form>
-        <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="在售" name="在售"></el-tab-pane>
-          <el-tab-pane label="仓库中" name="仓库中"></el-tab-pane>
-          <el-tab-pane label="折扣" name="折扣"></el-tab-pane>
-        </el-tabs>
-        <div class="mb-2">
-          <el-button type="primary" size="small" @click="addProduct"
-            >添加商品</el-button
-          >
-          <el-button
-            :disabled="selectList.length <= 0"
-            type="danger"
-            size="small"
-            @click="deleteProduct"
-            >批量删除</el-button
-          >
-        </div>
-      </template>
-    </obj-table-plus>
-    <!-- 添加或编辑 -->
-    <add-or-update
-      @queryList="$refs.oTable.reload()"
-      ref="addOrUpdate"
-    ></add-or-update>
-    <!-- 改价格 -->
-    <AddPrice ref="AddPrice" @queryList="$refs.oTable.reload()"></AddPrice>
-    <!-- 改库存 -->
-    <addStock ref="addStock" @queryList="$refs.oTable.reload()"></addStock>
-    <!-- 打折扣 -->
-    <AddDiscount
-      ref="AddDiscount"
-      @queryList="$refs.oTable.reload()"
-    ></AddDiscount>
+            <el-button
+              :disabled="selectList.length <= 0"
+              type="danger"
+              size="small"
+              @click="deleteProduct"
+              >批量删除</el-button
+            >
+          </div>
+        </template>
+      </obj-table-plus>
+      <!-- 添加或编辑 -->
+      <add-or-update
+        @queryList="$refs.oTable.reload()"
+        ref="addOrUpdate"
+      ></add-or-update>
+      <!-- 改价格 -->
+      <AddPrice ref="AddPrice" @queryList="$refs.oTable.reload()"></AddPrice>
+      <!-- 改库存 -->
+      <addStock ref="addStock" @queryList="$refs.oTable.reload()"></addStock>
+      <!-- 打折扣 -->
+      <AddDiscount
+        ref="AddDiscount"
+        @queryList="$refs.oTable.reload()"
+      ></AddDiscount>
+    </div>
+    <div style="height: calc(100vh - 200px)" v-else>
+      <el-empty :image-size="200" description="请先去完成商品哦"></el-empty>
+    </div>
   </div>
 </template>
 
@@ -95,6 +100,7 @@ export default {
       },
       productFilterType: "SALE",
       selectList: [],
+      shopId: sessionStorage.getItem("userInfo").shopId,
     };
   },
   methods: {
@@ -289,7 +295,7 @@ export default {
           render: ({ row }) => {
             let edit = () => {
               console.log(row);
-              
+
               this.$refs.addOrUpdate.toggle(row).update();
             };
             let priceAdjustment = () => {

From 597e1157eee1256f811ac6a091111e3c779e53fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Mon, 21 Oct 2024 18:08:53 +0800
Subject: [PATCH 10/20] =?UTF-8?q?=E5=93=81=E7=89=8C=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/brand/config/index.vue      |  26 ++-
 .../brand/config/popup/add-or-update.vue      | 198 ++++++++++++++----
 .../brand/config/popup/change-password.vue    | 141 +++++++++++++
 3 files changed, 322 insertions(+), 43 deletions(-)
 create mode 100644 src/views/modules/brand/config/popup/change-password.vue

diff --git a/src/views/modules/brand/config/index.vue b/src/views/modules/brand/config/index.vue
index 779b365..9b9989d 100644
--- a/src/views/modules/brand/config/index.vue
+++ b/src/views/modules/brand/config/index.vue
@@ -23,10 +23,15 @@
       账号信息
     </div>
     <div class="info-content">
-      <div class="info-item">管理员账号：</div>
+      <div class="info-item">
+        管理员账号：
+        <span @click="passwordUpdate(true)" class="brandInfo-update">修改</span>
+      </div>
       <div class="info-item">
         管理员密码:
-        <span @click="infoUpdate" class="brandInfo-update">修改</span>
+        <span @click="passwordUpdate(false)" class="brandInfo-update"
+          >修改</span
+        >
       </div>
     </div>
     <div class="brandInfo">
@@ -49,13 +54,16 @@
     </div>
     <!-- 编辑品牌信息 -->
     <addOrUpdate ref="addOrUpdate"></addOrUpdate>
+    <!-- 修改密码 -->
+    <changePassword ref="changePassword"></changePassword>
   </div>
 </template>
 
 <script>
+import changePassword from "./popup/change-password.vue";
 import addOrUpdate from "./popup/add-or-update.vue";
 export default {
-  components: { addOrUpdate },
+  components: { addOrUpdate, changePassword },
   data() {
     return {};
   },
@@ -66,6 +74,18 @@ export default {
       });
       console.log("123");
     },
+    passwordUpdate(state) {
+      console.log("123");
+      if (state) {
+        this.$nextTick(() => {
+          this.$refs.changePassword.toggle().add();
+        });
+      } else {
+        this.$nextTick(() => {
+          this.$refs.changePassword.toggle().update();
+        });
+      }
+    },
   },
 };
 </script>
diff --git a/src/views/modules/brand/config/popup/add-or-update.vue b/src/views/modules/brand/config/popup/add-or-update.vue
index ed99012..722b9d9 100644
--- a/src/views/modules/brand/config/popup/add-or-update.vue
+++ b/src/views/modules/brand/config/popup/add-or-update.vue
@@ -26,8 +26,9 @@ export default {
         width: "60%",
       },
       modalData: {},
-      value1: [],
+      value1: "",
       ProductData: {},
+      fileList: [],
     };
   },
   methods: {
@@ -59,68 +60,185 @@ export default {
     modalCols() {
       return [
         {
-          label: "商品折扣（折）",
+          label: "品牌名称",
           prop: "discount",
           type: "Input",
           width: "300px",
-          rules: { required: true, message: "请输入打折数" },
-          type: "jsx",
-          render: () => {
-            return (
-              <div>
-                <el-input-number
-                  min={0}
-                  max={9.9}
-                  v-model={this.modalData.discount}
-                ></el-input-number>
-                <span> 提示： 请输入≤9.9数字 如:8折=售价*0.8</span>
-              </div>
-            );
-          },
+          rules: { required: true, message: "请输入品牌名称" },
         },
         {
-          label: "限制购买(数量)",
+          label: "品牌ID",
           prop: "limitCount",
           type: "Input",
           width: "300px",
-          rules: { required: true, message: "请输入价格" },
+          rules: { required: true, message: "请输入品牌ID" },
+        },
+        {
+          label: "品牌LOGO",
+          prop: "DiscountTi",
+          type: "Input",
+          width: "300px",
+          rules: { required: true, message: "请上传品牌LOGO" },
           type: "jsx",
           render: () => {
+            const handleChange = (file, fileList) => {
+              // console.log(fileList);
+            };
+            const handleAvatarSuccess = (res, file, fileList) => {
+              console.log(res, fileList);
+            };
+            const handleRemove = (file, fileList) => {
+              console.log(file, fileList);
+            };
             return (
-              <div>
-                <el-input-number
-                  min={1}
-                  max={99}
-                  v-model={this.modalData.limitCount}
-                  step={1}
-                  step-strictly
-                ></el-input-number>
-                <span> 提示： 请输入≤99数字 超出数量以原价购买</span>
-              </div>
+              <el-upload
+                class="upload-demo"
+                action={this.$api.mer_admin.uploadFile()}
+                {...{
+                  props: {
+                    "on-change": handleChange,
+                    "on-success": handleAvatarSuccess,
+                    "on-remove": handleRemove,
+                  },
+                }}
+                headers={{
+                  token: "Bearer " + this.$cookie.get("token"),
+                }}
+                multiple={true}
+                file-list={this.fileList}
+                list-type="picture"
+              >
+                <el-button size="small" type="primary">
+                  <i class="el-icon-upload"></i>点击上传
+                </el-button>
+                <div class="el-upload__tip" slot="tip">
+                  只能上传jpg/png文件，且不超过500kb
+                </div>
+              </el-upload>
             );
           },
         },
         {
-          label: "活动时间",
-          prop: "DiscountTime",
+          label: "品牌首页：",
+          prop: "limitCoun",
           type: "Input",
           width: "300px",
-          rules: { required: true, message: "请输入活动时间" },
+          rules: { required: true, message: "请输入品牌ID" },
           type: "jsx",
           render: () => {
             return (
-              <el-date-picker
-                // format="yyyy-MM-dd HH:mm:ss"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                v-model={this.modalData.DiscountTime}
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              ></el-date-picker>
+              <el-switch
+                v-model={this.value1}
+                active-text="开启"
+                inactive-text="禁用"
+              ></el-switch>
             );
           },
         },
+        {
+          label: "宣传语",
+          prop: "limitCot",
+          type: "Input",
+          width: "300px",
+          rules: { required: true, message: "请输入宣传语" },
+        },
+        {
+          label: "首页背景",
+          prop: "DiscountTime",
+          type: "Input",
+          width: "300px",
+          rules: { required: true, message: "请上传背景图" },
+          type: "jsx",
+          render: () => {
+            const handleChange = (file, fileList) => {
+              // console.log(fileList);
+            };
+            const handleAvatarSuccess = (res, file, fileList) => {
+              console.log(res, fileList);
+            };
+            const handleRemove = (file, fileList) => {
+              console.log(file, fileList);
+            };
+            return (
+              <el-upload
+                class="upload-demo"
+                action={this.$api.mer_admin.uploadFile()}
+                {...{
+                  props: {
+                    "on-change": handleChange,
+                    "on-success": handleAvatarSuccess,
+                    "on-remove": handleRemove,
+                  },
+                }}
+                headers={{
+                  token: "Bearer " + this.$cookie.get("token"),
+                }}
+                multiple={true}
+                file-list={this.fileList}
+                list-type="picture"
+              >
+                <el-button size="small" type="primary">
+                  <i class="el-icon-upload"></i>点击上传
+                </el-button>
+                <div class="el-upload__tip" slot="tip">
+                  只能上传jpg/png文件，且不超过500kb
+                </div>
+              </el-upload>
+            );
+          },
+        },
+        {
+          label: "视频",
+          prop: "DiscountTim",
+          type: "Input",
+          width: "300px",
+          rules: { required: true, message: "请上传视频" },
+          type: "jsx",
+          render: () => {
+            const handleChange = (file, fileList) => {
+              // console.log(fileList);
+            };
+            const handleAvatarSuccess = (res, file, fileList) => {
+              console.log(res, fileList);
+            };
+            const handleRemove = (file, fileList) => {
+              console.log(file, fileList);
+            };
+            return (
+              <el-upload
+                class="upload-demo"
+                action={this.$api.mer_admin.uploadFile()}
+                {...{
+                  props: {
+                    "on-change": handleChange,
+                    "on-success": handleAvatarSuccess,
+                    "on-remove": handleRemove,
+                  },
+                }}
+                headers={{
+                  token: "Bearer " + this.$cookie.get("token"),
+                }}
+                multiple={true}
+                file-list={this.fileList}
+                list-type="picture"
+              >
+                <el-button size="small" type="primary">
+                  <i class="el-icon-upload"></i>点击上传
+                </el-button>
+                <div class="el-upload__tip" slot="tip">
+                  只能上传jpg/png文件，且不超过500kb
+                </div>
+              </el-upload>
+            );
+          },
+        },
+        {
+          label: "联系电话（仅用户可见）",
+          prop: "limit",
+          type: "Input",
+          width: "300px",
+          rules: { required: true, message: "请输入联系电话" },
+        },
       ];
     },
     modalHandles() {
diff --git a/src/views/modules/brand/config/popup/change-password.vue b/src/views/modules/brand/config/popup/change-password.vue
new file mode 100644
index 0000000..8e71c81
--- /dev/null
+++ b/src/views/modules/brand/config/popup/change-password.vue
@@ -0,0 +1,141 @@
+<template>
+  <div>
+    <obj-modal
+      ref="modal"
+      labelWidth="150px"
+      :modalCols="modalCols"
+      :modalConfig="modalConfig"
+      :modalData="modalData"
+      :modalHandles="modalHandles"
+    >
+    </obj-modal>
+  </div>
+</template>
+<script>
+import { debounce, cloneDeep } from "lodash";
+import { Divider } from "element-ui";
+export default {
+  components: {},
+  data() {
+    return {
+      isAdd: true,
+      //表格属性
+      modalConfig: {
+        title: "修改密码",
+        show: false,
+        width: "60%",
+      },
+      modalData: {},
+      value1: "",
+      ProductData: {},
+      fileList: [],
+      isAdd: "",
+    };
+  },
+  methods: {
+    queryTableData(pageNo, pageSize) {},
+    toggle(e) {
+      if (this.modalConfig.show == false) {
+        this.modalConfig.show = true;
+      } else {
+        this.modalConfig.show = false;
+      }
+      if (e) {
+        this.init(cloneDeep(e));
+      }
+      return {
+        add: () => {
+          this.$nextTick(() => {
+            this.modalData = {};
+          });
+          this.isAdd = true;
+        },
+        update: () => {
+          this.isAdd = false;
+        },
+      };
+    },
+    init(row) {},
+  },
+  computed: {
+    modalCols() {
+      if (this.isAdd) {
+        return [
+          {
+            label: "密码",
+            prop: "discount",
+            type: "Input",
+            width: "300px",
+            rules: { required: true, message: "请输入旧密码" },
+          },
+          {
+            label: "管理员账号",
+            prop: "discoun",
+            type: "Input",
+            width: "300px",
+            rules: { required: true, message: "请输入管理员账号" },
+            type: "jsx",
+            render: () => {
+              return (
+              <div>
+                <div>
+                  <el-input style="width:200px;margin-right:20px;margin-bottom:20px" placeholder="请输入管理员账号"></el-input>
+                  <el-button type="primary">获取验证码</el-button>
+                </div>
+                <div>
+                  <el-input style="width:300px" placeholder="请输入验证码"></el-input>
+                </div>
+                </div>
+              );
+            },
+          },
+        ];
+      } else {
+        return [
+          {
+            label: "旧密码",
+            prop: "discount",
+            type: "Input",
+            width: "300px",
+            rules: { required: true, message: "请输入旧密码" },
+          },
+          {
+            label: "新密码",
+            prop: "limitCount",
+            type: "Input",
+            width: "300px",
+            rules: { required: true, message: "请输入新密码" },
+          },
+          {
+            label: "确认新密码",
+            prop: "limitCot",
+            type: "Input",
+            width: "300px",
+            rules: { required: true, message: "请输入新密码" },
+          },
+        ];
+      }
+    },
+    modalHandles() {
+      return [
+        {
+          label: "取消",
+          handle: () => {
+            this.toggle();
+          },
+        },
+        {
+          label: this.isAdd ? "确认添加" : "确认",
+          type: "primary",
+          loading: this.isLoading,
+          submit: true,
+          handle: () => {},
+        },
+      ];
+    },
+  },
+  asyncComputed: {},
+};
+</script>
+<style lang="scss" scoped>
+</style>
\ No newline at end of file

From ade29df89c6ae100b2e5f1d1895a11d38c048fd0 Mon Sep 17 00:00:00 2001
From: yukai <zzhyzy0228@gmail.com>
Date: Tue, 22 Oct 2024 15:12:05 +0800
Subject: [PATCH 11/20] =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index e8452cb..cd4ec61 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,7 +4,7 @@ name: build
 
 steps:
   - name: build
-    image: node:18.20.3-alpine
+    image: docker.linbin.site/node:18.20.3-alpine
     pull: if-not-exists
     volumes:
       - name: cache
@@ -12,26 +12,27 @@ steps:
       - name: node-build
         path: /app/build
     commands: ## 此处自己定义项目工程的构建命令
-      - npm install -g pnpm
+      - npm install -g pnpm --registry=https://registry.npmmirror.com
+      - pnpm config set registry https://registry.npmmirror.com
       - pnpm i
       - pnpm run build:prod
       - ls -l
       - cp -r dist /app/build/
     when: ## 定义在什么情况下触发构建任务
       branch: master #定义在哪个分支触发构建任务
-  - name: scp
-    image: appleboy/drone-scp
-    volumes:
-      - name: node-build
-        path: /app/build
-    settings:
-      host: 60.204.138.3
-      username: root
-      password: 5xhqamyZ
-      port: 22
-      target: /data/app/dmjs-merchant-admin
-      source: /app/build/dist
-      overwrite: true
+#  - name: scp
+#    image: appleboy/drone-scp
+#    volumes:
+#      - name: node-build
+#        path: /app/build
+#    settings:
+#      host: 60.204.138.3
+#      username: root
+#      password: 5xhqamyZ
+#      port: 22
+#      target: /data/app/dmjs-merchant-admin
+#      source: /app/build/dist
+#      overwrite: true
 volumes:
   - name: node-build
     host:

From 732ff3cb50710acb0942c6b349264ecd42b6173f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Mon, 4 Nov 2024 16:59:29 +0800
Subject: [PATCH 12/20] =?UTF-8?q?=E8=BF=90=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/brand/config/popup/to-configure.vue     | 13 +++++++++++++
 .../logistics-template/popup/add-template.vue       |  8 ++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 src/views/modules/brand/config/popup/to-configure.vue

diff --git a/src/views/modules/brand/config/popup/to-configure.vue b/src/views/modules/brand/config/popup/to-configure.vue
new file mode 100644
index 0000000..40e998e
--- /dev/null
+++ b/src/views/modules/brand/config/popup/to-configure.vue
@@ -0,0 +1,13 @@
+<template>
+  <div>配置</div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue b/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue
index 025a327..3472035 100644
--- a/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue
+++ b/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue
@@ -832,7 +832,9 @@ export default {
             if (this.isAdd) {
               this.$api.mer_admin
                 .addShippingTemplate({
-                  linkId: JSON.parse(sessionStorage.getItem("userInfo")).shopId,
+                  linkId: JSON.parse(sessionStorage.getItem("userInfo")).shopId
+                    ? JSON.parse(sessionStorage.getItem("userInfo")).shopId
+                    : JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
                   defaults: 0, //默认值，待确认
                   sort: 0, //默认值，待确认
                   type: 2, //默认值，待确认
@@ -891,7 +893,9 @@ export default {
               this.$api.mer_admin
                 .updateShippingTemplate({
                   id: this.modalData.id,
-                  linkId: JSON.parse(sessionStorage.getItem("userInfo")).shopId,
+                  linkId: JSON.parse(sessionStorage.getItem("userInfo")).shopId
+                    ? JSON.parse(sessionStorage.getItem("userInfo")).shopId
+                    : JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
                   defaults: 0, //默认值，待确认
                   sort: 0, //默认值，待确认
                   type: 2, //默认值，待确认

From b95c767c985efbc35a64e44d41b3e684e84ce7ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Thu, 7 Nov 2024 17:13:34 +0800
Subject: [PATCH 13/20] =?UTF-8?q?=E8=BF=90=E8=B4=B9=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logistics-template/index.vue              | 73 +++++++++++--------
 src/views/modules/product/index.vue           |  5 +-
 2 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/src/views/modules/logistics-fare/logistics-template/index.vue b/src/views/modules/logistics-fare/logistics-template/index.vue
index b958aa4..fa49791 100644
--- a/src/views/modules/logistics-fare/logistics-template/index.vue
+++ b/src/views/modules/logistics-fare/logistics-template/index.vue
@@ -1,37 +1,42 @@
 <template>
   <div>
-    <obj-table-plus
-      style="height: calc(100vh - 132px)"
-      ref="oTable"
-      mode="flex"
-      :tableCols="tableCols"
-      v-model="dataList"
-      @query="queryList"
-    >
-      <template slot="flexEmpty">
-        <el-empty description="暂无数据"></el-empty>
-      </template>
-      <div slot="tableTop" class="mb-2">
-        <el-form inline>
-          <el-form-item label="模板名称：">
-            <el-input
-              placeholder="请输入模板名称"
-              v-model="searchForm.name"
-            ></el-input>
-          </el-form-item>
-          <el-button type="primary" @click="$refs.oTable.reload()"
-            >搜索</el-button
+    <div v-if="shopId">
+      <obj-table-plus
+        style="height: calc(100vh - 132px)"
+        ref="oTable"
+        mode="flex"
+        :tableCols="tableCols"
+        v-model="dataList"
+        @query="queryList"
+      >
+        <template slot="flexEmpty">
+          <el-empty description="暂无数据"></el-empty>
+        </template>
+        <div slot="tableTop" class="mb-2">
+          <el-form inline>
+            <el-form-item label="模板名称：">
+              <el-input
+                placeholder="请输入模板名称"
+                v-model="searchForm.name"
+              ></el-input>
+            </el-form-item>
+            <el-button type="primary" @click="$refs.oTable.reload()"
+              >搜索</el-button
+            >
+          </el-form>
+          <el-button type="primary" @click="addFareTemplate"
+            >添加运费模板</el-button
           >
-        </el-form>
-        <el-button type="primary" @click="addFareTemplate"
-          >添加运费模板</el-button
-        >
-      </div>
-    </obj-table-plus>
-    <add-template
-      ref="addTemplate"
-      @refresh="$refs.oTable.refresh()"
-    ></add-template>
+        </div>
+      </obj-table-plus>
+      <add-template
+        ref="addTemplate"
+        @refresh="$refs.oTable.refresh()"
+      ></add-template>
+    </div>
+    <div style="height: calc(100vh - 200px)" v-else>
+      <el-empty :image-size="200" description="请先去完成认证"></el-empty>
+    </div>
   </div>
 </template>
 
@@ -45,8 +50,12 @@ export default {
       searchForm: {
         name: "",
       },
+      shopId: "",
     };
   },
+  created() {
+    this.shopId = JSON.parse(sessionStorage.getItem("userInfo")).shopId;
+  },
   methods: {
     queryList(pageNo, pageSize) {
       this.$api.mer_admin
@@ -144,7 +153,7 @@ export default {
               }
 
               // 将所有找到的路径合并成字符串返回
-              return paths.map((path) =><p>{path.join("/")}</p>);
+              return paths.map((path) => <p>{path.join("/")}</p>);
             };
 
             const appointMapper = {
diff --git a/src/views/modules/product/index.vue b/src/views/modules/product/index.vue
index 959977d..3e4ff20 100644
--- a/src/views/modules/product/index.vue
+++ b/src/views/modules/product/index.vue
@@ -100,9 +100,12 @@ export default {
       },
       productFilterType: "SALE",
       selectList: [],
-      shopId: sessionStorage.getItem("userInfo").shopId,
+      shopId: "",
     };
   },
+  created() {
+    this.shopId = JSON.parse(sessionStorage.getItem("userInfo")).shopId;
+  },
   methods: {
     addProduct() {
       this.$refs.addOrUpdate.toggle().add();

From e5c74c2e0c827aad8083442a13f8c5f31f6dd69b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Mon, 11 Nov 2024 18:05:56 +0800
Subject: [PATCH 14/20] =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=BB=8F=E8=90=A5?=
 =?UTF-8?q?=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../brand/config/popup/change-password.vue    |  2 +-
 src/views/modules/product/index.vue           | 29 ++++++++++++++++---
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/brand/config/popup/change-password.vue b/src/views/modules/brand/config/popup/change-password.vue
index 8e71c81..85fb772 100644
--- a/src/views/modules/brand/config/popup/change-password.vue
+++ b/src/views/modules/brand/config/popup/change-password.vue
@@ -125,7 +125,7 @@ export default {
           },
         },
         {
-          label: this.isAdd ? "确认添加" : "确认",
+          label: this.isAdd ? "保存" : "确认",
           type: "primary",
           loading: this.isLoading,
           submit: true,
diff --git a/src/views/modules/product/index.vue b/src/views/modules/product/index.vue
index 3e4ff20..34490b7 100644
--- a/src/views/modules/product/index.vue
+++ b/src/views/modules/product/index.vue
@@ -26,7 +26,7 @@
             </el-form-item>
             <el-form-item label="商品搜索">
               <el-input
-                v-model="formInline.user"
+                v-model="formInline.name"
                 placeholder="商品搜索"
               ></el-input>
             </el-form-item>
@@ -34,6 +34,7 @@
               <el-button type="primary" @click="$refs.oTable.reload()"
                 >查询</el-button
               >
+              <el-button type="primary" @click="Reset">重置</el-button>
             </el-form-item>
           </el-form>
           <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -88,9 +89,10 @@ export default {
       activeName: "在售",
       dataList: [],
       formInline: {
-        user: "",
-        region: "",
+        name: "",
+        marketId: "",
       },
+      marketList: [],
       tableProp: {
         "auto-resize": true,
         border: true,
@@ -104,7 +106,18 @@ export default {
     };
   },
   created() {
-    this.shopId = JSON.parse(sessionStorage.getItem("userInfo")).shopId;
+    if (JSON.parse(sessionStorage.getItem("userInfo")).markets.length > 0) {
+      this.shopId = true;
+      this.formInline.marketId = JSON.parse(
+        sessionStorage.getItem("userInfo")
+      ).markets[0].marketId;
+      this.marketList = JSON.parse(sessionStorage.getItem("userInfo")).markets;
+      console.log(this.marketList);
+    } else if (JSON.parse(sessionStorage.getItem("userInfo")).shopId) {
+      this.shopId = true;
+    } else {
+      this.shopId = false;
+    }
   },
   methods: {
     addProduct() {
@@ -140,6 +153,7 @@ export default {
             pageNumber: pageNo,
             pageSize: pageSize,
           },
+          ...this.formInline,
           productFilterType: this.productFilterType,
           merchantId: JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
           shopId: JSON.parse(sessionStorage.getItem("userInfo")).shopId,
@@ -156,6 +170,13 @@ export default {
           this.$refs.oTable.complete(false);
         });
     },
+    Reset() {
+      this.formInline = {
+        name: "",
+        // region: "",
+      };
+      this.$refs.oTable.reload();
+    },
     handleClick() {
       switch (this.activeName) {
         case "在售":

From 97c78ea61bf7611f57e85ce96224aa85a7c9e9d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Tue, 12 Nov 2024 18:18:33 +0800
Subject: [PATCH 15/20] =?UTF-8?q?=E8=BF=90=E8=B4=B9=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logistics-fare/logistics-template/index.vue     | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/logistics-fare/logistics-template/index.vue b/src/views/modules/logistics-fare/logistics-template/index.vue
index fa49791..6649973 100644
--- a/src/views/modules/logistics-fare/logistics-template/index.vue
+++ b/src/views/modules/logistics-fare/logistics-template/index.vue
@@ -54,7 +54,18 @@ export default {
     };
   },
   created() {
-    this.shopId = JSON.parse(sessionStorage.getItem("userInfo")).shopId;
+    if (JSON.parse(sessionStorage.getItem("userInfo")).markets.length > 0) {
+      this.shopId = true;
+      this.formInline.marketId = JSON.parse(
+        sessionStorage.getItem("userInfo")
+      ).markets[0].marketId;
+      this.marketList = JSON.parse(sessionStorage.getItem("userInfo")).markets;
+      console.log(this.marketList);
+    } else if (JSON.parse(sessionStorage.getItem("userInfo")).shopId) {
+      this.shopId = true;
+    } else {
+      this.shopId = false;
+    }
   },
   methods: {
     queryList(pageNo, pageSize) {

From 71254860636ad52a888e457319e98c3c3f746dcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Tue, 12 Nov 2024 18:46:00 +0800
Subject: [PATCH 16/20] marketId

---
 .../logistics-template/popup/add-template.vue               | 6 ++++--
 src/views/modules/product/popup/add-or-update.vue           | 3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue b/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue
index 3472035..4a1457a 100644
--- a/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue
+++ b/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue
@@ -834,7 +834,8 @@ export default {
                 .addShippingTemplate({
                   linkId: JSON.parse(sessionStorage.getItem("userInfo")).shopId
                     ? JSON.parse(sessionStorage.getItem("userInfo")).shopId
-                    : JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
+                    : JSON.parse(sessionStorage.getItem("userInfo")).markets[0]
+                        .marketId,
                   defaults: 0, //默认值，待确认
                   sort: 0, //默认值，待确认
                   type: 2, //默认值，待确认
@@ -895,7 +896,8 @@ export default {
                   id: this.modalData.id,
                   linkId: JSON.parse(sessionStorage.getItem("userInfo")).shopId
                     ? JSON.parse(sessionStorage.getItem("userInfo")).shopId
-                    : JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
+                    : JSON.parse(sessionStorage.getItem("userInfo")).markets[0]
+                        .marketId,
                   defaults: 0, //默认值，待确认
                   sort: 0, //默认值，待确认
                   type: 2, //默认值，待确认
diff --git a/src/views/modules/product/popup/add-or-update.vue b/src/views/modules/product/popup/add-or-update.vue
index 0fdf68a..25386cd 100644
--- a/src/views/modules/product/popup/add-or-update.vue
+++ b/src/views/modules/product/popup/add-or-update.vue
@@ -208,8 +208,7 @@ export default {
           });
 
           this.isAdd = true;
-          console.log('112233');
-          
+          console.log("112233");
         },
         update: () => {
           this.modalConfig.title = "编辑商品";

From 4ec91760a15063f80485b041c3e4aa97be5e67a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Tue, 12 Nov 2024 19:52:30 +0800
Subject: [PATCH 17/20] =?UTF-8?q?=E8=BF=90=E8=B4=B9=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logistics-template/index.vue              | 23 ++++++++++++++++---
 .../logistics-template/popup/add-template.vue | 14 ++++-------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/logistics-fare/logistics-template/index.vue b/src/views/modules/logistics-fare/logistics-template/index.vue
index 6649973..2086987 100644
--- a/src/views/modules/logistics-fare/logistics-template/index.vue
+++ b/src/views/modules/logistics-fare/logistics-template/index.vue
@@ -20,6 +20,19 @@
                 v-model="searchForm.name"
               ></el-input>
             </el-form-item>
+            <el-form-item v-if="marketList.length > 0" label="摊铺">
+              <el-select
+                v-model="searchForm.linkId"
+                placeholder="请选择活动区域"
+              >
+                <el-option
+                  v-for="item in marketList"
+                  :key="item.marketId"
+                  :label="item.marketName"
+                  :value="item.marketId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
             <el-button type="primary" @click="$refs.oTable.reload()"
               >搜索</el-button
             >
@@ -49,19 +62,24 @@ export default {
       dataList: [],
       searchForm: {
         name: "",
+        linkId: "",
       },
       shopId: "",
+      marketList: "",
     };
   },
   created() {
     if (JSON.parse(sessionStorage.getItem("userInfo")).markets.length > 0) {
       this.shopId = true;
-      this.formInline.marketId = JSON.parse(
+      this.searchForm.linkId = JSON.parse(
         sessionStorage.getItem("userInfo")
       ).markets[0].marketId;
       this.marketList = JSON.parse(sessionStorage.getItem("userInfo")).markets;
       console.log(this.marketList);
     } else if (JSON.parse(sessionStorage.getItem("userInfo")).shopId) {
+      this.searchForm.linkId = JSON.parse(
+        sessionStorage.getItem("userInfo")
+      ).shopId;
       this.shopId = true;
     } else {
       this.shopId = false;
@@ -87,7 +105,7 @@ export default {
         });
     },
     addFareTemplate() {
-      this.$refs.addTemplate.toggle().add();
+      this.$refs.addTemplate.toggle().add(this.searchForm.linkId);
     },
   },
   computed: {
@@ -100,7 +118,6 @@ export default {
             this.$api.mer_admin.getShippingTemplateInfo(row.id).then((res) => {
               console.log(res);
               console.log("row.tableData", row.tableData);
-
               if (!row.tableData) {
                 if (res.data.data.shippingTemplatesRegionResultList) {
                   this.$set(
diff --git a/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue b/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue
index 4a1457a..ed4cc7f 100644
--- a/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue
+++ b/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue
@@ -57,6 +57,7 @@ export default {
       },
       fileList: [], //回显图片
       place: "", //场地
+      linkId: "",
     };
   },
   mounted() {
@@ -141,10 +142,11 @@ export default {
         this.modalData = _data;
       };
       return {
-        add: () => {
+        add: (id) => {
           this.$nextTick(() => {
             this.modalData = cloneDeep(BASE_DATA);
           });
+          this.linkId = id;
           this.isAdd = true;
           this.modalConfig.title = "添加运费模板";
         },
@@ -832,10 +834,7 @@ export default {
             if (this.isAdd) {
               this.$api.mer_admin
                 .addShippingTemplate({
-                  linkId: JSON.parse(sessionStorage.getItem("userInfo")).shopId
-                    ? JSON.parse(sessionStorage.getItem("userInfo")).shopId
-                    : JSON.parse(sessionStorage.getItem("userInfo")).markets[0]
-                        .marketId,
+                  linkId: this.linkId,
                   defaults: 0, //默认值，待确认
                   sort: 0, //默认值，待确认
                   type: 2, //默认值，待确认
@@ -894,10 +893,7 @@ export default {
               this.$api.mer_admin
                 .updateShippingTemplate({
                   id: this.modalData.id,
-                  linkId: JSON.parse(sessionStorage.getItem("userInfo")).shopId
-                    ? JSON.parse(sessionStorage.getItem("userInfo")).shopId
-                    : JSON.parse(sessionStorage.getItem("userInfo")).markets[0]
-                        .marketId,
+                  linkId: this.linkId,
                   defaults: 0, //默认值，待确认
                   sort: 0, //默认值，待确认
                   type: 2, //默认值，待确认

From 3d5fd892a501ad92eef43f91861a6f57a73ae0e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Wed, 13 Nov 2024 19:02:08 +0800
Subject: [PATCH 18/20] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/mer_admin.js                  |  4 +-
 src/views/common/login.vue                    | 78 ++++++++++++++++++-
 .../logistics-template/index.vue              | 14 +++-
 src/views/modules/product/index.vue           | 21 +++--
 4 files changed, 102 insertions(+), 15 deletions(-)

diff --git a/src/api/modules/mer_admin.js b/src/api/modules/mer_admin.js
index 378d992..b7e7607 100644
--- a/src/api/modules/mer_admin.js
+++ b/src/api/modules/mer_admin.js
@@ -15,9 +15,8 @@ export const mer_admin = {
    * @returns
    */
   loginByAccount: (params) => {
-    return $http.post(`/auth/login`, {
+    return $http.post(`/admin-api/auth/login`, {
       ...params,
-      type: 1,
     });
   },
   loginByMobile: (params) => {
@@ -155,5 +154,4 @@ export const mer_admin = {
       params: { id },
     });
   },
-
 };
diff --git a/src/views/common/login.vue b/src/views/common/login.vue
index b763c0e..8b921b9 100644
--- a/src/views/common/login.vue
+++ b/src/views/common/login.vue
@@ -3,9 +3,7 @@
     <div class="site-content__wrapper">
       <div class="site-content">
         <div class="brand-info">
-          <h1 class="brand-info__text" style="margin-left: 0px">
-            大妈集市商户端
-          </h1>
+          <h1>大妈集市商户端</h1>
           <!-- <h1 class="brand-info__text1" style="margin-left: 145px">
             登录
           </h1> -->
@@ -13,6 +11,12 @@
         </div>
         <div class="login-main">
           <h3 class="login-title">大妈集市商户端登录</h3>
+          <div class="brand-info__text" style="margin-left: 0px">
+            <el-radio-group v-model="value">
+              <el-radio-button :label="true">验证码登入</el-radio-button>
+              <el-radio-button :label="false">账号登录</el-radio-button>
+            </el-radio-group>
+          </div>
           <el-tabs
             v-if="false"
             :stretch="true"
@@ -102,6 +106,7 @@
             </el-tab-pane>
           </el-tabs>
           <el-form
+            v-if="value"
             :model="loginByYZMForm"
             :rules="loginByYZMFormRule"
             ref="loginByYZMRef"
@@ -133,6 +138,47 @@
               >
             </el-form-item>
           </el-form>
+          <el-form
+            v-else
+            :model="dataForm"
+            :rules="dataRule"
+            ref="dataForm"
+            @keyup.enter.native="dataFormSubmit()"
+            status-icon
+          >
+            <el-form-item prop="userName">
+              <el-input
+                v-model="dataForm.userName"
+                placeholder="帐号"
+              ></el-input>
+            </el-form-item>
+            <el-form-item prop="password">
+              <el-input
+                v-model="dataForm.password"
+                type="password"
+                placeholder="密码"
+              ></el-input>
+            </el-form-item>
+            <!-- <el-form-item prop="captcha">
+              <el-row :gutter="20">
+                <el-col :span="14">
+                  <el-input v-model="dataForm.captcha" placeholder="验证码">
+                  </el-input>
+                </el-col>
+                <el-col :span="10" class="login-captcha">
+                  <img :src="captchaPath" @click="getCaptcha()" alt="" />
+                </el-col>
+              </el-row>
+            </el-form-item> -->
+            <el-form-item>
+              <el-button
+                class="login-btn-submit"
+                type="primary"
+                @click="handleLogin()"
+                >登录</el-button
+              >
+            </el-form-item>
+          </el-form>
         </div>
       </div>
     </div>
@@ -144,6 +190,7 @@ import { getUUID } from "@/utils";
 export default {
   data() {
     return {
+      value: true,
       loginWay: "code_login",
       loginType: "教育局",
       mobileCodeCountDown: 0,
@@ -256,6 +303,31 @@ export default {
           });
       });
     },
+    handleLogin() {
+      const _loginTypeMapper = {
+        管理员: "ROLE_ADMIN",
+        教育局: "ROLE_EDU",
+        学校: "ROLE_SCHOOL",
+        教师: "ROLE_TEACHER",
+      };
+      this.$refs["dataForm"].validate((valid) => {
+        console.log("账号密码登录");
+        this.$api.mer_admin
+          .loginByAccount({
+            // role: _loginTypeMapper[this.loginType],
+            userName: this.dataForm.userName,
+            password: this.dataForm.password,
+          })
+          .then(({ data }) => {
+            console.log("data", data);
+            this.$cookie.set("token", data.data.token);
+            this.$router.replace({ name: "home" });
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      });
+    },
     //获取短信验证码
     getCode() {
       //正则表达式校验手机号是否合法
diff --git a/src/views/modules/logistics-fare/logistics-template/index.vue b/src/views/modules/logistics-fare/logistics-template/index.vue
index 2086987..4049b63 100644
--- a/src/views/modules/logistics-fare/logistics-template/index.vue
+++ b/src/views/modules/logistics-fare/logistics-template/index.vue
@@ -21,10 +21,7 @@
               ></el-input>
             </el-form-item>
             <el-form-item v-if="marketList.length > 0" label="摊铺">
-              <el-select
-                v-model="searchForm.linkId"
-                placeholder="请选择活动区域"
-              >
+              <el-select v-model="searchForm.linkId" placeholder="请选择摊铺">
                 <el-option
                   v-for="item in marketList"
                   :key="item.marketId"
@@ -36,6 +33,7 @@
             <el-button type="primary" @click="$refs.oTable.reload()"
               >搜索</el-button
             >
+            <el-button type="primary" @click="Reset">重置</el-button>
           </el-form>
           <el-button type="primary" @click="addFareTemplate"
             >添加运费模板</el-button
@@ -104,6 +102,14 @@ export default {
           this.$refs.oTable.complete(false);
         });
     },
+    Reset() {
+      this.searchForm = {
+        name: "",
+        linkId: JSON.parse(sessionStorage.getItem("userInfo")).markets[0]
+          .marketId,
+      };
+      this.$refs.oTable.reload();
+    },
     addFareTemplate() {
       this.$refs.addTemplate.toggle().add(this.searchForm.linkId);
     },
diff --git a/src/views/modules/product/index.vue b/src/views/modules/product/index.vue
index 34490b7..1bb5a99 100644
--- a/src/views/modules/product/index.vue
+++ b/src/views/modules/product/index.vue
@@ -12,24 +12,34 @@
       >
         <template slot="tableTop">
           <el-form :inline="true" :model="formInline" class="demo-form-inline">
-            <el-form-item label="平台分类">
+            <!-- <el-form-item label="平台分类">
               <el-select v-model="formInline.region" placeholder="活动区域">
                 <el-option label="区域一" value="shanghai"></el-option>
                 <el-option label="区域二" value="beijing"></el-option>
               </el-select>
-            </el-form-item>
-            <el-form-item label="商户分类">
+            </el-form-item> -->
+            <!-- <el-form-item label="商户分类">
               <el-select v-model="formInline.region" placeholder="活动区域">
                 <el-option label="区域一" value="shanghai"></el-option>
                 <el-option label="区域二" value="beijing"></el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="商品搜索">
               <el-input
                 v-model="formInline.name"
                 placeholder="商品搜索"
               ></el-input>
             </el-form-item>
+            <el-form-item v-if="marketList.length > 0" label="摊铺">
+              <el-select v-model="formInline.marketId" placeholder="请选择摊铺">
+                <el-option
+                  v-for="item in marketList"
+                  :key="item.marketId"
+                  :label="item.marketName"
+                  :value="item.marketId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="$refs.oTable.reload()"
                 >查询</el-button
@@ -173,7 +183,8 @@ export default {
     Reset() {
       this.formInline = {
         name: "",
-        // region: "",
+        marketId: JSON.parse(sessionStorage.getItem("userInfo")).markets[0]
+          .marketId,
       };
       this.$refs.oTable.reload();
     },

From f905b98c3530310d5ab58c656101b5e0095a84ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Fri, 15 Nov 2024 16:34:50 +0800
Subject: [PATCH 19/20] =?UTF-8?q?=E7=99=BB=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/mer_admin.js             | 10 ++-
 src/views/common/login.vue               |  2 +-
 src/views/modules/brand/config/index.vue | 78 +++++++++++++++++++-----
 3 files changed, 74 insertions(+), 16 deletions(-)

diff --git a/src/api/modules/mer_admin.js b/src/api/modules/mer_admin.js
index b7e7607..ad3bcd0 100644
--- a/src/api/modules/mer_admin.js
+++ b/src/api/modules/mer_admin.js
@@ -15,7 +15,7 @@ export const mer_admin = {
    * @returns
    */
   loginByAccount: (params) => {
-    return $http.post(`/admin-api/auth/login`, {
+    return $http.post(`/merchant-api/auth/login`, {
       ...params,
     });
   },
@@ -154,4 +154,12 @@ export const mer_admin = {
       params: { id },
     });
   },
+  //获取品牌信息
+  getBrandInfo: () => {
+    return $http.request({
+      method: "get",
+      url: `/merchant-api/brand/info`,
+      params: {},
+    });
+  },
 };
diff --git a/src/views/common/login.vue b/src/views/common/login.vue
index 8b921b9..ab04ccd 100644
--- a/src/views/common/login.vue
+++ b/src/views/common/login.vue
@@ -315,7 +315,7 @@ export default {
         this.$api.mer_admin
           .loginByAccount({
             // role: _loginTypeMapper[this.loginType],
-            userName: this.dataForm.userName,
+            mobile: this.dataForm.userName,
             password: this.dataForm.password,
           })
           .then(({ data }) => {
diff --git a/src/views/modules/brand/config/index.vue b/src/views/modules/brand/config/index.vue
index 9b9989d..97e8367 100644
--- a/src/views/modules/brand/config/index.vue
+++ b/src/views/modules/brand/config/index.vue
@@ -10,13 +10,51 @@
       <span @click="infoUpdate" class="brandInfo-update">编辑</span>
     </div>
     <div class="info-content">
-      <div class="info-item">品牌名称：</div>
-      <div class="info-item">品牌ID:</div>
-      <div class="info-item">品牌LOGO:</div>
-      <div class="info-item">品牌背景:</div>
-      <div class="info-item">品牌首页:</div>
-      <div class="info-item">宣传语:</div>
-      <div class="info-item">宣传视频:</div>
+      <div class="info-item">品牌名称：{{ list.name }}</div>
+      <div class="info-item">品牌ID: {{ list.id }}</div>
+      <div class="info-item" style="display: flex">
+        <div>品牌LOGO:</div>
+        <div v-if="list.logo" style="margin-left: 20px">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="list.logo"
+            :preview-src-list="[list.logo]"
+          >
+          </el-image>
+        </div>
+      </div>
+      <div class="info-item" style="display: flex">
+        <div>品牌背景:</div>
+        <div v-if="list.background" style="margin-left: 20px">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="list.background"
+            :preview-src-list="[list.background]"
+          >
+          </el-image>
+        </div>
+      </div>
+      <div class="info-item">
+        品牌首页: {{ list.homepageStatus == 0 ? "禁用" : "启用" }}
+      </div>
+      <div class="info-item">宣传语: {{ list.tagline }}</div>
+      <div class="info-item" style="display: flex">
+        <div>宣传视频:</div>
+        <div v-if="list.video" style="margin-left: 20px">
+          <video
+            id="videoPlayer"
+            width="200px"
+            height="100px"
+            object-fit="fill"
+            autoplay="true"
+            muted="muted"
+            loop
+            controls
+          >
+            <source :src="list.video" type="video/mp4" />
+          </video>
+        </div>
+      </div>
     </div>
     <div class="brandInfo">
       <span class="pattern"></span>
@@ -24,11 +62,13 @@
     </div>
     <div class="info-content">
       <div class="info-item">
-        管理员账号：
+        管理员账号：{{ list.administrator.substr(0, 3) }}****{{
+          list.administrator.substr(7)
+        }}
         <span @click="passwordUpdate(true)" class="brandInfo-update">修改</span>
       </div>
       <div class="info-item">
-        管理员密码:
+        管理员密码: ******
         <span @click="passwordUpdate(false)" class="brandInfo-update"
           >修改</span
         >
@@ -39,8 +79,8 @@
       其他信息
     </div>
     <div class="info-content">
-      <div class="info-item">品牌联系人：</div>
-      <div class="info-item">联系方式:</div>
+      <div class="info-item">品牌联系人：{{ list.contact }}</div>
+      <div class="info-item">联系方式: {{ list.contactPhone }}</div>
     </div>
     <div class="brandInfo">
       <span class="pattern"></span>
@@ -58,19 +98,29 @@
     <changePassword ref="changePassword"></changePassword>
   </div>
 </template>
-
 <script>
 import changePassword from "./popup/change-password.vue";
 import addOrUpdate from "./popup/add-or-update.vue";
 export default {
   components: { addOrUpdate, changePassword },
   data() {
-    return {};
+    return {
+      list: [],
+    };
+  },
+  created() {
+    this.getList();
   },
   methods: {
+    getList() {
+      this.$api.mer_admin.getBrandInfo().then((res) => {
+        console.log(res);
+        this.list = res.data.data;
+      });
+    },
     infoUpdate() {
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.toggle().update();
+        this.$refs.addOrUpdate.toggle().update(this.list);
       });
       console.log("123");
     },

From 94a1e831c4fd7833a15ae8e2eb0ee4b3ec6fb478 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Fri, 15 Nov 2024 17:27:55 +0800
Subject: [PATCH 20/20] =?UTF-8?q?=E5=85=A8=E5=9B=BD=E5=8C=85=E9=82=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logistics-fare/logistics-template/popup/add-template.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue b/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue
index ed4cc7f..7065558 100644
--- a/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue
+++ b/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue
@@ -850,7 +850,7 @@ export default {
                   }[this.modalData.fareConfig],
                   shippingTemplatesRegionList:
                     this.modalData.fareConfig == "全国包邮"
-                      ? nu
+                      ? null
                       : [
                           ...this.modalData.shippingTemplatesRegionList,
                           ...JSON.parse(