diff --git a/src/pages/FinancialMgm/OrderInquiry/OrderChangeInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/OrderChangeInquiry/index.jsx index 7f8e68a..fc7dc83 100644 --- a/src/pages/FinancialMgm/OrderInquiry/OrderChangeInquiry/index.jsx +++ b/src/pages/FinancialMgm/OrderInquiry/OrderChangeInquiry/index.jsx @@ -454,7 +454,7 @@ function EditOrderInquiry(props) {
-
车厂详情
+
车场详情
diff --git a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx index a5667d0..8e3494e 100644 --- a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx +++ b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx @@ -857,7 +857,7 @@ function ParkingOrderInquiry(props) {
停车订单:{ycddData.park_record_id}
-
车厂详情
+
车场详情
平台商户
{ycddData.payment_operator_name}
diff --git a/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx index 072ef91..28324eb 100644 --- a/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx +++ b/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx @@ -514,7 +514,7 @@ function ReturnOrderInquiry() {
-
车厂详情
+
车场详情
diff --git a/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx b/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx index 86d28c0..989b198 100644 --- a/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx +++ b/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx @@ -1011,7 +1011,7 @@ function CarInfo() {
停车订单:{ycddData.park_record_id}
-
车厂详情
+
车场详情
平台商户
{ycddData.payment_operator_name}
diff --git a/src/pages/OperationCenter/OperationSales/CreditScoreMgm/index.scss b/src/pages/OperationCenter/OperationSales/CreditScoreMgm/index.scss index 83f96d1..20af6c5 100644 --- a/src/pages/OperationCenter/OperationSales/CreditScoreMgm/index.scss +++ b/src/pages/OperationCenter/OperationSales/CreditScoreMgm/index.scss @@ -472,32 +472,68 @@ } } .pay-modal { - .content { - display: flex; + .addrule-btn { + display: inline-block; + margin: 0 5px; + width: 84px; + text-align: center; + height: 25px; + background: linear-gradient(180deg, #3aa9ff, #59b7ff); + border-radius: 4px; + margin-left: 20px; + cursor: pointer; + } + .pay-box { + border: 1px solid #777777; + margin-bottom: 16px; + padding: 10px; + .title { + display: inline-block; + margin-bottom: 20px; + } + .delrule-btn { + display: inline-block; + margin: 0 5px; + width: 84px; + text-align: center; + height: 25px; + background: linear-gradient(180deg, #3aa9ff, #59b7ff); + border-radius: 4px; + margin-left: 20px; + cursor: pointer; + } + .content { + display: flex; - .row-box { - .row-line { - margin-bottom: 10px; + .row-box { + .row-line { + margin-bottom: 10px; - .add-btn { - display: inline-block; - border: 1px solid; - border-radius: 20px; - font-size: 12px; - width: 21px; - text-align: center; - margin-left: 10px; - cursor: pointer; - } + .row-select { + width: 200px; + } - .del-btn { - color: #fff; - border: 1px solid red; - background: red; + .add-btn { + display: inline-block; + border: 1px solid; + border-radius: 20px; + font-size: 12px; + width: 21px; + text-align: center; + margin-left: 10px; + cursor: pointer; + } + + .del-btn { + color: #fff; + border: 1px solid red; + background: red; + } } - } + } } } + } \ No newline at end of file diff --git a/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx b/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx index 0a10f61..143ae8d 100644 --- a/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx +++ b/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx @@ -23,6 +23,20 @@ function CreditScoreMgm() { const [resultData, setResultData] = useState([])//列表数据 const [detailData, setDetailData] = useState([])//使用记录列表 const [saveData, setSaveData] = useState({})//积分规则配置保存 + const [flag, setFlag] = useState(1) + const [payData, setPayData] = useState({})//充值规则配置 + const [awardList, setAwardList] = useState([])//充值规则优惠券下拉 + const [coupon, setCoupon] = useState([ + { + "cid": "1", + "couponId": "1817399802436513369", + "num": 2 + }, + { + "cid": "2", + "couponId": "1817399802436513369", + "num": 5 + }])//充值规则配置 const [redeemData, setRedeemData] = useState([])//积分兑换配置列表 const [addData, setAddData] = useState({})//积分兑换添加数据 const [awardId, setAwardId] = useState('')//奖品名称下拉数据默认值 @@ -393,6 +407,33 @@ function CreditScoreMgm() { } }) } + // 充值规则配置列表 + const getRechargeRulesList = (e) => { + ajax.getRechargeRulesList(e).then((e) => { + if (e.status == 20000) { + setPayVisible(true) + setPayData(e.data) + } + }) + }; + // 充值规则配置修改 + const getRechargeRulesUpdate = (e) => { + ajax.getRechargeRulesUpdate(e).then((e) => { + if (e.status == 20000) { + message.success(e.message) + return 1 + } + }) + }; + // 充值规则配置移除 + const getRechargeRulesDel = (e) => { + ajax.getRechargeRulesDel(e).then((e) => { + if (e.status == 20000) { + message.success(e.message) + return 1 + } + }) + }; // 获取下拉数据 const getSelectList = () => { ajax.getCreditScoreAward().then((e) => { @@ -402,25 +443,18 @@ function CreditScoreMgm() { ]) }) }; - const acf = () => { - { - fields?.map((item, index) => { - return ( -
-
11
-
{ - let arr = fields - arr.push(1) - setFields(arr) - } - }>+
-
) - } - ) - } - } + // 充值规则优惠券下拉 + const getRechargeAwardList = () => { + ajax.getRechargeAwardList().then((e) => { + setAwardList([ + //...searchSelectList, + ...e.data + ]) + }) + }; useEffect(() => { getSelectList(); + getRechargeAwardList(); }, []); return ( @@ -441,8 +475,7 @@ function CreditScoreMgm() { type="primary" style={{ width: '116px' }} onClick={() => { - //getRule() - setPayVisible(true) + getRechargeRulesList() }} > 充值规则配置 @@ -728,75 +761,139 @@ function CreditScoreMgm() { + 充值规则配置 +
{ + let arr = payData + if (arr.list.length > 4) { + message.error('最多添加五条规则!') + return + } + arr.list[arr.list.length] = + { + "rid": "", + "recharge": '', + "children": [ + { + "cid": "", + "couponId": "", + "num": '' + }, + ] + } + setFlag(flag + 1) + setPayData(arr) + }}>添加规则
+
} className="pay-modal" onCancel={() => { setPayVisible(false); }} - onOk={() => { }} - > -
-
规则
-
-
充值 - { setSaveData({ ...saveData, deducting_points: e }) }} - /> - 元,返优惠券 -
-
- {fields.length != 0 ? - fields?.map((item, index) => { - return ( -
- e.parentNode} + options={awardList} + fieldNames={{ label: "award", value: "awardId" }} + defaultValue={payData.list[index]?.children[index2]?.couponId} + onChange={(e) => { + let arr = payData + res.couponId = e + arr.list[index].children[index2] = res + setFlag(flag + 1) + setPayData(arr) + } + } + //placeholder={item.placeholder} + /> + { + let arr = payData + res.num = e + arr.list[index].children[index2] = res + setFlag(flag + 1) + setPayData(arr) + } + } + />张 + { + index2 > 0 && index2 + 1 == item.children.length ? +
{ + getRechargeRulesDel({ cid: res.couponId }) + let arr = payData + arr.list[index].children.splice(index2, 1); + console.log(847, arr) + setFlag(flag + 1) + setPayData(arr) + } + }>—
+ : +
{ + let arr = payData + //console.log(123124, item, item.children, res, arr.list[index]?.children) + if (item.children.length > 2) { + message.error('最多添加三个优惠券!') + return + } + arr.list[index].children[item.children.length] = { + "cid": "", + "couponId": "", + "num": '' + } + setFlag(flag + 1) + setPayData(arr) + } + }>+
} - arr.push(1) - setFields([...arr]) - } - }>+
- } -
- ) - }) - : null - } -
-
- - -
+
+ ) + }) + : null + } + + + + }) : null + } + ) diff --git a/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx b/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx index c5fccaa..5a88a10 100644 --- a/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx +++ b/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx @@ -1280,7 +1280,7 @@ function UserInfo() {
停车订单:{ycddData.park_record_id}
-
车厂详情
+
车场详情
平台商户
{ycddData.payment_operator_name}
diff --git a/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx b/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx index 9d53fde..500af4f 100644 --- a/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx +++ b/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx @@ -5,7 +5,7 @@ import ReactEcharts from "echarts-for-react"; import { useSelector } from "react-redux"; import "./index.scss"; import { VideoPlay } from "@/components"; -import { Select, Tooltip } from "antd"; +import { Select, Tooltip, message } from "antd"; var timer = null; const OutRoadOverview = () => { const skin = useSelector((state) => { @@ -293,10 +293,12 @@ const OutRoadOverview = () => { //概览-监控设备 function getOutRoadVideoDevice(e) { ajax - .getOutRoadVideoDevice(e) + .getOutRoadVideoDevice({ road_id: e }) .then((res) => { if (res.status === 20000) { setVideoDevice(res.data); + }else { + message.error(res.message) } }) .catch((err) => { @@ -309,9 +311,11 @@ const OutRoadOverview = () => { .getOutRoadVideoPlay(e) .then((res) => { if (res.status === 20000) { - setVideoPlay(res.data.url); + setVideoPlay("http://122.9.151.13:81/rtp/Play-37021100131110000028-37021100131310000196.live.mp4"); handleFlvPlay(res.data.url); getOutRoadVideoPlaying(e) //轮询 + }else { + message.error(res.message) } }) .catch((err) => { @@ -407,7 +411,8 @@ const OutRoadOverview = () => { const handleFlvPlay = (e) => { videoRef.current.closeVideo() setVideoType("mp4") - videoRef.current.changeUrl(e) + console.log(e) + videoRef.current.changeUrl("http://122.9.151.13:81/rtp/Playback-37021100131110000028-37021100131310000196-1705292345-1705295109.live.mp4") } useEffect(() => { getBaseNumber(); diff --git a/src/services/OperationCenter/OperationSales/index.js b/src/services/OperationCenter/OperationSales/index.js index e1f3537..3b9ba20 100644 --- a/src/services/OperationCenter/OperationSales/index.js +++ b/src/services/OperationCenter/OperationSales/index.js @@ -316,6 +316,42 @@ const getCreditScoreAward = (p) => { data: p, }); }; + +// 信用积分管理-充值规则优惠券下拉 +const getRechargeAwardList = (p) => { + return ajax({ + url: "/api/ope/credit_system/recharge_award_list", + type: "get", + data: p, + }); +}; + +// 信用积分管理-充值规则配置列表 +const getRechargeRulesList = (p) => { + return ajax({ + url: "/api/ope/credit_system/recharge_rules_list", + type: "get", + data: p, + }); +}; + +// 信用积分管理-充值规则配置修改 +const getRechargeRulesUpdate = (p) => { + return ajax({ + url: "/api/ope/credit_system/recharge_rules_update", + type: "post", + data: p, + }); +}; + +// 信用积分管理-充值规则配置移除 +const getRechargeRulesDel = (p) => { + return ajax({ + url: "/api/ope/credit_system/recharge_rules_del", + type: "post", + data: p, + }); +}; export default { getCouponList, getCouponOptions, @@ -354,5 +390,9 @@ export default { getCreditScoreRedeemAdd, getCreditScoreRedeemEdit, getCreditScoreRedeemDel, - getCreditScoreAward + getCreditScoreAward, + getRechargeAwardList, + getRechargeRulesList, + getRechargeRulesUpdate, + getRechargeRulesDel, };