This commit is contained in:
weipengfei 2023-11-09 18:22:09 +08:00
commit 7e85b90fc7
25 changed files with 1579 additions and 1063 deletions

View File

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

View File

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

View File

@ -12,6 +12,9 @@
"nvueCompiler" : "uni-app", "nvueCompiler" : "uni-app",
"nvueStyleCompiler" : "uni-app", "nvueStyleCompiler" : "uni-app",
"compilerVersion" : 3, "compilerVersion" : 3,
"compatible":{
"ignoreVersion": true //trueHBuilderX1.9.0
},
"splashscreen" : { "splashscreen" : {
"alwaysShowBeforeRender" : true, "alwaysShowBeforeRender" : true,
"waiting" : true, "waiting" : true,

View File

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

View File

@ -40,6 +40,25 @@
{{orderInfo.refund_num}} {{orderInfo.refund_num}}
</view> </view>
</view> </view>
<view class="form-item item-txt">
<text class="label">退款原因</text>
<view class="picker">
{{orderInfo.refund_message}}
</view>
</view>
<view class="form-item item-txt">
<text class="label">退款备注</text>
<view class="picker">
{{orderInfo.mark}}
</view>
</view>
<view class="form-item item-txt">
<text class="label">退款凭证</text>
<view class="imgs">
<image v-for="(img, index) in orderInfo.pics4" :src="img" :key="index" style="width: 60rpx;height: 60rpx;margin-right: 10rpx;"></image>
<image @click="previewImg" src="@/static/images/right.png" style="width: 40rpx;height: 40rpx;transform: rotate(180deg);"></image>
</view>
</view>
</view> </view>
<view v-if="orderInfo.refund_type == 2 && status == 1" class="form-box"> <view v-if="orderInfo.refund_type == 2 && status == 1" class="form-box">
<view class="form-item item-txt"> <view class="form-item item-txt">
@ -116,7 +135,8 @@
let that = this; let that = this;
getRefundOrderInfo(that.mer_id, that.order_id).then( getRefundOrderInfo(that.mer_id, that.order_id).then(
res => { res => {
that.orderInfo = res.data res.data.pics4 = res.data.pics.slice(0,4);
that.orderInfo = res.data;
that.refundInfo = res.data.refund_info that.refundInfo = res.data.refund_info
}, },
err => { err => {
@ -138,7 +158,7 @@
status: that.status, status: that.status,
fail_message: that.fail_message fail_message: that.fail_message
} }
if(that.orderInfo.refund_type == 2){ if(that.orderInfo.refund_type == 2 && that.status != -1){
if (!that.refundInfo.mer_delivery_user) { if (!that.refundInfo.mer_delivery_user) {
return that.$util.Tips({ return that.$util.Tips({
title: '请填写收货人姓名' title: '请填写收货人姓名'
@ -176,6 +196,13 @@
} }
); );
}, },
//
previewImg(){
uni.previewImage({
urls: this.orderInfo.pics,
})
}
} }
} }
</script> </script>
@ -191,6 +218,15 @@
justify-content: space-between; justify-content: space-between;
border-bottom: 1px solid #f0f0f0; border-bottom: 1px solid #f0f0f0;
font-size: 30rpx; font-size: 30rpx;
.label{
flex-shrink: 0;
margin-right: 24rpx;
}
.imgs{
display: flex;
flex-wrap: wrap;
align-items: center;
}
} }
.item-txt{ .item-txt{
align-items: center; align-items: center;

View File

@ -121,7 +121,11 @@
// //
getindex(){ getindex(){
getUserInfo().then(res => { getUserInfo().then(res => {
if (res.data.mer_info.length == 0) {
return uni.showModal({
title: '暂无商户信息'
})
}
this.mer_id = res.data.service.mer_id; this.mer_id = res.data.service.mer_id;
if(this.isLogin){ if(this.isLogin){
this.getList(this.mer_id) this.getList(this.mer_id)

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

@ -242,20 +242,22 @@
showModel: false, showModel: false,
showModelCode: '', showModelCode: '',
goods: [ goods: [
// { // {
// "id": 35, // "id": 7,
// "store_name": "DT1515015024", // "store_name": " 400",
// "bar_code": "6903244675314", // "bar_code": "6922868290895",
// "manu_address": "", // "manu_address": "",
// "price": "0.00", // "price": "4.80",
// "stock": 9999999, // "stock": 9999999,
// "image": "https://lihai001.oss-cn-chengdu.aliyuncs.com/uploads/20230130/00ebcfdf75684f5494c0193075055d1.png", // "image": "http://lihai001.oss-cn-chengdu.aliyuncs.com/def/2023-11-02/202311021740247976.jpg",
// "slider_image": [], // "slider_image": [
// "spec": "1", // "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e4784202311041417185146.jpg"
// "trademark": "", // ],
// "manu_name": null, // "spec": "****()",
// "note": "" // "trademark": "****()",
// }, // "manu_name": null,
// "note": "login_dateJul 13 1998 12:00:00:000AMvalid_dateJul 13 2020 12:00:00:000AM"
// },
], ],
putGoods: { // putGoods: { //
@ -316,25 +318,29 @@
return flag; return flag;
}, },
clickImg(data, type, index){ clickImg(data, type, index){
if(!data.update&&!this.uploadImgIdList.get(data.id)){ //
let arr = []; // if(!data.update&&!this.uploadImgIdList.get(data.id)){
if(this.isNullImage(data.image))arr.push(-1); // let arr = [];
if(this.isNullImage(data.slider_image[0]))arr.push(0); // if(this.isNullImage(data.image))arr.push(-1);
if(this.isNullImage(data.slider_image[1]))arr.push(1); // if(this.isNullImage(data.slider_image[0]))arr.push(0);
if(this.isNullImage(data.slider_image[2]))arr.push(2); // if(this.isNullImage(data.slider_image[1]))arr.push(1);
this.uploadImgIdList.set(data.id, arr) // if(this.isNullImage(data.slider_image[2]))arr.push(2);
} // this.uploadImgIdList.set(data.id, arr)
let obj = this.uploadImgIdList.get(data.id) || []; // }
if(type==1&&!obj.includes(-1)) return ; // let obj = this.uploadImgIdList.get(data.id) || [];
if(type==2&&!obj.includes(index)) return ; // if(type==1&&!obj.includes(-1)) return ;
// if(type==2&&!obj.includes(index)) return ;
this.uploadImgInfo.id = data.id; this.uploadImgInfo.id = data.id;
this.uploadImgInfo.type = type; this.uploadImgInfo.type = type;
this.uploadImgInfo.index = index; this.uploadImgInfo.index = index;
if(data.image==this.defaultImageSRC||(type==2&&this.isNullImage(data.slider_image[index]))){ // if(data.image==this.defaultImageSRC||(type==2&&this.isNullImage(data.slider_image[index]))){
this.chooseImg() // this.chooseImg()
}else if(data.update){ // }else if(data.update){
this.chooseImg() // this.chooseImg()
} // }
// ,
this.chooseImg()
}, },
chooseImg(){ chooseImg(){
let that = this; let that = this;
@ -1210,6 +1216,7 @@
} }
.list-box-put { .list-box-put {
padding-bottom: 30rpx;
.item { .item {
width: 694rpx; width: 694rpx;
margin: 0 auto; margin: 0 auto;

View File

@ -16,8 +16,8 @@
<view class="message"> <view class="message">
<view class="goodstitle">{{item.store_name}}</view> <view class="goodstitle">{{item.store_name}}</view>
<view class="flex_a_c"> <view class="flex_a_c">
<view class="">分类{{item.storeCategory.cate_name}}</view> <view class="">分类{{item.storeCategory && item.storeCategory.cate_name}}</view>
<view class="unit">单位{{item.unit_name}}</view> <view class="unit">规格{{item.unit_name}}</view>
</view> </view>
<view class="bar_code">条形码{{ item.bar_code || "无" }}</view> <view class="bar_code">条形码{{ item.bar_code || "无" }}</view>
</view> </view>
@ -33,8 +33,8 @@
<view class="popup_cont" v-if="redactGoods.store_name"> <view class="popup_cont" v-if="redactGoods.store_name">
<view class="title">{{redactGoods.store_name}}</view> <view class="title">{{redactGoods.store_name}}</view>
<view class="message flex_a_c_j_sb"> <view class="message flex_a_c_j_sb">
<view class="">分类{{redactGoods.storeCategory.cate_name}}</view> <view class="">分类{{redactGoods.storeCategory && redactGoods.storeCategory.cate_name}}</view>
<view class="">单位{{redactGoods.unit_name}}</view> <view class="">规格{{redactGoods.unit_name}}</view>
<view class="">订货价{{redactGoods.price}}</view> <view class="">订货价{{redactGoods.price}}</view>
</view> </view>
<view class="bar_code flex_a_c_j_sb"> <view class="bar_code flex_a_c_j_sb">
@ -129,9 +129,10 @@
if (data.length < 9) this.status = 'nomore'; if (data.length < 9) this.status = 'nomore';
}, },
redactShow(item) { redactShow(item) {
console.log(item);
this.product_id = item.product_id this.product_id = item.product_id
this.merId = item.mer_id this.merId = item.mer_id
this.redactGoods = item this.redactGoods = {...item}
this.popupShow = true this.popupShow = true
productDetail(item.mer_id, item.product_id).then(res => { productDetail(item.mer_id, item.product_id).then(res => {
this.particulars = res.data this.particulars = res.data
@ -145,7 +146,8 @@
}, },
// //
async submitCreatedGoods() { async submitCreatedGoods() {
this.particulars.attrValue[0].stock = Number(this.goodsNum) console.log(this.particulars);
// this.particulars.attrValue[0].stock = Number(this.goodsNum)
this.particulars.attrValue[0].price = this.goodsPrive this.particulars.attrValue[0].price = this.goodsPrive
const res = await productUpdateFree(this.product_id, { const res = await productUpdateFree(this.product_id, {
attr:this.particulars.attr, attr:this.particulars.attr,

View File

@ -251,7 +251,15 @@
])), ])),
onReady() {}, onReady() {},
mounted: function() {}, mounted: function() {},
onLoad: function(options) {}, onLoad: function(options) {
let userInfo = this.$store.state.app.userInfo;
if(typeof userInfo == 'string') userInfo = JSON.parse(userInfo);
if (userInfo?.mer_info?.length == 0) {
uni.showModal({
title: '暂无商户信息'
})
}
},
onShow: function() { onShow: function() {
let that = this let that = this
let routes = getCurrentPages(); let routes = getCurrentPages();

View File

@ -128,7 +128,7 @@
线上入库 线上入库
</view> --> </view> -->
<view class="" class="bnt" @click="Fline(item)" style="width:150rpx"> <view class="" class="bnt" @click="Fline(item)" style="width:150rpx">
线下入库 修改库存
</view> </view>
<view v-if="item.is_show == 1 && item.status == 1" class="bnt" <view v-if="item.is_show == 1 && item.status == 1" class="bnt"
@ -155,7 +155,7 @@
<u-popup :show="show" @close="close" mode="center" bgColor='transparent'> <u-popup :show="show" @close="close" mode="center" bgColor='transparent'>
<image src="@/static/images/xianxia.png" mode="widthFix"></image> <image src="@/static/images/xianxia.png" mode="widthFix"></image>
<view class="popen"> <view class="popen">
<h4 v-if="this.on_line==1">线下入库</h4> <h4 v-if="this.on_line==1">修改库存</h4>
<h4 v-else>线上入库</h4> <h4 v-else>线上入库</h4>
<view class="guige"> <view class="guige">
<scroll-view scroll-y="true" class="scroll_y"> <scroll-view scroll-y="true" class="scroll_y">
@ -171,7 +171,7 @@
</view> </view>
<view class="shuru" v-if="this.on_line == 1"> <view class="shuru" v-if="this.on_line == 1">
数量: <input type="number" v-model="data.number" placeholder="请输入"> <view>数量: </view><input type="number" v-model="data.number" placeholder="请输入">
</view> </view>
<view class="btn"> <view class="btn">
<button class="btn_l" @click="close()">取消</button> <button class="btn_l" @click="close()">取消</button>
@ -391,6 +391,7 @@
this.show = true this.show = true
this.data.product_id = this.checkboxList1[0].product_id this.data.product_id = this.checkboxList1[0].product_id
this.data.unique = this.checkboxList1[0].unique this.data.unique = this.checkboxList1[0].unique
this.data.number = this.checkboxList1[0].stock
this.on_line = 1 this.on_line = 1
} else { } else {
this.show = false this.show = false
@ -971,10 +972,13 @@
.shuru { .shuru {
display: flex; display: flex;
justify-content: flex-start;
align-items: center; align-items: center;
padding: 5px; padding: 5px;
margin-left: 20px; width: 80%;
margin: 0 auto;
&>view{
flex-shrink: 0;
}
input { input {
background: #F5F5F5; background: #F5F5F5;
@ -982,6 +986,7 @@
border: 1px solid #999999; border: 1px solid #999999;
padding-left: 3px; padding-left: 3px;
margin-left: 3px; margin-left: 3px;
flex: 1;
} }
} }

View File

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

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 CRMEBCRMEB
// +----------------------------------------------------------------------
// | 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>

View File

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

View File

@ -1,24 +1,23 @@
<template> <template>
<view class="list"> <view class="list">
<view class="head"> <view class="head">
<view class="head_conent"> <view class="head_conent">
<view class="tatil"> <view class="sum">
<view class="sum"> <view class="text">已提现金额</view>
<u-count-to :startVal="0" :endVal="count"></u-count-to> <u-count-to class="num" style="color: #F84221;" :startVal="0" :endVal="sumTofixed" :decimals="2"></u-count-to>
<h3>提现次数</h3> </view>
</view> <view class="line"></view>
<view class="sum"> <view class="sum">
<u-count-to :startVal="0" :endVal="sumTofixed" :decimals="2"></u-count-to> <view class="text">已提现次数</view>
<h3>提现总额</h3> <u-count-to class="num" :startVal="0" :endVal="count"></u-count-to>
</view>
</view> </view>
</view> </view>
<u-line></u-line>
<view class="tixian" @click="tixian"> <view class="tixian" @click="tixian">
立即提现 立即提现
</view> </view>
</view> </view>
<view class="public-wrapper"> <!-- <view class="public-wrapper">
<view class="title"> <view class="title">
提现详情 提现详情
</view> </view>
@ -40,7 +39,30 @@
</scroll-view> </scroll-view>
</view> </view>
</view> </view> -->
<view class="recoder">
<block>
<!-- <picker mode="date" fields="month" :end="endDate" @change="changeDate">
<view class="time">
<view>2023-11</view>
<image src="@/static/images/arrow-right.png" class="icon"></image>
</view>
</picker> -->
<view class="card" v-for="(item,index) in UserApplylist" :key="index">
<image class="left" src="@/static/images/qianbao.png" style="width: 60rpx;height: 60rpx;"></image>
<view class="right">
<view class="item">
<view class="item_title">佣金提现到银行卡</view>
<view class="item_money">+{{item.extract_money}}</view>
</view>
<view class="item">
<view class="item_brank">{{`${item.financial_account.bank} (${item.financial_account.bank_code}) `}}</view>
<view class="item_time">{{item.create_time}}</view>
</view>
</view>
</view>
</block>
</view>
</view> </view>
</template> </template>
@ -63,6 +85,7 @@
sum: 0, sum: 0,
count:0, count:0,
scrollTop: 0, scrollTop: 0,
endDate: '',
merId: '', merId: '',
UserApplylist:[] UserApplylist:[]
} }
@ -77,13 +100,19 @@
}, },
onLoad(option) { onLoad(option) {
this.merId = option.mer_id this.merId = option.mer_id
console.log(this.merId); let date = new Date();
this.endDate = `${date.getFullYear()}-${date.getMonth()+1}-01`
console.log(this.endDate);
// console.log(this.merId);
this.ApplyList() this.ApplyList()
// this.UserApplylist.forEach((item)=>{ // this.UserApplylist.forEach((item)=>{
// console.log(item.extract_money); // console.log(item.extract_money);
// }) // })
}, },
methods: { methods: {
changeDate(e){
console.log(e.detail.value);
},
/**数字强制转为两位小数*/ /**数字强制转为两位小数*/
returnFloat(value){ returnFloat(value){
var value=Math.round(parseFloat(value)*100)/100; var value=Math.round(parseFloat(value)*100)/100;
@ -110,8 +139,10 @@
this.UserApplylist=res.data.list this.UserApplylist=res.data.list
this.count=this.UserApplylist.length this.count=this.UserApplylist.length
this.UserApplylist.forEach(item=>{ this.UserApplylist.forEach(item=>{
item.create_time=item.create_time.substr(0,10) item.financial_account.bank_code=item.financial_account.bank_code.substr(-4)
console.log(parseInt(item.extract_money)); console.log(item.financial_account.bank_code);
// item.create_time=item.create_time.substr(0,10)
// console.log(parseInt(item.extract_money));
}) })
for(let i =0; i<this.UserApplylist.length; i++){ for(let i =0; i<this.UserApplylist.length; i++){
this.sum+=parseInt(this.UserApplylist[i].extract_money) this.sum+=parseInt(this.UserApplylist[i].extract_money)
@ -128,54 +159,79 @@
<style lang="scss"> <style lang="scss">
.list { .list {
.head { .head {
width: 100%; // width: 100%;
height: 150px; // height: 150px;
display: flex; // display: flex;
background-image: linear-gradient(90deg, #FA6514 0%, #E93323 100%); // background-image: linear-gradient(90deg, #FA6514 0%, #E93323 100%);
position: relative; // position: relative;
// padding-top: 28rpx;
width: 694rpx;
margin: 28rpx auto;
padding: 28rpx;
background-color: #fff;
border-radius: 24rpx;
.head_conent { .head_conent {
width: 90%; // width: 694rpx;
height: 150px; // margin: 28rpx auto;
background-color: #fff; // height: 150px;
margin: 50px auto; // margin: 50px auto;
border-radius: 15px; // border-radius: 15px;
box-shadow: 0px 0px 5px rgba(#FA6514, 0.5); // box-shadow: 0px 0px 5px rgba(#FA6514, 0.5);
.tatil { display: flex;
display: flex; justify-content: space-around;
justify-content: space-around; align-items: center;
align-items: center;
width: 100%;
.sum { .line{
text-align: center; width: 1rpx;
margin-top: 30px; height: 70rpx;
background-color: #dfdfdf;
}
h3 { .sum {
margin-top: 15px; flex: 1;
font-size: 18px; text-align: center;
font-weight: 700; color: #737373;
color: #E93323; font-size: 30rpx;
} .num{
} font-size: 42.06rpx;
margin-bottom: 15rpx;
}
.text{
margin-bottom: 15rpx;
}
} }
} }
.tixian { .tixian {
position: absolute; width: 326rpx;
background-image: linear-gradient(90deg, #FA6514 0%, #E93323 100%); height: 53rpx;
box-shadow: 0px 0px 5px rgba(#FA6514, 0.5); line-height: 53rpx;
width: 100px; text-align: center;
height: 40px; background: #FFFFFF;
line-height: 40px; border-radius: 25rpx 25rpx 25rpx 25rpx;
border-radius: 30px; opacity: 1;
text-align: center; border: 2rpx solid #F84221;
font-size: 18px; margin: 0 auto;
color: #fff; margin-top: 20rpx;
font-weight: 700; font-size: 26rpx;
left: 37%; font-family: PingFang SC-Regular, PingFang SC;
top: 150px; font-weight: 400;
color: #F84221;
// position: absolute;
// background-image: linear-gradient(90deg, #FA6514 0%, #E93323 100%);
// box-shadow: 0px 0px 5px rgba(#FA6514, 0.5);
// width: 100px;
// height: 40px;
// line-height: 40px;
// border-radius: 30px;
// text-align: center;
// font-size: 18px;
// color: #fff;
// font-weight: 700;
// left: 37%;
// top: 150px;
} }
} }
@ -245,5 +301,75 @@
} }
} }
.recoder{
padding: 0 28rpx 28rpx 28rpx;
.time{
height: 42rpx;
font-size: 30rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500;
color: #333333;
line-height: 45rpx;
margin-bottom: 20rpx;
display: flex;
align-items: center;
.icon{
width: 30rpx;
height: 30rpx;
transform: rotate(90deg);
margin-left: 10rpx;
}
}
.card{
width: 694rpx;
background: #FFFFFF;
border-radius: 21rpx 21rpx 21rpx 21rpx;
opacity: 1;
padding: 28rpx;
margin-bottom: 20rpx;
display: flex;
align-items: center;
.left{
flex-shrink: 0;
margin-right: 20rpx;
}
.right{
flex: 1;
.item{
width: 100%;
display: flex;
justify-content: space-between;
&_title{
font-size: 30rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500;
color: #333333;
line-height: 45rpx;
}
&_money{
font-size: 33rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500;
color: #F84221;
line-height: 50rpx;
}
&_brank{
font-size: 26rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400;
color: #737373;
line-height: 39rpx;
}
&_time{
font-size: 23rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400;
color: #B3B3B3;
line-height: 34rpx;
}
}
}
}
}
} }
</style> </style>

View File

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

View File

@ -150,6 +150,25 @@
<!-- #ifndef H5 --> <!-- #ifndef H5 -->
<passwordPopup></passwordPopup> <passwordPopup></passwordPopup>
<!-- #endif --> <!-- #endif -->
<!-- 购物车 -->
<view class="card" :style="`bottom:10px`"
@click="navgo('/pages/order_addcart/order_addcart?product_type=98')">
<view class="left">
<view class="cart" :class="{ act_cart: false }" style="position: relative; z-index: 9999999">
<u--image :showLoading="true" src="/static/images/LHYC/GWC.png" width="63.09rpx"
height="63.09rpx"></u--image>
<view class="badge">
{{goodsNum}}
</view>
</view>
<view class="tot_price">
<view class=""> {{totalMoney}} </view>
<view class=""> 支持配送 售后无忧 </view>
</view>
</view>
<view class="right"> 去结算 </view>
</view>
</view> </view>
</template> </template>
@ -200,6 +219,11 @@
import { import {
getconfig, getconfig,
} from '@/api/public.js'; } from '@/api/public.js';
import {
getCartCounts,
getCartList,
} from '@/api/requesta.js';
const app = getApp(); const app = getApp();
export default { export default {
components: { components: {
@ -231,6 +255,8 @@
domain: HTTP_REQUEST_URL, domain: HTTP_REQUEST_URL,
productList: [], productList: [],
is_switch: true, is_switch: true,
goodsNum: 0,
totalMoney: 0,
where: { where: {
cate_id: '', cate_id: '',
order: '', order: '',
@ -334,8 +360,11 @@
this.get_host_product(); this.get_host_product();
this.getClassfication(); this.getClassfication();
this.getStoreType(); this.getStoreType();
this.tabIndex = 2 // this.tabIndex = 2
}, },
onShow() {
this.cartFn()
},
onReady() {}, onReady() {},
mounted() { mounted() {
uni.getStorage({ uni.getStorage({
@ -791,6 +820,55 @@
}) })
} }
}, },
skuaddcart() {
this.showcartpop = false
// this.skuform = {}
let res = postCartAdd({
cart_num: this.skuNumber,
is_new: 0,
product_attr_unique: this.skuform.sku[this.skusize].unique,
product_id: this.skuform.product_id,
product_type: this.skuform.product_type,
spread_id: "",
}).then((res, err) => {
this.cartFn()
uni.showToast({
title: "加入成功",
duration: 1000,
})
}).catch(err => {
// this.act_cart = false
uni.showToast({
title: err,
icon: "none",
duration: 1000,
})
})
},
cartFn() {
getCartList().then(res => {
// console.log(res)
this.totalMoney = 0
this.cartList = res.data.list
this.cartList.forEach(e => {
e.list.forEach(item => {
this.totalMoney += item.cart_num * item.productAttr.price
})
})
this.totalMoney = this.totalMoney.toFixed(2)
})
getCartCounts().then(res => {
this.goodsNum = res.data[0].count
})
},
navgo(url){
uni.navigateTo({
url: url
})
}
}, },
onPullDownRefresh() { onPullDownRefresh() {
@ -1661,4 +1739,59 @@
} }
} }
} }
.card {
width: 720rpx;
z-index: 99;
// margin:auto;
left: 50%;
transform: translateX(-50%);
position: fixed;
// bottom: 0;
background-color: #333333;
height: 101.64rpx;
border-radius: 50.82rpx;
overflow: hidden;
color: white;
display: flex;
justify-content: space-between;
box-sizing: border-box;
.left {
display: flex;
align-items: center;
padding: 10rpx 35rpx;
.tot_price {
display: flex;
margin-left: 42rpx;
flex-direction: column;
justify-content: space-between;
}
.badge {
position: absolute;
top: 0;
right: 0;
background-color: #f84221;
transform: translate(50%, -50%);
// padding: 10rpx 10rpx;
border-radius: 35rpx;
text-align: center;
width: 35rpx;
line-height: 35rpx;
height: 35rpx;
}
}
.right {
font-size: 33.29rpx;
line-height: 50px;
background: linear-gradient(to right, #f84221, #ff6d20);
width: 140.19rpx;
text-align: center;
}
}
.act_cart {
transition: 0.5s;
transform: scale(1.1);
}
</style> </style>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
static/images/qianbao.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB