From 34bd755f37a56908578f40dd3dd644865d6cba9a Mon Sep 17 00:00:00 2001
From: 17520697812 <1664311035@qq.com>
Date: Wed, 1 Nov 2023 17:00:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=AF=94=E6=9E=84=E5=AE=B6=E6=96=B0?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=89=8D=E7=AB=AF=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                             |   2 +-
 src/App.vue                      |   8 +-
 src/api/customer/customer.js     |  32 +++
 src/i18n/lang/en.json            |   8 +-
 src/i18n/lang/zh-cn.json         |  10 +-
 src/i18n/lang/zh-tw.json         |   8 +-
 src/layout/components/Navbar.vue |   4 +-
 src/settings.js                  |   2 +-
 src/views/customer/index.vue     | 221 ++++++++++++++++++
 src/views/index.vue              | 379 ++++++++++++++-----------------
 src/views/index_v2.vue           | 241 ++++++++++++++++++++
 src/views/login.vue              |  10 +-
 12 files changed, 700 insertions(+), 225 deletions(-)
 create mode 100644 src/api/customer/customer.js
 create mode 100644 src/views/customer/index.vue
 create mode 100644 src/views/index_v2.vue

diff --git a/.env b/.env
index 61adf7f..36e1d6f 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
 
 # 页面标题
-VITE_APP_TITLE = 'ZRAdmin.NET后台管理'
\ No newline at end of file
+VITE_APP_TITLE = 'BeegoDrop后台管理'
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index 17b3fdb..a9269bc 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -57,8 +57,8 @@ watch(
     immediate: true
   }
 )
-console.log('🎉源码地址: https://gitee.com/izory/ZrAdminNetCore')
-console.log('📖官方文档：http://www.izhaorui.cn/doc')
-console.log('💰打赏作者：http://www.izhaorui.cn/doc/support.html')
-console.log('📱移动端体验：http://www.izhaorui.cn/h5')
+// console.log('🎉源码地址: https://gitee.com/izory/ZrAdminNetCore')
+// console.log('📖官方文档：http://www.izhaorui.cn/doc')
+// console.log('💰打赏作者：http://www.izhaorui.cn/doc/support.html')
+// console.log('📱移动端体验：http://www.izhaorui.cn/h5')
 </script>
diff --git a/src/api/customer/customer.js b/src/api/customer/customer.js
new file mode 100644
index 0000000..140b9da
--- /dev/null
+++ b/src/api/customer/customer.js
@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+//查询客户列表
+export function customerList(query) {
+	var parm = {url:'api/customer/list',    method: 'get',    params: query}
+	return request(parm)
+}
+
+// 查询客户详细
+export function getCustomer(customerId) {
+  return request({
+    url: 'api/customer/' + customerId,
+    method: 'get'
+  })
+}
+
+// 修改客户
+export function UpdateCustomer(data) {
+  return request({
+    url: 'api/customer',
+    method: 'put',
+    data:data
+  })
+}
+
+// 查询业务员
+export function SelectSalesmans() {
+  return request({
+    url: 'api/customer/salesmans',
+    method: 'get'
+  })
+}
\ No newline at end of file
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index 5fbfc02..257cd29 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -2,7 +2,7 @@
   "menu": {
     "home": "Home",
     "dashboard": "Dashboard",
-    "system": "System",
+    "system": "UserCenter",
     "monitoring": "Monitoring",
     "systemTools": "Tools",
     "externalOpen": "External open",
@@ -32,7 +32,8 @@
     "personalCenter": "Personal",
     "menuPermi": "Menu permissions",
     "assignUsers": "Authorized user",
-    "cacheMonitor": "Cache monitoring"
+    "cacheMonitor": "Cache monitoring",
+    "customer": "customer"
   },
   "tagsView": {
     "refresh": "refresh",
@@ -178,5 +179,8 @@
     "newPwd": "new password",
     "oldPwd": "Old Password",
     "nickName": "User's Nickname"
+  },
+  "customer": {
+    "email": "Email"
   }
 }
diff --git a/src/i18n/lang/zh-cn.json b/src/i18n/lang/zh-cn.json
index a8ad1ff..bbfe90c 100644
--- a/src/i18n/lang/zh-cn.json
+++ b/src/i18n/lang/zh-cn.json
@@ -2,7 +2,7 @@
   "menu": {
     "home": "首页",
     "dashboard": "控制台",
-    "system": "系统管理",
+    "system": "用户中心",
     "monitoring": "系统监控",
     "systemTools": "系统工具",
     "externalOpen": "外部打开",
@@ -32,7 +32,8 @@
     "personalCenter": "个人中心",
     "menuPermi": "菜单权限",
     "assignUsers": "分配用户",
-    "cacheMonitor": "缓存监控"
+    "cacheMonitor": "缓存监控",
+    "customer": "客户"
   },
   "tagsView": {
     "refresh": "刷新页面",
@@ -178,5 +179,8 @@
   "language": "语言",
   "languageKey": "语言key",
   "showWay": "显示方式",
-  "table": "表格"
+  "table": "表格",
+  "customer": {
+    "email": "客户邮箱"
+  }
 }
diff --git a/src/i18n/lang/zh-tw.json b/src/i18n/lang/zh-tw.json
index c0632b9..683bb4a 100644
--- a/src/i18n/lang/zh-tw.json
+++ b/src/i18n/lang/zh-tw.json
@@ -2,7 +2,7 @@
   "menu": {
     "home": "首頁",
     "dashboard": "控制臺",
-    "system": "系統管理",
+    "system": "用戶中心",
     "monitoring": "系統監控",
     "systemTools": "系統工具",
     "externalOpen": "外部打開",
@@ -32,7 +32,8 @@
     "personalCenter": "個人中心",
     "menuPermi": "菜單權限",
     "assignUsers": "分配用戶",
-    "cacheMonitor": "緩存監控"
+    "cacheMonitor": "緩存監控",
+    "customer": "客戶"
   },
   "tagsView": {
     "refresh": "重繪",
@@ -178,5 +179,8 @@
     "newPwd": "新密碼",
     "oldPwd": "舊密碼",
     "nickName": "用戶暱稱"
+  },
+  "customer": {
+    "email": "客户邮箱"
   }
 }
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 0c3f947..c34a5c5 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -10,8 +10,8 @@
       <header-search id="header-search" class="right-menu-item" />
       <Notice title="通知" class="right-menu-item" />
       <template v-if="appStore.device == 'desktop'">
-        <zr-git title="源码地址" class="right-menu-item" />
-        <zr-doc title="文档地址" class="right-menu-item" />
+        <!-- <zr-git title="源码地址" class="right-menu-item" />
+         <zr-doc title="文档地址" class="right-menu-item" /> -->
         <screenfull title="全屏" class="right-menu-item" />
       </template>
       <size-select title="布局大小" class="right-menu-item" />
