1、新增旧货市场

2、新增用户等级

pages/user/order.vue

@@ -7,15 +7,15 @@
             <view class="flex-col flex-col justify-center items-center bg-white text-40 left-wrap pointer">
                 <view class="flex justify-center items-center" :class="[activeIndex === 0 ? 'active' : '' ]"
                       @click="changeActive(0)">
-                    <text class="ml-20">询价管理</text>
+                    <text>询价管理</text>
                 </view>
                 <view class="flex justify-center items-center" :class="[activeIndex === 1 ? 'active' : '' ]"
                       @click="changeActive(1)">
-                    <text class="ml-20">订单管理</text>
+                    <text>订单管理</text>
                 </view>
                 <view class="flex justify-center items-center" :class="[activeIndex === 2 ? 'active' : '' ]"
                       @click="changeActive(2)">
-                    <text class="ml-20">合同管理</text>
+                    <text>合同管理</text>
                 </view>
             </view>
             <view class="w-1200 m-a bg-white p-40">
@@ -29,13 +29,14 @@
                     <el-table-column label="商品列表" width="250">
                         <template v-slot="{ row }">
                             <view class="flex flex-col justify-start items-start">
-                                <view v-for="(item, index) in row.goods" :key="index" class="flex justify-start items-start">
-                                    <image :src="item.goodsCover" class="goods-cover"/>
+                                <view v-for="(item, index) in row.goods" :key="index"
+                                      class="flex justify-start items-start">
+                                    <image :src="item.goodsCover" class="goods-cover" v-if="row.type === 0"/>
                                     <view class="ml-20 flex flex-col justify-start items-start">
                                         <text class="text-main font-bold">{{ item.goodsName }}</text>
+                                        <text class="mt-20">￥{{ item.goodsPrice }}</text>
                                         <text class="mt-20">x{{ item.num }}</text>
                                     </view>
-                                    <text class="ml-20">小计: ￥{{ item.num * item.goodsPrice }}</text>
                                 </view>
                             </view>
                         </template>
@@ -51,7 +52,21 @@
                         </template>
                     </el-table-column>
                     <el-table-column prop="_add_time_str" label="下单时间"/>
+                    <el-table-column label="操作">
+                        <template v-slot="{ row }">
+                            <text v-if="row.orderStatus === 0" class="text-main pointer" @click="repay(row)">去支付</text>
+                        </template>
+                    </el-table-column>
                 </el-table>
+                <view class="text-center mt-20">
+                    <el-pagination
+                        :page-size="pageSize"
+                        @current-change="getOrderList"
+                        background
+                        layout="prev, pager, next"
+                        :total="total">
+                    </el-pagination>
+                </view>
             </view>
         </view>
         <gap height="50"/>
@@ -61,12 +76,21 @@
 </template>
 
 <script>
+import pay from "../index/shop/pay.vue";
+
 export default {
     name: "order",
+    computed: {
+        pay() {
+            return pay
+        }
+    },
     data() {
         return {
             tableData: [],
-            activeIndex: 0
+            activeIndex: 0,
+            pageSize: 20,
+            total: 0,
         }
     },
     methods: {
@@ -82,11 +106,27 @@ export default {
                 })
             }
         },
-        async getOrderList() {
+        async getOrderList(pageIndex = 1) {
             const {rows} = await vk.callFunction({
-                url: 'client/order/kh/getList'
+                url: 'client/order/kh/getList',
+                data: {
+                    pageIndex,
+                    pageSize: this.pageSize,
+                }
             })
             this.tableData = rows
+            console.log(this.tableData)
+        },
+        async repay(row) {
+            await vk.callFunction({
+                url: 'client/order/kh/resetOrderNo',
+                data: {
+                    id: row._id,
+                }
+            })
+            vk.navigateTo({
+                url: `/pages/index/shop/pay?id=${row._id}`
+            })
         }
     },
     onLoad(options) {
@@ -107,8 +147,8 @@ export default {
 
     .left-wrap {
         position: absolute;
-        width: 240px;
-        left: -300px;
+        width: 220px;
+        left: -240px;
         top: 0;
 
         view {
@@ -122,7 +162,7 @@ export default {
     }
 }
 
-.goods-cover{
+.goods-cover {
     width: 80px;
     height: 80px;
 }