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

更新功能, 修复bug

This commit is contained in:
weipengfei 2023-11-09 17:58:21 +08:00
parent 572e5a88a7
commit 754697ec48
12 changed files with 309 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/behalfAdmin.js
View File

@ -17,3 +17,11 @@ export function behalfAdminOrderList(data) {
return request.get("behalf_admin/order_list", data);
}
/**
* 订单统计
*
*/
export function behalfAdminNumber(data) {
return request.get("behalf_admin/number", data);
}

2
components/addInvoicing/index.vue
View File

@ -331,7 +331,7 @@
});
if(value.receipt_type == '增值税专用发票'){
if (!value.bank_name) return that.$util.Tips({
title: '请填写开户行'
title: '请填写银行卡号'
});
if (!value.bank_code) return that.$util.Tips({
title: '请填写银行账号'

15
pages.json
View File

@ -235,10 +235,21 @@
}
,{
"path" : "pages/replace_replenishment/index",
"path" : "pages/replace_replenishment/replace",
"style" :
{
"navigationBarTitleText": "代发补货",
"navigationBarTitleText": "代发订单",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ff5c2d",
"navigationBarTextStyle": "white"
}
},
{
"path" : "pages/replace_replenishment/replenishment",
"style" :
{
"navigationBarTitleText": "补货订单",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ff5c2d",
"navigationBarTextStyle": "white"

15
pages/index/index.vue
View File

@ -277,8 +277,8 @@
<view class='list'>
<view class="item">
<view class="acea-row row-middle">
<text class="item-name">开户行名称:</text>
<input type="text" maxlength="30" placeholder="请输入开户行名称" v-model="merchantData.bank_username"
<text class="item-name">开户银行名称:</text>
<input type="text" maxlength="30" placeholder="请输入开户银行名称" v-model="merchantData.bank_username"
@input="validateBtn" placeholder-class='placeholder' />
</view>
</view>
@ -293,8 +293,8 @@
<view class="item">
<view class="acea-row row-middle">
<text class="item-name">开户行:</text>
<input type="text" placeholder="请输入开户行" v-model="merchantData.bank_opening" @input="validateBtn"
<text class="item-name">银行卡号:</text>
<input type="text" placeholder="请输入银行卡号" v-model="merchantData.bank_opening" @input="validateBtn"
placeholder-class='placeholder' />
</view>
</view>
@ -768,7 +768,7 @@
title: '请输入银行账户姓名'
});
if (!value.bank_opening) return that.$util.Tips({
title: '请输入开户行'
title: '请输入银行卡号'
});
if (value.bank_front.length == 0) return that.$util.Tips({
@ -1639,6 +1639,7 @@
background-color: #d9d9d9;
text-align: center;
padding-top: 80rpx;
flex-shrink: 0;
.content-top_txt {
font-size: 18rpx;
@ -1666,6 +1667,7 @@
padding-left: 30rpx;
position: relative;
padding-top: 80rpx;
flex: 1;
.content-right-one {
display: flex;
@ -1694,7 +1696,8 @@
height: 70rpx;
line-height: 70rpx;
border-radius: 20rpx 20rpx;
left: 50%;
right: 50%;
transform: translate(50%, 0);
color: #ffffff;
background-color: #00a1f1;
text-align: center;

8
pages/margin/margin.vue
View File

@ -49,6 +49,7 @@
paymerchant,
marginlist
} from '@/api/api.js'
import { Toast } from '../../libs/uniApi'
export default {
data() {
return {
@ -130,7 +131,7 @@
// console.log('用户点击确定');
paymerchant().then((res) => {
console.log(res);
uni.requestPayment({
provider: 'wxpay',
orderInfo: res.data
@ -146,12 +147,13 @@
this.$util.Tips({
title: '支付失败'
});
console.log('fail:' + JSON.stringify(err));
}
});
}).catch((err) => {
console.log(err)
this.$util.Tips({
title: err
});
})
} else if (res.cancel) {
console.log('用户点击取消');

14
pages/moreProject/moreProject.vue
View File

@ -224,12 +224,12 @@
</image>
<text class="text">供应链批发</text>
</view>
<view v-if="userInfoData.mer_info.type_code === 'TypeTownSupplyChain'" class="examine" @click="navigator(`/pages/replace_replenishment/index`)">
<view v-if="userInfoData.mer_info.type_code === 'TypeTownSupplyChain'" class="examine" @click="navigator(`/pages/replace_replenishment/replace`)">
<image class="icon_img" src="@/static/images/index15.png" mode="aspectFit">
</image>
<text class="text">代发订单</text>
</view>
<view v-if="userInfoData.mer_info.type_code === 'TypeTownSupplyChain'" class="examine" @click="navigator(`/pages/replace_replenishment/index`)">
<view v-if="userInfoData.mer_info.type_code === 'TypeTownSupplyChain'" class="examine" @click="navigator(`/pages/replace_replenishment/replenishment`)">
<image class="icon_img" src="@/static/images/index15.png" mode="aspectFit">
</image>
<text class="text">补货订单</text>
@ -459,8 +459,8 @@
<view class='list'>
<view class="item">
<view class="acea-row row-middle">
<text class="item-name">开户行名称:</text>
<input type="text" maxlength="30" placeholder="请输入开户行名称" v-model="merchantData.bank_username"
<text class="item-name">开户银行名称:</text>
<input type="text" maxlength="30" placeholder="请输入开户银行名称" v-model="merchantData.bank_username"
@input="validateBtn" placeholder-class='placeholder' />
</view>
</view>
@ -476,8 +476,8 @@
<view class="item">
<view class="acea-row row-middle">
<text class="item-name">开户行:</text>
<input type="text" placeholder="请输入开户行" v-model="merchantData.bank_opening" @input="validateBtn"
<text class="item-name">银行卡号:</text>
<input type="text" placeholder="请输入银行卡号" v-model="merchantData.bank_opening" @input="validateBtn"
placeholder-class='placeholder' />
</view>
</view>
@ -766,7 +766,7 @@
title: '请输入银行账户姓名'
});
if (!value.bank_opening) return that.$util.Tips({
title: '请输入开户行'
title: '请输入银行卡号'
});
if (value.bank_front.length == 0) return that.$util.Tips({

4
pages/nongKe/cloud_entrepot/index.vue
View File

@ -525,7 +525,7 @@
category_id: this.cloudList[this.current]?.category_id || "",
order: this.type,
keyword: this.keyword,
page_num: this.page_num
page: this.page_num
}).then(res => {
// console.log(res.data.list[0].product_id, this.goodsList[0].product_id)
@ -793,7 +793,7 @@
category_id: this.cloudList[this.current]?.category_id || "",
order: this.type,
keyword: this.keyword,
page_num: this.page_num
page: this.page_num
}).then(res => {
this.goodsList = res.data.list

2
pages/nongKe/cloud_entrepot/indexa.vue
View File

@ -457,7 +457,7 @@
category_id: this.cloudList[this.current].category_id,
order: this.type,
keyword: this.keyword,
// page_num: this.page_num
// page: this.page_num
}).then(res => {
this.goodsList = res.data.list

90
pages/replace_replenishment/index.vue → pages/replace_replenishment/replace.vue
View File

@ -19,26 +19,26 @@
搜索我的订单
</navigator>
<view class='nav acea-row row-around'>
<view class='item' :class='orderStatus==-1 ? "on": ""' @click="statusClick(-1)">
<view class='item all' :class='orderStatus=="all" ? "on": ""' @click="statusClick('all')">
<view>全部</view>
<view class='num'>{{orderData.orderCount+len || 0}}</view>
<!-- <view class='num'>{{orderData.orderCount+len || 0}}</view> -->
</view>
<!-- <view class='item' :class='orderStatus==1? "on": ""' @click="statusClick(1)">
<view>待付款</view>
<view class='num'>{{orderData.noPay || 0}}</view>
</view> -->
<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
<view class='item' :class='orderStatus==0 ? "on": ""' @click="statusClick(0)">
<view>待发货</view>
<view class='num'>{{orderData.noPostage || 0}}</view>
</view>
<view class='item' :class='orderStatus==3? "on": ""' @click="statusClick(3)">
<view class='item' :class='orderStatus==1? "on": ""' @click="statusClick(1)">
<view>待收货</view>
<view class='num '>{{orderData.noDeliver || 0}}</view>
</view>
<view class='item' :class='orderStatus==4 ? "on": ""' @click="statusClick(4)">
<!-- <view class='item' :class='orderStatus==4 ? "on": ""' @click="statusClick(4)">
<view>待评价</view>
<view class='num'>{{orderData.noComment || 0}}</view>
</view>
</view> -->
<!-- <view class='item' :class='orderStatus==5 ? "on": ""' @click="statusClick(5)">
<view>售后/退款</view>
<view class='num'>{{len || 0}}</view>
@ -65,7 +65,7 @@
<view class='list'>
<!-- 代付款 -->
<view v-if="orderList.length > 0">
<block v-if="orderStatus == 0">
<block v-if="orderStatus == -1">
<view class='item' v-for="(item,index) in orderList" :key="index">
<view @click='goOrderDetails(item.group_order_id)'>
<view class='title acea-row row-between-wrapper'>
@ -263,6 +263,9 @@
<view class='bottom acea-row row-right row-middle'>
<!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
<block v-if="item.order_status==2">
<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>去发货</view>
</block>
<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
</block>
@ -385,7 +388,8 @@
refundList
} from '@/api/order.js';
import{
behalfAdminOrderList
behalfAdminOrderList,
behalfAdminNumber
} from "@/api/behalfAdmin.js"
import {
getUserInfo
@ -424,7 +428,7 @@
presellProList: [], //定金预售订单
presellOrderCount: 0,
orderData: {}, //订单详细统计
orderStatus: -1, //订单状态
orderStatus: 'all', //订单状态
page: 1,
limit: 20,
receivingshow: false,
@ -501,15 +505,15 @@
methods: {
arrlist() {
refundList({
product_type: 98,
type: 0,
page: 1,
limit: 1500
// refundList({
// product_type: 98,
// type: 0,
// page: 1,
// limit: 1500
}).then(res => {
this.len = res.data.list.length
})
// }).then(res => {
// this.len = res.data.list.length
// })
},
// 后退
returns() {
@ -585,10 +589,8 @@
*/
getOrderData: function() {
let that = this;
orderData({
product_type: 98
}).then(res => {
// console.log(res.data)
behalfAdminNumber().then(res => {
console.log(res.data)
that.$set(that, 'orderData', res.data);
})
},
@ -744,12 +746,6 @@
* 切换类型
*/
statusClick: function(status) {
if (status == 5) {
uni.navigateTo({
url: '/pages/users/refund/list?type=98'
})
} else {
if (status == this.orderStatus) return;
this.orderStatus = status;
this.loadend = false;
@ -757,7 +753,6 @@
this.page = 1;
this.$set(this, 'orderList', []);
this.getOrderList();
}
},
/**
* 获取订单列表
@ -768,14 +763,15 @@
if (that.loading) return;
that.loading = true;
that.loadTitle = "加载更多";
// console.log('点击');
// console.log(that.isReady);
if (that.isReady) {
that.isReady = false
if (that.orderStatus == -1) {
behalfAdminOrderList({
page: that.page,
limit: that.limit,
status: that.orderStatus
}).then(res => {
that.isReady = true;
let list = res.data.list || [];
let loadend = list.length < that.limit;
// console.log(that.orderList)
@ -787,38 +783,10 @@
that.loadend = loadend;
that.loading = false;
that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
that.page = that.page + 1
})
} else {
let arr;
if (that.orderStatus > -1) {
arr = that.orderStatus
} else {
arr = ''
}
getOrderList({
status: arr,
page: that.page,
limit: that.limit,
product_type: 98
}).then(res => {
let list = res.data.list || [];
let loadend = list.length < that.limit;
that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that
.orderList);
that.$set(that, 'orderList', that.orderList);
that.getProductCount();
that.loadend = loadend;
that.loading = false;
that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
that.page = that.page + 1;
that.isReady = true;
}).catch(err => {
that.loading = false;
that.loadTitle = "加载更多";
})
}
}
},
/**
* 获取定金预售订单列表
@ -1327,4 +1295,10 @@
font-size: 23rpx;
}
}
.all{
display: flex;
align-items: center;
}
</style>

197
pages/replace_replenishment/replenishment.vue Normal file
View File

@ -0,0 +1,197 @@
<template>
<view class="page">
<u-sticky style="padding: 28rpx 0;background-color: #f5f5f5;" offset-top="0" customNavHeight="0">
<view class="search_box">
<u-search borderColor="#F84221" bgColor="white" :showAction="false" placeholder="搜索订单"
class="search_cls"></u-search>
<button class="search">搜索</button>
</view>
</u-sticky>
<view>
<view class="order" v-for="i in 4">
<view class="order_id flex_sb">
<view>订单号: {{'ssdfdsfsfds'}}</view>
<view class="order_type">待补货</view>
</view>
<u-line></u-line>
<view class="short_name">
<text class="iconfont icon-shangjiadingdan" style="margin-right: 10rpx;"></text>店铺名称
</view>
<view class="order_card flex">
<image class="img" src="http://lihai001.oss-cn-chengdu.aliyuncs.com/def/2023-11-04/202311041457096683.jpg">
</image>
<view class="card_text">
<view class="name">商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称</view>
<view class="price_num">
<view>￥10</view>
<view>x10</view>
</view>
</view>
</view>
<view class="all_price">
共计{{'1'}}件 实付金额: <text>￥100.00</text>
</view>
<u-line></u-line>
<view class="flex_sb t_line">
<view>下单时间:</view>
<view>sss</view>
</view>
<view class="flex_sb t_line">
<view>支付状态:</view>
<view>sss</view>
</view>
<view class="flex_sb t_line">
<view>支付方式:</view>
<view>sss</view>
</view>
<button class="confrim">确认收货</button>
</view>
</view>
</view>
</template>
<script>
// +----------------------------------------------------------------------
// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
// +----------------------------------------------------------------------
// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
export default {
data() {
return {
};
},
}
</script>
<style scoped lang="scss">
.page {
// padding-top: 28rpx;
.flex_sb {
display: flex;
justify-content: space-between;
}
}
.search_box{
width: 694rpx;
margin: 0 auto;
position: relative;
.search_cls{
width: 100%;
}
.search{
position: absolute;
top: 50%;
right: 1%;
width: 115.65rpx;
height: 56.82rpx;
line-height: 56.82rpx;
text-align: center;
border-radius: 56.82rpx;
background-color: #F84221;
color: #fff;
transform: translate(0, -50%);
}
}
.order {
margin: 0 auto;
margin-bottom: 28rpx;
padding: 28rpx;
width: 694rpx;
background-color: #fff;
border-radius: 21rpx 21rpx 21rpx 21rpx;
.order_id {
padding-bottom: 20rpx;
font-size: 26.29rpx;
font-weight: 500;
.order_type {
font-size: 30rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400;
color: #F84221;
}
}
.short_name {
padding-top: 20rpx;
padding-bottom: 28rpx;
font-size: 29.79rpx;
}
.order_card {
height: 150rpx;
.img {
width: 150rpx;
height: 150rpx;
border-radius: 14rpx;
margin-right: 20rpx;
}
.card_text {
display: flex;
flex-direction: column;
justify-content: space-around;
height: 100%;
flex: 1;
.name {
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
max-height: 3em;
/* 如果每行高度为1.2em，两行文字的高度就是2.4em */
overflow: hidden;
font-size: 26.29rpx;
}
.price_num {
display: flex;
justify-content: space-between;
font-size: 29.79rpx;
}
}
}
.all_price {
text-align: right;
padding: 20rpx 0;
font-size: 26.29rpx;
text {
color: #F84221;
font-size: 42rpx;
}
}
.t_line {
padding-top: 20rpx;
font-size: 26rpx;
}
.confrim {
margin: 0 auto;
margin-top: 30rpx;
width: 589rpx;
height: 72rpx;
line-height: 72rpx;
border-radius: 42rpx 42rpx 42rpx 42rpx;
opacity: 1;
border: 2rpx solid #F84221;
font-size: 33rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500;
color: #F84221;
}
}
</style>

18
pages/users/embody/embody.vue
View File

@ -51,10 +51,10 @@
</view>
<view class='tip mt25'>
当前可提现金额: <text
class="price">￥{{extract_money}},</text>冻结佣金：￥{{userInfo.lock_brokerage}}
class="price">￥{{extract_money}}</text>, 冻结金额: ￥{{lock_money}}
</view>
<view class='tip'>
说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天，到期后可提现
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额
</view>
<view class="btn-submit">
<button formType="submit" class='bnt b-color'>提现</button>
@ -92,10 +92,10 @@
<view class='tip mt25'>
当前可提现金额: <text
class="price">￥{{extract_money}},</text>冻结佣金：￥{{userInfo.lock_brokerage}}
class="price">￥{{extract_money}},</text>冻结金额: ￥{{lock_money}}
</view>
<view class='tip'>
说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天，到期后可提现
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额
</view>
<button formType="submit" class='bnt b-color'>提现</button>
</view>
@ -141,10 +141,10 @@
</view>
<view class='tip mb25'>
当前可提现金额: <text
class="price">￥{{extract_money}},</text>冻结佣金：￥{{userInfo.lock_brokerage}}
class="price">￥{{extract_money}}</text>, 冻结金额: ￥{{lock_money}}
</view>
<view class='tip' v-if="userInfo.broken_day>0">
说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天，到期后可提现
<view class='tip'>
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额
</view>
<view class="btn-submit">
<button formType="submit" class='bnt b-color'>提现</button>
@ -194,6 +194,8 @@
data() {
return {
extract_money:"",
lock_money: "",
lock_time: "",
mode: {
bank_address: "",
bank_code: "",
@ -279,6 +281,8 @@
this.mode.bank_name = res.data.financial_bank_bank
this.mode.bank_address = res.data.financial_bank_branch
this.extract_money=res.data.extract_money
this.lock_money = res.data.lock_money
this.lock_time = res.data.lock_time
console.log(this.extract_money)
} catch (err) {
//TODO handle the exception

2
pages/users/user_invoice_form/index.vue
View File

@ -208,7 +208,7 @@
}
if(this.receipt_type == 2){
if (!formData.bank_name) return this.$util.Tips({
title: '请输入开户行'
title: '请输入银行卡号'
});
if (!formData.bank_code) return this.$util.Tips({