增加bd管理

src/pages.json

@@ -559,6 +559,30 @@
                 "navigationBarTitleText": "收益记录",
                 "enablePullDownRefresh": true
             }
+        },
+        {
+            "path": "pages/bd/nav",
+            "style": {
+                "navigationBarTitleText": "bd管理"
+            }
+        },
+        {
+            "path": "pages/bd/profit",
+            "style": {
+                "navigationBarTitleText": "我的收益"
+            }
+        },
+        {
+            "path": "pages/bd/chief",
+            "style": {
+                "navigationBarTitleText": "我的团长"
+            }
+        },
+        {
+            "path": "pages/bd/code",
+            "style": {
+                "navigationBarTitleText": "我的邀请码"
+            }
         }
     ]
 }

src/pages/assistant/setting2.vue

@@ -1,19 +1,15 @@
 <template>
     <div class="page">
         <ul class="list">
-            <li
-                class="item"
-                @click="
-                    jump({
-                        path: '/pages/assistant/re-pid',
-                    })
-                "
-            >
-                <div class="name">团长号设置</div>
-                <my-image
+            <li class="item">
+                <div class="name">团长号</div>
+                <div>
+                    {{ pid }}
+                </div>
+                <!-- <my-image
                     class="arrow"
                     src="/static/common/arrows_left.png"
-                ></my-image>
+                ></my-image> -->
             </li>
         </ul>
     </div>
