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

src/views/order/rentVehicleInfo/index.vue

@@ -288,7 +288,7 @@
 								:key="index"
 							>{{item.excessCost}}</span>
 						</el-form-item>
-						<el-form-item label="违约赔款:">
+						<!-- <el-form-item label="违约赔款:">
 							<span
 								v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList"
 								:key="index"
@@ -305,6 +305,10 @@
 								v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList"
 								:key="index"
 							>{{item.deductions}}</span>
+						</el-form-item> -->
+						<el-form-item label="违约赔款:" v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList" :key="index">
+							<span>{{item.statusName}}</span><span style="margin-left:10px">{{item.cost}}</span>元<br/>
+							<span style="color:#999">{{item.deductions}}</span>
 						</el-form-item>
 						<el-form-item label="优惠券返还:">
 							<span

src/views/userManagement/userList/index.vue

@@ -142,9 +142,9 @@
       <!--      </el-table-column>-->
       <el-table-column align="center" label="操作" width="400" fixed="right">
         <template scope="scope">
-           <el-button size="small" class="el-button el-button--text el-button--small" v-show="!scope.row.nameOfSuperior || !scope.row.superiorMobileNumber" @click="setHigher(scope.row)">
+           <!-- <el-button size="small" class="el-button el-button--text el-button--small" v-show="!scope.row.nameOfSuperior || !scope.row.superiorMobileNumber" @click="setHigher(scope.row)">
             设置上级
-          </el-button>
+          </el-button> -->
           <el-button size="small" class="el-button el-button--text el-button--small" @click="viewDetails(scope.row)">
             查看详情
           </el-button>