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

src/api/admin/member/index.js

@@ -26,4 +26,11 @@ export function update(params) {
     method: 'PUT',
     data:params
   });
+}
+export function setBind(params) {
+  return fetch({
+    url: 'api/admin/relation/admin/bind',
+    method: 'post',
+    data: params
+  });
 }
\ No newline at end of file

src/api/admin/userManagement/index.js

@@ -148,4 +148,15 @@ export function username(id) {
     url: 'api/admin/public/app/userinfo-by-username?name='+id,
     method: 'get'
   });
-}
+}
\ No newline at end of file
+
+/**
+ *  用户详情
+ * @param obj
+ */
+export function getOne(id) {
+  return fetch({
+    url: '/api/admin/appUsersManage/user_info/'+id,
+    method: 'get',
+  });
+}

src/views/order/modal/rentOrderDetailModal.vue

@@ -154,7 +154,7 @@
 						<p v-else>无</p>
 					</td>
 					<td>
-						<p v-if="form.rentVehiclePriceVO && form.damageSafeAmount > 0">
+						<p v-if="form.rentVehiclePriceVO && form.rentVehiclePriceVO.damageSafeAmount > 0">
 							¥{{form.rentVehiclePriceVO.damageSafePrice}}/{{form.rentVehiclePriceVO.dayNum}}天
 						</p>
 						<p v-else>
@@ -170,7 +170,7 @@
 						</p>
 					</td>
 					<td>
-						<p v-if='form.rentVehiclePriceVO && form.driverAmount > 0'>
+						<p v-if='form.rentVehiclePriceVO && form.rentVehiclePriceVO.driverAmount > 0'>
 							¥{{form.rentVehiclePriceVO.driverPrice}}*{{form.rentVehiclePriceVO.driverNum}}/{{form.rentVehiclePriceVO.dayNum}}天
 						</p>
 						<p v-else>

src/views/order/rentVehicleInfo/index.vue

@@ -279,38 +279,23 @@
 					<el-form-item label="实退押金:">
 						<span>{{orderReturnVehicleCrosstown.restDeposit}}</span>
 					</el-form-item>
-					<!-- {{orderReturnVehicleCrosstown.violateDetailList != ''}} -->
 					<div v-show="orderReturnVehicleCrosstown.violateDetailList != ''">
-					<!-- <div> -->
 						<el-form-item label="消费超额:">
 							<span
 								v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList"
 								:key="index"
 							>{{item.excessCost}}</span>
 						</el-form-item>
-						<el-form-item label="违约赔款:">
-							<span
-								v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList"
-								:key="index"
-							>{{item.cost}}</span>
-						</el-form-item>
-						<el-form-item label="违约类型:">
-							<span
-								v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList"
-								:key="index"
-							>{{item.statusName}}</span>
-						</el-form-item>
-						<el-form-item label="赔款备注:">
-							<span
-								v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList"
-								:key="index"
-							>{{item.deductions}}</span>
+
+						<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
 								v-for="(item,index) in orderReturnVehicleCrosstown.backCoupons"
 								:key="index"
-							>{{item.title}} {{item.usedAmount}}</span>
+							>{{item.title}} 价值{{item.usedAmount}}元</span>
 						</el-form-item>
 					</div>
 				</div>

src/views/userManagement/userList/index.vue

@@ -142,6 +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>
           <el-button size="small" class="el-button el-button--text el-button--small" @click="viewDetails(scope.row)">
             查看详情
           </el-button>
@@ -169,6 +172,18 @@
       </el-table-column>
     </el-table>
 
+    <el-dialog title="设置上级" :visible.sync="setPop" @close='closeSet'>
+       <!-- <el-form-item label="上级电话">
+        <el-input placeholder="请输入上级电话"></el-input>
+      </el-form-item> -->
+      <el-input v-model="phone" placeholder="请输入上级手机号" style="width:300px"></el-input>
+      <div style="margin-top:20px">
+        <el-button type="primary" @click="setHeighterBtn">确定</el-button>
+        <el-button type="primary" @click="setPop = false">取消</el-button>
+      </div>
+    </el-dialog>
+
+
     <div v-show="!listLoading" class="pagination-container">
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
                      :current-page.sync="listQuery.page" :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit"
@@ -533,7 +548,8 @@
     setDisable,
     setAvailable,
     deleteUser,
-    userPosition
+    userPosition,
+    getOne
   } from 'src/api/admin/userManagement/index';
   import {getToken} from 'src/utils/auth';
   import {mapGetters} from 'vuex';
@@ -548,7 +564,7 @@
     getrewardSetting
   } from 'api/purseManage';
   import {formatDate} from "../../../utils/dateFormattor";
-  import {getMembers} from "src/api/admin/member/index"
+  import {getMembers,setBind} from "src/api/admin/member/index"
   import tourOrderDetailModal from "src/views/userManagement/model/tourOrderDetailModal";//旅游订单
   import rentOrderDetailModal from "src/views/userManagement/model/rentOrderDetailModal";//租车订单详情
   import memberOrderDetailModal from "src/views/userManagement/model/memberOrderDetailModal";//会员订单详情
@@ -562,6 +578,8 @@
     },
     data() {
       return {
+        setPop:false,
+        activeId:'',//id
         tourCostDetail: '',
         memberCostDetail: '',
         rentCostDetail: '',
@@ -631,6 +649,7 @@
         orderTotal: null,
         listLoading: true,
         orderListLoading: true,
+        phone:null,//上级电话
         newMemberObject: {
           phone: undefined,
           memberLevel: undefined,
@@ -881,6 +900,31 @@
 
     },
     methods: {
+      //设置上级弹窗
+      setHigher(val){   
+        this.setPop = true;
+        this.activeId = val.userId;
+      },
+      //设置上级
+      setHeighterBtn(){
+        if (!!this.phone) {
+           setBind({"phone":this.phone,"userId":this.activeId}).then(data=>{
+            if (data.status == 200) {
+              this.$message.success('设置成功')
+              this.setPop = false
+               this.getList();
+            }else{
+              this.$message.error(data.message)
+            }
+          })
+        }else{
+          this.$message.error('请输入上级手机号')
+        }
+      },
+      //设置上级弹窗关闭
+      closeSet(){
+        this.phone = null
+      },
       handleOrderDetail(row) {
 
 
@@ -1103,9 +1147,12 @@
        * @param row
        */
       viewDetails(row) {
-        this.userDetails = row
-        this.detailsDialogFormVisible = true
-        this.getBoolean(this.userDetails.certificationStatus)
+        getOne(row.userId).then(res=>{
+          this.userDetails=res.data
+          this.detailsDialogFormVisible = true
+          this.getBoolean(this.userDetails.certificationStatus)
+        })
+
       }
       ,
       /**
@@ -1433,9 +1480,12 @@
         this.listQuery.registrationTimeEnd = undefined
         this.listQuery.registrationTimeBegin = undefined
         this.listQuery.postionState = undefined
+        this.listQuery.realName =undefined
         if(this.listQuery){
           localStorage.setItem("userList", JSON.stringify(this.listQuery));
         }
+        this.getList();
+
       },
       change() {
         this.$forceUpdate()