首页面板&参数设置

src/api/system.js

@@ -279,4 +279,22 @@ export function configIdentityLst(page, limit) {
 export function configIdentityUpdateForm(id) {
   return request.get('config/identity/update/table/' + id)
 }
+  
 
+
+/**
+ * 奖励配置列表
+ * @param {Object} page
+ * @param {Object} limit
+ */
+export function configAwardLst(page, limit) {
+  return request.get('config/award/lst', { page, limit })
+}
+/**
+ * 奖励编辑表单
+ * @param {Object} page
+ * @param {Object} limit
+ */
+export function configAwardUpdateForm(data) {
+  return request.get('config/award/update/table', data)
+}

src/router/modules/config.js

@@ -15,7 +15,7 @@ const configRouter =
         {
           path: 'classify',
           name: 'system_config_classify',
-          meta: {
+          meta: { 
             title: '配置分类',
             noCache: true
           },
@@ -61,15 +61,15 @@ const configRouter =
           path: 'helper',
           name: 'kefu',
           meta: {
-            title: '客服设置'
+            title: '客服设置' 
           },
           component: () => import('@/views/setting/helper/index')
         },
-        {
+        {     
           path: 'agree',
           name: 'system_config_agree',
           meta: {
-            title: '协议设置',
+            title: '协议设置',  
             noCache: true
           },
           component: () => import('@/views/agreement/agree/index')
@@ -83,15 +83,42 @@ const configRouter =
           },
           component: () => import('@/views/contribution/contribution/index')
         },
-		{
-		  path: 'identity',
-		  name: 'system_identity_up',
-		  meta: {
-		    title: '身份升级设置',
-		    noCache: true
-		  },
-		  component: () => import('@/views/system/identity/index')
-		}
-      ]
+        {
+          path: 'identity',
+          name: 'system_identity_up',
+          meta: {
+            title: '身份升级设置',
+            noCache: true
+          },
+          component: () => import('@/views/system/identity/index')
+        },
+        {
+          path: 'award',
+          name: 'system_award_up',
+          meta: {
+            title: '奖励设置',
+            noCache: true
+          },
+          component: () => import('@/views/system/award/index')
+        },
+        {   
+          path: 'hongbao',
+          name: 'system_hongbao_up',
+          meta: {
+            title: '红包设置',
+            noCache: true
+          },
+          component: () => import('@/views/system/hongbao/index')
+        },
+        {
+          path: 'hierarchy',
+          name: 'system_hierarchy_up',
+          meta: {
+            title: '团队业绩层级设置',
+            noCache: true
+          },  
+          component: () => import('@/views/system/hierarchy/index')
+        }
+      ] 
     }
 export default configRouter

src/views/dashboard/index.vue

@@ -56,8 +56,8 @@
             <div class="conbox_cen_item_box">
               <img referrerpolicy='no-referrer' src="../../../static/index/con1.gif" alt="">
               <div class="item_r">
-                <div class="item_n">{{ orderData.orderNum }}</div>
-                <div class="item_t">订单数</div>
+                <div class="item_n">{{ orderData.todayShangCount }}</div>
+                <div class="item_t">线上订单</div>
               </div>
             </div>
           </div>
@@ -65,8 +65,8 @@
             <div class="conbox_cen_item_box">
               <img referrerpolicy='no-referrer' src="../../../static/index/con2.gif" alt="">
               <div class="item_r">
-                <div class="item_n">{{ statisticsData.today.userVkeNum }}</div>
-                <div class="item_t">V客增长数</div>
+                <div class="item_n">{{ orderData.userDayCount }}</div>
+                <div class="item_t">新增用户</div>
               </div>
             </div>
           </div>
@@ -74,8 +74,8 @@
             <div class="conbox_cen_item_box">
               <img referrerpolicy='no-referrer' src="../../../static/index/con3.gif" alt="">
               <div class="item_r">
-                <div class="item_n">{{ statisticsData.today.userNum }}</div>
-                <div class="item_t">新增用户</div>
+                <div class="item_n">{{ orderData.todayXiaCount }}</div>
+                <div class="item_t">游客数</div>
               </div>
             </div>
           </div>
