From 7a080124c64fb6a0e803d87485aebd36ac162eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Tue, 29 Jun 2021 11:59:45 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E6=8F=90=E7=8E=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/config/index.js                   |   8 +-
 .../views/member/advance/withdrawApply.vue    | 577 ++++++++----------
 seller/src/config/index.js                    |   5 +-
 3 files changed, 261 insertions(+), 329 deletions(-)

diff --git a/manager/src/config/index.js b/manager/src/config/index.js
index 680fb1b1..a27badcf 100644
--- a/manager/src/config/index.js
+++ b/manager/src/config/index.js
@@ -21,10 +21,10 @@ export default {
     buyer: "https://buyer-api.pickmall.cn",
     seller: "https://store-api.pickmall.cn",
     manager: "https://admin-api.pickmall.cn"
-    // common: 'http://192.168.0.109:8890',
-    // buyer: 'http://192.168.0.109:8888',
-    // seller: 'http://192.168.0.109:8889',
-    // manager: 'http://192.168.0.109:8887'
+    // common: 'http://192.168.0.100:8890',
+    // buyer: 'http://192.168.0.100:8888',
+    // seller: 'http://192.168.0.100:8889',
+    // manager: 'http://192.168.0.100:8887'
   },
   api_prod: {
     common: "https://common-api.pickmall.cn",
diff --git a/manager/src/views/member/advance/withdrawApply.vue b/manager/src/views/member/advance/withdrawApply.vue
index c5a9078a..27e24eb3 100644
--- a/manager/src/views/member/advance/withdrawApply.vue
+++ b/manager/src/views/member/advance/withdrawApply.vue
@@ -2,86 +2,34 @@
   <div class="search">
     <Card>
       <Row @keydown.enter.native="handleSearch">
-        <Form
-          ref="searchForm"
-          :model="searchForm"
-          inline
-          :label-width="70"
-          class="search-form"
-        >
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
           <Form-item label="会员名称" prop="memberName">
-            <Input
-              type="text"
-              v-model="searchForm.memberName"
-              placeholder="请输入会员名称"
-              clearable
-              style="width: 200px"
-            />
+            <Input type="text" v-model="searchForm.memberName" placeholder="请输入会员名称" clearable style="width: 200px" />
           </Form-item>
           <Form-item label="审核状态" prop="applyStatus">
-            <Select
-              v-model="searchForm.memberName"
-              clearable
-              style="width: 200px"
-            >
+            <Select v-model="searchForm.memberName" clearable style="width: 200px">
               <Option value="APPLY">申请中</Option>
               <Option value="VIA_AUDITING">审核通过(提现成功)</Option>
               <Option value="FAIL_AUDITING">审核拒绝</Option>
             </Select>
           </Form-item>
           <Form-item label="申请时间">
-            <DatePicker
-              v-model="selectDate"
-              type="datetimerange"
-              format="yyyy-MM-dd HH:mm:ss"
-              clearable
-              @on-change="selectDateRange"
-              placeholder="选择起始时间"
-              style="width: 200px"
-            ></DatePicker>
+            <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
           </Form-item>
           <Form-item style="margin-left: -35px" class="br">
-            <Button @click="handleSearch" type="primary" icon="ios-search"
-            >搜索
-            </Button
-            >
+            <Button @click="handleSearch" type="primary" icon="ios-search">搜索
+            </Button>
           </Form-item>
         </Form>
       </Row>
-      <Table
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-        sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="changeSelect"
-      ></Table>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
       <Row type="flex" justify="end" class="page">
-        <Page
-          :current="searchForm.pageNumber"
-          :total="total"
-          :page-size="searchForm.pageSize"
-          @on-change="changePage"
-          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
-          size="small"
-          show-total
-          show-elevator
-          show-sizer
-        ></Page>
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
+          show-total show-elevator show-sizer></Page>
       </Row>
     </Card>
-    <Modal
-      :title="modalTitle"
-      v-model="roleModalVisible"
-      :mask-closable="false"
-      :width="500"
-    >
-      <Form
-        :label-width="80"
-      >
+    <Modal :title="modalTitle" v-model="roleModalVisible" :mask-closable="false" :width="500">
+      <Form :label-width="80">
         <FormItem label="申请编号">
           <span>{{showList.sn}}</span>
         </FormItem>
@@ -89,7 +37,7 @@
           <span>{{showList.memberName}}</span>
         </FormItem>
         <FormItem label="申请金额">
-          <span>{{showList.applyMoney}}</span>
+          <span>{{showList.applyMoney | unitPrice}}</span>
         </FormItem>
         <FormItem label="提现状态">
           <span>{{showList.applyStatus | paramTypeFilter}}</span>
@@ -98,28 +46,19 @@
           <span>{{showList.createTime}}</span>
         </FormItem>
         <FormItem label="审核备注">
-          <Input v-model="audit"/>
+          <Input v-model="audit" />
         </FormItem>
 
       </Form>
       <div slot="footer" v-if="showList.applyStatus == 'APPLY'">
         <Button type="text" @click="submitRole(false)">拒绝</Button>
-        <Button type="primary" :loading="submitLoading" @click="submitRole(true)"
-        >通过
-        </Button
-        >
+        <Button type="primary" :loading="submitLoading" @click="submitRole(true)">通过
+        </Button>
       </div>
     </Modal>
 
-    <Modal
-      :title="modalTitle"
-      v-model="queryModalVisible"
-      :mask-closable="false"
-      :width="500"
-    >
-      <Form
-        :label-width="80"
-      >
+    <Modal :title="modalTitle" v-model="queryModalVisible" :mask-closable="false" :width="500">
+      <Form :label-width="80">
         <FormItem label="申请编号">
           <span>{{showList.sn}}</span>
         </FormItem>
@@ -139,270 +78,266 @@
           <span>{{showList.inspectTime}}</span>
         </FormItem>
 
-
       </Form>
       <div slot="footer" v-if="showList.applyStatus == 'APPLY'">
         <Button type="text" @click="submitRole(false)">拒绝</Button>
-        <Button type="primary" :loading="submitLoading" @click="submitRole(true)"
-        >通过
-        </Button
-        >
+        <Button type="primary" :loading="submitLoading" @click="submitRole(true)">通过
+        </Button>
       </div>
       <div slot="footer" v-else>
-        <Button type="text"  @click="queryModalVisible = false">取消</Button>
+        <Button type="text" @click="queryModalVisible = false">取消</Button>
       </div>
     </Modal>
   </div>
 </template>
 
 <script>
-  import {
-    getUserWithdrawApply,
-    withdrawApply
-  } from "@/api/member";
+import { getUserWithdrawApply, withdrawApply } from "@/api/member";
 
-  export default {
-    name: "withdrawApply",
-    components: {},
-    data() {
-      return {
-        modalTitle: "", //弹出框标题
-        openSearch: true, // 显示搜索
-        openTip: true, // 显示提示
-        loading: true, // 表单加载状态
-        audit: '', // 审核备注
-        roleModalVisible: false, // 审核模态框
-        queryModalVisible: false, // 审核模态框
-        searchForm: {
-          // 搜索框初始化对象
-          pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
-          sort: "createTime", // 默认排序字段
-          order: "desc", // 默认排序方式
-          startDate: "", // 起始时间
-          endDate: "", // 终止时间
-          memberName: "",
-          applyStatus: ""
+export default {
+  name: "withdrawApply",
+  components: {},
+  data() {
+    return {
+      modalTitle: "", //弹出框标题
+      openSearch: true, // 显示搜索
+      openTip: true, // 显示提示
+      loading: true, // 表单加载状态
+      audit: "", // 审核备注
+      roleModalVisible: false, // 审核模态框
+      queryModalVisible: false, // 审核模态框
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        startDate: "", // 起始时间
+        endDate: "", // 终止时间
+        memberName: "",
+        applyStatus: "",
+      },
+      selectDate: null, // 选择时间段
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      showList: {}, // 可操作选项
+      columns: [
+        {
+          title: "申请编号",
+          key: "sn",
+          align: "left",
+          tooltip: true,
         },
-        selectDate: null, // 选择时间段
-        submitLoading: false, // 添加或编辑提交状态
-        selectList: [], // 多选数据
-        selectCount: 0, // 多选计数
-        showList: {}, // 可操作选项
-        columns: [
-          {
-            title: "申请编号",
-            key: "sn",
-            align: "left",
-            tooltip: true
+        {
+          title: "用户名称",
+          key: "memberName",
+          align: "left",
+          tooltip: true,
+        },
+        {
+          title: "申请金额",
+          key: "applyMoney",
+          align: "left",
+          width: 120,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "span",
+                {},
+                this.$options.filters.unitPrice(params.row.applyMoney)
+              ),
+            ]);
           },
-          {
-            title: "用户名称",
-            key: "memberName",
-            align: "left",
-            tooltip: true
-          },
-          {
-            title: "申请金额",
-            key: "applyMoney",
-            align: "left",
-            width: 120,
-          },
-          {
-            title: "提现状态",
-            align: "left",
-            key: "applyStatus",
-            width: 120,
-            render: (h, params) => {
-              if (params.row.applyStatus == "APPLY") {
-                return h('div', [
-                  h('span', {}, '申请中'),
-                ]);
-              } else if (params.row.applyStatus == "VIA_AUDITING") {
-                return h('div', [
-                  h('span', {}, '审核通过'),
-                ]);
-              } else if (params.row.applyStatus == "SUCCESS") {
-                return h('div', [
-                  h('span', {}, '提现成功'),
-                ]);
-              } else {
-                return h('div', [
-                  h('span', {}, '审核拒绝'),
-                ]);
-              }
-            },
-          },
-          {
-            title: "申请时间",
-            key: "createTime",
-            align: "left",
-            width: 170
-          },
-          {
-            title: "审核时间",
-            key: "inspectTime",
-            align: "left",
-            width: 170
-          }, {
-            title: "操作",
-            key: "action",
-            width: 120,
-            align: "center",
-            fixed: "right",
-            render: (h, params) => {
-              if (params.row.applyStatus == 'APPLY') {
-                return h(
-                  "Button",
-                  {
-                    props: {
-                      type: "success",
-                      size: "small"
-                    },
-                    style: {
-                      marginRight: "5px"
-                    },
-                    on: {
-                      click: () => {
-                        this.showList = {}
-                        this.roleModalVisible = true;
-                        this.showList = params.row
-                      }
-                    }
-                  },
-                  "审核"
-                );
-              } else {
-                return h(
-                  "Button",
-                  {
-                    props: {
-                      type: "primary",
-                      size: "small"
-                    },
-                    style: {
-                      marginRight: "5px",
-                    },
-                    on: {
-                      click: () => {
-                        this.showList = {}
-                        this.queryModalVisible = true;
-                        this.showList = params.row
-                        this.modalTitle = "查看"
-                      }
-                    }
-                  },
-                  "查看"
-                );
-              }
+        },
+        {
+          title: "提现状态",
+          align: "left",
+          key: "applyStatus",
+          width: 120,
+          render: (h, params) => {
+            if (params.row.applyStatus == "APPLY") {
+              return h("Tag", { props: { color: "volcano" } }, "申请中");
+            } else if (params.row.applyStatus == "VIA_AUDITING") {
+              return h("Tag", { props: { color: "green" } }, "审核通过");
+            } else if (params.row.applyStatus == "SUCCESS") {
+              return h("Tag", { props: { color: "blue" } }, "提现成功");
+            } else {
+              return h("Tag", { props: { color: "red" } }, "审核拒绝");
             }
           }
-        ],
-        data: [], // 表单数据
-        total: 0, // 表单数据总数
-      };
-    },
-    filters: {
-      paramTypeFilter(val) {
-        if (val === 'APPLY') {
-          return '申请中'
-        } else if (val === 'VIA_AUDITING') {
-          return '审核通过(提现成功)'
-        } else if (val === 'FAIL_AUDITING') {
-          return '审核拒绝'
-        } else {
-          return '未知状态'
-        }
+        },
+        {
+          title: "申请时间",
+          key: "createTime",
+          align: "left",
+          width: 170,
+        },
+        {
+          title: "审核时间",
+          key: "inspectTime",
+          align: "left",
+          width: 170,
+        },
+        {
+          title: "操作",
+          key: "action",
+          width: 120,
+          align: "center",
+          fixed: "right",
+          render: (h, params) => {
+            if (params.row.applyStatus == "APPLY") {
+              return h(
+                "Button",
+                {
+                  props: {
+                    type: "success",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.showList = {};
+                      this.roleModalVisible = true;
+                      this.showList = params.row;
+                    },
+                  },
+                },
+                "审核"
+              );
+            } else {
+              return h(
+                "Button",
+                {
+                  props: {
+                    type: "primary",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.showList = {};
+                      this.queryModalVisible = true;
+                      this.showList = params.row;
+                      this.modalTitle = "查看";
+                    },
+                  },
+                },
+                "查看"
+              );
+            }
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  filters: {
+    paramTypeFilter(val) {
+      if (val === "APPLY") {
+        return "申请中";
+      } else if (val === "VIA_AUDITING") {
+        return "审核通过(提现成功)";
+      } else if (val === "FAIL_AUDITING") {
+        return "审核拒绝";
+      } else {
+        return "未知状态";
       }
     },
-    methods: {
-      submitRole(res) {
-        const params = {}
-        params.apply_id = this.showList.id
-        params.result = res
-        params.remark = this.audit
-        if (res === false && params.remark === '') {
-          this.$Message.error("审核备注不能为空");
-          return
-        }
-        withdrawApply(params).then((res) => {
-          this.loading = false;
-          if (res == true) {
-            this.$Message.success("操作成功");
-            this.roleModalVisible = false;
-            this.getDataList();
-          }
-        });
-      },
-      init() {
-        this.getDataList();
-      },
-      changePage(v) {
-        this.searchForm.pageNumber = v;
-        this.getDataList();
-        this.clearSelectAll();
-      },
-      changePageSize(v) {
-        this.searchForm.pageSize = v;
-        this.getDataList();
-      },
-      handleSearch() {
-        this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
-        this.getDataList();
-      },
-      handleReset() {
-        this.$refs.searchForm.resetFields();
-        this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
-        this.selectDate = null;
-        this.searchForm.startDate = "";
-        this.searchForm.endDate = "";
-        this.searchForm.memberName = "";
-        // 重新加载数据
-        this.getDataList();
-      },
-      changeSort(e) {
-        this.searchForm.sort = e.key;
-        this.searchForm.order = e.order;
-        if (e.order === "normal") {
-          this.searchForm.order = "";
-        }
-        this.getDataList();
-      },
-      clearSelectAll() {
-        this.$refs.table.selectAll(false);
-      },
-      changeSelect(e) {
-        this.selectList = e;
-        this.selectCount = e.length;
-      },
-      selectDateRange(v) {
-        if (v) {
-          this.searchForm.startDate = v[0];
-          this.searchForm.endDate = v[1];
-        }
-      },
-      getDataList() {
-        this.loading = true;
-        // 带多条件搜索参数获取表单数据 请自行修改接口
-        getUserWithdrawApply(this.searchForm).then((res) => {
-          this.loading = false;
-          if (res.success) {
-            this.data = res.result.records;
-            this.total = res.result.total;
-          }
-        });
-        this.total = this.data.length;
+  },
+  methods: {
+    submitRole(res) {
+      const params = {};
+      params.applyId = this.showList.id;
+      params.result = res;
+      params.remark = this.audit;
+      if (res === false && params.remark === "") {
+        this.$Message.error("审核备注不能为空");
+        return;
+      }
+      withdrawApply(params).then((res) => {
         this.loading = false;
-      },
+        if (res == true) {
+          this.$Message.success("操作成功");
+          this.roleModalVisible = false;
+          this.getDataList();
+        }
+      });
     },
-    mounted() {
-      this.init();
+    init() {
+      this.getDataList();
     },
-  };
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    handleReset() {
+      this.$refs.searchForm.resetFields();
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.selectDate = null;
+      this.searchForm.startDate = "";
+      this.searchForm.endDate = "";
+      this.searchForm.memberName = "";
+      // 重新加载数据
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    selectDateRange(v) {
+      if (v) {
+        this.searchForm.startDate = v[0];
+        this.searchForm.endDate = v[1];
+      }
+    },
+    getDataList() {
+      this.loading = true;
+      // 带多条件搜索参数获取表单数据 请自行修改接口
+      getUserWithdrawApply(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
 </script>
 <style lang="scss" scoped>
-  // 建议引入通用样式 可删除下面样式代码
-  @import "@/styles/table-common.scss";
+// 建议引入通用样式 可删除下面样式代码
+@import "@/styles/table-common.scss";
 </style>
diff --git a/seller/src/config/index.js b/seller/src/config/index.js
index fb771310..53b93578 100644
--- a/seller/src/config/index.js
+++ b/seller/src/config/index.js
@@ -22,10 +22,7 @@ export default {
     buyer: 'https://buyer-api.pickmall.cn',
     seller: 'https://store-api.pickmall.cn',
     manager: 'https://admin-api.pickmall.cn',
-    // common: 'http://192.168.0.100:8890',
-    // buyer: 'http://192.168.0.100:8888',
-    // seller: 'http://192.168.0.100:8889',
-    // manager: 'http://192.168.0.100:8887'
+
   },
   api_prod: {
     common: 'https://common-api.pickmall.cn',

From 18bfa0edefdb57629647a908d949b044938c48bd Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Tue, 29 Jun 2021 14:58:07 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=BB=91=E5=9D=97=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/App.vue                             |  2 +-
 buyer/src/components/verify/index.vue         | 36 +++++++++----------
 buyer/src/config/index.js                     | 16 ++++-----
 buyer/src/pages/Login.vue                     | 14 +++++---
 buyer/src/pages/SignUp.vue                    |  4 +--
 buyer/src/pages/forgetPassword.vue            |  8 +++--
 manager/src/views/login.vue                   |  6 ++--
 .../src/views/my-components/verify/index.vue  | 29 +++++++--------
 seller/src/views/login.vue                    |  4 +--
 .../src/views/my-components/verify/index.vue  | 30 ++++++++--------
 10 files changed, 77 insertions(+), 72 deletions(-)

diff --git a/buyer/src/App.vue b/buyer/src/App.vue
index 019eb1c1..56da9df3 100644
--- a/buyer/src/App.vue
+++ b/buyer/src/App.vue
@@ -31,7 +31,7 @@ export default {
 </script>
 <style lang="scss">
 #app{
-  min-height: 100%;
+  height: 100%;
   @include background_color($light_background_color);
 }
 </style>
diff --git a/buyer/src/components/verify/index.vue b/buyer/src/components/verify/index.vue
index 6dfa3be0..3004b32c 100644
--- a/buyer/src/components/verify/index.vue
+++ b/buyer/src/components/verify/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="verify-content" v-if="show" @mousemove="mouseMove" @mouseup="mouseUp">
+  <div class="verify-content" v-if="show" @mousemove="mouseMove" @mouseup="mouseUp" @click.stop>
     <div class="imgBox" :style="{width:data.originalWidth+'px',height:data.originalHeight + 'px'}">
       <img :src="data.backImage" style="width:100%;height:100%" alt="">
       <img class="slider" :src="data.slidingImage" :style="{left:distance+'px',top:data.randomY+'px'}" :width="data.sliderWidth" :height="data.sliderHeight" alt="">
@@ -38,16 +38,16 @@ export default {
       distance: 0, // 拼图移动距离
       flag: false, // 判断滑块是否按下
       downX: 0, // 鼠标按下位置
-      bgColor: 'aqua', // 滑动背景颜色
+      bgColor: '#04ad11', // 滑动背景颜色
       verifyText: '拖动滑块解锁' // 文字提示
     };
   },
   methods: {
-    mouseDown (e) { // 鼠标按下操作，
+    mouseDown (e) {
       this.downX = e.clientX;
       this.flag = true;
     },
-    mouseMove (e) { // 鼠标移动
+    mouseMove (e) {
       if (this.flag) {
         let offset = e.clientX - this.downX;
 
@@ -60,7 +60,7 @@ export default {
         }
       }
     },
-    mouseUp () { // 鼠标抬起
+    mouseUp () {
       if (!this.flag) return false;
       this.flag = false;
       let params = {
@@ -83,33 +83,31 @@ export default {
         }
       });
     },
-    refresh () { // 刷新验证图片
+    refresh () { // 刷新滑块
       this.flag = false;
       this.downX = 0;
       this.distance = 0;
-      this.bgColor = 'aqua';
+      this.bgColor = '#04ad11';
       this.verifyText = '拖动滑块解锁';
-      this.getImg();
+      this.init();
     },
-    getImg () { // 获取验证图片
+    init () { // 初始化数据
       getVerifyImg(this.type).then(res => {
-        this.data = res.result;
+        if (res.result) {
+          this.data = res.result;
+          this.show = true;
+        } else {
+          this.$Message.warning('请求失败请重试！')
+        }
       });
     }
   },
-  created () {
-    // this.getImg();
-  },
   watch: {
     verifyType: {
       immediate: true,
       handler: function (v) {
         this.type = v;
-        // this.refresh();
       }
-    },
-    show (v) {
-      if (v) this.refresh();
     }
   }
 };
@@ -143,7 +141,7 @@ export default {
   }
 }
 .handle {
-  border: 1px solid rgb(134, 134, 134);
+  border: 1px solid #e4dede;
   margin-top: 5px;
   height: 42px;
   background: #ddd;
@@ -156,7 +154,7 @@ export default {
     width: 40px;
     height: 40px;
     opacity: 0.5;
-    background: aqua;
+    background: #04ad11;
   }
 
   .swiper {
diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js
index c3161388..e3011596 100644
--- a/buyer/src/config/index.js
+++ b/buyer/src/config/index.js
@@ -17,15 +17,15 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    common: 'http://192.168.0.100:8890',
-    buyer: 'http://192.168.0.100:8888',
-    seller: 'http://192.168.0.100:8889',
-    manager: 'http://192.168.0.100:8887'
+    // common: 'http://192.168.0.100:8890',
+    // buyer: 'http://192.168.0.100:8888',
+    // seller: 'http://192.168.0.100:8889',
+    // manager: 'http://192.168.0.100:8887'
 
-    // common: 'https://common-api.pickmall.cn',
-    // buyer: 'https://buyer-api.pickmall.cn',
-    // seller: 'https://store-api.pickmall.cn',
-    // manager: 'https://admin-api.pickmall.cn'
+    common: 'https://common-api.pickmall.cn',
+    buyer: 'https://buyer-api.pickmall.cn',
+    seller: 'https://store-api.pickmall.cn',
+    manager: 'https://admin-api.pickmall.cn'
   },
   api_prod: {
     common: 'https://common-api.pickmall.cn',
diff --git a/buyer/src/pages/Login.vue b/buyer/src/pages/Login.vue
index a078e266..66c65a86 100644
--- a/buyer/src/pages/Login.vue
+++ b/buyer/src/pages/Login.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login" @keyup.enter="handleSubmit('formInline')">
     <!-- 顶部logo -->
-    <div class="top-content">
+    <div class="top-content" @click='$refs.verify.show = false'>
       <div class="logo-box">
         <img
           :src="logoImg"
@@ -15,7 +15,7 @@
       <!-- 轮播 -->
       <Carousel loop :autoplay-speed="5000" class="login-carousel" arrow="never">
         <CarouselItem>
-          <div class="demo-carousel">
+          <div class="demo-carousel" @click='$refs.verify.show = false'>
             <img
               src="https://wanmi-b2b.oss-cn-shanghai.aliyuncs.com/201811141632252680"
             />
@@ -23,7 +23,7 @@
         </CarouselItem>
       </Carousel>
       <!-- 登录模块 -->
-      <div class="form-box">
+      <div class="form-box" @click='$refs.verify.show = false'>
         <div class="account-number">
           <div class="tab-switch">
             <span>{{type?'账号登录':'验证码登录'}}</span>
@@ -37,6 +37,7 @@
           :model="formData"
           :rules="ruleInline"
           v-show="type === true"
+          @click.self='$refs.verify.show = false'
         >
           <FormItem prop="username">
             <i-input
@@ -72,6 +73,7 @@
           :model="formSms"
           :rules="ruleInline"
           v-show="type === false"
+          @click.self='$refs.verify.show = false'
         >
           <FormItem prop="mobile">
             <i-input
@@ -194,7 +196,7 @@ export default {
       this.$refs[name].validate((valid) => {
         if (valid) {
           if (this.type) {
-            this.$refs.verify.show = true;
+            this.$refs.verify.init();
           } else {
             let data = JSON.parse(JSON.stringify(this.formSms));
             apiLogin.smsLogin(data).then((res) => {
@@ -224,6 +226,7 @@ export default {
         }
       });
     },
+    // 发送手机验证码
     sendCode () {
       if (this.time === 60) {
         if (this.formSms.mobile === '') {
@@ -296,9 +299,10 @@ export default {
         this.$refs.verify.show = false;
       }
     },
+    // 开启滑块验证
     verifyBtnClick () {
       if (!this.verifyStatus) {
-        this.$refs.verify.show = true;
+        this.$refs.verify.init();
       }
     },
     handleWebLogin (type) { // 第三方登录
diff --git a/buyer/src/pages/SignUp.vue b/buyer/src/pages/SignUp.vue
index e68cde17..1abd7039 100644
--- a/buyer/src/pages/SignUp.vue
+++ b/buyer/src/pages/SignUp.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="login">
+  <div class="login" @click='$refs.verify.show = false'>
     <div style="height:50px;"></div>
     <div class="logo-box">
       <img
@@ -202,7 +202,7 @@ export default {
     },
     verifyBtnClick () {
       if (!this.verifyStatus) {
-        this.$refs.verify.show = true;
+        this.$refs.verify.init();
       }
     }
   },
diff --git a/buyer/src/pages/forgetPassword.vue b/buyer/src/pages/forgetPassword.vue
index 2de0d5a0..88dced4e 100644
--- a/buyer/src/pages/forgetPassword.vue
+++ b/buyer/src/pages/forgetPassword.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="login">
+  <div class="forget-password" @click='$refs.verify.show = false'>
     <div style="height:50px;"></div>
     <!-- 顶部logo -->
     <div class="logo-box">
@@ -236,7 +236,7 @@ export default {
     },
     verifyBtnClick () {
       if (!this.verifyStatus) {
-        this.$refs.verify.show = true;
+        this.$refs.verify.init();
       }
     }
   },
@@ -248,7 +248,11 @@ export default {
   }
 };
 </script>
+
 <style scoped lang="scss">
+.forget-password{
+  height: 100%;
+}
 .logo-box {
   width: 600px;
   height: 80px;
diff --git a/manager/src/views/login.vue b/manager/src/views/login.vue
index f428e847..46c80c11 100644
--- a/manager/src/views/login.vue
+++ b/manager/src/views/login.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="login">
+  <div class="login" @click='$refs.verify.show = false'>
     <Row @keydown.enter.native="submitLogin" class="flex">
       <Col style="width: 368px">
       <Header />
@@ -111,7 +111,7 @@ export default {
       // 登录操作
       this.$refs.usernameLoginForm.validate((valid) => {
         if (valid) {
-          this.$refs.verify.show = true;
+          this.$refs.verify.init();
         }
       });
     },
@@ -161,7 +161,7 @@ export default {
   }
   .verify-con {
     position: absolute;
-    top: 90px;
+    top: 150px;
     z-index: 10;
     left: 20px;
   }
diff --git a/manager/src/views/my-components/verify/index.vue b/manager/src/views/my-components/verify/index.vue
index 136c3160..3004b32c 100644
--- a/manager/src/views/my-components/verify/index.vue
+++ b/manager/src/views/my-components/verify/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="verify-content" v-if="show" @mousemove="mouseMove" @mouseup="mouseUp">
+  <div class="verify-content" v-if="show" @mousemove="mouseMove" @mouseup="mouseUp" @click.stop>
     <div class="imgBox" :style="{width:data.originalWidth+'px',height:data.originalHeight + 'px'}">
       <img :src="data.backImage" style="width:100%;height:100%" alt="">
       <img class="slider" :src="data.slidingImage" :style="{left:distance+'px',top:data.randomY+'px'}" :width="data.sliderWidth" :height="data.sliderHeight" alt="">
@@ -18,7 +18,7 @@
 import { getVerifyImg, postVerifyImg } from './verify.js';
 export default {
   props: {
-    verifyType: { // 验证方式，登录，注册等
+    verifyType: {
       defalut: 'LOGIN',
       type: String
     }
@@ -38,7 +38,7 @@ export default {
       distance: 0, // 拼图移动距离
       flag: false, // 判断滑块是否按下
       downX: 0, // 鼠标按下位置
-      bgColor: 'aqua', // 滑动背景颜色
+      bgColor: '#04ad11', // 滑动背景颜色
       verifyText: '拖动滑块解锁' // 文字提示
     };
   },
@@ -83,17 +83,22 @@ export default {
         }
       });
     },
-    refresh () {
+    refresh () { // 刷新滑块
       this.flag = false;
       this.downX = 0;
       this.distance = 0;
-      this.bgColor = 'aqua';
+      this.bgColor = '#04ad11';
       this.verifyText = '拖动滑块解锁';
-      this.getImg();
+      this.init();
     },
-    getImg () {
+    init () { // 初始化数据
       getVerifyImg(this.type).then(res => {
-        this.data = res.result;
+        if (res.result) {
+          this.data = res.result;
+          this.show = true;
+        } else {
+          this.$Message.warning('请求失败请重试！')
+        }
       });
     }
   },
@@ -102,11 +107,7 @@ export default {
       immediate: true,
       handler: function (v) {
         this.type = v;
-        // this.refresh();
       }
-    },
-    show (v) {
-      if (v) this.refresh();
     }
   }
 };
@@ -140,7 +141,7 @@ export default {
   }
 }
 .handle {
-  border: 1px solid rgb(134, 134, 134);
+  border: 1px solid #e4dede;
   margin-top: 5px;
   height: 42px;
   background: #ddd;
@@ -153,7 +154,7 @@ export default {
     width: 40px;
     height: 40px;
     opacity: 0.5;
-    background: aqua;
+    background: #04ad11;
   }
 
   .swiper {
diff --git a/seller/src/views/login.vue b/seller/src/views/login.vue
index a1bd088a..b5fb4c09 100644
--- a/seller/src/views/login.vue
+++ b/seller/src/views/login.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="login">
+  <div class="login" @click="$refs.verify.show = false">
     <Row type="flex" @keydown.enter.native="submitLogin">
       <Col style="width: 368px">
       <Header />
@@ -128,7 +128,7 @@ export default {
       // 登录提交
       this.$refs.usernameLoginForm.validate((valid) => {
         if (valid) {
-          this.$refs.verify.show = true;
+          this.$refs.verify.init();
         }
       });
     },
diff --git a/seller/src/views/my-components/verify/index.vue b/seller/src/views/my-components/verify/index.vue
index 34f07f36..7dfbff4f 100644
--- a/seller/src/views/my-components/verify/index.vue
+++ b/seller/src/views/my-components/verify/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="verify-content" v-if="show" @mousemove="mouseMove" @mouseup="mouseUp">
+  <div class="verify-content" v-if="show" @mousemove="mouseMove" @mouseup="mouseUp" @click.stop>
     <div class="imgBox" :style="{width:data.originalWidth+'px',height:data.originalHeight + 'px'}">
       <img :src="data.backImage" style="width:100%;height:100%" alt="">
       <img class="slider" :src="data.slidingImage" :style="{left:distance+'px',top:data.randomY+'px'}" :width="data.sliderWidth" :height="data.sliderHeight" alt="">
@@ -38,7 +38,7 @@ export default {
       distance: 0, // 拼图移动距离
       flag: false, // 判断滑块是否按下
       downX: 0, // 鼠标按下位置
-      bgColor: 'aqua', // 滑动背景颜色
+      bgColor: '#04ad11', // 滑动背景颜色
       verifyText: '拖动滑块解锁' // 文字提示
     };
   },
@@ -83,34 +83,32 @@ export default {
         }
       });
     },
-    refresh () {
+    refresh () { // 刷新滑块
       this.flag = false;
       this.downX = 0;
       this.distance = 0;
-      this.bgColor = 'aqua';
+      this.bgColor = '#04ad11';
       this.verifyText = '拖动滑块解锁';
-      this.getImg();
+      this.init();
     },
-    getImg () {
+    init () { // 初始化数据
       getVerifyImg(this.type).then(res => {
-        this.data = res.result;
+        if (res.result) {
+          this.data = res.result;
+          this.show = true;
+        } else {
+          this.$Message.warning('请求失败请重试！')
+        }
       });
     }
   },
-  created () {
-    // this.getImg();
-  },
   watch: {
     verifyType: {
       immediate: true,
       handler: function (v) {
         this.type = v;
-        // this.refresh();
       }
     },
-    show (v) {
-      if (v) this.refresh();
-    }
   }
 };
 </script>
@@ -143,7 +141,7 @@ export default {
   }
 }
 .handle {
-  border: 1px solid rgb(134, 134, 134);
+  border: 1px solid #e4dede;
   margin-top: 5px;
   height: 42px;
   background: #ddd;
@@ -156,7 +154,7 @@ export default {
     width: 40px;
     height: 40px;
     opacity: 0.5;
-    background: aqua;
+    background: #04ad11;
   }
 
   .swiper {

From 5143f2b83f1292d01e4584582a6c4e47934e1fe1 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Tue, 29 Jun 2021 15:24:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=BB=91=E5=9D=97?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/components/verify/index.vue            | 6 +++++-
 manager/src/views/my-components/verify/index.vue | 4 ++++
 seller/src/views/my-components/verify/index.vue  | 6 +++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/buyer/src/components/verify/index.vue b/buyer/src/components/verify/index.vue
index 3004b32c..39ecee85 100644
--- a/buyer/src/components/verify/index.vue
+++ b/buyer/src/components/verify/index.vue
@@ -18,6 +18,7 @@
 import { getVerifyImg, postVerifyImg } from './verify.js';
 export default {
   props: {
+    // 传入数据，判断是登录、注册、修改密码
     verifyType: {
       defalut: 'LOGIN',
       type: String
@@ -43,10 +44,12 @@ export default {
     };
   },
   methods: {
+    // 鼠标按下事件，开始拖动滑块
     mouseDown (e) {
       this.downX = e.clientX;
       this.flag = true;
     },
+    // 鼠标移动事件，计算距离
     mouseMove (e) {
       if (this.flag) {
         let offset = e.clientX - this.downX;
@@ -60,6 +63,7 @@ export default {
         }
       }
     },
+    // 鼠标抬起事件，验证是否正确
     mouseUp () {
       if (!this.flag) return false;
       this.flag = false;
@@ -108,7 +112,7 @@ export default {
       handler: function (v) {
         this.type = v;
       }
-    }
+    },
   }
 };
 </script>
diff --git a/manager/src/views/my-components/verify/index.vue b/manager/src/views/my-components/verify/index.vue
index 3004b32c..eb6b7705 100644
--- a/manager/src/views/my-components/verify/index.vue
+++ b/manager/src/views/my-components/verify/index.vue
@@ -18,6 +18,7 @@
 import { getVerifyImg, postVerifyImg } from './verify.js';
 export default {
   props: {
+    // 传入数据，判断是登录、注册、修改密码
     verifyType: {
       defalut: 'LOGIN',
       type: String
@@ -43,10 +44,12 @@ export default {
     };
   },
   methods: {
+    // 鼠标按下事件，开始拖动滑块
     mouseDown (e) {
       this.downX = e.clientX;
       this.flag = true;
     },
+    // 鼠标移动事件，计算距离
     mouseMove (e) {
       if (this.flag) {
         let offset = e.clientX - this.downX;
@@ -60,6 +63,7 @@ export default {
         }
       }
     },
+    // 鼠标抬起事件，验证是否正确
     mouseUp () {
       if (!this.flag) return false;
       this.flag = false;
diff --git a/seller/src/views/my-components/verify/index.vue b/seller/src/views/my-components/verify/index.vue
index 7dfbff4f..eb6b7705 100644
--- a/seller/src/views/my-components/verify/index.vue
+++ b/seller/src/views/my-components/verify/index.vue
@@ -18,6 +18,7 @@
 import { getVerifyImg, postVerifyImg } from './verify.js';
 export default {
   props: {
+    // 传入数据，判断是登录、注册、修改密码
     verifyType: {
       defalut: 'LOGIN',
       type: String
@@ -43,10 +44,12 @@ export default {
     };
   },
   methods: {
+    // 鼠标按下事件，开始拖动滑块
     mouseDown (e) {
       this.downX = e.clientX;
       this.flag = true;
     },
+    // 鼠标移动事件，计算距离
     mouseMove (e) {
       if (this.flag) {
         let offset = e.clientX - this.downX;
@@ -60,6 +63,7 @@ export default {
         }
       }
     },
+    // 鼠标抬起事件，验证是否正确
     mouseUp () {
       if (!this.flag) return false;
       this.flag = false;
@@ -108,7 +112,7 @@ export default {
       handler: function (v) {
         this.type = v;
       }
-    },
+    }
   }
 };
 </script>