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 15:26:03 +08:00
parent af0d0b8ef8 e0f0987ea6
commit ece51bf8d8
5 changed files with 154 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/admin.js
View File

@ -9,6 +9,14 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
import request from "@/utils/request.js"; import request from "@/utils/request.js";
/**
* 设置自提人姓名 电话
* @returns {*}
*/
export function delivery(data) {
return request.post(`admin/${data.mer_id}/delivery/${data.delivery_id}`, data);
}
/** /**
* 统计数据 * 统计数据
*/ */
@ -377,8 +385,8 @@ export function couponReceive(data) {
*/ */
export function couponRefuse(data) { export function couponRefuse(data) {
return request.post(`server/${data.mer_id}/subsidyRefuse/${data.id}`, { return request.post(`server/${data.mer_id}/subsidyRefuse/${data.id}`, {
reason: data.reason reason: data.reason
}, { }, {
login: true login: true
}); });
} }

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

@ -214,44 +214,50 @@
<view class="mask" @touchmove.prevent v-show="refundMark === true"></view> <view class="mask" @touchmove.prevent v-show="refundMark === true"></view>
</view> </view>
<u-popup :show="popUpShow" mode="center" :closeOnClickOverlay="true" round="12" @close="popUpClose">
<!-- <view style="text-align: center;margin-top: 30rpx;">
请把二维码展示给取货人员
</view>
<view style="padding: 28.07rpx;">
<image :src="payCodeUrl" style="width:400rpx;height: 400rpx;"></image>
</view> -->
<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;">
<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>
<view class="form-item-val"> <view class="form-item-val">
<u-input placeholder="请输入送货人姓名" placeholderStyle="color:#999;font-size:26rpx;" <u-input v-model="deliveryForm.delivery_name" placeholder="请输入送货人姓名"
border="surround"></u-input> placeholderStyle="color:#999;font-size:26rpx;" border="surround"></u-input>
</view> </view>
</view> </view>
<view class="form-item"> <view class="form-item">
<view class="form-item-label">送货人电话</view> <view class="form-item-label">送货人电话</view>
<view class="form-item-val"> <view class="form-item-val">
<u-input placeholder="请输入送货人电话" placeholderStyle="color:#999;font-size:26rpx;" <u-input v-model="deliveryForm.delivery_id" placeholder="请输入送货人电话"
border="surround"></u-input> placeholderStyle="color:#999;font-size:26rpx;" border="surround"></u-input>
</view> </view>
</view> </view>
<view class="form-item"> <view class="form-item">
<view class="form-item-label">备注</view> <view class="form-item-label">备注</view>
<view class="form-item-val"> <view class="form-item-val">
<u-input placeholder="请输入备注" placeholderStyle="color:#999;font-size:26rpx;"></u-input> <u-input v-model="deliveryForm.remark" placeholder="请输入备注"
placeholderStyle="color:#999;font-size:26rpx;"></u-input>
</view> </view>
</view> </view>
<view class="form-btn"> <view class="form-btn">
<view class="form-btn-cancel" @click="popUpShow = false">取消</view> <view class="form-btn-cancel" @click="popUpShow = false">取消</view>
<view class="form-btn-confirm">确认</view> <view class="form-btn-confirm" @click="handleSubmitDelivery">确认</view>
</view> </view>
</view> </view>
</u-popup> </view>
<!--
<u-popup :show="popUpShow" mode="center" :closeOnClickOverlay="true" round="12" @close="popUpClose">
<view style="text-align: center;margin-top: 30rpx;">
请把二维码展示给取货人员
</view>
<view style="padding: 28.07rpx;">
<image :src="payCodeUrl" style="width:400rpx;height: 400rpx;"></image>
</view>
</u-popup> -->
<view class="bar-code" v-show="showBar" @click="showBar=false"> <view class="bar-code" v-show="showBar" @click="showBar=false">
<barcode ref="code"></barcode> <barcode ref="code"></barcode>
</view> </view>
@ -278,7 +284,8 @@
refundOrderReceive, refundOrderReceive,
setRefundMark, setRefundMark,
postconfirm, postconfirm,
logisticsCode logisticsCode,
delivery
} from "@/api/admin"; } from "@/api/admin";
import Loading from '@/components/Loading/index' import Loading from '@/components/Loading/index'
@ -286,6 +293,9 @@
import { import {
isMoney isMoney
} from '@/utils/validate.js' } from '@/utils/validate.js'
import {
Toast
} from "../../../libs/uniApi";
export default { export default {
name: "AdminOrderList", name: "AdminOrderList",
components: { components: {
@ -294,6 +304,13 @@
}, },
data() { data() {
return { return {
// 去发货
deliveryForm: {
delivery_name: '',
delivery_id: '',
delivery_type: 2,
mer_id: ''
},
showBar: false, showBar: false,
current: "", current: "",
change: false, change: false,
@ -382,8 +399,6 @@
}, },
// 获取数据 // 获取数据
getIndex() { getIndex() {
let that = this; let that = this;
// console.log(that.merId) // console.log(that.merId)
if (that.loading || that.loaded) return; if (that.loading || that.loaded) return;
@ -512,19 +527,54 @@
}) })
}, },
//收件码 // 保存送货人电话 姓名
toPostagequ(item) { handleSubmitDelivery(item) {
this.popUpShow = true if (!this.deliveryForm.delivery_name) return this.$util.Tips({
logisticsCode(item.order_id).then(res => { title: "请输入送货人姓名!"
if (res.status == 200) {
this.payCodeUrl = res.data.qrcode
}
}) })
if (!uni.$u.test.mobile(this.deliveryForm.delivery_id)) {
return uni.showToast({
title: "手机号输入有误!",
icon: "none"
});
}
let that = this;
delivery(this.deliveryForm).then(res => {
if (res.status == 200) {
this.$util.Tips({
title: '设置收货人成功!'
})
setTimeout(() => {
that.popUpShow = false;
}, 1000)
}
}).catch((err) => {
that.$util.Tips({
title: err
})
setTimeout(() => {
that.popUpShow = false;
}, 1500)
})
},
//收件码
toPostagequ(item) {
this.deliveryForm.mer_id = item.mer_id;
this.popUpShow = true;
this.deliveryForm.delivery_name = '';
this.deliveryForm.delivery_id = '';
// this.shipment.delivery_name = this.shipment.to_name
// this.shipment.delivery_id = this.shipment.to_phone
// logisticsCode(item.order_id).then(res => {
// if (res.status == 200) {
// this.payCodeUrl = res.data.qrcode
// }
// })
}, },
toPostage(item) { toPostage(item) {
@ -631,7 +681,11 @@
<style lang="scss"> <style lang="scss">
.form { .form {
position: relative;
z-index: 9999999;
padding: 40rpx 60rpx; padding: 40rpx 60rpx;
background-color: #fff;
border-radius: 20rpx;
.form-item { .form-item {
display: flex; display: flex;

2
pages/product/shop_type_change/index.vue
View File

@ -60,7 +60,7 @@
handleToRecord() { handleToRecord() {
uni.navigateTo({ uni.navigateTo({
url: "/pages/product/shop_type_change/list", url: "/pages/product/shop_type_change/list?mer_id=" + this.mer_id,
fail(err) { fail(err) {
console.log(err); console.log(err);
} }

47
pages/product/shop_type_change/list.vue
View File

@ -10,11 +10,14 @@
</view> </view>
<view class="shop-type-list"> <view class="shop-type-list">
<block v-for="item in 4"> <block v-for="(item,indx) in list" :key="indx">
<view class="shop-type-list-item"> <view class="shop-type-list-item">
<view class="shop-type-list-item-title" @click='hanldeTo'> <view class="shop-type-list-item-title" @click='hanldeTo(item)'>
<!-- #40AE36 审核通过 #F55726 审核未通过 #666666 审核中--> <!-- #40AE36 审核通过 #F55726 审核未通过 #666666 审核中-->
<view class="shop-type-list-item-title-status">审核通过</view> <view class="shop-type-list-item-title-status"
:style="{'color':item.status==0?'#666':item.status==1?'#40AE36':'#F55726'}">
{{item.status == 0?'审核中':item.status==1?'审核通过':'审核未通过'}}
</view>
<view class="shop-type-list-item-title-detail"> <view class="shop-type-list-item-title-detail">
查看详情 查看详情
<u-icon name="arrow-right" size="13" color="#666"></u-icon> <u-icon name="arrow-right" size="13" color="#666"></u-icon>
@ -23,19 +26,28 @@
<view class="shop-type-list-item-con"> <view class="shop-type-list-item-con">
<view class="shop-type-list-item-con-item"> <view class="shop-type-list-item-con-item">
<view class="shop-type-list-item-con-key">变更商户：</view> <view class="shop-type-list-item-con-key">变更商户：</view>
<view class="shop-type-list-item-con-val">这是一段店铺名称</view> <view class="shop-type-list-item-con-val">{{item.mer_name}}</view>
</view> </view>
<view class="shop-type-list-item-con-item"> <view class="shop-type-list-item-con-item">
<view class="shop-type-list-item-con-key">变更类型：</view> <view class="shop-type-list-item-con-key">变更类型：</view>
<view class="shop-type-list-item-con-val">批发零售商户</view> <view class="shop-type-list-item-con-val">{{item.type_name}}</view>
</view> </view>
<view class="shop-type-list-item-con-item"> <view class="shop-type-list-item-con-item">
<view class="shop-type-list-item-con-key">申请时间：</view> <view class="shop-type-list-item-con-key">申请时间：</view>
<view class="shop-type-list-item-con-val">2024-3-14 14:00</view> <view class="shop-type-list-item-con-val">{{item.create_time}}</view>
</view> </view>
<view class="shop-type-list-item-con-item"> <view class="shop-type-list-item-con-item">
<view class="shop-type-list-item-con-key">审核人：</view> <view class="shop-type-list-item-con-key">审核人：</view>
<view class="shop-type-list-item-con-val">2024-</view> <view class="shop-type-list-item-con-val">{{item.name}}</view>
</view>
<view class="shop-type-list-item-con-item" v-if="item.status == 1 || item.status == 2">
<view class="shop-type-list-item-con-key">审核时间：</view>
<view class="shop-type-list-item-con-val">{{item.update_time || ''}}</view>
</view>
<view class="shop-type-list-item-con-item" v-if="item.status == 2">
<view class="shop-type-list-item-con-key">备注：</view>
<view class="shop-type-list-item-con-val" style="word-break: break-all;">
{{item.update_time || ''}}</view>
</view> </view>
</view> </view>
</view> </view>
@ -55,19 +67,30 @@
list: [] list: []
} }
}, },
onLoad() { onLoad(opt) {
this.getData(); this.getData();
}, },
methods: { methods: {
hanldeTo() { hanldeTo(item) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/product/shop_type_change/progress" url: "/pages/product/shop_type_change/progress?form=" + encodeURIComponent(JSON.stringify(
item)),
success(res) {}
}) })
}, },
getData() { getData(mer_id) {
intentionList().then(res => { uni.showLoading({
title: '加载中...'
})
intentionList({
uid: this.$store.state.app.userInfo.uid
}).then(res => {
uni.hideLoading()
this.list = res.data; this.list = res.data;
}) })
},
handleBack() {
uni.navigateBack()
} }
} }
} }

