Skip to content

C
cloud-platform-ui
Commit fe94fd62 authored by jiaorz's avatar jiaorz
Browse files
Options

Merge branch 'master' into master-bg

parents b8af6a85 9862b78b
Show whitespace changes
Inline Side-by-side
Showing with 101 additions and 22 deletions
src/api/admin/member/index.js
View file @ fe94fd62
......@@ -27,3 +27,10 @@ export function update(params) {
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
View file @ fe94fd62
......@@ -149,3 +149,14 @@ export function username(id) {
method: 'get'
});
}
/**
* 用户详情
* @param obj
*/
export function getOne(id) {
return fetch({
url: '/api/admin/appUsersManage/user_info/'+id,
method: 'get',
});
}
src/views/discoveryModule/clapIndex.vue
View file @ fe94fd62
......@@ -54,9 +54,9 @@
</el-form>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
<el-button class="filter-item" type="primary" v-waves @click="reloadPage">重置</el-button>
<el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate"
<!-- <el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate"
type="primary" icon="edit">添加
</el-button>
</el-button> -->
</div>
<el-table :key='tableKey' :data="list" border fit highlight-current-row
style="width: 100%">
......@@ -104,7 +104,7 @@
<template scope="scope">
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑
</el-button>
<el-button size="small"class="el-button el-button--text el-button--small" style="color: green;" v-if="scope.row.visible==2" @click="upStatus(scope.row)">设置为公开
<el-button size="small" class="el-button el-button--text el-button--small" style="color: green;" v-if="scope.row.visible==2" @click="upStatus(scope.row)">设置为公开
</el-button>
<el-button size="small" class="el-button el-button--text el-button--small" style="color: red" v-if="scope.row.visible==1" @click="upStatus(scope.row)">设置为保密
</el-button>
......
src/views/discoveryModule/questionsAndAnswers.vue
View file @ fe94fd62
......@@ -54,9 +54,9 @@
</el-form>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
<el-button class="filter-item" type="primary" v-waves @click="reloadPage">重置</el-button>
<el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate"
<!-- <el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate"
type="primary" icon="edit">添加
</el-button>
</el-button> -->
</div>
<el-table :key='tableKey' :data="list" border fit highlight-current-row
style="width: 100%">
......@@ -98,7 +98,7 @@
<template scope="scope">
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑
</el-button>
<el-button size="small"class="el-button el-button--text el-button--small" style="color: green;" v-if="scope.row.visible==2" @click="upStatus(scope.row)">设置为公开
<el-button size="small" class="el-button el-button--text el-button--small" style="color: green;" v-if="scope.row.visible==2" @click="upStatus(scope.row)">设置为公开
</el-button>
<el-button size="small" class="el-button el-button--text el-button--small" style="color: red" v-if="scope.row.visible==1" @click="upStatus(scope.row)">设置为保密
</el-button>
......
src/views/discoveryModule/shortVideo.vue
View file @ fe94fd62
......@@ -54,9 +54,9 @@
</el-form>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
<el-button class="filter-item" type="primary" v-waves @click="reloadPage">重置</el-button>
<el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate"
<!-- <el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate"
type="primary" icon="edit">添加
</el-button>
</el-button> -->
</div>
<el-table :key='tableKey' :data="list" border fit highlight-current-row
style="width: 100%">
......@@ -104,7 +104,7 @@
<template scope="scope">
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑
</el-button>
<el-button size="small"class="el-button el-button--text el-button--small" style="color: green;" v-if="scope.row.visible==2" @click="upStatus(scope.row)">设置为公开
<el-button size="small" class="el-button el-button--text el-button--small" style="color: green;" v-if="scope.row.visible==2" @click="upStatus(scope.row)">设置为公开
</el-button>
<el-button size="small" class="el-button el-button--text el-button--small" style="color: red" v-if="scope.row.visible==1" @click="upStatus(scope.row)">设置为保密
</el-button>
......
src/views/order/modal/rentOrderDetailModal.vue
View file @ fe94fd62
......@@ -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
View file @ fe94fd62
......@@ -277,7 +277,7 @@
<div v-else-if="modalTitle=='还车记录'">
<el-form-item label="实退押金:">
<span>{{orderReturnVehicleCrosstown.restDeposit}}</span>
<span>{{orderReturnVehicleCrosstown.actualDeposit}}</span>
</el-form-item>
<!-- {{orderReturnVehicleCrosstown.violateDetailList != ''}} -->
<div v-show="orderReturnVehicleCrosstown.violateDetailList != ''">
......@@ -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
......@@ -330,7 +334,7 @@
</viewer>
</el-form-item>
<el-form-item label="备注:">
<span>{{form.remak}}</span>
<span>{{orderReturnVehicleCrosstown.remak}}</span>
</el-form-item>
</div>
<div v-if="modalTitle=='交车记录'">
......@@ -341,6 +345,7 @@
class="label-text"
>{{checkUserInfo.length > 0 && checkUserInfo[0].username? checkUserInfo[0].username : ""}} {{checkUserInfo.length > 0 && checkUserInfo[0].telephone? checkUserInfo[0].telephone : ""}}</span>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="交车时间:">
......@@ -443,7 +448,7 @@
</template>
<template v-if="item.status==3">
<div class="picBox">
<div v-show="item.iscomplete">退还违章保证金{{item.restAmount}}元（扣除{{item.amount}}元）</div>
<div v-show="item.iscomplete">退还违章保证金{{activeRecord.refundOfRemainingDeposit}}元（扣除{{activeRecord.violationOfCharges}}元）</div>
<div v-show="!item.iscomplete">退还押金{{item.restAmount}}元</div>
<div style="color: #999" v-show="item.iscomplete">
{{item.updTimeStr}}
......@@ -596,6 +601,7 @@ export default {
},
data() {
return {
activeRecord:null,
isInline: false,
pictureList: [],
dedDetail: [],
......@@ -1223,7 +1229,9 @@ export default {
that.dedTotal = 0
that.Tel = ''
getStep(row.no + '&address=1').then(response => {
this.activeRecord = response.data[0]
response.data.forEach(function(item) {
if (item.type != 1) {
that.Tel = item.customerPhone
that.type = item.type
......@@ -1264,7 +1272,6 @@ export default {
} else {
var arr = item.depositRefundRecord
}
that.depositRefundRecord = arr
// console.log(that.depositRefundRecord);
}
......
src/views/userManagement/userList/index.vue
View file @ fe94fd62
......@@ -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
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()
......
src/views/vehicle/bookRecord/index.vue
View file @ fe94fd62
......@@ -1942,4 +1942,8 @@
background: #000;
z-index: 2001;
}
.voucher{
width: 100px;
height: 100px;
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment