Merge branch 'master' into feature/mall_product

2023-06-18 13:14:30 +08:00 · 2023-06-18 13:14:30 +08:00 · 322d5aae1a
parent 676b7c73a1 66e4a6c6fc
commit 322d5aae1a
13 changed files with 641 additions and 42 deletions
--- a/builds/Dockerfile
+++ b/builds/Dockerfile
@ -5,7 +5,7 @@ LABEL Author="axzsd" \
      Description="创盈支付服务端"

 ENV SPRING_PROFILES_ACTIVE="dev"
-ENV JAVA_OPTIONS "-Xms800m -Xmx800m \
+ENV JAVA_OPTIONS "-Xms1024m -Xmx2048m \
 -XX:+HeapDumpOnOutOfMemoryError \
 -Dfile.encoding=UTF-8 \
 -Djava.awt.headless=true \
--- a/builds/docker-compose-test.yml
+++ b/builds/docker-compose-test.yml
@ -20,7 +20,7 @@ services:
    deploy:
      resources:
        limits:
-          memory: 800MB
+          memory: 2048MB
    healthcheck:
      test: ["CMD", "curl", "-f", "http://localhost:48080/actuator/health"]
      timeout: 30s
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
@ -167,6 +167,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
    private StoreOrderMapper storeOrderMapper;
    @Autowired
    private TenantApi tenantApi;
