资金结算

src/common/js/plugin.js

@@ -258,7 +258,7 @@ export default {
                                 router.push({
                                     path: "/pages/index/login",
                                 });
-
+                                return;
                             }
                         } else {
                             store.commit("user/logout", null);

src/common/js/share.js

@@ -7,7 +7,7 @@ export default {
                 title: "供应管理端",
                 path: "/pages/index/login",
                 imageUrl:
-                    "https://oss.ixiaokejia.com/images/common/share_login.jpg",
+                    "https://oss.ixiaokejia.com/images/common/share_login2.jpg",
             }
         }
     },

src/pages.json

@@ -161,6 +161,12 @@
             "style": {
                 "navigationBarTitleText": "快递单号"
             }
+        },
+        {
+            "path": "pages/manage/income",
+            "style": {
+                "navigationBarTitleText": "资金结算"
+            }
         }
     ]
 }

src/pages/index/index.vue

@@ -48,12 +48,13 @@
                                         <ul class="info-list">
                                             <li>店铺：{{ order.shopName }}</li>
                                             <li>
-                                                商品代码：<span class="link" @click="
+                                                商品代码：<span
+                                                    class="link"
+                                                    @click="
                                                         copy(order.productCode)
-                                                    ">
-                                                    {{
-                                                    order.productCode
-                                                }}
+                                                    "
+                                                >
+                                                    {{ order.productCode }}
                                                 </span>
                                                 <span
                                                     class="copy"
@@ -80,6 +81,13 @@
                                         </div>
                                         <p class="order__des">
                                             {{ order.receiverAddress }}
+                                            <span
+                                                class="copy"
+                                                @click="
+                                                    copyAddress(order)
+                                                "
+                                                >复制</span
+                                            >
                                         </p>
                                     </div>
                                 </div>
@@ -148,7 +156,10 @@
                                     </div>
                                     <div
                                         class="btn"
-                                        v-if="order.status !== 6 && order.status !== 12"
+                                        v-if="
+                                            order.status !== 6 &&
+                                            order.status !== 12
+                                        "
                                         @click="cancelOrder(order)"
                                     >
                                         取消订单
