Browse Source

新增配送方式字段

wangningfei 3 years ago
parent
commit
371ba0fabf

+ 63 - 17
vue-admin-template-master/src/views/orders/list/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <el-card class="box-card" style="height: 90vh;">
+    <el-card class="box-card" style="height: 90vh">
       <div class="filter-container">
         <el-date-picker
           v-model="timeValue"
@@ -12,11 +12,12 @@
           :picker-options="pickerOptions"
         ></el-date-picker>
         <el-button
-          style="margin-left: 10px;"
+          style="margin-left: 10px"
           :loading="exportLoading"
           type="primary"
           @click="exportBtn"
-        >导出</el-button>
+          >导出</el-button
+        >
       </div>
       <!-- show-overflow-tooltip -->
       <el-table
@@ -27,44 +28,89 @@
         style="width: 100%"
         fit
         class="table-list"
-        :cell-style="{padding:'6px 0'}"
+        :cell-style="{ padding: '6px 0' }"
       >
         <el-table-column prop="id" label="ID"></el-table-column>
-        <el-table-column prop="status" label="订单状态" width="90" show-overflow-tooltip></el-table-column>
+        <el-table-column
+          prop="status"
+          label="订单状态"
+          width="90"
+          show-overflow-tooltip
+        ></el-table-column>
         <el-table-column prop="type" label="订单类型">
-          <template slot-scope="{row}">
+          <template slot-scope="{ row }">
             <span>{{ row.type | setType }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="outtradeno" label="订单号" width="130"></el-table-column>
+        <el-table-column
+          prop="deliverypro"
+          label="配送方式"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          prop="outtradeno"
+          label="订单号"
+          width="130"
+        ></el-table-column>
         <el-table-column prop="createtime" label="下单时间" width="140">
-          <template slot-scope="{row}">
+          <template slot-scope="{ row }">
             <span>{{ row.createtime | parseTime }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="products" label="商品" width="90" show-overflow-tooltip></el-table-column>
+        <el-table-column
+          prop="products"
+          label="商品"
+          width="90"
+          show-overflow-tooltip
+        ></el-table-column>
         <el-table-column prop="productfee" label="商品价格"></el-table-column>
 
         <el-table-column prop="totalfee" label="总价">
-          <template slot-scope="{row}">
+          <template slot-scope="{ row }">
             <span>{{ row.totalfee | filterFee }}</span>
           </template>
         </el-table-column>
 
-        <el-table-column prop="shippingaddr" label="下单地址" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="shopname" label="门店" width="200" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="notes" show-overflow-tooltip label="订单备注"></el-table-column>
-        <el-table-column prop="courier" label="骑手" width="140" show-overflow-tooltip></el-table-column>
+        <el-table-column
+          prop="shippingaddr"
+          label="下单地址"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          prop="shopname"
+          label="门店"
+          width="200"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          prop="notes"
+          show-overflow-tooltip
+          label="订单备注"
+        ></el-table-column>
+        <el-table-column
+          prop="courier"
+          label="骑手"
+          width="140"
+          show-overflow-tooltip
+        ></el-table-column>
 
-        <el-table-column prop="peisong_id" label="peisong_id" show-overflow-tooltip></el-table-column>
+        <el-table-column
+          prop="peisong_id"
+          label="peisong_id"
+          show-overflow-tooltip
+        ></el-table-column>
 
-        <el-table-column prop="useropenid" label="useropenid" show-overflow-tooltip></el-table-column>
+        <el-table-column
+          prop="useropenid"
+          label="useropenid"
+          show-overflow-tooltip
+        ></el-table-column>
         <el-table-column prop="useticket" label="useticket"></el-table-column>
         <el-table-column prop="wxverified" label="wxverified"></el-table-column>
       </el-table>
       <div class="pd-30">
         <el-pagination
-          v-show="total>0"
+          v-show="total > 0"
           background
           layout="prev, pager, next"
           :total="total"

+ 57 - 16
vue-admin-template-master/src/views/orders/query/index.vue

@@ -1,22 +1,23 @@
 <template>
   <div class="container">
-    <el-card class="box-card" style="height: 90vh;">
+    <el-card class="box-card" style="height: 90vh">
       <div class="filter-container">
         <el-input
           prefix-icon="el-icon-search"
           v-model="listQuery.phone"
-          style="width: 300px;"
+          style="width: 300px"
           placeholder="请输入手机号"
           clearable
           @keyup.enter.native="getDetail"
         />
         <el-button
-          style="margin-left: 10px;"
+          style="margin-left: 10px"
           :loading="searchLoading"
           type="primary"
           icon="el-icon-search"
           @click="getDetail"
-        >搜索</el-button>
+          >搜索</el-button
+        >
       </div>
       <el-table
         :data="tableData"
@@ -26,38 +27,78 @@
         style="width: 100%"
         fit
         class="table-list"
-        :cell-style="{padding:'6px 0'}"
+        :cell-style="{ padding: '6px 0' }"
       >
         <el-table-column prop="id" label="ID"></el-table-column>
-        <el-table-column prop="status" label="订单状态" width="90" show-overflow-tooltip></el-table-column>
+        <el-table-column
+          prop="status"
+          label="订单状态"
+          width="90"
+          show-overflow-tooltip
+        ></el-table-column>
         <el-table-column prop="type" label="订单类型">
-          <template slot-scope="{row}">
+          <template slot-scope="{ row }">
             <span>{{ row.type | setType }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="outtradeno" label="订单号" width="130"></el-table-column>
+        <el-table-column
+          prop="deliverypro"
+          label="配送方式"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          prop="outtradeno"
+          label="订单号"
+          width="130"
+        ></el-table-column>
         <el-table-column prop="createtime" label="下单时间" width="140">
-          <template slot-scope="{row}">
+          <template slot-scope="{ row }">
             <span>{{ row.createtime | parseTime }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="products" label="商品" width="90" show-overflow-tooltip></el-table-column>
+        <el-table-column
+          prop="products"
+          label="商品"
+          width="90"
+          show-overflow-tooltip
+        ></el-table-column>
         <el-table-column prop="productfee" label="商品价格"></el-table-column>
 
         <el-table-column prop="totalfee" label="总价">
-          <template slot-scope="{row}">
+          <template slot-scope="{ row }">
             <span>{{ row.totalfee | filterFee }}</span>
           </template>
         </el-table-column>
 
-        <el-table-column prop="shippingaddr" label="下单地址" show-overflow-tooltip></el-table-column>
+        <el-table-column
+          prop="shippingaddr"
+          label="下单地址"
+          show-overflow-tooltip
+        ></el-table-column>
         <el-table-column prop="shopid" label="门店id"></el-table-column>
-        <el-table-column prop="notes" show-overflow-tooltip label="订单备注"></el-table-column>
-        <el-table-column prop="courier" label="骑手" width="140" show-overflow-tooltip></el-table-column>
+        <el-table-column
+          prop="notes"
+          show-overflow-tooltip
+          label="订单备注"
+        ></el-table-column>
+        <el-table-column
+          prop="courier"
+          label="骑手"
+          width="140"
+          show-overflow-tooltip
+        ></el-table-column>
 
-        <el-table-column prop="peisong_id" label="peisong_id" show-overflow-tooltip></el-table-column>
+        <el-table-column
+          prop="peisong_id"
+          label="peisong_id"
+          show-overflow-tooltip
+        ></el-table-column>
 
-        <el-table-column prop="useropenid" label="useropenid" show-overflow-tooltip></el-table-column>
+        <el-table-column
+          prop="useropenid"
+          label="useropenid"
+          show-overflow-tooltip
+        ></el-table-column>
         <el-table-column prop="useticket" label="useticket"></el-table-column>
         <el-table-column prop="wxverified" label="wxverified"></el-table-column>
       </el-table>