@@ -29,10 +25,14 @@ export default {
     data() {
         return {
             id: "",
+            pid: "",
+            platformData: {},
         };
     },
 
     onLoad(opts) {
+        this.platformData = this.$store.state.common.platformData;
+        this.pid = this.platformData.pid || "";
     },
     async onShow() {},
     // 函数

src/pages/bd/chief.vue

@@ -0,0 +1,175 @@
+<template>
+    <div class="page">
+        <ul class="list">
+            <li v-for="item of listData" :key="item.id">
+                <my-image class="img" :src="item.headIcon"></my-image>
+                <div class="info">
+                    <div class="name">{{ item.nickName }}</div>
+                    <div class="mobile">手机号：{{ item.mobile }}</div>
+                    <div class="comission">佣金：{{ item.comission / 100 }}</div>
+                </div>
+            </li>
+        </ul>
+        <div class="more-text" v-if="dataEnd">- 没有更多数据了 -</div>
+    </div>
+</template>
+
+<script>
+import MyImage from "../../components/image/index";
+export default {
+    name: "",
+    components: { MyImage },
+    // 数据
+    data() {
+        return {
+            pageIndex: 1,
+            dataEnd: false,
+            listData: [],
+        };
+    },
+    onShow() {},
+
+    onLoad() {
+        this.getList();
+    },
+    onPullDownRefresh() {
+        this.getList(true);
+    },
+    onReachBottom() {
+        this.getMoreList();
+    },
+
+    // 函数
+    methods: {
+        getList(isPull) {
+            uni.showLoading({
+                title: "加载中...",
+            });
+            this.pageIndex = 1;
+            this.dataEnd = false;
+            let sendData = {
+                pageIndex: this.pageIndex++,
+                // appId: this.shopInfo.id,
+            };
+            this.api.get("/User/GetGroupLeaderList", sendData).then((res) => {
+                if (isPull) {
+                    uni.stopPullDownRefresh();
+                }
+                uni.hideLoading();
+                this.listData = res.data.groupLeaderList;
+                if (!res.data.groupLeaderList.length) {
+                    this.dataEnd = true;
+                }
+            });
+        },
+        getMoreList() {
+            uni.showLoading({
+                title: "加载中...",
+            });
+            let sendData = {
+                pageIndex: this.pageIndex++,
+            };
+            this.api.get("/User/GetGroupLeaderList", sendData).then((res) => {
+                uni.hideLoading();
+                this.listData = [...this.listData, ...res.data.groupLeaderList];
+                if (!res.data.groupLeaderList.length) {
+                    this.dataEnd = true;
+                }
+            });
+        },
+    },
+
+    // 数据计算
+    computed: {},
+
+    // 数据监听
+    watch: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.filter {
+    display: flex;
+    align-items: center;
+    padding: px(40);
+    font-size: px(44);
+    background-color: #fff;
+    .row {
+        padding: 0 px(20);
+        flex-shrink: 0;
+    }
+    .key {
+        flex-shrink: 0;
+    }
+    .value {
+        border: 1px solid #f1f1f1;
+        height: px(80);
+        width: px(200);
+        padding: 0 px(10);
+        width: 90%;
+    }
+}
+
+.profit-info {
+    text-align: center;
+    padding: px(60) px(40);
+    background-color: #fff;
+    .tit {
+        font-size: px(44);
+    }
+    .money {
+        font-size: px(56);
+        color: #ff4b26;
+        margin-top: px(30);
+    }
+}
+.list {
+    padding: px(50) 0;
+    border-top: 1px solid #f1f1f1;
+    background-color: #fff;
+    li{
+            display: flex;
+    align-items: stretch;
+    justify-content: space-between;
+    }
+    .img {
+        width: px(200);
+        height: px(200);
+        margin-right: px(30);
+        flex-shrink: 0;
+        /deep/ img {
+            width: px(200);
+            height: px(200);
+            background-color: #eee;
+        }
+    }
+    .info{
+        width: 100%;
+        .name{
+            font-size: px(48);
+        }
+        div~div{
+            margin-top: px(15);
+        }
+        .mobile,.comission{
+            color: #666;
+        }
+    }
+}
+.blod {
+    font-weight: bold;
+}
+.more-text {
+    display: flex;
+    justify-content: center;
+    padding-bottom: px(60);
+    font-size: px(34);
+    color: #999;
+}
+.shop-name {
+    color: #666;
+    display: inline-block;
+    margin-left: px(10);
+    font-size: px(40);
+}
+</style>

src/pages/bd/code.vue

@@ -0,0 +1,86 @@
+<template>
+    <div class="page">
+        <ul class="list">
+            <li class="item" @click="jump('/pages/bd/profit')">
+                <div class="name">我的收益</div>
+                <my-image
+                    class="arrow"
+                    src="/static/common/arrows_left.png"
+                ></my-image>
+            </li>
+            <li class="item" @click="jump('/pages/bd/chief')">
+                <div class="name">我的团长</div>
+                <my-image
+                    class="arrow"
+                    src="/static/common/arrows_left.png"
+                ></my-image>
+            </li>
+            <li class="item" @click="jump('/pages/bd/code')">
+                <div class="name">我的邀请码</div>
+                <my-image
+                    class="arrow"
+                    src="/static/common/arrows_left.png"
+                ></my-image>
+            </li>
+        </ul>
+    </div>
+</template>
+
+<script>
+import MyImage from "../../components/image/index";
+export default {
+    name: "",
+    components: { MyImage },
+
+    // 数据
+    data() {
+        return {
+            curShop: {},
+        };
+    },
+
+    onLoad() {},
+    async onShow() {},
+    // 函数
+    methods: {},
+
+    // 数据计算
+    computed: {
+        user() {
+            return this.$store.state.user.user;
+        },
+    },
+
+    // 数据监听
+    watch: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.page {
+    min-height: 100vh;
+    background-color: #fff;
+}
+.list {
+    border-top: 1px solid #f1f1f1;
+    .item {
+        height: px(120);
+        padding: 0 px(35);
+        font-size: px(44);
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        border-bottom: 1px solid #f1f1f1;
+    }
+    .arrow {
+        width: px(40);
+        height: px(40);
+        flex-shrink: 0;
+        transform: rotate(180deg);
+        /deep/ img {
+            width: px(40);
+            height: px(40);
+        }
+    }
+}
+</style>

src/pages/bd/nav.vue

@@ -0,0 +1,109 @@
+<template>
+    <div class="page">
+        <ul class="list">
+            <li class="item" @click="jump('/pages/bd/profit')">
+                <div class="name">我的收益</div>
+                <my-image
+                    class="arrow"
+                    src="/static/common/arrows_left.png"
+                ></my-image>
+            </li>
+            <li class="item" @click="jump('/pages/bd/chief')">
+                <div class="name">我的团长</div>
+                <my-image
+                    class="arrow"
+                    src="/static/common/arrows_left.png"
+                ></my-image>
+            </li>
+            <li class="item" @click="copy(user.inviteCode)">
+                <div class="name">我的邀请码</div>
+                <div>{{user.inviteCode}} <span class="copy">点击复制</span></div>
+            </li>
+        </ul>
+    </div>
+</template>
+
+<script>
+import MyImage from "../../components/image/index";
+export default {
+    name: "",
+    components: { MyImage },
+
+    // 数据
+    data() {
+        return {
+            curShop: {},
+        };
+    },
+
+    onLoad() {},
+    async onShow() {},
+    // 函数
+    methods: {
+        
+
+        // 复制
+        copy(val) {
+            const self = this;
+
+            uni.setClipboardData({
+                data: val,
+                success: () => {
+                    self.fn.showToast("邀请码复制成功");
+                },
+            });
+        },
+    },
+
+    // 数据计算
+    computed: {
+        user() {
+            return this.$store.state.user.user;
+        },
+    },
+
+    // 数据监听
+    watch: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.page {
+    min-height: 100vh;
+    background-color: #fff;
+}
+.list {
+    border-top: 1px solid #f1f1f1;
+    .item {
+        height: px(120);
+        padding: 0 px(35);
+        font-size: px(44);
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        border-bottom: 1px solid #f1f1f1;
+    }
+    .arrow {
+        width: px(40);
+        height: px(40);
+        flex-shrink: 0;
+        transform: rotate(180deg);
+        /deep/ img {
+            width: px(40);
+            height: px(40);
+        }
+    }
+}
+.copy {
+    display: inline-block;
+    font-size: px(32);
+    line-height: px(44);
+    padding: 0 px(10);
+    border: 1px solid #4395ff;
+    color: #4395ff;
+    background-color: #fff;
+    margin-left: px(20);
+    border-radius: px(5);
+    transform: translate(0, -1px);
+}
+</style>

src/pages/bd/profit.vue

@@ -0,0 +1,216 @@
+<template>
+    <div class="page">
+
+        <ul class="list">
+            <li v-for="item of listData" :key="item.id">
+                <div class="top">
+                    <div class="tit">
+                        {{ item.title }}
+                        <span class="shop-name">({{ item.shopName }})</span>
+                    </div>
+                    <div class="money" :class="{ green: item.type === 1 }">
+                        {{ item.type === 1 ? "+" : "-" }}{{ item.amount / 100 }}
+                    </div>
+                </div>
+                <div class="info">
+                    <div class="date">
+                        {{ item.createdTime | dateFormat("yyyy-MM-dd hh:mm") }}
+                    </div>
+                    <div class="formula blod">
+                        ￥{{ item.totalCommission / 100 }}(佣金)-￥{{
+                            item.pointsPrice / 100
+                        }}(积分抵扣) = ￥{{ item.amount / 100 }}
+                    </div>
+                </div>
+                <div class="bottom">
+                    <div class="num">订单号：{{ item.orderNo }}</div>
+                    <div
+                        class="link"
+                        @click="
+                            jump({
+                                path: '/pages/youxuan/order/detail',
+                                query: { id: item.orderId },
+                            })
+                        "
+                    >
+                        查看订单
+                    </div>
+                </div>
+            </li>
+        </ul>
+        <div class="more-text" v-if="dataEnd">- 没有更多数据了 -</div>
+    </div>
+</template>
+
+<script>
+import MyImage from "../../components/image/index";
+export default {
+    name: "",
+    components: { MyImage },
+    // 数据
+    data() {
+        return {
+            pageIndex: 1,
+            dataEnd: false,
+            listData: [],
+            shopInfo: null,
+        };
+    },
+    onShow() {},
+
+    onLoad() {
+        this.getList();
+    },
+    onPullDownRefresh() {
+        this.getList(true);
+    },
+    onReachBottom() {
+        this.getMoreList();
+    },
+
+    // 函数
+    methods: {
+
+        getList(isPull) {
+            uni.showLoading({
+                title: "加载中...",
+            });
+            this.pageIndex = 1;
+            this.dataEnd = false;
+            let sendData = {
+                pageIndex: this.pageIndex++,
+                // appId: this.user.appId,
+            };
+            this.api.get("/User/GetComissionList", sendData).then((res) => {
+                if (isPull) {
+                    uni.stopPullDownRefresh();
+                }
+                uni.hideLoading();
+                this.listData = res.data;
+                if (!this.listData.length) {
+                    this.dataEnd = true;
+                }
+            });
+        },
+        getMoreList() {
+            uni.showLoading({
+                title: "加载中...",
+            });
+            let sendData = {
+                pageIndex: this.pageIndex++,
+            };
+            this.api.get("/User/GetComissionList", sendData).then((res) => {
+                uni.hideLoading();
+                this.listData = [...this.listData, ...res.data];
+                if (!res.data.length) {
+                    this.dataEnd = true;
+                }
+            });
+        },
+    },
+
+    // 数据计算
+    computed: {
+        user() {
+            return this.$store.state.user.user;
+        },
+    },
+
+    // 数据监听
+    watch: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.filter {
+    display: flex;
+    align-items: center;
+    padding: px(40);
+    font-size: px(44);
+    background-color: #fff;
+    .row {
+        padding: 0 px(20);
+        flex-shrink: 0;
+    }
+    .key {
+        flex-shrink: 0;
+    }
+    .value {
+        border: 1px solid #f1f1f1;
+        height: px(80);
+        width: px(200);
+        padding: 0 px(10);
+        width: 90%;
+    }
+}
+
+.profit-info {
+    text-align: center;
+    padding: px(60) px(40);
+    background-color: #fff;
+    .tit {
+        font-size: px(44);
+    }
+    .money {
+        font-size: px(56);
+        color: #ff4b26;
+        margin-top: px(30);
+    }
+}
+.list {
+    padding: px(50) 0;
+    border-top: 1px solid #f1f1f1;
+    background-color: #fff;
+    li {
+        border-bottom: 1px solid #f1f1f1;
+        padding: px(30) px(40);
+    }
+    .top,
+    .info,
+    .bottom {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
+    .tit {
+        font-size: px(48);
+    }
+    .money {
+        color: #ff4b26;
+    }
+    .green {
+        color: #27a34f;
+    }
+    .info,
+    .bottom {
+        font-size: px(40);
+        color: #666;
+        margin-top: px(10);
+    }
+    .formula {
+        font-weight: bold;
+    }
+    .link {
+        color: #4395ff;
+    }
+    .num {
+        color: #999;
+    }
+}
+.blod {
+    font-weight: bold;
+}
+.more-text {
+    display: flex;
+    justify-content: center;
+    padding-bottom: px(60);
+    font-size: px(34);
+    color: #999;
+}
+.shop-name {
+    color: #666;
+    display: inline-block;
+    margin-left: px(10);
+    font-size: px(40);
+}
+</style>

src/pages/manage/index.vue

@@ -49,6 +49,16 @@
                     ></my-image>
                     <span class="text">优选管理</span>
                 </li>
+                <li
+                    class="item"
+                    @click="jump('/pages/bd/nav')"
+                >
+                    <my-image
+                        class="img"
+                        src="/static/icon/youxuan.png"
+                    ></my-image>
+                    <span class="text">bd管理</span>
+                </li>
                 <!-- <block v-if="storeStatus === 0 || storeStatus === 1">
                         <li
                             class="item"
@@ -81,7 +91,7 @@
 
         <!-- <button class="btn" @click="layout">退出登录</button> -->
 
-        <div class="ver">0.5.45</div>
+        <div class="ver">0.5.46</div>
         <wyg-bottom-tab
             ref="tabbar"
             :tabIndex="2"

src/pages/youxuan/order/detail.vue

@@ -81,7 +81,7 @@
                     <div class="value blod">
                         ￥{{ data.commission / 100 }}（佣金）-￥{{
                             data.pointsPrice / 100
-                        }}（积分抵扣）=￥{{ data.amount / 100 }}
+                        }}（积分抵扣）=￥{{ data.estimateComission / 100 }}
                     </div>
                 </li>
             </ul>
@@ -300,9 +300,9 @@ export default {
     li {
         display: flex;
         justify-content: flex-start;
-        align-items: center;
+        align-items: flex-start;
         font-size: px(40);
-        padding: px(10) 0;
+        padding: px(15) 0;
     }
     .key {
         color: #666;
@@ -313,6 +313,10 @@ export default {
     .key-r {
         margin-left: px(50);
     }
+    .value{
+        flex-shrink: 0;
+        margin-left: px(20);
+    }
 }
 .blod {
     font-weight: bold;

src/pages/youxuan/profit.vue

@@ -36,8 +36,8 @@
         <ul class="list">
             <li v-for="item of listData" :key="item.id">
                 <div class="top">
-                    <div class="tit">{{ item.title }}</div>
-                    <div class="money">+{{ item.amount / 100 }}</div>
+                    <div class="tit">{{ item.title }} <span class="shop-name">({{item.shopName}})</span> </div>
+                    <div class="money" :class="{green:item.type===1}">{{item.type===1?'+':'-'}}{{ item.amount / 100 }}</div>
                 </div>
                 <div class="info">
                     <div class="date">
@@ -153,7 +153,7 @@ export default {
             this.api.get("/Yx/GetProfitList", sendData).then((res) => {
                 uni.hideLoading();
                 this.listData = [...this.listData, ...res.data];
-                if (!this.listData.length) {
+                if (!res.data.length) {
                     this.dataEnd = true;
                 }
             });
@@ -230,6 +230,9 @@ export default {
     .money {
         color: #ff4b26;
     }
+    .green{
+        color: #27a34f;
+    }
     .info,
     .bottom {
         font-size: px(40);
@@ -256,4 +259,10 @@ export default {
     font-size: px(34);
     color: #999;
 }
+.shop-name{
+    color: #666;
+    display: inline-block;
+    margin-left: px(10);
+    font-size: px(40);
+}
 </style>