Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

config/dev.env.js

 module.exports = {
     NODE_ENV: '"development"',
-  BASE_API:'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
+  BASE_API:'"https://dev.dfangche.com"',//'"https://xxtest.upyuns.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
     APP_ORIGIN: '"https://wallstreetcn.com"'
 }

src/api/summit/activityShow.js

@@ -2,7 +2,7 @@ import fetch from 'utils/fetch';
 
 export function one(activityId) {
   return fetch({
-    url: '/api/summit/activityShow/one/'+activityId,
+    url: '/api/summit/activityShow/app/unauth/one/'+activityId,
     method: 'get'
   })
 }

src/views/baseInfo/companyInfo/index.vue

@@ -461,6 +461,7 @@
         this.page = 1;
         this.list = [];
         this.nomore = false;
+         this.loading = false;
         this.loadMore();
       },
       /**
@@ -510,6 +511,7 @@
               if(res.data.length< this.listQuery.limit && this.list.length>0){
                 //已加载全部
                 this.nomore = true;
+                this.loading = false;
               }
             }
             this.list = [...this.list, ...allList];

src/views/purseManage/gainRecord.vue

@@ -52,13 +52,13 @@
 
         <el-table-column width="200" align="center" label="来源">
           <template scope="scope">
-            <span>{{scope.row.sourceName}}</span>
+            <span>{{scope.row.sourceUserName}}</span>
           </template>
         </el-table-column>
 
         <el-table-column width="200" align="center" label="订单号">
           <template scope="scope">
-            <span>{{scope.row.cono}}</span>
+            <span>{{scope.row.orderNo}}</span>
           </template>
         </el-table-column>
         <el-table-column width="200" align="center" label="订单金额">
@@ -68,7 +68,8 @@
         </el-table-column>
         <el-table-column width="200" align="center" label="提成比例">
           <template scope="scope">
-            <span>{{scope.row.extract}}%</span>
+            <span v-if="scope.row.extract">{{scope.row.extract}}%</span>
+            <span else></span>
           </template>
         </el-table-column>
         <el-table-column width="100" align="center" label="金额变动">

src/views/summit/index.vue

@@ -78,14 +78,13 @@
           <el-button
             size="small"
             class="el-button el-button--text el-button--small"
-            v-if
             @click="enrollData(scope.row)"
           >报名信息</el-button>
-           <el-button
+           <!-- <el-button
             size="small"
             class="el-button el-button--text el-button--small"
             @click="applyPage(scope.row)"
-          >报名页面</el-button>
+          >报名页面</el-button> -->
           <el-button
             class="el-button el-button--text el-button--small"
             size="small"
@@ -94,7 +93,6 @@
           <el-button
             size="small"
             class="el-button el-button--text el-button--small"
-            v-if
             @click="review(scope.row)"
           >回顾页面</el-button>
           <el-button
@@ -136,7 +134,7 @@
       v-on:reviewDialogEvent="reviewDialogEvent"
     />
 
-    <applyPage :applyInfo='applyInfo'></applyPage>
+    <!-- <applyPage :applyInfo='applyInfo'></applyPage> -->
   </div>
 </template>
 <script>
@@ -146,7 +144,7 @@ import { page, update } from "src/api/summit/activity";
 import summitPopup from "src/views/summit/model/summitPopup";
 import enrollDataPopup from "src/views/summit/model/enrollDataPopup";
 import reviewPopup from "src/views/summit/model/reviewPopup";
-import applyPage from "src/views/summit/model/applyPage";
+// import applyPage from "src/views/summit/model/applyPage";
 
 import { getToken } from "src/utils/auth";
 
@@ -156,7 +154,7 @@ export default {
     summitPopup,
     enrollDataPopup,
     reviewPopup,
-    applyPage
+    // applyPage
   },
   data() {
     return {
@@ -210,9 +208,9 @@ export default {
   },
   methods: {
     //报名页面
-    applyPage(){
-      this.applyInfo.dialogVisible = true;
-    },
+    // applyPage(){
+    //   this.applyInfo.dialogVisible = true;
+    // },
     getList() {
       this.listLoading = true;
       page(this.query).then(res => {

src/views/vehicle/vehicleCount/index.vue

@@ -75,7 +75,6 @@
        <span>{{scope.row.beforeDepartureNum}}</span>
      </template>
    </el-table-column>
- 
    <el-table-column width="150" align="center" label="正常交车">
      <template scope="scope">
        <span>{{scope.row.actualDepartureNum}}</span>
@@ -112,6 +111,12 @@
 	  </template>
 	</el-table-column>
 	
+		<el-table-column width="150" align="center" label="过期未出车">
+	  <template scope="scope">
+	    <span>{{scope.row.noUseNum}}</span>
+	  </template>
+	</el-table-column>
+	
 	<el-table-column width="200" align="center" label="日期">
 	  <template scope="scope">
 	    <span>{{scope.row.countDate}}</span>
@@ -145,7 +150,7 @@
 					{'id':3, "name":"内部用车"}
 					],
 				list : [],
-				header : ['序号','类型','应交车','提前交车','正常交车','延期交车','应还车','提前还车','正常还车','延期还车','日期'],
+				header : ['序号','类型','应交车','提前交车','正常交车','延期交车','应还车','提前还车','正常还车','延期还车','过期未出车','日期'],
 				name: 'export'
               }
         },
@@ -157,8 +162,12 @@
         },
         methods: {
 			handlerSearch() {
-				this.listQuery.startTime = getYMD_date(new Date(this.listQuery.startTime));
-				this.listQuery.endTime = getYMD_date(new Date(this.listQuery.endTime));
+				if (this.listQuery.startTime) {
+					this.listQuery.startTime = getYMD_date(new Date(this.listQuery.startTime));
+				}
+				if(this.listQuery.endTime) {
+					this.listQuery.endTime = getYMD_date(new Date(this.listQuery.endTime));
+				}
 				 get(this.listQuery).then(response => {
 				     if (response.status === 200) {
 						 this.list = response.data
@@ -234,6 +243,7 @@
 					window.location.href="https://"+domain+"/vehicle/vehicleCount/app/unauth/download?path="+fileName;
 				})
         },
+		
 	}
  }
 </script>

src/views/xxOfficialWebsite/modal/popup.vue

@@ -48,7 +48,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="发布人" prop="publisher">
-            <el-input v-model="form.publisher"  type="text" placeholder="请输入发布人"></el-input>
+            <el-input v-model="form.publisher"  type="text"placeholder="请输入发布人"></el-input>
           </el-form-item>
         </el-col>
       </el-row>