47
pages/product/shop_type_change/progress.vue
View File

@ -15,22 +15,23 @@
<view class="shop-type-con-item"> <view class="shop-type-con-item">
<view class="shop-type-con-item-info"> <view class="shop-type-con-item-info">
<view class="shop-type-con-item-info-label">变更商户</view> <view class="shop-type-con-item-info-label">变更商户</view>
<view class="shop-type-con-item-info-val">这是一段店铺名称</view> <view class="shop-type-con-item-info-val">{{form.mer_name}}</view>
</view> </view>
<view class="shop-type-con-item-info"> <view class="shop-type-con-item-info">
<view class="shop-type-con-item-info-label">变更类型</view> <view class="shop-type-con-item-info-label">变更类型</view>
<view class="shop-type-con-item-info-val">批发零售商户</view> <view class="shop-type-con-item-info-val">{{form.type_name}}</view>
</view> </view>
<view class="shop-type-con-item-info"> <view class="shop-type-con-item-info">
<view class="shop-type-con-item-info-label">申请时间</view> <view class="shop-type-con-item-info-label">申请时间</view>
<view class="shop-type-con-item-info-val">2024-3-14 15:00</view> <view class="shop-type-con-item-info-val">{{form.create_time}}</view>
</view> </view>
<view class="shop-type-con-item-info"> <view class="shop-type-con-item-info">
<view class="shop-type-con-item-info-label">变更进度</view> <view class="shop-type-con-item-info-label">变更进度</view>
<view class="shop-type-con-item-info-val">待审核</view> <view class="shop-type-con-item-info-val">{{form.status == 0?'审核中':form.status==1?'审核通过':'审核未通过'}}
</view>
</view> </view>
<view class="shop-type-con-item-img"> <view class="shop-type-con-item-img">
<u-image width="116rpx" height="116rpx" src="" shape="circle" /> <u-image width="116rpx" height="116rpx" src="" shape="circle" :src="form.mer_avatar" />
</view> </view>
</view> </view>
@ -40,14 +41,14 @@
<view class="shop-type-audit-card"> <view class="shop-type-audit-card">
<view class="shop-type-audit-card-info"> <view class="shop-type-audit-card-info">
<view class="shop-type-audit-card-info-label audit">审核人</view> <view class="shop-type-audit-card-info-label audit">审核人</view>
<view class="shop-type-audit-card-info-val">小刘</view> <view class="shop-type-audit-card-info-val">{{form.check_name}}</view>
</view> </view>
<view class="shop-type-audit-card-info"> <view class="shop-type-audit-card-info">
<view class="shop-type-audit-card-info-label">联系电话</view> <view class="shop-type-audit-card-info-label">联系电话</view>
<view class="shop-type-audit-card-info-val">15200000000</view> <view class="shop-type-audit-card-info-val">{{form.check_phone}}</view>
</view> </view>
<view class="shop-type-audit-card-img"> <view class="shop-type-audit-card-img">
<u-image width="116rpx" height="116rpx" src="" shape="circle" /> <u-image width="116rpx" height="116rpx" src="" shape="circle" :src="form.check_avatar" />
</view> </view>
</view> </view>
</view> </view>
@ -67,27 +68,30 @@
<view class="dot"></view> <view class="dot"></view>
<view class="dot"></view> <view class="dot"></view>
<view class="shop-type-con-progress-left-item"> <view class="shop-type-con-progress-left-item">
<!-- <u-icon name="checkmark-circle-fill" size="18" color="#40AE36"></u-icon> --> <u-icon name="checkmark-circle-fill" size="18" color="#999" v-if="form.status == 0" />
<!-- <u-icon name="checkmark-circle-fill" size="18" color="#999"></u-icon> --> <u-icon name="checkmark-circle-fill" size="18" color="#40AE36" v-if="form.status == 1" />
<u-icon name="close-circle-fill" size="20" color="#F55726"></u-icon> <u-icon name="close-circle-fill" size="18" color="#F55726" v-if="form.status == 2" />
</view> </view>
</view> </view>
<view class="shop-type-con-progress-right"> <view class="shop-type-con-progress-right">
<view <view
style="display:flex;margin-bottom: 46rpx;justify-content: space-between;align-items: center;"> style="display:flex;margin-bottom: 46rpx;justify-content: space-between;align-items: center;">
<view class="shop-type-con-progress-right-name">申请已提交</view> <view class="shop-type-con-progress-right-name">申请已提交</view>
<view class="shop-type-con-progress-right-time">审核通过</view> <view class="shop-type-con-progress-right-time">{{form.create_time}}</view>
</view> </view>
<view <view
style="display: flex;justify-content: space-between;align-items: center;margin-bottom:10rpx;"> style="display: flex;justify-content: space-between;align-items: center;margin-bottom:10rpx;">
<view class="shop-type-con-progress-right-name">申请已提交</view> <view class="shop-type-con-progress-right-name">
<view class="shop-type-con-progress-right-time">审核通过</view> {{form.status == 0?'待审核人员审核':form.status==1?'审核通过':'审核未通过'}}
</view>
<view class="shop-type-con-progress-right-time" v-if="form.status == 1 || form.status == 2">
{{form.update_time}}
</view>
</view> </view>
<view class="audit-info"> <view class="audit-info" v-if="form.status != 0">
<view style="margin-bottom: 10rpx;">审批人：小刘</view> <view style="margin-bottom: 10rpx;">审批人：{{form.check_name}}</view>
<view class="audit-info-txt">审核不通过：商户状态不符合变更条件</view> <view class="audit-info-txt" v-if="form.status == 2">审核不通过：{{form.fail_msg}}</view>
</view> </view>
</view> </view>
</view> </view>
@ -100,10 +104,15 @@
export default { export default {
data() { data() {
return { return {
selected: '' selected: '',
form: {}
} }
}, },
onLoad(opt) {
this.form = JSON.parse(decodeURIComponent(opt.form));
},
methods: { methods: {
handleChoose(e) { handleChoose(e) {
this.selected = e; this.selected = e;