chuangte/share-space-vue
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

111

Browse Source
This commit is contained in:
邱贞招 2025-02-06 13:42:51 +08:00
parent 800899ab70
commit 9a1e365f4f
11 changed files with 292 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/api/system/order.js
View File

@ -42,3 +42,16 @@ export function delOrder(orderId) {
method: 'delete'
})
}
// 结束订单
export function closeBill(orderNo) {
return request({
url: '/app/order/orderEnd',
method: 'post',
params: {
orderNo: orderNo
}
})
}

196
src/components/MapSelect/index.vue
View File

@ -2,9 +2,8 @@
<div class="map-select">
<el-input
v-model="address"
placeholder="点击选择地址"
readonly
@click="showMapDialog"
placeholder="请输入或选择地址"
@change="handleAddressChange"
>
<el-button slot="append" icon="el-icon-location" @click="showMapDialog"></el-button>
</el-input>
@ -25,9 +24,9 @@
:loading="searching"
@keyup.enter.native="searchAddress"
>
<el-button
slot="append"
icon="el-icon-search"
<el-button
slot="append"
icon="el-icon-search"
@click="searchAddress"
:loading="searching"
></el-button>
@ -37,8 +36,8 @@
</div>
<div class="search-result" v-if="searchResults.length">
<ul>
<li
v-for="(item, index) in searchResults"
<li
v-for="(item, index) in searchResults"
:key="index"
@click="selectSearchResult(item)"
>
@ -51,7 +50,7 @@
</div>
<div slot="footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="confirmLocation" :disabled="!currentLocation.address">确 定</el-button>
<el-button type="primary" @click="confirmLocation">确 定</el-button>
</div>
</el-dialog>
</div>
@ -83,6 +82,11 @@ export default {
lng: null,
lat: null,
address: ''
},
defaultLocation: {
lng: 116.397428,
lat: 39.90923,
address: ''
}
}
},
@ -94,76 +98,84 @@ export default {
methods: {
showMapDialog() {
this.dialogVisible = true
this.$nextTick(() => {
// 设置安全密钥配置
window._AMapSecurityConfig = {
securityJsCode: globalConfig.aMap.secret
}
// 确保在设置安全密钥后再初始化地图
this.$nextTick(async () => {
// 确保高德地图已加载
this.$loadAMap().then(() => {
try {
await this.$loadAMap();
this.initMap()
}).catch(err => {
} catch (err) {
this.$modal.msgError('地图加载失败，请检查网络后刷新重试')
console.error('高德地图加载失败:', err)
this.dialogVisible = false
})
}
})
},
initMap() {
if (!this.map) {
// 加载所需插件
AMap.plugin([
'AMap.Geocoder',
'AMap.PlaceSearch',
'AMap.Geolocation'
], () => {
this.map = new AMap.Map('map', {
zoom: 13
})
// 添加定位控件
this.map.addControl(new AMap.Geolocation({
position: 'RB'
}))
// 等待地图实例创建完成
this.map = new AMap.Map('map', {
zoom: 13
});
// 初始化地理编码服务
this.geocoder = new AMap.Geocoder({
radius: 1000,
extensions: 'all'
})
// 初始化搜索服务
this.placeSearch = new AMap.PlaceSearch({
pageSize: 10,
citylimit: true,
extensions: 'all'
})
// 确保地图实例创建完成后再加载插件
this.map.on('complete', () => {
// 加载所需插件
AMap.plugin([
'AMap.Geocoder',
'AMap.PlaceSearch',
'AMap.Geolocation'
], () => {
// 添加定位控件
this.map.addControl(new AMap.Geolocation({
position: 'RB'
}))
// 点击地图事件
this.map.on('click', (e) => {
this.updateMarker(e.lnglat)
this.getAddress(e.lnglat)
})
// 如果已有坐标，则定位到该位置
if (this.currentLocation.lng && this.currentLocation.lat) {
const lnglat = new AMap.LngLat(this.currentLocation.lng, this.currentLocation.lat)
this.updateMarker(lnglat)
this.map.setCenter(lnglat)
this.getAddress(lnglat)
} else {
// 定位到当前位置
const geolocation = new AMap.Geolocation()
geolocation.getCurrentPosition((status, result) => {
if (status === 'complete') {
this.updateMarker(result.position)
this.map.setCenter(result.position)
this.getAddress(result.position)
}
// 初始化地理编码服务
this.geocoder = new AMap.Geocoder({
radius: 1000,
extensions: 'all'
})
}
})
// 初始化搜索服务
this.placeSearch = new AMap.PlaceSearch({
pageSize: 10,
citylimit: true,
extensions: 'all'
})
// 点击地图事件
this.map.on('click', (e) => {
this.updateMarker(e.lnglat)
this.getAddress(e.lnglat)
})
// 如果已有坐标，则定位到该位置
if (this.currentLocation.lng && this.currentLocation.lat) {
const lnglat = new AMap.LngLat(this.currentLocation.lng, this.currentLocation.lat)
this.updateMarker(lnglat)
this.map.setCenter(lnglat)
this.getAddress(lnglat)
} else {
// 定位到当前位置
const geolocation = new AMap.Geolocation()
geolocation.getCurrentPosition((status, result) => {
if (status === 'complete') {
this.updateMarker(result.position)
this.map.setCenter(result.position)
this.getAddress(result.position)
} else {
// 定位失败时使用默认位置（北京）
const defaultLnglat = new AMap.LngLat(this.defaultLocation.lng, this.defaultLocation.lat)
this.updateMarker(defaultLnglat)
this.map.setCenter(defaultLnglat)
this.getAddress(defaultLnglat)
this.$message.warning('定位失败，已切换到默认位置')
}
})
}
})
});
}
},
updateMarker(lnglat) {
@ -175,7 +187,7 @@ export default {
map: this.map,
draggable: true
})
// 拖动结束后获取地址
this.marker.on('dragend', (e) => {
this.getAddress(e.target.getPosition())
@ -210,18 +222,18 @@ export default {
this.marker.setMap(null)
this.marker = null
}
// 显示加载状态
this.$set(this, 'searching', true)
this.placeSearch.search(this.searchKey, (status, result) => {
console.log('搜索结果:', status, result)
this.searching = false
if (status === 'complete') {
this.searchResults = result.poiList.pois
console.log('解析到的地点:', this.searchResults)
// 更新搜索结果列表
this.$nextTick(() => {
if (this.searchResults.length > 0) {
@ -233,7 +245,7 @@ export default {
}
})
} else {
console.error('搜索失败:', result)
console.error('搜索失败11111:', result)
this.$message.error('搜索失败，请重试')
}
}, (error) => {
@ -251,9 +263,27 @@ export default {
this.searchResults = []
this.searchKey = ''
},
handleAddressChange(val) {
this.$emit('input', val)
// 如果有经纬度信息，一并更新
if (this.currentLocation.lng && this.currentLocation.lat) {
this.$emit('select', {
...this.currentLocation,
address: val
})
}
},
confirmLocation() {
this.$emit('input', this.currentLocation.address)
this.$emit('select', this.currentLocation)
// 即使没有完整的位置信息也允许确认
const location = {
address: this.currentLocation.address || this.address || '',
lng: this.currentLocation.lng || this.defaultLocation.lng,
lat: this.currentLocation.lat || this.defaultLocation.lat
}
// 更新本地 address 变量
this.address = location.address
this.$emit('input', location.address)
this.$emit('select', location)
this.dialogVisible = false
}
}
@ -281,14 +311,14 @@ export default {
left: 10px;
width: 300px;
z-index: 1;
.current-location {
margin-top: 10px;
padding: 10px;
background: rgba(255, 255, 255, 0.9);
border-radius: 4px;
box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
p {
margin: 0;
font-size: 13px;
@ -296,28 +326,28 @@ export default {
word-break: break-all;
}
}
.search-result {
margin-top: 5px;
background: #fff;
box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
max-height: 300px;
overflow-y: auto;
ul {
margin: 0;
padding: 0;
list-style: none;
li {
padding: 8px 12px;
cursor: pointer;
border-bottom: 1px solid #eee;
&:hover {
background: #f5f7fa;
}
.address {
font-size: 12px;
color: #909399;
@ -327,4 +357,4 @@ export default {
}
}
}
</style>
</style>

11
src/main.js
View File

@ -95,18 +95,18 @@ function loadAMap() {
resolve(window.AMap)
return
}
const script = document.createElement('script')
script.type = 'text/javascript'
script.async = true
const { version, key, plugins } = globalConfig.aMap
script.src = `https://webapi.amap.com/maps?v=${version}&key=${key}&plugin=${plugins.join(',')}`
script.onerror = reject
script.onload = () => {
resolve(window.AMap)
}
document.head.appendChild(script)
})
}
@ -120,3 +120,8 @@ new Vue({
store,
render: h => h(App)
})
// 设置安全密钥配置
window._AMapSecurityConfig = {
securityJsCode: globalConfig.aMap.secret
}

16
src/views/system/changeBalance/index.vue
View File

@ -20,7 +20,7 @@
<el-form-item label="收支类型" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择收支类型" clearable>
<el-option
v-for="dict in dict.type.rl_change_type"
v-for="dict in dict.type.ss_change_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@ -30,7 +30,7 @@
<el-form-item label="业务类型" prop="busType">
<el-select v-model="queryParams.busType" placeholder="请选择业务类型" clearable>
<el-option
v-for="dict in dict.type.rl_business_type"
v-for="dict in dict.type.ss_business_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@ -88,12 +88,12 @@
<el-table-column label="第三方流水号" align="center" prop="outTradeNo" />
<el-table-column label="收支类型" align="center" prop="type">
<template slot-scope="scope">
<dict-tag :options="dict.type.rl_change_type" :value="scope.row.type"/>
<dict-tag :options="dict.type.ss_change_type" :value="scope.row.type"/>
</template>
</el-table-column>
<el-table-column label="业务类型" align="center" prop="busType">
<template slot-scope="scope">
<dict-tag :options="dict.type.rl_business_type" :value="scope.row.busType"/>
<dict-tag :options="dict.type.ss_business_type" :value="scope.row.busType"/>
</template>
</el-table-column>
<el-table-column label="变动前金额" align="center" prop="beforeBalance" />
@ -102,7 +102,7 @@
<el-table-column label="所属人名称" align="center" prop="ownerName" />
<el-table-column label="所属人类型" align="center" prop="ownerType">
<template slot-scope="scope">
<dict-tag :options="dict.type.rl_user_type" :value="scope.row.ownerType"/>
<dict-tag :options="dict.type.ss_user_type" :value="scope.row.ownerType"/>
</template>
</el-table-column>
<!-- <el-table-column label="所属人id" align="center" prop="ownerId" />-->
@ -135,7 +135,7 @@
<el-form-item label="收支类型" prop="type">
<el-select v-model="form.type" placeholder="请选择收支类型">
<el-option
v-for="dict in dict.type.rl_change_type"
v-for="dict in dict.type.ss_change_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@ -145,7 +145,7 @@
<el-form-item label="业务类型" prop="busType">
<el-select v-model="form.busType" placeholder="请选择业务类型">
<el-option
v-for="dict in dict.type.rl_business_type"
v-for="dict in dict.type.ss_business_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@ -187,7 +187,7 @@ import { listChangeBalance, getChangeBalance, delChangeBalance, addChangeBalance
export default {
name: "ChangeBalance",
dicts: ['rl_change_type', 'rl_business_type','rl_user_type'],
dicts: ['ss_change_type','ss_business_type','ss_user_type'],
props:{
query: {
type: Object,

8
src/views/system/detail/index.vue
View File

@ -43,13 +43,13 @@
<el-table-column label="订单号" align="center" prop="orderNo" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.rl_dividend_status" :value="scope.row.status"/>
<dict-tag :options="dict.type.ss_dividend_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="收款人" align="center" prop="partnerName" />
<el-table-column label="收款人类型" align="center" prop="partnerType">
<template slot-scope="scope">
<dict-tag :options="dict.type.rl_user_type" :value="scope.row.partnerType"/>
<dict-tag :options="dict.type.ss_user_type" :value="scope.row.partnerType"/>
</template>
</el-table-column>
<el-table-column label="电话" align="center" prop="partnerPhone" />
@ -104,7 +104,7 @@ import { listDetail, getDetail, delDetail, addDetail, updateDetail } from "@/api
export default {
name: "Detail",
dicts: ['rl_user_type','rl_dividend_status'],
dicts: ['ss_user_type','ss_dividend_status'],
props:{
query: {
type: Object,
@ -167,7 +167,7 @@ export default {
formatProportion(row) {
let dividendProportion = row.dividendProportion;
if (dividendProportion !== null && dividendProportion !== undefined) {
return (dividendProportion * 100).toFixed(2) + '%';
return dividendProportion.toFixed(2) + '%';
}
return '—'; // 或者返回其他默认值
},

54
src/views/system/device/device_detail.vue
View File

@ -357,6 +357,22 @@
</el-tabs>
<el-dialog title="绑定设施" :visible.sync="bindFacilityDialogVisible" width="900px" append-to-body>
<el-form :model="facilityQueryParams" ref="facilityQueryForm" :inline="true" class="search-form">
<el-form-item label="店铺" prop="storeId">
<el-select
v-model="facilityQueryParams.storeId"
filterable
clearable
placeholder="请选择店铺"
@change="handleFacilityQuery"
>
<el-option
v-for="item in storeOptions"
:key="item.storeId"
:label="item.name"
:value="item.storeId"
/>
</el-select>
</el-form-item>
<el-form-item label="设施名称" prop="equipmentName">
<el-input v-model="facilityQueryParams.equipmentName" placeholder="请输入设施名称" clearable size="small" @keyup.enter.native="getFacilityList" />
</el-form-item>
@ -474,6 +490,7 @@ import QRCode from 'qrcode'
import Role from '@/views/system/rule/index.vue'
import Log from '@/views/system/commandLog/index.vue'
import {getDomain} from "@/api/common/common";
import { listStore } from "@/api/system/store";
export default {
name: "DeviceDetail",
components: {
@ -547,7 +564,12 @@ export default {
packageName: '',
chargeMode: '',
chargeType: ''
}
},
facilityQuery: {
name: undefined,
storeId: undefined
},
storeOptions: [],
}
},
computed: {
@ -636,21 +658,19 @@ export default {
const queryParams = {
pageNum: this.facilityQueryParams.pageNum,
pageSize: this.facilityQueryParams.pageSize,
name: this.facilityQueryParams.name,
name: this.facilityQueryParams.equipmentName,
type: this.facilityQueryParams.type,
status: "0",
storeId: this.deviceData.storeId,
storeId: this.facilityQueryParams.storeId,
merchantId: this.deviceData.userId,
isBind: false
};
console.log(queryParams, 'queryParams');
listUnifiedEquipment(queryParams).then(response => {
this.facilityList = response.rows;
this.facilityTotal = response.total;
this.facilityTableLoading = false;
}).catch(() => {
this.$message.error("获取设施列表失败");
this.facilityTableLoading = false;
});
},
@ -755,7 +775,9 @@ export default {
openBindFacilityDialog() {
this.bindFacilityDialogVisible = true;
this.getFacilityList();
this.getStoreOptions().then(() => {
this.getFacilityList();
});
},
handleBindFacility(row) {
@ -855,10 +877,10 @@ export default {
this.facilityQueryParams = {
pageNum: 1,
pageSize: 10,
name: undefined,
equipmentName: undefined,
type: undefined,
storeId: undefined,
status: "0",
storeId: this.deviceData.storeId,
merchantId: this.deviceData.userId,
isBind: false
};
@ -882,14 +904,16 @@ export default {
return '';
}
},
getGateAndRestroomList() {
// 假设有一个 API 可以获取大门和卫生间的列表
listGateAndRestroom({ storeId: this.deviceData.storeId }).then(response => {
this.gateAndRestroomList = response.rows || [];
}).catch(() => {
this.$message.error("获取大门和卫生间列表失败");
getStoreOptions() {
return listStore({ pageSize: 999 ,merchantId: this.deviceData.userId}).then(response => {
this.storeOptions = response.rows;
});
}
},
/** 搜索按钮操作 */
handleFacilityQuery() {
this.facilityQueryParams.pageNum = 1;
this.getFacilityList();
},
}
}
</script>

19
src/views/system/order/index.vue
View File

@ -264,13 +264,13 @@
</template>
<script>
import { listOrder, getOrder, delOrder, addOrder, updateOrder } from "@/api/system/order";
import { listOrder, getOrder, delOrder, addOrder, updateOrder,closeBill } from "@/api/system/order";
import { $showColumns } from '@/utils/mixins';
import {parseTime} from "../../../utils/ruoyi";
import RefundDialog from "@/views/system/order/components/RefundDialog.vue";
// 默认排序字段
const defaultSort = {
export const defaultSort = {
prop: "createTime",
order: "descending"
}
@ -420,17 +420,18 @@ export default {
});
},
handleClose(row) {
this.$confirm(`确定结束订单【${row.billNo}】吗？`, {
let orderNo = row.orderNo;
this.$confirm(`确定结束订单【${orderNo}】吗？`, {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
// closeBill({billId: row.billId, totalEle: null}).then(res => {
// if (res.code === 200) {
// this.$message.success("操作成功");
// this.getList();
// }
// })
closeBill(orderNo).then(res => {
if (res.code === 200) {
this.$message.success("操作成功");
this.getList();
}
})
})
},
// 查看详情

138
src/views/system/order/order_detail.vue
View File

@ -63,6 +63,7 @@
{{ order.storeName }}
</router-link>
</el-descriptions-item>
<el-descriptions-item label="店长">{{ order.managerPhone || '--' }}</el-descriptions-item>
<el-descriptions-item label="大门">
<router-link
v-if="order.gateSn"
@ -70,6 +71,15 @@
class="link-type">
{{ order.gateSn }}
</router-link>
<template v-else>--</template>
</el-descriptions-item>
<el-descriptions-item label="房间类型">
<dict-tag :options="dict.type.ss_room_type2" :value="order.roomType2"/>
</el-descriptions-item>
<el-descriptions-item label="商户">
<router-link :to="`/user/detail/${order.merchantId}`" class="link-type">
{{ order.merchantName }}
</router-link>
</el-descriptions-item>
</el-descriptions>
</div>
@ -84,24 +94,11 @@
<el-descriptions-item label="收费模式">
<dict-tag :options="dict.type.ss_fee_rule_mode" :value="order.mode"/>
</el-descriptions-item>
<el-descriptions-item label="套餐名称">{{ order.ruleName }}</el-descriptions-item>
<el-descriptions-item label="套餐名称">{{ order.explain }}</el-descriptions-item>
<el-descriptions-item label="套餐时长">{{ order.duration }} 小时</el-descriptions-item>
</el-descriptions>
</div>
<!-- 商户信息 -->
<div class="info-section">
<h3>
<i class="el-icon-office-building"></i>
商户信息
</h3>
<el-descriptions :column="3" border>
<el-descriptions-item label="商户名称">
<router-link :to="`/user/detail/${order.merchantId}`" class="link-type">
{{ order.merchantName }}
</router-link>
</el-descriptions-item>
<el-descriptions-item label="商户ID">{{ order.merchantId }}</el-descriptions-item>
<el-descriptions-item label="已用时长">{{ order.hours || '--' }} 小时</el-descriptions-item>
<el-descriptions-item label="押金">{{ order.deposit || '--' }} 元</el-descriptions-item>
<el-descriptions-item label="押金退款">{{ order.depositRefund || '--' }} 元</el-descriptions-item>
</el-descriptions>
</div>
@ -116,7 +113,7 @@
<dict-tag :options="dict.type.ss_pay_type" :value="order.payType"/>
</el-descriptions-item>
<el-descriptions-item label="支付状态">
<dict-tag :options="dict.type.et_order_pay_status" :value="order.paid"/>
<dict-tag :options="dict.type.ss_order_pay_status" :value="order.paid"/>
</el-descriptions-item>
<el-descriptions-item label="支付时间">
{{ parseTime(order.payTime) }}
@ -140,7 +137,7 @@
<i class="el-icon-time" style="color: #E6A23C;"></i>
操作履历
</h3>
<el-timeline class="padding0">
<el-timeline class="padding0" v-if="order.orderOpers && order.orderOpers.length > 0">
<el-timeline-item
v-for="activity in order.orderOpers"
:key="activity.operId"
@ -150,7 +147,7 @@
>
<div class="timeline-content">
<span class="operation-type" :style="{ color: getTimelineItemColor(activity.operType) }">
{{ dict.type.ss_order_oper_type[activity.operType].label }}
{{ getOperTypeLabel(activity.operType) }}
</span>
<el-tooltip placement="right" effect="light" popper-class="operation-tooltip">
<div slot="content">
@ -168,6 +165,10 @@
</div>
</el-timeline-item>
</el-timeline>
<div v-else class="empty-history">
<i class="el-icon-document"></i>
<p>暂无操作记录</p>
</div>
</div>
</div>
</el-col>
@ -194,7 +195,7 @@
</template>
<script>
import { getOrder } from "@/api/system/order";
import {closeBill, getOrder} from "@/api/system/order";
import { parseTime } from '@/utils/ruoyi'
import Detail from '@/views/system/detail/index.vue'
import RefundDialog from './components/RefundDialog'
@ -202,7 +203,7 @@ import Log from "@/views/system/commandLog/index.vue";
export default {
name: "OrderDetail",
dicts: ['ss_order_status', 'ss_pay_type', 'et_order_pay_status', 'ss_fee_rule_mode', 'ss_order_oper_type'],
dicts: ['ss_order_status', 'ss_pay_type', 'ss_order_pay_status', 'ss_fee_rule_mode', 'ss_order_oper_type','ss_room_type2'],
components: {
Log,
RefundDialog,
@ -228,11 +229,34 @@ export default {
this.getDetail(this.orderId);
},
methods: {
/** 获取操作类型标签 */
getOperTypeLabel(operType) {
try {
return this.dict.type.ss_order_oper_type[operType-1]?.label || '未知操作';
} catch (error) {
console.error('获取操作类型标签失败:', error);
return '未知操作';
}
},
/** 获取房间类型文本 */
getRoomTypeText(type) {
const typeMap = {
'1': '房间',
'2': '大厅设施'
};
return typeMap[type] || '--';
},
/** 获取订单详情 */
async getDetail(orderId) {
try {
const response = await getOrder(orderId);
this.order = response.data;
// 打印操作记录，用于调试
if (this.order.orderOpers) {
console.log('操作记录:', this.order.orderOpers);
}
} catch (error) {
console.error('获取订单详情失败:', error);
this.$message.error('获取订单详情失败');
@ -251,12 +275,12 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
// closeBill({billId: this.order.billId}).then(res => {
// if (res.code === 200) {
// this.$message.success("操作成功");
// this.getDetail(this.order.orderId);
// }
// })
closeBill(this.order.orderNo).then(res => {
if (res.code === 200) {
this.$message.success("操作成功");
this.getDetail(this.order.orderId);
}
})
}).catch(() => {})
},
@ -269,7 +293,8 @@ export default {
'4': 'info', // 结束订单
'6': 'warning', // 退款
'7': 'danger', // 用户取消
'8': 'danger' // 系统自动取消
'8': 'danger', // 系统自动取消
'9': 'warning' // 用户结束订单
};
return typeMap[operType] || 'info';
},
@ -283,46 +308,11 @@ export default {
'4': '#909399', // 结束订单 - 灰色
'6': '#E6A23C', // 退款 - 黄色
'7': '#F56C6C', // 用户取消 - 红色
'8': '#F56C6C' // 系统自动取消 - 红色
'8': '#f63f3f', // 系统自动取消 - 红色
'9': '#8E44AD' // 用户结束订单 - 紫色
};
return colorMap[operType] || '#909399';
},
/** 获取操作图标 */
getOperationIcon(operType) {
const iconMap = {
'1': 'el-icon-plus', // 下单 - 加号图标
'2': 'el-icon-check', // 支付 - 对勾图标
'3': 'el-icon-refresh', // 更换包间 - 刷新图标
'4': 'el-icon-circle-close', // 结束订单 - 关闭圆圈图标
'6': 'el-icon-back', // 退款 - 返回图标
'7': 'el-icon-close', // 用户取消 - 关闭图标
'8': 'el-icon-warning' // 系统自动取消 - 警告图标
};
return iconMap[operType] || 'el-icon-info';
},
/** 获取提示内容 */
getTooltipContent(activity) {
let content = [];
// 添加操作详情
if (activity.details) {
content.push(activity.details);
}
// 添加金额变更信息
if (activity.beforeAmount !== activity.afterAmount) {
content.push(`金额变更: ${activity.beforeAmount}元 -> ${activity.afterAmount}元`);
}
// 添加操作人信息
if (activity.operPhone) {
content.push(`操作人: ${activity.operPhone}`);
}
return content.join('\n');
}
}
}
</script>
@ -521,4 +511,20 @@ export default {
}
}
}
.empty-history {
padding: 40px 0;
text-align: center;
color: #909399;
i {
font-size: 32px;
margin-bottom: 10px;
}
p {
margin: 0;
font-size: 14px;
}
}
</style>

5
src/views/system/store/index.vue
View File

@ -230,7 +230,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-col :span="12">
<el-form-item v-if="isAdmin" label="商户" prop="merchantId">
<el-select v-model="form.merchantId" filterable placeholder="请选择商户" >
<el-select v-model="form.merchantId" filterable placeholder="请选择商户" :disabled="query.merchantId">
<el-option
v-for="merchant in merchantOptions"
:key="merchant.userId"
@ -470,6 +470,7 @@ export default {
// 表单参数
form: {
address: '',
merchantId: this.query.merchantId,
lng: null,
lat: null
},
@ -608,7 +609,7 @@ export default {
county: null,
serverPhone: null,
simpleAddress: null,
merchantId: null,
merchantId: this.query.merchantId,
status: null,
gateSn: null,
managerId: null,

12
src/views/system/userWithdraw/index.vue
View File

@ -28,7 +28,7 @@
<el-form-item label="提现类型" prop="handlingChargeType">
<el-select v-model="queryParams.handlingChargeType" placeholder="请选择提现类型" clearable>
<el-option
v-for="dict in dict.type.rl_handling_charge_type"
v-for="dict in dict.type.ss_handling_charge_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@ -113,12 +113,12 @@
<el-table-column label="渠道名称" align="center" prop="name" />
<el-table-column label="提现类型" align="center" prop="handlingChargeType">
<template slot-scope="scope">
<dict-tag :options="dict.type.rl_handling_charge_type" :value="scope.row.handlingChargeType"/>
<dict-tag :options="dict.type.ss_handling_charge_type" :value="scope.row.handlingChargeType"/>
</template>
</el-table-column>
<el-table-column label="提现手续费" align="center" prop="withdrawHandlingCharge" />
<el-table-column label="单笔最低提现金额" align="center" prop="minAmount" />
<el-table-column label="单笔最高提现金额" align="center" prop="maxAmount" />
<el-table-column label="最低提现金额" align="center" prop="minAmount" />
<el-table-column label="最高提现金额" align="center" prop="maxAmount" />
<el-table-column label="是否开通" align="center" prop="isOpen">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.isOpen"/>
@ -167,7 +167,7 @@
<el-form-item label="提现类型" prop="handlingChargeType">
<el-select v-model="form.handlingChargeType" placeholder="请选择提现类型">
<el-option
v-for="dict in dict.type.rl_handling_charge_type"
v-for="dict in dict.type.ss_handling_charge_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@ -207,7 +207,7 @@ import { listUserWithdraw, getUserWithdraw, delUserWithdraw, addUserWithdraw, up
export default {
name: "UserWithdraw",
dicts: ['rl_handling_charge_type', 'sys_normal_disable'],
dicts: ['ss_handling_charge_type', 'sys_normal_disable'],
props:{
query: {
type: Object,

27
src/views/user/user/detail.vue
View File

@ -26,16 +26,18 @@
<!-- 用户详情卡片 -->
<el-col :lg="10" :md="12" :xs="24">
<el-card class="box-card detail-card">
<template #header>
<el-row type="flex" style="justify-content: space-between">
<div>用户详情</div>
</el-row>
<el-row type="flex" justify="end" class="mb-2">
<!-- <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleUpdate"
v-hasPermi="['system:smUser:edit']">修改</el-button>-->
<el-button type="text" icon="el-icon-setting" size="mini" @click="handleUpdateRisk"
v-hasPermi="['system:smUser:edit']">配置</el-button>
</el-row>
<template #header >
<div class="el-card_header">
<el-row type="flex" style="justify-content: space-between">
<div>用户详情</div>
</el-row>
<el-row type="flex" justify="end" >
<!-- <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleUpdate"
v-hasPermi="['system:smUser:edit']">修改</el-button>-->
<el-button type="text" icon="el-icon-setting" size="mini" @click="handleUpdateRisk"
v-hasPermi="['system:smUser:edit']">配置</el-button>
</el-row>
</div>
</template>
<div class="user-detail">
<div class="user-header">
@ -799,7 +801,6 @@ export default {
display: flex;
align-items: flex-start;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
margin-bottom: 20px;
}
.stat-icon {
@ -931,4 +932,8 @@ export default {
border-radius: 50%;
object-fit: cover;
}
.el-card_header{
justify-content: space-between;
display: flex;
}
</style>