售后修改

a.txt

@@ -4,4 +4,15 @@ VUE_APP_API_BASE_URL = https://delivery.ixiaokejia.com
 三方门店ID：5424_2705880
 门店名称：t_pK0XCn0TDQ
 商家端登录账号：M35PJ_2705880
-商家端登录密码：lqHtOkG3b3
+商家端登录密码：lqHtOkG3b3
+
+
+05caf6e0-9069-4da0-9d7e-92d27ce2b7be 配送员 门店下的配送人员，该人员可登录配送助手  
+26b2d3be-be4a-489f-839b-d50fdac0f2f4 客服 客服人员  
+50c41c5d-b54c-43ed-b587-10dcb60e72e5 店铺管理员 店铺管理员用户  （切换们门店）
+731d7667-d68c-4b15-9080-4a96775a5606 门店管理员 门店管理员用户  
+75b71b24-25de-40ac-a866-c8f5555b8b92 系统管理员 管理整个系统的用户  （切换们门店） 
+bfbde5df-9922-410f-bab2-158402d3d98d 财务 财务工作人员  
+c67011ac-f79c-4d0b-a7c3-24e5b8319056 运营 运营工作人员  
+cab1e08c-c0ca-4485-9bc9-658f866be9ae 配送员 门店下的配送人员，该人员可登录配送助手  
+f68b8e48-c681-467b-af76-e1612c26d62e 主播 主播人员  

src/pages/index/index.vue

@@ -36,55 +36,133 @@
                                 v-for="(order, oindex) of orderList"
                                 :key="oindex"
                             >
-                                <div class="apply">
-                                    <div class="head">
-                                        <div class="tit">退款</div>
-                                    </div>
-                                    <section class="info-item">
-                                        <div class="coll">
-                                            <div class="coll-l coll-tit">
-                                                顾客申请部分退款
-                                            </div>
-                                            <div class="date coll-r">
-                                                11-24 10:43
-                                            </div>
-                                        </div>
-                                        <div class="coll">
-                                            <div class="coll-l">
-                                                金额：<span class="money-red">￥0.5</span>
-                                            </div>
-                                            <div class="date coll-r"></div>
+                                <black
+                                    v-if="
+                                        order.afterSaleList &&
+                                        order.afterSaleList.length
+                                    "
+                                >
+                                    <div
+                                        class="apply"
+                                        :class="{
+                                            showAll: order.showAllAfterSale,
+                                        }"
+                                    >
+                                        <div class="head">
+                                            <div class="tit">退款</div>
                                         </div>
-                                        <div class="coll">
-                                            <div class="coll-l">
-                                                商品：xxxx商品
+                                        <section
+                                            class="info-item"
+                                            v-for="afterSale of order.afterSaleList"
+                                            :key="afterSale._id"
+                                        >
+                                            <div class="coll">
+                                                <div class="coll-l coll-tit">
+                                                    {{
+                                                        afterSale.applyUser ===
+                                                        0
+                                                            ? "顾客申请"
+                                                            : ""
+                                                    }}
+                                                    {{
+                                                        afterSale.refundType ===
+                                                        0
+                                                            ? "全部退款"
+                                                            : "部分退款"
+                                                    }}
+
+                                                    <span class="status"
+                                                        >({{
+                                                            afterSale.status
+                                                                | afterSaleStatus
+                                                        }})</span
+                                                    >
+                                                </div>
+                                                <div class="date coll-r">
+                                                    {{
+                                                        afterSale.createdTime
+                                                            | timestampToDate(
+                                                                "MM-dd hh:mm"
+                                                            )
+                                                    }}
+                                                </div>
                                             </div>
-                                            <div class="good-r coll-r">
-                                                <span class="num">x1</span>
-                                                <span class="money">￥0.5</span>
+                                            <div class="coll">
+                                                <div class="coll-l">
+                                                    金额：<span
+                                                        class="money-red"
+                                                        >￥{{
+                                                            afterSale.refundAmount
+                                                                | minuteToRmb2
+                                                        }}</span
+                                                    >
+                                                </div>
+                                                <div class="date coll-r"></div>
                                             </div>
