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

src/api/order/rentVehicle.js

@@ -127,3 +127,22 @@ export function downloadExcel(params) {
     responseType: 'blob'
   });
 }
+
+//会员订单管理列表
+export function pageList(params) {
+  return fetch({
+    url: '/api/order/orderMember/page',
+    method: 'post',
+    data: params
+  });
+}
+
+//会员订单管理导出
+export function orderMemberExcel(params) {
+  return fetch({
+    url: '/api/order/orderMember/page',
+    method: 'post',
+    data: params,
+    responseType: 'blob'
+  });
+}
\ No newline at end of file

src/views/userManagement/userList/index.vue

@@ -27,6 +27,8 @@
                          :value="val.id"></el-option>
             </el-select>
           </el-form-item>
+
+
           <!--            <el-form-item label="注册时间" prop="bookDateRange">-->
           <!--              <el-date-picker-->
           <!--                v-model="listQuery.registrationDate "-->
@@ -90,7 +92,7 @@
           <span>{{scope.row.channel}}</span>
         </template>
       </el-table-column>
-      <el-table-column width="110" align="center" label="来源">
+      <el-table-column width="90" align="center" label="来源">
         <template scope="scope">
           <span>{{scope.row.source}}</span>
         </template>
@@ -110,6 +112,11 @@
           <span>{{scope.row.positionName}}</span>
         </template>
       </el-table-column>
+      <el-table-column width="130" align="center" label="上级/电话">
+        <template scope="scope">
+          <span>{{getSuperiorInformation(scope.row.nameOfSuperior,scope.row.superiorMobileNumber,1)}}</span>
+        </template>
+      </el-table-column>
       <el-table-column width="200" align="center" label="加入时间">
         <template scope="scope">
           <span>{{scope.row.timeOfMembership}}</span>
@@ -302,6 +309,11 @@
               <span>{{userDetails.cityName}}</span>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="上级:">
+              <span>{{getSuperiorInformation(userDetails.nameOfSuperior,userDetails.superiorMobileNumber,2)}}</span>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
 
@@ -1461,6 +1473,19 @@
           trigger: 'blur'
         };
       },
