bug修改

pages/activity/jkDetail.vue

@@ -454,9 +454,13 @@
 		},
 		onShow() {
 			this.shopName=this.$store.state.ckshopInfo.shopName;
-			this.ckshopdata=this.$store.state.ckshopInfo
+			if(this.$store.state.ckshopInfo){
+				this.ckshopdata=this.$store.state.ckshopInfo
+			}
+			
 			this.shopInfo=this.$store.state.ckshopInfo
-			//console.log(this.shopInfo)
+			/* console.log(this.shopName)
+			console.log(this.ckshopdata) */
 		},
 		onPullDownRefresh(){
 			//this.getInfo();

pages/subPack/refundDetail.vue

@@ -48,7 +48,7 @@
 	 	<view class="tkTopTitle" v-if="data.openSheetRefund.refundState == 4">退款失败</view>	 
 		<view class="tkTopTitle" v-if="data.openSheetRefund.refundState == 5">退款关闭</view>
 	 	<view class="tkErr" v-if="data.openSheetRefund.refundState == 4">退款失败</view>	 
-		<view class="tkErr" v-if="data.openSheetRefund.refundState == 5">用户已取消退款</view>	 
+		<view class="tkErr" v-if="data.openSheetRefund.refundState == 5">您的退款申请已关闭</view>	 
 	 </view>
 	 <!-- 退款关闭-->
 	 <view class="goodsBox topBox" v-if="data.openSheetRefund.refundState ==6">

pages/user/myOrder/activityOrderDetail.vue

@@ -589,6 +589,7 @@
 		onLoad(opt) {
 			 this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			this.id = opt.id
+			//this.id ='20A619BF-8F25-4C9D-AA2A-E1DAA8F28842'
 			this.themeColor = uni.getStorageSync("themeColor");
             this.userInfo=this.$store.state.userInfo;
             this.ext=this.$common.getExtStoreId();
@@ -694,7 +695,7 @@
 			},
 			refundDetail(item){
 				uni.navigateTo({
-					url:'../../subPack/refundDetail?id='+item.id
+					url:'../../subPack/refundDetail?id='+item.refundSheetID
 				})
 			},
 			xsHide(){
@@ -2168,4 +2169,7 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 	.xiahuaxian{
 		text-decoration: line-through;
 	}
+	.writeoffXx .informationNum{
+		text-align: right;
+	}
 </style>

pages/user/myOrder/myOrder.vue

@@ -37,7 +37,7 @@
 					</view>
 					<view class="itemShopBg">
 						<view class="shopName">{{item.SheetContent}}</view>
-						<view style="color: #333333;font-size: 22rpx;">￥<span class="price">{{item.PayType==1?item.RealMoney:0}}</span></view>
+						<view style="color: #333333;font-size: 22rpx;">￥<span class="price">{{item.RealMoney}}</span></view>
 					</view>
 				     <view class="renBox" v-if="item.SheetType==6">
 						<image src="../../../static/timg/icon_ren.png" mode="" class="renimg"></image> 
@@ -81,7 +81,8 @@
 						<span style="font-weight: 500;color: #222222;" v-if="item.RefundState==2">退款成功</span>
 						<span style="font-weight: 500;color: #222222;" v-if="item.RefundState==3">退款拒绝</span>
 						<span style="font-weight: 500;color: #222222;" v-if="item.RefundState==4">退款失败</span>
-						<span style="font-weight: 500;color: #222222;" v-if="item.RefundState==5">取消退款</span>
+						<span style="font-weight: 500;color: #222222;" v-if="item.RefundState==5">退款关闭</span>
+						<span style="font-weight: 500;color: #222222;" v-if="item.RefundState==6">待退款到账</span>
 						<span style="padding-left: 24rpx;" >请查看详情</span>
 					</view>
 					<view class="tkBottom">
@@ -657,7 +658,7 @@
 				border: 1rpx solid #DDDDDD;
 				text-align: center;
 				line-height: 56rpx;
-				margin-right: 20rpx;
+				/* margin-right: 20rpx; */
 			}
 			
 			.defer {
@@ -669,6 +670,7 @@
 				border: 1rpx solid #EC0F0A;
 				text-align: center;
 				line-height: 56rpx;
+				margin-left: 20rpx;
 		
 			}
 			.bottom{

utils/request.js

@@ -8,8 +8,8 @@
 import $store from '../store'
 const extConfig = uni.getExtConfigSync();		
 console.log(extConfig)
-const baseUrl=extConfig.url+'/'
-//const baseUrl='http://api2.dms.66km.com.cn/'
+//const baseUrl=extConfig.url+'/'
+const baseUrl='http://api2.dms.66km.com.cn/'
 //const baseUrl='http://dms.66km.com.cn/'
 //const baseUrl='http://192.168.1.18:20187/' 
 //const baseUrl='https://store-api.qdbtl.cn/'