Merge branch 'hotwind_dev_7.12.0' into 'hotwind_dev_7.13.0'

修改退单

See merge request !199

src/component/applyRefund/applyRefund.wxss

@@ -50,11 +50,13 @@
   margin-top: 79rpx;
 }
 .modal-confirm-btn button{
-  width: 416rpx;
-  border-radius: 15rpx;
-  background-color: rgba(255, 51, 51, 1);
-  box-shadow: 0px 2rpx 9rpx 0px rgba(255, 51, 51, 0.6);
+  width: 420rpx;
+  border-radius: 10rpx;
+  background-color: var(--themecolor);
+  /* box-shadow: 0px 2rpx 9rpx 0px rgba(255, 51, 51, 0.6); */
   border: none;
   margin: 0 auto;
-  font-size: 36rpx;
+  font-size: 32rpx;
+  height: 80rpx;
+  line-height: 80rpx;
 }

src/pages/refundDetail/refundDetail.wxml

@@ -72,10 +72,25 @@
 			</view>
 		</block>
 	</view>
-
+	<!-- 寄回提示 -->
+	<view class="warn-tips" wx:if="{{openRefundTips}}">
+		<view class="header">请将退货商品，邮寄到以下地址:</view>
+		<view class="tips-content gray-bg">
+			<view class="tips-content-item flex-item">
+					<label>收货人：{{refundDetail.refundLogistic.receiverName}}</label>
+					<label>{{refundDetail.refundLogistic.receiverPhone}}</label>
+			</view>
+			<view class="tips-content-item">
+					<!-- <label>地址：{{refundDetail.refundLogistic.receiverAddress}}</label> -->
+					<label>地址：{{refundDetail.refundLogistic.receiverAddress}}
+					<view class="copy" wx:if="{{refundDetail.refundLogistic.receiverAddress}}" bindtap="copy" data-content="{{refundDetail.refundLogistic.receiverAddress}}">复制</view>
+					</label>
+			</view>
+		</view>
+	</view>
 	<!-- 温馨提示 -->
 	<view class="warn-tips" wx:if="{{openRefundTips}}">
-		<view class="header">退货须知</view>
+		<view class="header">退货须知:</view>
 		<view class="tips-content">
 			{{refundTips}}
 		</view>
@@ -99,7 +114,7 @@
 			<text class="refund-desc">{{refundDetail.tradeId}}</text>
 		</view>
 
-		<view class="refund-item">
+		<!-- <view class="refund-item">
 			<text class="refund-label">寄回收件人</text>
 			<text class="refund-desc" selectable="true">{{refundDetail.refundLogistic.receiverName}}</text>
 		</view>
@@ -111,38 +126,23 @@
 			<text class="refund-label">寄回地址</text>
 			<text class="refund-desc" selectable="true">{{refundDetail.refundLogistic.receiverAddress}}</text>
 			<view class="copy" wx:if="{{refundDetail.refundLogistic.receiverAddress}}" bindtap="copy" data-content="{{refundDetail.refundLogistic.receiverAddress}}">复制</view>
-		</view>
+		</view> -->
 		<view class="refund-item">
 			<text class="refund-label">退货凭证</text>
 			<view class="refund-certificate">
 				<view class="refund-img" wx:for="{{refundDetail.proofImgUrls}}" wx:key="{{index}}">
 					<image src="{{utils.formateUrl(item,baseImgUrl)}}" />
 				</view>
-				<!-- <view class="refund-img">
-					<image src="/assets/imgs/7_1_0/address-line.png" />
-				</view>
-				<view class="refund-img">
-					<image src="/assets/imgs/7_1_0/address-line.png" />
-				</view>
-				<view class="refund-img">
-					<image src="/assets/imgs/7_1_0/address-line.png" />
-				</view>
-				<view class="refund-img">
-					<image src="/assets/imgs/7_1_0/address-line.png" />
-				</view> -->
 			</view>
 		</view>
-
 	</view>
-	<view class="cancel" wx-if="{{refundDetail.status == 'A'}}">
-		<button class="btn btn-primary btn-lg" bindtap="handelRevokeRefund">取消退款</button>
+	<view class="cancel box" wx-if="{{refundDetail.status == 'A' || refundDetail.status == 'N'}}">
+		<button class="btn btn-primary return-goods" wx:if="{{refundDetail.status == 'A'}}" bindtap="tapWriteLogis">退货寄回</button>
+		<button class="btn btn-primary btn-lg" bindtap="handelRevokeRefund">撤销退款</button>
 	</view>
 </view>
 
-
-
 <apply-refund show="{{showApplyRefundModal}}" refundId="{{refundId}}" bind:ok="onDeliveryOk"/>
-
 <!--goHome-->
 <go-home/>
 <floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>

src/pages/refundDetail/refundDetail.wxss

@@ -172,11 +172,45 @@ page{
   height: 129rpx;
   border-radius: 5rpx;
 }
+
+.box{
+  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+}
+
 .cancel{
   position: fixed;
   bottom: 0;
   left: 0;
-  width: 750rpx;
+  width: 100vw;
+  display: flex;
+  justify-content: flex-end;
+  padding: 10rpx 20rpx;
+  align-items: center;
+  background: #ffffff;
+  z-index: 1;
+  border-top: solid 1rpx #dddddd;
+  
+}
+
+.cancel button{
+  width: 140rpx;
+  height: 60rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 5rpx;
+}
+
+.cancel button:active{
+  opacity: 0.8;
+}
+
+.cancel button.return-goods{
+  background: #f2f2f2;
+  color: #333333;
+  margin-right: 30rpx;
+  border: solid 2rpx #dddddd;
 }
 
 .warn-tips{
@@ -198,4 +232,31 @@ page{
   padding-top: 20rpx;
   letter-spacing: 2rpx;
   line-height: 30rpx;
+}
+
+.tips-content .tips-content-item{
+  display: flex;
+  align-items: center;
+  margin-bottom: 20rpx;
+  font-size: 24rpx;
+  color: #999999;
+  border-radius: 4rpx;
+  letter-spacing: 0;
+  line-height: 36rpx;
+}
+
+.tips-content .tips-content-item:last-child{
+  margin-bottom: 0;
+}
+
+.tips-content .tips-content-item.flex-item{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.tips-content.gray-bg{
+  background: #eeeeee;
+  padding: 20rpx;
+  margin-top: 10rpx;
 }
\ No newline at end of file

src/project.config.json

@@ -192,7 +192,7 @@
 					"id": 22,
 					"name": "退单详情",
 					"pathName": "pages/refundDetail/refundDetail",
-					"query": "id=626842713396088832",
+					"query": "id=710106668792418304",
 					"scene": null
 				},
 				{