修改二期bug

.env.development

 NODE_ENV=development
-VUE_APP_API_BASE_URL='http://220.203.25.212:9998'
-# VUE_APP_API_BASE_URL='http://192.168.0.106:9999'
+# VUE_APP_API_BASE_URL='http://220.203.25.212:9998'
+VUE_APP_API_BASE_URL='http://192.168.0.100:9999'
 # VUE_APP_API_BASE_URL='http://220.203.25.212:9999'
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

src/views/bulletin/board.vue

@@ -94,97 +94,97 @@
       <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
         <div class="statistics">
           <p style="color:#666;margin-bottom:5px;">平台总合作伙伴数</p>
-          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">56</p>
+          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.partners || 0}}</p>
         </div>
       </a-col>
       <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
         <div class="statistics">
           <p style="color:#666;margin-bottom:5px;">平台总商铺数量</p>
-          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">56</p>
+          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.shop || 0}}</p>
         </div>
       </a-col>
       <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
         <div class="statistics">
           <p style="color:#666;margin-bottom:5px;">平台总小区数量</p>
-          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">56</p>
+          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.bindCommunity || 0}}</p>
         </div>
       </a-col>
       <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
         <div class="statistics">
           <p style="color:#666;margin-bottom:5px;">平台总业主数量</p>
-          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">56</p>
+          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.bindOwner || 0}}</p>
         </div>
       </a-col>
       <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
         <div class="statistics">
           <p style="color:#666;margin-bottom:5px;">总营收</p>
-          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">56</p>
+          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.totalMoney || 0}}</p>
         </div>
       </a-col>
       <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
         <div class="statistics">
           <p style="color:#666;margin-bottom:5px;">月营收</p>
-          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">56</p>
+          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.monthMoney || 0}}</p>
         </div>
       </a-col>
       <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
         <div class="statistics">
           <p style="color:#666;margin-bottom:5px;">日营收</p>
-          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">56</p>
+          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.todayMoney || 0}}</p>
         </div>
       </a-col>
       <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
         <div class="statistics">
           <p style="color:#666;margin-bottom:5px;">新增合作伙伴数</p>
-          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">56</p>
+          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.newPartners || 0}}</p>
         </div>
       </a-col>
       <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
         <div class="statistics">
           <p style="color:#666;margin-bottom:5px;">推广商铺数量</p>
-          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">56</p>
+          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.newShop || 0}}</p>
         </div>
       </a-col>
       <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
         <div class="statistics">
           <p style="color:#666;margin-bottom:5px;">新增小区数量</p>
-          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">56</p>
+          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.newBindCommunity || 0}}</p>
         </div>
       </a-col>
       <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
         <div class="statistics">
           <p style="color:#666;margin-bottom:5px;">新增业主数量</p>
-          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">56</p>
+          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.newBindOwner || 0}}</p>
         </div>
       </a-col>
       <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
         <div class="statistics">
           <p style="color:#666;margin-bottom:5px;">新增订单数量</p>
-          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">56</p>
+          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.newOrderAmount || 0}}</p>
         </div>
       </a-col>
       <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
         <div class="statistics">
           <p style="color:#666;margin-bottom:5px;">商铺平均人流</p>
-          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">56</p>
+          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.personSvg || 0}}</p>
         </div>
       </a-col>
       <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
         <div class="statistics">
           <p style="color:#666;margin-bottom:5px;">总平台分利</p>
-          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">56</p>
+          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.todaySaasMoney || 0}}</p>
         </div>
       </a-col>
       <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
         <div class="statistics">
           <p style="color:#666;margin-bottom:5px;">合作伙伴分利</p>
-          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">56</p>
+          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.todayPartnerMoney || 0}}</p>
         </div>
       </a-col>
       <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
         <div class="statistics">
           <p style="color:#666;margin-bottom:5px;">小区分利</p>
-          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">56</p>
+          <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.todayCommunityMoney || 0}}</p>
         </div>
       </a-col>
     </a-row>
@@ -192,7 +192,7 @@
     <a-row :gutter="24">
       <a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '12px' }">
         <div class="statistics-box">
-          <h3 class="title">最新成交订单</h3>
+          <h3 class="title">今日成交订单</h3>
 
           <div class="order">
             <div class="order-title">
@@ -200,8 +200,8 @@
               <span>提交时间</span><span>买家名称</span>
               <span>订单金额</span>
             </div>
-            <vue-seamless-scroll :data="data.shareOrder" class="seamless-warp" :class-option="defineScroll">
-              <div v-for="(item, index) in data.shareOrder" :key="index" class="item">
+            <vue-seamless-scroll :data="pageData.shareOrder" class="seamless-warp" :class-option="defineScroll">
+              <div v-for="(item, index) in pageData.shareOrder" :key="index" class="item">
                 <span style="width: 30%;">{{ item.order_num }}</span>
                 <span>{{ item.create_time }}</span>
                 <span>{{ item.buyer_name }}</span>
