From 2cc1b38e5a8f254c56b46b08a6cdc73bfba55a70 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 15 Sep 2023 15:52:10 +0800
Subject: [PATCH] kuaisuruchang

---
 .env.development               |  4 ++--
 src/views/order/visitorder.vue | 36 +++++++++++++++++++++++++---------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/.env.development b/.env.development
index c9490af..a9f1c2e 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # base api
-#VUE_APP_BASE_API = 'https://gb-test.ali251.langye.net'
+VUE_APP_BASE_API = 'https://gb-test.ali251.langye.net'
 
 
-VUE_APP_BASE_API = ' https://gbyuyue.szgmbwg.org.cn'
+#VUE_APP_BASE_API = ' https://gbyuyue.szgmbwg.org.cn'
diff --git a/src/views/order/visitorder.vue b/src/views/order/visitorder.vue
index 8c59759..63e3a6d 100644
--- a/src/views/order/visitorder.vue
+++ b/src/views/order/visitorder.vue
@@ -56,11 +56,11 @@
                 </div>
                 <el-tag v-if="scope.row[column.field]==1" type="success">是</el-tag>
               </div>
-              <div v-else-if="column.type=='type'" v-for="item in parameters.visitType">
+             <!-- <div v-else-if="column.type=='type'" v-for="item in parameters.visitType">
                 <div v-if="item.id==scope.row[column.field]">
                   {{item.value}}
                 </div>
-              </div>
+              </div> -->
               <div v-else-if="column.type=='status'" v-for="item in parameters.status_list">
                 <div v-if="item.id==scope.row[column.field]">
                   <el-tag v-if="scope.row[column.field]==1" type="warning">{{item.value}}</el-tag>
@@ -89,13 +89,16 @@
                 {{form.date+" "+form.time}}
               </div>
             </el-form-item>
-            <el-form-item label="类型" prop="type">
-              <el-tag v-if="form.type==1" type="" effect="dark">
+            <el-form-item label="类型" prop="type">
+              <el-tag type="" effect="dark">
+                {{form.type_name}}
+              </el-tag>
+              <!-- <el-tag v-if="form.type==1" type="" effect="dark">
                 团体
               </el-tag>
               <el-tag v-if="form.type==2" type="" effect="dark">
                 个人
-              </el-tag>
+              </el-tag> -->
             </el-form-item>
             <el-form-item label="联系方式" prop="mobile">
               <div>
@@ -302,9 +305,9 @@
             align: "center"
           },
           {
-            field: "type",
+            field: "type_name",
             title: "类型",
-            type: "type",
+            type: "string",
             align: "center"
           },
           {
@@ -369,7 +372,6 @@
           let tokens = getToken();
           if (isExcel) {
             var url = "/api/admin/visit/order-index?token=" + tokens
-            console.log(url)
             for (var m in that.searchFields) {
               url += "&" + m + "=" + that.searchFields[m]
             }
@@ -377,6 +379,15 @@
             window.open("https://" + url, '_blank')
             that.searchFields.is_export = 0
             return;
+          }
+          for(var k of res.data){
+            let typeName = ''
+            let isFast = ''
+            if(k.user_id==0){
+              isFast = '快速入场-'
+            }
+            typeName = k.type==1?'团队':'个人'
+            k.type_name = isFast + typeName
           }
           this.tableData = res.data;
           this.paginations.total = res.total
@@ -396,7 +407,14 @@
       info(obj) {
         var that = this;
         get(obj.id).then(res => {
-          let result = Object.assign(that.form, res);
+          let result = Object.assign(that.form, res);
+          let typeName = ''
+          let isFast = ''
+          if(result.user_id==0){
+            isFast = '快速入场-'
+          }
+          typeName = result.type==1?'团队':'个人'
+          result.type_name = isFast + typeName
           that.form = result;
           that.form.details_list = result.details;
         }).catch(error => {