Merge branch 'master' of ssh://gogs.zfire.top:2222/zfire-front/recycle-mobile

src/pages/mine/myBuy/detail.vue

@@ -8,7 +8,7 @@
       <view class="address-container">
         <view class="icon"><text class="iconfont icon-dingwei1"></text></view>
         <view class="hasdata">
-          <view class="name">{{detail.userName}}<text>{{detail.phone}}</text></view>
+          <view class="name">{{detail.consigneeName}}<text>{{detail.consigneePhone}}</text></view>
           <view class="address ellipsis-2">
             {{detail.province}}{{detail.city}}{{detail.area}}{{detail.street}}{{detail.address}}</view>
         </view>

src/pages/mine/myIssue/list.vue

@@ -46,7 +46,7 @@
             </view>
 
             <view class="right-btn" @tap.stop>
-              <block v-if="item.status === 4 && item.sendStatus === 'NO' && (item.orderInfo && item.orderInfo.status === 'SEND')">
+              <block v-if="item.status === 4 && item.sendStatus === 'NO' && (item.orderInfo && item.orderInfo.status === 'PAID')">
                 <u-button text="确认发货" shape="circle" @click="openDeliver(item.id)"></u-button>
               </block>
             </view>