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

更新

This commit is contained in:
weipengfei 2023-12-29 18:13:12 +08:00
parent bb58661166
commit cb6bf8de21
5 changed files with 126 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pages/admin/orderDetail/indexOther.vue
View File

@ -64,6 +64,10 @@
共{{ orderInfo.total_num }}件商品，应支付 共{{ orderInfo.total_num }}件商品，应支付
<span class="money">￥{{ orderInfo.pay_price }}</span> ( 邮费 ¥{{orderInfo.pay_postage}}) <span class="money">￥{{ orderInfo.pay_price }}</span> ( 邮费 ¥{{orderInfo.pay_postage}})
</view> --> </view> -->
<view class="public-total">
共{{ orderInfo.total_num }}件商品，总计
<span class="money">￥{{ orderInfo.pay_price }}</span>
</view>
<view class="wrapper"> <view class="wrapper">
<view class="item acea-row row-between"> <view class="item acea-row row-between">
<view>订单编号：</view> <view>订单编号：</view>

12
pages/admin/orderList/indexOther.vue
View File

@ -138,13 +138,13 @@
</view> </view>
</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 }}件商品， 共{{ item.total_num }}件商品，
<span v-if="where.status <= 1">应</span> <!-- <span v-if="where.status <= 1">应</span>
<span v-else>已</span> <span v-else>已</span>
支付 支付 -->
<span class="money" style="margin-right: 30rpx;">￥{{ item.pay_price }}</span> (邮费 总计: <span class="money" style="margin-right: 30rpx;">￥{{ item.pay_price }}</span>
¥{{ item.pay_postage}}) <!-- (邮费¥{{ item.pay_postage}}) -->
</view> </view>
<view class="public-total" v-else> <view class="public-total" v-else>
先货后款 先货后款
@ -152,7 +152,7 @@
<span v-else>已</span> <span v-else>已</span>
支付 支付
<span class="money" style="margin-right: 30rpx;">￥0.00</span> (邮费 ¥{{ item.pay_postage}}) <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 "> <view class="public-total" v-if="item.pay_type == 8 ">
共{{item.total_num}}件商品，结算周期到期后付款￥{{ item.pay_price }} 共{{item.total_num}}件商品，结算周期到期后付款￥{{ item.pay_price }}
</view> </view>

124
pages/order_details/indexOther.vue
View File