@@ -83,9 +83,9 @@
             <div class="conbox_cen_item_box">
               <img referrerpolicy='no-referrer' src="../../../static/index/con4.gif" alt="">
               <div class="item_r">
-                <div class="item_n">{{ statisticsData.today.visitNum }}</div>
+                <div class="item_n">{{ orderData.todayXiaCount }}</div>
                 <!-- <div class="item_n">9999999999999999999999999</div> -->
-                <div class="item_t">浏览量</div>
+                <div class="item_t">线下订单</div>
               </div>
             </div>
           </div>
@@ -93,8 +93,8 @@
             <div class="conbox_cen_item_box">
               <img referrerpolicy='no-referrer' src="../../../static/index/con5.gif" alt="">
               <div class="item_r">
-                <div class="item_n">{{ statisticsData.today.visitUserNum }}</div>
-                <div class="item_t">访客数</div>
+                <div class="item_n">{{ orderData.userHyDayCount }}</div>
+                <div class="item_t">新增会员数</div>
               </div>
             </div>
           </div>
@@ -102,12 +102,13 @@
             <div class="conbox_cen_item_box">
               <img referrerpolicy='no-referrer' src="../../../static/index/con6.gif" alt="">
               <div class="item_r">
-                <div class="item_n">{{ statisticsData.today.storeNum }}</div>
-                <div class="item_t">创客数</div>
+                <div class="item_n">{{ orderData.merchantCount }}</div>
+                <div class="item_t">商户数</div>
               </div>
             </div>
           </div>
         </div>
+
         <div class="conbox_bot">
           <!-- <div class="conbox_bot_t">
             <img referrerpolicy='no-referrer' src="../../../static/index/yhsj.png" alt="">
@@ -135,6 +136,33 @@
             <line-chart ref="lineChart" :date="time3" :style="{marginLeft:!indexfull&&sidebar.opened? '100px':'0px'}"/>
           </div>
         </div>
+
+        <div class="conbox_bot">
+    
+          <div class="conbox_bot_con">
+            <div style="{display:flex;width:100%;position:relative;}">
+              <img referrerpolicy='no-referrer' src="../../../static/index/gxzph.png" alt="" style="width:80%;">
+              <div class="acea-row row-between-wrapper mb20 chooseBox">
+                <span class="header-title"></span>
+                <span class="header-time">
+                </span>
+              </div>
+            </div>
+            <!-- 新增排行榜模块 -->
+            <div class="rank-list">
+              <ul>
+                <li v-for="(item, index) in gxz_users" :key="index" class="rank-item">
+                  <div class="rank-num" :class="{'top-rank': index++ <= 2}">{{ index++ }}</div>
+                  <div class="rank-info">
+                    <div class="rank-name">{{item.nickname}}</div>
+                    <div class="rank-value">{{item.contribute}}</div>
+                  </div>
+                </li>
+              </ul>
+            </div>
+          </div>
+        </div>
+
       </div>
       <div class="con_rightbox">
         <div class="con_righttbox_item">
@@ -204,6 +232,7 @@ export default {
         }
       },
       orderData: {},
+      gxz_users: [],
       merTitle: '商户销量排行',
       visitTitle: '商户访客量排行',
       currentRole: 'adminDashboard',
