root
/
school_uni
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

11

master
tianyi 20 hours ago
parent
a2d14e1753
commit
3b5aff3359
4 changed files with 70 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      package1/buyFood/buyFood.vue
  2. 2
      package1/group/groupBuySingle.vue
  3. 42
      package1/order/orderConfirm.vue
  4. 71
      package1/order/returnOrder.vue

8
package1/buyFood/buyFood.vue
View File

@ -788,7 +788,7 @@
}, },
fail: function(err) { fail: function(err) {
uni.redirectTo({ uni.redirectTo({
url: '/package1/order/orderDetail?id=' + that.currentOrderId url: '/package1/order/orderConfirm?id=' + that.currentOrderId + '&amount=' + this.backendTotalAmount
}); });
} }
}); });
@ -818,7 +818,7 @@
handlePaymentSuccess() { handlePaymentSuccess() {
if (!this.isGroupBuy) { if (!this.isGroupBuy) {
uni.redirectTo({ uni.redirectTo({
url: '/package1/order/orderDetail?id=' + this.currentOrderId url: '/package1/order/orderConfirm?id=' + that.currentOrderId + '&amount=' + this.backendTotalAmount
}); });
} else { } else {
let isInitiating = !this.groupItem.groupId; let isInitiating = !this.groupItem.groupId;
@ -829,7 +829,7 @@
return; return;
} else if (isJoining) { } else if (isJoining) {
uni.redirectTo({ uni.redirectTo({
url: '/package1/order/orderDetail?id=' + this.currentOrderId url: '/package1/order/orderConfirm?id=' + that.currentOrderId + '&amount=' + this.backendTotalAmount
}); });
} }
} }
@ -837,7 +837,7 @@
onPintuanPopupChange(e) { onPintuanPopupChange(e) {
if(!e.show){ if(!e.show){
uni.redirectTo({ uni.redirectTo({
url: '/package1/order/orderDetail?id=' + this.currentOrderId url: '/package1/order/orderConfirm?id=' + that.currentOrderId + '&amount=' + this.backendTotalAmount
}); });
} }
}, },

2
package1/group/groupBuySingle.vue
View File

