up

.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'

src/views/order/activeordervisitor.vue

@@ -261,20 +261,20 @@
             window.open("https://" + url, '_blank')
             that.searchFields.is_export = 0
             return;
+          }else{
+            that.tableData = res.data
+            that.paginations.total = res.total
+            for (var m of res.data) {
+              let startT = m.activity_order.activity.start_time?m.activity_order.activity.start_time:''
+              let endT = m.activity_order.activity.end_time?m.activity_order.activity.end_time:''
+              m.date = startT + "至" + this.$moment(endT).format("HH:mm:ss")
+              m.activity_name = m.activity_order.activity.name?m.activity_order.activity.name:''
+              m.typeName = m.activity_order.type == 1 ? "团体" : "个人"
+              m.unit = m.activity_order.type == 1 ? m.activity_order.unit : "无"
+              m.leader = m.activity_order.type == 1 ? m.activity_order.leader : "无"
+            }
           }
-          let _data = [];
-          // let result = Object.assign(_data, res.data);
-          for (var m of res.data) {
-            m.date = m.activity_order.activity.start_time + "至" + this.$moment(m.activity_order.activity
-              .end_time).format("HH:mm:ss");
-            m.activity_name = m.activity_order.activity.name;
-            m.typeName = m.activity_order.type == 1 ? "团体" : "个人"
-            m.unit = m.activity_order.type == 1 ? m.activity_order.unit : "无"
-            m.leader = m.activity_order.type == 1 ? m.activity_order.leader : "无"
-            _data.push(m);
-          }
-          that.tableData = _data;
-          that.paginations.total = res.total
+
         }).catch(error => {
 
         })