2025008071805
This commit is contained in:
parent
50216a1806
commit
2892ce9efc
|
|
@ -26,6 +26,8 @@ import com.ruoyi.system.service.IDiyCityService;
|
|||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import java.util.Objects;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* 自定义地区Controller
|
||||
|
|
@ -37,6 +39,8 @@ import java.util.Objects;
|
|||
@RequestMapping("/system/DiyCity")
|
||||
public class DiyCityController extends BaseController
|
||||
{
|
||||
private static final Logger logger = LoggerFactory.getLogger(DiyCityController.class);
|
||||
|
||||
@Autowired
|
||||
private IDiyCityService diyCityService;
|
||||
|
||||
|
|
@ -70,36 +74,61 @@ public class DiyCityController extends BaseController
|
|||
@PreAuthorize("@ss.hasPermi('system:DiyCity:query')")
|
||||
@GetMapping("/getTreeData")
|
||||
public AjaxResult getTreeData() {
|
||||
try {
|
||||
List<DiyCity> list = diyCityService.selectDiyCityList(new DiyCity());
|
||||
|
||||
if (list == null || list.isEmpty()) {
|
||||
return success(new ArrayList<>());
|
||||
}
|
||||
|
||||
// 使用Map优化查找性能
|
||||
Map<Long, Map<String, Object>> nodeMap = new HashMap<>();
|
||||
List<Map<String, Object>> rootList = new ArrayList<>();
|
||||
|
||||
// 第一步：创建所有节点
|
||||
for (DiyCity city : list) {
|
||||
Map<String, Object> node = toMap(city);
|
||||
node.put("children", new ArrayList<>());
|
||||
nodeMap.put(city.getId().longValue(), node);
|
||||
}
|
||||
|
||||
// 第二步：构建树形结构
|
||||
for (DiyCity city : list) {
|
||||
Long parentId = city.getParentId();
|
||||
Long id = Long.valueOf(city.getId());
|
||||
// 一级节点
|
||||
Long id = city.getId().longValue();
|
||||
|
||||
if (parentId == null || parentId == 0L) {
|
||||
Map<String, Object> node = toMap(city);
|
||||
// 组装children
|
||||
List<Map<String, Object>> children = new ArrayList<>();
|
||||
for (DiyCity child : list) {
|
||||
Long childParentId = child.getParentId();
|
||||
if (id != null && Objects.equals(id, childParentId)) {
|
||||
children.add(toMap(child));
|
||||
// 根节点
|
||||
rootList.add(nodeMap.get(id));
|
||||
} else {
|
||||
// 子节点，添加到父节点的children中
|
||||
Map<String, Object> parentNode = nodeMap.get(parentId);
|
||||
if (parentNode != null) {
|
||||
@SuppressWarnings("unchecked")
|
||||
List<Map<String, Object>> children = (List<Map<String, Object>>) parentNode.get("children");
|
||||
children.add(nodeMap.get(id));
|
||||
}
|
||||
}
|
||||
node.put("children", children);
|
||||
rootList.add(node);
|
||||
}
|
||||
}
|
||||
|
||||
return success(rootList);
|
||||
} catch (Exception e) {
|
||||
logger.error("获取树形数据失败", e);
|
||||
return error("获取树形数据失败: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
private Map<String, Object> toMap(DiyCity city) {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
map.put("id", city.getId());
|
||||
map.put("label", city.getTitle());
|
||||
map.put("title", city.getTitle()); // 兼容前端
|
||||
map.put("parentId", city.getParentId());
|
||||
// 其他字段按需添加
|
||||
map.put("order", city.getOrder());
|
||||
map.put("lat", city.getLat());
|
||||
map.put("lng", city.getLng());
|
||||
map.put("createdAt", city.getCreatedAt());
|
||||
map.put("updatedAt", city.getUpdatedAt());
|
||||
return map;
|
||||
}
|
||||
/**
|
||||
|
|
@ -122,7 +151,34 @@ public class DiyCityController extends BaseController
|
|||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") Integer id)
|
||||
{
|
||||
return success(diyCityService.selectDiyCityById(id));
|
||||
try {
|
||||
DiyCity diyCity = diyCityService.selectDiyCityById(id);
|
||||
if (diyCity == null) {
|
||||
return error("地区不存在");
|
||||
}
|
||||
return success(diyCity);
|
||||
} catch (Exception e) {
|
||||
logger.error("获取地区详情失败", e);
|
||||
return error("获取地区详情失败: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取指定地区的子地区列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:DiyCity:query')")
|
||||
@GetMapping("/children/{parentId}")
|
||||
public AjaxResult getChildren(@PathVariable("parentId") Long parentId)
|
||||
{
|
||||
try {
|
||||
DiyCity query = new DiyCity();
|
||||
query.setParentId(parentId);
|
||||
List<DiyCity> children = diyCityService.selectDiyCityList(query);
|
||||
return success(children);
|
||||
} catch (Exception e) {
|
||||
logger.error("获取子地区列表失败", e);
|
||||
return error("获取子地区列表失败: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -133,7 +189,26 @@ public class DiyCityController extends BaseController
|
|||
@PostMapping
|
||||
public AjaxResult add(@RequestBody DiyCity diyCity)
|
||||
{
|
||||
try {
|
||||
// 验证必填字段
|
||||
if (diyCity.getTitle() == null || diyCity.getTitle().trim().isEmpty()) {
|
||||
return error("地区名称不能为空");
|
||||
}
|
||||
|
||||
// 检查同级下是否有重名
|
||||
DiyCity query = new DiyCity();
|
||||
query.setParentId(diyCity.getParentId());
|
||||
query.setTitle(diyCity.getTitle());
|
||||
List<DiyCity> existing = diyCityService.selectDiyCityList(query);
|
||||
if (existing != null && !existing.isEmpty()) {
|
||||
return error("同级下已存在相同名称的地区");
|
||||
}
|
||||
|
||||
return toAjax(diyCityService.insertDiyCity(diyCity));
|
||||
} catch (Exception e) {
|
||||
logger.error("新增自定义地区失败", e);
|
||||
return error("新增失败: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -144,7 +219,38 @@ public class DiyCityController extends BaseController
|
|||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody DiyCity diyCity)
|
||||
{
|
||||
try {
|
||||
// 验证必填字段
|
||||
if (diyCity.getId() == null) {
|
||||
return error("地区ID不能为空");
|
||||
}
|
||||
if (diyCity.getTitle() == null || diyCity.getTitle().trim().isEmpty()) {
|
||||
return error("地区名称不能为空");
|
||||
}
|
||||
|
||||
// 检查是否将父级设置为自己或自己的子级（防止循环引用）
|
||||
if (diyCity.getParentId() != null && diyCity.getParentId().equals(diyCity.getId().longValue())) {
|
||||
return error("不能将父级设置为自己");
|
||||
}
|
||||
|
||||
// 检查同级下是否有重名（排除自己）
|
||||
DiyCity query = new DiyCity();
|
||||
query.setParentId(diyCity.getParentId());
|
||||
query.setTitle(diyCity.getTitle());
|
||||
List<DiyCity> existing = diyCityService.selectDiyCityList(query);
|
||||
if (existing != null && !existing.isEmpty()) {
|
||||
for (DiyCity item : existing) {
|
||||
if (!item.getId().equals(diyCity.getId())) {
|
||||
return error("同级下已存在相同名称的地区");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return toAjax(diyCityService.updateDiyCity(diyCity));
|
||||
} catch (Exception e) {
|
||||
logger.error("修改自定义地区失败", e);
|
||||
return error("修改失败: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -155,7 +261,20 @@ public class DiyCityController extends BaseController
|
|||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable Integer[] ids)
|
||||
{
|
||||
try {
|
||||
// 检查是否有子节点
|
||||
for (Integer id : ids) {
|
||||
List<DiyCity> children = diyCityService.selectDiyCityList(new DiyCity() {{ setParentId(id.longValue()); }});
|
||||
if (children != null && !children.isEmpty()) {
|
||||
return error("无法删除地区ID " + id + "，该地区下还有子地区，请先删除子地区");
|
||||
}
|
||||
}
|
||||
|
||||
return toAjax(diyCityService.deleteDiyCityByIds(ids));
|
||||
} catch (Exception e) {
|
||||
logger.error("删除自定义地区失败", e);
|
||||
return error("删除失败: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -113,6 +113,15 @@ public class GoodsOrderController extends BaseController {
|
|||
for (GoodsOrder order : orders) {
|
||||
if (order.getProductId() != null) {
|
||||
try {
|
||||
UsersPayBefor usersPayBefor = usersPayBeforService.selectUsersPayBeforByOrderId(order.getMainOrderId());
|
||||
if (usersPayBefor != null) {
|
||||
order.setWxmoney(usersPayBefor.getWxmoney());
|
||||
order.setYemoney(usersPayBefor.getYemoney());
|
||||
order.setMembermoney(usersPayBefor.getMembermoney());
|
||||
order.setCouponmoney(usersPayBefor.getCouponmoney());
|
||||
order.setReturnmoney(usersPayBefor.getReturnmoney());
|
||||
}
|
||||
|
||||
ServiceGoods serviceGoods = serviceGoodsService.selectServiceGoodsById(order.getProductId());
|
||||
if (serviceGoods != null) {
|
||||
// 补充商品详细信息
|
||||
|
|
@ -227,7 +236,14 @@ public class GoodsOrderController extends BaseController {
|
|||
goodsOrderdata.setDeliveryName(siteDelivery.getTitle());
|
||||
}
|
||||
}
|
||||
|
||||
UsersPayBefor usersPayBefor = usersPayBeforService.selectUsersPayBeforByOrderId(goodsOrderdata.getMainOrderId());
|
||||
if (usersPayBefor != null) {
|
||||
goodsOrderdata.setWxmoney(usersPayBefor.getWxmoney());
|
||||
goodsOrderdata.setYemoney(usersPayBefor.getYemoney());
|
||||
goodsOrderdata.setMembermoney(usersPayBefor.getMembermoney());
|
||||
goodsOrderdata.setCouponmoney(usersPayBefor.getCouponmoney());
|
||||
goodsOrderdata.setReturnmoney(usersPayBefor.getReturnmoney());
|
||||
}
|
||||
Users users = usersService.selectUsersById(goodsOrderdata.getUid());
|
||||
if (users != null) {
|
||||
goodsOrderdata.setUname(users.getName());
|
||||
|
|
|
|||
|
|
@ -409,7 +409,10 @@ public class OrderController extends BaseController {
|
|||
logJson.put("type",9);
|
||||
orderdata.setLogJson(logJson.toJSONString());
|
||||
orderdata.setJsonStatus(0);
|
||||
orderdata.setFileData(order.getFileData());
|
||||
if(StringUtils.isNotBlank(order.getFileData())){
|
||||
orderdata.setFileData(AppletControllerUtil.convertToJSONArray(order.getFileData()).toJSONString());
|
||||
}
|
||||
//orderdata.setFileData(order.getFileData());
|
||||
orderdata.setOdertype(0);
|
||||
orderdata.setReamk(order.getReamk());
|
||||
orderdata.setBigtype(1);
|
||||
|
|
|
|||
|
|
@ -126,6 +126,7 @@ public class ScheduledTaskUtil implements CommandLineRunner {
|
|||
cleanupSystemData();
|
||||
healthCheck();
|
||||
updateWorkerMoneyLook();
|
||||
DispatchWorkerForOrder();
|
||||
autoResumeWorkerOrderStatus(); // 添加师傅暂停状态自动恢复任务
|
||||
log.info("定时任务自动执行完成");
|
||||
}
|
||||
|
|
@ -139,7 +140,7 @@ public class ScheduledTaskUtil implements CommandLineRunner {
|
|||
* 师傅收益7天定时冻结的解冻
|
||||
* 每10分钟执行一次
|
||||
*/
|
||||
@Scheduled(fixedRate = 10 * 60 * 1000) // 每10分钟执行一次
|
||||
@Scheduled(fixedRate = 20 * 60 * 1000) // 每10分钟执行一次
|
||||
public void updateWorkerMoneyLook() {
|
||||
String taskName = "订单状态超时检查";
|
||||
long startTime = System.currentTimeMillis();
|
||||
|
|
@ -156,6 +157,32 @@ public class ScheduledTaskUtil implements CommandLineRunner {
|
|||
|
||||
|
||||
|
||||
/**
|
||||
* 派单10分钟一次对没有派单的进行派单
|
||||
* 每10分钟执行一次
|
||||
*/
|
||||
@Scheduled(fixedRate = 10 * 60 * 1000) // 每10分钟执行一次
|
||||
public void DispatchWorkerForOrder() {
|
||||
String taskName = "订单派单检查并重新派单";
|
||||
long startTime = System.currentTimeMillis();
|
||||
try {
|
||||
Order order = new Order();
|
||||
order.setStatus(1L);
|
||||
order.setIsAccept(0);
|
||||
order.setQiangdan("1");
|
||||
List<Order> orders = orderService.selectOrderList(order);
|
||||
for (Order orderdata : orders) {
|
||||
DispatchUtil.dispatchOrder(orderdata.getId());
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error("{}任务执行失败", taskName, e);
|
||||
updateTaskStatistics(taskName, false, System.currentTimeMillis() - startTime);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 订单派单超时处理任务
|
||||
* 每5分钟执行一次，检查派单超过20分钟的订单
|
||||
|
|
|
|||
|
|
@ -834,7 +834,7 @@ public class WorkerCommissionUtil {
|
|||
BigDecimal newCommission = currentCommission.add(finalCommissionWithDoorFee);
|
||||
worker.setCommission(newCommission);
|
||||
//累计分佣
|
||||
worker.setTotalComm(worker.getTotalComm().add(newCommission));
|
||||
worker.setTotalComm(worker.getTotalComm().add(finalCommissionWithDoorFee));
|
||||
|
||||
// 5. 更新师傅信息
|
||||
int updateResult = usersService.updateUsers(worker);
|
||||
|
|
|
|||
|
|
@ -117,6 +117,10 @@ public class GoodsOrder extends BaseEntity
|
|||
/** 排序 */
|
||||
private Integer forserviceid;
|
||||
|
||||
private BigDecimal wxmoney;
|
||||
private BigDecimal yemoney;
|
||||
private BigDecimal membermoney;
|
||||
private BigDecimal couponmoney;
|
||||
|
||||
/** 支付时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
|
|
@ -753,6 +757,38 @@ public class GoodsOrder extends BaseEntity
|
|||
this.deliveryName = deliveryName;
|
||||
}
|
||||
|
||||
public BigDecimal getCouponmoney() {
|
||||
return couponmoney;
|
||||
}
|
||||
|
||||
public void setCouponmoney(BigDecimal couponmoney) {
|
||||
this.couponmoney = couponmoney;
|
||||
}
|
||||
|
||||
public BigDecimal getMembermoney() {
|
||||
return membermoney;
|
||||
}
|
||||
|
||||
public void setMembermoney(BigDecimal membermoney) {
|
||||
this.membermoney = membermoney;
|
||||
}
|
||||
|
||||
public BigDecimal getYemoney() {
|
||||
return yemoney;
|
||||
}
|
||||
|
||||
public void setYemoney(BigDecimal yemoney) {
|
||||
this.yemoney = yemoney;
|
||||
}
|
||||
|
||||
public BigDecimal getWxmoney() {
|
||||
return wxmoney;
|
||||
}
|
||||
|
||||
public void setWxmoney(BigDecimal wxmoney) {
|
||||
this.wxmoney = wxmoney;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
|
|
|
|||
|
|
@ -32,13 +32,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="parentId != null"> and parent_id=#{parentId}</if>
|
||||
<if test="city != null and city != ''"> and JSON_CONTAINS(city, #{city})</if>
|
||||
</where>
|
||||
order by parent_id ASC, sort ASC
|
||||
order by sort ASC
|
||||
</select>
|
||||
|
||||
<select id="selectServiceCateCiKaList" resultMap="ServiceCateResult">
|
||||
<include refid="selectServiceCateVo"/>
|
||||
where id in (select card.type from user_secondary_card card where card.status='1' )
|
||||
order by parent_id ASC, sort ASC
|
||||
order by sort ASC
|
||||
</select>
|
||||
|
||||
|
||||
|
|
@ -46,21 +46,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<select id="selectServiceCatepintuanList" resultMap="ServiceCateResult">
|
||||
<include refid="selectServiceCateVo"/>
|
||||
where id in (select card.first_cate_id from service_goods card where card.status='1' and card.type='1' and card.isgroup='1' )
|
||||
order by parent_id ASC, sort ASC
|
||||
order by sort ASC
|
||||
</select>
|
||||
|
||||
|
||||
<select id="selectServiceCateMiaoshaList" resultMap="ServiceCateResult">
|
||||
<include refid="selectServiceCateVo"/>
|
||||
where id in (select card.first_cate_id from service_goods card where card.status='1' and card.type='1' and card.isfixed='1' )
|
||||
order by parent_id ASC, sort ASC
|
||||
order by sort ASC
|
||||
</select>
|
||||
|
||||
|
||||
<select id="selectServiceCateBaojiaList" resultMap="ServiceCateResult">
|
||||
<include refid="selectServiceCateVo"/>
|
||||
where id in (select card.first_cate_id from service_goods card where card.status='1' and card.type='1' and card.servicetype='2' )
|
||||
order by parent_id ASC, sort ASC
|
||||
order by sort ASC
|
||||
</select>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="isgroup != null "> and isgroup = #{isgroup}</if>
|
||||
|
||||
</where>
|
||||
order by id desc
|
||||
order by sort ASC
|
||||
</select>
|
||||
|
||||
|
||||
|
|
@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<foreach collection="ids" item="id" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
order by created_at desc
|
||||
order by sort ASC
|
||||
</select>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ export function delDiyCity(id) {
|
|||
// 查询城市树结构
|
||||
export function getDiyCityTree() {
|
||||
return request({
|
||||
url: '/system/DiyCity/tree',
|
||||
url: '/system/DiyCity/getTreeData',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -290,7 +290,7 @@ export default {
|
|||
},
|
||||
handlefenleiStatusChange(row) {
|
||||
let text = row.status === "0" ? "启用" : "停用"
|
||||
this.$modal.confirm('确认要"' + text + '""' + row.title + '"状态吗？').then(function() {
|
||||
this.$modal.confirm('确认要操作' + row.title + '状态吗？').then(function() {
|
||||
return changefenleiStatus(row.id, row.status)
|
||||
}).then(() => {
|
||||
this.$modal.msgSuccess(text + "成功")
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import { listDiyCity, getDiyCity, delDiyCity, addDiyCity, updateDiyCity,getTreeDataList } from "@/api/system/DiyCity"
|
||||
import { listDiyCity, getDiyCity, delDiyCity, addDiyCity, updateDiyCity, getDiyCityTree } from "@/api/system/DiyCity"
|
||||
|
||||
export default {
|
||||
name: "DiyCity",
|
||||
|
|
@ -152,6 +152,7 @@ export default {
|
|||
amap: null,
|
||||
marker: null,
|
||||
geocoder: null,
|
||||
mapInited: false,
|
||||
defaultProps: {
|
||||
children: 'children',
|
||||
label: 'label'
|
||||
|
|
@ -207,10 +208,19 @@ export default {
|
|||
},
|
||||
|
||||
gettreeDataList(){
|
||||
getTreeDataList().then(response => {
|
||||
// 使用后端的树形数据接口
|
||||
getDiyCityTree().then(response => {
|
||||
if (response.data && response.data.length > 0) {
|
||||
this.treeDataList = response.data
|
||||
} else {
|
||||
this.treeDataList = []
|
||||
}
|
||||
// 初始化时不展开任何节点
|
||||
this.expandedKeys = []
|
||||
}).catch(error => {
|
||||
console.error('获取树数据失败:', error)
|
||||
// 如果树形接口失败，回退到列表接口构建树形结构
|
||||
this.fallbackToBuildTree()
|
||||
})
|
||||
},
|
||||
|
||||
|
|
@ -255,12 +265,16 @@ export default {
|
|||
this.$modal.msgSuccess("修改成功")
|
||||
this.open = false
|
||||
this.getList()
|
||||
this.gettreeDataList() // 刷新树结构
|
||||
this.loadParentOptions() // 刷新父级选项
|
||||
})
|
||||
} else {
|
||||
addDiyCity(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功")
|
||||
this.open = false
|
||||
this.getList()
|
||||
this.gettreeDataList() // 刷新树结构
|
||||
this.loadParentOptions() // 刷新父级选项
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
@ -269,10 +283,12 @@ export default {
|
|||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const ids = row.id || this.ids
|
||||
this.$modal.confirm('是否确认删除自定义地区编号为"' + ids + '"的数据项？').then(function() {
|
||||
this.$modal.confirm('是否确认删除自定义地区编号为"' + ids + '"的数据项？').then(() => {
|
||||
return delDiyCity(ids)
|
||||
}).then(() => {
|
||||
this.getList()
|
||||
this.gettreeDataList() // 刷新树结构
|
||||
this.loadParentOptions() // 刷新父级选项
|
||||
this.$modal.msgSuccess("删除成功")
|
||||
}).catch(() => {})
|
||||
},
|
||||
|
|
@ -378,6 +394,61 @@ export default {
|
|||
this.gettreeDataList(); // 重新获取数据
|
||||
},
|
||||
|
||||
/** 处理节点点击事件 */
|
||||
handleNodeClick(data, node) {
|
||||
// 可以在这里添加节点点击的逻辑
|
||||
console.log('点击节点:', data, node);
|
||||
},
|
||||
|
||||
/** 回退到构建树形结构的方法 */
|
||||
fallbackToBuildTree() {
|
||||
listDiyCity({pageSize: 1000}).then(response => {
|
||||
if (response.rows && response.rows.length > 0) {
|
||||
this.treeDataList = this.buildTreeData(response.rows)
|
||||
} else {
|
||||
this.treeDataList = []
|
||||
}
|
||||
this.expandedKeys = []
|
||||
}).catch(error => {
|
||||
console.error('回退构建树形结构也失败:', error)
|
||||
this.treeDataList = []
|
||||
this.expandedKeys = []
|
||||
})
|
||||
},
|
||||
|
||||
/** 构建树形结构数据 */
|
||||
buildTreeData(dataList) {
|
||||
const treeData = []
|
||||
const dataMap = new Map()
|
||||
|
||||
// 先建立ID映射
|
||||
dataList.forEach(item => {
|
||||
dataMap.set(item.id, {
|
||||
id: item.id,
|
||||
label: item.title,
|
||||
parentId: item.parentId,
|
||||
children: []
|
||||
})
|
||||
})
|
||||
|
||||
// 构建树形结构
|
||||
dataList.forEach(item => {
|
||||
const node = dataMap.get(item.id)
|
||||
if (item.parentId === null || item.parentId === 0) {
|
||||
// 根节点
|
||||
treeData.push(node)
|
||||
} else {
|
||||
// 子节点
|
||||
const parent = dataMap.get(item.parentId)
|
||||
if (parent) {
|
||||
parent.children.push(node)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
return treeData
|
||||
},
|
||||
|
||||
decreaseOrder() {
|
||||
if (this.form.order > 0) {
|
||||
this.form.order--
|
||||
|
|
@ -393,23 +464,23 @@ export default {
|
|||
},
|
||||
initMap() {
|
||||
// 销毁旧地图和事件，防止重复绑定
|
||||
if (this.map) {
|
||||
this.map.destroy()
|
||||
this.map = null
|
||||
if (this.amap) {
|
||||
this.amap.destroy()
|
||||
this.amap = null
|
||||
this.marker = null
|
||||
this.geocoder = null
|
||||
this.mapInited = false
|
||||
}
|
||||
this.map = new AMap.Map('map', {
|
||||
this.amap = new AMap.Map('map', {
|
||||
zoom: 16,
|
||||
center: [this.form.longitude || 108.94141, this.form.latitude || 34.209883],
|
||||
})
|
||||
this.geocoder = new AMap.Geocoder()
|
||||
// if (this.form.longitude && this.form.latitude) {
|
||||
// this.setMapMarker([this.form.longitude, this.form.latitude]);
|
||||
// this.map.setCenter([this.form.longitude, this.form.latitude]);
|
||||
// this.amap.setCenter([this.form.longitude, this.form.latitude]);
|
||||
// }
|
||||
this.map.on('click', (e) => {
|
||||
this.amap.on('click', (e) => {
|
||||
const lnglat = [e.lnglat.lng, e.lnglat.lat]
|
||||
this.setMapMarker(lnglat)
|
||||
this.form.longitude = e.lnglat.lng
|
||||
|
|
@ -429,7 +500,7 @@ export default {
|
|||
}
|
||||
this.marker = new AMap.Marker({
|
||||
position: lnglat,
|
||||
map: this.map,
|
||||
map: this.amap,
|
||||
})
|
||||
},
|
||||
searchMapAddress() {
|
||||
|
|
@ -445,7 +516,7 @@ export default {
|
|||
if (status === 'complete' && result.geocodes.length) {
|
||||
const lnglat = result.geocodes[0].location
|
||||
this.setMapMarker([lnglat.lng, lnglat.lat])
|
||||
this.map.setCenter([lnglat.lng, lnglat.lat])
|
||||
this.amap.setCenter([lnglat.lng, lnglat.lat])
|
||||
this.form.longitude = lnglat.lng
|
||||
this.form.latitude = lnglat.lat
|
||||
this.latlng = `${lnglat.lng},${lnglat.lat}`
|
||||
|
|
@ -462,9 +533,12 @@ export default {
|
|||
})
|
||||
},
|
||||
loadParentOptions() {
|
||||
// 这里假设用listDiyCity获取所有可选父级
|
||||
listDiyCity({parentId:0}).then(res => {
|
||||
// 获取所有可选父级
|
||||
listDiyCity({parentId: 0, pageSize: 1000}).then(res => {
|
||||
this.parentOptions = res.rows || []
|
||||
}).catch(error => {
|
||||
console.error('加载父级选项失败:', error)
|
||||
this.parentOptions = []
|
||||
})
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,6 +42,18 @@
|
|||
<label>用户电话：</label>
|
||||
<span class="value">{{ orderData.uphone || "未知" }}</span>
|
||||
</div>
|
||||
<div class="info-item">
|
||||
<label>订单单号：</label>
|
||||
<span class="value">{{ orderData.mainOrderId || "未知" }}</span>
|
||||
</div>
|
||||
<div class="info-item">
|
||||
<label>下单时间：</label>
|
||||
<span class="value">{{ orderData.createdAt || "未知" }}</span>
|
||||
</div>
|
||||
<!-- <div class="info-item">-->
|
||||
<!-- <label>下单商品：</label>-->
|
||||
<!-- <span class="value">{{ orderData.productName || "未知" }}</span>-->
|
||||
<!-- </div>-->
|
||||
</div>
|
||||
</el-col>
|
||||
<!-- 基础金额信息 -->
|
||||
|
|
@ -91,6 +103,16 @@
|
|||
}}</span
|
||||
>
|
||||
</div>
|
||||
<div class="info-item">
|
||||
<label>商品数量：</label>
|
||||
<span class="value amount-good"
|
||||
>￥{{
|
||||
orderData.num
|
||||
? orderData.num.toFixed(2)
|
||||
: "0.00"
|
||||
}}</span
|
||||
>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</el-col>
|
||||
|
|
@ -138,7 +160,16 @@
|
|||
}}</span
|
||||
>
|
||||
</div>
|
||||
|
||||
<div class="info-item">
|
||||
<label>退款金额：</label>
|
||||
<span class="value amount-coupon"
|
||||
>￥{{
|
||||
orderData.returnmoney
|
||||
? orderData.returnmoney.toFixed(2)
|
||||
: "0.00"
|
||||
}}</span
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
|
|||
|
|
@ -12,6 +12,27 @@
|
|||
@close="handleClose"
|
||||
>
|
||||
<div class="order-detail-container">
|
||||
<!-- 顶部操作栏 -->
|
||||
<!-- <div class="top-actions">-->
|
||||
<!-- <div class="left-section">-->
|
||||
<!-- <el-button -->
|
||||
<!-- type="primary" -->
|
||||
<!-- size="small" -->
|
||||
<!-- icon="el-icon-refresh"-->
|
||||
<!-- @click="refreshOrderData"-->
|
||||
<!-- :loading="refreshing"-->
|
||||
<!-- >-->
|
||||
<!-- 刷新数据-->
|
||||
<!-- </el-button>-->
|
||||
<!-- <span class="refresh-tip">-->
|
||||
<!-- 💡 操作完成后数据会自动刷新，页面不会关闭-->
|
||||
<!-- </span>-->
|
||||
<!-- </div>-->
|
||||
<!-- <span class="last-refresh-time" v-if="lastRefreshTime">-->
|
||||
<!-- 最后刷新: {{ lastRefreshTime }}-->
|
||||
<!-- </span>-->
|
||||
<!-- </div>-->
|
||||
|
||||
<el-tabs v-model="activeName">
|
||||
<el-tab-pane
|
||||
label="基本信息"
|
||||
|
|
@ -283,6 +304,24 @@
|
|||
</el-row>
|
||||
</div>
|
||||
<div class="detailright" v-if="activeName == 'third'">
|
||||
<!-- 当前订单状态提示 -->
|
||||
<!-- <div class="order-status-banner">-->
|
||||
<!-- <el-alert-->
|
||||
<!-- :title="`当前订单状态: ${getStatusLabel(info.status)}`"-->
|
||||
<!-- :type="getStatusTagType(info.status)"-->
|
||||
<!-- :closable="false"-->
|
||||
<!-- show-icon-->
|
||||
<!-- >-->
|
||||
<!-- <template slot="default">-->
|
||||
<!-- <div class="status-details">-->
|
||||
<!-- <span>订单号: {{ info.orderId }}</span>-->
|
||||
<!-- <span v-if="orderInfo.workerName">| 师傅: {{ orderInfo.workerName }}</span>-->
|
||||
<!-- <span v-if="orderInfo.receiveTime">| 接单时间: {{ orderInfo.receiveTime }}</span>-->
|
||||
<!-- </div>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-alert>-->
|
||||
<!-- </div>-->
|
||||
|
||||
<el-row :gutter="20" class="boxcontent">
|
||||
<el-col :span="24">
|
||||
<el-card class="box-card" shadow="hover">
|
||||
|
|
@ -319,9 +358,9 @@
|
|||
}}</span>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<!-- <div class="timeline-description">-->
|
||||
<!-- {{ getContentDescription(record.content) }}-->
|
||||
<!-- </div>-->
|
||||
<div class="timeline-description">
|
||||
{{ getTimelineDescription(record) }}
|
||||
</div>
|
||||
|
||||
<!-- 显示报价数据 -->
|
||||
<div
|
||||
|
|
@ -1064,6 +1103,10 @@ export default {
|
|||
startServiceImages: [],
|
||||
startServiceSubmitting: false,
|
||||
info: {}, //订单详情
|
||||
|
||||
// 刷新相关状态
|
||||
refreshing: false,
|
||||
lastRefreshTime: null,
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
|
|
@ -1091,17 +1134,25 @@ export default {
|
|||
},
|
||||
},
|
||||
},
|
||||
method() {},
|
||||
mounted() {
|
||||
// 页面挂载后自动刷新一次数据
|
||||
this.$nextTick(() => {
|
||||
if (this.orderInfo.id) {
|
||||
this.refreshOrderData();
|
||||
}
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
// 获取订单详情
|
||||
getinfo() {
|
||||
if (this.orderInfo.id) {
|
||||
getOrder(this.orderInfo.id).then((r) => {
|
||||
return getOrder(this.orderInfo.id).then((r) => {
|
||||
r.data.adressjson = JSON.parse(r.data.adressjson);
|
||||
this.info = r.data;
|
||||
this.getOrderlogDataFrist()
|
||||
return this.getOrderlogDataFrist();
|
||||
});
|
||||
}
|
||||
return Promise.resolve();
|
||||
},
|
||||
|
||||
/** 关闭对话框 */
|
||||
|
|
@ -1232,22 +1283,159 @@ export default {
|
|||
return date.toLocaleString();
|
||||
},
|
||||
|
||||
/** 获取时间线描述（智能处理不同类型记录） */
|
||||
getTimelineDescription(record) {
|
||||
if (!record) return "无记录信息";
|
||||
|
||||
const title = record.title || "";
|
||||
const content = record.content;
|
||||
|
||||
// 根据标题类型智能生成描述
|
||||
if (title.includes("订单生成") || title.includes("创建")) {
|
||||
return content ? `订单已创建，${this.getContentDescription(content)}` : "订单已创建，等待用户支付";
|
||||
}
|
||||
|
||||
if (title.includes("支付成功")) {
|
||||
return content ? `支付完成，${this.getContentDescription(content)}` : "订单支付成功，等待派单";
|
||||
}
|
||||
|
||||
if (title.includes("派单")) {
|
||||
return content ? `订单已派发给师傅，${this.getContentDescription(content)}` : "订单已派发给师傅";
|
||||
}
|
||||
|
||||
if (title.includes("接单")) {
|
||||
return content ? `师傅已接单，${this.getContentDescription(content)}` : "师傅已接单，准备服务";
|
||||
}
|
||||
|
||||
if (title.includes("出发")) {
|
||||
return content ? `师傅已出发，${this.getContentDescription(content)}` : "师傅已出发前往服务地点";
|
||||
}
|
||||
|
||||
if (title.includes("到达")) {
|
||||
return content ? `师傅已到达，${this.getContentDescription(content)}` : "师傅已到达服务地点";
|
||||
}
|
||||
|
||||
if (title.includes("开始服务")) {
|
||||
return content ? `服务已开始，${this.getContentDescription(content)}` : "师傅开始提供服务";
|
||||
}
|
||||
|
||||
if (title.includes("服务完成") || title.includes("完成")) {
|
||||
return content ? `服务已完成，${this.getContentDescription(content)}` : "服务已完成";
|
||||
}
|
||||
|
||||
if (title.includes("报价")) {
|
||||
return content ? `已生成报价，${this.getContentDescription(content)}` : "已生成服务报价";
|
||||
}
|
||||
|
||||
if (title.includes("更换师傅")) {
|
||||
return content ? `已更换师傅，${this.getContentDescription(content)}` : "订单已更换给新师傅";
|
||||
}
|
||||
|
||||
// 如果有具体内容，使用内容描述
|
||||
if (content) {
|
||||
return this.getContentDescription(content);
|
||||
}
|
||||
|
||||
// 兜底返回
|
||||
return "操作记录";
|
||||
},
|
||||
|
||||
/** 获取内容描述 */
|
||||
getContentDescription(content) {
|
||||
if (!content) return "无描述信息";
|
||||
|
||||
try {
|
||||
// 尝试解析JSON内容
|
||||
const contentData = JSON.parse(content);
|
||||
|
||||
// 如果是数组类型
|
||||
if (Array.isArray(contentData)) {
|
||||
return contentData[0]?.name || content;
|
||||
} else if (typeof contentData === "object") {
|
||||
return contentData.name || content;
|
||||
if (contentData.length > 0) {
|
||||
const firstItem = contentData[0];
|
||||
if (typeof firstItem === 'string') {
|
||||
return firstItem;
|
||||
} else if (typeof firstItem === 'object') {
|
||||
return firstItem.name || firstItem.title || firstItem.description || '数组内容';
|
||||
}
|
||||
} catch (e) {
|
||||
// 如果解析失败，直接返回原始内容
|
||||
}
|
||||
return '数组内容';
|
||||
}
|
||||
// 如果是对象类型
|
||||
else if (typeof contentData === "object") {
|
||||
// 优先显示描述字段
|
||||
if (contentData.description) {
|
||||
return contentData.description;
|
||||
}
|
||||
if (contentData.name) {
|
||||
return contentData.name;
|
||||
}
|
||||
if (contentData.title) {
|
||||
return contentData.title;
|
||||
}
|
||||
if (contentData.content) {
|
||||
return contentData.content;
|
||||
}
|
||||
if (contentData.remark) {
|
||||
return contentData.remark;
|
||||
}
|
||||
if (contentData.message) {
|
||||
return contentData.message;
|
||||
}
|
||||
if (contentData.msg) {
|
||||
return contentData.msg;
|
||||
}
|
||||
|
||||
// 特殊处理：如果是报价数据，显示简要信息
|
||||
if (contentData.basic || contentData.craft || contentData.material || contentData.project) {
|
||||
let summary = [];
|
||||
if (contentData.basic && Array.isArray(contentData.basic)) {
|
||||
const basicCount = contentData.basic.filter(item => item.select === true).length;
|
||||
if (basicCount > 0) {
|
||||
summary.push(`基检项目: ${basicCount}项`);
|
||||
}
|
||||
}
|
||||
if (contentData.craft && Array.isArray(contentData.craft)) {
|
||||
summary.push(`服务项目: ${contentData.craft.length}项`);
|
||||
}
|
||||
if (contentData.material && Array.isArray(contentData.material)) {
|
||||
summary.push(`物料项目: ${contentData.material.length}项`);
|
||||
}
|
||||
if (contentData.project && contentData.project.price) {
|
||||
summary.push(`总价: ¥${parseFloat(contentData.project.price).toFixed(2)}`);
|
||||
}
|
||||
return summary.length > 0 ? summary.join(' | ') : '报价详情';
|
||||
}
|
||||
|
||||
// 如果没有找到合适的字段，尝试显示其他有用信息
|
||||
const keys = Object.keys(contentData);
|
||||
if (keys.length > 0) {
|
||||
const firstKey = keys[0];
|
||||
const firstValue = contentData[firstKey];
|
||||
if (typeof firstValue === 'string' && firstValue.length < 100) {
|
||||
return `${firstKey}: ${firstValue}`;
|
||||
}
|
||||
}
|
||||
return '对象内容';
|
||||
}
|
||||
} catch (e) {
|
||||
// 如果JSON解析失败，检查是否为纯文本
|
||||
if (typeof content === 'string') {
|
||||
// 如果内容长度合理，直接显示
|
||||
if (content.length <= 200) {
|
||||
return content;
|
||||
} else {
|
||||
// 如果内容太长，截取前100个字符
|
||||
return content.substring(0, 100) + '...';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 兜底返回
|
||||
if (typeof content === 'string') {
|
||||
return content.length > 200 ? content.substring(0, 200) + '...' : content;
|
||||
}
|
||||
|
||||
return '未知内容格式';
|
||||
},
|
||||
|
||||
/** 判断是否为JSON字符串 */
|
||||
|
|
@ -1407,8 +1595,8 @@ export default {
|
|||
this.$message.success("完成服务成功！");
|
||||
this.completeServiceDialogVisible = false;
|
||||
this.completeServiceImages = [];
|
||||
this.$emit("refresh-order");
|
||||
this.handleClose();
|
||||
// 不关闭页面，刷新数据
|
||||
await this.refreshOrderData();
|
||||
} else {
|
||||
this.$message.error("完成服务失败：" + (response.msg || "未知错误"));
|
||||
}
|
||||
|
|
@ -1443,11 +1631,8 @@ export default {
|
|||
if (response.code === 200) {
|
||||
this.$message.success("接单成功！");
|
||||
|
||||
// 刷新订单信息
|
||||
this.$emit("refresh-order");
|
||||
|
||||
// 关闭订单明细弹窗
|
||||
this.handleClose();
|
||||
// 不关闭页面，刷新数据
|
||||
await this.refreshOrderData();
|
||||
} else {
|
||||
this.$message.error("接单失败：" + response.msg);
|
||||
}
|
||||
|
|
@ -1478,10 +1663,8 @@ export default {
|
|||
|
||||
if (response.code === 200) {
|
||||
this.$message.success("确认到达成功！");
|
||||
// 刷新订单信息
|
||||
this.$emit("refresh-order");
|
||||
// 关闭订单明细弹窗
|
||||
this.handleClose();
|
||||
// 不关闭页面，刷新数据
|
||||
await this.refreshOrderData();
|
||||
} else {
|
||||
this.$message.error("确认到达失败：" + response.msg);
|
||||
}
|
||||
|
|
@ -1526,7 +1709,8 @@ export default {
|
|||
this.$message.success("开始服务成功！");
|
||||
this.startServiceDialogVisible = false;
|
||||
this.startServiceImages = [];
|
||||
this.$emit("refresh-order");
|
||||
// 不关闭页面，刷新数据
|
||||
await this.refreshOrderData();
|
||||
} else {
|
||||
this.$message.error("开始服务失败：" + (response.msg || "未知错误"));
|
||||
}
|
||||
|
|
@ -1628,10 +1812,10 @@ export default {
|
|||
});
|
||||
if (response.code === 200) {
|
||||
this.$message.success("订单已结束");
|
||||
this.$emit("refresh-order");
|
||||
this.endOrderDialogVisible = false;
|
||||
this.resetEndOrderForm();
|
||||
this.handleClose();
|
||||
// 不关闭页面，刷新数据
|
||||
await this.refreshOrderData();
|
||||
} else {
|
||||
this.$message.error(
|
||||
"结束订单失败：" + (response.msg || "未知错误")
|
||||
|
|
@ -1765,8 +1949,8 @@ export default {
|
|||
this.loadWorkerInfo();
|
||||
}
|
||||
|
||||
// 通知父组件刷新数据
|
||||
this.$emit("refresh-order");
|
||||
// 不关闭页面，刷新数据
|
||||
await this.refreshOrderData();
|
||||
} catch (error) {
|
||||
console.error("更换师傅失败:", error);
|
||||
this.$message.error("更换师傅失败：" + (error.message || "未知错误"));
|
||||
|
|
@ -1983,6 +2167,38 @@ export default {
|
|||
return '清洗剂 ¥35.00*1、其他辅料面议项 ¥1.00*1';
|
||||
}
|
||||
},
|
||||
|
||||
/** 刷新订单数据（不关闭页面） */
|
||||
async refreshOrderData() {
|
||||
try {
|
||||
this.refreshing = true;
|
||||
|
||||
// 重新获取订单详情
|
||||
await this.getinfo();
|
||||
|
||||
// 重新获取日志数据
|
||||
await this.getOrderlogDataFrist();
|
||||
|
||||
// 如果当前有师傅ID，重新加载师傅信息
|
||||
if (this.orderInfo.workerId) {
|
||||
await this.loadWorkerInfo();
|
||||
}
|
||||
|
||||
// 更新最后刷新时间
|
||||
this.lastRefreshTime = new Date().toLocaleString();
|
||||
|
||||
// 自动切换到流程管理标签页，让用户看到最新状态
|
||||
this.activeName = "third";
|
||||
|
||||
this.$message.success("数据刷新完成！");
|
||||
|
||||
} catch (error) {
|
||||
console.error("刷新订单数据失败:", error);
|
||||
this.$message.error("刷新数据失败：" + (error.message || "网络错误"));
|
||||
} finally {
|
||||
this.refreshing = false;
|
||||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
@ -1996,6 +2212,25 @@ export default {
|
|||
.detailright {
|
||||
height: calc(100% - 54px);
|
||||
|
||||
// 订单状态提示栏
|
||||
.order-status-banner {
|
||||
margin-bottom: 20px;
|
||||
|
||||
.status-details {
|
||||
margin-top: 8px;
|
||||
font-size: 13px;
|
||||
color: #606266;
|
||||
|
||||
span {
|
||||
margin-right: 15px;
|
||||
|
||||
&:last-child {
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.boxcontent {
|
||||
height: calc(100% - 60px);
|
||||
overflow-y: auto;
|
||||
|
|
@ -2034,6 +2269,39 @@ export default {
|
|||
// 确保三个卡片在同一行时高度一致
|
||||
height: 100%;
|
||||
|
||||
// 顶部操作栏样式
|
||||
.top-actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 15px 20px;
|
||||
background: #f8f9fa;
|
||||
border-bottom: 1px solid #e4e7ed;
|
||||
margin-bottom: 20px;
|
||||
border-radius: 8px 8px 0 0;
|
||||
|
||||
.left-section {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 15px;
|
||||
|
||||
.refresh-tip {
|
||||
font-size: 13px;
|
||||
color: #67c23a;
|
||||
background: #f0f9ff;
|
||||
padding: 6px 12px;
|
||||
border-radius: 15px;
|
||||
border: 1px solid #b3d8ff;
|
||||
}
|
||||
}
|
||||
|
||||
.last-refresh-time {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
font-style: italic;
|
||||
}
|
||||
}
|
||||
|
||||
.el-col {
|
||||
display: flex;
|
||||
|
||||
|
|
@ -2258,6 +2526,128 @@ export default {
|
|||
.timeline-description {
|
||||
margin-bottom: 12px;
|
||||
font-size: 14px;
|
||||
color: #606266;
|
||||
line-height: 1.6;
|
||||
padding: 10px 14px;
|
||||
background: linear-gradient(135deg, #f8f9fa 0%, #ffffff 100%);
|
||||
border-radius: 8px;
|
||||
border-left: 4px solid #409eff;
|
||||
word-break: break-word;
|
||||
white-space: pre-wrap;
|
||||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
|
||||
position: relative;
|
||||
|
||||
// 添加一个小图标
|
||||
&::before {
|
||||
content: "📝";
|
||||
position: absolute;
|
||||
left: -8px;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
background: #409eff;
|
||||
color: white;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
border-radius: 50%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 8px;
|
||||
box-shadow: 0 2px 4px rgba(64, 158, 255, 0.3);
|
||||
}
|
||||
|
||||
// 特殊样式：报价相关
|
||||
&:contains("报价") {
|
||||
border-left-color: #67c23a;
|
||||
background: linear-gradient(135deg, #f0f9ff 0%, #ffffff 100%);
|
||||
|
||||
&::before {
|
||||
background: #67c23a;
|
||||
content: "💰";
|
||||
}
|
||||
}
|
||||
|
||||
// 特殊样式：服务相关
|
||||
&:contains("服务") {
|
||||
border-left-color: #e6a23c;
|
||||
background: linear-gradient(135deg, #fef9f0 0%, #ffffff 100%);
|
||||
|
||||
&::before {
|
||||
background: #e6a23c;
|
||||
content: "🔧";
|
||||
}
|
||||
}
|
||||
|
||||
// 特殊样式：状态变更
|
||||
&:contains("订单生成") {
|
||||
border-left-color: #409eff;
|
||||
background: linear-gradient(135deg, #f0f9ff 0%, #ffffff 100%);
|
||||
|
||||
&::before {
|
||||
background: #409eff;
|
||||
content: "📋";
|
||||
}
|
||||
}
|
||||
|
||||
&:contains("支付") {
|
||||
border-left-color: #67c23a;
|
||||
background: linear-gradient(135deg, #f0f9ff 0%, #ffffff 100%);
|
||||
|
||||
&::before {
|
||||
background: #67c23a;
|
||||
content: "💳";
|
||||
}
|
||||
}
|
||||
|
||||
&:contains("派单") {
|
||||
border-left-color: #e6a23c;
|
||||
background: linear-gradient(135deg, #fef9f0 0%, #ffffff 100%);
|
||||
|
||||
&::before {
|
||||
background: #e6a23c;
|
||||
content: "📤";
|
||||
}
|
||||
}
|
||||
|
||||
&:contains("接单") {
|
||||
border-left-color: #67c23a;
|
||||
background: linear-gradient(135deg, #f0f9ff 0%, #ffffff 100%);
|
||||
|
||||
&::before {
|
||||
background: #67c23a;
|
||||
content: "✅";
|
||||
}
|
||||
}
|
||||
|
||||
&:contains("出发") {
|
||||
border-left-color: #e6a23c;
|
||||
background: linear-gradient(135deg, #fef9f0 0%, #ffffff 100%);
|
||||
|
||||
&::before {
|
||||
background: #e6a23c;
|
||||
content: "🚗";
|
||||
}
|
||||
}
|
||||
|
||||
&:contains("到达") {
|
||||
border-left-color: #67c23a;
|
||||
background: linear-gradient(135deg, #f0f9ff 0%, #ffffff 100%);
|
||||
|
||||
&::before {
|
||||
background: #67c23a;
|
||||
content: "📍";
|
||||
}
|
||||
}
|
||||
|
||||
&:contains("完成") {
|
||||
border-left-color: #f56c6c;
|
||||
background: linear-gradient(135deg, #fef0f0 0%, #ffffff 100%);
|
||||
|
||||
&::before {
|
||||
background: #f56c6c;
|
||||
content: "🎉";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 时间轴图片 */
|
||||
|
|
@ -2622,6 +3012,33 @@ export default {
|
|||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
}
|
||||
|
||||
.timeline-description {
|
||||
padding: 8px 10px;
|
||||
font-size: 13px;
|
||||
|
||||
&::before {
|
||||
width: 14px;
|
||||
height: 14px;
|
||||
font-size: 7px;
|
||||
left: -7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 480px) {
|
||||
.timeline-description {
|
||||
padding: 6px 8px;
|
||||
font-size: 12px;
|
||||
margin-bottom: 8px;
|
||||
|
||||
&::before {
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
font-size: 6px;
|
||||
left: -6px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 更换师傅弹窗样式 */
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@
|
|||
<el-form :model="timeForm" label-width="120px" class="tab-form">
|
||||
<el-form-item label="每月提现时间">
|
||||
<el-select v-model="timeForm.withdrawDays" multiple placeholder="请选择日期" style="width: 300px">
|
||||
<el-option v-for="d in 31" :key="d" :label="d + '号'" :value="d + '号'" />
|
||||
<el-option v-for="d in 31" :key="d" :label="d + '号'" :value="d.toString()" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="定时接单时长">
|
||||
|
|
@ -1051,7 +1051,7 @@ export default {
|
|||
this.$message.success('提交成功（模拟）')
|
||||
},
|
||||
resetTime() {
|
||||
this.timeForm = { withdrawDays: ['8号', '18号', '28号'], autoOrderMinutes: 10, cancelOrderDays: 7 }
|
||||
this.timeForm = { withdrawDays: ['8', '18', '28'], autoOrderMinutes: 10, cancelOrderDays: 7 }
|
||||
},
|
||||
resetMember() {
|
||||
this.memberForm = { member: '', memberRule: '', recharge: '' }
|
||||
|
|
|
|||
|
|
@ -244,7 +244,7 @@ export default {
|
|||
// 任务状态修改
|
||||
handlefenleiStatusChange(row) {
|
||||
let text = row.status === "0" ? "启用" : "停用"
|
||||
this.$modal.confirm('确认要"' + text + '""' + row.title + '"状态吗？').then(function() {
|
||||
this.$modal.confirm('确认要操作' + row.title + '状态吗？').then(function() {
|
||||
return changefenleiStatus(row.id, row.status)
|
||||
}).then(() => {
|
||||
this.$modal.msgSuccess(text + "成功")
|
||||
|
|
|
|||
|
|
@ -258,7 +258,7 @@ export default {
|
|||
// 任务状态修改
|
||||
handlefenleiStatusChange(row) {
|
||||
let text = row.status === "0" ? "启用" : "停用"
|
||||
this.$modal.confirm('确认要"' + text + '""' + row.title + '"状态吗？').then(function() {
|
||||
this.$modal.confirm('确认要操作' + row.title + '状态吗？').then(function() {
|
||||
return changefenleiStatus(row.id, row.status)
|
||||
}).then(() => {
|
||||
this.$modal.msgSuccess(text + "成功")
|
||||
|
|
|
|||
Loading…
Reference in New Issue