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

src/app.js

@@ -61,16 +61,16 @@ App({
       wx.setStorageSync('_baseUserInfo',baseUserInfo)
     }
     // 711_授权字体
-    wx.loadFontFace({
-      family: 'iconfont-711',
-      source: 'url("https://cdn-alyun.bigaka.com/group1/M00/00/01/Cv6CDl0nE9aAdG45AC7AStq8LfA180.TTF")',
-      success: function (res) {
-        console.log(res.status) //  loaded
-      },
-      fail: function (res) {
-        console.log(res.status) //  error
-      }
-    })
+    // wx.loadFontFace({
+    //   family: 'iconfont-711',
+    //   source: 'url("https://cdn-alyun.bigaka.com/group1/M00/00/01/Cv6CDl0nE9aAdG45AC7AStq8LfA180.TTF")',
+    //   success: function (res) {
+    //     console.log(res.status) //  loaded
+    //   },
+    //   fail: function (res) {
+    //     console.log(res.status) //  error
+    //   }
+    // })
 
   },
   onHide: function () {

src/pages/refundDetail/refundDetail.wxml

 <!--pages/refundDetail/refundDetail.wxml-->
 <view class="page-refund-detail">
-  <view class="header-wrap">
-    <image class="header-bg" src="/assets/imgs/7_1_0/address-line.png"></image>
+  <view class="header-wrap" style="background-image:url('/assets/imgs/7_1_0/rf_bgc.jpg')">
+    <!--<image class="header-bg" src="/assets/imgs/7_1_0/address-line.png"></image>-->
     <view class="refund-status">
       <view class="status">待审核</view>
       <view class="desc">退款申请已经提交，等待商家处理哦~</view>

src/pages/refundDetail/refundDetail.wxss

@@ -7,9 +7,11 @@ page{
 }
 .header-wrap{
   position: relative;
-  width: 750rpx;
   height: 180rpx;
-  
+  overflow-x: hidden; 
+  box-sizing: border-box;
+  background-repeat: no-repeat;
+  background-size: 100%;
 }
 .header-bg{
   width: 750rpx;

src/subPackage/page/pages/paymentStatus/paymentStatus.wxml

@@ -3,7 +3,7 @@
 <!--subPackage/page/pages/paymentStatus/paymentStatus.wxml-->
 <view class="payment">
   <view class="payment-status">
-    <image class="status-img" src="./../../../../assets/imgs/7_1_0/notice.png"  mode="widthFix" lazy-load="false" binderror="" bindload="" />
+    <image class="status-img" src="/assets/imgs/7_1_0/08_22/success.png"  mode="widthFix" lazy-load="false" binderror="" bindload="" />
     <view class="status-success">支付成功</view>
     <view class="status-price">￥ 306.90</view>
     <view class="status-time">交易时间： 2019-03-24 至 2019-06-23</view>
@@ -19,7 +19,7 @@
   <view class="status-vip df">
     <view class="vip-tips">
       <view class="tips-desc">
-        <image class="tips-img" src="./../../../../assets/imgs/7_1_0/notice.png"  mode="widthFix" lazy-load="false" binderror="" bindload="" />
+        <image class="tips-img" src="/assets/imgs/7_1_0/notice.png"  mode="widthFix" lazy-load="false" binderror="" bindload="" />
         现在勾选成为vip，立领200元礼包，文案文案 </view>
         <view class="tips-notice">vip 可尊享n大权益</view>
     </view>