+
    /**
     * 列表（PC）
     *
@ -1488,7 +1489,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
            List<StatementAllReqDataVo> dataVos = mapper.statisticsAll(request.getStartTime(), request.getEndTime());
            Map<Long, List<StatementAllReqDataVo>> collect = dataVos.stream().collect(Collectors.groupingBy(StatementAllReqDataVo::getTenantId));
            List<StatisticsPageVo> vos = new ArrayList<>();
-            tenantPage.getList().forEach(e->{
+            tenantPage.getList().forEach(e -> {
                List<StatementAllReqDataVo> dataVos1 = collect.get(e.getId());
                StatisticsPageVo vo = new StatisticsPageVo();
                if (!CollectionUtils.isEmpty(dataVos1)) {
--- a/yudao-ui-admin/src/api/index.js
+++ b/yudao-ui-admin/src/api/index.js
@ -0,0 +1,12 @@
+import request from '@/utils/request'
+
+// 数据统计(全部)
+export function statisticsAll(query) {
+  return request({
+    url: '/system/statement/statisticsAll',
+    method: 'get',
+    params: query
+  })
+}
+
+
--- a/yudao-ui-admin/src/api/member/promoter.js
+++ b/yudao-ui-admin/src/api/member/promoter.js
@ -68,6 +68,16 @@ export function getPromoterPage(query) {
  })
 }

+// 导出所有推广员 Excel
+export function allExport(query) {
+  return request({
+    url: '/member/promoter/all-export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
 // 导出推广员 Excel
 export function exportPromoterExcel(query) {
  return request({
--- a/yudao-ui-admin/src/api/statistics/merchantData.js
+++ b/yudao-ui-admin/src/api/statistics/merchantData.js
@ -0,0 +1,20 @@
+import request from '@/utils/request'
+
+// 数据统计(根据租户统计)
+export function statisticsData(query) {
+  return request({
+    url: '/system/statement/statistics',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出数据统计(根据租户统计) Excel
+export function statement(query) {
+  return request({
+    url: '/system/statement/statement-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
--- a/yudao-ui-admin/src/views/index.vue
+++ b/yudao-ui-admin/src/views/index.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="dashboard-editor-container">
+<!--  <div class="dashboard-editor-container">-->

 <!--    <panel-group @handleSetLineChartData="handleSetLineChartData" />-->

@ -26,7 +26,7 @@
 <!--    </el-row>-->


-  </div>
+<!--  </div>-->
 </template>

 <script>
@ -35,7 +35,10 @@ import LineChart from './dashboard/LineChart'
 import RaddarChart from './dashboard/RaddarChart'
 import PieChart from './dashboard/PieChart'
 import BarChart from './dashboard/BarChart'
-
+import creatComment from "@/views/mall/product/comment/creatComment.vue";
+import {
+  statisticsAll
+} from '@/api/index';
 const lineChartData = {
  newVisitis: {
    expectedData: [100, 120, 161, 134, 105, 160, 165],
@ -58,6 +61,7 @@ const lineChartData = {
 export default {
  name: 'Index',
  components: {
+    creatComment,
    PanelGroup,
    LineChart,
    RaddarChart,
@ -66,9 +70,10 @@ export default {
  },
  data() {
    return {
-      lineChartData: lineChartData.newVisitis
    }
  },
+  created() {
+  },
  methods: {
    handleSetLineChartData(type) {
      this.lineChartData = lineChartData[type]
@ -78,6 +83,50 @@ export default {
 </script>

 <style lang="scss" scoped>
+.statistics{
+  width: 100%;
+  height: 30%;
+  display: flex;
+  justify-content: space-around;
+  flex-wrap: wrap;
+  border-bottom: 1px solid #e6ebf5;
+  .statistics_item{
+    border-radius: 10px;
+    width: 240px;
+    min-height: 90px;
+    margin: 10px 6%;
+    font-size: 20px;
+    color: #fff;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    word-wrap: break-word;
+    span:nth-of-type(1){
+      margin-left: 20px;
+    }
+    span:nth-of-type(2){
+      margin-left: 40px;
+    }
+  }
+  .totalMoney{
+    background: rgb(77,157,255);
+  }
+  .totalNum{
+    background: rgb(95,212,89);
+  }
+  .totalWithdrawMoney{
+    background: rgb(171,109,234);
+  }
+  .threeTotalNum{
+    background: rgb(255,154,1);
+  }
+  .twoTotalNum{
+    background: rgb(10,193,224);
+  }
+  .oneTotalNum{
+    background: rgb(10,196,160);
+  }
+}
 .dashboard-editor-container {
  padding: 32px;
  background-color: rgb(240, 242, 245);
--- a/yudao-ui-admin/src/views/member/allpromoter/index.vue
+++ b/yudao-ui-admin/src/views/member/allpromoter/index.vue
@ -5,7 +5,6 @@
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
      <el-form-item label="所属组织" prop="deptId">
        <treeselect style="width: 240px;" v-model="queryParams.deptId" :options="deptOptions" :show-count="true"
-                    :clearable="false"
                    placeholder="请选择所属组织" :normalizer="normalizer" />
      </el-form-item>
 <!--      <el-form-item label="启用状态" prop="status">-->
@ -18,7 +17,7 @@
        <el-input v-model="queryParams.nickname" placeholder="请输入"  clearable @keyup.enter.native="handleQuery"/>
      </el-form-item>
      <el-form-item label="注册来源" prop="sourceType">
-        <el-select v-model="queryParams.sourceType" placeholder="请选择来源" clearable  @keyup.enter.native="handleQuery">
+        <el-select v-model="queryParams.sourceType" placeholder="请选择来源" clearable  @keyup.enter.native="handleQuery" @clear="()=>{queryParams.sourceType = undefined}">
          <el-option value="1" label="后台注册"/>
          <el-option value="2" label="扫码注册"/>
        </el-select>
@ -44,10 +43,10 @@
 <!--                   v-hasPermi="['member:promoter:export']">导入-->
 <!--        </el-button>-->
 <!--      </el-col>-->
-<!--            <el-col :span="1.5">-->
-<!--              <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"-->
-<!--                         v-hasPermi="['member:promoter:export']">导出</el-button>-->
-<!--            </el-col>-->
+            <el-col :span="1.5">
+              <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                         >导出</el-button>
+            </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

@ -161,7 +160,7 @@ import {
  createPromoter,
  tenantIgnoreUpdate,
  deletePromoter,
-  getPromoter,
+  allExport,
  getallPage,
  importTemplate,
  exportPromoterExcel, updatePassword
@ -462,11 +461,10 @@ export default {
    handleExport() {
      // 处理查询参数
      let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
+      params.pageSize = 999;
      this.$modal.confirm('是否确认导出所有推广员数据项?').then(() => {
        this.exportLoading = true;
-        return exportPromoterExcel(params);
+        return allExport(params);
      }).then(response => {
        this.$download.excel(response, '推广员.xls');
        this.exportLoading = false;
--- a/yudao-ui-admin/src/views/member/promoter/index.vue
+++ b/yudao-ui-admin/src/views/member/promoter/index.vue
@ -5,7 +5,6 @@
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
      <el-form-item label="所属组织" prop="deptId">
        <treeselect style="width: 240px;" v-model="queryParams.deptId" :options="deptOptions" :show-count="true"
-                    :clearable="false"
                    placeholder="请选择所属组织" :normalizer="normalizer"/>
      </el-form-item>
      <el-form-item label="启用状态" prop="status">
@ -18,7 +17,7 @@
        <el-input v-model="queryParams.nickname" placeholder="请输入"  clearable @keyup.enter.native="handleQuery"/>
      </el-form-item>
      <el-form-item label="注册来源" prop="sourceType">
-        <el-select v-model="queryParams.sourceType" placeholder="请选择来源" clearable  @keyup.enter.native="handleQuery">
+        <el-select v-model="queryParams.sourceType" placeholder="请选择来源" clearable  @keyup.enter.native="handleQuery" @clear="()=>{queryParams.sourceType = undefined}">
          <el-option value="1" label="后台注册"/>
          <el-option value="2" label="扫码注册"/>
        </el-select>
--- a/yudao-ui-admin/src/views/statistics/merchantData/index.vue
+++ b/yudao-ui-admin/src/views/statistics/merchantData/index.vue
@ -0,0 +1,271 @@
+<template>
+  <div class="app-container">
+
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
+      <el-form-item label="商铺名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入"  clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="选择日期" class="width100" prop="dateLimit">
+        <el-date-picker @change="onchangeTime" v-model="queryParams.dateLimit" value-format="yyyy-MM-dd HH:mm:ss"  format="yyyy-MM-dd HH:mm:ss"  size="small" type="datetimerange"   start-placeholder="开始时间"
+                        end-placeholder="结束时间" placement="bottom-end" placeholder="自定义时间" style="width: 220px;" @keyup.enter.native="handleQuery"></el-date-picker>
+      </el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery" >搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+<!--      <el-col :span="1.5">-->
+<!--        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"-->
+<!--                   v-hasPermi="['member:promoter:create']">新增-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport"-->
+<!--                   v-hasPermi="['member:promoter:export']">导入-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+            <el-col :span="1.5">
+              <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                         >导出</el-button>
+            </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="编号" align="center" type="index"/>
+      <el-table-column label="商铺名称" align="center" prop="tenantName"/>
+      <el-table-column label="销售金额" align="center" prop="totalMoney"/>
+      <el-table-column label="订单数量" align="center" prop="totalNum"/>
+      <el-table-column label="退款金额" align="center" prop="totalWithdrawMoney"/>
+      <el-table-column label="240档订单数量" align="center" prop="threeTotalNum"/>
+      <el-table-column label="400档订单数量" align="center" prop="twoTotalNum"/>
+      <el-table-column label="640档订单数量" align="center" prop="oneTotalNum"/>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+                 :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+                 :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <!--          <div class="el-upload__tip" slot="tip">-->
+          <!--            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据-->
+          <!--          </div>-->
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+                   @click="importTemplate">下载模板
+          </el-link>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm" :loading="submitLoading" :disabled="submitLoading">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  statement,
+  statisticsData
+} from '@/api/statistics/merchantData';
+import {getBaseHeader} from '@/utils/request';
+import {DICT_TYPE} from '@/utils/dict';
+import Treeselect from '@riophae/vue-treeselect';
+import '@riophae/vue-treeselect/dist/vue-treeselect.css';
+import ImageUpload from '@/components/ImageUpload/index.vue';
+
+export default {
+  name: 'Promoter',
+  computed: {
+    DICT_TYPE() {
+      return DICT_TYPE
+    }
+  },
+  components: {
+    ImageUpload,
+    Treeselect
+  },
+  data() {
+    const validatePass = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请输入密码'));
+      } else {
+        if (this.updatePasswordForm.checkPass !== '') {
+          this.$refs.updatePasswordForm.validateField('checkPass');
+        }
+        callback();
+      }
+    };
+    const validateCheckPass = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请再次输入密码'));
+      } else if (value !== this.updatePasswordForm.password) {
+        callback(new Error('两次输入密码不一致!'));
+      } else {
+        callback();
+      }
+    };
+    return {
+      // 遮罩层
+      loading: true,
+      submitLoading: false,
+      deptOptions: undefined,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 推广员列表
+      list: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: '推广员导入',
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: getBaseHeader(),
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + '/admin-api/member/promoter/import'
+      },
+      updatePasswordForm: {},
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 8,
+      },
+      // 表单参数
+      form: {
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    onchangeTime(value){
+      this.queryParams.startTime = value[0]
+      this.queryParams.endTime = value[1]
+    },
+    handleChange(value){
+      this.form.tenantId = value.tenantId
+    },
+
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      statisticsData(this.queryParams).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    handleUpdatePassword(row) {
+      this.updatePasswordForm = {}
+      this.updatePassword.show = true
+      this.updatePassword.userId = row.userId
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        deptId: undefined,
+        userId: undefined,
+      };
+      this.resetForm('form');
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm');
+      this.queryParams.startTime = undefined;
+      this.queryParams.endTime = undefined;
+      this.handleQuery();
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = {...this.queryParams};
+      params.pageSize = 999;
+      this.$modal.confirm('是否确认导出商户分销数据项?').then(() => {
+        this.exportLoading = true;
+        return statement(params);
+      }).then(response => {
+        this.$download.excel(response, '分销数据.xls');
+        this.exportLoading = false;
+      }).catch(() => {
+      });
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = '推广员导入';
+      this.upload.open = true;
+    },
+    // /** 下载模板操作 */
+    // importTemplate() {
+    //   importTemplate().then(response => {
+    //     this.$download.excel(response, '推广员导入模板.xls');
+    //   });
+    // },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      if (response.code !== 0) {
+        this.$modal.msgError(response.msg)
+        return;
+      }
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      // 拼接提示语
+      let data = response.data;
+      let text = '创建成功数量：' + data.createUsernames.length;
+      for (const username of data.createUsernames) {
+        text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username;
+      }
+      text += '<br />创建失败数量：' + Object.keys(data.failureUsernames).length;
+      for (const username in data.failureUsernames) {
+        text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username + '：' + data.failureUsernames[username];
+      }
+      this.$alert(text, '导入结果', {dangerouslyUseHTMLString: true});
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    }
+  }
+};
+</script>
--- a/yudao-ui-admin/src/views/statistics/statisticsData/index.vue
+++ b/yudao-ui-admin/src/views/statistics/statisticsData/index.vue
@ -0,0 +1,221 @@
+<template>
+  <div class="app-container">
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <el-form  :model="queryParams" ref="queryForm" size="small" :inline="true"  label-width="100px">
+          <el-form-item label="快速查看" class="width100" prop="type">
+            <el-radio-group v-model="queryParams.type" type="button"  class="mr20"  size="small" @change="handleChange">
+              <el-radio-button  v-for="(item,i) in lookList" :label=i+1 :key="i">{{item.name}}</el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="选择日期" class="width100" prop="dateLimit">
+            <el-date-picker @change="onchangeTime" v-model="queryParams.dateLimit" value-format="yyyy-MM-dd HH:mm:ss"  format="yyyy-MM-dd HH:mm:ss"  size="small" type="datetimerange"   start-placeholder="开始时间"
+                            end-placeholder="结束时间" placement="bottom-end" placeholder="自定义时间" style="width: 220px;" ></el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <div class="statistics">
+        <div v-for="(item,index) in statisticsList" :key="index" :class="[item.class,'statistics_item']">
+          <span>{{item.name}}</span>
+          <span v-if="index<2">￥{{item.value}}</span>
+          <span v-else>{{item.value}} 单</span>
+        </div>
+      </div>
+
+    </el-card>
+
+  </div>
+  <!--  <div class="dashboard-editor-container">-->
+
+  <!--    <panel-group @handleSetLineChartData="handleSetLineChartData" />-->
+
+  <!--    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">-->
+  <!--      <line-chart :chart-data="lineChartData" />-->
+  <!--    </el-row>-->
+
+  <!--    <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>-->
+
+
+  <!--  </div>-->
+</template>
+
+<script>
+import PanelGroup from '@/views/dashboard/PanelGroup'
+import LineChart from '@/views/dashboard/LineChart'
+import RaddarChart from '@/views/dashboard/RaddarChart'
+import PieChart from '@/views/dashboard/PieChart'
+import BarChart from '@/views/dashboard/BarChart'
+import creatComment from "@/views/mall/product/comment/creatComment.vue";
+import {
+  statisticsAll
+} from '@/api/index';
+const lineChartData = {
+  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]
+  }
+}
+
+export default {
+  name: 'Index',
+  components: {
+    creatComment,
+    PanelGroup,
+    LineChart,
+    RaddarChart,
+    PieChart,
+    BarChart
+  },
+  data() {
+    return {
+      lineChartData: lineChartData.newVisitis,
+      queryParams: {
+        type:4
+      },
+      // list:[],
+      lookList:[{name:'今日'},{name:'上周'},{name:'上月'},{name:'全部'}],
+      statisticsList:[{name:'总销售金额',class:'totalMoney',value:0},{name:'总退款金额',class:'totalWithdrawMoney',value:0},{name:'总订单数量（单）',class:'totalNum',value:0},{name:'240档订单数量（单）',class:'threeTotalNum',value:0},{name:'400档订单数量（单）',class:'twoTotalNum',value:0},{name:'640档订单数量（单）',class:'oneTotalNum',value:0}],
+    }
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    handleChange(){
+      this.queryParams ={type:this.queryParams.type}
+      this.getList()
+    },
+    onchangeTime(value){
+      this.queryParams.type = null
+      this.queryParams.startTime = value[0]
+      this.queryParams.endTime = value[1]
+    },
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      statisticsAll(this.queryParams).then(response => {
+        this.statisticsList.forEach((item,index) =>{
+          for (let key in response.data){
+            if(item.class === key){
+              item.value = response.data[key] || 0
+            }
+          }
+        })
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams ={
+        type: 4
+      };
+      this.handleQuery();
+    },
+    handleSetLineChartData(type) {
+      this.lineChartData = lineChartData[type]
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.statistics{
+  width: 100%;
+  height: 30%;
+  display: flex;
+  justify-content: space-around;
+  flex-wrap: wrap;
+  border-bottom: 1px solid #e6ebf5;
+  .statistics_item{
+    border-radius: 10px;
+    width: 240px;
+    min-height: 90px;
+    margin: 10px 6%;
+    font-size: 20px;
+    color: #fff;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    word-wrap: break-word;
+    span:nth-of-type(1){
+      margin-left: 20px;
+    }
+    span:nth-of-type(2){
+      margin-left: 40px;
+    }
+  }
+  .totalMoney{
+    background: rgb(77,157,255);
+  }
+  .totalNum{
+    background: rgb(95,212,89);
+  }
+  .totalWithdrawMoney{
+    background: rgb(171,109,234);
+  }
+  .threeTotalNum{
+    background: rgb(255,154,1);
+  }
+  .twoTotalNum{
+    background: rgb(10,193,224);
+  }
+  .oneTotalNum{
+    background: rgb(10,196,160);
+  }
+}
+.dashboard-editor-container {
+  padding: 32px;
+  background-color: rgb(240, 242, 245);
+  position: relative;
+
+  .chart-wrapper {
+    background: #fff;
+    padding: 16px 16px 0;
+    margin-bottom: 32px;
+  }
+}
+
+@media (max-width:1024px) {
+  .chart-wrapper {
+    padding: 8px;
+  }
+}
+</style>
--- a/yudao-ui-app/pages/index/index.vue
+++ b/yudao-ui-app/pages/index/index.vue
@ -56,16 +56,16 @@
        <image src="@/static/images/wecheat.png" ></image>
      </view>
    </view>
-    <view class="protocol-text">
-      <text>
-        <image src="/static/images/trade.jpg" mode=""></image>
-        电子证照中心
-      </text>
-      <text @click="handleTrade">
-        ICP备案号：渝ICP备2022012409号-1
-      </text>
-      <text class="text">Copyright@2022-2023创盈云网络cyywl.top版权所有</text>
-    </view>
+ <view class="protocol-text">
+   <text  @click="handleTrade('证照')">
+     <image src="/static/images/trade.jpg" mode=""></image>
+     电子证照中心
+   </text>
+   <text @click="handleTrade('备案')">
+     ICP备案号：渝ICP备2022012409号-1
+   </text>
+   <text class="text">Copyright@2022-2023创盈云网络cyywl.top版权所有</text>
+ </view>
 <!-- 		<view class="hot">
 			<view class="contain"></view>
 			<view class="top">
@ -371,11 +371,19 @@
 			})
 		},
 		methods: {
-      handleTrade() {
-        uni.navigateTo({ 
-          url: '/pages/business_license/index'
-        })
-      },
+     handleTrade(value) {
+       switch (value) {
+         case '证照':
+         uni.navigateTo({
+           url: '/pages/business_license/index'
+         })
+         break;
+         case '备案':
+         window.location.href = 'https://beian.miit.gov.cn/'
+         break;
+       }
+
+     },
      handleCustomer(value){
        switch (value) {
          case '电话客服':
@ -755,6 +763,8 @@
 </style>
 <style lang="scss">
 	.box {
+    overflow: auto;
+    padding-bottom: 6%;
 		.header {
 			position: relative;
 			width: 100%;
@ -886,7 +896,7 @@
      // border-radius: 20rpx;
      .customer{
        margin: 3% 44rpx;
-        height: 240rpx;
+        height: 310rpx;
        image{
          width: 100%;
          height: 100%;
--- a/yudao-ui-app/pages/users/login/index.vue
+++ b/yudao-ui-app/pages/users/login/index.vue
@ -51,11 +51,11 @@
        <view class="text">我已阅读并同意 <span class="link" @click="onLinkUserPrivacy">《创盈商城用户协议》</span></view>
      </div>
      <view class="protocol-text">
-        <text>
+        <text  @click="handleTrade('证照')">
          <image src="/static/images/trade.jpg" mode=""></image>
          电子证照中心
        </text>
-        <text @click="handleTrade">
+        <text @click="handleTrade('备案')">
          ICP备案号：渝ICP备2022012409号-1
        </text>
        <text class="text">Copyright@2022-2023创盈云网络cyywl.top版权所有</text>
@ -121,10 +121,18 @@

    },
    methods: {
-      handleTrade() {
-        uni.navigateTo({ 
-          url: '/pages/business_license/index'
-        })
+      handleTrade(value) {
+        switch (value) {
+          case '证照':
+          uni.navigateTo({
+            url: '/pages/business_license/index'
+          })
+          break;
+          case '备案':
+          window.location.href = 'https://beian.miit.gov.cn/'
+          break;
+        }
+
      },
      onLinkUserPrivacy() {
        uni.navigateTo({
@ -141,7 +149,7 @@
        let that = this;
        if (!that.mobile) return that.$util.Tips({
          title: '请填写手机号码'
-        }); 
+        });
        if (!/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(that.mobile))
          return that.$util.Tips({
            title: '请输入正确的手机号码'