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

Merge branch 'new' of https://gitea.lihaink.cn/mkm/shop-applet into new

This commit is contained in:
weipengfei 2024-03-21 17:31:38 +08:00
parent 95431d4bd6 735e91b8b2
commit 8167f71bfd
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/admin.js
View File

@ -14,7 +14,7 @@ import request from "@/utils/request.js";
* @returns {*} * @returns {*}
*/ */
export function delivery(data) { export function delivery(data) {
return request.post(`admin/${data.mer_id}/delivery/${data.delivery_id}`, data); return request.post(`admin/${data.mer_id}/delivery/${data.order_id}`, data);
} }
/** /**

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

@ -214,9 +214,8 @@
<view class="mask" @touchmove.prevent v-show="refundMark === true"></view> <view class="mask" @touchmove.prevent v-show="refundMark === true"></view>
</view> </view>
<view class="form-wrap" v-if="popUpShow" <view class="form-wrap" v-if="popUpShow"
style="position: fixed;top: 0;left: 0;width:100vw;height:100vh;background:rgba(0,0,0,.8);display: flex;align-items: center;justify-content: center;"> style="position: fixed;z-index: 11; top: 0;left: 0;width:100vw;height:100vh;background:rgba(0,0,0,.4);display: flex;align-items: center;justify-content: center;">
<view class="form"> <view class="form">
<view class="form-item"> <view class="form-item">
<view class="form-item-label">送货人姓名</view> <view class="form-item-label">送货人姓名</view>
@ -534,6 +533,9 @@
}) })
if (!uni.$u.test.mobile(this.deliveryForm.delivery_id)) { if (!uni.$u.test.mobile(this.deliveryForm.delivery_id)) {
console.log(3123123);
return uni.showToast({ return uni.showToast({
title: "手机号输入有误!", title: "手机号输入有误!",
icon: "none" icon: "none"
@ -544,8 +546,9 @@
delivery(this.deliveryForm).then(res => { delivery(this.deliveryForm).then(res => {
if (res.status == 200) { if (res.status == 200) {
this.$util.Tips({ this.$util.Tips({
title: '设置收货人成功!' title: res.message
}) })
that.init();
setTimeout(() => { setTimeout(() => {
that.popUpShow = false; that.popUpShow = false;
}, 1000) }, 1000)
@ -554,18 +557,19 @@
that.$util.Tips({ that.$util.Tips({
title: err title: err
}) })
setTimeout(() => {
that.popUpShow = false;
}, 1500)
}) })
}, },
//收件码 //收件码
toPostagequ(item) { toPostagequ(item) {
this.deliveryForm.mer_id = item.mer_id;
this.popUpShow = true;
this.deliveryForm.delivery_name = ''; this.deliveryForm.delivery_name = '';
this.deliveryForm.delivery_id = ''; this.deliveryForm.delivery_id = '';
this.deliveryForm.remark = '';
this.deliveryForm.mer_id = item.mer_id;
this.deliveryForm.order_id = item.order_id;
this.popUpShow = true;
// this.shipment.delivery_name = this.shipment.to_name // this.shipment.delivery_name = this.shipment.to_name
// this.shipment.delivery_id = this.shipment.to_phone // this.shipment.delivery_id = this.shipment.to_phone
@ -682,7 +686,7 @@
<style lang="scss"> <style lang="scss">
.form { .form {
position: relative; position: relative;
z-index: 9999999; z-index: 11;
padding: 40rpx 60rpx; padding: 40rpx 60rpx;
background-color: #fff; background-color: #fff;
border-radius: 20rpx; border-radius: 20rpx;
@ -745,7 +749,7 @@
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
z-index: 9999; z-index: 10;
width: 100%; width: 100%;
background-color: #fff; background-color: #fff;
} }