-                                        </div>
-                                        <div class="coll">
-                                            <div class="coll-l">
-                                                商品：xxxx商品
+                                            <div class="coll">
+                                                <div class="coll-l">
+                                                    商品：{{
+                                                        afterSale.productInfo
+                                                            .name
+                                                    }}
+                                                </div>
+                                                <div class="good-r coll-r">
+                                                    <span class="num">x1</span>
+                                                    <span class="money"
+                                                        >￥{{
+                                                            afterSale
+                                                                .productInfo
+                                                                .price
+                                                                | minuteToRmb2
+                                                        }}</span
+                                                    >
+                                                </div>
                                             </div>
-                                            <div class="good-r coll-r">
-                                                <span class="num">x1</span>
-                                                <span class="money">￥0.5</span>
+                                            <div
+                                                class="coll"
+                                                v-if="afterSale.applyReason"
+                                            >
+                                                <div class="coll-l">
+                                                    理由：{{
+                                                        afterSale.applyReason
+                                                    }}
+                                                </div>
+                                                <div class="coll-r"></div>
                                             </div>
-                                        </div>
-                                        <div class="coll">
-                                            <div class="coll-l">
-                                                理由：计划有变，不想要了计划有变，不想要了计划有变，不想要了计划有变，不想要了计划有变，不想要了计划有变，不想要了
+                                            <div
+                                                class="btns"
+                                                v-if="afterSale.status === 1"
+                                            >
+                                                <span
+                                                    class="btn"
+                                                    @click="applyNo(afterSale)"
+                                                    >拒绝</span
+                                                >
+                                                <span
+                                                    class="btn ok"
+                                                    @click="applyOk(afterSale)"
+                                                    >同意</span
+                                                >
                                             </div>
-                                            <div class="coll-r"></div>
+                                        </section>
+                                        <div
+                                            class="toggle"
+                                            v-if="
+                                                order.afterSaleList &&
+                                                order.afterSaleList.length > 1
+                                            "
+                                        >
+                                            <span
+                                                @click="afterSaleToggle(order)"
+                                                >{{
+                                                    order.showAllAfterSale
+                                                        ? "收起信息"
+                                                        : "展开完整售后信息"
+                                                }}</span
+                                            >
                                         </div>
-                                    </section>
-                                    <div class="btns">
-                                        <span class="btn" @click="applyNo(order)">拒绝</span>
-                                        <span class="btn ok" @click="applyOk(order)">同意</span>
                                     </div>
-                                </div>
+                                </black>
                                 <div class="order__main">
                                     <div class="order__top">
                                         <div class="des">
@@ -117,6 +195,10 @@
                                                 "
                                                 >复制</span
                                             >
+                                            <span class="order-status">{{
+                                                order.orderInfo.status
+                                                    | orderStatus
+                                            }}</span>
                                         </div>
                                     </div>
                                     <div class="tags">
@@ -193,8 +275,18 @@
                                     备注：{{ order.orderInfo.description }}
                                 </div>
                                 <div class="tools">
-                                    <div class="oper">
-                                        <span class="oper-btn">取消订单</span>
+                                    <!-- afterSaleStatus 根据售后信息里RefundType字段判断手动加的值 -->
+                                    <div
+                                        class="oper"
+                                        v-if="order.afterSaleStatus !== 'all'"
+                                    >
+                                        <!-- 只要有一条售后就不能申请取消订单 -->
+                                        <span
+                                            class="oper-btn"
+                                            @click="cancelOrder(order)"
+                                            v-if="!order.noShowCancelOrder"
+                                            >取消订单</span
+                                        >
                                         <span
                                             class="oper-btn"
                                             @click="refund(order)"
@@ -219,18 +311,14 @@
                                                 <div class="goods__left">
                                                     <my-image
                                                         class="goods__img"
-                                                        :src="
-                                                            good.orderItem
-                                                                .productImage
-                                                        "
+                                                        :src="good.productImage"
                                                     ></my-image>
                                                     <div class="goods__info">
                                                         <div
                                                             class="goods__title"
                                                         >
                                                             {{
-                                                                good.orderItem
-                                                                    .productName ||
+                                                                good.productName ||
                                                                 ""
                                                             }}
                                                         </div>
