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

zxl

4 小时以前 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,14 +141,17 @@
          <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' && order.orderType !=='VIRTUAL'"
         @click="buyBack"
         >再来一单</view>
        </view>
      </view>
    </view>
@@ -260,10 +263,11 @@
</template>

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

import shares from "@/components/m-share/index"; //分享
import shares from "@/pages/order/m-share/index.vue"; //分享

import { getClearReason } from "@/api/after-sale.js";

@@ -319,6 +323,8 @@
      rogShow: false,
      reason: "",
     orderPackage:"",
     //商品信息再来一单使用
     skuList:[],
    };
  },
  onLoad(options) {
@@ -389,11 +395,31 @@
          this.orderGoodsList[0].goodsId,
      });
    },
   //再来一单
   buyBack(){
      console.log(JSON.stringify(this.skuList))
      buyBack(this.skuList).then(res=>{
         console.log('------------------->',res)
         if(res.data.code==200){
            uni.navigateTo({
               url: "/pages/order/fillorder?way=CART"
            })
         }
      })
		
   },
    async loadData(sn) {
      uni.showLoading({
        title: "加载中",
      });
     // 将再次购买商品置空重新获取
     this.skuList = []
      getOrderDetail(sn).then((res) => {
    this.skuList =   res.data.result.orderItems.map(item=>{
         return{
            skuId:item.skuId,
            num:item.num}
        })
        const order = res.data.result;
        this.order = order.order;
        this.orderGoodsList = order.orderItems;