Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub

zxl

7 小时以前 4c85457a83afeebb0bb4977d0525222493d29de2

 pages/order/orderDetail.vue

@@ -10,7 +10,7 @@
    </div>
    <!-- 物流信息 -->
    <view class="info-view logistics-view">
      <view class="logistics-List" v-if="logisticsList && logisticsList.traces && logisticsList.traces.length != 0 ">
      <view class="logistics-List" v-if="logisticsList && logisticsList.traces && logisticsList.traces.length != 0 && !(orderPackage && orderPackage.length)">
        <view class="logistics-List-title">
          {{ logisticsList.traces[logisticsList.traces.length - 1].AcceptStation }}
        </view>
@@ -141,15 +141,15 @@
          <view class="title">服务</view>
        </view>
        <view class="customer-list">
          <view class="customer-service"
<!--       <view class="customer-service"
            v-if="orderDetail.allowOperationVO && orderDetail.allowOperationVO.cancel == true"
            @click="onCancel(order.sn)">取消订单</view>
            @click="onCancel(order.sn)">取消订单</view> -->
          <view class="customer-service" v-if="order.orderStatus == 'DELIVERED'" @click="onLogistics(order)">查看物流</view>
          <view class="customer-service" v-if="order.orderStatus != 'UNPAID' && order.orderPromotionType == 'PINTUAN'"
            @click="ByUserMessage(order)">查看拼团信息</view>
            <view class="customer-service"
            @click="contact(order.storeId)">联系客服</view>
         <view class="customer-service" v-if="order.orderStatus==='COMPLETED'"
         <view class="customer-service" v-if="order.orderStatus==='COMPLETED' && order.orderType !=='VIRTUAL'"
         @click="buyBack"
         >再来一单</view>
        </view>
@@ -263,7 +263,7 @@
</template>

<script>
import '@/components/uview-components/uview-ui'
import '@/pages/subComponents/uview-components/uview-ui'
import { getExpress, getPackage ,buyBack} from "@/api/trade.js";
import { cancelOrder, confirmReceipt, getOrderDetail } from "@/api/order.js";