Merge pull request 'feature/mall_product' (#4) from feature/mall_product into master

Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/4

yudao-ui-admin/src/api/shop/rechargeOrder.js

@@ -52,6 +52,15 @@ export function getRechargeOrderPage(query) {
   })
 }
 
+// 获得抽佣明细-会员充值
+export function getCommissionDetailsPage(query) {
+  return request({
+    url: '/shop/recharge-order/findPromoterDrawPage',
+    method: 'post',
+    data: query
+  })
+}
+
 // 导出订单 Excel
 export function exportRechargeOrderExcel(query) {
   return request({

yudao-ui-admin/src/views/distribution/commissionDetails/memberRecharge.vue

@@ -3,21 +3,21 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
-      <el-form-item label="组织名称" prop="tenantName">
-        <el-input v-model="queryParams.tenantName" placeholder="请输入组织名称" clearable @keyup.enter.native="handleQuery"/>
+      <el-form-item label="组织名称" prop="parentOrganizationName">
+        <el-input v-model="queryParams.parentOrganizationName" placeholder="请输入组织名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="订单编号" prop="orderId">
-        <el-input v-model="queryParams.orderId" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery"/>
+      <el-form-item label="商户名称" prop="deptName">
+        <el-input v-model="queryParams.deptName" placeholder="请输入商户名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="加入时间" prop="payTime">
-        <el-date-picker v-model="queryParams.payTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+      <el-form-item label="加入时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
                         range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="推广员" prop="nickname">
         <el-input v-model="queryParams.nickname" placeholder="请输入推广员" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="手机号" prop="nickname">
-        <el-input v-model="queryParams.nickname" placeholder="请输入手机号" clearable @keyup.enter.native="handleQuery"/>
+      <el-form-item label="手机号" prop="mobile">
+        <el-input v-model="queryParams.mobile" placeholder="请输入手机号" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -31,32 +31,32 @@
       <!--        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"-->
       <!--                   v-hasPermi="['shop:recharge-order:create']">新增</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="['shop:recharge-order: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="['shop:recharge-order:export']">导出</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" prop="orderId" />
+      <el-table-column label="组织名称" align="center" prop="deptName" />
       <el-table-column label="推广员" align="center" prop="parentOrganizationName" >
         <template v-slot="scope">
           <span>{{ scope.row.parentOrganizationName }}</span>
           <span v-if="scope.row.nickname!=='' && scope.row.nickname!==null">-{{ scope.row.nickname }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="手机号" align="center" prop="orderId" />
-      <el-table-column label="加入时间" align="center" prop="payTime" width="180">
+      <el-table-column label="手机号" align="center" prop="mobile" />
+      <el-table-column label="加入时间" align="center" prop="createTime" width="180">
         <template v-slot="scope">
-          <span>{{ parseTime(scope.row.payTime) }}</span>
+          <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="成交定单数" align="center" prop="orderId" />
-      <el-table-column label="成交金额" align="center" prop="commissionPrice" />
-      <el-table-column label="累计金额" align="center" prop="tenantName" />
-      <el-table-column label="可提现金额" align="center" prop="tenantName" />
+      <el-table-column label="成交定单数" align="center" prop="orderCount" />
+      <el-table-column label="成交金额" align="center" prop="dealAmount" />
+      <el-table-column label="累计金额" align="center" prop="totalAmount" />
+      <el-table-column label="可提现金额" align="center" prop="drawAmount" />
     </el-table>
     <!-- 分页组件 -->
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
@@ -68,7 +68,7 @@
 
 <script>
 import {
-  getRechargeOrderPage,
+  getCommissionDetailsPage,
   exportRechargeOrderExcel
 } from '@/api/shop/rechargeOrder';
 import {DICT_TYPE, getDictDatas} from "@/utils/dict";
@@ -104,10 +104,11 @@ export default {
       queryParams: {
         pageNo: 1,
         pageSize: 10,
-        orderId: null,
-        tenantName: null,
-        payTime: [],
-        nickname: null
+        parentOrganizationName: '',
+        deptName: '',
+        createTime: [],
+        nickname: '',
+        mobile: ''
       },
       statusDictDatas: getDictDatas(DICT_TYPE.PAY_STATUS),
     };
@@ -120,7 +121,7 @@ export default {
     getList() {
       this.loading = true;
       // 执行查询
-      getRechargeOrderPage(this.queryParams).then(response => {
+      getCommissionDetailsPage(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;

yudao-ui-admin/src/views/system/tenant/index.vue

@@ -389,6 +389,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.form.status = 0
       this.open = true;
       this.isLook = false;
       this.title = '添加店铺';

yudao-ui-app/pages/sale_performance/index.vue

@@ -1,9 +1,9 @@
 <template>
   <view class="box">
-    <u-navbar autoBack title="发展会员业绩" bgColor="rgba(255,255,255,0)" :placeholder="true" leftIconSize="40"
+    <u-navbar autoBack :title="performance[active].name" bgColor="rgba(255,255,255,0)" :placeholder="true" leftIconSize="40"
       leftIconColor="#fff" titleStyle="font-size:35rpx;color:#fff">
-   <!--   <view slot="right">
-        <u-icon name="more-dot-fill" color="#fff"></u-icon>
+     <!-- <view slot="right">
+        <u-icon name="more-dot-fill" color="#fff" @click="show = true"></u-icon>
       </view> -->
     </u-navbar>
     <u-sticky bgColor="#fff">
@@ -48,7 +48,7 @@
       </view>
       <view class="sale_turnover">
         <view class="turnover_title">
-          流水明细
+          {{performance[active].fund}}
         </view>
         <view class="turnover_list">
         <u-list
@@ -71,6 +71,7 @@
         </view>
       </view>
     </view>
+    <u-action-sheet :actions="performance" @close="show = false" :closeOnClickOverlay="true" :closeOnClickAction="true" @select="selectClick" :title="title" :show="show"></u-action-sheet>
   </view>
 </template>
 
@@ -96,6 +97,23 @@
           fontWeight: '400',
           color: '#fff'
         },
+        show:false,
+        title:'业绩',
+        active:0,
+        performance: [
+        				{
+                  fund:'流水明细',
+        					name:'发展会员业绩',
+        					fontSize:'30',
+                  id:0
+        				},
+        				{
+                  fund:'订单流水',
+        					name: '商品订单业绩',
+        					fontSize:'30',
+                  id:1
+        				},
+        			],
         list: [{
           name: '今日',
         }, {
@@ -127,6 +145,10 @@
       }
     },
     methods: {
+      selectClick(value){
+        console.log(value)
+        this.active = value.id
+      		},
      async scrolltolower() {
        if(this.total>this.orderData.length){
          this.pageData.pageNo++