小程序修改

pages/coupon/details/details.vue

@@ -29,9 +29,9 @@
 			<view style="width: 100%;border-top: 1px dashed #f5f5f5;margin: 10px 0;"></view>
 			<Text class='c_name' style='margin-top: 25px;'>有效期</Text>
 			
-			<!-- <Text class='cd_content' v-if='g.expire_type==1'>领取后{{g.expire_day}}天内有效</Text>
-			<Text class='cd_content' v-if='g.expire_type==2'>{{g.begin_time}}-{{g.end_time}}</Text> -->
-			<Text class='cd_content' >{{g.StartDate}}-{{g.EndDate}}</Text> 
+			<Text class='cd_content' v-if='g.IndateType==1'>领取后{{g.IndateDay}}天内有效</Text>
+			<Text class='cd_content' v-if='g.IndateType==2'>{{g.StartDate}}-{{g.EndDate}}</Text>
+			<!-- <Text class='cd_content' >{{g.StartDate}}-{{g.EndDate}}</Text> -->
 			<Text class='c_name' style='margin-top: 1px;'>使用规则</Text>
 						
 			<Text class='cd_content' v-if='g.UseType==1'>适用类别: <Text v-for="(item, index) in g.ProductList" :key="index">{{item.Relevance}}</Text> </Text>

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

@@ -6,9 +6,9 @@
         <view class="status">{{
           d.ReOrderStatusName
         }}</view>
-        <view style="margin: 0 -40rpx;" v-if="d.ReOrderStatus!=3">
+        <view style="margin: 0 -40rpx;" v-if="d.ReOrderStatus!=6">
           <u-steps
-            :list="d.Type==1?statusList:statusHuanList"
+            :list="d.Type==1?statusList:statusHuanList"	
             :current="currentStatus"
             active-color="#FFF"
             un-active-color="#eee"
@@ -31,6 +31,11 @@
       <view class="content" v-else-if="d.ReOrderStatus == 2">
         尊敬的客户，让您久等了，很抱歉出现了让您不满意的情况，我们将配合您尽快完成本次售后申请
       </view>
+	  <view v-if="d.ReOrderStatus == 5 || d.Type==1">申请退款金额:{{d.Refund}}</view>
+	  <view v-if="d.ReOrderStatus == 5 || d.Type==1">实退金额:{{d.Refund}}</view>
+	  <view v-if="d.ReOrderStatus == 5 || d.Type==1">退款方式:原路退回</view>
+	  <view v-if="d.ReOrderStatus == 5 || d.Type==1">退款时间:{{d.FinishTime}}</view>
+	  
 	  <!-- TODO字段没有 -->
       <!-- <view class="content" v-else>
         审核留言：{{d.Remark}}
@@ -39,25 +44,25 @@
     <view
       style="margin-top: 40rpx;"
       class="block"
-      v-if="d.ReOrderStatus=='3'"
+      v-if="d.ReOrderStatus=='3' || d.ReOrderStatus=='4'"
     >
-      <view class="good-title">{{d.Type==1?'退货物流':'换货物流'}} </view>
+      <view class="good-title">{{d.ReOrderStatus==3?'退货物流':'换货物流'}} </view>
       <view class="filed">
         <view class="key">快递公司</view>
         <view class="val">
-          {{d.Type==1?  d.TExpressList[0].ExpressName: d.HExpressList[0].ExpressName }}
+          {{d.ReOrderStatus==3?  d.TExpressList[0].ExpressName: d.HExpressList[0].ExpressName }}
         </view>
       </view>
       <view class="filed">
         <view class="key">快递单号</view>
         <view class="val">
-          {{d.Type==1?  d.TExpressList[0].ExpressNumber: d.HExpressList[0].ExpressNumber }}
+          {{d.ReOrderStatus==3?  d.TExpressList[0].ExpressNumber: d.HExpressList[0].ExpressNumber }}
         </view>
       </view>
       <view class="filed">
         <view class="key">快递类型</view>
         <view class="val" style="color:#c0392b">
-          {{d.Type==1? (d.TExpressList[0].Type==1?'快递':"其他") : (d.HExpressList[0].Type==1?'快递':"其他") }}
+          {{d.ReOrderStatus==3? (d.TExpressList[0].Type==1?'快递':"其他") : (d.HExpressList[0].Type==1?'快递':"其他") }}
         </view>
       </view>
     </view>

pages/order/after-sale/refunds.vue

@@ -18,12 +18,25 @@
           </view>
         </view>
       </view>
-      <view class="num-box">
+    <!--  <view class="num-box">
         <view class="left">申请数量</view>
         <view class="right">
           <u-number-box :disabled="forms.Type==1" :min="1" :max="good.Number" v-model="forms.ReNumber" @change="valChange"></u-number-box>
         </view>
-      </view>
+      </view> -->
+	  <view class="num-box">
+	    <view class="left">退款金额</view>
+	    <view class="right" style="display: flex;flex-direction: row;align-items: center;">
+	      <input
+		  style='text-align: right;'
+	        type="number"
+	        v-model="forms.Refund"
+			@blur='inputnum'
+	        placeholder="请输入退款金额"
+	      />
+		  <Text>元</Text>
+	    </view>
+	  </view>
     </view>
     <view class="apply">
       <view class="title">
@@ -76,13 +89,13 @@
         >
       </view>
     </view>
-    <view class="apply">
+   <!-- <view class="apply">
       <view class="user">
         <view
           class="user-item"
           style="padding-bottom: 40rpx; border-bottom: 2rpx solid #f5f5f5;"
         >
-		<!-- TODO暂无字段 -->
+		
           <view class="icon">
             <u-icon name="user-circle-o" size="32" color="#000"></u-icon>
           </view>
@@ -95,7 +108,7 @@
           <view>{{ good.order.mobile }}</view>
         </view>
       </view>
-    </view>
+    </view> -->
     <view class="tips">
       <text>提交服务单后，售后专员可能与您电话沟通，请保持手机畅通</text>
     </view>
@@ -125,7 +138,7 @@ export default {
       forms: {
         OrderDetialId: 0,
         Type: 1,
-		ReNumber:0,
+		ReNumber:1,
         VoucherList: [],
         Refund: 0,
         Remark: "",
@@ -171,13 +184,22 @@ export default {
 		  this.forms.ReNumber = res.data.Number;
 		  
           if (this.forms.Type == 1) {
-            this.forms.Refund = res.data.Final_Price;
+            this.forms.Refund = res.data.Final_Price-res.data.FreightMoney;
           }
           this.loading = false;
           uni.hideNavigationBarLoading();
         }
       );
     },
+	inputnum(val){
+		let that = this
+		let totelPrice = that.good.Final_Price - that.good.FreightMoney
+		if(val.target.value>totelPrice){
+			console.log('进入')
+			that.forms.Refund= totelPrice
+		}
+		
+	},
     inputremarkHandler(e) {
       this.forms.Remark = e.detail.value;
     },
@@ -199,7 +221,9 @@ export default {
             let msg = "";
             if (that.forms.Remark == "") {
               msg = "亲，请描述一下你遇到的问题吧";
-            } else if (that.forms.VoucherList.length == 0) {
+            } else if(that.forms.Refund==''){
+				msg = "亲，退款金额不能为空";
+			}else if (that.forms.VoucherList.length == 0) {
               msg = "亲，请上传一张说明截图吧";
             }
             if (msg == "") {