售后bug修改

pages.json

@@ -646,7 +646,8 @@
 					{
 						"path": "refundDetail",
 						"style": {
-							"navigationBarTitleText": "退款详情"
+							"navigationBarTitleText": "退款详情",
+							"enablePullDownRefresh": true
 						}
 					},
 					{

pages/shop/confirm.vue

@@ -16,7 +16,7 @@
 				<view class="numJsbox">
 					<view class="numJj" @click="calculation(1)">-</view>
 					<view class="goodsnum">
-					<input type="number" value="" v-model="goodsnum" class="goodsnumInput"/>
+					<input type="number" @input="inputChange" value="" v-model="goodsnum" class="goodsnumInput"/>
 					</view>
 					<view class="numJj" @click="calculation(2)">+</view>
 				</view>
@@ -288,6 +288,26 @@
 					url:'../user/addCar/cailist'
 				})
 			},
+			inputChange(){
+				//console.log(this.goodsnum)
+				if(this.goodsInfo.oneQty){
+					if(this.goodsInfo.oneQty>this.goodsnum||this.goodsInfo.oneQty==this.goodsnum){
+						
+						this.jsMoney()
+					}else{
+						uni.showToast({
+							 title: '超过限购次数',
+							 icon:'none',
+							 duration: 2000
+						});
+						this.goodsnum=this.goodsInfo.oneQty
+						this.jsMoney()
+					}
+				}else{
+					
+					this.jsMoney()
+				}
+			},
 			calculation(type){
 				console.log(type)
 				console.log(this.goodsnum)

pages/subPack/refund.vue

@@ -25,7 +25,7 @@
 					 <view class="numJsbox">
 					 	<view class="numJj" @click="calculation(1)">-</view>
 					 	<view class="goodsnum">
-					 	 <input @blur="goodsnumBlur" type="number" value="" v-model="goodsnum" class="goodsnumInput"/>
+					 	 <input @input="goodsnumBlur" type="number" value="" v-model="goodsnum" class="goodsnumInput"/>
 					 	</view>
 					 	<view class="numJj" @click="calculation(2)">+</view>
 					 </view>
@@ -178,6 +178,7 @@
 				goodsType:'',
 				couponCount:1,
 				shData:'',
+				couponIds:'',
 			}
 		},
 		onLoad(opt) {
@@ -229,7 +230,7 @@
 				}
 				this.$http('openOrderManagement/sheetRefundReason', params,'GET').then(res => {
 					this.refundReasonList=res.data
-				
+				   
 				}) 
 			},
 			sheetRefundReason2(){
@@ -287,6 +288,7 @@
 					uni.hideLoading();
 					if(res.code==0){
 						this.totalPrice=res.data.total
+						this.couponIds=res.data.couponIds
 					}else{
 						uni.showToast({
 							title: res.msg,
@@ -303,10 +305,30 @@
 						icon: 'none',
 						duration: 3000
 					});
-					this.goodsnum=this.maxNum
+					this.$nextTick(() => {
+						this.goodsnum=this.maxNum
+						this.queryPrice(this.goodsnum)
+					})
+					
 					
+					
+				}else
+				if(this.goodsnum<1){
+					uni.showToast({
+						title: '退款份数不能小于1',
+						icon: 'none',
+						duration: 3000
+					});
+					this.$nextTick(() => {
+						this.goodsnum=1
+						this.queryPrice(this.goodsnum)
+					})
+					
+				}
+				else{
+					this.queryPrice(this.goodsnum)
 				}
-				this.queryPrice(this.goodsnum)
+				
 			},
 			calculation(type){
 				if(type==1){
@@ -344,7 +366,7 @@
 				if(this.type==1){
 					var params={
 						hType:this.type,
-						couponID:this.couponCodeArr.join(','),
+						couponID:this.couponIds,
 						money:this.totalPrice,
 						refundReasonID:this.refundReasonID,
 						sheetID:this.orderData.data.id,
@@ -389,6 +411,14 @@
 				})
 			},
 			submitFn(){
+				if(this.refundReasonTxt==''){
+					uni.showToast({
+						title: '请选择退款原因',
+						icon: 'none',
+						duration: 3000
+					});
+					return false
+				}
 				var that=this;
 				uni.showModal({
 				    title: '申请退款',
@@ -571,6 +601,9 @@
 .chahao{
 	width: 21rpx;height: 21rpx;
 	padding-top: 10rpx;
+	padding-left: 10rpx;
+	padding-right: 10rpx;
+	padding-bottom: 10rpx;
 }
 .tkTitle{
 	font-weight: 500;

pages/subPack/refundDetail.vue

@@ -112,10 +112,18 @@
 		<view class="goodsline flex" >
 				 <view class="goodsLeft">订单编号</view>
 				 <view class="goodRight" style="display: flex;">
-						<image src="../../static/img2/copy.png" mode="" class="copyIcon"></image>
+						<image  @click="copy(data.openSheetRefund.sheetCode)" src="../../static/img2/copy.png" mode="" class="copyIcon"></image>
+								<span>{{data.openSheetRefund.sheetCode}}</span>
+				 </view>
+		</view>
+		<view class="goodsline flex" >
+				 <view class="goodsLeft">退款编号</view>
+				 <view class="goodRight" style="display: flex;">
+						<image  @click="copy(data.openSheetRefund.code)" src="../../static/img2/copy.png" mode="" class="copyIcon"></image>
 								<span>{{data.openSheetRefund.code}}</span>
 				 </view>
 		</view>
+		
 	 </view>
 	 
  </view>
@@ -130,7 +138,7 @@
  		 <view class="codeLineBox">
  			<view class="codeLine" v-for="(v,i) in data.openSheetRefund.couponCode.split(',')">
 				<span style="padding-right: 10rpx;">{{v}}</span>
-				<image src="../../static/img2/copy.png" mode="" class="copyIcon"></image>
+				<image src="../../static/img2/copy.png" mode="" @click="copy(v)" class="copyIcon"></image>
 					
 			</view>
  		 </view>
@@ -204,7 +212,19 @@
 			},
 			codeFn(){
 				this.codeShow=true;	
-			}
+			},
+			copy(txt) {
+				uni.setClipboardData({
+					data: txt,
+					success: function() {
+						uni.showToast({
+							title: '复制成功',
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				});
+			},
 			
 			
 		},
@@ -334,6 +354,9 @@
 .chahao{
 	width: 21rpx;height: 21rpx;
 	padding-top: 10rpx;
+	padding-left: 10rpx;
+	padding-right: 10rpx;
+	padding-bottom: 10rpx;
 }
 .tkTitle{
 	font-weight: 500;

pages/user/myOrder/activityOrderDetail.vue

@@ -172,7 +172,11 @@
 		</view>
 		<view style="padding-left: 24rpx;padding-right: 24rpx;" v-if="orderData.writeoff!=0||orderData.refund!=0">
 			<view class="ysyBox">
-				<view class="ysyLeft" style="font-weight: 500;color: #222222;">已使用({{orderData.writeoff}})·退款({{orderData.refund}})</view>
+				<view class="ysyLeft" style="font-weight: 500;color: #222222;">
+					<span v-if="orderData.writeoff!=0">已使用({{orderData.writeoff}})</span>
+					<span v-if="orderData.writeoff!=0&&orderData.refund!=0">·</span>
+					<span v-if="orderData.refund!=0">退款({{orderData.refund}})</span>
+				</view>
 				<view class="ysyRgiht" @click="sheetQRCode">
 					<span style="color: #9A9A9A;padding-right: 16rpx;">查看详情</span> 
 					<image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
@@ -429,8 +433,8 @@
 			<view class="tkline2" v-for="(item,index) in sheetQRCodeList">
 				<view class="tklineTop2">
 					<view class="tkZt">
-						<span v-if="item.writeoffState==3">已使用</span>
-						<span v-if="item.writeoffState==1">未使用</span>
+						<span v-if="item.orderType==3||item.orderType==1">已使用</span>
+						<span v-if="item.orderType==2">未使用</span>
 						<span v-if="item.refundState==0"></span>
 						<span v-if="item.refundState==1">·退款中</span>
 						<span v-if="item.refundState==2">·退款成功</span>
@@ -438,38 +442,56 @@
 						<span v-if="item.refundState==4">·退款失败</span>
 					
 					</view>
-					<view class="tkSeeD" @click="refundDetail(item)" v-if="item.writeoffState==1">
+					<view class="tkSeeD" @click="refundDetail(item)" v-if="item.orderType!=1">
 						<span>退款详情</span>
 						<image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
 					</view>
-					<view v-if="item.writeoffState==3">
-						<view class="tkSeeD" @click="refundDetail(item)" v-if="item.refundState==4||item.refundState==2||item.refundState==1||item.refundState==3">
-							<span>退款详情</span>
-							<image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
-						</view>
-						<view class="tkSeeD" @click="goSh(item)" v-if="item.refundState==0">
-							<span>申请售后</span>
-							<image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
-						</view>
+					<view class="tkSeeD" @click="goSh(item)" v-if="item.orderType==1">
+						<span>申请售后</span>
+						<image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
 					</view>
 				</view>
 				<view class="tkRow">
-					<view class="tlRowLeft" v-if="item.writeoffState==3">使用份数</view>
+					<view class="tlRowLeft" v-if="item.orderType==3||item.orderType==1">使用份数</view>
 					<view class="tlRowLeft" v-else>退款份数</view>
-					<view style="color: #222222;">1份</view>
+					<view style="color: #222222;" v-if="item.orderType==3||item.orderType==1">1份</view>
+					<view style="color: #222222;" v-else>{{item.couponCount}}份</view>
 				</view>
-				<view class="tkRow">
+				<view class="tkRow" v-if="item.orderType==3||item.orderType==1">
 					<view class="tlRowLeft">消费门店</view>
 					<view style="color: #222222;">{{item.writeoffShopName?item.writeoffShopName:''}}</view>
 				</view>
-				<view class="tkRow">
+				<view class="tkRow" v-if="item.orderType==3||item.orderType==1">
 					<view class="tlRowLeft">消费时间</view>
 					<view style="color: #222222;">{{item.writeoffTime?item.writeoffTime:''}}</view>
 				</view>
-				<view class="tkRow">
+				<view class="tkRow" v-if="item.orderType==1">
+					<view class="tlRowLeft">券&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</view>
+					<view style="color: #222222;" class="xiahuaxian">{{item.qrCode}}</view>
+				</view>
+				<view class="tkRow" v-if="item.orderType==3">
 					<view class="tlRowLeft">券&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</view>
-					<view style="color: #222222;" class="{'xiahuaxian':item.writeoffState==3}">{{item.qrCode}}</view>
+					<view style="color: #222222;" class="xiahuaxian">{{item.couponCode}}</view>
 				</view>
+				
+				<view class="tkRow" v-if="item.orderType==2">
+					<view class="tlRowLeft">退款金额</view>
+					<view style="color: #222222;">{{item.money?item.money:''}}</view>
+				</view>
+				<view class="tkRow" v-if="item.orderType==2">
+					<view class="tlRowLeft">退款方式</view>
+					<view style="color: #222222;">原路返回</view>
+				</view>
+				<view class="tkRow" v-if="item.orderType==2">
+					<view class="tlRowLeft">到账时间</view>
+					<view style="color: #222222;">{{item.refundTime?item.refundTime:''}}</view>
+				</view>
+				<view class="tkRow" v-if="item.orderType==2">
+					<view class="tlRowLeft">券&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</view>
+					<view style="color: #222222;" class="xiahuaxian">{{item.couponCode}}</view>
+				</view>
+							
+			
 			</view>
 			<nodata v-if="sheetQRCodeList.length==0"></nodata>
 		</view>

pages/user/myOrder/mallOrderDetail.vue

@@ -131,7 +131,11 @@
 		</view>
 		<view style="padding-left: 24rpx;padding-right: 24rpx;" v-if="orderData.writeoff!=0||orderData.refund!=0">
 			<view class="ysyBox">
-				<view class="ysyLeft" style="font-weight: 500;color: #222222;">已使用({{orderData.writeoff}})·退款({{orderData.refund}})</view>
+				<view class="ysyLeft" style="font-weight: 500;color: #222222;">
+					<span v-if="orderData.writeoff!=0">已使用({{orderData.writeoff}})</span>
+					<span v-if="orderData.writeoff!=0&&orderData.refund!=0">·</span>
+					<span v-if="orderData.refund!=0">退款({{orderData.refund}})</span>
+				</view>
 				<view class="ysyRgiht" @click="sheetQRCode">
 					<span style="color: #9A9A9A;padding-right: 16rpx;">查看详情</span> 
 					<image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
@@ -401,8 +405,9 @@
 			<view class="tkline2" v-for="(item,index) in sheetQRCodeList">
 				<view class="tklineTop2">
 					<view class="tkZt">
-						<span v-if="item.writeoffState==3">已使用</span>
-						<span v-if="item.writeoffState==1">未使用</span>
+							<!-- 已使用无退款：orderType=1 已使用有退款：orderType=3  未使用有退款：orderType=2 -->
+						<span v-if="item.orderType==3||item.orderType==1">已使用</span>
+						<span v-if="item.orderType==2">未使用</span>
 						<span v-if="item.refundState==0"></span>
 						<span v-if="item.refundState==1">·退款中</span>
 						<span v-if="item.refundState==2">·退款成功</span>
@@ -410,40 +415,58 @@
 						<span v-if="item.refundState==4">·退款失败</span>
 					
 					</view>
-					<view class="tkSeeD" @click="refundDetail(item)" v-if="item.writeoffState==1">
+					<view class="tkSeeD" @click="refundDetail(item)" v-if="item.orderType!=1">
 						<span>退款详情</span>
 						<image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
 					</view>
-					<view v-if="item.writeoffState==3">
-						<view class="tkSeeD" @click="refundDetail(item)" v-if="item.refundState==4||item.refundState==2||item.refundState==1||item.refundState==3">
-							<span>退款详情</span>
-							<image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
-						</view>
-						<view class="tkSeeD" @click="goSh(item)" v-if="item.refundState==0">
-							<span>申请售后</span>
-							<image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
-						</view>
+					<view class="tkSeeD" @click="goSh(item)" v-if="item.orderType==1">
+						<span>申请售后</span>
+						<image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
 					</view>
 					
 					
+					
 				</view>
 				<view class="tkRow">
-					<view class="tlRowLeft" v-if="item.writeoffState==3">使用份数</view>
+					<view class="tlRowLeft" v-if="item.orderType==3||item.orderType==1">使用份数</view>
 					<view class="tlRowLeft" v-else>退款份数</view>
-					<view style="color: #222222;">1份</view>
+					<view style="color: #222222;" v-if="item.orderType==3||item.orderType==1">1份</view>
+					<view style="color: #222222;" v-else>{{item.couponCount}}份</view>
 				</view>
-				<view class="tkRow">
+				<view class="tkRow" v-if="item.orderType==3||item.orderType==1">
 					<view class="tlRowLeft">消费门店</view>
 					<view style="color: #222222;">{{item.writeoffShopName?item.writeoffShopName:''}}</view>
 				</view>
-				<view class="tkRow">
+				<view class="tkRow" v-if="item.orderType==3||item.orderType==1">
 					<view class="tlRowLeft">消费时间</view>
 					<view style="color: #222222;">{{item.writeoffTime?item.writeoffTime:''}}</view>
 				</view>
-				<view class="tkRow">
+				<view class="tkRow" v-if="item.orderType==1">
 					<view class="tlRowLeft">券&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</view>
-					<view style="color: #222222;" :class="{'xiahuaxian':item.writeoffState==3}">{{item.qrCode}}</view>
+					<view style="color: #222222;" class="xiahuaxian">{{item.qrCode}}</view>
 				</view>
+				<view class="tkRow" v-if="item.orderType==3">
+					<view class="tlRowLeft">券&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</view>
+					<view style="color: #222222;" class="xiahuaxian">{{item.couponCode}}</view>
+				</view>
+				
+				<view class="tkRow" v-if="item.orderType==2">
+					<view class="tlRowLeft">退款金额</view>
+					<view style="color: #222222;">{{item.money?item.money:''}}</view>
+				</view>
+				<view class="tkRow" v-if="item.orderType==2">
+					<view class="tlRowLeft">退款方式</view>
+					<view style="color: #222222;">原路返回</view>
+				</view>
+				<view class="tkRow" v-if="item.orderType==2">
+					<view class="tlRowLeft">到账时间</view>
+					<view style="color: #222222;">{{item.refundTime?item.refundTime:''}}</view>
+				</view>
+				<view class="tkRow" v-if="item.orderType==2">
+					<view class="tlRowLeft">券&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</view>
+					<view style="color: #222222;" class="xiahuaxian">{{item.couponCode}}</view>
+				</view>
+			
 			</view>
 			<nodata v-if="sheetQRCodeList.length==0"></nodata>
 		</view>
@@ -1691,7 +1714,10 @@
 }
 .chahaoIMg{
 	width: 22rpx;height: 22rpx;
-	margin-top: 4rpx;
+	padding-top: 4rpx;
+	    padding-left: 10px;
+	    padding-right: 10rpx;
+	    padding-bottom: 10rpx;
 }
 .tkBox{
 	position: fixed;

pages/user/myOrder/myOrder.vue

@@ -61,7 +61,7 @@
 				<view class="afterSalesLine" v-for="(item,index) in RefundList"  @click="goReDetail(item)">
 					<view class="afterSalesLineTop">
 						<view class="" style="display: flex;">
-							<view class="afterSalesShop">{{item.WriteoffShopName?item.WriteoffShopName:'暂无门店'}}</view>
+							<view class="afterSalesShop">{{item.WriteoffShopName?item.WriteoffShopName:item.serverShopName}}</view>
 							<image class="afterSalesLineJt" src="/static/img2/jt1.png" mode=""></image>
 						</view>
 						<view class="afterSalesLineState">退款</view>

pages/user/myOrder/paintOrderDetail.vue

@@ -128,7 +128,11 @@
 		</view>
 		<view style="padding-left: 24rpx;padding-right: 24rpx;" v-if="orderData.writeoff!=0||orderData.refund!=0">
 			<view class="ysyBox">
-				<view class="ysyLeft" style="font-weight: 500;color: #222222;">已使用({{orderData.writeoff}})·退款({{orderData.refund}})</view>
+				<view class="ysyLeft" style="font-weight: 500;color: #222222;">
+					<span v-if="orderData.writeoff!=0">已使用({{orderData.writeoff}})</span>
+					<span v-if="orderData.writeoff!=0&&orderData.refund!=0">·</span>
+					<span v-if="orderData.refund!=0">退款({{orderData.refund}})</span>
+				</view>
 				<view class="ysyRgiht" @click="sheetQRCode">
 					<span style="color: #9A9A9A;padding-right: 16rpx;">查看详情</span> 
 					<image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
@@ -369,8 +373,8 @@
 			<view class="tkline2" v-for="(item,index) in sheetQRCodeList">
 				<view class="tklineTop2">
 					<view class="tkZt">
-						<span v-if="item.writeoffState==3">已使用</span>
-						<span v-if="item.writeoffState==1">未使用</span>
+						<span v-if="item.orderType==3||item.orderType==1">已使用</span>
+						<span v-if="item.orderType==2">未使用</span>
 						<span v-if="item.refundState==0"></span>
 						<span v-if="item.refundState==1">·退款中</span>
 						<span v-if="item.refundState==2">·退款成功</span>
@@ -378,38 +382,55 @@
 						<span v-if="item.refundState==4">·退款失败</span>
 					
 					</view>
-					<view class="tkSeeD" @click="refundDetail(item)" v-if="item.writeoffState==1">
+					<view class="tkSeeD" @click="refundDetail(item)" v-if="item.orderType!=1">
 						<span>退款详情</span>
 						<image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
 					</view>
-					<view v-if="item.writeoffState==3">
-						<view class="tkSeeD" @click="refundDetail(item)" v-if="item.refundState==4||item.refundState==2||item.refundState==1||item.refundState==3">
-							<span>退款详情</span>
-							<image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
-						</view>
-						<view class="tkSeeD" @click="goSh(item)" v-if="item.refundState==0">
-							<span>申请售后</span>
-							<image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
-						</view>
+					<view class="tkSeeD" @click="goSh(item)" v-if="item.orderType==1">
+						<span>申请售后</span>
+						<image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
 					</view>
 				</view>
 				<view class="tkRow">
-					<view class="tlRowLeft" v-if="item.writeoffState==3">使用份数</view>
+					<view class="tlRowLeft" v-if="item.orderType==3||item.orderType==1">使用份数</view>
 					<view class="tlRowLeft" v-else>退款份数</view>
-					<view style="color: #222222;">1份</view>
+					<view style="color: #222222;" v-if="item.orderType==3||item.orderType==1">1份</view>
+					<view style="color: #222222;" v-else>{{item.couponCount}}份</view>
 				</view>
-				<view class="tkRow">
+				<view class="tkRow" v-if="item.orderType==3||item.orderType==1">
 					<view class="tlRowLeft">消费门店</view>
 					<view style="color: #222222;">{{item.writeoffShopName?item.writeoffShopName:''}}</view>
 				</view>
-				<view class="tkRow">
+				<view class="tkRow" v-if="item.orderType==3||item.orderType==1">
 					<view class="tlRowLeft">消费时间</view>
 					<view style="color: #222222;">{{item.writeoffTime?item.writeoffTime:''}}</view>
 				</view>
-				<view class="tkRow">
+				<view class="tkRow" v-if="item.orderType==1">
+					<view class="tlRowLeft">券&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</view>
+					<view style="color: #222222;" class="xiahuaxian">{{item.qrCode}}</view>
+				</view>
+				<view class="tkRow" v-if="item.orderType==3">
+					<view class="tlRowLeft">券&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</view>
+					<view style="color: #222222;" class="xiahuaxian">{{item.couponCode}}</view>
+				</view>
+				
+				<view class="tkRow" v-if="item.orderType==2">
+					<view class="tlRowLeft">退款金额</view>
+					<view style="color: #222222;">{{item.money?item.money:''}}</view>
+				</view>
+				<view class="tkRow" v-if="item.orderType==2">
+					<view class="tlRowLeft">退款方式</view>
+					<view style="color: #222222;">原路返回</view>
+				</view>
+				<view class="tkRow" v-if="item.orderType==2">
+					<view class="tlRowLeft">到账时间</view>
+					<view style="color: #222222;">{{item.refundTime?item.refundTime:''}}</view>
+				</view>
+				<view class="tkRow" v-if="item.orderType==2">
 					<view class="tlRowLeft">券&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</view>
-					<view style="color: #222222;" class="{'xiahuaxian':item.writeoffState==3}">{{item.qrCode}}</view>
+					<view style="color: #222222;" class="xiahuaxian">{{item.couponCode}}</view>
 				</view>
+							
 			</view>
 			<nodata v-if="sheetQRCodeList.length==0"></nodata>
 		</view>