修改用户

src/views/customer/orderTable.vue

@@ -8,8 +8,12 @@
       </el-table-column>
       <el-table-column label="商品数量" align="center" prop="goodsNum"/>
       <el-table-column label="金额" align="center" prop="amount"/>
-      <el-table-column label="城市" align="center" prop=""/>
-      <el-table-column label="店铺" align="center" prop=""/>
+      <el-table-column label="城市" align="center" >
+        <template slot-scope="scope">
+          {{getProvince(scope.row.shop.city)}}
+        </template>
+      </el-table-column>
+      <el-table-column label="店铺" align="center" prop="shop.name"/>
       <el-table-column label="创建时间" align="center" prop="createdAt"/>
       <el-table-column label="订单状态" align="center" prop="state">
         <template slot-scope="scope">{{formatterState(scope.row.state)}}</template>
@@ -28,6 +32,7 @@
 </template>
 <script>
 import OrderDetial from '@/components/order/orderDetial.vue';
+import piovince from '@/utils/piovince';
 export default {
   components: { OrderDetial},
   name: "orderTable", 
@@ -35,10 +40,19 @@ export default {
   data() {
     return {
       pageNum: 1,
-      pageSize: 10
+      pageSize: 10,      
+      piovince
     }
   },
   methods: {
+    getProvince(city){
+      let list=this.piovince;
+      for(let i=0;i<list.length;i++){
+        if(list[i].value == city){
+          return list[i].name;
+        }        
+      }
+    },
     getList(){
       this.$emit("getOrderList",this.pageNum,this.pageSize)
     },