@@ -398,15 +409,16 @@ export default {
                 })
                 .then((modalRes) => {
                     if (modalRes.confirm) {
-                        let sendData = {
-                            id: val._id,
-                            query: true,
-                        };
+                        uni.showLoading({
+                            title: "处理中...",
+                            mask: true,
+                        });
                         this.api
                             .get("/Supplier/ConfirmOrder", {
                                 id: order.id,
                             })
                             .then((res) => {
+                                uni.hideLoading();
                                 if (res.success) {
                                     this.fn.showToast("确认订单成功");
                                     this.getList();
@@ -429,15 +441,16 @@ export default {
                 })
                 .then((modalRes) => {
                     if (modalRes.confirm) {
-                        let sendData = {
-                            id: val._id,
-                            query: true,
-                        };
+                        uni.showLoading({
+                            title: "处理中...",
+                            mask: true,
+                        });
                         this.api
                             .get("/Supplier/CancelOrder", {
                                 id: order.id,
                             })
                             .then((res) => {
+                                uni.hideLoading();
                                 if (res.success) {
                                     this.fn.showToast("取消订单成功");
                                     this.getList();
@@ -454,13 +467,13 @@ export default {
         },
 
         // 填写快递单号
-        fillDeliveryOrder(val){
+        fillDeliveryOrder(val) {
             this.router.push({
-                path:'/pages/index/order-delivery-form',
-                query:{
-                    orderId:val.id
-                }
-            })
+                path: "/pages/index/order-delivery-form",
+                query: {
+                    orderId: val.id,
+                },
+            });
         },
 
         // 复制
@@ -475,7 +488,18 @@ export default {
             });
         },
 
-        
+        // 复制
+        copyAddress(order) {
+            let str = `${order.receiverName}，${order.receiverMobile}，${order.receiverAddress}`;
+            const self = this;
+
+            uni.setClipboardData({
+                data: str,
+                success: () => {
+                    self.fn.showToast("复制成功");
+                },
+            });
+        },
     },
 
     // 数据计算
@@ -1204,7 +1228,7 @@ page {
 .link {
     color: #3582fb !important;
 }
-.active-btn{
+.active-btn {
     color: #52c41a;
 }
 </style>

src/pages/index/order-delivery-form.vue

@@ -10,6 +10,7 @@
                     <picker
                         :mode="'selector'"
                         :range="expressList"
+                        range-key="name"
                         @change="expressChange($event)"
                     >
                         <input
@@ -64,12 +65,22 @@ export default {
     methods: {
         getExpressCompanyList() {
             this.api.get("/Supplier/GetExpressCompanyList", {}).then((res) => {
-                this.expressList = res.data;
+                let arr = [];
+                for (let item of res.data) {
+                    arr.push({
+                        label: item.name,
+                        value: item.name,
+                        name: item.name,
+                        reg_mail_no: item.reg_mail_no,
+                    });
+                }
+                this.expressList = arr;
+                // for(let)
             });
         },
         expressChange(e) {
             let index = e.detail.value;
-            let val = this.expressList[index];
+            let val = this.expressList[index].name;
             this.form.expressName = val;
         },
         saveOk() {
@@ -82,6 +93,19 @@ export default {
             if (!this.form.expressNo) {
                 return this.fn.showToast("请输入快递单号");
             }
+            // 判断快递单号正则
+            let curExpress = {};
+            for (let item of this.expressList) {
+                if (item.name === this.form.expressName) {
+                    curExpress = item;
+                }
+            }
+            if (curExpress.reg_mail_no) {
+                let reg = new RegExp(curExpress.reg_mail_no);
+                if (!reg.test(this.form.expressNo)) {
+                    return this.fn.showToast("快递单号不正确");
+                }
+            }
             uni.showLoading({
                 title: "提交中...",
                 mask: true,

src/pages/manage/income.vue

@@ -0,0 +1,323 @@
+<template>
+    <div class="page">
+        <div class="profit-info">
+            <div class="item">
+                <h6 class="tit">余额</h6>
+                <div class="money green" v-if="dataInfo">
+                    {{ dataInfo.balance / 100 }}
+                </div>
+            </div>
+            <div class="item">
+                <h6 class="tit">待结算金额</h6>
+                <div class="money green" v-if="dataInfo">
+                    {{ dataInfo.waitingSettleAmount / 100 }}
+                </div>
+            </div>
+        </div>
+
+        <div class="filter">
+            <span class="key">时间：</span>
+            <picker
+                mode="date"
+                @change="dateChange($event, 'startDate')"
+                :end="filter.endDate || endDate"
+                ><input
+                    class="value"
+                    placeholder="开始日期"
+                    :disabled="true"
+                    v-model="filter.startDate"
+            /></picker>
+            <span class="row">至</span>
+            <picker
+                mode="date"
+                @change="dateChange($event, 'endDate')"
+                :start="filter.startDate"
+                :end="endDate"
+                ><input
+                    class="value"
+                    placeholder="结束日期"
+                    :disabled="true"
+                    v-model="filter.endDate"
+            /></picker>
+        </div>
+
+        <ul class="list">
+            <h1 class="list-tit">账单列表</h1>
+            <li v-for="item of listData" :key="item.id">
+                <div class="other">
+                    <div class="title">
+                        {{ item.title }}
+                        <span class="shop">({{ item.shopName }})</span>
+                    </div>
+                    <div class="time">
+                        {{ item.createdTime | dateFormat("yyyy-MM-dd hh:mm") }}
+                    </div>
+                </div>
+                <div class="other">
+                    <div class="status">
+                        {{ item.type | minaBillType }}({{
+                            item.status === 0 ? "未结算" : "已结算"
+                        }})
+                    </div>
+                    <div class="money">￥{{ item.amount / 100 }}</div>
+                </div>
+                <div class="good-main">
+                    <div class="img">
+                        <my-image :src="item.productImage"></my-image>
+                    </div>
+                    <div class="info">
+                        <h2 class="good-name">{{ item.productName }}</h2>
+                    </div>
+                </div>
+            </li>
+        </ul>
+        <div class="more-text" v-if="dataEnd">- 没有更多数据了 -</div>
+    </div>
+</template>
+
+<script>
+let minaBillTypeEnum = {
+    1: "充值",
+    2: "消费",
+    3: "退款",
+    4: "收益",
+    5: "收益返还",
+    6: "提现",
+    7: "收入",
+    8: "优选佣金",
+    9: "优选佣金返还",
+    10: "BD佣金",
+    11: "BD佣金返还",
+    12: "BDM佣金",
+    13: "BDM佣金返还",
+};
+import MyImage from "../../components/image/index";
+export default {
+    name: "",
+    components: { MyImage },
+    filters: {
+        minaBillType(v) {
+            return minaBillTypeEnum[v];
+        },
+    },
+    // 数据
+    data() {
+        return {
+            filter: {
+                startDate: "",
+                endDate: "",
+            },
+            pageIndex: 1,
+            dataEnd: false,
+            listData: [],
+            dataInfo: null,
+            endDate: "",
+        };
+    },
+    onShow() {},
+
+    onLoad() {
+        this.getList();
+        this.getInfo();
+        this.endDate = this.fn.dateFormat2(new Date());
+    },
+    onPullDownRefresh() {
+        this.getList(true);
+        this.getInfo();
+    },
+    onReachBottom() {
+        this.getMoreList();
+    },
+
+    // 函数
+    methods: {
+        getInfo() {
+            this.api.get("/Supplier/GetIncomeInfo").then((res) => {
+                this.dataInfo = res.data;
+            });
+        },
+
+        getList(isPull) {
+            uni.showLoading({
+                title: "加载中...",
+            });
+            this.pageIndex = 1;
+            this.dataEnd = false;
+            let sendData = {
+                pageIndex: this.pageIndex++,
+            };
+            if (this.filter.startDate) {
+                sendData.startTime = this.filter.startDate;
+            }
+            if (this.filter.endDate) {
+                sendData.endTime = this.filter.endDate;
+            }
+            this.api.get("/Supplier/GetBillList", 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++,
+            };
+            if (this.filter.startDate) {
+                sendData.startTime = this.filter.startDate;
+            }
+            if (this.filter.endDate) {
+                sendData.endTime = this.filter.endDate;
+            }
+            this.api.get("/Supplier/GetBillList", sendData).then((res) => {
+                uni.hideLoading();
+                this.listData = [...this.listData, ...res.data];
+                if (!res.data.length) {
+                    this.dataEnd = true;
+                }
+            });
+        },
+
+        dateChange(e, name) {
+            this.filter[name] = e.detail.value;
+            this.getList();
+        },
+    },
+
+    // 数据计算
+    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;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .item {
+        width: 50%;
+    }
+    .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;
+    .list-tit {
+        font-size: px(50);
+        text-align: center;
+        padding: px(30) 0;
+    }
+    li {
+        border-bottom: 2px solid #f1f1f1;
+        padding: px(30) px(40);
+    }
+    .other {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: px(10) 0;
+        .title {
+            font-size: px(44);
+            .shop {
+                font-size: px(40);
+                color: #999;
+            }
+        }
+        .time {
+            font-size: px(42);
+        }
+            .money {
+                color: #ff4b26;
+            }
+    }
+    .good-main {
+        display: flex;
+        align-items: stretch;
+        justify-content: space-between;
+        background-color: #f9f9f9;
+        padding: px(10);
+        margin-top: px(20);
+        .img {
+            width: px(250);
+            height: px(250);
+            margin-right: px(30);
+            flex-shrink: 0;
+            /deep/ img {
+                width: px(250);
+                height: px(250);
+            }
+        }
+        .info {
+            .good-name {
+                font-size: px(42);
+                @include omits(2);
+            }
+        }
+    }
+}
+.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);
+}
+.green {
+    color: #27a34f !important;
+}
+.red {
+    color: #f85e5e !important;
+}
+</style>

src/pages/manage/index.vue

@@ -3,13 +3,13 @@
         <manage-nav :shopId="shopId" :title="'菜单'"></manage-nav>
         <div>
             <ul class="menu">
-                <!-- <li class="item" @click="jump('/pages/manage/user/index')">
+                <li class="item" @click="jump('/pages/manage/user/index')">
                     <my-image
                         class="img"
                         src="/static/icon/user.png"
                     ></my-image>
                     <span class="text">账号管理</span>
-                </li> -->
+                </li>
                 <li class="item" @click="jump('/pages/yx/classify')">
                     <my-image
                         class="img"
@@ -24,7 +24,7 @@
                     ></my-image>
                     <span class="text">活动管理</span>
                 </li>
-                <!-- <li class="item">
+                <li class="item" @click="jump('/pages/manage/income')">
                     <my-image
                         class="img"
                         src="/static/icon/cashier.png"
@@ -34,10 +34,10 @@
                 <li class="item">
                     <my-image
                         class="img"
-                        src="/static/icon/bd.png"
+                        src="/static/icon/cashier-list.png"
                     ></my-image>
-                    <span class="text">售后处理</span>
-                </li> -->
+                    <span class="text">提现</span>
+                </li>
                 <!-- <li class="item" @click="jump('/pages/yx/order/index')">
                     <my-image
                         class="img"
@@ -48,9 +48,9 @@
             </ul>
         </div>
 
-        <button class="btn" @click="layout">退出登录</button>
+        <!-- <button class="btn" @click="layout">退出登录</button> -->
 
-        <div class="ver">0.0.11</div>
+        <div class="ver">0.0.13</div>
     </div>
 </template>
 

src/pages/manage/user/index.vue

@@ -1,13 +1,6 @@
 <template>
     <div class="page">
         <ul class="list">
-            <!-- <li class="item" v-for="item of menuList" :key="item.id" @click="jump(item.url)">
-                <div class="name">{{item.name}}</div>
-                <my-image
-                    class="arrow"
-                    src="/static/common/arrows_left.png"
-                ></my-image>
-            </li> -->
             <li class="item" @click="jump('/pages/manage/user/info')">
                 <div class="name">账号信息</div>
                 <my-image
@@ -29,20 +22,6 @@
                     src="/static/common/arrows_left.png"
                 ></my-image>
             </li>
-            <!-- <button open-type="share" class="item" id="2">
-                <div class="name">邀请团长</div>
-                <my-image
-                    class="arrow"
-                    src="/static/common/arrows_left.png"
-                ></my-image>
-            </button>
-            <button open-type="share" class="item" id="1">
-                <div class="name">邀请区区购团长</div>
-                <my-image
-                    class="arrow"
-                    src="/static/common/arrows_left.png"
-                ></my-image>
-            </button> -->
         </ul>
         <button class="btn" @click="layout">退出登录</button>
     </div>
@@ -58,17 +37,11 @@ export default {
     data() {
         return {
             curShop: {},
-            menuList: [],
         };
     },
 
     onLoad() {
-        let appMenuList = this.$store.state.user.menuList;
-        for (let item of appMenuList) {
-            if (item.id === "mobile_statistic") {
-                this.menuList = item.children;
-            }
-        }
+        
     },
     async onShow() {},
     // 函数
@@ -77,7 +50,6 @@ export default {
             this.$store.commit("user/logout", null);
             this.router.push({
                 path: "/pages/index/login",
-                isTabBar: true,
             });
         },
     },