Merge branch 'feature-zyw-sc' into 'dev_7.1.0'

Feature zyw sc

See merge request !58

src/component/applyRefund/applyRefund.js

+// component/applyRefund/applyRefund.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    show: { // 显示标识
+      type: Boolean,
+      value: false
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    isSelect: false
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    selectCoupon() {
+      console.log('2222')
+      this.setData({
+        isSelect: !this.data.isSelect
+      })
+    },
+    hidePopup: function () { // 隐藏弹出框
+      this.setData({
+        show: false
+      })
+    },
+
+  },
+
+
+
+})

src/component/applyRefund/applyRefund.json

+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file

src/component/applyRefund/applyRefund.wxml

+<!--component/applyRefund/applyRefund.wxml-->
+<view class="modal-container" bindtap="hidePopup" wx:if="{{show}}"></view>
+<view class="modal-content" wx:if="{{show}}">
+  <view class="modal-header">
+    <image class="modal-close" mode="widthFix" src="/assets/imgs/7_1_0/close.png" bindtap="hidePopup"></image>
+  </view>
+
+  <view class="modal-info">
+    <view class="modal-logistics">
+      <view>
+        <picker bindchange="bindSelectRefundReason" value="{{reasonIndex}}" range="{{reasonList}}" range-key="name" class="modal-picker">
+        <view class="picker">
+          当前选择：{{reasonList[reasonIndex].name}}
+        </view>
+      </picker>
+      </view>
+      <view class="modal-logis-number">
+        <input placeholder-class="modal-placeholder" class="modal-input" placeholder="填写物流单号"></input>
+      </view>
+    </view>
+    <view class="modal-confirm-btn">
+      <button class="btn btn-primary btn-lg">确认</button>
+    </view>
+  </view>
+</view>

src/component/applyRefund/applyRefund.wxss

+/* component/applyRefund/applyRefund.wxss */
+@import "/app.wxss";
+.modal-container {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 98; 
+  
+}
+
+.modal-content {
+  position: fixed;
+  z-index: 99;
+  bottom: 30%;
+  left: 65rpx;
+  background: #ffffff;
+  height: 620rpx;
+  width: 620rpx;
+  border-radius: 15rpx;
+  }
+
+.modal-content .modal-close {
+  position: absolute;
+  right: 24rpx;
+  top: 35rpx;
+  width: 25rpx;
+   }
+
+.modal-info{
+  padding: 60rpx 40rpx;
+  margin-top: 95rpx;
+}
+.modal-input,.modal-picker{
+  border-radius: 5rpx;
+  border: 1px solid rgba(170, 170, 170, 1);
+  height: 78rpx;
+  line-height: 78rpx;
+  padding: 0 20rpx;
+}
+.modal-placeholder,.picker{
+  color: #999999;
+}
+.modal-logis-number{
+  margin-top: 43rpx;
+}
+.modal-confirm-btn{
+  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);
+  border: none;
+  margin: 0 auto;
+  font-size: 36rpx;
+}

src/pages/refundDetail/refundDetail.js

@@ -5,7 +5,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    showApplyRefundModal:false
   },
 
   /**
@@ -23,8 +23,6 @@ Page({
   },
 
   copy(e){
-    console.log(e)
-    console.log('1111')
     wx.setClipboardData({
       //准备复制的数据
       data: e.currentTarget.dataset.content,
@@ -35,5 +33,13 @@ Page({
         });
       }
     });
+  },
+
+  //填写物流信息
+  tapWriteLogis(){
+    console.log('222')
+    this.setData({
+      showApplyRefundModal: true
+    })
   }
 })
\ No newline at end of file

src/pages/refundDetail/refundDetail.json

 {
   "navigationBarTitleText": "退单详情",
-  "usingComponents": {}
+  "usingComponents": {
+    "apply-refund": "/component/applyRefund/applyRefund"
+  }
 }
\ No newline at end of file

src/pages/refundDetail/refundDetail.wxml

@@ -8,6 +8,22 @@
     </view>
   </view>
 
+  <view class="logistics-wrap">
+    <view class="logistics-info">
+      <view class="logistics-item">
+        <text>物流公司</text>
+        <text class="company">xxxxxxx</text>
+      </view>
+      <view class="logistics-item">
+        <text>快递单号</text>
+        <text class="company">456575687686786</text>
+      </view>
+      <view class="write-logistics" bindtap="tapWriteLogis">
+        <button class="btn btn-primary btn-outline write-btn">填写物流信息</button>
+      </view>
+    </view>
+  </view>
+
    <view class="pro-wrap">
       <view class="pro-header">
         <text class="choose-pro">选择商品</text>
@@ -92,3 +108,5 @@
     <button class="btn btn-primary btn-lg">撤销退款</button>
   </view>
 </view>
+
+<apply-refund show="{{showApplyRefundModal}}"/>

src/pages/refundDetail/refundDetail.wxss

 /* pages/refundDetail/refundDetail.wxss */
+@import './../../base/base.wxss';
+
 page{
   background: #f9f9f9;
   padding-bottom: 95rpx;
@@ -28,12 +30,45 @@ page{
   font-size: 26rpx;
   margin-top: 8rpx;
 }
+.logistics-wrap{
+  background-color: #ffffff;
+  padding: 28rpx 30rpx;
+}
+.logistics-info{
+  padding: 23rpx 22rpx 22rpx 44rpx;
+  border-radius: 10rpx;
+  background-color: rgba(255, 255, 255, 1);
+  box-shadow: 0px 0px 10rpx 0px rgba(0, 0, 0, 0.1);
+}
+.logistics-item{
+  color: #76A1D5;
+  font-size: 26rpx;
+}
+.logistics-item:nth-child(2){
+  margin-top: 10rpx;
+}
+.company{
+  margin-left: 30rpx;
+}
+.write-logistics{
+  display: flex;
+  flex-direction: row-reverse;
+}
+.write-btn{
+  width: 188rpx;
+  height: 46rpx;
+  line-height: 46rpx;
+  border-radius: 23rpx;
+  border: 1px solid rgba(203, 60, 60, 1);
+}
+
+
 .pro-header{
   display: flex;
   justify-content: space-between;
 }
 .pro-wrap{
-  padding: 19rpx 32rpx 0 30rpx;
+  padding: 19rpx 32rpx 53rpx 30rpx;
   background-color: #ffffff;
 }
 .choose-pro{