From 059728f38f7f62d66ce2c995e1a746b8ca0ab2fa Mon Sep 17 00:00:00 2001
From: liudan <18634735655@163.com>
Date: Wed, 27 Mar 2024 00:54:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 view/admin/src/router/modules/marketing.js    | 13 ++-
 view/admin/src/router/modules/user.js         | 12 +++
 .../marketing/signinConfiguration/index.vue   | 64 ++++++++++++
 view/admin/src/views/user/grade/index.vue     | 97 +++++++++++++++++++
 .../admin/src/views/user/huitongbao/index.vue | 78 +++++++++++++++
 .../systemForm/setSystem/modifyStoreInfo.vue  | 40 +++++++-
 6 files changed, 299 insertions(+), 5 deletions(-)
 create mode 100644 view/admin/src/views/marketing/signinConfiguration/index.vue
 create mode 100644 view/admin/src/views/user/grade/index.vue
 create mode 100644 view/admin/src/views/user/huitongbao/index.vue

diff --git a/view/admin/src/router/modules/marketing.js b/view/admin/src/router/modules/marketing.js
index 01a3088..941c932 100644
--- a/view/admin/src/router/modules/marketing.js
+++ b/view/admin/src/router/modules/marketing.js
@@ -422,7 +422,18 @@ const marketingRouter =
           component: () => import('@/views/marketing/assets/index')
         }
       ]
-    }
+    },
+    {
+      path: "signinConfiguration",
+      name: 'signinConfiguration',
+      meta: {
+        title: '签到配置',
+        noCache: true
+      },
+     
+      component: () => import('@/views/marketing/signinConfiguration/index'),
+     
+    },
   ],
 
 }
diff --git a/view/admin/src/router/modules/user.js b/view/admin/src/router/modules/user.js
index a7ecaa4..c0dddf8 100644
--- a/view/admin/src/router/modules/user.js
+++ b/view/admin/src/router/modules/user.js
@@ -25,6 +25,18 @@ const userRouter =
         name: 'UserGroup',
         meta: { title: '用户分组', noCache: true }
       },