@ -1459,7 +1459,7 @@
}, false, false).then((res3) => { }, false, false).then((res3) => {
if(res3.code == 200){ if(res3.code == 200){
uni.redirectTo({ uni.redirectTo({
url: '/package1/order/orderDetail?id=' + that.currentOrderId + '&groupId=' + that.groupId url: '/package1/order/orderConfirm?id=' + that.currentOrderId + '&groupId=' + that.groupId + '&amount=' + this.backendTotalAmount
}); });
}else{ }else{
that.tui.toast("订单创建失败，请联系客服处理"); that.tui.toast("订单创建失败，请联系客服处理");

42
package1/order/orderConfirm.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<!-- 支付确认页 --> <!-- 订单详情中间页 -->
<view class="page1"> <view class="page1">
<view class="title"> <view class="title">
<view class="title-sreach"> <view class="title-sreach">
@ -7,38 +7,24 @@
<uni-icons type="left" size="28"></uni-icons> <uni-icons type="left" size="28"></uni-icons>
</view> </view>
<view class="title-name" :style="{'padding-top': menuButtonInfo.top +'px'}"> <view class="title-name" :style="{'padding-top': menuButtonInfo.top +'px'}">
支付订单 订单状态
</view> </view>
</view> </view>
</view> </view>
<view class="content"> <view class="content">
<view class="box1"> <view class="box1">
<view style="height: 70rpx;line-height: 70rpx;text-align: center;"> <view style="height: 70rpx;line-height: 70rpx;text-align: center;">
支付剩余时间 59:19 支付完成
</view> </view>
<view style="height: 90rpx;line-height: 90rpx;text-align: center;font-weight: 700;font-size: 30rpx;"> <view style="height: 90rpx;line-height: 90rpx;text-align: center;font-weight: 700;font-size: 30rpx;">
￥<text style="font-size: 60rpx;">449.96</text> ￥<text style="font-size: 60rpx;">{{amount == null?0:amount}}</text>
</view> </view>
<view style="height: 40rpx;text-align: center;color: red;"> <view style="height: 40rpx;text-align: center;color: red;">
若拼团失败，将会为您自动退款 点击可查看订单详情
</view> </view>
</view> </view>
<view class="box1" style="display: flex;padding: 40rpx;"> <view class="btn" @tap="getorder">
<view style="flex: 1;"> 查看订单详情
<view style="height: 42rpx;line-height: 42rpx;display: flex;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4c8e0cc311db4d38ab43e019673c4b8c.png" alt="" style="width: 42rpx;height: 42rpx;margin-right: 20rpx;" />
<text style="font-size: 30rpx;font-weight: 700;">微信支付</text>
</view>
<view style="text-align: right;margin-left: 60rpx;color: #777;width: 146rpx;">
使用微信支付
</view>
</view>
<view style="width: 36rpx;padding-top: 20rpx;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/02bff7edc4e04caaa1868955ff684f1f.png" alt="" style="width: 36rpx;height: 36rpx;" />
</view>
</view>
<view class="btn">
确认付款
</view> </view>
</view> </view>
</view> </view>
@ -48,16 +34,26 @@
export default { export default {
data() { data() {
return { return {
menuButtonInfo: {} menuButtonInfo: {},
id:'',
groupId:'',
amount:0,
} }
}, },
onLoad(option) { onLoad(option) {
this.id = option.id
this.groupId = option.groupId
this.amount = option.amount
}, },
onShow() { onShow() {
this.menuButtonInfo = uni.getMenuButtonBoundingClientRect() this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
}, },
methods: { methods: {
getorder(){
uni.redirectTo({
url: '/package1/order/orderDetail?id=' + that.id + '&groupId=' + that.groupId
});
},
back() { back() {
uni.navigateBack() uni.navigateBack()
} }

71
package1/order/returnOrder.vue
View File

@ -8,6 +8,9 @@
<view class="back-btn" @tap="back" :style="{'top': menuButtonInfo.top +'px'}"> <view class="back-btn" @tap="back" :style="{'top': menuButtonInfo.top +'px'}">
<uni-icons type="left" size="28"></uni-icons> <uni-icons type="left" size="28"></uni-icons>
</view> </view>
<view class="title-name" :style="{'padding-top': menuButtonInfo.top +'px'}">
申请售后
</view>
</view> </view>
</view> </view>
<view class="content"> <view class="content">
@ -20,7 +23,7 @@
<img :src="item1.productPicture" alt=""> <img :src="item1.productPicture" alt="">
</view> </view>
<view class="goods-content"> <view class="goods-content">
<view class="goods-name"> <view class="goods-name" style="display: flex;">
{{item1.productName}} {{item1.productName}}
<view class="goods-num" v-if="sellTime == 0"> <view class="goods-num" v-if="sellTime == 0">
<view class="num-plus" style="background: #999;color: #fff;" <view class="num-plus" style="background: #999;color: #fff;"
@ -171,26 +174,32 @@
{{orderDetail.deliveryInfo.finishTime ? orderDetail.deliveryInfo.finishTime : '尽快送达' | formatTime}} {{orderDetail.deliveryInfo.finishTime ? orderDetail.deliveryInfo.finishTime : '尽快送达' | formatTime}}
</view> </view>
</view> </view>
<uni-forms-item label="上传图片" name="pictures"> <view style="height: 160rpx;line-height: 160rpx;display: flex;" v-if="orderDetail.deliveryType == 1">
<view class="upload-img" @tap="pictureAdd" <view style="flex: 1;color: #777;font-weight: 700;">
style="background: #eee;text-align: center;line-height: 160rpx;"> 上传图片
<uni-icons type="camera" size="28" color="#777"></uni-icons> </view>
</view> <view style="color: #000;font-weight: 700;width: 160rpx;">
<view style="overflow-x: scroll;display: flex;width: 350rpx;"> <view class="upload-img" @tap="pictureAdd"
<view v-if="returnData.pictures !=''" style="width: 160rpx;height: 160rpx;margin-left: 20rpx;"> style="background: #eee;text-align: center;line-height: 160rpx;">
<img :src="returnData.pictures" alt="" class="upload-img"> <uni-icons type="camera" size="28" color="#777"></uni-icons>
</view>
<view style="overflow-x: scroll;display: flex;width: 350rpx;">
<view v-if="returnData.pictures !=''" style="width: 160rpx;height: 160rpx;margin-left: 20rpx;">
<img :src="returnData.pictures" alt="" class="upload-img">
</view>
</view> </view>
</view> </view>
</uni-forms-item> </view>
<view class="content-box" style="line-height: 200rpx;"> <view style="height: 170rpx;line-height: 170rpx;display: flex;margin-top: 20px;" v-if="orderDetail.deliveryType == 1">
<view class="content-title"> <view style="flex: 1;color: #777;font-weight: 700;">
订单备注<text>*</text> 订单备注
</view> </view>
<view style="height: 200rpx;background: #eee;border-radius: 40rpx;padding: 20rpx;width: 70%;"> <view style="height: 200rpx;background: #eee;border-radius: 40rpx;padding: 20rpx;width: 70%;">
<textarea name="" id="" cols="30" rows="10" placeholder="请填写备注" v-model="returnData.reason" <textarea name="" id="" cols="30" rows="10" placeholder="请填写备注" v-model="returnData.reason"
style="height: 160rpx;width: 100%;"></textarea> style="height: 160rpx;width: 100%;"></textarea>
</view> </view>
</view> </view>
<view class="btn" <view class="btn"
@tap.stop="$refs.carPopup.open()"> @tap.stop="$refs.carPopup.open()">
售后原因 售后原因
@ -210,29 +219,34 @@
<view class="car-close"> <view class="car-close">
<uni-icons type="close" size="30" color="#fff"></uni-icons> <uni-icons type="close" size="30" color="#fff"></uni-icons>
</view> </view>
<view class="car-title"> <view class="car-title" style="padding: 0 10px;">
选择退款原因 选择退款原因
</view> </view>
<view class=""> <view style="padding: 0 10px;">
<view class=""> <view style="height:80rpx;">
只退商品
<radio :checked="sellTime==0" name="sellTime" @click="checkSellTime(0)" /> <radio :checked="sellTime==0" name="sellTime" @click="checkSellTime(0)" />
只退商品
</view> </view>
<view class=""> <view style="height:80rpx;">
退配送费
<radio :checked="sellTime==1" name="sellTime" @click="checkSellTime(1)" /> <radio :checked="sellTime==1" name="sellTime" @click="checkSellTime(1)" />
退配送费
</view> </view>
<view class=""> <view style="height:80rpx;">
全额退款（商家原因）
<radio :checked="sellTime==2" name="sellTime" @click="checkSellTime(2)" /> <radio :checked="sellTime==2" name="sellTime" @click="checkSellTime(2)" />
全额退款（商家原因）
</view> </view>
<view class=""> <view style="height:80rpx;">
全额退款（配送员原因）
<radio :checked="sellTime==3" name="sellTime" @click="checkSellTime(3)" /> <radio :checked="sellTime==3" name="sellTime" @click="checkSellTime(3)" />
全额退款（配送员原因）
</view> </view>
<view class=""> <view style="height:80rpx;">
全额退款（商家+配送员原因）
<radio :checked="sellTime==4" name="sellTime" @click="checkSellTime(4)" /> <radio :checked="sellTime==4" name="sellTime" @click="checkSellTime(4)" />
全额退款（商家+配送员原因）
</view> </view>
</view> </view>
<view class="btn" @tap="chooseReturnType()">确认</view> <view class="btn" @tap="chooseReturnType()">确认</view>
@ -577,6 +591,13 @@
bottom: 0; bottom: 0;
left: 0; left: 0;
} }
.title-name{
padding-top: 110rpx;
font-size: 36rpx;
font-weight: 700;
flex: 1;
text-align: center;
}
.box1{ .box1{
width: 95%; width: 95%;
margin: 0 auto 20rpx; margin: 0 auto 20rpx;

Write Preview
Loading…
Cancel
Save