@@ -226,7 +226,7 @@
       <a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }">
         <div class="statistics-box">
           <h3 class="title">总平台、合作伙伴、商铺分利金额</h3>
-          <line-chart-multid :dataSource="dataList1" :fields="dayFields1" style="padding: 0;" />
+          <line-chart-multid :dataSource="dividendAmount" :fields="dayFields3" style="padding: 0;" />
         </div>
       </a-col>
       <a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }">
@@ -238,7 +238,7 @@
       <a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }">
         <div class="statistics-box">
           <h3 class="title">入驻商铺新增数量</h3>
-          <bar :dataSource="dataList3" style="padding:0;" />
+          <bar :dataSource="shopByMonthList" style="padding:0;" />
         </div>
       </a-col>
       <a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }">
@@ -275,12 +275,15 @@ export default {
       // 表头
       loading: true,
       time: '',
-      data: {},
+      pageData: {},
       dayFields1: ['月成交金额'],
       dataList1: [],
       dayFields2: ['月成交订单数量'],
       dataList2: [],
+      dayFields3: ['总平台', '合作伙伴', '商铺分利金额'],
+      dividendAmount: [],
       dataList3: [],
+      shopByMonthList: [],
       dayFields4: ['巡报订单数量'],
       dataList4: [],
       dayFields5: ['巡报订单金额'],
@@ -310,42 +313,49 @@ export default {
     async getDataStatistics() {
       let { result } = await shareBoardApi({ platformType: 'central', date: this.time })
       if (result) {
-        this.data = result
-        this.dataList1 =
-          result.shareByMonth.map((item) => {
-            return {
-              type: item.MONTH,
-              月成交金额: item.shareMoney,
-            }
-          }) || []
-        this.dataList2 =
-          result.orderCountByMonth.map((item) => {
-            return {
-              type: item.MONTH,
-              月成交订单数量: item.orderCount,
-            }
-          }) || []
-        this.dataList3 =
-          result.shopCountByMonth.map((item) => {
-            return {
-              x: item.MONTH,
-              y: item.shopCount,
-            }
-          }) || []
-        this.dataList4 =
-          result.shareList.map((item) => {
-            return {
-              type: item.st_date_day,
-              巡报订单数量: item.order_num,
-            }
-          }) || []
-        this.dataList5 =
-          result.shareList.map((item) => {
-            return {
-              type: item.st_date_day,
-              巡报订单金额: item.share_money,
-            }
-          }) || []
+        this.pageData = {...result}
+        this.dataList1 = result.shareByMonth.map((item) => {
+          return {
+            type: item.MONTH,
+            月成交金额: item.shareMoney,
+          }
+        }) || []
+        this.dataList2 = result.orderCountByMonth.map((item) => {
+          return {
+            type: item.MONTH,
+            月成交订单数量: item.orderCount,
+          }
+        }) || []
+        this.dataList3 = result.partnerByMonth.map((item) => {
+          return {
+            x: item.MONTH,
+            y: item.partnerCount
+          }
+        }) || []
+        this.dividendAmount = result.shareSaasByMonth.map(item=> {
+          return {
+            type: item.MONTH,
+            月成交订单数量: item.shareMoney
+          }
+        })
+        this.shopByMonthList =  result.shopByMonth.map((item) => {
+          return {
+            x: item.MONTH,
+            y: item.shopCount
+          }
+        }) || []
+        this.dataList4 = result.shareList.map((item) => {
+          return {
+            type: item.st_date_day,
+            巡报订单数量: item.order_num
+          }
+        }) || []
+        this.dataList5 = result.shareList.map((item) => {
+          return {
+            type: item.st_date_day,
+            巡报订单金额: item.share_money
+          }
+        }) || []
       }
     }
   },

src/views/rule/RuleList.vue

@@ -67,8 +67,11 @@
           <span v-if="record.rangeType === 'all'">所有小区</span>
           <span v-else>{{record.shareRuleRefList.map(item=>item.communityName).join(',')}}</span>
         </span>
+        <span slot="rangNumber" slot-scope="text, record">
+          <span>{{record.rangeType === 'all' ? '' : record.shareRuleRefList.length}}</span>
+        </span>
         <span slot="status" slot-scope="text, record">
-          <a-switch :disabled="!record.shopNum" checked-children="启用" un-checked-children="冻结" v-model="record.statusBoolean" @change="flag=>onStatusChange(flag, record)" />
+          <a-switch :disabled="record.rangeType === 'all'" checked-children="启用" un-checked-children="冻结" v-model="record.statusBoolean" @change="flag=>onStatusChange(flag, record)" />
         </span>
         <span slot="action" slot-scope="text, record">
           <a href="javascript:;" @click="propertyDetails(2, record)">编辑</a>
@@ -128,9 +131,10 @@ const columns = [
   },
   {
     title: '已添加数量',
-    dataIndex: 'propertyName',
-    key: 'propertyName',
+    dataIndex: 'rangNumber',
+    key: 'rangNumber',
     align: 'center',
+    scopedSlots: { customRender: 'rangNumber' }
   },
   {
     title: '添加时间',