|
|
@@ -569,568 +569,3 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-=======
|
|
|
-<template>
|
|
|
- <view class="content">
|
|
|
- <view class="inner">
|
|
|
- <!-- 时间、价格 -->
|
|
|
- <view class="time-price">
|
|
|
- <text class="time">待支付</text>
|
|
|
- <view class="price-box">
|
|
|
- <text class="unit">¥</text>
|
|
|
- <text class="num">{{order ? (Number(order.payMoney) || 0).toFixed(2) : "0.00"}}</text>
|
|
|
- </view>
|
|
|
-
|
|
|
- </view>
|
|
|
- <!-- 支付方式 -->
|
|
|
- <view class="pay-type">
|
|
|
- <view class="title">支付方式</view>
|
|
|
- <radio-group @change="handlePayTypeChange">
|
|
|
- <view class="item">
|
|
|
- <view class="left">
|
|
|
- <image src="/static/images/wecha_pay.png" mode=""></image>
|
|
|
- <text class="text">微信支付</text>
|
|
|
- </view>
|
|
|
- <label>
|
|
|
- <radio :value="1" :checked="payType === 1" />
|
|
|
- </label>
|
|
|
- </view>
|
|
|
- <!-- #ifdef APP-PLUS||H5 -->
|
|
|
- <view class="item">
|
|
|
- <view class="left">
|
|
|
- <image src="/static/images/zfb.png" mode=""></image>
|
|
|
- <text class="text">支付宝</text>
|
|
|
- </view>
|
|
|
- <label>
|
|
|
- <radio :value="2" :checked="payType === 2" />
|
|
|
- </label>
|
|
|
- </view>
|
|
|
- <!-- #endif -->
|
|
|
- </radio-group>
|
|
|
- </view>
|
|
|
- <!-- 订单详情查看 -->
|
|
|
- <view class="order-info">
|
|
|
- <view class="title">订单信息</view>
|
|
|
- <view class="item">
|
|
|
- <text class="label">订单编号</text>
|
|
|
- <view class="sn-box">
|
|
|
- <view>
|
|
|
- <view class="text">{{order.orderCode}}</view>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- <view class="item">
|
|
|
- <text class="label">下单时间</text>
|
|
|
- <text class="text">{{ formattedDate}} </text>
|
|
|
- </view>
|
|
|
- <view class="item">
|
|
|
- <text class="label">订单金额</text>
|
|
|
- <text class="text"
|
|
|
- v-if="order!=null">{{order ? (Number(order.totalPrice) || 0).toFixed(2) : "0.00"}}</text>
|
|
|
- </view>
|
|
|
- <view class="item">
|
|
|
- <text class="label">优惠券</text>
|
|
|
- <text class="text">-¥{{order ? (Number(order.discountMoney) || 0).toFixed(2) : "0.00"}} </text>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
-
|
|
|
- </view>
|
|
|
- <view class="btn-box">
|
|
|
- <view class="btn" @click="payOrder()">去支付</view>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
-</template>
|
|
|
-
|
|
|
-<script>
|
|
|
- import dayjs from 'dayjs';
|
|
|
- import {
|
|
|
- weChatPayment
|
|
|
- } from '@/api/pay_new'
|
|
|
- import {
|
|
|
- zfbPayment,
|
|
|
- // weChatPayment
|
|
|
- } from '@/api/pay'
|
|
|
- import {
|
|
|
- payConfirmReward,
|
|
|
- } from '@/api/order'
|
|
|
- export default {
|
|
|
- data() {
|
|
|
- return {
|
|
|
- type:'',
|
|
|
- payPrice: null,
|
|
|
- newOrder: {},
|
|
|
- payType: 2,
|
|
|
- order: null,
|
|
|
- orderId: null,
|
|
|
- payDelivery: 0,
|
|
|
- payMoney: 0,
|
|
|
- config: null,
|
|
|
- payType: 1,
|
|
|
- user: null,
|
|
|
- couponUserId: null
|
|
|
- }
|
|
|
- },
|
|
|
- computed: {
|
|
|
- formattedDate() {
|
|
|
- return this.order?.createTime ? dayjs(this.order.createTime).format('YYYY-MM-DD HH:mm:ss') : '';
|
|
|
- },
|
|
|
- payLimitTime() {
|
|
|
- return this.order?.updateTime ?
|
|
|
- dayjs(this.order.updateTime).add(2, 'day').format('YYYY-MM-DD HH:mm:ss') :
|
|
|
- '';
|
|
|
- }
|
|
|
- },
|
|
|
- onLoad(options) {
|
|
|
- // if (options.payPrice) {
|
|
|
- // this.payPrice = options.payPrice;
|
|
|
- // }
|
|
|
- if (options.couponUserId) {
|
|
|
- this.couponUserId = options.couponUserId;
|
|
|
- }
|
|
|
- console.log("支付订单是>>", options)
|
|
|
- this.type = options.type;
|
|
|
- // this.liveId = options.liveId
|
|
|
- // this.productId=options.productId
|
|
|
- // console.log("支付订单",options)
|
|
|
-
|
|
|
- if (options.orderList) {
|
|
|
- try {
|
|
|
- const decoded = decodeURIComponent(options.orderList);
|
|
|
- this.order = JSON.parse(decoded) || {}; // 默认空对象
|
|
|
- } catch (e) {
|
|
|
- console.error('参数解析失败:', e);
|
|
|
- this.order = {}; // 显式赋默认值
|
|
|
- }
|
|
|
- }
|
|
|
- },
|
|
|
- // //发送给朋友
|
|
|
- // onShareAppMessage(res) {
|
|
|
- // const combinationOrderId = this.combinationOrderId ?
|
|
|
- // `&combinationOrderId=${encodeURIComponent(this.combinationOrderId)}` : ''
|
|
|
- // return {
|
|
|
- // title: "帮TA支付",
|
|
|
- // path: '/pages_user/user/otherPaymentOrder?orderId=' + this.orderId + combinationOrderId,
|
|
|
- // imageUrl: '/static/images/logo.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
|
|
|
- // }
|
|
|
-
|
|
|
- // },
|
|
|
- methods: {
|
|
|
- weixinPayOrder() {
|
|
|
- var data = {
|
|
|
- orderId: this.order.orderId,
|
|
|
- payType: 1
|
|
|
- // payType: this.order.payType
|
|
|
- };
|
|
|
-
|
|
|
- var that = this;
|
|
|
- uni.showLoading();
|
|
|
- weChatPayment(data).then(
|
|
|
- res => {
|
|
|
- if (res.code == 200) {
|
|
|
- console.log(res);
|
|
|
-
|
|
|
- if (res.payType == 1 || res.payType == 2) {
|
|
|
- var result = JSON.parse(res.result);
|
|
|
- uni.requestPayment({
|
|
|
- provider: 'wxpay',
|
|
|
- timeStamp: result.timeStamp,
|
|
|
- nonceStr: result.nonceStr,
|
|
|
- package: result.package,
|
|
|
- signType: result.signType,
|
|
|
- paySign: result.paySign,
|
|
|
- success: function(res) {
|
|
|
- uni.hideLoading();
|
|
|
-
|
|
|
- uni.redirectTo({
|
|
|
- url: "./success?order=" + JSON.stringify(that.newOrder)
|
|
|
- })
|
|
|
-
|
|
|
-
|
|
|
- },
|
|
|
- fail: function(err) {
|
|
|
- uni.showToast({
|
|
|
- icon: 'none',
|
|
|
- title: 'fail:' + JSON.stringify(err),
|
|
|
- });
|
|
|
- uni.hideLoading();
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
-
|
|
|
- } else {
|
|
|
- uni.showToast({
|
|
|
- icon: 'none',
|
|
|
- title: res.msg,
|
|
|
- });
|
|
|
- }
|
|
|
- },
|
|
|
- rej => {}
|
|
|
- );
|
|
|
-
|
|
|
- },
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- payOrder() {
|
|
|
- if (this.type == 'win') {
|
|
|
- this.toPayConfirmReward()
|
|
|
- } else {
|
|
|
- if (this.payType == 1) {
|
|
|
- console.log("这个order", this.order)
|
|
|
- const {
|
|
|
- itemJson,
|
|
|
- ...newOrder
|
|
|
- } = this.order;
|
|
|
- this.newOrder = newOrder;
|
|
|
- console.log("这个newOrder", this.newOrder)
|
|
|
- this.weixinPayOrder()
|
|
|
- } else {
|
|
|
- uni.showToast({
|
|
|
- title: "暂时无可用支付",
|
|
|
- icon: 'none'
|
|
|
- })
|
|
|
- }
|
|
|
- }
|
|
|
- },
|
|
|
-
|
|
|
- // 选微信支付或者支付宝支付
|
|
|
- handlePayTypeChange(e) {
|
|
|
- this.payType = e.detail.value; // 获取选中的 value
|
|
|
- console.log('当前选中:', this.payType);
|
|
|
- },
|
|
|
- toPayConfirmReward() {
|
|
|
- let data={
|
|
|
- orderId:this.order.orderId
|
|
|
- }
|
|
|
- payConfirmReward(data).then(
|
|
|
- res => {
|
|
|
- if (res.code == 200) {
|
|
|
- uni.showToast({
|
|
|
- icon: 'none',
|
|
|
- title: res.msg,
|
|
|
- });
|
|
|
- } else {
|
|
|
- uni.showToast({
|
|
|
- icon: 'none',
|
|
|
- title: "请求失败",
|
|
|
- });
|
|
|
- }
|
|
|
- },
|
|
|
- rej => {}
|
|
|
- );
|
|
|
- },
|
|
|
-
|
|
|
- getUserInfo() {
|
|
|
- getUserInfo().then(
|
|
|
- res => {
|
|
|
- if (res.code == 200) {
|
|
|
- if (res.user != null) {
|
|
|
- this.user = res.user;
|
|
|
- }
|
|
|
- } else {
|
|
|
- uni.showToast({
|
|
|
- icon: 'none',
|
|
|
- title: "请求失败",
|
|
|
- });
|
|
|
- }
|
|
|
- },
|
|
|
- rej => {}
|
|
|
- );
|
|
|
- },
|
|
|
- getStoreConfig() {
|
|
|
- getStoreConfig().then(
|
|
|
- res => {
|
|
|
- if (res.code == 200) {
|
|
|
- this.config = res.data
|
|
|
- console.log(this.config);
|
|
|
- }
|
|
|
- },
|
|
|
- rej => {}
|
|
|
- );
|
|
|
- },
|
|
|
- payTypeChange(e) {
|
|
|
- if (this.combinationOrderId) {
|
|
|
- this.editPayTypeByCombinationId(e.detail.value)
|
|
|
- } else {
|
|
|
- this.editPayType(e.detail.value)
|
|
|
- }
|
|
|
- },
|
|
|
- editPayType(payType) {
|
|
|
- var data = {
|
|
|
- orderId: this.orderId,
|
|
|
- payType: payType
|
|
|
- };
|
|
|
- var that = this;
|
|
|
- uni.showLoading();
|
|
|
- editPayType(data).then(
|
|
|
- res => {
|
|
|
- if (res.code == 200) {
|
|
|
- console.log(res);
|
|
|
- uni.hideLoading();
|
|
|
- that.order = res.order;
|
|
|
- that.order.orderCodes = that.order.orderCode ? [that.order.orderCode] : []
|
|
|
- that.orderCode = that.order.orderCode
|
|
|
- // this.payType=this.order.payType
|
|
|
- this.payMoney = this.order.payMoney;
|
|
|
- this.payDelivery = this.order.payDelivery;
|
|
|
- } else {
|
|
|
- uni.showToast({
|
|
|
- icon: 'none',
|
|
|
- title: res.msg,
|
|
|
- });
|
|
|
- }
|
|
|
- },
|
|
|
- rej => {}
|
|
|
- );
|
|
|
-
|
|
|
- },
|
|
|
-
|
|
|
- }
|
|
|
- }
|
|
|
-</script>
|
|
|
-
|
|
|
-<style lang="scss">
|
|
|
- page {
|
|
|
- height: 100%;
|
|
|
- }
|
|
|
-
|
|
|
- .content {
|
|
|
- height: 100%;
|
|
|
- display: flex;
|
|
|
- flex-direction: column;
|
|
|
- justify-content: space-between;
|
|
|
-
|
|
|
- .inner {
|
|
|
- padding: 20upx;
|
|
|
-
|
|
|
- .time-price {
|
|
|
- box-sizing: border-box;
|
|
|
- padding: 50upx 0upx;
|
|
|
- background: #FFFFFF;
|
|
|
- border-radius: 16upx;
|
|
|
- display: flex;
|
|
|
- flex-direction: column;
|
|
|
- align-items: center;
|
|
|
-
|
|
|
- .time {
|
|
|
- font-size: 32upx;
|
|
|
- font-family: PingFang SC;
|
|
|
- font-weight: 500;
|
|
|
- color: #222222;
|
|
|
- line-height: 1;
|
|
|
- text-align: center;
|
|
|
- }
|
|
|
-
|
|
|
- .desc {
|
|
|
- margin: 30upx 0upx 15upx;
|
|
|
- font-size: 26upx;
|
|
|
- font-family: PingFang SC;
|
|
|
- color: #999999;
|
|
|
- line-height: 1;
|
|
|
- text-align: center;
|
|
|
- }
|
|
|
-
|
|
|
- .price-box {
|
|
|
- display: flex;
|
|
|
- align-items: flex-end;
|
|
|
- margin-top: 28upx;
|
|
|
-
|
|
|
- .unit {
|
|
|
- font-size: 32upx;
|
|
|
- font-family: PingFang SC;
|
|
|
- font-weight: bold;
|
|
|
- color: #FF6633;
|
|
|
- line-height: 1.3;
|
|
|
- margin-right: 10upx;
|
|
|
- }
|
|
|
-
|
|
|
- .num {
|
|
|
- font-size: 56upx;
|
|
|
- font-family: PingFang SC;
|
|
|
- font-weight: bold;
|
|
|
- color: #FF6633;
|
|
|
- line-height: 1;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- .pay-type {
|
|
|
- box-sizing: border-box;
|
|
|
- background: #FFFFFF;
|
|
|
- border-radius: 16upx;
|
|
|
- margin-top: 20upx;
|
|
|
- padding: 40upx 30upx;
|
|
|
- display: flex;
|
|
|
- flex-direction: column;
|
|
|
- justify-content: space-between;
|
|
|
-
|
|
|
- .title {
|
|
|
- font-size: 28upx;
|
|
|
- font-family: PingFang SC;
|
|
|
- font-weight: 500;
|
|
|
- color: #999999;
|
|
|
- line-height: 1;
|
|
|
- margin-bottom: 10upx;
|
|
|
- }
|
|
|
-
|
|
|
- .item {
|
|
|
- padding: 15upx 0upx;
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- justify-content: space-between;
|
|
|
-
|
|
|
- .left {
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
-
|
|
|
- image {
|
|
|
- width: 44upx;
|
|
|
- height: 44upx;
|
|
|
- margin-right: 20upx;
|
|
|
- }
|
|
|
-
|
|
|
- .text {
|
|
|
- font-size: 30upx;
|
|
|
- font-family: PingFang SC;
|
|
|
- font-weight: bold;
|
|
|
- color: #222222;
|
|
|
- line-height: 1;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- .order-info {
|
|
|
- margin-top: 20upx;
|
|
|
- background: #FFFFFF;
|
|
|
- border-radius: 16upx;
|
|
|
- padding: 40upx 30upx;
|
|
|
-
|
|
|
- .title {
|
|
|
- font-size: 30upx;
|
|
|
- font-family: PingFang SC;
|
|
|
- font-weight: bold;
|
|
|
- color: #222222;
|
|
|
- line-height: 1;
|
|
|
- }
|
|
|
-
|
|
|
- .item {
|
|
|
- margin-top: 40upx;
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- justify-content: space-between;
|
|
|
-
|
|
|
- .label {
|
|
|
- font-size: 26upx;
|
|
|
- font-family: PingFang SC;
|
|
|
- font-weight: 500;
|
|
|
- color: #666666;
|
|
|
- line-height: 1;
|
|
|
- }
|
|
|
-
|
|
|
- .text {
|
|
|
- font-size: 26upx;
|
|
|
- font-family: PingFang SC;
|
|
|
- font-weight: 500;
|
|
|
- color: #222222;
|
|
|
- line-height: 32upx;
|
|
|
- }
|
|
|
-
|
|
|
- .cont-text {
|
|
|
- font-size: 26upx;
|
|
|
- font-family: PingFang SC;
|
|
|
- font-weight: 500;
|
|
|
- color: #666666;
|
|
|
-
|
|
|
- .bold {
|
|
|
- color: #111111;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- .sn-box {
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
-
|
|
|
- .copy-btn {
|
|
|
- width: 58upx;
|
|
|
- height: 32upx;
|
|
|
- line-height: 32upx;
|
|
|
- text-align: center;
|
|
|
- font-size: 22upx;
|
|
|
- font-weight: 500;
|
|
|
- color: #222222;
|
|
|
- background: #F5F5F5;
|
|
|
- border-radius: 4upx;
|
|
|
- margin-left: 24upx;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- .line {
|
|
|
- width: 100%;
|
|
|
- height: 1px;
|
|
|
- background: #F0F0F0;
|
|
|
- margin-top: 30upx;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- .btn-box {
|
|
|
- height: 242upx;
|
|
|
- background: #FFFFFF;
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- justify-content: center;
|
|
|
- flex-direction: column;
|
|
|
-
|
|
|
- .btn {
|
|
|
- width: 91.73%;
|
|
|
- height: 88upx;
|
|
|
- line-height: 88upx;
|
|
|
- font-size: 30upx;
|
|
|
- font-family: PingFang SC;
|
|
|
- font-weight: bold;
|
|
|
- color: #FFFFFF;
|
|
|
- text-align: center;
|
|
|
- background: #2BC7B9;
|
|
|
- border-radius: 44upx;
|
|
|
- margin-bottom: 10rpx;
|
|
|
- }
|
|
|
-
|
|
|
- .other-btn {
|
|
|
- width: 91.73%;
|
|
|
- height: 88upx;
|
|
|
- line-height: 88upx;
|
|
|
- font-size: 30upx;
|
|
|
- font-family: PingFang SC;
|
|
|
- font-weight: bold;
|
|
|
- color: #2BC7B9;
|
|
|
- border: 1rpx solid #2BC7B9;
|
|
|
- text-align: center;
|
|
|
- background: #FFFFFF;
|
|
|
- border-radius: 44upx;
|
|
|
- margin-bottom: 10rpx;
|
|
|
- position: relative;
|
|
|
-
|
|
|
- .share {
|
|
|
- display: inline-block;
|
|
|
- position: absolute;
|
|
|
- top: 0;
|
|
|
- left: 0;
|
|
|
- width: 100%;
|
|
|
- height: 100%;
|
|
|
- opacity: 0;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
->>>>>>> 8c8ec24aaf25141f3a66af3c1d21e5415ce32117
|
|
|
-</style>
|