@@ -238,8 +326,7 @@
                                                             class="goods__spec"
                                                         >
                                                             {{
-                                                                good.orderItem
-                                                                    .skuName ||
+                                                                good.skuName ||
                                                                 ""
                                                             }}
                                                         </div>
@@ -248,15 +335,14 @@
                                                 <div class="goods__right">
                                                     <div class="goods__price">
                                                         ¥{{
-                                                            good.orderItem.price
+                                                            good.price
                                                                 | minuteToRmb
                                                         }}
                                                     </div>
                                                     <div class="goods__num">
                                                         {{
                                                             "X" +
-                                                            (good.orderItem
-                                                                .count || "0")
+                                                            (good.count || "0")
                                                         }}
                                                     </div>
                                                 </div>
@@ -413,6 +499,64 @@ export default {
             sTime += instantDelivery + reserveReceivingOrdersTime;
             return fn.getDateFormat(new Date(sTime), "MM-dd hh:mm");
         },
+
+        afterSaleStatus(v) {
+            switch (v) {
+                case 1:
+                    return "退款审核中";
+                case 2:
+                    return "等待商家退款";
+                case 3:
+                    return "退款完成";
+                case 4:
+                    return "退款取消";
+                case 5:
+                    return "退货审核中";
+                case 6:
+                    return "退货取消";
+                case 7:
+                    return "退货完成";
+                case 8:
+                    return "等待买家退货";
+                case 9:
+                    return "等待确认收货";
+                case 10:
+                    return "已拒绝";
+                default:
+                    return "未知";
+            }
+        },
+
+        orderStatus(v) {
+            let obj = {
+                2: "待支付",
+                3: "待发货",
+                4: "待收货",
+                5: "拼团中",
+                6: "已取消",
+                7: "售后中",
+                8: "已删除",
+                9: "已完成",
+                10: "已评价",
+                11: "已售后",
+                12: "已退款",
+                20: "待接单",
+                21: "拣货中",
+                22: "拣货完成",
+                23: "待配送",
+                24: "配送中",
+                25: "已送达",
+                26: "待提货",
+                27: "已提货",
+                31: "订单已推单",
+                32: "订单已被骑手接单",
+                33: "骑手已到店",
+                34: "骑手已取餐",
+                35: "订单完成",
+                36: "订单失败",
+            };
+            return obj[v] || "未知";
+        },
     },
 
     async onShow() {
@@ -484,6 +628,7 @@ export default {
                     // self.list[1].num = data.countInfo.unpaidOrderCount
                     // self.list[2].num = data.countInfo.waitShippedOrderCount
                     // self.list[3].num = data.countInfo.waitReceivedOrderCount
+                    data = this.afterSaleFactory(data);
                     self.list[self.tab].list = data;
                     self.loading = true;
                     uni.hideLoading();
@@ -505,7 +650,7 @@ export default {
                     if (data.length) {
                         self.list[self.tab].page++;
                     }
-
+                    data = this.afterSaleFactory(data);
                     // self.list[1].num = data.countInfo.unpaidOrderCount;
                     // self.list[2].num = data.countInfo.waitShippedOrderCount;
                     // self.list[3].num = data.countInfo.waitReceivedOrderCount;
@@ -515,6 +660,26 @@ export default {
                 });
         },
 
+        // 售后处理
+        afterSaleFactory(data) {
+            for (let item of data) {
+                //判断是否有售货
+                if (item.afterSaleList && item.afterSaleList.length) {
+                    let obj = {
+                        expire: [],
+                        now: [],
+                    };
+                    item.noShowCancelOrder = true;
+                    for (let afterSale of item.afterSaleList) {
+                        if (afterSale.refundType === 0) {
+                            item.afterSaleStatus = "all";
+                        }
+                    }
+                }
+            }
+            return data;
+        },
+
         // 打电话
         makePhone(val) {
             if (!val.orderInfo.mobile) {
@@ -540,8 +705,8 @@ export default {
                 .then((res) => {
                     if (res.success) {
                         this.fn.showToast("接单成功");
-                        this.orderList.splice(index, 1);
-                        this.orderList = [...this.orderList];
+                        this.list[this.tab].list.splice(index, 1);
+                        this.list = [...this.list];
                     } else {
                         this.fn.showToast("接单失败：" + res.message);
                     }
@@ -562,8 +727,8 @@ export default {
                 .then((res) => {
                     if (res.success) {
                         this.fn.showToast("打包完成功");
-                        this.orderList.splice(index, 1);
-                        this.orderList = [...this.orderList];
+                        this.list[this.tab].list.splice(index, 1);
+                        this.list = [...this.list];
                     } else {
                         this.fn.showToast("打包完失败：" + res.message);
                     }
@@ -584,8 +749,8 @@ export default {
                 .then((res) => {
                     if (res.success) {
                         this.fn.showToast("提货成功");
-                        this.orderList.splice(index, 1);
-                        this.orderList = [...this.orderList];
+                        this.list[this.tab].list.splice(index, 1);
+                        this.list = [...this.list];
                     } else {
                         this.fn.showToast("提货失败：" + res.message);
                     }
@@ -606,8 +771,8 @@ export default {
                 .then((res) => {
                     if (res.success) {
                         this.fn.showToast("配送中成功");
-                        this.orderList.splice(index, 1);
-                        this.orderList = [...this.orderList];
+                        this.list[this.tab].list.splice(index, 1);
+                        this.list = [...this.list];
                     } else {
                         this.fn.showToast("配送中失败：" + res.message);
                     }
@@ -628,8 +793,8 @@ export default {
                 .then((res) => {
                     if (res.success) {
                         this.fn.showToast("送达成功");
-                        this.orderList.splice(index, 1);
-                        this.orderList = [...this.orderList];
+                        this.list[this.tab].list.splice(index, 1);
+                        this.list = [...this.list];
                     } else {
                         this.fn.showToast("送达失败：" + res.message);
                     }
@@ -676,19 +841,98 @@ export default {
             });
         },
 
-        // 拒绝退款
-        applyNo(val){
+        // 取消订单
+        cancelOrder(val) {
+            if (val.loading) {
+                return;
+            }
+            val.loading = true;
+            uni.showLoading({
+                title: "提交中...",
+                mask: true,
+            });
+            this.api
+                .post(
+                    "/Order/Refund",
+                    {
+                        query: true,
+                        orderId: val.orderInfo.id,
+                    },
+                    { pass: true }
+                )
+                .then((res) => {
+                    uni.hideLoading();
+                    val.loading = false;
+                    if (res.success) {
+                        this.fn.showToast("取消成功");
+                        this.list[this.tab].list.splice(index, 1);
+                        this.list = [...this.list];
+                    } else {
+                        this.fn.showToast("取消失败：" + res.message);
+                    }
+                });
+        },
 
+        // 拒绝退款
+        applyNo(val) {
+            if (val.loading) {
+                return;
+            }
+            val.loading = true;
+            this.api
+                .post(
+                    "/Order/RejectRefund",
+                    {
+                        query: true,
+                        orderId: val.id,
+                    },
+                    { pass: true }
+                )
+                .then((res) => {
+                    val.loading = false;
+                    if (res.success) {
+                        this.fn.showToast("操作成功");
+                        this.getList();
+                    } else {
+                        this.fn.showToast("操作失败：" + res.message);
+                    }
+                });
         },
 
         // 同意退款
-        applyOk(val){
-
+        applyOk(val) {
+            if (val.loading) {
+                return;
+            }
+            val.loading = true;
+            this.api
+                .post(
+                    "/Order/AgreeRefund",
+                    {
+                        query: true,
+                        orderId: val.id,
+                    },
+                    { pass: true }
+                )
+                .then((res) => {
+                    val.loading = false;
+                    if (res.success) {
+                        this.fn.showToast("操作成功");
+                        this.getList();
+                    } else {
+                        this.fn.showToast("操作失败：" + res.message);
+                    }
+                });
         },
 
         goShopSelect() {
             this.router.push("/pages/index/select");
         },
+
+        afterSaleToggle(val) {
+            val.showAllAfterSale = !val.showAllAfterSale;
+            this.list = [...this.list];
+        },
     },
 
     // 数据计算
@@ -864,6 +1108,7 @@ page {
         align-items: center;
         .des {
             font-size: px(40);
+            width: 100%;
             span {
                 color: #666;
             }
@@ -889,6 +1134,9 @@ page {
             border-radius: px(5);
         }
     }
+    .order-status {
+        float: right;
+    }
     .tags {
         margin-top: px(20);
         .tag {
@@ -1207,7 +1455,12 @@ page {
 .apply {
     padding: px(40);
     border-bottom: 1px dashed #f1f1f1;
-    background-color: #f6f6f6;
+    background-color: #fcfcfc;
+    &.showAll {
+        .info-item {
+            display: block !important;
+        }
+    }
     .head {
         display: flex;
         justify-content: space-between;
@@ -1218,8 +1471,11 @@ page {
         }
     }
     .info-item {
-        border-bottom: 1px solid #e9e9e9;
+        border-bottom: 1px solid #f1f1f1;
         padding: px(15) 0;
+        & ~ .info-item {
+            display: none;
+        }
         .coll {
             display: flex;
             justify-content: space-between;
@@ -1229,41 +1485,51 @@ page {
             padding: px(0) px(30);
             margin-top: px(20);
         }
-        .coll-tit{
+        .coll-tit {
             color: #333;
             font-size: px(44);
+            .status {
+                display: inline-flexbox;
+                margin-left: px(30);
+            }
         }
-        .good-r{
-            .money{
+        .good-r {
+            .money {
                 display: inline-flex;
                 width: px(200);
                 justify-content: flex-end;
             }
         }
     }
-    .btns{
+    .btns {
         display: flex;
         justify-content: space-between;
         align-items: center;
         margin-top: px(30);
-        .btn{
+        .btn {
             width: 45%;
             height: px(100);
-            border:1px solid #cacaca;
+            border: 1px solid #cacaca;
             border-radius: px(50);
             font-size: px(44);
             text-align: center;
             line-height: px(100);
             background-color: #fff;
         }
-        .ok{
+        .ok {
             background-color: #ff4b26;
             border-color: #ff4b26;
             color: #fff;
         }
     }
+    .toggle {
+        margin-top: px(20);
+        font-size: px(40);
+        text-align: right;
+        color: #3582fb;
+    }
 }
-.money-red{
+.money-red {
     color: #ff475f;
 }
 </style>

src/pages/index/refund.vue

@@ -8,28 +8,29 @@
                     class="item"
                     v-for="(item, index) of orderData.orderItems"
                     :key="index"
+                    :class="{ invalid: item.invalid }"
                 >
                     <div class="check">
-                        <checkbox class="checkbox" :value="item.orderItem.id" />
+                        <checkbox
+                            v-if="!item.invalid"
+                            class="checkbox"
+                            :value="item.id"
+                        />
                     </div>
                     <div class="info">
                         <my-image
-                            :src="item.orderItem.productImage"
+                            :src="item.productImage"
                             class="img"
                         ></my-image>
                         <div class="data">
                             <div class="tit">
-                                {{ item.orderItem.productName }}
+                                {{ item.productName }}
                             </div>
                             <div class="des">
                                 <span class="price"
-                                    >￥{{
-                                        item.orderItem.price | minuteToRmb
-                                    }}</span
-                                >
-                                <span class="num"
-                                    >x {{ item.orderItem.count }}</span
+                                    >￥{{ item.price | minuteToRmb }}</span
                                 >
+                                <span class="num">x {{ item.count }}</span>
                             </div>
                         </div>
                     </div>
@@ -39,7 +40,7 @@
         <div class="refund-info">
             <div class="head">
                 <div class="tit">退款金额</div>
-                <div class="money">￥0</div>
+                <div class="money">￥{{ refundNum | minuteToRmb}}</div>
             </div>
             <!-- <div class="des">
                 备注：
@@ -70,7 +71,7 @@ export default {
     // 数据
     data() {
         return {
-            orderData: null,
+            orderData: {},
             radioList: [
                 { key: "商品已售完", value: "商品已售完" },
                 { key: "店铺太忙", value: "店铺太忙" },
@@ -78,12 +79,13 @@ export default {
             ],
             curReason: "",
             curGoodItemIds: [],
+            submitLoading: false,
         };
     },
 
     onLoad() {
         let curOrder = this.$store.state.common.curOrder;
-        this.orderData = curOrder;
+        this.orderData = this.initData(curOrder);
         console.log(curOrder);
         this.$store.commit("common/update", {
             curOrder: null,
@@ -95,6 +97,30 @@ export default {
     async onShow() {},
     // 函数
     methods: {
+        // 初始化订单数据
+        initData(data) {
+            let d = JSON.parse(JSON.stringify(data));
+            console.log(d);
+            //没有现有售后则不处理
+            if (!d.afterSaleList) {
+                return d;
+            }
+            // 判断订单项是否已经申请过
+            let num = 0;
+            for (let orderItem of d.orderItems) {
+                for (let afterSale of d.afterSaleList) {
+                    if (afterSale.orderInfo.orderItemId === orderItem.id) {
+                        orderItem.invalid = true;
+                        num += 1;
+                    }
+                }
+            }
+            d.validItemNum = d.orderItems.length - num;
+            console.log(d.validItemNum);
+            d.orderItems.sort((a, b) => (a.invalid ? 1 : -1));
+            return d;
+        },
+
         radioChange(e) {
             this.curReason = e.detail.value;
         },
@@ -103,23 +129,36 @@ export default {
         },
 
         submit() {
+            if (this.submitLoading) {
+                return;
+            }
             if (this.curGoodItemIds.length === 0) {
                 return this.fn.showToast("请选择退货项");
             }
-            if (this.curGoodItemIds.length === this.orderData.orderItems.length) {
+            if (this.curGoodItemIds.length === this.orderData.validItemNum) {
                 return this.fn.showToast("全部退款请选择取消订单");
             }
             if (!this.curReason) {
                 return this.fn.showToast("请选择退货原因");
             }
             let sendData = {
-                orderItemIds:this.curGoodItemIds,
-                reason:this.curReason,
-                remark:this.curReason,
-            }
-            this.api.post('/order/PartialRefundApply',sendData).then(res=>{
-
-            })
+                orderItemIds: this.curGoodItemIds,
+                reason: this.curReason,
+                remark: this.curReason,
+            };
+            this.submitLoading = true;
+            uni.showLoading({
+                title: "提交中...",
+                mask:true
+            });
+            this.api.post("/order/PartialRefundApply", sendData,{pass: true}).then((res) => {
+                uni.hideLoading();
+                this.submitLoading = false;
+                if (res.success) {
+                    this.fn.showToast('提交成功');
+                    this.router.back();
+                }
+            });
         },
     },
 
@@ -128,6 +167,17 @@ export default {
         user() {
             return this.$store.state.user.user;
         },
+        refundNum(){
+            let num = 0;
+            for(let id of this.curGoodItemIds){
+                for(let item of this.orderData.orderItems){
+                    if(item.id === id ){
+                        num+=item.price;
+                    }
+                }
+            }
+            return num;
+        }
     },
 
     // 数据监听
@@ -179,6 +229,9 @@ export default {
         align-items: center;
         padding: px(40) 0;
         border-bottom: 1px solid #f1f1f1;
+        &.invalid {
+            background-color: #efefef;
+        }
     }
     .check {
         width: px(100);

src/pages/manage/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="page">
-        <div class="page__top" v-if="user.isAdmin">
+        <div class="page__top" v-if="isAdmin">
             <div class="name">当前门店：</div>
             <div class="shop" v-if="!hideShop" @click="goShopSelect">
                 <div class="shop__name">
@@ -76,7 +76,7 @@ export default {
     onLoad() {},
     async onShow() {
         console.log(this.user);
-        if (this.user.isAdmin) {
+        if (this.isAdmin) {
             this.curShop = {
                 name: this.user.storeName,
                 id: this.user.storeId,
@@ -143,6 +143,16 @@ export default {
         user() {
             return this.$store.state.user.user;
         },
+        isAdmin() {
+            if (
+                this.user.roleId === "50c41c5d-b54c-43ed-b587-10dcb60e72e5" ||
+                this.user.roleId === "75b71b24-25de-40ac-a866-c8f5555b8b92"
+            ) {
+                return true;
+            } else {
+                return false;
+            }
+        },
     },
 
     // 数据监听

src/pages/manage/statistics/order.vue

@@ -171,6 +171,7 @@ export default {
                 .then((res) => {
                     uni.hideLoading();
                     for (let item of res.data) {
+                        item.refundAmount /= 100;
                         item.saleAmount /= 100;
                     }
                     this.dataList = res.data;