+      {
+        path: 'huitongbao',
+        component: () => import('@/views/user/huitongbao'),
+        name: 'huitongbao',
+        meta: { title: '惠通宝转让记录', noCache: true }
+      },
+      {
+        path: 'grade',
+        component: () => import('@/views/user/grade'),
+        name: 'grade',
+        meta: { title: '等级配置', noCache: true }
+      },
       {
         path: 'label',
         component: () => import('@/views/user/group'),
diff --git a/view/admin/src/views/marketing/signinConfiguration/index.vue b/view/admin/src/views/marketing/signinConfiguration/index.vue
new file mode 100644
index 0000000..6f68de1
--- /dev/null
+++ b/view/admin/src/views/marketing/signinConfiguration/index.vue
@@ -0,0 +1,64 @@
+<template>
+<div class="signCfg">
+    <div class="title">签到配置获取消费积分</div>
+    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+        <el-form-item label="第一天" prop="one">
+            <el-input v-model="ruleForm.one" type="number"></el-input>
+        </el-form-item>
+        <el-form-item label="第二天" prop="two">
+            <el-input v-model="ruleForm.two" type="number"></el-input>
+        </el-form-item>
+        <el-form-item label="第三天" prop="three">
+            <el-input v-model="ruleForm.three" type="number"></el-input>
+        </el-form-item>
+        <el-form-item label="第四天" prop="four">
+            <el-input v-model="ruleForm.four" type="number"></el-input>
+        </el-form-item>
+        <el-form-item label="第五天" prop="five">
+            <el-input v-model="ruleForm.five" type="number"></el-input>
+        </el-form-item>
+
+        <el-form-item label="第六天" prop="six">
+            <el-input v-model="ruleForm.six" type="number"></el-input>
+        </el-form-item>
+        <el-form-item label="第七天" prop="seven">
+            <el-input v-model="ruleForm.seven" type="number"></el-input>
+        </el-form-item>
+        <el-form-item label="七天后" prop="other">
+            <el-input v-model="ruleForm.other" type="number"></el-input>
+        </el-form-item>
+        
+    </el-form>
+    <el-button style="margin-left:200px;" type="primary">提交</el-button>
+</div>
+</template>
+<script>
+export default{
+    data(){
+        return{
+            rules:{},
+            ruleForm:{
+                one:null,
+                two:null,
+                three:null,
+                four:null,
+                five:null,
+                six:null,
+                seven:null,
+                other:null,
+            }
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.signCfg{
+    .title{
+        padding: 20px;
+        font-size: 18px;
+    }
+     .el-input{
+        width:300px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/view/admin/src/views/user/grade/index.vue b/view/admin/src/views/user/grade/index.vue
new file mode 100644
index 0000000..d23c172
--- /dev/null
+++ b/view/admin/src/views/user/grade/index.vue
@@ -0,0 +1,97 @@
+<template>
+    <div class="divBox">
+        <el-card class="box-card">
+            
+           
+            <el-table  :data="tableData" style="width: 100%;">
+                <el-table-column prop="date" label="ID"></el-table-column>
+                <el-table-column prop="date" label="等级名称"></el-table-column>
+                <el-table-column prop="date" label="项目经理人数"></el-table-column>
+                <el-table-column prop="date" label="创建时间"></el-table-column>
+                <el-table-column width="90" label="操作">
+                    <template slot-scope="scope">
+                        <el-button type="text">编辑</el-button>
+                    </template>
+                </el-table-column>
+     
+            </el-table>
+        </el-card>
+        <el-dialog  title="编辑等级"  :visible.sync="dialogVisible"  width="30%">
+            <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+                <el-form-item label="等级名称" prop="name">
+                    {{ruleForm.name}}
+                </el-form-item>
+                <el-form-item label="项目经理人数" prop="name">
+                    <el-input v-model="ruleForm.num" type="number"></el-input>
+                </el-form-item>
+               
+            </el-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+            </span>
+        </el-dialog>
+       
+    </div>
+    </template>
+    
+    <script>
+    // +----------------------------------------------------------------------
+    // | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+    // +----------------------------------------------------------------------
+    // | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+    // +----------------------------------------------------------------------
+    // | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+    // +----------------------------------------------------------------------
+    // | Author: CRMEB Team <admin@crmeb.com>
+    // +----------------------------------------------------------------------
+    import {
+      
+    } from '@/api/user'
+
+    
+    export default {
+        
+        data() {
+            return {
+              
+                tableData:[],
+                dialogVisible:false,
+                ruleForm:{
+                    name:'11',
+                    num:null,
+                },
+                rules:{}
+    
+            }
+        },
+        mounted() {
+          
+        },
+        methods: {
+            
+        }
+    }
+    </script>
+    
+    <style lang="scss" scoped>
+    .search{
+        display: flex;
+        align-items: center;
+        .input{
+            display: flex;
+            align-items: center;
+            span{
+                display:inline-block;
+                width:200px;
+            }
+        }
+    }
+    .info{
+        font-size: 18px;
+        font-weight: bold;
+        margin:10px 0;
+
+    }
+    </style>
+    
\ No newline at end of file
diff --git a/view/admin/src/views/user/huitongbao/index.vue b/view/admin/src/views/user/huitongbao/index.vue
new file mode 100644
index 0000000..e8a2a8f
--- /dev/null
+++ b/view/admin/src/views/user/huitongbao/index.vue
@@ -0,0 +1,78 @@
+<template>
+    <div class="divBox">
+        <el-card class="box-card">
+            <div class="search">
+                <div class="input">
+                    <span>转让记录/收款记录</span>
+                    <el-input v-model="account"></el-input>
+                </div>
+                <el-button size="small" style="margin-left:20px;" type="primary">查询</el-button>
+                <el-button size="small"  type="info">重置</el-button>
+            </div>
+            <div class="info">惠通宝当前市值：10</div>
+            <el-table  :data="tableData" style="width: 100%;">
+                <el-table-column prop="date" label="转让账户"></el-table-column>
+                <el-table-column prop="date" label="收款账户"></el-table-column>
+                <el-table-column prop="date" label="转让数量"></el-table-column>
+                <el-table-column prop="date" label="转让时间"></el-table-column>
+     
+            </el-table>
+        </el-card>
+       
+    </div>
+    </template>
+    
+    <script>
+    // +----------------------------------------------------------------------
+    // | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+    // +----------------------------------------------------------------------
+    // | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+    // +----------------------------------------------------------------------
+    // | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+    // +----------------------------------------------------------------------
+    // | Author: CRMEB Team <admin@crmeb.com>
+    // +----------------------------------------------------------------------
+    import {
+      
+    } from '@/api/user'
+
+    
+    export default {
+        
+        data() {
+            return {
+                account:'',
+                tableData:[]
+    
+            }
+        },
+        mounted() {
+          
+        },
+        methods: {
+            
+        }
+    }
+    </script>
+    
+    <style lang="scss" scoped>
+    .search{
+        display: flex;
+        align-items: center;
+        .input{
+            display: flex;
+            align-items: center;
+            span{
+                display:inline-block;
+                width:200px;
+            }
+        }
+    }
+    .info{
+        font-size: 18px;
+        font-weight: bold;
+        margin:10px 0;
+
+    }
+    </style>
+    
\ No newline at end of file
diff --git a/view/mer/src/views/systemForm/setSystem/modifyStoreInfo.vue b/view/mer/src/views/systemForm/setSystem/modifyStoreInfo.vue
index e92f790..7155923 100644
--- a/view/mer/src/views/systemForm/setSystem/modifyStoreInfo.vue
+++ b/view/mer/src/views/systemForm/setSystem/modifyStoreInfo.vue
@@ -279,7 +279,7 @@
           </el-form>
         </div>
       </div>
-      <div v-if="infoType == '3'" class="user-msg">
+      <!-- <div v-if="infoType == '3'" class="user-msg">
         <div class="basic-information">
           <span class="basic-label"> 商户手续费：</span>
           {{ Number(merData.commission_rate) > 0 ? (parseFloat(merData.commission_rate)).toFixed(2) : (parseFloat(merData.merchantCategory.commission_rate * 100)).toFixed(2)}}%
@@ -300,8 +300,39 @@
           <span class="basic-label"> 平台首页推荐商户：</span>
           {{ merData.is_best ? "是" : "否" }}
         </div>
+      </div> -->
+      <div v-if="infoType == '4'" class="user-msg">
+        <div class="basic-information">
+          <span class="basic-label"> 商户收入：</span>
+          56789
+          <!-- {{ Number(merData.commission_rate) > 0 ? (parseFloat(merData.commission_rate)).toFixed(2) : (parseFloat(merData.merchantCategory.commission_rate * 100)).toFixed(2)}}% -->
+        </div>
+        <div class="basic-information">
+          <span class="basic-label"> 商户余额：</span>
+          56789
+        </div>
+        <div class="basic-information">
+          <span class="basic-label"> 商户冻结金额：</span>
+          56789
+        </div>
+        <div class="basic-information">
+          <span class="basic-label"> 商户冻结积分：</span>
+          56789
+        </div>
+        <div class="basic-information">
+          <span class="basic-label"> 商户可提现总金额：</span>
+          56789
+        </div>
+        <div class="basic-information">
+          <span class="basic-label"> 商户可提现消费积分部分：</span>
+          56789
+        </div>
+        <div class="basic-information">
+          <span class="basic-label"> 商户退款支出：</span>
+          56789
+        </div>
       </div>
-      <div v-if="infoType != 3" class="submit-button">
+      <div v-if="infoType != 4" class="submit-button">
         <el-button type="primary" :loading="submitLoading" @click="submitForm('ruleForm')">提交</el-button>
       </div>
     </div>
@@ -517,7 +548,8 @@ export default {
       tabList: [
         {value: '1',title: '基本信息'},
         {value: '2',title: '店铺信息'},
-        {value: '3',title: '功能信息'}
+        // {value: '3',title: '功能信息'}
+        {value: '4',title: '商家账户信息'}
       ]
     }
   },
@@ -839,7 +871,7 @@ export default {
     .basic-label{
       display: inline-block;
       text-align: right;
-      width: 150px;
+      width: 170px;
       margin-right: 10px;
     }
   }