@@ -304,6 +333,7 @@ export default {
         const dataList = this.orderData.today.filter(item => {
           return item.total !== 0
         })
+        this.gxz_users = this.orderData.gxz_users;
         dataList.unshift({ time: '00:00', total: 0 })
 
       }).catch(res => {
@@ -394,7 +424,56 @@ export default {
   margin: 0;
   padding: 0;
 }
+.rank-list {
+  padding: 20px;
+  
+  ul {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 10px;
+  }
 
+  .rank-item {
+    display: flex;
+    align-items: center;
+    width: calc(33.33% - 7px);
+    background: #06155E;
+    padding: 10px;
+    border-radius: 4px;
+
+    .rank-num {
+      width: 26px;
+      height: 26px;
+      background: #1D74F8;
+      border-radius: 4px;
+      color: #fff;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-right: 10px;
+      font-size: 14px;
+    }
+
+    .rank-num.top-rank {
+      background: #F64B07;
+    }
+
+    .rank-info {
+      flex: 1;
+      
+      .rank-name {
+        color: #fff;
+        font-size: 14px;
+        margin-bottom: 4px;
+      }
+
+      .rank-value {
+        color: #13BADE;
+        font-size: 16px;
+      }
+    }
+  }
+}
 .divBox {
   width: 100%;
   min-width: 1400px;
@@ -562,7 +641,7 @@ export default {
     flex: 2;
     min-width: 700px;
     background-image: url('../../../static/index/conbackimg.png');
-    background-size: 100% 74%;
+    background-size: 100% 85%;  // 将背景尺寸从 74% 增加到 85%
     background-position-y: 200px;
     background-repeat: no-repeat;
 
@@ -639,7 +718,7 @@ export default {
           // flex:1;
           // min-width: 120px;
           // margin-left:40px;
-          width: 146px;
+          width: 166px;
           display: flex;
 
           img {
@@ -709,10 +788,25 @@ export default {
     .conbox_bot {
       box-sizing: border-box;
       padding: 0px 40px;
-      margin-bottom: 15px;
+      margin-bottom: 20px;  // 减小底部间距
+      position: relative;    
       
+      &::after {            
+        content: '';
+        position: absolute;
+        bottom: -10px;      // 相应调整装饰线位置
+        left: 0;
+        width: 100%;
+        height: 2px;
+        background: linear-gradient(to right, 
+          rgba(0,83,169,0) 0%,
+          rgba(0,83,169,0.8) 50%,
+          rgba(0,83,169,0) 100%
+        );
+      }
+
       .conbox_bot_t {
-        height: 54px;
+        height: 94px;
         box-sizing: border-box;
         padding: 0px 60px;
 

src/views/merchant/list/index.vue

@@ -462,7 +462,7 @@ export default {
         .then((res) => {
           Cookies.set("merchantToken", res.data.token);
           // window.open(SettingMer.httpUrl + res.data.url); // 2023年9月2日 - 前后端分离 去掉httpUrl
-          window.open("http://testshop.hxxfb.com" + res.data.url); // 2023年9月2日 - 前后端分离 去掉httpUrl
+          window.open("http://shop.hxxfb.com" + res.data.url); // 2023年9月2日 - 前后端分离 去掉httpUrl
           // window.open(res.data.url);
           console.log('跳转到merchant res = ')
           console.log(res)

src/views/system/award/index.vue

@@ -0,0 +1,143 @@
+<template>
+  <div class="divBox">
+    <el-card class="box-card">
+      <!-- <div slot="header" class="clearfix"> -->
+        <!-- <el-button size="small" type="primary" @click="onAdd">添加配置</el-button> -->
+      <!-- </div> -->
+      <el-table
+        v-loading="listLoading"
+        :data="tableData.data"
+        style="width: 100%"
+        size="small"
+      >
+        <el-table-column
+          prop="name"
+          label="名称"
+          min-width="60"
+        />
+        <el-table-column
+          prop="number_rate"
+          label="佣金占比(%)"
+          min-width="80"
+        />
+        <el-table-column
+          prop="lianchuang_rate"
+          label="联创占比(%)"
+          min-width="80"
+        />
+        <el-table-column
+          prop="guquan_rate"
+          label="股权占比(%)"
+          min-width="80"
+        />
+        <el-table-column
+          prop="user_groub_1"
+          label="消费者占比(%)"
+          min-width="80"
+        />
+        <el-table-column
+          prop="user_groub_2"
+          label="业务员占比(%)"
+          min-width="80"
+        />
+        <el-table-column
+          prop="user_groub_3"
+          label="业务经理占比(%)"
+          min-width="80"
+        />
+        <el-table-column
+          prop="user_groub_4"
+          label="初级合伙人占比(%)"
+          min-width="80"
+        />
+        <el-table-column
+          prop="user_groub_5"
+          label="中级合伙人占比(%)"
+          min-width="80"
+        />
+        <el-table-column
+          prop="user_groub_6"
+          label="高级合伙人占比(%)"
+          min-width="80"
+        />
+        <el-table-column
+          prop="user_groub_7"
+          label="董事占比(%)"
+          min-width="80"
+        />
+        <el-table-column label="操作" min-width="130" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="onEdit(scope.row)">编辑</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          :page-sizes="[20, 40, 60, 80]"
+          :page-size="tableData.limit"
+          :current-page="tableData.page"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
+      </div>
+    </el-card>
+  </div>
+</template> 
+
+<script>
+import {
+  configAwardUpdateForm,
+  configAwardLst,
+} from '@/api/system.js'
+export default {
+  name: 'Setting',
+  data() {
+    return {
+      tableData: {
+        page: 1,
+        limit: 20,
+        data: [],
+        total: 0
+      },
+      listLoading: true
+    }
+  },
+  mounted() {   
+    this.getList()
+  },  
+  methods: {
+    // 列表
+    getList() {
+      this.listLoading = true
+      configAwardLst(this.tableData.page, this.tableData.limit).then(res => {
+        this.tableData.data = res.data.list
+        this.tableData.total = res.data.count
+        this.listLoading = false
+      }).catch(res => {
+        this.listLoading = false
+        this.$message.error(res.message)
+      })
+    },
+    pageChange(page) {
+      this.tableData.page = page
+      this.getList()
+    },
+    handleSizeChange(val) {
+      this.tableData.limit = val
+      this.getList()
+    },
+    // 编辑
+    onEdit(key) { 
+      console.log(123)
+      console.log(key)
+      this.$modalForm(configAwardUpdateForm(key)).then(() => this.getList())
+    },
+  }
+}
+</script>
+
+<style scoped lang="stylus">
+
+</style>

src/views/system/hierarchy/index.vue

@@ -0,0 +1,139 @@
+<template>
+  <div class="divBox">
+    <el-form size="small" label-width="140px">
+      <el-form-item label="大团队业绩统计层级：">
+        <el-input v-model="userFrom.max_team_hierarchy" placeholder="请输入" element-id="max_team_hierarchy" style="width: 20%" /> 
+      </el-form-item>
+      <el-form-item label="小团队业绩统计层级：">
+        <el-input v-model="userFrom.min_team_hierarchy" placeholder="请输入" element-id="min_team_hierarchy" style="width: 20%" /> 
+      </el-form-item>
+      <el-button class="ResetSearch mr10" size="small" type="primary" @click="config()">确定</el-button>
+    </el-form>
+
+  </div>
+</template>
+
+<script>
+import { MemberSettingsUpdate, getMemberSettings } from '@/api/systemForm.js'
+
+export default {
+  name: 'Fenrunbili',
+  data() {
+    return {
+      userFrom: {
+        max_team_hierarchy:0,
+        min_team_hierarchy:0
+      },
+      params: {}
+    }
+  },
+
+  mounted() {
+    this.getMerchantProfit()
+    this.getMerchantProfitTow()
+  },
+
+  methods: {
+    getMerchantProfit() {
+      getMemberSettings('max_team_hierarchy').then(res => {
+        this.userFrom.max_team_hierarchy = res.message
+      }).catch(err => {
+        this.$message.error(err.message)
+      })
+    },  
+    getMerchantProfitTow() {
+      getMemberSettings('min_team_hierarchy').then(res => {
+        this.userFrom.min_team_hierarchy = res.message
+      }).catch(err => {
+        this.$message.error(err.message)
+      })
+    },  
+    // 修改商户分润比例
+    config() {
+      this.params = {
+        name: 'max_team_hierarchy',
+        value: this.userFrom.max_team_hierarchy
+      };
+      this.setMerchantProfit(this.params)
+      this.params = {
+        name: 'min_team_hierarchy',
+        value: this.userFrom.min_team_hierarchy
+      };
+      this.setMerchantProfit(this.params)
+      this.$message.success('设置成功')
+    },
+    // 修改商户分润比例
+    setMerchantProfit(params) {
+      MemberSettingsUpdate(params).then(res => {
+      }).catch(err => {
+        this.$message.error(err.message)
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.selWidth {
+    width: 300px;
+}
+
+.el-dropdown-link {
+    cursor: pointer;
+    color: #409eff;
+    font-size: 12px;
+}
+
+.el-icon-arrow-down {
+    font-size: 12px;
+}
+
+.tabBox_tit {
+    width: 53%;
+    font-size: 12px !important;
+    margin: 0 2px 0 10px;
+    letter-spacing: 1px;
+    padding: 5px 0;
+    box-sizing: border-box;
+}
+
+/deep/.row-bg {
+    .cell {
+        color: red !important;
+    }
+}
+
+.filter-item {
+  width:15%;
+}
+
+.cancel-order-mark {
+    margin-top: 30px;
+    .cancel-order-select-reason {
+        height: 30px;
+    }
+    .canel-order-remark-input {
+        width: 75%;
+        margin-left: 35px;
+    }
+} 
+
+.cancel-button {
+        display: flex;
+        justify-content: center;
+        margin-top: 20px;
+        gap:50px;
+        height: 30px;
+        .confirm {
+          width: 70px;
+        }
+        .cacnel-item {
+          width: 70px;
+        }
+    }
+
+.selected-kuang {
+  width: 500px;
+}
+</style>
+

src/views/system/hongbao/index.vue

@@ -0,0 +1,123 @@
+<template>
+  <div class="divBox">
+    <el-form size="small" label-width="120px">
+      <el-form-item label="红包比例：">
+        <el-input v-model="userFrom.hongbao_rate" placeholder="请输入" element-id="hongbao_rate" style="width: 20%" /> %
+      </el-form-item>
+      <el-button class="ResetSearch mr10" size="small" type="primary" @click="config()">确定</el-button>
+    </el-form>
+
+  </div>
+</template>
+
+<script>
+import { MemberSettingsUpdate, getMemberSettings } from '@/api/systemForm.js'
+
+export default {
+  name: 'Fenrunbili',
+  data() {
+    return {
+      userFrom: {
+        hongbao_rate:0
+      },
+      params: {}
+    }
+  },
+
+  mounted() {
+    this.getMerchantProfit()
+  },
+
+  methods: {
+    // 获取商户分润比例
+    getMerchantProfit() {
+      getMemberSettings('hongbao_rate').then(res => {
+        this.userFrom.hongbao_rate = res.message
+      }).catch(err => {
+        this.$message.error(err.message)
+      })
+    },  
+    // 修改商户分润比例
+    config() {
+      this.params = {
+        name: 'hongbao_rate',
+        value: this.userFrom.hongbao_rate
+      };
+      this.setMerchantProfit(this.params)
+    },
+    // 修改商户分润比例
+    setMerchantProfit(params) {
+      MemberSettingsUpdate(params).then(res => {
+        this.$message.success('设置成功')
+      }).catch(err => {
+        this.$message.error(err.message)
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.selWidth {
+    width: 300px;
+}
+
+.el-dropdown-link {
+    cursor: pointer;
+    color: #409eff;
+    font-size: 12px;
+}
+
+.el-icon-arrow-down {
+    font-size: 12px;
+}
+
+.tabBox_tit {
+    width: 53%;
+    font-size: 12px !important;
+    margin: 0 2px 0 10px;
+    letter-spacing: 1px;
+    padding: 5px 0;
+    box-sizing: border-box;
+}
+
+/deep/.row-bg {
+    .cell {
+        color: red !important;
+    }
+}
+
+.filter-item {
+  width:15%;
+}
+
+.cancel-order-mark {
+    margin-top: 30px;
+    .cancel-order-select-reason {
+        height: 30px;
+    }
+    .canel-order-remark-input {
+        width: 75%;
+        margin-left: 35px;
+    }
+}
+
+.cancel-button {
+        display: flex;
+        justify-content: center;
+        margin-top: 20px;
+        gap:50px;
+        height: 30px;
+        .confirm {
+          width: 70px;
+        }
+        .cacnel-item {
+          width: 70px;
+        }
+    }
+
+.selected-kuang {
+  width: 500px;
+}
+</style>
+