wangtao 3 роки тому
батько
коміт
752e88f478
2 змінених файлів з 8 додано та 8 видалено
  1. 6 6
      src/views/recharge/consumption/index.vue
  2. 2 2
      vue.config.js

+ 6 - 6
src/views/recharge/consumption/index.vue

@@ -49,19 +49,19 @@
       <el-table-column label="消费类型" align="center" prop="shopName" show-overflow-tooltip />
       <el-table-column label="交易类型" align="center" prop="type" show-overflow-tooltip >
          <template slot-scope="scope">
-          <span v-if="scope.row.type == 1" style="color:#409EFF">消费</span>
+          <span v-if="scope.row.type == 1" style="color:#67C23A">消费</span>
           <span v-if="scope.row.type == 1001" style="color:#F56C6C">消费撤单</span>
         </template>
       </el-table-column>
 
 
 
-      <el-table-column label="餐饮时段" align="center" prop="amt" show-overflow-tooltip >
+      <el-table-column label="餐饮时段" align="center" prop="part" show-overflow-tooltip >
         <template slot-scope="scope">
-          <span v-if="scope.row.part == 0" style="color:#909399">早餐</span>
-          <span v-if="scope.row.part == 1" style="color:#E6A23CC">午餐</span>
-          <span v-if="scope.row.part == 2" style="color:#409EFF">晚餐</span>
-          <span v-if="scope.row.part == 3" style="color:#F56C6C">夜宵</span>
+          <span v-if="scope.row.part == 1" style="color:#909399">早餐</span>
+          <span v-if="scope.row.part == 2" style="color:#E6A23C">午餐</span>
+          <span v-if="scope.row.part == 3" style="color:#409EFF">晚餐</span>
+          <span v-if="scope.row.part == 4" style="color:#F56C6C">夜宵</span>
         </template>
       </el-table-column>
 

+ 2 - 2
vue.config.js

@@ -33,8 +33,8 @@ module.exports = {
         proxy: {
             // detail: https://cli.vuejs.org/config/#devserver-proxy
             [process.env.VUE_APP_BASE_API]: {
-                target: `http://172.16.120.213:8085`, //本地
-                //target: 'https://smartpark.caih.com/dxapi/', //东信
+                //target: `http://172.16.120.213:8085`, //本地
+                target: 'https://smartpark.caih.com/dxapi/', //东信
                 changeOrigin: true,
                 pathRewrite: {
                     ['^' + process.env.VUE_APP_BASE_API]: ''