mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
DESKTOP-GMUNQ1B\k 2024-04-20 15:23:06 +08:00
parent c6034c4ae4
commit d8b90ee847
6 changed files with 142 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/admin.js
View File

@ -17,6 +17,16 @@ export function delivery(data) {
return request.post(`admin/${data.mer_id}/delivery/${data.order_id}`, data); return request.post(`admin/${data.mer_id}/delivery/${data.order_id}`, data);
} }
/**
* 查询暂存订单
* @returns {*}
*/
export function lockList(data, merid) {
return request.get(`admin/${merid}/lock_list`, data);
}
/** /**
* 统计数据 * 统计数据
*/ */

91
pages/admin/orderList/index.vue
View File

@ -35,6 +35,9 @@
<view class="item" :class="where.status == 6 ? 'on' : ''" @click="changeStatus(6)"> <view class="item" :class="where.status == 6 ? 'on' : ''" @click="changeStatus(6)">
退款 退款
</view> </view>
<view class="item" :class="where.status == 7 ? 'on' : ''" @click="changeStatus(7)">
暂存
</view>
</scroll-view> </scroll-view>
</view> </view>
@ -97,6 +100,64 @@
</view> </view>
</view> </view>
</view> </view>
<view v-else-if="(where.status == 7)" class="list">
<block v-for="(item, index) in list" :key="index">
<view class="item" v-if="item.order && item.order.length > 0">
<view class="order-num acea-row row-middle">
暂存单号：{{ item.order && item.order[0] && item.order[0].order_sn }}
<text class="time">暂存时间：{{ item.order && item.order[0] && item.order[0].create_time }}</text>
</view>
<view class="pos-order-goods" v-for="(val, key) in item.order[0].orderProduct" :key="key"
@click="toDetail(item)">
<view class="goods acea-row row-between-wrapper" v-if="val.cart_info && val.cart_info.product">
<view class="picTxt acea-row row-between-wrapper">
<view class="pictrue">
<image :src="val.cart_info.product.image || val.cart_info.productAttr.image" />
</view>
<view class="text acea-row row-between row-column">
<view class="info line1 refund-info">
{{ val.cart_info.product.store_name }}
</view>
<view class="attr" v-if="val.cart_info.productAttr.sku">
{{ val.cart_info.productAttr.sku }}
</view>
<view class="y-money refund-y-money">
价格：￥{{ val.cart_info.product.price }}
</view>
</view>
</view>
<view class="money refund-money">
<view class="num">x{{ item.order[0].total_num }}</view>
</view>
</view>
</view>
<view class="item-status">
<text v-if="item.status == -1" class="iconfont icon-yijujue1"></text>
<text v-if="item.status == 0" class="iconfont icon-tuikuanzhong on"></text>
<text v-if="item.status == 1 || item.status == 2" class="iconfont icon-tuihuozhong on"></text>
<text v-if="item.status == 3" class="iconfont icon-yituikuan1"></text>
<text v-if="item.status == -2" class="iconfont icon-yiquxiao"></text>
</view>
<view class="operation acea-row row-between-wrapper">
<view class="more">
</view>
<view class="acea-row row-middle">
<!-- <view class="bnt" @click="refundModify(item, 1)">订单备注</view>
<navigator class="bnt bnt_color" v-if="item.status == 0"
:url="'/pages/admin/orderRefund/index?id='+item.refund_order_id+'&merId='+merId">立即退款
</navigator>
<navigator class="bnt" v-if="item.status == 2"
:url="'/pages/users/goods_logistics/index?refundId='+item.refund_order_id+'&merId='+merId">
查看物流
</navigator>
<view class="bnt bnt_color" v-if="item.status == 2" @tap='confirmOrder(item)'>确认收货</view> -->
</view>
</view>
</view>
</block>
</view>
<view v-else class="list"> <view v-else class="list">
<view class="item" v-for="(item, index) in list" :key="index"> <view class="item" v-for="(item, index) in list" :key="index">
<view class="order-num acea-row row-middle"> <view class="order-num acea-row row-middle">
@ -287,7 +348,8 @@
setRefundMark, setRefundMark,
postconfirm, postconfirm,
logisticsCode, logisticsCode,
delivery delivery,
lockList
} from "@/api/admin"; } from "@/api/admin";
import Loading from '@/components/Loading/index' import Loading from '@/components/Loading/index'
@ -346,7 +408,6 @@
that.init(); that.init();
} }
}, },
}, },
onLoad(option) { onLoad(option) {
this.where.product_type = uni.getStorageSync("PRODUCT_TYPE") ?? "" this.where.product_type = uni.getStorageSync("PRODUCT_TYPE") ?? ""
@ -355,6 +416,9 @@
delete this.where.status; delete this.where.status;
this.where.is_verify = 1; this.where.is_verify = 1;
} }
if (option.types == 88) {
this.where.status = 7;
}
this.current = ""; this.current = "";
this.merId = option.merId; this.merId = option.merId;
if (option.pay_time) { if (option.pay_time) {
@ -424,6 +488,18 @@
}); });
} }
); );
} else if (that.where.status == 7) {
lockList(that.where, that.merId).then(res => {
that.loading = false;
that.loaded = res.data.list.length < that.where.limit;
that.list.push.apply(that.list, res.data.list);
that.where.page = that.where.page + 1;
},
err => {
that.$util.Tips({
title: err
});
})
} else { } else {
getOrderList(that.where, that.merId).then( getOrderList(that.where, that.merId).then(
res => { res => {
@ -673,8 +749,17 @@
} }
}, },
toDetail(item) { toDetail(item) {
let order_id, mer_id;
if (item.order_id) {
order_id = item.order_id;
mer_id = item.mer_id;
} else {
order_id = item.order[0].order_id;
mer_id = item.order[0].merchant.mer_id;
}
uni.navigateTo({ uni.navigateTo({
url: `/pages/admin/orderDetail/index?id=${item.order_id}&mer_id=${item.mer_id}` url: `/pages/admin/orderDetail/index?id=${order_id}&mer_id=${mer_id}`
}) })
}, },

15
pages/index/index.vue
View File

@ -897,6 +897,8 @@
} }
if (index == 2) url = `/pages/admin/orderList/index?merId=${this.userInfoData.service.mer_id}&types=`; if (index == 2) url = `/pages/admin/orderList/index?merId=${this.userInfoData.service.mer_id}&types=`;
if (index == 3) url = "/pages/activeCode/subsidy"; if (index == 3) url = "/pages/activeCode/subsidy";
if (index == 1) url = "/pages/admin/orderList/index?merId=" + this.userInfoData.service.mer_id +
"&types=88";
uni.navigateTo({ uni.navigateTo({
url: url url: url
@ -1272,8 +1274,6 @@
// this.order[4].value = res.data.order.unevaluate // this.order[4].value = res.data.order.unevaluate
this.order[4].value = res.data.order.refund this.order[4].value = res.data.order.refund
this.list[2].value = res.data.data.month.orderNum this.list[2].value = res.data.data.month.orderNum
this.list[5].value = res.data.data.today.orderNum this.list[5].value = res.data.data.today.orderNum
}, err => { }, err => {
@ -1281,17 +1281,6 @@
title: err.msg title: err.msg
}) })
}); });
// otherOrderStatistics(this.userInfoData.service.mer_id, data).then(
// res => {
// this.other_order[0].value = res.data.order.unshipped
// this.other_order[1].value = res.data.order.untake
// },
// err => {
// that.$util.Tips({
// title: err.msg
// })
// }
// );
}, },
open() { open() {
this.isshow = !this.isshow this.isshow = !this.isshow

55
pages/users/gather_list/index.vue
View File

@ -23,13 +23,14 @@
<view class="total">已提现金额{{extractSum}}</view> <view class="total">已提现金额{{extractSum}}</view>
</view> </view>
<view class="recoder"> <view class="recoder" v-if="UserApplylist.length > 0">
<view class="card" v-for="(item,index) in UserApplylist" :key="index"> <view class="card" v-for="(item,index) in UserApplylist" :key="index">
<view class="right"> <view class="right">
<view class="item" style="justify-content: flex-start;"> <view class="item" style="justify-content: flex-start;">
<text class="rest">余额提现至</text> <text class="rest">余额提现至</text>
<text class="code">({{item.financial_account.bank_code}})</text> <text class="code">({{item.financial_account.bank_code}})</text>
<text class="withdraw-type legal_company">{{"对公"}}</text> <text class="withdraw-type legal_company"
:style="{background:item.checkType==1?'#F55726':''}">{{item.checkType ==1 ?'对公':'法人'}}</text>
</view> </view>
<view class="item"> <view class="item">
<view class="item_title"> <view class="item_title">
@ -40,26 +41,31 @@
<view class="item"> <view class="item">
<view class="item-time">{{item.create_time}}</view> <view class="item-time">{{item.create_time}}</view>
<view class="item_status audit" v-if="item.status == 0">待审核</view> <view class="item_status audit" v-if="item.status == 0">待审核</view>
<view class="item_status trans" v-if="item.status == 1 && (!item.image || item.length> 0)">待转账 <view class="item_status trans" v-if="item.status == 1 && ((!item.image || !item.image[0]))">
待转账
</view> </view>
<view class="item_status done" v-if="item.status == 1 && item.image && item.image.length > 0" <view class="item_status done" v-if="item.status == 1 && item.image && item.image[0]"
@click="handleView(item)"> @click="handleView(item)">
已转账 已转账
<u-icon name="arrow-right" color="#46B03A"></u-icon> <u-icon name="arrow-right" color="#46B03A" size="14"></u-icon>
</view> </view>
<view class="item_status lose" v-if="item.status == -1">审核不通过</view> <view class="item_status lose" v-if="item.status == -1">审核不通过</view>
</view> </view>
</view> </view>
<view class="remark" v-if="item.mark">{{item.mark}}</view> <view class="remark" v-if="item.status == -1">备注:{{item.refusal}}</view>
</view>
</view> </view>
<view style="color:#afafaf;" class='loadingicon acea-row row-center-wrapper'> <view style="color:#afafaf;" class='loadingicon acea-row row-center-wrapper'>
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}} <text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
</view> </view>
</view>
<u-empty v-else text="暂无记录~" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
</u-empty>
<!-- 时间组件 --> <!-- 时间组件 -->
<h-datetime-picker ref="pickerDate" @reset="reset" @confirm="confirm"></h-datetime-picker> <h-datetime-picker ref="pickerDate" @reset="reset" @confirm="confirm"
:params="{year: true,month: true,day: false,hour: false,minute: false,second: false,timestamp: true,}"></h-datetime-picker>
</view> </view>
</template> </template>
@ -114,7 +120,7 @@
onLoad(option) { onLoad(option) {
this.merId = option.mer_id; this.merId = option.mer_id;
this.where.start_time = new Date().format('yyyy-MM-dd'); this.where.start_time = new Date().format('yyyy-MM');
this.ApplyList(); this.ApplyList();
}, },
@ -131,7 +137,6 @@
// 确认 // 确认
confirm(e) { confirm(e) {
if (e.time) { if (e.time) {
this.where.start_time = e.time; this.where.start_time = e.time;
this.where.end_time = ''; this.where.end_time = '';
@ -141,13 +146,17 @@
} }
this.where.page = 1; this.where.page = 1;
this.loaded = false; this.loaded = false;
this.UserApplylist = [];
this.ApplyList(); this.ApplyList();
}, },
// 重置 // 重置
reset(e) { reset(e) {
this.where.page = 1;
this.loaded = false;
this.UserApplylist = [];
this.where.end_time = ''; this.where.end_time = '';
this.where.start_time = new Date().format('yyyy-MM-dd'); this.where.start_time = new Date().format('yyyy-MM');
this.ApplyList(); this.ApplyList();
}, },
@ -170,7 +179,7 @@
that.loaded = res.data.list.length < that.where.limit; that.loaded = res.data.list.length < that.where.limit;
that.UserApplylist.push.apply(that.UserApplylist, res.data.list); that.UserApplylist.push.apply(that.UserApplylist, res.data.list);
that.where.page = that.where.page + 1; that.where.page = that.where.page + 1;
that.loadTitle = that.loaded ? '已全部加载' : '加载更多'; that.loadTitle = that.loaded ? '已全部加载~' : '加载更多';
//截取银行卡后四位 //截取银行卡后四位
this.UserApplylist.forEach(item => { this.UserApplylist.forEach(item => {
@ -210,16 +219,20 @@
.list { .list {
.search { .search {
position: sticky;
top: 0;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin: 0 50rpx 20rpx 48rpx; padding: 0 50rpx 0rpx 48rpx;
height: 90rpx;
background: #f5f5f5;
.search-time { .search-time {
display: flex; display: flex;
.month { .month {
font-weight: 600; font-weight: bold;
font-size: 28rpx; font-size: 28rpx;
color: #333333; color: #333333;
margin-right: 6rpx; margin-right: 6rpx;
@ -233,8 +246,10 @@
} }
.head { .head {
position: sticky;
z-index: 10;
width: 694rpx; width: 694rpx;
margin: 28rpx auto 40rpx; margin: 28rpx auto 00rpx;
padding: 28rpx; padding: 28rpx;
background-color: #fff; background-color: #fff;
border-radius: 24rpx; border-radius: 24rpx;
@ -354,7 +369,7 @@
.code { .code {
margin-right: 10rpx; margin-right: 10rpx;
font-weight: 600; font-weight: bold;
font-size: 28rpx; font-size: 28rpx;
color: #333333; color: #333333;
} }
@ -381,13 +396,13 @@
} }
&_title { &_title {
font-weight: 600; font-weight: bold;
font-size: 28rpx; font-size: 28rpx;
color: #333333; color: #333333;
} }
&_money { &_money {
font-weight: 600; font-weight: bold;
font-size: 36rpx; font-size: 36rpx;
color: #F55726; color: #F55726;
} }
@ -409,6 +424,10 @@
} }
.item_status { .item_status {
display: flex;
justify-content: center;
align-items: center;
height: 44rpx;
border-radius: 6rpx 6rpx 6rpx 6rpx; border-radius: 6rpx 6rpx 6rpx 6rpx;
padding: 2rpx 16rpx; padding: 2rpx 16rpx;
font-size: 28rpx; font-size: 28rpx;

1
pages/withdrawal/index.vue
View File

@ -357,6 +357,7 @@
title: "提现申请成功,请等待审核!" title: "提现申请成功,请等待审核!"
}, () => { }, () => {
this.payForm.extract_money = ''; this.payForm.extract_money = '';
this.getBankInfo();
}) })
}).catch(err => { }).catch(err => {
uni.hideLoading(); uni.hideLoading();

3
uni_modules/h-datetime-picker/components/h-datetime-picker/h-datetime-picker.vue
View File

@ -222,7 +222,6 @@
'/')), '/')),
this.fmt) this.fmt)
} }
//console.log(this.valueArr);
}, },
initDate() { initDate() {
if (this.params.year) { if (this.params.year) {
@ -315,8 +314,10 @@
let { let {
year year
} = end_time } = end_time
// 获取年份集合 // 获取年份集合
this.years = this.generateArray(1950, year); this.years = this.generateArray(1950, year);
// 设置this.valueArr某一项的值，是为了让picker预选中某一个值 // 设置this.valueArr某一项的值，是为了让picker预选中某一个值
setTimeout(() => { setTimeout(() => {
this.valueArr.splice(this.yearKey, 1, this.getIndex(this.years, time.year)); this.valueArr.splice(this.yearKey, 1, this.getIndex(this.years, time.year));