@ -219,47 +219,82 @@
</view> </view>
</view> </view>
<view class='wrapper orderinfo'> <view class='wrapper orderinfo' v-if="orderInfo.order_extend">
<view class='item acea-row row-between'> <block v-if="orderInfo.order_extend.bank_info">
<view>订单编号：</view> <view class='item acea-row row-between'>
<view class='conter acea-row row-middle row-right'>{{orderInfo.order_sn}} <view>收款公司：</view>
<!-- #ifndef H5 --> <view class='conter'>{{orderInfo.order_extend.bank_info.company_name}}</view>
<text class='copy' @tap='copy'>复制</text> </view>
<!-- #endif --> <view class='item acea-row row-between'>
<!-- #ifdef H5 --> <view>对公账户：</view>
<text class='copy copy-data' :data-clipboard-text="orderInfo.order_sn">复制</text> <view class='conter acea-row row-middle row-right'>{{orderInfo.order_extend.bank_info.corporate_account}}
<!-- #endif --> <!-- #ifndef H5 -->
</view> <text class='copy' @tap='copy(orderInfo.order_extend.bank_info.corporate_account)'>复制</text>
</view> <!-- #endif -->
<view class='item acea-row row-between'> <!-- #ifdef H5 -->
<view>下单时间：</view> <text class='copy copy-data' :data-clipboard-text="orderInfo.order_extend.bank_info.corporate_account">复制</text>
<view class='conter'>{{orderInfo.create_time}}</view> <!-- #endif -->
</view> </view>
<view class='item acea-row row-between'> </view>
<view>支付状态：</view> <view class='item acea-row row-between'>
<!-- <view class='conter'>已支付</view> --> <view>开户行：</view>
</view> <view class='conter'>{{orderInfo.order_extend.bank_info.corporate_bank}}</view>
<view class='item acea-row row-between' v-if="orderInfo.pay_time"> </view>
<view>支付时间：</view> <view class='item acea-row row-between'>
<!-- <view class='conter'>{{orderInfo.pay_time}}</view> --> <view>开户行地址：</view>
</view> <view class='conter'>{{orderInfo.order_extend.bank_info.corporate_bank_address}}</view>
<view class='item acea-row row-between'> </view>
<view>商品总额：</view> </block>
<view class='conter'>￥{{orderInfo.total_price}}</view> <block v-if="orderInfo.order_extend.corporate_voucher">
</view> <view class='item acea-row row-between'>
<view class='item acea-row row-between'> <view>收款凭证：</view>
<view>支付方式：</view> <view class='conter'>
<view class='conter' v-if="orderInfo.pay_type==0">余额支付</view> <image :src="orderInfo.order_extend.corporate_voucher" @click="getPhotoClickIdx([orderInfo.order_extend.corporate_voucher], 0)" style="height: 100rpx;width: 100rpx;"></image>
<view class='conter' v-if="orderInfo.pay_type==4 || orderInfo.pay_type==5">支付宝支付</view> </view>
<view class='conter' </view>
v-if="orderInfo.pay_type==1 || orderInfo.pay_type==2 || orderInfo.pay_type==3">微信支付</view> </block>
<view class='conter' v-if="orderInfo.pay_type==8 ">先货后款</view>
</view>
<view class='item acea-row row-between' v-if="orderInfo.mark">
<view>买家留言：</view>
<view class='conter'>{{orderInfo.mark}}</view>
</view>
</view> </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(orderInfo.order_sn)'>复制</text>
<!-- #endif -->
<!-- #ifdef H5 -->
<text class='copy copy-data' :data-clipboard-text="orderInfo.order_sn">复制</text>
<!-- #endif -->
</view>
</view>
<view class='item acea-row row-between'>
<view>下单时间：</view>
<view class='conter'>{{orderInfo.create_time}}</view>
</view>
<view class='item acea-row row-between'>
<view>支付状态：</view>
<!-- <view class='conter'>已支付</view> -->
</view>
<view class='item acea-row row-between' v-if="orderInfo.pay_time">
<view>支付时间：</view>
<!-- <view class='conter'>{{orderInfo.pay_time}}</view> -->
</view>
<view class='item acea-row row-between'>
<view>商品总额：</view>
<view class='conter'>￥{{orderInfo.total_price}}</view>
</view>
<view class='item acea-row row-between'>
<view>支付方式：</view>
<view class='conter' v-if="orderInfo.pay_type==0">余额支付</view>
<view class='conter' v-if="orderInfo.pay_type==4 || orderInfo.pay_type==5">支付宝支付</view>
<view class='conter'
v-if="orderInfo.pay_type==1 || orderInfo.pay_type==2 || orderInfo.pay_type==3">微信支付</view>
<view class='conter' v-if="orderInfo.pay_type==8 ">先货后款</view>
</view>
<view class='item acea-row row-between' v-if="orderInfo.mark">
<view>买家留言：</view>
<view class='conter'>{{orderInfo.mark}}</view>
</view>
</view>
</view> </view>
<view v-if="orderInfo.is_virtual == 1 && orderInfo.order_extend" class='wrapper'> <view v-if="orderInfo.is_virtual == 1 && orderInfo.order_extend" class='wrapper'>
<view v-for="(item,index) in orderInfo.order_extend" v-if="item" :key="index" <view v-for="(item,index) in orderInfo.order_extend" v-if="item" :key="index"
@ -898,7 +933,8 @@
}); });
getOtherOrderDetail(that.order_id).then(res => { getOtherOrderDetail(that.order_id).then(res => {
uni.hideLoading(); 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.$set(that, 'orderInfo', res.data);
that.orderInfo.take = res.data.take; that.orderInfo.take = res.data.take;
that.$set(that, 'cartInfo', res.data.orderProduct); that.$set(that, 'cartInfo', res.data.orderProduct);
@ -934,11 +970,11 @@
* 剪切订单号 * 剪切订单号
*/ */
// #ifndef H5 // #ifndef H5
copy: function() { copy: function(str) {
let that = this; let that = this;
// console.log(that.orderInfo.order_sn) // console.log(that.orderInfo.order_sn)
uni.setClipboardData({ uni.setClipboardData({
data: that.orderInfo.order_sn, data: str,
success: function(res) {} success: function(res) {}
}); });
@ -1373,7 +1409,7 @@
.order-details .wrapper { .order-details .wrapper {
background: #FFFFFF; background: #FFFFFF;
border-radius: 21rpx 21rpx 21rpx 21rpx; // border-radius: 21rpx 21rpx 21rpx 21rpx;
margin-top: 12rpx; margin-top: 12rpx;
padding: 30rpx; padding: 30rpx;
} }

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

@ -25,23 +25,32 @@
<view class='input'><input v-model="mode.real_name" placeholder='请输入持卡人姓名' <view class='input'><input v-model="mode.real_name" placeholder='请输入持卡人姓名'
placeholder-class='placeholder' name="real_name"></input></view> placeholder-class='placeholder' name="real_name"></input></view>
</view> --> </view> -->
<view class='item acea-row row-between-wrapper'>
<view class='name'>公司名称</view>
<view class='input'>
<text class='Bank'>{{mode.mer_name}}</text>
<text class='iconfont icon-qiepian38'></text>
</view>
</view>
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
<view class='name'>卡号</view> <view class='name'>对公账号</view>
<view class='input'><input v-model="mode.bank_code" type='number' placeholder='请填写卡号' <view class='input'><input v-model="mode.bank_code" type='number' placeholder='请填写对公账号'
placeholder-class='placeholder' name="bank_code"></input></view> placeholder-class='placeholder' name="bank_code"></input></view>
</view> </view>
<view class='item acea-row row-between-wrapper' v-if="array.length>0"> <view class='item acea-row row-between-wrapper' v-if="array.length>0">
<view class='name'>银行</view> <view class='name'>开户行</view>
<view class='input'> <view class='input'>
<picker @change="bindPickerChange" :value="index" :range="array" range-key="name"> <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='Bank'>{{array[index]["name"]}}</text>
<text class='iconfont icon-qiepian38'></text> <text class='iconfont icon-qiepian38'></text>
</picker> </picker> -->
</view> </view>
</view> </view>
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
<view class='name'>支行信息</view> <view class='name'>开户行地址</view>
<view class='input'><input placeholder='请输入支行信息' v-model="mode.bank_address" <view class='input'><input placeholder='请输入开户行地址' v-model="mode.bank_address"
placeholder-class='placeholder' name="bank_address"></input></view> placeholder-class='placeholder' name="bank_address"></input></view>
</view> </view>
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
@ -286,10 +295,12 @@
async getApply() { async getApply() {
try { try {
const res = await getAdminApplyAPI(this.merId) 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_code = res.data.financial_bank_code
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_opening
this.mode.mer_name = res.data.mer_name
this.extract_money=res.data.extract_money this.extract_money=res.data.extract_money
this.lock_money = res.data.lock_money this.lock_money = res.data.lock_money
this.ot_margin = res.data.ot_margin this.ot_margin = res.data.ot_margin
@ -394,12 +405,18 @@
value.source = this.source value.source = this.source
if (that.load) return; if (that.load) return;
if (that.currentTab == 0) { //银行卡 if (that.currentTab == 0) { //银行卡
if (value.real_name.length == 0) return this.$util.Tips({ // if (value.real_name.length == 0) return this.$util.Tips({
title: '请填写持卡人姓名' // title: '请填写持卡人姓名'
}); // });
if (value.bank_code.length == 0) return this.$util.Tips({ 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({ // if (that.index == 0) return this.$util.Tips({
// title: "请选择银行" // title: "请选择银行"
// }); // });
@ -442,7 +459,7 @@
// console.log(value) // console.log(value)
// 提交提现方式 // 提交提现方式
const mode = { const mode = {
financial_bank_name: value.real_name, financial_bank_name: this.mode.mer_name,
financial_bank_bank: value.bank_name, financial_bank_bank: value.bank_name,
financial_bank_code: value.bank_code, financial_bank_code: value.bank_code,
extract_money: value.extract_price, extract_money: value.extract_price,
@ -664,7 +681,7 @@
} }
.cash-withdrawal .wrapper .list .item .name { .cash-withdrawal .wrapper .list .item .name {
width: 130rpx; width: 180rpx;
} }
.cash-withdrawal .wrapper .list .item .input { .cash-withdrawal .wrapper .list .item .input {

38
pages/users/order_list/indexOther.vue
View File

@ -23,10 +23,10 @@
<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==2 ? "on": ""' @click="statusClick(2)">
<view>待发货</view> <view>待发货</view>
<view class='num'>{{orderData.noPostage || 0}}</view> <view class='num'>{{orderData.noPostage || 0}}</view>
@ -655,43 +655,13 @@
* 去订单详情 * 去订单详情
*/ */
goOrderDetails: function(order_id, item) { goOrderDetails: function(order_id, item) {
let self = this let self = this
if (!order_id) return that.$util.Tips({ if (!order_id) return that.$util.Tips({
title: '缺少订单号无法查看订单详情' title: '缺少订单号无法查看订单详情'
}); });
// #ifdef MP uni.navigateTo({
uni.showLoading({ url: `/pages/order_details/indexOther?order_id=${order_id}`
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
}, },
/** /**
* 提示 * 提示