diff --git a/src/settings.js b/src/settings.js
index 8300f82..fc72b1f 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -55,7 +55,7 @@ export default {
   /**
    * 版权信息
    */
-  copyright: 'Copyright ©2023 <a target="_black" href="http://www.izhaorui.cn/doc">ZRAdmin.NET</a> All Rights Reserved.',
+  copyright:'', //'Copyright ©2023 <a target="_black" href="http://www.izhaorui.cn/doc">ZRAdmin.NET</a> All Rights Reserved.',
   /**
    * 是否显示底部栏
    */
diff --git a/src/views/customer/index.vue b/src/views/customer/index.vue
new file mode 100644
index 0000000..5917708
--- /dev/null
+++ b/src/views/customer/index.vue
@@ -0,0 +1,221 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+        <el-form-item :label="$t('customer.email')" prop="Email">
+          <el-input v-model="queryParams.Email" placeholder="请输入邮箱地址" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="业务员">
+          <el-select v-model="queryParams.SalesmanId" filterable clearable placeholder="请选择业务员" class="w100">
+            <el-option v-for="item in salesmanOptions" :key="item.users" :label="item.nickName" :value="item.userId" :disabled="item.status == 1">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="search" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+          <el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+        </el-form-item>
+      </el-form>
+    </el-row>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button plain type="primary" icon="plus" @click="handleAdd" v-hasPermi="['system:dept:add']">{{ $t('btn.add') }}</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="customers"
+      :default-expand-all="isExpandAll"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
+      <el-table-column prop="id" label="客户id" width="80"></el-table-column>
+      <el-table-column prop="email" label="客户邮箱" width="230"></el-table-column>
+      <el-table-column prop="invitationCode" label="邀请码"></el-table-column>
+      <el-table-column prop="phone" label="电话号码"></el-table-column>
+      <el-table-column prop="priceMultiples" label="价格倍数"></el-table-column>
+      <el-table-column prop="salesmanName" label="业务员"></el-table-column>
+      <el-table-column label="支付状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :options="statusPayment" :value="scope.row.paymentState" />
+        </template>
+      </el-table-column>
+      <el-table-column label="注册时间" align="center" prop="registTime" width="200">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.registTime) }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作" align="center" width="110" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button text icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']"> </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    <!-- 添加或修改客户信息 -->
+    <el-dialog :title="title" v-model="open" width="600px" append-to-body>
+      <el-form :model="form" label-width="80px" ref="customerRef">
+        <el-row :gutter="20">
+          <el-col :lg="24">
+            <el-form-item label="业务员">
+              <el-select v-model="form.salesmanId" filterable clearable placeholder="请选择业务员" class="w100">
+                <el-option v-for="item in users" :key="item.users" :label="item.nickName" :value="item.userId" :disabled="item.status == 1">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="24">
+            <el-form-item label="联系电话">
+              <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
+        <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="customer">
+import { customerList, getCustomer, UpdateCustomer, SelectSalesmans } from '@/api/customer/customer'
+
+// 遮罩层
+const loading = ref(true)
+// 显示搜索条件
+const showSearch = ref(true)
+// 表格树数据
+const customers = ref([])
+// 是否展开，默认全部折叠
+const isExpandAll = ref(false)
+// 重新渲染表格状态
+const refreshTable = ref(true)
+// 业务员树选择
+const salesmanOptions = ref([])
+// 弹出层标题
+const title = ref('')
+// 是否显示弹出层
+const open = ref(false)
+// 状态数据字典
+const statusPayment = ref([])
+
+// 查询参数
+const queryParams = reactive({
+  Email: undefined,
+  SalesmanId: undefined
+})
+
+//总行数
+const total = ref(0)
+
+const users = ref([])
+
+const { proxy } = getCurrentInstance()
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  getList()
+}
+
+/** 新增操作 */
+function handleAdd() {
+  proxy.$modal.msgSuccess('正在开发中.敬请期待')
+}
+
+/** 编辑 */
+function handleUpdate(row) {
+  const customerId = row.id
+  getCustomer(customerId).then((response) => {
+    var data = response.data
+    users.value = data.users
+    form.value = {
+      id: data.customer.id,
+      salesman: data.customer.salesmanName,
+      salesmanId: data.customer.salesmanId > 0 ? data.customer.salesmanId : null,
+      phone: data.customer.phone
+    }
+    open.value = true
+  })
+}
+
+/** 取消 */
+function cancel() {
+  open.value = false
+}
+
+/** 提交 */
+function submitForm() {
+  proxy.$refs['customerRef'].validate((valid) => {
+    if (valid) {
+      if (form.value.id != undefined) {
+        UpdateCustomer(form.value).then((response) => {
+          proxy.$modal.msgSuccess('修改成功')
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 重置查询 */
+function resetQuery() {
+  proxy.$modal.msgSuccess('正在开发中.敬请期待')
+}
+
+const state = reactive({
+  // 表单参数
+  form: {},
+  // 表单校验
+  rules: {
+    // parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
+    deptName: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
+    orderNum: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }],
+    email: [
+      {
+        type: 'email',
+        message: '请输入正确的邮箱地址',
+        trigger: ['blur', 'change']
+      }
+    ],
+    phone: [
+      {
+        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        message: '请输入正确的手机号码',
+        trigger: 'blur'
+      }
+    ]
+  }
+})
+const formRef = ref()
+const { form, rules } = toRefs(state)
+
+/** 查询客户列表 */
+function getList() {
+  loading.value = true
+  customerList(queryParams).then((response) => {
+    customers.value = proxy.handleTree(response.data.result, 'id')
+    loading.value = false
+    total.value = response.data.totalNum
+  })
+}
+
+/** 查询业务员绑定下拉框 */
+function getSalesmans() {
+  SelectSalesmans().then((response) => {
+    salesmanOptions.value = response.data
+  })
+}
+
+getList()
+proxy.getDicts('sys_automatic_payment').then((response) => {
+  statusPayment.value = response.data
+})
+
+getSalesmans()
+</script>
diff --git a/src/views/index.vue b/src/views/index.vue
index efea7e2..e1c2bd6 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,241 +1,210 @@
 <template>
-  <div class="app-container home">
-    <el-row :gutter="20">
-      <el-col :sm="24" :lg="24">
-        <blockquote class="text-warning" style="font-size: 14px">
-          【阿里云特惠专区】
-          <el-link href="https://www.aliyun.com/minisite/goods?userCode=uotn5vt1&share_source=copy_link" type="primary" target="_black">
-            ☛☛点我进入☚☚
-          </el-link>
-          <br />
-          【领取腾讯云通用云产品新用户专属大礼包2860优惠券，每种代金券限量500张，先到先得。】
-          <el-link href="https://curl.qcloud.com/5J4nag8D" type="primary" target="_blank"> ☛☛点我进入☚☚ </el-link>
-          <br />
-
-          【腾讯云限时秒杀活动】
-          <el-link href="https://curl.qcloud.com/4yEoRquq" type="primary" target="_blank">☛☛点我进入☚☚ </el-link>
-          <br />
-
-          【华为特惠专区，多款产品限时特价】
-          <el-link
-            href="https://activity.huaweicloud.com/discount_area_v5/index.html?fromacct=a53709d1-149d-49f4-9b89-bf62bd96ef65&utm_source=aGlkX3N0dnZkMWNxejBnOTJ5OA===&utm_medium=cps&utm_campaign=201905"
-            type="primary"
-            target="_blank">
-            ☛☛点我进入☚☚
-          </el-link>
-          <br />
-          【领取七牛云通用云产品优惠券】
-          <el-link href="https://s.qiniu.com/FzEfay" type="primary" target="_blank"> ☛☛点我进入☚☚ </el-link>
-          <br />
-          【Gitee 企业版优惠专区】
-          <el-link href="https://gitee.com/enterprises?invite_code=Z2l0ZWUtMTI1NzM1OQ%3D%3D" type="primary" target="_blank"> ☛☛点我进入☚☚ </el-link>
-          <br />
-          <h4 class="text-danger">云产品通用红包，可叠加官网常规优惠使用。(仅限新用户)</h4>
-        </blockquote>
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :lg="16" :sm="24">
-        <h2>ZRAdmin.NET {{ $t('layout.backstageManagement') }}</h2>
-        <p>
-          ZRAdmin.NET借鉴了很多开源项目的优点，让你开发Web管理系统更简单，所以我也把它给开源了（前端
-          <code>vue页面</code>主要使用了若依，后端参考Ruoyi SpringBoot版本，在此表示感谢.)
-        </p>
-        <p>{{ $t('layout.content1') }}</p>
-        <p>
-          <b>{{ $t('layout.currentVersion') }}:</b> <span>v{{ version }}</span>
-          <el-link
-            class="ml10"
-            type="primary"
-            size="small"
-            icon="Document"
-            plain
-            @click="goTarget('http://www.izhaorui.cn/doc/changelog.html#' + version)"
-            >{{ $t('layout.changeLog') }}
-          </el-link>
-        </p>
-        <p>
-          <el-button type="primary" size="small" icon="Cloudy" plain @click="goTarget('https://gitee.com/izory/ZrAdminNetCore')">Gitee </el-button>
-          <el-button type="primary" size="small" icon="Cloudy" plain @click="goTarget('https://github.com/izhaorui/ZrAdmin.NET')"
-            >Github
-          </el-button>
-        </p>
-        <p></p>
-        <h3>{{ $t('layout.tip1') }}</h3>
+  <div class="home">
+    <!-- 用户信息 -->
+    <el-row :gutter="15">
+      <el-col :md="24" :lg="16" :xl="24" class="mb10">
+        <el-card shadow="hover">
+          <div class="user-item">
+            <div class="user-item-left">
+              <el-avatar :size="60" shape="circle" :src="userInfo.avatar" />
+            </div>
+
+            <div class="user-item-right">
+              <el-row>
+                <el-col :xs="24" :md="24" class="right-title mb20 one-text-overflow">
+                  <div class="mb10">
+                    {{ userInfo.welcomeMessage }} <strong>{{ userInfo.nickName }}</strong>
+                    <span>({{ userInfo.welcomeContent }})</span>
+                  </div>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-button icon="edit">
+                  <router-link to="/user/profile">{{ $t('layout.modifyInformation') }}</router-link>
+                </el-button>
+              </el-row>
+            </div>
+          </div>
+        </el-card>
       </el-col>
-      <el-col :lg="8" :sm="24">
-        <h2>{{ $t('layout.technicalSelection') }}</h2>
-        <div style="float: left; width: 50%">
-          <h4>{{ $t('layout.backendTechnology') }}</h4>
-          <ul>
-            <li>NET7</li>
-            <li>JWT</li>
-            <li>SqlSugar</li>
-            <li>Quartz.Net</li>
-            <li>MySql</li>
-            <li>Mapster</li>
-            <li>MiniExcel</li>
-            <li>Redis</li>
-            <li>Signalr</li>
-            <li>...</li>
-          </ul>
-        </div>
-        <div style="float: right; width: 50%">
-          <h4>{{ $t('layout.frontendTechnology') }}</h4>
-          <ul>
-            <li>Vue3</li>
-            <li>Vuex</li>
-            <li>Element plus</li>
-            <li>Axios</li>
-            <li>Sass</li>
-            <li>Wangeditor</li>
-            <li>Vite</li>
-            <li>Composition api</li>
-            <li>I18n</li>
-            <li>...</li>
-          </ul>
-        </div>
+      <el-col :lg="8" class="mb10">
+        <el-card style="height: 100%">
+          <div class="text-warning mb10">{{ currentTime }} {{ weekName }}</div>
+          <div class="work-wrap">
+            <el-statistic :title="$t('layout.workTime')" :formatter="workTimeFormatter" :value="onlineInfo.todayOnlineTime" />
+            <el-statistic :title="$t('layout.onlineClientNum')" :value="onlineInfo.clientNum" />
+          </div>
+        </el-card>
       </el-col>
     </el-row>
-    <el-divider />
-    <el-row :gutter="20" class="mt10">
-      <el-col :sm="24" :lg="8">
-        <el-card>
+
+    <el-row :gutter="15">
+      <el-col :md="24" :lg="24" :xl="24" class="mb10">
+        <el-card shadow="hover">
           <template #header>
-            <span>{{ $t('layout.donationSupport') }}</span>
+            <span><svg-icon name="tool" /> {{ $t('layout.commonFuncs') }}</span>
+            <div class="home-card-more">
+              <el-button text @click="handleAdd()">{{ $t('btn.add') }}</el-button>
+            </div>
           </template>
-
-          <div class="body">
-            <div style="color: red">{{ $t('layout.rewardUser') }}</div>
-            <img src="@/assets/images/reward.jpg" alt="donate" style="width: 100%" />
+          <div>
+            <el-scrollbar wrap-class="scrollbar-wrapper"> <CommonMenu v-model="showEdit"></CommonMenu></el-scrollbar>
           </div>
         </el-card>
       </el-col>
-      <el-col :sm="24" :lg="10">
-        <el-card>
-          <template #header>
-            <span>
-              移动端体验
-              <span style="color: red">如有需要联系作者</span>
-            </span>
-          </template>
+    </el-row>
+    <panel-group @handleSetLineChartData="handleSetLineChartData" />
 
-          <div class="body">
-            <table style="width: 100%; text-align: center">
-              <tr>
-                <td>微信小程序</td>
-                <td>H5</td>
-              </tr>
-              <tr>
-                <td>
-                  <img src="@/assets/images/qrcode.jpg" alt="donate" style="width: 160px" />
-                </td>
-                <td>
-                  <img src="@/assets/images/qrcodeH5.png" alt="donate" style="width: 160px" />
-                </td>
-              </tr>
-            </table>
-          </div>
-        </el-card>
+    <el-row :gutter="32">
+      <el-col :xs="24" :sm="24" :lg="24">
+        <div class="chart-wrapper">
+          <line-chart :chart-data="lineChartData" :key="dataType" />
+        </div>
       </el-col>
-      <el-col :sm="24" :lg="6">
-        <el-card>
-          <template #header>
-            <span>{{ $t('layout.contactUs') }}</span>
-          </template>
-          <div class="body">
-            <p>
-              <el-icon> <promotion /> </el-icon>{{ $t('layout.officialWebsite') }}：
-              <el-link href="http://www.izhaorui.cn/doc" target="_blank"> http://www.izhaorui.cn/doc </el-link>
-            </p>
-            <p>
-              <el-icon> <UserFilled /> </el-icon>{{ $t('layout.qqGroup') }}：
-              <s>满191349103</s>
+    </el-row>
 
-              <el-link
-                target="_black"
-                href="https://qm.qq.com/cgi-bin/qm/qr?k=kgt4HsckdljU0VM-0kxND6d_igmfuPlL&authKey=r55YUbruiKQ5iwC/folG7KLCmZ++Y4rQVgNlvLbUniUMkbk24Y9+zNuOmOnjAjRc&noverify=0">
-                &nbsp;462862273
-              </el-link>
-            </p>
-          </div>
-        </el-card>
+    <el-row :gutter="32">
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper">
+          <raddar-chart />
+        </div>
+      </el-col>
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper">
+          <pie-chart />
+        </div>
+      </el-col>
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper">
+          <bar-chart />
+        </div>
       </el-col>
     </el-row>
+    <!-- <el-row :gutter="32">
+      <el-col :xs="24" :sm="24" :lg="24">
+        <div class="chart-wrapper">
+          <WordCloudChat :data="data.wordCloud" />
+        </div>
+      </el-col>
+    </el-row> -->
   </div>
 </template>
 
 <script setup name="index">
-import defaultSettings from '@/settings'
-const version = defaultSettings.version
+import PanelGroup from './dashboard/PanelGroup'
+import LineChart from './dashboard/LineChart'
+import RaddarChart from './dashboard/RaddarChart'
+import PieChart from './dashboard/PieChart'
+import BarChart from './dashboard/BarChart'
+// import WordCloudChat from './dashboard/WordCloud.vue'
+import CommonMenu from './components/CommonMenu'
+import dayjs from 'dayjs'
+// 时间插件
+import duration from 'dayjs/plugin/duration'
+dayjs.extend(duration)
+
+import useUserStore from '@/store/modules/user'
+import useSocketStore from '@/store/modules/socket'
+import { getWeek } from '@/utils/ruoyi'
+const showEdit = ref(false)
+const data = {
+  newVisitis: {
+    expectedData: [100, 120, 161, 134, 105, 160, 165],
+    actualData: [120, 82, 91, 154, 162, 140, 145]
+  },
+  messages: {
+    expectedData: [200, 192, 120, 144, 160, 130, 140],
+    actualData: [180, 160, 151, 106, 145, 150, 130]
+  },
+  purchases: {
+    expectedData: [80, 100, 121, 104, 105, 90, 100],
+    actualData: [120, 90, 100, 138, 142, 130, 130]
+  },
+  shoppings: {
+    expectedData: [130, 140, 141, 142, 145, 150, 160],
+    actualData: [120, 82, 91, 154, 162, 140, 130]
+  }
+}
+const { proxy } = getCurrentInstance()
+const userInfo = computed(() => {
+  return useUserStore().userInfo
+})
+const onlineInfo = computed(() => {
+  return useSocketStore().onlineInfo
+})
+const currentTime = computed(() => {
+  return proxy.parseTime(new Date(), 'YYYY-MM-DD')
+})
+const weekName = getWeek()
+
+let lineChartData = reactive([])
+const dataType = ref(null)
+function handleSetLineChartData(type) {
+  dataType.value = type
+  lineChartData = data[type]
+}
+handleSetLineChartData('newVisitis')
 
-function goTarget(url) {
-  window.open(url, '__blank')
+function handleAdd() {
+  proxy.$modal.msg('请通过搜索添加')
+}
+function workTimeFormatter(val) {
+  return dayjs.duration(val * 60, 'second').format('HH时mm分')
 }
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 .home {
-  blockquote {
-    padding: 10px 20px;
-    margin: 0 0 20px;
-    font-size: 17.5px;
-    border-left: 5px solid #eee;
-  }
-
-  hr {
-    margin-top: 20px;
-    margin-bottom: 20px;
-    border: 0;
-    border-top: 1px solid #eee;
+  .home-card-more {
+    float: right;
+    padding: 3px 0;
+    font-size: 13px;
   }
 
-  .col-item {
-    margin-bottom: 20px;
-  }
-
-  ul {
-    padding: 0;
-    margin: 0;
-  }
-
-  font-family: 'open sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  color: #676a6c;
-  overflow-x: hidden;
-
-  ul {
-    list-style-type: none;
+  .user-item {
+    // height: 198px;
+    display: flex;
+    align-items: center;
+    .user-item-left {
+      width: 60px;
+      height: 60px;
+      overflow: hidden;
+      margin-right: 10px;
+    }
+    .user-item-right {
+      flex: 1;
+      .right-title {
+        font-size: 20px;
+      }
+    }
   }
-
-  h4 {
-    margin-top: 0px;
+  .info {
+    height: 200px;
+    // overflow-y: scroll;
   }
 
-  h2 {
-    margin-top: 10px;
-    font-size: 26px;
-    font-weight: 100;
-  }
+  .work-wrap {
+    display: grid;
+    grid-template-columns: repeat(2, 50%);
 
-  p {
-    margin-top: 10px;
+    .item {
+      text-align: center;
 
-    b {
-      font-weight: 700;
+      .name {
+        color: #606666;
+      }
     }
   }
+}
+.chart-wrapper {
+  background: var(--base-bg-main);
+  padding: 16px 16px 0;
+  margin-bottom: 32px;
+}
 
-  .update-log {
-    ol {
-      display: block;
-      list-style-type: decimal;
-      margin-block-start: 1em;
-      margin-block-end: 1em;
-      margin-inline-start: 0;
-      margin-inline-end: 0;
-      padding-inline-start: 40px;
-    }
+@media (max-width: 1024px) {
+  .chart-wrapper {
+    padding: 8px;
   }
 }
 </style>
diff --git a/src/views/index_v2.vue b/src/views/index_v2.vue
new file mode 100644
index 0000000..efea7e2
--- /dev/null
+++ b/src/views/index_v2.vue
@@ -0,0 +1,241 @@
+<template>
+  <div class="app-container home">
+    <el-row :gutter="20">
+      <el-col :sm="24" :lg="24">
+        <blockquote class="text-warning" style="font-size: 14px">
+          【阿里云特惠专区】
+          <el-link href="https://www.aliyun.com/minisite/goods?userCode=uotn5vt1&share_source=copy_link" type="primary" target="_black">
+            ☛☛点我进入☚☚
+          </el-link>
+          <br />
+          【领取腾讯云通用云产品新用户专属大礼包2860优惠券，每种代金券限量500张，先到先得。】
+          <el-link href="https://curl.qcloud.com/5J4nag8D" type="primary" target="_blank"> ☛☛点我进入☚☚ </el-link>
+          <br />
+
+          【腾讯云限时秒杀活动】
+          <el-link href="https://curl.qcloud.com/4yEoRquq" type="primary" target="_blank">☛☛点我进入☚☚ </el-link>
+          <br />
+
+          【华为特惠专区，多款产品限时特价】
+          <el-link
+            href="https://activity.huaweicloud.com/discount_area_v5/index.html?fromacct=a53709d1-149d-49f4-9b89-bf62bd96ef65&utm_source=aGlkX3N0dnZkMWNxejBnOTJ5OA===&utm_medium=cps&utm_campaign=201905"
+            type="primary"
+            target="_blank">
+            ☛☛点我进入☚☚
+          </el-link>
+          <br />
+          【领取七牛云通用云产品优惠券】
+          <el-link href="https://s.qiniu.com/FzEfay" type="primary" target="_blank"> ☛☛点我进入☚☚ </el-link>
+          <br />
+          【Gitee 企业版优惠专区】
+          <el-link href="https://gitee.com/enterprises?invite_code=Z2l0ZWUtMTI1NzM1OQ%3D%3D" type="primary" target="_blank"> ☛☛点我进入☚☚ </el-link>
+          <br />
+          <h4 class="text-danger">云产品通用红包，可叠加官网常规优惠使用。(仅限新用户)</h4>
+        </blockquote>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :lg="16" :sm="24">
+        <h2>ZRAdmin.NET {{ $t('layout.backstageManagement') }}</h2>
+        <p>
+          ZRAdmin.NET借鉴了很多开源项目的优点，让你开发Web管理系统更简单，所以我也把它给开源了（前端
+          <code>vue页面</code>主要使用了若依，后端参考Ruoyi SpringBoot版本，在此表示感谢.)
+        </p>
+        <p>{{ $t('layout.content1') }}</p>
+        <p>
+          <b>{{ $t('layout.currentVersion') }}:</b> <span>v{{ version }}</span>
+          <el-link
+            class="ml10"
+            type="primary"
+            size="small"
+            icon="Document"
+            plain
+            @click="goTarget('http://www.izhaorui.cn/doc/changelog.html#' + version)"
+            >{{ $t('layout.changeLog') }}
+          </el-link>
+        </p>
+        <p>
+          <el-button type="primary" size="small" icon="Cloudy" plain @click="goTarget('https://gitee.com/izory/ZrAdminNetCore')">Gitee </el-button>
+          <el-button type="primary" size="small" icon="Cloudy" plain @click="goTarget('https://github.com/izhaorui/ZrAdmin.NET')"
+            >Github
+          </el-button>
+        </p>
+        <p></p>
+        <h3>{{ $t('layout.tip1') }}</h3>
+      </el-col>
+      <el-col :lg="8" :sm="24">
+        <h2>{{ $t('layout.technicalSelection') }}</h2>
+        <div style="float: left; width: 50%">
+          <h4>{{ $t('layout.backendTechnology') }}</h4>
+          <ul>
+            <li>NET7</li>
+            <li>JWT</li>
+            <li>SqlSugar</li>
+            <li>Quartz.Net</li>
+            <li>MySql</li>
+            <li>Mapster</li>
+            <li>MiniExcel</li>
+            <li>Redis</li>
+            <li>Signalr</li>
+            <li>...</li>
+          </ul>
+        </div>
+        <div style="float: right; width: 50%">
+          <h4>{{ $t('layout.frontendTechnology') }}</h4>
+          <ul>
+            <li>Vue3</li>
+            <li>Vuex</li>
+            <li>Element plus</li>
+            <li>Axios</li>
+            <li>Sass</li>
+            <li>Wangeditor</li>
+            <li>Vite</li>
+            <li>Composition api</li>
+            <li>I18n</li>
+            <li>...</li>
+          </ul>
+        </div>
+      </el-col>
+    </el-row>
+    <el-divider />
+    <el-row :gutter="20" class="mt10">
+      <el-col :sm="24" :lg="8">
+        <el-card>
+          <template #header>
+            <span>{{ $t('layout.donationSupport') }}</span>
+          </template>
+
+          <div class="body">
+            <div style="color: red">{{ $t('layout.rewardUser') }}</div>
+            <img src="@/assets/images/reward.jpg" alt="donate" style="width: 100%" />
+          </div>
+        </el-card>
+      </el-col>
+      <el-col :sm="24" :lg="10">
+        <el-card>
+          <template #header>
+            <span>
+              移动端体验
+              <span style="color: red">如有需要联系作者</span>
+            </span>
+          </template>
+
+          <div class="body">
+            <table style="width: 100%; text-align: center">
+              <tr>
+                <td>微信小程序</td>
+                <td>H5</td>
+              </tr>
+              <tr>
+                <td>
+                  <img src="@/assets/images/qrcode.jpg" alt="donate" style="width: 160px" />
+                </td>
+                <td>
+                  <img src="@/assets/images/qrcodeH5.png" alt="donate" style="width: 160px" />
+                </td>
+              </tr>
+            </table>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col :sm="24" :lg="6">
+        <el-card>
+          <template #header>
+            <span>{{ $t('layout.contactUs') }}</span>
+          </template>
+          <div class="body">
+            <p>
+              <el-icon> <promotion /> </el-icon>{{ $t('layout.officialWebsite') }}：
+              <el-link href="http://www.izhaorui.cn/doc" target="_blank"> http://www.izhaorui.cn/doc </el-link>
+            </p>
+            <p>
+              <el-icon> <UserFilled /> </el-icon>{{ $t('layout.qqGroup') }}：
+              <s>满191349103</s>
+
+              <el-link
+                target="_black"
+                href="https://qm.qq.com/cgi-bin/qm/qr?k=kgt4HsckdljU0VM-0kxND6d_igmfuPlL&authKey=r55YUbruiKQ5iwC/folG7KLCmZ++Y4rQVgNlvLbUniUMkbk24Y9+zNuOmOnjAjRc&noverify=0">
+                &nbsp;462862273
+              </el-link>
+            </p>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script setup name="index">
+import defaultSettings from '@/settings'
+const version = defaultSettings.version
+
+function goTarget(url) {
+  window.open(url, '__blank')
+}
+</script>
+
+<style scoped lang="scss">
+.home {
+  blockquote {
+    padding: 10px 20px;
+    margin: 0 0 20px;
+    font-size: 17.5px;
+    border-left: 5px solid #eee;
+  }
+
+  hr {
+    margin-top: 20px;
+    margin-bottom: 20px;
+    border: 0;
+    border-top: 1px solid #eee;
+  }
+
+  .col-item {
+    margin-bottom: 20px;
+  }
+
+  ul {
+    padding: 0;
+    margin: 0;
+  }
+
+  font-family: 'open sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  color: #676a6c;
+  overflow-x: hidden;
+
+  ul {
+    list-style-type: none;
+  }
+
+  h4 {
+    margin-top: 0px;
+  }
+
+  h2 {
+    margin-top: 10px;
+    font-size: 26px;
+    font-weight: 100;
+  }
+
+  p {
+    margin-top: 10px;
+
+    b {
+      font-weight: 700;
+    }
+  }
+
+  .update-log {
+    ol {
+      display: block;
+      list-style-type: decimal;
+      margin-block-start: 1em;
+      margin-block-end: 1em;
+      margin-inline-start: 0;
+      margin-inline-end: 0;
+      padding-inline-start: 40px;
+    }
+  }
+}
+</style>
diff --git a/src/views/login.vue b/src/views/login.vue
index f113b57..e56da54 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -9,8 +9,8 @@
       <div style="padding: 0 25px 5px 25px">
         <el-tabs v-model="loginType" @tab-click="handleLoginType">
           <el-tab-pane :label="$t('login.loginway1')" :name="1"></el-tab-pane>
-          <el-tab-pane :label="$t('login.loginway2')" :name="2" v-if="defaultSettings.showPhoneLogin"></el-tab-pane>
-          <el-tab-pane :label="$t('login.loginway3')" :name="3" v-if="defaultSettings.showQrLogin"></el-tab-pane>
+          <!-- <el-tab-pane :label="$t('login.loginway2')" :name="2" v-if="defaultSettings.showPhoneLogin"></el-tab-pane>
+          <el-tab-pane :label="$t('login.loginway3')" :name="3" v-if="defaultSettings.showQrLogin"></el-tab-pane> -->
         </el-tabs>
       </div>
 
@@ -50,12 +50,12 @@
         <div style="display: flex; justify-content: space-between; align-items: center">
           <el-checkbox v-model="loginForm.rememberMe">{{ $t('login.rememberMe') }}</el-checkbox>
           <span style="font-size: 12px">
-            <router-link class="link-type" :to="'/register'">{{ $t('login.register') }}</router-link>
+            <!-- <router-link class="link-type" :to="'/register'">{{ $t('login.register') }}</router-link> -->
             <span @click="handleForgetPwd()" class="forget-pwd">{{ $t('login.forgotPwd') }}</span>
           </span>
         </div>
       </el-form>
-      <div class="qr-wrap login-form" v-show="loginType == 3">
+      <!-- <div class="qr-wrap login-form" v-show="loginType == 3">
         <div class="login-scan-container">
           <div ref="imgContainerRef" id="imgContainer" class="qrCode"></div>
           <div class="mt10 text-muted">{{ $t('login.tip_scan_code') }}</div>
@@ -63,7 +63,7 @@
       </div>
 
       <phoneLogin v-show="loginType == 2"></phoneLogin>
-      <oauthLogin v-show="defaultSettings.showOtherLogin"></oauthLogin>
+      <oauthLogin v-show="defaultSettings.showOtherLogin"></oauthLogin> -->
     </div>
 
     <div class="el-login-footer">
-- 
Gitee


From 4c6f9542b7fd26a5770856d9123b574b3222bcf6 Mon Sep 17 00:00:00 2001
From: 17520697812 <1664311035@qq.com>
Date: Thu, 30 Nov 2023 10:00:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 .env.production                               |   1 +
 .../business/ProductPricingCalculator.vue     | 530 ++++++++++++++++++
 src/views/system/user/index.vue               |   2 +-
 vite.config.js                                |   7 +
 5 files changed, 540 insertions(+), 2 deletions(-)
 create mode 100644 src/views/business/ProductPricingCalculator.vue

diff --git a/.env.development b/.env.development
index 488868c..cc1add7 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,7 @@
 # 开发环境配置
 ENV = 'development'
 
-VITE_APP_API_HOST = 'http://localhost:8888'
+VITE_APP_API_HOST = 'http://beegodrop.com'
 
 # 开发环境
 VITE_APP_BASE_API = '/dev-api'
diff --git a/.env.production b/.env.production
index 069cc48..f0a78b6 100644
--- a/.env.production
+++ b/.env.production
@@ -1,6 +1,7 @@
 # 生产环境配置
 ENV = 'production'
 
+VITE_APP_API_HOST = 'http://beegodrop.com'
 
 # 生产环境
 VITE_APP_BASE_API = '/prod-api'
diff --git a/src/views/business/ProductPricingCalculator.vue b/src/views/business/ProductPricingCalculator.vue
new file mode 100644
index 0000000..ed98dae
--- /dev/null
+++ b/src/views/business/ProductPricingCalculator.vue
@@ -0,0 +1,530 @@
+<template>
+  <div>
+    <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+      <el-form-item>
+        <el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+        <el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- 工具区域 -->
+    <el-row :gutter="15" class="mb10">
+      <el-col :span="1.5">
+        <el-button type="primary" v-hasPermi="['business:productpricingcalculator:add']" plain icon="plus" @click="handleAdd">
+          {{ $t('btn.add') }}
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          :disabled="single"
+          v-hasPermi="['business:productpricingcalculator:edit']"
+          plain
+          icon="edit"
+          @click="handleUpdate">
+          {{ $t('btn.edit') }}
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          :disabled="multiple"
+          v-hasPermi="['business:productpricingcalculator:delete']"
+          plain
+          icon="delete"
+          @click="handleDelete">
+          {{ $t('btn.delete') }}
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-dropdown trigger="click" v-hasPermi="['business:productpricingcalculator:import']">
+          <el-button type="primary" plain icon="Upload">
+            {{ $t('btn.import') }}<el-icon class="el-icon--right"><arrow-down /></el-icon>
+          </el-button>
+          <template #dropdown>
+            <el-dropdown-menu>
+              <el-dropdown-item command="upload">
+                <importData
+                  templateUrl="business/ProductPricingCalculator/importTemplate"
+                  importUrl="/business/ProductPricingCalculator/importData"
+                  @success="handleFileSuccess"></importData>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </template>
+        </el-dropdown>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="download" @click="handleExport" v-hasPermi="['business:productpricingcalculator:export']">
+          {{ $t('btn.export') }}
+        </el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table
+      :data="dataList"
+      v-loading="loading"
+      ref="table"
+      border
+      header-cell-class-name="el-table-header-cell"
+      highlight-current-row
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column prop="id" label="id" align="center" v-if="columns.showColumn('id')" />
+      <el-table-column prop="customerId" label="客户ID" align="center" v-if="columns.showColumn('customerId')">
+        <template #default="scope">
+          <dict-tag :options="options.sql_cus_customer" :value="scope.row.customerId" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="shopId" label="店铺id" align="center" v-if="columns.showColumn('shopId')">
+        <template #default="scope">
+          <dict-tag :options="options.sql_cus_customer_shopify" :value="scope.row.shopId" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="productSku" label="SKU" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('productSku')" />
+      <el-table-column prop="productName" label="产品名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('productName')" />
+      <el-table-column
+        prop="productAttribute"
+        label="产品属性使用;分割"
+        align="center"
+        :show-overflow-tooltip="true"
+        v-if="columns.showColumn('productAttribute')" />
+      <el-table-column prop="weight" label="重量" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('weight')" />
+      <el-table-column prop="length" label="长" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('length')" />
+      <el-table-column prop="width" label="宽" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('width')" />
+      <el-table-column prop="height" label="高" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('height')" />
+      <el-table-column prop="volumeInformation" label="材积信息" align="center" v-if="columns.showColumn('volumeInformation')" />
+      <el-table-column prop="isElectricity" label="是否带电" align="center" v-if="columns.showColumn('isElectricity')">
+        <template #default="scope">
+          <dict-tag :options="options.isElectricityOptions" :value="scope.row.isElectricity" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="purchasePrice" label="产品售价" align="center" v-if="columns.showColumn('purchasePrice')" />
+      <el-table-column prop="tax" label="税金" align="center" v-if="columns.showColumn('tax')" />
+      <el-table-column prop="logisticsPrice" label="物流售价" align="center" v-if="columns.showColumn('logisticsPrice')" />
+      <el-table-column
+        prop="destinationCountry"
+        label="国家二字码"
+        align="center"
+        :show-overflow-tooltip="true"
+        v-if="columns.showColumn('destinationCountry')" />
+      <el-table-column prop="channel" label="物流渠道" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('channel')" />
+      <el-table-column prop="createId" label="创建人" align="center" v-if="columns.showColumn('createId')" />
+      <el-table-column prop="updateId" label="修改人" align="center" v-if="columns.showColumn('updateId')" />
+      <el-table-column label="操作" width="160">
+        <template #default="scope">
+          <el-button
+            type="success"
+            size="small"
+            icon="edit"
+            title="编辑"
+            v-hasPermi="['business:productpricingcalculator:edit']"
+            @click="handleUpdate(scope.row)"></el-button>
+          <el-button
+            type="danger"
+            size="small"
+            icon="delete"
+            title="删除"
+            v-hasPermi="['business:productpricingcalculator:delete']"
+            @click="handleDelete(scope.row)"></el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改产品sku自动报价表对话框 -->
+    <el-dialog :title="title" :lock-scroll="false" v-model="open">
+      <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+        <el-row :gutter="20">
+          <el-col :lg="12" v-if="opertype != 1">
+            <el-form-item label="id" prop="id">
+              <el-input-number v-model.number="form.id" controls-position="right" placeholder="请输入id" :disabled="true" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="客户ID" prop="customerId">
+              <el-select v-model="form.customerId" placeholder="请选择客户ID">
+                <el-option
+                  v-for="item in options.sql_cus_customer"
+                  :key="item.dictValue"
+                  :label="item.dictLabel"
+                  :value="parseInt(item.dictValue)"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="店铺id" prop="shopId">
+              <el-select v-model="form.shopId" placeholder="请选择店铺id">
+                <el-option
+                  v-for="item in options.sql_cus_customer_shopify"
+                  :key="item.dictValue"
+                  :label="item.dictLabel"
+                  :value="parseInt(item.dictValue)"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="SKU" prop="productSku">
+              <el-input v-model="form.productSku" placeholder="请输入SKU" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="产品名称" prop="productName">
+              <el-input v-model="form.productName" placeholder="请输入产品名称" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="产品属性使用;分割" prop="productAttribute">
+              <el-input v-model="form.productAttribute" placeholder="请输入产品属性使用;分割" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="重量" prop="weight">
+              <el-input v-model="form.weight" placeholder="请输入重量" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="长" prop="length">
+              <el-input v-model="form.length" placeholder="请输入长" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="宽" prop="width">
+              <el-input v-model="form.width" placeholder="请输入宽" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="高" prop="height">
+              <el-input v-model="form.height" placeholder="请输入高" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="材积信息" prop="volumeInformation">
+              <el-input v-model="form.volumeInformation" placeholder="请输入材积信息" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="是否带电" prop="isElectricity">
+              <el-radio-group v-model="form.isElectricity">
+                <el-radio v-for="item in options.isElectricityOptions" :key="item.dictValue" :label="item.dictValue">
+                  {{ item.dictLabel }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="产品售价" prop="purchasePrice">
+              <el-input v-model="form.purchasePrice" placeholder="请输入产品售价" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="税金" prop="tax">
+              <el-input v-model="form.tax" placeholder="请输入税金" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="物流售价" prop="logisticsPrice">
+              <el-input v-model="form.logisticsPrice" placeholder="请输入物流售价" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="国家二字码" prop="destinationCountry">
+              <el-input v-model="form.destinationCountry" placeholder="请输入国家二字码" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="物流渠道" prop="channel">
+              <el-input v-model="form.channel" placeholder="请输入物流渠道" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="创建人" prop="createId">
+              <el-input v-model.number="form.createId" placeholder="请输入创建人" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="创建时间" prop="createTime">
+              <el-date-picker v-model="form.createTime" type="datetime" :teleported="false" placeholder="选择日期时间"></el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="修改人" prop="updateId">
+              <el-input v-model.number="form.updateId" placeholder="请输入修改人" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="修改时间" prop="updateTime">
+              <el-date-picker v-model="form.updateTime" type="datetime" :teleported="false" placeholder="选择日期时间"></el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer v-if="opertype != 3">
+        <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
+        <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="productpricingcalculator">
+import {
+  listProductPricingCalculator,
+  addProductPricingCalculator,
+  delProductPricingCalculator,
+  updateProductPricingCalculator,
+  getProductPricingCalculator
+} from '@/api/business/productpricingcalculator.js'
+import importData from '@/components/ImportData'
+const { proxy } = getCurrentInstance()
+const ids = ref([])
+const loading = ref(false)
+const showSearch = ref(true)
+const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  sort: 'Id',
+  sortType: 'desc'
+})
+const columns = ref([
+  { visible: true, prop: 'id', label: 'id' },
+  { visible: true, prop: 'customerId', label: '客户ID' },
+  { visible: true, prop: 'shopId', label: '店铺id' },
+  { visible: true, prop: 'productSku', label: 'SKU' },
+  { visible: true, prop: 'productName', label: '产品名称' },
+  { visible: true, prop: 'productAttribute', label: '产品属性使用;分割' },
+  { visible: true, prop: 'weight', label: '重量' },
+  { visible: true, prop: 'length', label: '长' },
+  { visible: false, prop: 'width', label: '宽' },
+  { visible: false, prop: 'height', label: '高' },
+  { visible: false, prop: 'volumeInformation', label: '材积信息' },
+  { visible: false, prop: 'isElectricity', label: '是否带电' },
+  { visible: false, prop: 'purchasePrice', label: '产品售价' },
+  { visible: false, prop: 'tax', label: '税金' },
+  { visible: false, prop: 'logisticsPrice', label: '物流售价' },
+  { visible: false, prop: 'destinationCountry', label: '国家二字码' },
+  { visible: false, prop: 'channel', label: '物流渠道' },
+  { visible: false, prop: 'createId', label: '创建人' },
+  { visible: false, prop: 'updateId', label: '修改人' }
+])
+const total = ref(0)
+const dataList = ref([])
+const queryRef = ref()
+const defaultTime = ref([new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)])
+
+var dictParams = [{ dictType: 'sql_cus_customer' }, { dictType: 'sql_cus_customer_shopify' }]
+
+proxy.getDicts(dictParams).then((response) => {
+  response.data.forEach((element) => {
+    state.options[element.dictType] = element.list
+  })
+})
+
+function getList() {
+  loading.value = true
+  listProductPricingCalculator(queryParams).then((res) => {
+    const { code, data } = res
+    if (code == 200) {
+      dataList.value = data.result
+      total.value = data.totalNum
+      loading.value = false
+    }
+  })
+}
+
+// 查询
+function handleQuery() {
+  queryParams.pageNum = 1
+  getList()
+}
+
+// 重置查询操作
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  handleQuery()
+}
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+// 自定义排序
+function sortChange(column) {
+  var sort = undefined
+  var sortType = undefined
+
+  if (column.prop != null && column.order != null) {
+    sort = column.prop
+    sortType = column.order
+  }
+  queryParams.sort = sort
+  queryParams.sortType = sortType
+  handleQuery()
+}
+
+/*************** form操作 ***************/
+const formRef = ref()
+const title = ref('')
+// 操作类型 1、add 2、edit 3、view
+const opertype = ref(0)
+const open = ref(false)
+const state = reactive({
+  single: true,
+  multiple: true,
+  form: {},
+  rules: {},
+  options: {
+    // 客户ID 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+    sql_cus_customer: [],
+    // 店铺id 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+    sql_cus_customer_shopify: [],
+    // 是否带电 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+    isElectricityOptions: []
+  }
+})
+
+const { form, rules, options, single, multiple } = toRefs(state)
+
+// 关闭dialog
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 重置表单
+function reset() {
+  form.value = {
+    id: null,
+    customerId: null,
+    shopId: null,
+    productSku: null,
+    productName: null,
+    productAttribute: null,
+    weight: null,
+    length: null,
+    width: null,
+    height: null,
+    volumeInformation: null,
+    isElectricity: null,
+    purchasePrice: null,
+    tax: null,
+    logisticsPrice: null,
+    destinationCountry: null,
+    channel: null,
+    createId: null,
+    createTime: null,
+    updateId: null,
+    updateTime: null
+  }
+  proxy.resetForm('formRef')
+}
+// 添加按钮操作
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = '添加产品sku自动报价表'
+  opertype.value = 1
+}
+// 修改按钮操作
+function handleUpdate(row) {
+  reset()
+  const id = row.id || ids.value
+  getProductPricingCalculator(id).then((res) => {
+    const { code, data } = res
+    if (code == 200) {
+      open.value = true
+      title.value = '修改产品sku自动报价表'
+      opertype.value = 2
+
+      form.value = {
+        ...data
+      }
+    }
+  })
+}
+
+// 添加&修改 表单提交
+function submitForm() {
+  proxy.$refs['formRef'].validate((valid) => {
+    if (valid) {
+      if (form.value.id != undefined && opertype.value === 2) {
+        updateProductPricingCalculator(form.value).then((res) => {
+          proxy.$modal.msgSuccess('修改成功')
+          open.value = false
+          getList()
+        })
+      } else {
+        addProductPricingCalculator(form.value).then((res) => {
+          proxy.$modal.msgSuccess('新增成功')
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+// 删除按钮操作
+function handleDelete(row) {
+  const Ids = row.id || ids.value
+
+  proxy
+    .$confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
+    .then(function () {
+      return delProductPricingCalculator(Ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+}
+
+// 导入数据成功处理
+const handleFileSuccess = (response) => {
+  const { item1, item2 } = response.data
+  var error = ''
+  item2.forEach((item) => {
+    error += item.storageMessage + ','
+  })
+  proxy.$alert(item1 + '<p>' + error + '</p>', '导入结果', {
+    dangerouslyUseHTMLString: true
+  })
+  getList()
+}
+
+// 导出按钮操作
+function handleExport() {
+  proxy
+    .$confirm('是否确认导出产品sku自动报价表数据项?', '警告', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    })
+    .then(async () => {
+      await proxy.downFile('/business/ProductPricingCalculator/export', { ...queryParams })
+    })
+}
+
+handleQuery()
+</script>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 31d4c5d..9617dde 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -199,7 +199,7 @@
           </el-col>
           <el-col :lg="12">
             <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+              <el-input v-model.number="form.phone.number" placeholder="请输入手机号码" maxlength="11" />
             </el-form-item>
           </el-col>
           <el-col :lg="12">
diff --git a/vite.config.js b/vite.config.js
index 56feffb..bec7ed1 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -55,6 +55,13 @@ export default defineConfig(({ mode, command }) => {
           changeOrigin: true,
           rewrite: (path) => path.replace(/^\/dev-api/, '')
         },
+
+       '/prod-api': {
+          target: env.VITE_APP_API_HOST,
+          changeOrigin: true,
+          rewrite: (path) => path.replace(/^\/prod-api/, '')
+        },
+        
         '/msghub': {
           target: env.VITE_APP_API_HOST,
           ws: true,
-- 
Gitee