xinyilu/nurseWeChatAppletUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
曹辉 2023-03-03 13:31:01 +08:00
parent c00453f273
commit 47a5797e61
10 changed files with 63 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pages/Applforrefund/Applforrefund.vue
View File

@ -10,7 +10,9 @@
<image src="../../static/huijiantou.png" mode=""></image> <image src="../../static/huijiantou.png" mode=""></image>
</view> </view>
<view class="priceinfo">退款金额 <view class="priceinfo">退款金额
<view class="priceback">￥{{order.totalPrice}} <view class="priceback" v-if="order.orderType=='DIRECT_BUY'">￥{{order.totalPrice}}
</view>
<view class="priceback" v-if="order.orderType=='INTEGRAL_EXCHANGE'">{{order.integralExchangeSill}}
</view> </view>
<!-- <view class="words"> <!-- <view class="words">
已修改，最多{{order.totalPrice}}，含发货邮费 0.00 已修改，最多{{order.totalPrice}}，含发货邮费 0.00

18
pages/CommodityDetails/CommodityDetails.vue
View File

@ -314,6 +314,7 @@
attributeDetailsId: '', //商品属性明细表id attributeDetailsId: '', //商品属性明细表id
goodsAttributeId: '', goodsAttributeId: '',
goodsAttributeDetailsId: '', goodsAttributeDetailsId: '',
originalTotalPrice: null,
}, },
couponListtrue: [], couponListtrue: [],
couponListfalse: [], couponListfalse: [],
@ -394,10 +395,21 @@
type: 'error' type: 'error'
}) })
} else { } else {
this.updata.goodsPrice = Number(this.updata.goodsPrice)
this.buyshow = false this.buyshow = false
this.updata.totalPrice = (this.updata.goodsPrice * this.updata this.updata.totalPrice = Number((this.updata.goodsPrice *
.goodsCount).toFixed( this.updata.goodsCount).toFixed(
2) 2))
this.updata.originalTotalPrice = this.updata.totalPrice
if (this.couponId) {
this.updata.couponId = this.couponId
this.updata.couponTitle = this.coupon.couponTitle
this.updata.discountPrice = Number(this.coupon.couponPrice)
this.updata.couponConsumePrice = Number(this.coupon
.couponConsumePrice)
this.updata.totalPrice = Number((this.updata.originalTotalPrice -
this.updata.discountPrice).toFixed(2))
}
addStationGoodsOrder(this.updata).then(res => { addStationGoodsOrder(this.updata).then(res => {
if (res.code == 500) { if (res.code == 500) {
that.$refs.uToast.show({ that.$refs.uToast.show({

8
pages/CommodityDetails/CommodityDetailsstyle.scss
View File

@ -230,13 +230,13 @@
.goodsStock{ .goodsStock{
font-size: 24rpx; font-size: 24rpx;
position: absolute; position: absolute;
top: 75%; top: 55%;
right: 10rpx; right: 10rpx;
} }
.prices{ .prices{
position: absolute; position: absolute;
top: 70%; top: 70%;
left: 35%; left: 230rpx;
.Paidinprice{ .Paidinprice{
margin-left: 10rpx; margin-left: 10rpx;
color: #fff; color: #fff;
@ -254,7 +254,7 @@
font-size: 36rpx; font-size: 36rpx;
position: absolute; position: absolute;
top: 3%; top: 3%;
left: 35%; left: 230rpx;
font-weight: 600; font-weight: 600;
width: 58%; width: 58%;
// height: 85rpx; // height: 85rpx;
@ -262,7 +262,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 3; -webkit-line-clamp:2;
word-break: break-all; word-break: break-all;
} }

5
pages/CommodityOrder/CommodityOrder.vue
View File

@ -32,12 +32,9 @@
<span class="box">×{{item.goodsCount}}</span> <span class="box">×{{item.goodsCount}}</span>
</view> </view>
<view class="refund"> <view class="refund">
<span v-if="item.orderType=='DIRECT_BUY'"> <span>
实付款： 实付款：
</span> </span>
<span v-if="item.orderType=='INTEGRAL_EXCHANGE'">
实付：
</span>
<text class="price" v-if="item.orderType=='DIRECT_BUY'">￥{{item.totalPrice}}</text> <text class="price" v-if="item.orderType=='DIRECT_BUY'">￥{{item.totalPrice}}</text>
<text class="price" <text class="price"
v-if="item.orderType=='INTEGRAL_EXCHANGE'">{{item.integralExchangeSill}}</text> v-if="item.orderType=='INTEGRAL_EXCHANGE'">{{item.integralExchangeSill}}</text>

9
pages/integral/integral.vue
View File

@ -12,7 +12,7 @@
</view> --> </view> -->
</view> </view>
<view class="title"> <view class="title">
{{integral}} {{list.integral}}
</view> </view>
<view class="centertext"> <view class="centertext">
<!-- 20积分将于2022.01.01过期 --> <!-- 20积分将于2022.01.01过期 -->
@ -184,7 +184,9 @@
buyshow: false, //兑换购买 buyshow: false, //兑换购买
yaoqingshow: false, yaoqingshow: false,
yaoqingimg: null, yaoqingimg: null,
list: null, list: {
integral: 0
},
inviteimg: null, //邀请二维码 inviteimg: null, //邀请二维码
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
@ -406,6 +408,7 @@
upbuy() { upbuy() {
integralGoodsOrder(this.updata).then(res => { integralGoodsOrder(this.updata).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.selectPatientSignInifo();
this.$refs.uToast.show({ this.$refs.uToast.show({
title: '兑换商品成功', title: '兑换商品成功',
type: 'success' type: 'success'
@ -483,12 +486,12 @@
signIninfo() { signIninfo() {
signIn(this.patientId).then(res => { signIn(this.patientId).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.selectPatientSignInifo();
this.$refs.uToast.show({ this.$refs.uToast.show({
title: '今日签到成功', title: '今日签到成功',
type: 'success', type: 'success',
duration: '1000', duration: '1000',
}) })
this.selectPatientSignInifo();
} }
}) })
}, },

14
pages/orderDetails/orderDetails.scss
View File

@ -133,7 +133,6 @@
border-radius: 20rpx; border-radius: 20rpx;
margin: 30rpx auto; margin: 30rpx auto;
position: relative; position: relative;
padding-bottom: 130rpx;
.name { .name {
width: 95%; width: 95%;
@ -152,6 +151,8 @@
} }
.details { .details {
height: 380rpx;
position: relative;
.detailslist { .detailslist {
display: flex; display: flex;
@ -175,17 +176,18 @@
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
width: 70%; width: 65%;
} }
span:nth-child(2) { span:nth-child(2) {
color: #969394; color: #969394;
float: right; float: right;
margin-right: 30rpx; margin-right: 20rpx;
} }
.bottom { .bottom {
margin-top: 40rpx; // margin-top: 40rpx;
margin-top: 15rpx;
.box { .box {
color: #969394; color: #969394;
@ -209,7 +211,6 @@
right: 20rpx; right: 20rpx;
bottom: 100rpx; bottom: 100rpx;
} }
} }
} }
@ -218,7 +219,7 @@
position: absolute; position: absolute;
left: 2.5%; left: 2.5%;
bottom: 20rpx; bottom: 20rpx;
.pay { .pay {
font-size: 30rpx; font-size: 30rpx;
color: #020000; color: #020000;
@ -230,7 +231,6 @@
color: #D43953; color: #D43953;
margin-right: 10rpx; margin-right: 10rpx;
} }
} }
} }
} }

17
pages/orderDetails/orderDetails.vue
View File

@ -20,15 +20,20 @@
<view class="model"> <view class="model">
<view class="top"> <view class="top">
<span>{{order.goodsName}}</span> <span>{{order.goodsName}}</span>
<span>￥{{order.goodsPrice}}</span> <span v-if="order.orderType=='DIRECT_BUY'">￥{{order.goodsPrice}}</span>
</view> </view>
<view class="bottom"> <view class="bottom">
<span class="box">型号：{{order.goodsAttributeName}}</span> <span class="box">型号：{{order.goodsAttributeName}}</span>
<span class="box">X{{order.goodsCount}}</span> <span class="box">X{{order.goodsCount}}</span>
</view> </view>
<view class="bottom" v-if="order.discountPrice>0">
<span class="box" style='width:40%'>优惠金额：</span>
<span class="box">-￥{{order.discountPrice}}</span>
</view>
<view class="refund" @tap='gorefundType' <view class="refund" @tap='gorefundType'
v-if="order.orderStatus != 'WAIT_PAY'&& order.orderStatus!='CANCEL'&&order.orderStatus!='WAIT_REFUND'&&order.orderStatus!='REFUNDED'&&order.orderStatus!='RETURNED_GOODS'&&order.orderStatus!='WAIT_RETURNED_GOODS'"> v-if="order.orderStatus != 'WAIT_PAY'&& order.orderStatus!='CANCEL'&&order.orderStatus!='WAIT_REFUND'&&order.orderStatus!='REFUNDED'&&order.orderStatus!='RETURNED_GOODS'&&order.orderStatus!='WAIT_RETURNED_GOODS'">
申请退款 <text v-if="order.orderType=='INTEGRAL_EXCHANGE'">取消兑换</text>
<text v-if="order.orderType=='DIRECT_BUY'">申请退款</text>
</view> </view>
<view class="refund" v-if="order.orderStatus=='WAIT_REFUND'" @tap='goAftersalesdetails(order)'> <view class="refund" v-if="order.orderStatus=='WAIT_REFUND'" @tap='goAftersalesdetails(order)'>
退款中 退款中
@ -47,9 +52,15 @@
</view> </view>
</view> </view>
</view> </view>
<!-- <view class="payinfo" style="bottom:90rpx">
<text class="pay" style="color: #969394;">优惠金额</text>
<text class="pay" style="float: right; color: #969394;">-￥{{order.discountPrice}}</text>
</view> -->
<view class="payinfo"> <view class="payinfo">
<text class="pay">实付款</text> <text class="pay">实付款</text>
<text class="price">￥{{order.totalPrice}}</text> <text class="price" v-if="order.orderType=='DIRECT_BUY'">￥{{order.totalPrice}}</text>
<text class="price"
v-if="order.orderType=='INTEGRAL_EXCHANGE'">{{order.integralExchangeSill}}积分</text>
</view> </view>
</view> </view>
</view> </view>

4
pages/payorderDetails/payorderDetails.vue
View File

@ -26,6 +26,10 @@
<span class="box">型号：{{order.goodsAttributeName}}</span> <span class="box">型号：{{order.goodsAttributeName}}</span>
<span class="box">X{{order.goodsCount}}</span> <span class="box">X{{order.goodsCount}}</span>
</view> </view>
<view class="bottom" v-if="order.discountPrice>0">
<span class="box" style='width:40%'>优惠金额：</span>
<span class="box">-￥{{order.discountPrice}}</span>
</view>
<view class="refund" @tap='gorefundType' <view class="refund" @tap='gorefundType'
v-if="order.orderStatus != 'WAIT_PAY'&& order.orderStatus!='CANCEL'&&order.orderStatus!='WAIT_REFUND'&&order.orderStatus!='REFUNDED'&&order.orderStatus!='RETURNED_GOODS'&&order.orderStatus!='WAIT_RETURNED_GOODS'"> v-if="order.orderStatus != 'WAIT_PAY'&& order.orderStatus!='CANCEL'&&order.orderStatus!='WAIT_REFUND'&&order.orderStatus!='REFUNDED'&&order.orderStatus!='RETURNED_GOODS'&&order.orderStatus!='WAIT_RETURNED_GOODS'">
申请退款 申请退款

3
pages/refundType/refundType.scss
View File

@ -7,7 +7,6 @@
box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03); box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
border-radius: 20rpx; border-radius: 20rpx;
margin: 0 auto; margin: 0 auto;
padding-bottom: 60rpx;
.name { .name {
width: 95%; width: 95%;
@ -27,6 +26,8 @@
.details { .details {
.detailslist { .detailslist {
position: relative;
height:340rpx;
display: flex; display: flex;
image { image {

9
pages/refundType/refundType.vue
View File

@ -10,13 +10,18 @@
<view class="model"> <view class="model">
<view class="top"> <view class="top">
<span>{{order.goodsName}}</span> <span>{{order.goodsName}}</span>
<span>￥{{order.goodsPrice}}</span> <span v-if="order.orderType=='DIRECT_BUY'">￥{{order.goodsPrice}}</span>
</view> </view>
<view class="bottom"> <view class="bottom">
<span>型号：{{order.goodsAttributeName}}</span> <span>型号：{{order.goodsAttributeName}}</span>
<span>X{{order.goodsCount}}</span> <span>X{{order.goodsCount}}</span>
</view> </view>
</view>
<view class="payinfo">
<text class="pay">实付款</text>
<text class="price" v-if="order.orderType=='DIRECT_BUY'">￥{{order.totalPrice}}</text>
<text class="price"
v-if="order.orderType=='INTEGRAL_EXCHANGE'">{{order.integralExchangeSill}}积分</text>
</view> </view>
</view> </view>
</view> </view>