wanma-benteng
/
new-mshop-view
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加：配送商 - 关联商户信息页

This commit is contained in:
wuhui_zzw 2024-06-18 10:58:47 +08:00
parent d6f1cd4371
commit 9eaa2f6e89
3 changed files with 128 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/agent.js
View File

@ -54,18 +54,17 @@ export function roleAndCorrelationRole(data) {
export function deliveryPaymentList(data) {
return request.get(`agent/delivery/payment_list`, data);
}
// 配送商 - 请求进行缴费
export function deliveryCreateOrder(data) {
return request.post(`agent/delivery/create_order`, data);
}
// 配送商 - 获取相关商户列表
export function deliveryMerList(data) {
return request.get(`agent/delivery/mer_list`, data);
}

152
pages/agent/delivery/mer_list.vue
View File

@ -1,13 +1,29 @@
<template>
<view>
<view class="main-content" v-if="Object.values(list).length > 0">
配送商关联商户列表
<view class="main-content">
<!--顶部内容-->
<view class="search">
<input class="search-text" v-model="search_text" placeholder="商户名称/联系电话" />
</view>
<!--信息列表-->
<view class="list-content" v-if="Object.values(list).length > 0">
<view class="list-box" v-for="(item,index) in list" :key="index">
<view class="mer-info">
<image class="mer-avatar" :src="item.mer_avatar || '/static/images/mer_avatar.png'"></image>
<view class="mer-right">
<view class="mer-nickanme">{{ item.mer_name || '' }}</view>
<view class="phone" v-if="item.mer_phone">联系电话：{{ item.mer_phone || '' }}</view>
</view>
</view>
<!--<view class="buttons">
<view class="btn-item">去支付</view>
<view class="btn-item">查看详情</view>
</view>-->
</view>
</view>
<emptyPage v-else title="暂无信息～"></emptyPage>
</view>
<!-- 授权登录 -->
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authClose"></authorize>
</view>
@ -17,6 +33,7 @@
import {mapGetters} from "vuex";
import emptyPage from '@/components/emptyPage.vue';
import authorize from '@/components/Authorize';
import {deliveryMerList} from "../../../api/agent";
export default {
components: {
@ -36,7 +53,7 @@ export default {
list: [],
page: 1,
agent_id: 0,
search_text: '',
}
},
onLoad(options) {
@ -82,29 +99,23 @@ export default {
// 记录
getList() {
let _this = this;
console.log("列表信息获取");
// let params = {
// page: _this.page,
// pid: _this.agent_id
// };
// myAgentList(params).then(res => {
// let list = res.data.list || {};
// _this.total = res.data.count || 0;
// if (Object.values(list).length > 0) {
// _this.list = _this.$util.SplitArray(list, _this.list);
// _this.$set(_this, 'list', _this.list);
// _this.page++;
// }
// }).catch(err => {
// this.$util.Tips({title: err});
// });
let params = {
page: _this.page,
agent_id: _this.agent_id,
search_text: _this.search_text || ''
};
deliveryMerList(params).then(res => {
let list = res.data.list || {};
_this.total = res.data.count || 0;
if (Object.values(list).length > 0) {
_this.list = _this.$util.SplitArray(list, _this.list);
_this.$set(_this, 'list', _this.list);
_this.page++;
}
}).catch(err => {
this.$util.Tips({title: err});
});
},
}
}
</script>
@ -113,11 +124,90 @@ export default {
.main-content {
width: 100vw;
min-height: 100vh!important;
background: #f6f6f6;
background: #f6f6f6;// #f6f6f6
.search{
width: 100%;
padding: 20rpx 30rpx;
background-color: #c20000;
.search-text{
width: 100%;
border-radius: 80rpx;
background-color: #cc2e2d;
text-align: center;
height: 60rpx;
line-height: 60rpx;
color: #ffffff;
}
}
.list-content{
width: 100%;
padding: 30rpx;
.list-box:not(:last-child){
margin-bottom: 30rpx;
}
.list-box{
background-color: #ffffff;
border-radius: 20rpx;
width: 100%;
padding: 20rpx;
.mer-info{
width: 100%;
padding-bottom: 20rpx;
display: inline-flex;
flex-direction: row;
align-items: center;
justify-content: flex-start;
flex-wrap: nowrap;
.mer-avatar{
width: 100rpx!important;
height: 100rpx!important;
border-radius: 15rpx;
}
.mer-right{
width: calc(100% - 100rpx);
padding-left: 20rpx;
height: 100rpx!important;
.mer-nickanme{
height: 50rpx;
line-height: 50rpx;
font-size: 32rpx;
font-weight: bold;
}
.phone{
font-size: 26rpx;
color: #9d9d9d;
height: 30rpx;
line-height: 30rpx;
}
}
}
.buttons{
border-top: 2rpx solid #f6f6f6;
width: 100%;
padding-top: 20rpx;
display: inline-flex;
flex-direction: row;
align-items: center;
justify-content: flex-end;
flex-wrap: nowrap;
.btn-item{
width: max-content!important;
height: 50rpx;
line-height: 50rpx;
font-size: 28rpx;
border: 2rpx solid #cccccc;
padding: 0 20rpx;
border-radius: 50rpx;
}
.btn-item:not(:last-child){
margin-right: 15rpx!important;
}
}
}
}
}
</style>

2
pages/agent/delivery/payment.vue
View File

@ -19,7 +19,7 @@
<view class="give-content">
<view class="give-box">赠送冠名品牌额度：<view class="give-quota">{{ payment_current.title_quota | toFixedTwo}}</view></view>
<view class="give-box">赠送其他品牌额度：<view class="give-quota">{{ payment_current.other_quota | toFixedTwo}}</view></view>
<view class="give-box change-btn" v-if="Object.values(payment_list).length > 1" @click="showChangePopup">切换支付项</view>
<view class="give-box change-btn" v-if="Object.values(payment_list).length > 1" @click="showChangePopup">切换规格</view>
</view>
</view>
<!--支付方式-->