初始上传
This commit is contained in:
146
addon/cashier/source/os/components/ns-pend-order-popup/index.js
Executable file
146
addon/cashier/source/os/components/ns-pend-order-popup/index.js
Executable file
@@ -0,0 +1,146 @@
|
||||
import { editPendOrderRemark, deletePendOrder, getPendOrderList } from '@/api/pendorder.js';
|
||||
import { getMemberInfoById } from '@/api/member.js'
|
||||
import {mapGetters} from 'vuex';
|
||||
|
||||
export default {
|
||||
name: 'nsPendOrder',
|
||||
data() {
|
||||
return {
|
||||
orderData: {
|
||||
page: 0,
|
||||
total: 1,
|
||||
list: []
|
||||
},
|
||||
remark: '',
|
||||
index: -1,
|
||||
orderId: 0,
|
||||
isRepeat: false,
|
||||
height: ''
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
...mapGetters(['pendOrderNum'])
|
||||
},
|
||||
created() {
|
||||
this.getOrder();
|
||||
},
|
||||
mounted() {
|
||||
this.setHeight();
|
||||
},
|
||||
methods: {
|
||||
open() {
|
||||
this.$refs.pendOrderPop.open();
|
||||
},
|
||||
getOrder(page = null) {
|
||||
if (page === 0) this.orderData.page = page;
|
||||
this.orderId = 0;
|
||||
|
||||
if (this.orderData.page + 1 > this.orderData.total) return;
|
||||
|
||||
this.orderData.page++;
|
||||
|
||||
getPendOrderList({ page: this.orderData.page }).then(res => {
|
||||
if (res.code == 0) {
|
||||
if (this.orderData.page == 1) this.orderData.list = [];
|
||||
this.$store.commit('billing/setPendOrderNum', res.data.count);
|
||||
if (res.data.list.length) {
|
||||
this.orderData.total = res.data.page_count;
|
||||
this.orderData.list = this.orderData.list.concat(res.data.list);
|
||||
} else {
|
||||
this.orderData.total = 1;
|
||||
}
|
||||
this.setHeight();
|
||||
}
|
||||
});
|
||||
},
|
||||
deleteOrder(order_id) {
|
||||
if (this.isRepeat) return;
|
||||
this.isRepeat = true;
|
||||
deletePendOrder(order_id).then(res => {
|
||||
if (res.code == 0) {
|
||||
this.isRepeat = false;
|
||||
this.getOrder(0);
|
||||
}
|
||||
});
|
||||
},
|
||||
remarkConfirm() {
|
||||
let data = this.orderData.list[this.index];
|
||||
editPendOrderRemark({
|
||||
order_id: data.order_id,
|
||||
remark: this.remark
|
||||
}).then(res => {
|
||||
if (res.code == 0) {
|
||||
this.orderData.list[this.index].remark = this.remark;
|
||||
this.$refs.remarkPopup.close();
|
||||
} else {
|
||||
this.$util.showToast({
|
||||
title: '操作失败'
|
||||
});
|
||||
}
|
||||
})
|
||||
},
|
||||
remarkSetting(data, index) {
|
||||
this.index = index;
|
||||
this.remark = data.remark;
|
||||
this.$refs.remarkPopup.open();
|
||||
},
|
||||
async takeOrder(data) {
|
||||
this.orderId = data.order_id;
|
||||
//获取挂单数据的会员信息
|
||||
if (data.member_id) {
|
||||
let res = await getMemberInfoById(data.member_id);
|
||||
if (res.code == 0 && res.data) {
|
||||
this.$store.commit('app/setGlobalMemberInfo', res.data);
|
||||
} else {
|
||||
this.$store.commit('app/setGlobalMemberInfo', null);
|
||||
}
|
||||
}
|
||||
//取出挂单数据设置到展示列表
|
||||
let goodsData = {};
|
||||
data.order_goods.forEach(item => {
|
||||
if (item.goods_class == 'money') item.money = item.price;
|
||||
//item.is_adjust = true;
|
||||
var key = 'sku_' + item.sku_id;
|
||||
if (item.goods_class == 4 || item.goods_class == 6) {
|
||||
var index = 0;
|
||||
Object.keys(goodsData).forEach(k => {
|
||||
if (k.indexOf(key) != -1) {
|
||||
index++;
|
||||
}
|
||||
});
|
||||
key += '_' + index;
|
||||
}
|
||||
goodsData[key] = item;
|
||||
});
|
||||
this.$store.commit('billing/setPendOrderId', data.order_id);
|
||||
this.$store.commit('billing/setPendOrderNum', this.pendOrderNum - 1);
|
||||
this.$store.commit('billing/setGoodsData', goodsData);
|
||||
this.$store.commit('billing/setOrderData', {
|
||||
goods_list: [],
|
||||
remark: data.remark
|
||||
});
|
||||
|
||||
this.$store.commit('billing/setActive', 'SelectGoodsAfter');
|
||||
this.$refs.pendOrderPop.close();
|
||||
},
|
||||
switchStoreAfter() {
|
||||
this.orderData = {
|
||||
page: 0,
|
||||
total: 1,
|
||||
list: []
|
||||
};
|
||||
this.getOrder();
|
||||
},
|
||||
setHeight() {
|
||||
this.$nextTick(() => {
|
||||
const query = uni.createSelectorQuery()
|
||||
// #ifndef MP-ALIPAY
|
||||
.in(this)
|
||||
// #endif
|
||||
query.selectViewport().scrollOffset(data => {
|
||||
this.height = (data.scrollHeight - 51 - 67 - 15) / 100 + 'rem';
|
||||
}).exec();
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
269
addon/cashier/source/os/components/ns-pend-order-popup/index.scss
Executable file
269
addon/cashier/source/os/components/ns-pend-order-popup/index.scss
Executable file
@@ -0,0 +1,269 @@
|
||||
.container {
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.pend-order-scroll-view-wrap {
|
||||
height: calc(100% - 0.67rem) !important;
|
||||
box-sizing: border-box;
|
||||
padding-top: 0.15rem;
|
||||
padding-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.header {
|
||||
height: 0.66rem;
|
||||
line-height: 0.66rem;
|
||||
text-align: left;
|
||||
border-bottom: 0.01rem solid #e6e6e6;
|
||||
color: #303133;
|
||||
font-size: 0.14rem;
|
||||
}
|
||||
|
||||
.table-list {
|
||||
.table-item {
|
||||
border: 0.01rem solid #e6e6e6;
|
||||
padding: 0.15rem;
|
||||
position: relative;
|
||||
margin-bottom: 0.2rem;
|
||||
|
||||
.table-header-info {
|
||||
text {
|
||||
font-size: 0.16rem;
|
||||
}
|
||||
|
||||
.color {
|
||||
font-size: 0.18rem;
|
||||
color: #fe2278;
|
||||
}
|
||||
}
|
||||
|
||||
.table-header-time {
|
||||
color: #909399;
|
||||
font-size: 0.14rem;
|
||||
margin-top: 0.1rem;
|
||||
|
||||
.line {
|
||||
margin: 0 0.15rem;
|
||||
}
|
||||
}
|
||||
|
||||
.table-header-btn {
|
||||
position: absolute;
|
||||
right: 0.3rem;
|
||||
top: 0.3rem;
|
||||
color: $primary-color;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.table-content {
|
||||
margin-top: 0.1rem;
|
||||
|
||||
.table-content-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
border-bottom: 0.01rem solid #e6e6e6;
|
||||
padding: 0.1rem 0;
|
||||
|
||||
.content-item-left {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex: 1;
|
||||
width: 0;
|
||||
|
||||
.content-item-info {
|
||||
padding-right: 0.15rem;
|
||||
flex: 1;
|
||||
width: 0;
|
||||
|
||||
view {
|
||||
font-size: 0.14rem;
|
||||
}
|
||||
|
||||
.content-item-name {
|
||||
margin-bottom: 0.05rem;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
display: -webkit-box;
|
||||
-webkit-line-clamp: 2;
|
||||
line-clamp: 2;
|
||||
-webkit-box-orient: vertical;
|
||||
white-space: normal;
|
||||
word-break: break-all;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.content-item-img {
|
||||
width: 0.5rem;
|
||||
height: 0.5rem;
|
||||
margin-right: 0.1rem;
|
||||
|
||||
image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.content-item-number {
|
||||
font-size: 0.16rem;
|
||||
}
|
||||
|
||||
.content-item-price {
|
||||
font-size: 0.14rem;
|
||||
width: 40%;
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.remark-info {
|
||||
padding: 0.1rem;
|
||||
background-color: var(--primary-color-light-9);
|
||||
color: $primary-color;
|
||||
margin-top: 0.1rem;
|
||||
font-size: 0.12rem;
|
||||
}
|
||||
|
||||
.table-bottom {
|
||||
margin-top: 0.2rem;
|
||||
display: flex;
|
||||
justify-content: end;
|
||||
|
||||
button {
|
||||
width: 1rem;
|
||||
margin: 0;
|
||||
margin-right: 0.1rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/deep/ .uni-scroll-view {
|
||||
&::-webkit-scrollbar {
|
||||
width: 0.06rem;
|
||||
height: 0.06rem;
|
||||
background-color: rgba($color: #000000, $alpha: 0);
|
||||
}
|
||||
|
||||
&::-webkit-scrollbar-button {
|
||||
display: none;
|
||||
}
|
||||
|
||||
&::-webkit-scrollbar-thumb {
|
||||
border-radius: 0.06rem;
|
||||
box-shadow: inset 0 0 0.06rem rgba(45, 43, 43, 0.45);
|
||||
background-color: #ddd;
|
||||
display: none;
|
||||
}
|
||||
|
||||
&:hover::-webkit-scrollbar-thumb {
|
||||
display: block;
|
||||
}
|
||||
|
||||
&::-webkit-scrollbar-track {
|
||||
background-color: transparent;
|
||||
}
|
||||
}
|
||||
|
||||
.remark-wrap {
|
||||
width: 6rem;
|
||||
background-color: #fff;
|
||||
border-radius: 0.04rem;
|
||||
box-shadow: 0 0.01rem 0.12rem 0 rgba(0, 0, 0, 0.1);
|
||||
|
||||
.header,
|
||||
.footer {
|
||||
height: 0.5rem;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border-bottom: 0.01rem solid #e6e6e6;
|
||||
position: relative;
|
||||
|
||||
.title {
|
||||
font-size: 0.16rem;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.iconfont {
|
||||
line-height: 1;
|
||||
position: absolute;
|
||||
right: 0.15rem;
|
||||
font-size: 0.2rem;
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
|
||||
.body {
|
||||
padding: 0.15rem;
|
||||
|
||||
textarea {
|
||||
border: 0.01rem solid #e6e6e6;
|
||||
width: 100%;
|
||||
padding: 0.1rem;
|
||||
box-sizing: border-box;
|
||||
font-size: 0.14rem;
|
||||
}
|
||||
|
||||
.placeholder-class {
|
||||
font-size: 0.14rem;
|
||||
}
|
||||
}
|
||||
|
||||
.footer {
|
||||
border-top: 0.01rem solid #e6e6e6;
|
||||
border-bottom: unset;
|
||||
|
||||
button {
|
||||
width: 1rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.empty {
|
||||
text-align: center;
|
||||
padding-top: 1.2rem;
|
||||
|
||||
image {
|
||||
width: 2rem;
|
||||
}
|
||||
|
||||
.tips {
|
||||
color: #999;
|
||||
margin-top: 0.15rem;
|
||||
}
|
||||
}
|
||||
|
||||
// pop弹框
|
||||
.pop-box {
|
||||
background: #ffffff;
|
||||
width: 8rem;
|
||||
height: 7rem;
|
||||
|
||||
.pop-header {
|
||||
padding: 0 0.15rem 0 0.2rem;
|
||||
height: 0.5rem;
|
||||
line-height: 0.5rem;
|
||||
border-bottom: 0.01rem solid #f0f0f0;
|
||||
font-size: 0.14rem;
|
||||
color: #333;
|
||||
overflow: hidden;
|
||||
border-radius: 0.02rem 0.2rem 0 0;
|
||||
box-sizing: border-box;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
|
||||
.pop-header-text {}
|
||||
|
||||
.pop-header-close {
|
||||
cursor: pointer;
|
||||
|
||||
text {
|
||||
font-size: 0.18rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,95 @@
|
||||
<template>
|
||||
<view class="container pend-order">
|
||||
|
||||
<uni-popup ref="pendOrderPop">
|
||||
<view class="pop-box">
|
||||
<view class="pop-header">
|
||||
<view class="pop-header-text">挂/取单</view>
|
||||
<view class="pop-header-close" @click="$refs.pendOrderPop.close()">
|
||||
<text class="iconguanbi1 iconfont"></text>
|
||||
</view>
|
||||
</view>
|
||||
<scroll-view scroll-y="true" @scrolltolower="getOrder" class="pend-order-scroll-view-wrap" :style="{height : height}">
|
||||
<view class="table-list" v-if="orderData.list.length">
|
||||
<block v-for="(item, index) in orderData.list" :key="index">
|
||||
<view class="table-item" v-show="item.order_id != orderId">
|
||||
<view class="table-header">
|
||||
<view class="table-header-info">
|
||||
<text>订单总价：</text>
|
||||
<text class="color">￥{{ item.order_money | moneyFormat }}</text>
|
||||
</view>
|
||||
<view class="table-header-time">
|
||||
<text>挂单时间：{{ item.create_time | timeFormat }}</text>
|
||||
<block v-if="item.member_id">
|
||||
<text class="line">|</text>
|
||||
<text>会员：{{ item.nickname }}</text>
|
||||
</block>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="table-content">
|
||||
<view class="table-content-item" v-for="(goods, gindex) in item.order_goods" :key="gindex">
|
||||
<view class="content-item-left">
|
||||
<view class="content-item-img">
|
||||
<image v-if="goods.goods_class == 'money'" src="@/static/goods/goods.png"/>
|
||||
<image v-else-if="goods.goods_image == '@/static/goods/goods.png'" src="@/static/goods/goods.png"/>
|
||||
<image v-else :src="$util.img(goods.goods_image, { size: 'small' })" @error="goods.goods_image = '@/static/goods/goods.png'"/>
|
||||
</view>
|
||||
<view class="content-item-info">
|
||||
<view class="content-item-name" v-if="goods.goods_class == 'money'">无码商品</view>
|
||||
<view class="content-item-name" v-else>
|
||||
<text>{{ goods.goods_name }}</text>
|
||||
<text>{{ goods.spec_name }}</text>
|
||||
</view>
|
||||
<view>￥{{ goods.price | moneyFormat }}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="content-item-number">x {{ goods.num }}</view>
|
||||
<view class="content-item-price">￥{{ (goods.num * goods.price) | moneyFormat }}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="remark-info" v-if="item.remark">备注：{{ item.remark }}</view>
|
||||
<view class="table-bottom">
|
||||
<button class="default-btn btn-left" @click="deleteOrder(item.order_id)">删除</button>
|
||||
<button class="default-btn btn-left" @click="remarkSetting(item, index)">备注</button>
|
||||
<button class="primary-btn btn-right" @click="takeOrder(item)">取单</button>
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
<view class="empty" v-if="!orderData.list.length || (orderData.list.length == 1 && orderId)">
|
||||
<image src="@/static/goods/goods_empty.png" mode="widthFix"/>
|
||||
<view class="tips">暂无挂单记录</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
|
||||
</view>
|
||||
</uni-popup>
|
||||
<uni-popup ref="remarkPopup" type="center">
|
||||
<view class="remark-wrap">
|
||||
<view class="header">
|
||||
<text class="title">备注</text>
|
||||
<text class="iconfont iconguanbi1" @click="$refs.remarkPopup.close()"></text>
|
||||
</view>
|
||||
<view class="body">
|
||||
<textarea v-model="remark" placeholder="填写备注信息" placeholder-class="placeholder-class" />
|
||||
</view>
|
||||
<view class="footer">
|
||||
<button type="default" class="primary-btn" @click="remarkConfirm">确认</button>
|
||||
</view>
|
||||
</view>
|
||||
</uni-popup>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import index from './index.js';
|
||||
|
||||
export default {
|
||||
mixins: [index]
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@import './index.scss';
|
||||
</style>
|
||||
Reference in New Issue
Block a user