订单列表

pages/order/index.vue

@@ -8,17 +8,18 @@
       <!-- 订单列表 -->
       <view class="order-list">
         <view class="order-item" v-for="(item, index) in list.data" :key="index">
+			
           <view class="item-top">
             <view class="item-top-left">
-              <text class="order-time">{{ item.create_time }}</text>
+              <text class="order-time">订单号{{ item.batchcode }}</text>
             </view>
             <view class="item-top-right">
-              <text class="state-text">{{ item.state_text }}</text>
+              <text class="state-text">{{item.state_text}}</text>
             </view>
           </view>
           <!-- 商品列表 -->
           <view class="goods-list" @click="handleTargetDetail(item.order_id)">
-            <view class="goods-item" v-for="(goods, idx) in item.goods" :key="idx">
+            <view class="goods-item" v-for="(goods, idx) in item.order_detail" :key="idx">
               <!-- 商品图片 -->
               <view class="goods-image">
                 <image class="image" :src="goods.goods_image" mode="scaleToFill"></image>
@@ -36,10 +37,10 @@
               <view class="goods-trade">
                 <view class="goods-price">
                   <text class="unit">￥</text>
-                  <text class="value">{{ goods.is_user_grade ? goods.grade_goods_price : goods.goods_price }}</text>
+                  <text class="value">{{goods.price }}</text>
                 </view>
                 <view class="goods-num">
-                  <text>×{{ goods.total_num }}</text>
+                  <text>×{{ goods.transaction_count }}</text>
                 </view>
               </view>
             </view>
@@ -48,7 +49,7 @@
           <view class="order-total">
             <text>共{{ item.total_num }}件商品，总金额</text>
             <text class="unit">￥</text>
-            <text class="money">{{ item.pay_price }}</text>
+            <text class="money">{{ item.total_money }}</text>
           </view>
           <!-- 订单操作 -->
           <view v-if="item.order_status != OrderStatusEnum.CANCELLED.value" class="order-handle">
@@ -135,7 +136,7 @@
   import { getEmptyPaginateObj, getMoreListData } from '@/core/app'
   import * as OrderApi from '@/api/order'
   import { wxPayment } from '@/core/app'
-import { list } from '../../api/goods'
+  import { list } from '../../api/goods'
 
   // 每页记录数量
   const pageSize = 15
@@ -225,7 +226,6 @@ import { list } from '../../api/goods'
 
       // 初始化当前选中的标签
       initCurTab(options) {
-		  console.log("tlist",this.list)
         // const app = this
         // if (options.dataType) {
         //   const index = app.tabs.findIndex(item => item.value == options.dataType)
@@ -243,7 +243,6 @@ import { list } from '../../api/goods'
         // 设置列表数据
         app.getOrderList(page.num)
           .then(list => {
-			  console.log("od list",list)
             const curPageLen = list.data.length
             const totalSize = list.data.total
             app.mescroll.endBySize(curPageLen, totalSize)
@@ -259,8 +258,9 @@ import { list } from '../../api/goods'
 			OrderApi.ordquery(data)
           //OrderApi.list({ dataType: app.getTabValue(), page: pageNo }, { load: false })
             .then(result => {
-				console.log("quod",result)
-				let nlist = {data:result.data}
+				// 按格式封装
+				let nlist = {data:result.data,total:result.count,current_page:pageNo}
+				
               // 合并新数据
               const newList = app.initList(nlist)
               app.list.data = getMoreListData(newList, app.list, pageNo)
@@ -272,14 +272,34 @@ import { list } from '../../api/goods'
       // 初始化订单列表数据
       initList(newList) {
         newList.data.forEach(item => {
-          item.total_num = 0
-          item.goods.forEach(goods => {
-            item.total_num += goods.total_num
-          })
+			item.total_num = item.order_detail.length
+			item.state_text = this.showStateText(item.staus)
+			
+          // item.total_num = 0
+          // item.goods.forEach(goods => {
+          //   item.total_num += goods.total_num
+          // })
         })
         return newList
       },
 	  
+	  // 订单状态
+	  showStateText(state){
+		  let state_txt="";
+		  if(state=="1"){
+			  state_txt="待付款"
+		  }else if(state =="2" ){
+			  state_txt="待付款"
+		  } else if(state=="3"){
+			  state_txt="已终止"
+		  } else if(state == "4"){
+			  state_txt="已终止"
+		  }else{
+			  state_txt="已关闭"
+		  }
+		  return state_txt;
+	  },
+
       // 获取当前标签项的值
       getTabValue() {
         return this.tabs[this.curTab].value