mkm/new_shop_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitea.lihaink.cn/mkm/new_shop_app

Browse Source
This commit is contained in:
weipengfei 2024-03-20 10:57:41 +08:00
commit 0a1844b19c
4 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pages/order_details/index.vue
View File

@ -249,32 +249,27 @@
</view>
</view>
</view>
<view v-if="orderInfo.order_extend" class='wrapper'>
<view v-for="(item,index) in orderInfo.order_extend" v-if="item" :key="index"
class='item acea-row row-between'>
<!-- <view>{{index}}：</view> -->
<view v-if="!Array.isArray(item)" class='banks' style="width: 100%;">
<view v-if="orderInfo.order_extend && orderInfo.order_extend.bank_info" class='wrapper'>
<view class='item acea-row row-between'>
<view class='banks' style="width: 100%;">
<view class="conter-item">
<text class="conter-item-name">公司名称:</text>
<text>{{item.company_name}}</text>
<text>{{orderInfo.order_extend.bank_info.company_name}}</text>
</view>
<view class="conter-item">
<text class="conter-item-name">对公账号:</text>
<text>{{item.corporate_account}}</text>
<text>{{orderInfo.order_extend.bank_info.corporate_account}}</text>
</view>
<view class="conter-item">
<text class="conter-item-name">开户行:</text>
<text>{{item.corporate_bank}}</text>
<text>{{orderInfo.order_extend.bank_info.corporate_bank}}</text>
</view>
<view class="conter-item">
<text class="conter-item-name">开户行地址:</text>
<text>{{item.corporate_bank_address}}</text>
<text>{{orderInfo.order_extend.bank_info.corporate_bank_address}}</text>
</view>
</view>
<view v-else class='conter virtual_image'>
<image v-for="(pic,i) in item" :key="i" class="picture" :src="pic"
@click="getPhotoClickIdx(item,i)"></image>
</view>
</view>
</view>
<view class='wrapper'>
@ -298,6 +293,14 @@
<view>实付款：</view>
<view class='conter'>￥{{orderInfo.pay_price}}</view>
</view>
<view class='item acea-row row-between'
v-if="orderInfo.order_extend && orderInfo.order_extend.corporate_voucher && orderInfo.pay_type == 10">
<view>付款凭证：</view>
<view class='conter' @click="getPhotoClickIdx(orderInfo.order_extend.corporate_voucher)">
<u-image width="200rpx" height="200rpx"
:src="orderInfo.order_extend.corporate_voucher"></u-image>
</view>
</view>
</view>
<view class="content-clip"
v-if="isGoodsReturn==false && (orderInfo.status != 0 || (orderInfo.status == 0 && refundNum.length != cartInfo.length && orderInfo.refund_status && orderInfo.refund_switch))">
@ -551,9 +554,15 @@
methods: {
// 图片预览
getPhotoClickIdx(list, idx) {
const ls = [];
if (!Array.isArray(list)) {
ls.push(list)
} else {
ls.concat(...list)
}
uni.previewImage({
current: list[idx], // 传 Number H5端出现不兼容
urls: list
current: 0, // 传 Number H5端出现不兼容
urls: ls
});
},
// 判断是否到支付尾款时间

3
pages/payment/get_payment.vue
View File

@ -250,7 +250,8 @@
checkForm: that.checkForm,
money: that.cartForm.total_amount,
merName: that.mer_name,
money: that.cartForm.total_amount
money: that.cartForm.total_amount,
key: res1.data.key
})
},
fail(err) {

10
pages/payment/settlement.vue
View File

@ -245,7 +245,9 @@
pay_type: '',
money: '',
merName: '',
return_url: ''
return_url: '',
key: '',
source: 999,
},
checkForm: {
address_id: '',
@ -255,7 +257,8 @@
source: 999,
takes: [],
use_coupon: {},
use_integral: false
use_integral: false,
key: ''
},
productData: []
};
@ -297,8 +300,9 @@
this.payForm.cart_id = this.checkForm.cart_id;
this.payForm.money = data.money;
this.payForm.merName = data.merName;
this.payForm.key = data.key;
this.total_coupon = data.money;
this.checkForm.key = data.key;
// #ifdef H5
this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5'

8
pages/users/order_list/index.vue
View File

@ -104,7 +104,11 @@
<view @click='goOrderDetails(item.group_order_id)'>
<view class='title acea-row row-between-wrapper'>
<view class="acea-row row-middle left-wrapper">
{{item.group_order_sn}}
<text class="iconfont icon-shangjiadingdan"></text>
<view class="store-name">
<view>{{item.orderList[0].merchant.mer_name}}</view>
</view>
<text class="iconfont icon-xiangyou"></text>
</view>
<view class='t-color'>
{{ item.orderList[0].activity_type === 2 && item.orderList[0].orderProduct[0].cart_info.productPresell.presell_type ==2 ? "待付定金" : "待付款" }}
@ -191,7 +195,7 @@
立即付款</view>
</view>
<view class='bottom acea-row row-right row-middle' v-else>
<view class='bnt b-color' @click.stop='uploadEnvidence(item.group_order_id)'>
<view class='bnt b-color' @click.stop='uploadEnvidence(item.orderList[0].order_id)'>
上传凭证</view>
</view>
</view>