+      /**
+       * 根据拼接上级信息
+       */
+      getSuperiorInformation(name,mobile,type){
+
+        if (type==1&&name && mobile) {
+          return name+'/'+mobile;
+        }
+        if (type==2&&name && mobile) {
+          return name+'  '+mobile;
+        }
+        return '';
+      },
       templateModel(){
         this.costDetail= {
           key: undefined,

src/views/vehicle/vehicleInfo/index.vue

@@ -416,7 +416,6 @@
 			</el-table-column>
 		</el-table>
 
-		<div v-show="!listLoading" class="pagination-container">
 		<el-pagination
 				@size-change="handleSizeChange"
 				@current-change="handleCurrentChange"
@@ -426,7 +425,6 @@
 				layout="total, sizes, prev, pager, next, jumper"
 				:total="total"
 			></el-pagination>
-		</div>
 
 		<!-- 对话框相关html元素  -->
 		<el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" @close="closePop">
@@ -1450,7 +1448,7 @@ export default {
 			},
 			selectArry: [],
 			selectVehicleModelArray: [],
-			list: null,
+			list: [],
 			total: null,
 			listLoading: true,
 			listQuery: {
@@ -1574,9 +1572,9 @@ export default {
 					t.listQuery.addrProvinceName = ''
 				}
 
-				if (queryJson.vin) {
-					t.listQuery.vin = queryJson.vin
-				}
+				// if (queryJson.vin) {
+				// 	t.listQuery.vin = queryJson.vin
+				// }
 				if (queryJson.insuranceCompany) {
 					t.listQuery.insuranceCompany = queryJson.insuranceCompany
 				}
@@ -2541,7 +2539,11 @@ export default {
 		checkIfRuning: vehicle =>
 			vehicle.status === VEHICLE_CONSTANT_STATUS_NORMAL,
 		getVehicleStatus: function(code) {
-			return this.vehicleStatus[code].val
+			// console.log(this.getAllVehicleStatus()[1].val);
+			// let demo = this.getAllVehicleStatus.filter(item => item)
+			// console.log(this.vehicleStatus[code]);
+			
+			return this.getAllVehicleStatus()[code].val
 		},
 		getAllVehicleStatus: function() {
 			return {
@@ -2603,6 +2605,7 @@ export default {
 			return getConstantListByType(VEHICLE_CONSTANT_VEHICLE_USE)
 		},
 		getList() {
+			// this.listQuery.vin = null
 			this.listLoading = true
 			let listQueryTemp = this.fillDateRange2Object(
 				this.listQuery,
@@ -2631,23 +2634,27 @@ export default {
 			if (!this.listQuery.belongToName) {
 				this.listQuery.belongToName = undefined
 			}
+			
+			
 			page(listQueryTemp).then(response => {
 				if (response.code == 1) {
 					let totalCountRs = undefined
 					let listRs = undefined
-					if (
-						!this.$utils.isEmpty(response.data.data) &&
-						this.$utils.isInteger(response.data.totalCount)
-					) {
-						listRs = response.data.data
-						totalCountRs = response.data.totalCount
-						listRs.map(function(item) {
-							item.visible2 = false
-						})
-					}
+					// if (
+					// 	!this.$utils.isEmpty(response.data.data) &&
+					// 	this.$utils.isInteger(response.data.totalCount)
+					// ) {
+					// 	listRs = response.data.data
+					// 	totalCountRs = response.data.totalCount
+					// 	listRs.map(function(item) {
+					// 		item.visible2 = false
+					// 	})
+					// }
 					this.listLoading = false
-					this.list = listRs
-					this.total = totalCountRs
+					console.log(response.data.data);
+					
+					this.list = response.data.data
+					this.total = response.data.totalCount
 				} else {
 					this.list = []
 					this.listLoading = false

src/views/vehicleType/modal/oneType.vue

@@ -338,6 +338,7 @@
                     imgTitle: undefined,
                     imgKeyword: undefined,
                     imgDesc: undefined,
+                    coverPic:'',
                     pPrice: 0,//普通会员
                     hPrice: 0,//黄金会员
                     zPrice: 0,//钻石会员
@@ -354,7 +355,8 @@
                     rentDiscountStatus: "0",//租车优惠状态 0--没有优惠;1--会员折扣;2--固定值
                     rentDiscountPrice: 0,//租车优惠价格  固定优化价格
                     buyPrice: 0,//购买价格
-                    intro: ''
+                    intro: '',
+                    posterBackground: '',//海报背景
                 },
                 showDestinationVisible: false,//编辑目的地
                 showPathWayVisible: false,//编辑途径地
@@ -928,24 +930,31 @@
             cleanForm() {
                 this.activeName2 = "";
                 this.form = {
-                    name: undefined,//房车名称
-                    config: "",//房车配置
-                    keyword: "",//房车关键标签
-                    modelsDetails: "",//房车详情
-                    modelParam: [],//房车参数
-                    picture: "",//轮播图
-                    price: 0,//租车价格
+                  number: undefined,//乘卧数量
+                  brand: undefined,//房车品牌
+                  name: '',//房车名称
+                  config:'',//房车配置
+                  keyword: '',//房车关键标签
+                  modelsDetails: '',//房车详情
+                  modelParam: '',//房车参数
+                  picture: '',//轮播图
+                  coverPic: '',//封面图
+                  posterBackground: '',//海报背景
+                  price: undefined,//租车价格
                   deposit: 20000,//总押金
-                    vioDeposit: 0,//违章押金
+                  vioDeposit: '',
+                  rentDiscountStatus: 0,//租车优惠状态 0--没有优惠;1--会员折扣;2--固定值
+                  buyPrice: undefined,//购买价格
+                  alt: '',//seo 标签优化
+                  intro: '',
+                  imgTitle: '',
+                  imgKeyword: '',
+                  imgDesc: '',
+                  pPrice: 0,//普通会员
+                  hPrice: 0,//黄金会员
+                  zPrice: 0,//钻石会员
                   hotSign: "2",//热门车型  1、热门  2、非热门
-                    rentDiscountStatus: "0",//租车优惠状态 0--没有优惠;1--会员折扣;2--固定值
-                    rentDiscountPrice: "",//租车优惠价格  固定优化价格
-                    buyPrice: 0,//购买价格
-                    posterBackground: '',//海报背景
-                    alt: '',
-                    imgTitle: undefined,
-                    imgKeyword: undefined,
-                    imgDesc: undefined,
+                  rentDiscountPrice: 0,//租车优惠价格  固定优化价格
                 }
             }
         }