Commit c9015f69 authored by daniel's avatar daniel

feat(gk): 赛包+发票

parent 042cd241
......@@ -75,6 +75,7 @@ public class ResourcesController {
obj.put("scene", "raceId=" + cmptid);
// 修改为小程序页面路径 by 2025-06-12
obj.put("page", "pages/race/raceHome");
obj.put("width", "1280");
String partnerId = cmptService.getPartnerId(cmptid);
String url = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=";
try {
......
......@@ -40,6 +40,7 @@ public class ServiceSettingController {
@RequestMapping(value = "/page/{id}", method = RequestMethod.GET)
@PageView
public ModelAndView page(@PathVariable("id") String id, ModelAndView mv) {
mv.setViewName("cmpt/detail");
RichText richText = richTextService.getById(id);
......
package com.dlbridge.jadp.plugins.partner.controller;
import com.dlbridge.jadp.common.interceptor.PageView;
import com.dlbridge.jadp.job.CountJob;
import com.dlbridge.jadp.plugins.cmpt.bean.Banner;
import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt;
import com.dlbridge.jadp.plugins.cmpt.service.CmptService;
import com.dlbridge.jadp.plugins.cmpt.utils.Page;
import com.dlbridge.jadp.plugins.partner.bean.BagDelivery;
import com.dlbridge.jadp.plugins.partner.bean.BagParam;
......@@ -8,6 +13,7 @@ import com.neusoft.www.utils.web.Result;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource;
import java.util.List;
......@@ -19,6 +25,18 @@ public class BagDeliveryController {
@Resource
private BagDeliveryService bagDeliveryService;
@Resource
private CmptService cmptService;
@RequestMapping("index/{cmptId}")
@PageView
public ModelAndView index(@PathVariable("cmptId") Integer cmptId, ModelAndView mv) {
Cmpt cmpt = cmptService.queryCmptBycmptId(cmptId);
mv.addObject("cmpt", cmpt);
mv.setViewName("cmpt/bag");
return mv;
}
/**
* 赛包邮寄申请列表
* @param page 分页参数
......
package com.dlbridge.jadp.plugins.partner.controller;
import com.dlbridge.jadp.common.interceptor.PageView;
import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt;
import com.dlbridge.jadp.plugins.cmpt.service.CmptService;
import com.dlbridge.jadp.plugins.cmpt.utils.Page;
import com.dlbridge.jadp.plugins.partner.bean.Invoice;
import com.dlbridge.jadp.plugins.partner.bean.BagParam;
......@@ -9,6 +12,7 @@ import com.neusoft.www.utils.web.Result;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource;
......@@ -21,6 +25,18 @@ public class InvoiceController {
@Resource
private InvoiceService invoiceService;
@Resource
private CmptService cmptService;
@RequestMapping("index/{cmptId}")
@PageView
public ModelAndView index(@PathVariable("cmptId") Integer cmptId, ModelAndView mv) {
Cmpt cmpt = cmptService.queryCmptBycmptId(cmptId);
mv.addObject("cmpt", cmpt);
mv.setViewName("cmpt/invoice");
return mv;
}
/**
* 赛包邮寄申请列表
* @param page 分页参数
......
This diff is collapsed.
This diff is collapsed.
......@@ -656,7 +656,7 @@
return;
}
// 文档
if (file.type && !['.docx', '.xlsx', '.pptx'].includes(file.name.slice(file.name.lastIndexOf('.'))) && this.letter.openType == 5) {
if (file.type && !['.docx', '.xlsx', '.pptx', '.pdf'].includes(file.name.slice(file.name.lastIndexOf('.'))) && this.letter.openType == 5) {
layer.msg('请上传文档', { icon: 5 })
return;
}
......
......@@ -348,6 +348,20 @@
<span class="menu-txt">轮播图管理</span>
</a>
</li>
<li class="bag menu-sub-item">
<a
href="/gk/bag/index/${cmpt.cmptId}?uId=${uId}&cId=${cId}&timestamp=${timestamp}&sign=${sign}">
<span class="left-arrow"></span>
<span class="menu-txt">赛包邮寄</span>
</a>
</li>
<li class="invoice menu-sub-item">
<a
href="/gk/invoice/index/${cmpt.cmptId}?uId=${uId}&cId=${cId}&timestamp=${timestamp}&sign=${sign}">
<span class="left-arrow"></span>
<span class="menu-txt">发票管理</span>
</a>
</li>
</ul>
</li>
</ul>
......@@ -410,7 +424,7 @@
var classes = ['cmptSetting', 'nameList', 'manual', 'contact', 'manage',
'route', 'road', 'equip', 'photo', 'news', 'cert', 'data',
'banner', 'score', 'auto', 'scan', 'review', 'customer', 'rule',
'outter-link', 'sure-letter', 'rankSetting', 'service', "module", "swiper"];
'outter-link', 'sure-letter', 'rankSetting', 'service', "module", "swiper", "bag", "invoice"];
let url = document.location.href;
var done = false;
for (var i in classes) {
......
/* Flex 布局相关 */
.flex {
display: flex;
}
.flex-col {
flex-direction: column;
}
.flex-row {
flex-direction: row;
}
.justify-start {
justify-content: flex-start;
}
.justify-end {
justify-content: flex-end;
}
.justify-center {
justify-content: center;
}
.justify-between {
justify-content: space-between;
}
.justify-around {
justify-content: space-around;
}
.items-start {
align-items: flex-start;
}
.items-end {
align-items: flex-end;
}
.items-center {
align-items: center;
}
.items-baseline {
align-items: baseline;
}
.items-stretch {
align-items: stretch;
}
.flex-wrap {
flex-wrap: wrap;
}
.flex-nowrap {
flex-wrap: nowrap;
}
.flex-1 {
flex: 1 1 0%;
}
/* Margin 相关 */
.m-0 {
margin: 0;
}
.m-1 {
margin: 0.25rem;
}
.m-2 {
margin: 0.5rem;
}
.m-3 {
margin: 1rem;
}
.m-4 {
margin: 1.5rem;
}
.m-5 {
margin: 3rem;
}
.mt-0 {
margin-top: 0;
}
.mt-1 {
margin-top: 0.25rem;
}
.mt-2 {
margin-top: 0.5rem;
}
.mt-3 {
margin-top: 1rem;
}
.mt-4 {
margin-top: 1.5rem;
}
.mt-5 {
margin-top: 3rem;
}
/* 其他方向margin (mr, mb, ml) 和 padding (p, pt, pr, pb, pl) 同理 */
/* 这里省略类似代码,实际使用时建议补全 */
/* Padding 相关 */
.p-0 {
padding: 0;
}
.p-1 {
padding: 0.25rem;
}
.p-2 {
padding: 0.5rem;
}
.p-3 {
padding: 1rem;
}
.p-4 {
padding: 1.5rem;
}
.p-5 {
padding: 3rem;
}
/* 文本相关 */
.text-left {
text-align: left;
}
.text-center {
text-align: center;
}
.text-right {
text-align: right;
}
.text-uppercase {
text-transform: uppercase;
}
.text-lowercase {
text-transform: lowercase;
}
.text-capitalize {
text-transform: capitalize;
}
.font-bold {
font-weight: bold;
}
.font-normal {
font-weight: normal;
}
/* 宽度相关 */
.w-full {
width: 100%;
}
.w-auto {
width: auto;
}
.w-1\/2 {
width: 50%;
}
.w-1\/3 {
width: 33.333333%;
}
.w-2\/3 {
width: 66.666667%;
}
/* 显示相关 */
.block {
display: block;
}
.inline-block {
display: inline-block;
}
.inline {
display: inline;
}
.hidden {
display: none;
}
/* 间距相关 - 基于rem单位 */
.gap-0 {
gap: 0;
}
.gap-1 {
gap: 0.25rem;
}
.gap-2 {
gap: 0.5rem;
}
.gap-3 {
gap: 1rem;
}
.gap-4 {
gap: 1.5rem;
}
.gap-5 {
gap: 3rem;
}
/* 行间距 (row-gap) */
.row-gap-0 {
row-gap: 0;
}
.row-gap-1 {
row-gap: 0.25rem;
}
.row-gap-2 {
row-gap: 0.5rem;
}
.row-gap-3 {
row-gap: 1rem;
}
.row-gap-4 {
row-gap: 1.5rem;
}
.row-gap-5 {
row-gap: 3rem;
}
/* 列间距 (column-gap) */
.column-gap-0 {
column-gap: 0;
}
.column-gap-1 {
column-gap: 0.25rem;
}
.column-gap-2 {
column-gap: 0.5rem;
}
.column-gap-3 {
column-gap: 1rem;
}
.column-gap-4 {
column-gap: 1.5rem;
}
.column-gap-5 {
column-gap: 3rem;
}
/* 行高相关 */
.lh-1 {
line-height: 1;
}
.lh-1\.2 {
line-height: 1.2;
}
.lh-1\.4 {
line-height: 1.4;
}
.lh-1\.5 {
line-height: 1.5;
}
.lh-1\.6 {
line-height: 1.6;
}
.lh-1\.8 {
line-height: 1.8;
}
.lh-2 {
line-height: 2;
}
/* 固定值行高 */
.lh-16 {
line-height: 16px;
}
.lh-20 {
line-height: 20px;
}
.lh-24 {
line-height: 24px;
}
.lh-28 {
line-height: 28px;
}
.lh-32 {
line-height: 32px;
}
.lh-40 {
line-height: 40px;
}
.lh-48 {
line-height: 48px;
}
/* 指针相关 */
.cursor-auto {
cursor: auto;
}
.cursor-default {
cursor: default;
}
.cursor-pointer {
cursor: pointer;
}
.cursor-wait {
cursor: wait;
}
.cursor-text {
cursor: text;
}
.cursor-move {
cursor: move;
}
.cursor-help {
cursor: help;
}
.cursor-not-allowed {
cursor: not-allowed;
}
.cursor-none {
cursor: none;
}
.cursor-context-menu {
cursor: context-menu;
}
.cursor-progress {
cursor: progress;
}
.cursor-cell {
cursor: cell;
}
.cursor-crosshair {
cursor: crosshair;
}
.cursor-vertical-text {
cursor: vertical-text;
}
.cursor-alias {
cursor: alias;
}
.cursor-copy {
cursor: copy;
}
.cursor-no-drop {
cursor: no-drop;
}
.cursor-grab {
cursor: grab;
}
.cursor-grabbing {
cursor: grabbing;
}
.cursor-all-scroll {
cursor: all-scroll;
}
.cursor-col-resize {
cursor: col-resize;
}
.cursor-row-resize {
cursor: row-resize;
}
.cursor-n-resize {
cursor: n-resize;
}
.cursor-e-resize {
cursor: e-resize;
}
.cursor-s-resize {
cursor: s-resize;
}
.cursor-w-resize {
cursor: w-resize;
}
.cursor-ne-resize {
cursor: ne-resize;
}
.cursor-nw-resize {
cursor: nw-resize;
}
.cursor-se-resize {
cursor: se-resize;
}
.cursor-sw-resize {
cursor: sw-resize;
}
.cursor-ew-resize {
cursor: ew-resize;
}
.cursor-ns-resize {
cursor: ns-resize;
}
.cursor-nesw-resize {
cursor: nesw-resize;
}
.cursor-nwse-resize {
cursor: nwse-resize;
}
.cursor-zoom-in {
cursor: zoom-in;
}
.cursor-zoom-out {
cursor: zoom-out;
}
\ No newline at end of file
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