This commit is contained in:
parent
bb58661166
commit
cb6bf8de21
|
@ -64,6 +64,10 @@
|
|||
共{{ orderInfo.total_num }}件商品,应支付
|
||||
<span class="money">¥{{ orderInfo.pay_price }}</span> ( 邮费 ¥{{orderInfo.pay_postage}})
|
||||
</view> -->
|
||||
<view class="public-total">
|
||||
共{{ orderInfo.total_num }}件商品,总计
|
||||
<span class="money">¥{{ orderInfo.pay_price }}</span>
|
||||
</view>
|
||||
<view class="wrapper">
|
||||
<view class="item acea-row row-between">
|
||||
<view>订单编号:</view>
|
||||
|
|
|
@ -138,13 +138,13 @@
|
|||
</view>
|
||||
|
||||
</view>
|
||||
<!-- <view class="public-total" v-if="item.pay_type !== 8">
|
||||
<view class="public-total" v-if="item.pay_type !== 8">
|
||||
共{{ item.total_num }}件商品,
|
||||
<span v-if="where.status <= 1">应</span>
|
||||
<!-- <span v-if="where.status <= 1">应</span>
|
||||
<span v-else>已</span>
|
||||
支付
|
||||
<span class="money" style="margin-right: 30rpx;">¥{{ item.pay_price }}</span> (邮费
|
||||
¥{{ item.pay_postage}})
|
||||
支付 -->
|
||||
总计: <span class="money" style="margin-right: 30rpx;">¥{{ item.pay_price }}</span>
|
||||
<!-- (邮费¥{{ item.pay_postage}}) -->
|
||||
</view>
|
||||
<view class="public-total" v-else>
|
||||
先货后款
|
||||
|
@ -152,7 +152,7 @@
|
|||
<span v-else>已</span>
|
||||
支付
|
||||
<span class="money" style="margin-right: 30rpx;">¥0.00</span> (邮费 ¥{{ item.pay_postage}})
|
||||
</view> -->
|
||||
</view>
|
||||
<view class="public-total" v-if="item.pay_type == 8 ">
|
||||
共{{item.total_num}}件商品,结算周期到期后付款¥{{ item.pay_price }}
|
||||
</view>
|
||||
|
|
|
@ -219,12 +219,47 @@
|
|||
</view>
|
||||
</view>
|
||||
|
||||
<view class='wrapper orderinfo' v-if="orderInfo.order_extend">
|
||||
<block v-if="orderInfo.order_extend.bank_info">
|
||||
<view class='item acea-row row-between'>
|
||||
<view>收款公司:</view>
|
||||
<view class='conter'>{{orderInfo.order_extend.bank_info.company_name}}</view>
|
||||
</view>
|
||||
<view class='item acea-row row-between'>
|
||||
<view>对公账户:</view>
|
||||
<view class='conter acea-row row-middle row-right'>{{orderInfo.order_extend.bank_info.corporate_account}}
|
||||
<!-- #ifndef H5 -->
|
||||
<text class='copy' @tap='copy(orderInfo.order_extend.bank_info.corporate_account)'>复制</text>
|
||||
<!-- #endif -->
|
||||
<!-- #ifdef H5 -->
|
||||
<text class='copy copy-data' :data-clipboard-text="orderInfo.order_extend.bank_info.corporate_account">复制</text>
|
||||
<!-- #endif -->
|
||||
</view>
|
||||
</view>
|
||||
<view class='item acea-row row-between'>
|
||||
<view>开户行:</view>
|
||||
<view class='conter'>{{orderInfo.order_extend.bank_info.corporate_bank}}</view>
|
||||
</view>
|
||||
<view class='item acea-row row-between'>
|
||||
<view>开户行地址:</view>
|
||||
<view class='conter'>{{orderInfo.order_extend.bank_info.corporate_bank_address}}</view>
|
||||
</view>
|
||||
</block>
|
||||
<block v-if="orderInfo.order_extend.corporate_voucher">
|
||||
<view class='item acea-row row-between'>
|
||||
<view>收款凭证:</view>
|
||||
<view class='conter'>
|
||||
<image :src="orderInfo.order_extend.corporate_voucher" @click="getPhotoClickIdx([orderInfo.order_extend.corporate_voucher], 0)" style="height: 100rpx;width: 100rpx;"></image>
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
<view class='wrapper orderinfo'>
|
||||
<view class='item acea-row row-between'>
|
||||
<view>订单编号:</view>
|
||||
<view class='conter acea-row row-middle row-right'>{{orderInfo.order_sn}}
|
||||
<!-- #ifndef H5 -->
|
||||
<text class='copy' @tap='copy'>复制</text>
|
||||
<text class='copy' @tap='copy(orderInfo.order_sn)'>复制</text>
|
||||
<!-- #endif -->
|
||||
<!-- #ifdef H5 -->
|
||||
<text class='copy copy-data' :data-clipboard-text="orderInfo.order_sn">复制</text>
|
||||
|
@ -898,7 +933,8 @@
|
|||
});
|
||||
getOtherOrderDetail(that.order_id).then(res => {
|
||||
uni.hideLoading();
|
||||
|
||||
res.data.orderProduct[0].cart_info.productAttr.price = res.data.orderProduct[0].cart_info.productAttr.procure_price;
|
||||
res.data.orderProduct[0].cart_info.product.price = res.data.orderProduct[0].cart_info.productAttr.procure_price;
|
||||
that.$set(that, 'orderInfo', res.data);
|
||||
that.orderInfo.take = res.data.take;
|
||||
that.$set(that, 'cartInfo', res.data.orderProduct);
|
||||
|
@ -934,11 +970,11 @@
|
|||
* 剪切订单号
|
||||
*/
|
||||
// #ifndef H5
|
||||
copy: function() {
|
||||
copy: function(str) {
|
||||
let that = this;
|
||||
// console.log(that.orderInfo.order_sn)
|
||||
uni.setClipboardData({
|
||||
data: that.orderInfo.order_sn,
|
||||
data: str,
|
||||
success: function(res) {}
|
||||
|
||||
});
|
||||
|
@ -1373,7 +1409,7 @@
|
|||
|
||||
.order-details .wrapper {
|
||||
background: #FFFFFF;
|
||||
border-radius: 21rpx 21rpx 21rpx 21rpx;
|
||||
// border-radius: 21rpx 21rpx 21rpx 21rpx;
|
||||
margin-top: 12rpx;
|
||||
padding: 30rpx;
|
||||
}
|
||||
|
|
|
@ -26,22 +26,31 @@
|
|||
placeholder-class='placeholder' name="real_name"></input></view>
|
||||
</view> -->
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<view class='name'>卡号</view>
|
||||
<view class='input'><input v-model="mode.bank_code" type='number' placeholder='请填写卡号'
|
||||
placeholder-class='placeholder' name="bank_code"></input></view>
|
||||
</view>
|
||||
<view class='item acea-row row-between-wrapper' v-if="array.length>0">
|
||||
<view class='name'>银行</view>
|
||||
<view class='name'>公司名称</view>
|
||||
<view class='input'>
|
||||
<picker @change="bindPickerChange" :value="index" :range="array" range-key="name">
|
||||
<text class='Bank'>{{array[index]["name"]}}</text>
|
||||
<text class='Bank'>{{mode.mer_name}}</text>
|
||||
<text class='iconfont icon-qiepian38'></text>
|
||||
</picker>
|
||||
</view>
|
||||
</view>
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<view class='name'>支行信息</view>
|
||||
<view class='input'><input placeholder='请输入支行信息' v-model="mode.bank_address"
|
||||
<view class='name'>对公账号</view>
|
||||
<view class='input'><input v-model="mode.bank_code" type='number' placeholder='请填写对公账号'
|
||||
placeholder-class='placeholder' name="bank_code"></input></view>
|
||||
</view>
|
||||
<view class='item acea-row row-between-wrapper' v-if="array.length>0">
|
||||
<view class='name'>开户行</view>
|
||||
<view class='input'>
|
||||
<input placeholder='请输入开户行' v-model="mode.bank_name"
|
||||
placeholder-class='placeholder' name="bank_address"></input>
|
||||
<!-- <picker @change="bindPickerChange" :value="index" :range="array" range-key="name">
|
||||
<text class='Bank'>{{array[index]["name"]}}</text>
|
||||
<text class='iconfont icon-qiepian38'></text>
|
||||
</picker> -->
|
||||
</view>
|
||||
</view>
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<view class='name'>开户行地址</view>
|
||||
<view class='input'><input placeholder='请输入开户行地址' v-model="mode.bank_address"
|
||||
placeholder-class='placeholder' name="bank_address"></input></view>
|
||||
</view>
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
|
@ -286,10 +295,12 @@
|
|||
async getApply() {
|
||||
try {
|
||||
const res = await getAdminApplyAPI(this.merId)
|
||||
this.mode.real_name = res.data.financial_bank_name
|
||||
// this.mode.real_name = res.data.financial_bank_name
|
||||
this.mode.real_name = res.data.mer_name
|
||||
this.mode.bank_code = res.data.financial_bank_code
|
||||
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_opening
|
||||
this.mode.mer_name = res.data.mer_name
|
||||
this.extract_money=res.data.extract_money
|
||||
this.lock_money = res.data.lock_money
|
||||
this.ot_margin = res.data.ot_margin
|
||||
|
@ -394,11 +405,17 @@
|
|||
value.source = this.source
|
||||
if (that.load) return;
|
||||
if (that.currentTab == 0) { //银行卡
|
||||
if (value.real_name.length == 0) return this.$util.Tips({
|
||||
title: '请填写持卡人姓名'
|
||||
});
|
||||
// if (value.real_name.length == 0) return this.$util.Tips({
|
||||
// title: '请填写持卡人姓名'
|
||||
// });
|
||||
if (value.bank_code.length == 0) return this.$util.Tips({
|
||||
title: '请填写卡号'
|
||||
title: '请填写对公账号'
|
||||
});
|
||||
if (!this.mode.bank_name) return this.$util.Tips({
|
||||
title: '请填写开户行'
|
||||
});
|
||||
if (!this.mode.bank_address) return this.$util.Tips({
|
||||
title: '请填写开户地址'
|
||||
});
|
||||
// if (that.index == 0) return this.$util.Tips({
|
||||
// title: "请选择银行"
|
||||
|
@ -442,7 +459,7 @@
|
|||
// console.log(value)
|
||||
// 提交提现方式
|
||||
const mode = {
|
||||
financial_bank_name: value.real_name,
|
||||
financial_bank_name: this.mode.mer_name,
|
||||
financial_bank_bank: value.bank_name,
|
||||
financial_bank_code: value.bank_code,
|
||||
extract_money: value.extract_price,
|
||||
|
@ -664,7 +681,7 @@
|
|||
}
|
||||
|
||||
.cash-withdrawal .wrapper .list .item .name {
|
||||
width: 130rpx;
|
||||
width: 180rpx;
|
||||
}
|
||||
|
||||
.cash-withdrawal .wrapper .list .item .input {
|
||||
|
|
|
@ -23,10 +23,10 @@
|
|||
<view>全部</view>
|
||||
<view class='num'>{{orderData.orderCount+len || 0}}</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 class='num'>{{orderData.noPay || 0}}</view>
|
||||
</view> -->
|
||||
</view>
|
||||
<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
|
||||
<view>待发货</view>
|
||||
<view class='num'>{{orderData.noPostage || 0}}</view>
|
||||
|
@ -655,43 +655,13 @@
|
|||
* 去订单详情
|
||||
*/
|
||||
goOrderDetails: function(order_id, item) {
|
||||
|
||||
|
||||
let self = this
|
||||
if (!order_id) return that.$util.Tips({
|
||||
title: '缺少订单号无法查看订单详情'
|
||||
});
|
||||
// #ifdef MP
|
||||
uni.showLoading({
|
||||
title: '正在加载',
|
||||
})
|
||||
console.log(self.orderStatus)
|
||||
openOrderSubscribe().then(() => {
|
||||
uni.hideLoading();
|
||||
if (self.orderStatus == 0||(item&&item.order_status==1)) {
|
||||
uni.navigateTo({
|
||||
url: `/pages/order_details/stay?order_id=${item.group_order_id}&product_type=${this.product_type}`
|
||||
})
|
||||
} else {
|
||||
uni.navigateTo({
|
||||
url: `/pages/order_details/indexOther?order_id=${order_id}`
|
||||
})
|
||||
}
|
||||
}).catch(() => {
|
||||
uni.hideLoading();
|
||||
})
|
||||
// #endif
|
||||
// #ifndef MP
|
||||
if (self.orderStatus == 0||(item&&item.order_status==1)) {
|
||||
uni.navigateTo({
|
||||
url: `/pages/order_details/stay?order_id=${item.group_order_id}&product_type=${this.product_type}`
|
||||
})
|
||||
} else {
|
||||
uni.navigateTo({
|
||||
url: `/pages/order_details/indexOther?order_id=${order_id}`
|
||||
})
|
||||
}
|
||||
// #endif
|
||||
},
|
||||
/**
|
||||
* 提示
|
||||
|
|
Loading…
Reference in New Issue