1

pages/order/after-sale/refunds-detail.vue

@@ -33,8 +33,8 @@
       </view>
 	  <view v-if="d.ReOrderStatus == 5 || d.Type==1" class="marginT">申请退款金额:{{d.Refund}}元</view>
 	  <view v-if="d.ReOrderStatus == 5 || d.Type==1" class="marginT">实退金额:{{d.Refund}}元</view>
-	  <view v-if="d.ReOrderStatus == 5 || d.Type==1" class="marginT">退款方式:原路退回</view>
-	  <view v-if="d.ReOrderStatus == 5 || d.Type==1" class="marginT">退款时间:{{d.FinishTime}}</view>
+	  <view v-if="d.ReOrderStatus == 5 && d.Type==1" class="marginT">退款方式:原路退回</view>
+	  <view v-if="d.ReOrderStatus == 5 && d.Type==1" class="marginT">退款时间:{{d.FinishTime}}</view>
 	  
 	  <!-- TODO字段没有 -->
       <!-- <view class="content" v-else>

pages/order/express.vue

@@ -66,9 +66,9 @@
           <!-- 此处没有自定义左边的内容，会默认显示一个点 -->
           <template v-slot:content>
             <view style="padding-bottom: 30rpx;" :style="{color:(i==0)?'#000 !important':'gray'}">
-              <view class="u-order-desc">{{ x.AcceptStation }}</view>
-			  <view class="u-order-desc">{{ x.Remark }}</view>
-              <view class="u-order-time">{{ x.AcceptTime }}</view>
+              <view class="u-order-desc">{{ x.AcceptStation!=null? x.AcceptStation:'' }}</view>
+			  <view class="u-order-desc">{{ x.Remark !=null? x.Remark:''}}</view>
+              <view class="u-order-time">{{ x.AcceptTime !=null? x.AcceptTime:''}}</view>
 			  
             </view>
           </template>

pages/order/index/index.vue

@@ -218,7 +218,7 @@
 				<view style="display: flex;align-items: center;justify-content: center;height:70px ;">
 					<Text>是否取消订单？</Text>
 				</view>
-				<view  style="display: flex;flex-direction: column;height:80px ;margin-left: 15px;width: 100%;" v-if='msg.OrderStatus==2'>
+				<view  style="display: flex;flex-direction: column;height:80px ;margin-left: 15px;width: 100%;" v-if='item.OrderStatus==2'>
 					<Text style='margin-left: 10px;margin-top: 5px;'>备注</Text>
 					<input class="uni-input inputM" style='margin-left: 10px;margin-top: 5px;' v-model="Cancelmsg.Remark" placeholder="输入备注"/>
 				</view>
@@ -490,6 +490,13 @@ export default {
 	},
     confirm() { //取消订单
       this.showModal = false;
+	  if(this.Cancelmsg.Type==2 && this.Cancelmsg.Remark==''){
+		  uni.showToast({
+			  title:'备注不能为空',
+			  icon:'none'
+		  })
+		  return 
+	  }
       this.request2(
         {
         	url: '/api/AppletOrder/CancelAppletGoodsOrderInfo',

pages/order/order-detail.vue

@@ -440,6 +440,13 @@ export default {
     },
     confirm() {
       this.showModal = false;
+	  if(this.Cancelmsg.Type==2 && this.Cancelmsg.Remark==''){
+	  		  uni.showToast({
+	  			  title:'备注不能为空',
+	  			  icon:'none'
+	  		  })
+	  		  return 
+	  }
 	  let pages = getCurrentPages(); // 当前页面
 	  let beforePage = pages[pages.length - 2]; // 前一个页面
       this.request2(

pages/share-qrcode/share-qrcode.vue

@@ -64,7 +64,7 @@
 			  	 {
 			  		url: '/api/AppletUser/GetWeiXinQRCodeForApplet',
 			  		data: {
-						Path:'/pages/index/index?pid=' + this.UserInfo.UserId,
+						Path:'pages/index/index?pid=' + this.UserInfo.UserId,
 						With:this.qrcode.QrCodeSize,
 					}
 			  	 },