调整"订单统计"功能, 区分了现金,线上,平台交易金额

dist/assets/index-Bv9eB42o.js

@@ -1 +1 @@
-import{_ as U,u as I,r as u,o as L,b as n,c as R,h as S,e as w,f as e,w as t,k as v,g as b,v as K,x as B,A as C,E as d,K as E,L as N}from"./index-CrZDS_S7.js";const M=l=>(K("data-v-59a7e82c"),l=l(),B(),l),T={class:"body"},A={class:"login"},$=M(()=>w("div",{class:"title"},"里海收银系统 - 登录",-1)),j={__name:"index",setup(l){const p=I(),y=C(),h=u(null),_=u(null),s=u({account:"",password:"",key:"",captchaVerification:"",code:""}),i=()=>{if(!s.value.account)return d({message:"请填写账号",type:"error"});if(!s.value.password)return d({message:"请填写密码",type:"error"});E(s.value).then(a=>{console.log(a),a.data&&(p.setToken(a.data.token),N().then(({data:o})=>{if(!o.service)return d({message:"请联系管理员开通服务",type:"error"});p.setUserInfo(o),y.push("/")}))}).catch(a=>{})};return L(()=>{}),(a,o)=>{const k=n("User"),f=n("el-icon"),m=n("el-input"),c=n("el-form-item"),g=n("Lock"),x=n("el-button"),V=n("el-form");return R(),S("div",T,[w("div",A,[$,e(V,null,{default:t(()=>[e(c,null,{default:t(()=>[e(m,{ref_key:"accRef",ref:h,modelValue:s.value.account,"onUpdate:modelValue":o[0]||(o[0]=r=>s.value.account=r),placeholder:"请输入账号",autofocus:!0,onKeydown:o[1]||(o[1]=v(r=>_.value.focus(),["enter"]))},{prefix:t(()=>[e(f,null,{default:t(()=>[e(k)]),_:1})]),_:1},8,["modelValue"])]),_:1}),e(c,null,{default:t(()=>[e(m,{ref_key:"pwdRef",ref:_,modelValue:s.value.password,"onUpdate:modelValue":o[2]||(o[2]=r=>s.value.password=r),type:"password",placeholder:"请输入密码","show-password":"",onKeydown:v(i,["enter"])},{prefix:t(()=>[e(f,null,{default:t(()=>[e(g)]),_:1})]),_:1},8,["modelValue"])]),_:1}),e(c,null,{default:t(()=>[e(x,{style:{width:"100%"},type:"primary",onClick:i},{default:t(()=>[b("登录")]),_:1})]),_:1})]),_:1})])])}}},z=U(j,[["__scopeId","data-v-59a7e82c"]]);export{z as default};
+import{_ as U,u as I,r as u,o as L,b as n,c as R,h as S,e as w,f as e,w as t,k as v,g as b,v as K,x as B,A as C,E as d,K as E,L as N}from"./index-Db3iIaOe.js";const M=l=>(K("data-v-59a7e82c"),l=l(),B(),l),T={class:"body"},A={class:"login"},$=M(()=>w("div",{class:"title"},"里海收银系统 - 登录",-1)),j={__name:"index",setup(l){const p=I(),y=C(),h=u(null),_=u(null),s=u({account:"",password:"",key:"",captchaVerification:"",code:""}),i=()=>{if(!s.value.account)return d({message:"请填写账号",type:"error"});if(!s.value.password)return d({message:"请填写密码",type:"error"});E(s.value).then(a=>{console.log(a),a.data&&(p.setToken(a.data.token),N().then(({data:o})=>{if(!o.service)return d({message:"请联系管理员开通服务",type:"error"});p.setUserInfo(o),y.push("/")}))}).catch(a=>{})};return L(()=>{}),(a,o)=>{const k=n("User"),f=n("el-icon"),m=n("el-input"),c=n("el-form-item"),g=n("Lock"),x=n("el-button"),V=n("el-form");return R(),S("div",T,[w("div",A,[$,e(V,null,{default:t(()=>[e(c,null,{default:t(()=>[e(m,{ref_key:"accRef",ref:h,modelValue:s.value.account,"onUpdate:modelValue":o[0]||(o[0]=r=>s.value.account=r),placeholder:"请输入账号",autofocus:!0,onKeydown:o[1]||(o[1]=v(r=>_.value.focus(),["enter"]))},{prefix:t(()=>[e(f,null,{default:t(()=>[e(k)]),_:1})]),_:1},8,["modelValue"])]),_:1}),e(c,null,{default:t(()=>[e(m,{ref_key:"pwdRef",ref:_,modelValue:s.value.password,"onUpdate:modelValue":o[2]||(o[2]=r=>s.value.password=r),type:"password",placeholder:"请输入密码","show-password":"",onKeydown:v(i,["enter"])},{prefix:t(()=>[e(f,null,{default:t(()=>[e(g)]),_:1})]),_:1},8,["modelValue"])]),_:1}),e(c,null,{default:t(()=>[e(x,{style:{width:"100%"},type:"primary",onClick:i},{default:t(()=>[b("登录")]),_:1})]),_:1})]),_:1})])])}}},z=U(j,[["__scopeId","data-v-59a7e82c"]]);export{z as default};

dist/assets/index-CUukkCvJ.js

@@ -1 +0,0 @@
-import{o as r,d as o}from"./detail-g-dzYqDw.js";import{p as t}from"./padding-DQpQTC2Q.js";import{c as a,h as s,f as e}from"./index-CrZDS_S7.js";import"./pay.vue_vue_type_style_index_0_scoped_7f298acd_lang-CKxahYPN.js";import"./moment-Cl4UOzQZ.js";import"./pay-BRZ0vzgF.js";const i={class:"my-card"},h={__name:"index",setup(c){return(d,l)=>(a(),s("div",i,[e(r,{style:{"flex-shrink":"0"},ref:"orderRef"},null,512),e(t),e(o,{ref:"detailRef"},null,512)]))}};export{h as default};

dist/assets/index-Ekaohlhc.js

@@ -0,0 +1 @@
+import{o as r,d as o}from"./detail-CNaDiLm4.js";import{p as t}from"./padding-Ch9Ano5D.js";import{c as a,h as s,f as e}from"./index-Db3iIaOe.js";import"./pay.vue_vue_type_style_index_0_scoped_7f298acd_lang-B6ZqZT0L.js";import"./moment-Cl4UOzQZ.js";import"./pay-CEmj54N0.js";const i={class:"my-card"},h={__name:"index",setup(c){return(d,l)=>(a(),s("div",i,[e(r,{style:{"flex-shrink":"0"},ref:"orderRef"},null,512),e(t),e(o,{ref:"detailRef"},null,512)]))}};export{h as default};

dist/assets/index-wJI7wNCe.js

@@ -1 +1 @@
-import{b as t,c,h as a,e,f as o,w as d,g as l}from"./index-CrZDS_S7.js";const r={style:{width:"100vw",height:"100vh"}},_={style:{display:"flex","justify-content":"center","padding-top":"20vh"}},m={style:{display:"flex","flex-direction":"column","justify-content":"center","padding-left":"3rem"}},h=e("div",{style:{"font-size":"5rem","font-weight":"bold"}},"404",-1),p=e("div",{style:{"padding-bottom":"1rem"}},"您的页面没有找到",-1),v={__name:"index",setup(f){const s=()=>{window.location="/"};return(y,g)=>{const n=t("el-image"),i=t("el-button");return c(),a("div",r,[e("div",_,[o(n,{loading:"lazy",style:{width:"30rem",height:"20rem"},src:"/src/assets/icon-404-color.svg"}),e("div",m,[h,p,o(i,{type:"primary",onClick:s},{default:d(()=>[l("返回首页")]),_:1})])])])}}};export{v as default};
+import{b as t,c,h as a,e,f as o,w as d,g as l}from"./index-Db3iIaOe.js";const r={style:{width:"100vw",height:"100vh"}},_={style:{display:"flex","justify-content":"center","padding-top":"20vh"}},m={style:{display:"flex","flex-direction":"column","justify-content":"center","padding-left":"3rem"}},h=e("div",{style:{"font-size":"5rem","font-weight":"bold"}},"404",-1),p=e("div",{style:{"padding-bottom":"1rem"}},"您的页面没有找到",-1),v={__name:"index",setup(f){const s=()=>{window.location="/"};return(y,g)=>{const n=t("el-image"),i=t("el-button");return c(),a("div",r,[e("div",_,[o(n,{loading:"lazy",style:{width:"30rem",height:"20rem"},src:"/src/assets/icon-404-color.svg"}),e("div",m,[h,p,o(i,{type:"primary",onClick:s},{default:d(()=>[l("返回首页")]),_:1})])])])}}};export{v as default};

dist/assets/indexCount-BYG7OM1O.js

@@ -1 +0,0 @@
-import{h as I,i as S}from"./pay.vue_vue_type_style_index_0_scoped_7f298acd_lang-CKxahYPN.js";import{_ as Y,u as w,r as d,b as m,j as k,q as N,c as h,h as y,e,t,s as D,f as c,w as f,g as F,v as M,x as V,A as j}from"./index-CrZDS_S7.js";import{h as n}from"./moment-Cl4UOzQZ.js";const o=l=>(M("data-v-a8d18e7b"),l=l(),V(),l),A={"element-loading-text":"加载中",class:"my-order"},B={key:0,class:"from"},L={class:"form-card green"},q=o(()=>e("div",{class:"tips"},"今日线上收银金额",-1)),O={class:"form-card green"},E=o(()=>e("div",{class:"tips"},"昨日线上收银金额",-1)),R={class:"form-card green"},T=o(()=>e("div",{class:"tips"},"本月线上收银金额",-1)),U={class:"form-card"},z=o(()=>e("div",{class:"tips"},"今日收银 线上+现金 总金额",-1)),G={class:"form-card"},H=o(()=>e("div",{class:"tips"},"本月收银 线上+现金 总金额",-1)),J={class:"form-card red"},K=o(()=>e("div",{class:"tips"},"今日现金收银金额",-1)),Q={class:"form-card red"},W=o(()=>e("div",{class:"tips"},"昨日现金收银金额",-1)),X={class:"form-card red"},Z=o(()=>e("div",{class:"tips"},"本月现金收银金额",-1)),$={class:"form-card"},ee=o(()=>e("div",{class:"tips"},"昨日收银 线上+现金 总金额",-1)),se={class:"table"},te={__name:"indexCount",setup(l){const r=w(),u=d([]),b=j();d(1),d(null);const g=d({page:1,limit:15,staff_id:r.userInfo.service.service_id}),_=d(!1);d(0),(()=>{I(r.userInfo.service.mer_id,g.value).then(i=>{u.value=i.data})})();const s=d({});(()=>{_.value=!0,S(r.userInfo.service.mer_id,{staff_id:r.userInfo.service.service_id}).then(i=>{s.value=i.data.data,_.value=!1})})();const x=(i,P)=>{let a="";Number(n(i.day).format("MM"))>Number(n().format("MM"))?a=n().format("YYYY")-1+"-"+i.day.split("-").join("-"):a=n().format("YYYY")+"-"+i.day.split("-").join("-"),b.push({path:"order",query:{date:a}})};return(i,P)=>{const a=m("el-table-column"),v=m("el-table"),C=k("loading");return N((h(),y("div",A,[s.value.today?(h(),y("div",B,[e("div",L,[e("div",null,t(s.value.today.payPrice),1),q]),e("div",O,[e("div",null,t(s.value.yesterday.payPrice),1),E]),e("div",R,[e("div",null,t(s.value.month.payPrice),1),T]),e("div",U,[e("div",null,t((s.value.today.cashPayment+s.value.today.payPrice).toFixed(2)),1),z]),e("div",G,[e("div",null,t((s.value.month.cashPayment+s.value.month.payPrice).toFixed(2)),1),H]),e("div",J,[e("div",null,t(s.value.today.cashPayment),1),K]),e("div",Q,[e("div",null,t(s.value.yesterday.cashPayment),1),W]),e("div",X,[e("div",null,t(s.value.month.cashPayment),1),Z]),e("div",$,[e("div",null,t((s.value.yesterday.cashPayment+s.value.yesterday.payPrice).toFixed(2)),1),ee])])):D("",!0),e("div",se,[c(v,{data:u.value,style:{width:"100%"},onCellClick:x},{default:f(()=>[c(a,{prop:"day",label:"日期",width:"260"}),c(a,{prop:"total",label:"订单数量"}),c(a,{prop:"cash_payment",label:"现金收银金额"}),c(a,{prop:"pay_price",label:"线上收银金额"}),c(a,{label:"总金额"},{default:f(p=>[F(t(((+p.row.pay_price||0)+(+p.row.cash_payment||0)).toFixed(2)),1)]),_:1})]),_:1},8,["data"])])])),[[C,_.value]])}}},le=Y(te,[["__scopeId","data-v-a8d18e7b"]]);export{le as default};

dist/assets/indexCount-BfTXghlq.js

@@ -0,0 +1 @@
+import{h as S,i as Y}from"./pay.vue_vue_type_style_index_0_scoped_7f298acd_lang-B6ZqZT0L.js";import{_ as w,u as P,r as o,b as v,j as k,q as N,c as h,h as f,e as t,t as c,s as D,f as r,w as y,g as F,v as M,x as V,A as j}from"./index-Db3iIaOe.js";import{h as d}from"./moment-Cl4UOzQZ.js";const p=i=>(M("data-v-85d892d5"),i=i(),V(),i),A={"element-loading-text":"加载中",class:"my-order"},B={key:0,class:"from"},L={class:"form-card"},q=p(()=>t("div",{class:"tips"},"今日收银 平台+线上+现金 总金额",-1)),O={class:"form-card"},E=p(()=>t("div",{class:"tips"},"昨日收银 平台+线上+现金 总金额",-1)),R={class:"form-card"},T=p(()=>t("div",{class:"tips"},"本月收银 平台+线上+现金 总金额",-1)),U={class:"table"},z={__name:"indexCount",setup(i){const l=P(),u=o([]),b=j();o(1),o(null);const x=o({page:1,limit:15,staff_id:l.userInfo.service.service_id}),n=o(!1);o(0),(()=>{S(l.userInfo.service.mer_id,x.value).then(s=>{u.value=s.data})})();const a=o({});(()=>{n.value=!0,Y(l.userInfo.service.mer_id,{staff_id:l.userInfo.service.service_id}).then(s=>{a.value=s.data.data,n.value=!1})})();const g=(s,C)=>{let e="";Number(d(s.day).format("MM"))>Number(d().format("MM"))?e=d().format("YYYY")-1+"-"+s.day.split("-").join("-"):e=d().format("YYYY")+"-"+s.day.split("-").join("-"),b.push({path:"order",query:{date:e}})};return(s,C)=>{const e=v("el-table-column"),_=v("el-table"),I=k("loading");return N((h(),f("div",A,[a.value.today?(h(),f("div",B,[t("div",L,[t("div",null,c((a.value.today.cashPayment+a.value.today.payPrice).toFixed(2)),1),q]),t("div",O,[t("div",null,c((a.value.yesterday.cashPayment+a.value.yesterday.payPrice).toFixed(2)),1),E]),t("div",R,[t("div",null,c((a.value.month.cashPayment+a.value.month.payPrice).toFixed(2)),1),T])])):D("",!0),t("div",U,[r(_,{data:u.value,style:{width:"100%"},onCellClick:g},{default:y(()=>[r(e,{prop:"day",label:"日期",width:"260"}),r(e,{prop:"total",label:"订单数量"}),r(e,{prop:"cash_payment",label:"现金收银金额"}),r(e,{prop:"cash_registe",label:"线上收银金额"}),r(e,{prop:"pay_price",label:"平台交易额"}),r(e,{label:"总金额"},{default:y(m=>[F(c(((+m.row.pay_price||0)+(+m.row.cash_payment||0)).toFixed(2)),1)]),_:1})]),_:1},8,["data"])])])),[[I,n.value]])}}},W=w(z,[["__scopeId","data-v-85d892d5"]]);export{W as default};

dist/assets/indexCount-DOVRNxk8.css

@@ -0,0 +1 @@
+@charset "UTF-8";.my-order[data-v-85d892d5]{box-sizing:border-box}.my-order .from[data-v-85d892d5]{width:100%;padding-bottom:1.25rem;display:grid;grid-template-columns:repeat(5,1fr);gap:1.25rem}.my-order .from .form-card[data-v-85d892d5]{border-radius:.8rem;height:5rem;background-color:#fff;font-size:1.3rem;font-weight:700;display:flex;flex-direction:column;justify-content:center;align-items:center}.my-order .from .form-card .tips[data-v-85d892d5]{font-size:.9rem;color:#999;font-weight:400}.my-order .from .red[data-v-85d892d5]{color:#ff4a00}.my-order .from .green[data-v-85d892d5]{color:#01c86f}.my-order .table[data-v-85d892d5]{background-color:#fff;border-radius:1.2rem;box-sizing:border-box;padding:1rem;overflow-y:scroll}[data-v-85d892d5]::-webkit-scrollbar{width:.315rem}[data-v-85d892d5]::-webkit-scrollbar-track{background-color:#f1f1f1;margin:1.25rem 0}[data-v-85d892d5]::-webkit-scrollbar-thumb{background-color:#ccc;border-radius:.315rem}[data-v-85d892d5]::-webkit-scrollbar-thumb:hover{background-color:#999}

dist/assets/indexCount-DxWO3iy4.css

@@ -1 +0,0 @@
-@charset "UTF-8";.my-order[data-v-a8d18e7b]{box-sizing:border-box}.my-order .from[data-v-a8d18e7b]{width:100%;padding-bottom:1.25rem;display:grid;grid-template-columns:repeat(5,1fr);gap:1.25rem}.my-order .from .form-card[data-v-a8d18e7b]{border-radius:.8rem;height:5rem;background-color:#fff;font-size:1.3rem;font-weight:700;display:flex;flex-direction:column;justify-content:center;align-items:center}.my-order .from .form-card .tips[data-v-a8d18e7b]{font-size:.9rem;color:#999;font-weight:400}.my-order .from .red[data-v-a8d18e7b]{color:#ff4a00}.my-order .from .green[data-v-a8d18e7b]{color:#01c86f}.my-order .table[data-v-a8d18e7b]{background-color:#fff;border-radius:1.2rem;box-sizing:border-box;padding:1rem;overflow-y:scroll}[data-v-a8d18e7b]::-webkit-scrollbar{width:.315rem}[data-v-a8d18e7b]::-webkit-scrollbar-track{background-color:#f1f1f1;margin:1.25rem 0}[data-v-a8d18e7b]::-webkit-scrollbar-thumb{background-color:#ccc;border-radius:.315rem}[data-v-a8d18e7b]::-webkit-scrollbar-thumb:hover{background-color:#999}

dist/assets/indexList-C22m_nTv.js

@@ -1 +1 @@
-import{e as F,a as G,g as J,f as K}from"./pay.vue_vue_type_style_index_0_scoped_7f298acd_lang-CKxahYPN.js";import{_ as Q,u as W,r as s,b as d,j as X,q as Y,c,h as m,f as t,w as o,g as r,t as Z,e as P,d as I,A as ee,E as h,v as te,x as ae}from"./index-CrZDS_S7.js";import{p as oe}from"./pay-BRZ0vzgF.js";const le=v=>(te("data-v-3c901223"),v=v(),ae(),v),se={"element-loading-text":"加载中",class:"my-order"},ne={key:0},re={key:1,style:{color:"#ff4a00"}},ie={key:0},de={key:1,class:"flex"},ce=le(()=>P("span",null,"提单前请清空购物车, 避免提单的商品与购物车商品混合, 请确保购物车内无数据后再进行提单",-1)),ue={class:"dialog-footer"},pe={__name:"indexList",setup(v){const k=W(),C=s([]),b=ee(),g=s(1),f=s(null),n=s({page:1,limit:20}),y=s(!1),w=s(0),i=()=>{y.value=!0,g.value==1&&(n.value.paid=null),g.value==2&&(n.value.paid=0),F(k.userInfo.service.mer_id,n.value).then(e=>{C.value=e.data.list,w.value=e.data.count,y.value=!1})};i();const x=s(0);(()=>{G({staff_id:k.userInfo.service.service_id}).then(e=>{var a;x.value=(a=e.data.list)==null?void 0:a.length})})();const A=e=>{n.value.page=1,i()},B=e=>{n.value.page=e,i()},D=e=>{n.value.page=e,i()},N=e=>{n.value.page=e,i()},R=()=>{i()},$=e=>{f.value.setRePay({price:e.pay_price,order_id:e.group_order_id}),f.value.drawer=!0},E=e=>{J({order_sn:e}).then(a=>{a.data.paid==1||a.message=="支付成功"?(h({message:a.message,type:"success"}),i()):h({message:a.message,type:"error"})}).catch(a=>{})},L=s(""),U=()=>{_.value=!1,K({order_sn:L.value}).then(e=>{h({message:e.message,type:"success"}),b.push({name:"home"})})},_=s(!1),z=e=>{L.value=e,_.value=!0},O=()=>{b.push({name:"home"})};return(e,a)=>{const S=d("el-radio-button"),T=d("el-radio-group"),u=d("el-table-column"),p=d("el-button"),j=d("el-table"),q=d("el-pagination"),H=d("el-dialog"),M=X("loading");return Y((c(),m("div",se,[t(T,{modelValue:g.value,"onUpdate:modelValue":a[0]||(a[0]=l=>g.value=l),style:{"margin-bottom":"30px"},onChange:A},{default:o(()=>[t(S,{value:1},{default:o(()=>[r("全部")]),_:1}),t(S,{value:2},{default:o(()=>[r("未支付")]),_:1})]),_:1},8,["modelValue"]),t(j,{data:C.value,style:{width:"100%"}},{default:o(()=>[t(u,{prop:"group_order_id",label:"ID",width:"100"}),t(u,{prop:"order_sn",label:"订单号",width:"260"}),t(u,{prop:"total_price",label:"订单金额"}),t(u,{prop:"paid",label:"支付状态"},{default:o(l=>[l.row.paid==1?(c(),m("span",ne,"已支付")):(c(),m("span",re,"未支付"))]),_:1}),t(u,{prop:"create_time",label:"订单创建时间"}),t(u,{prop:"pay_time",label:"订单支付时间"},{default:o(l=>[l.row.pay_time?(c(),m("span",ie,Z(l.row.pay_time),1)):(c(),m("div",de,[t(p,{type:"primary",link:"",onClick:V=>$(l.row)},{default:o(()=>[r("重新支付")]),_:2},1032,["onClick"]),t(p,{type:"primary",link:"",onClick:V=>E(l.row.order_sn)},{default:o(()=>[r("检测状态")]),_:2},1032,["onClick"]),t(p,{type:"primary",link:"",onClick:V=>z(l.row.order_sn)},{default:o(()=>[r("提单")]),_:2},1032,["onClick"])]))]),_:1})]),_:1},8,["data"]),t(q,{"page-size":n.value.limit,layout:"prev, pager, next",total:w.value,onPrevClick:B,onNextClick:D,onCurrentChange:N},null,8,["page-size","total"]),t(oe,{ref_key:"payRef",ref:f,onPaySuccess:R},null,512),t(H,{modelValue:_.value,"onUpdate:modelValue":a[2]||(a[2]=l=>_.value=l),title:"提示",width:"500"},{footer:o(()=>[P("div",ue,[t(p,{onClick:a[1]||(a[1]=l=>_.value=!1)},{default:o(()=>[r("取消")]),_:1}),x.value>0?(c(),I(p,{key:0,onClick:O},{default:o(()=>[r(" 前去清空购物车 ")]),_:1})):(c(),I(p,{key:1,type:"primary",onClick:U},{default:o(()=>[r(" 确认提单 ")]),_:1}))])]),default:o(()=>[ce]),_:1},8,["modelValue"])])),[[M,y.value]])}}},fe=Q(pe,[["__scopeId","data-v-3c901223"]]);export{fe as default};
+import{e as F,a as G,g as J,f as K}from"./pay.vue_vue_type_style_index_0_scoped_7f298acd_lang-B6ZqZT0L.js";import{_ as Q,u as W,r as s,b as d,j as X,q as Y,c,h as m,f as t,w as o,g as r,t as Z,e as P,d as I,A as ee,E as h,v as te,x as ae}from"./index-Db3iIaOe.js";import{p as oe}from"./pay-CEmj54N0.js";const le=v=>(te("data-v-3c901223"),v=v(),ae(),v),se={"element-loading-text":"加载中",class:"my-order"},ne={key:0},re={key:1,style:{color:"#ff4a00"}},ie={key:0},de={key:1,class:"flex"},ce=le(()=>P("span",null,"提单前请清空购物车, 避免提单的商品与购物车商品混合, 请确保购物车内无数据后再进行提单",-1)),ue={class:"dialog-footer"},pe={__name:"indexList",setup(v){const k=W(),C=s([]),b=ee(),g=s(1),f=s(null),n=s({page:1,limit:20}),y=s(!1),w=s(0),i=()=>{y.value=!0,g.value==1&&(n.value.paid=null),g.value==2&&(n.value.paid=0),F(k.userInfo.service.mer_id,n.value).then(e=>{C.value=e.data.list,w.value=e.data.count,y.value=!1})};i();const x=s(0);(()=>{G({staff_id:k.userInfo.service.service_id}).then(e=>{var a;x.value=(a=e.data.list)==null?void 0:a.length})})();const A=e=>{n.value.page=1,i()},B=e=>{n.value.page=e,i()},D=e=>{n.value.page=e,i()},N=e=>{n.value.page=e,i()},R=()=>{i()},$=e=>{f.value.setRePay({price:e.pay_price,order_id:e.group_order_id}),f.value.drawer=!0},E=e=>{J({order_sn:e}).then(a=>{a.data.paid==1||a.message=="支付成功"?(h({message:a.message,type:"success"}),i()):h({message:a.message,type:"error"})}).catch(a=>{})},L=s(""),U=()=>{_.value=!1,K({order_sn:L.value}).then(e=>{h({message:e.message,type:"success"}),b.push({name:"home"})})},_=s(!1),z=e=>{L.value=e,_.value=!0},O=()=>{b.push({name:"home"})};return(e,a)=>{const S=d("el-radio-button"),T=d("el-radio-group"),u=d("el-table-column"),p=d("el-button"),j=d("el-table"),q=d("el-pagination"),H=d("el-dialog"),M=X("loading");return Y((c(),m("div",se,[t(T,{modelValue:g.value,"onUpdate:modelValue":a[0]||(a[0]=l=>g.value=l),style:{"margin-bottom":"30px"},onChange:A},{default:o(()=>[t(S,{value:1},{default:o(()=>[r("全部")]),_:1}),t(S,{value:2},{default:o(()=>[r("未支付")]),_:1})]),_:1},8,["modelValue"]),t(j,{data:C.value,style:{width:"100%"}},{default:o(()=>[t(u,{prop:"group_order_id",label:"ID",width:"100"}),t(u,{prop:"order_sn",label:"订单号",width:"260"}),t(u,{prop:"total_price",label:"订单金额"}),t(u,{prop:"paid",label:"支付状态"},{default:o(l=>[l.row.paid==1?(c(),m("span",ne,"已支付")):(c(),m("span",re,"未支付"))]),_:1}),t(u,{prop:"create_time",label:"订单创建时间"}),t(u,{prop:"pay_time",label:"订单支付时间"},{default:o(l=>[l.row.pay_time?(c(),m("span",ie,Z(l.row.pay_time),1)):(c(),m("div",de,[t(p,{type:"primary",link:"",onClick:V=>$(l.row)},{default:o(()=>[r("重新支付")]),_:2},1032,["onClick"]),t(p,{type:"primary",link:"",onClick:V=>E(l.row.order_sn)},{default:o(()=>[r("检测状态")]),_:2},1032,["onClick"]),t(p,{type:"primary",link:"",onClick:V=>z(l.row.order_sn)},{default:o(()=>[r("提单")]),_:2},1032,["onClick"])]))]),_:1})]),_:1},8,["data"]),t(q,{"page-size":n.value.limit,layout:"prev, pager, next",total:w.value,onPrevClick:B,onNextClick:D,onCurrentChange:N},null,8,["page-size","total"]),t(oe,{ref_key:"payRef",ref:f,onPaySuccess:R},null,512),t(H,{modelValue:_.value,"onUpdate:modelValue":a[2]||(a[2]=l=>_.value=l),title:"提示",width:"500"},{footer:o(()=>[P("div",ue,[t(p,{onClick:a[1]||(a[1]=l=>_.value=!1)},{default:o(()=>[r("取消")]),_:1}),x.value>0?(c(),I(p,{key:0,onClick:O},{default:o(()=>[r(" 前去清空购物车 ")]),_:1})):(c(),I(p,{key:1,type:"primary",onClick:U},{default:o(()=>[r(" 确认提单 ")]),_:1}))])]),default:o(()=>[ce]),_:1},8,["modelValue"])])),[[M,y.value]])}}},fe=Q(pe,[["__scopeId","data-v-3c901223"]]);export{fe as default};

dist/assets/indexSystem-BEtGVxAa.js

@@ -1 +0,0 @@
-import{o as r,d as t}from"./detail-g-dzYqDw.js";import{p as o}from"./padding-DQpQTC2Q.js";import{c as s,h as a,f as e}from"./index-CrZDS_S7.js";import"./pay.vue_vue_type_style_index_0_scoped_7f298acd_lang-CKxahYPN.js";import"./moment-Cl4UOzQZ.js";import"./pay-BRZ0vzgF.js";const i={class:"my-card"},h={__name:"indexSystem",setup(m){return(c,d)=>(s(),a("div",i,[e(r,{style:{"flex-shrink":"0"},ref:"orderRef",isSystem:""},null,512),e(o),e(t,{ref:"detailRef"},null,512)]))}};export{h as default};

dist/assets/indexSystem-BcKTr545.js

@@ -0,0 +1 @@
+import{o as r,d as t}from"./detail-CNaDiLm4.js";import{p as o}from"./padding-Ch9Ano5D.js";import{c as s,h as a,f as e}from"./index-Db3iIaOe.js";import"./pay.vue_vue_type_style_index_0_scoped_7f298acd_lang-B6ZqZT0L.js";import"./moment-Cl4UOzQZ.js";import"./pay-CEmj54N0.js";const i={class:"my-card"},h={__name:"indexSystem",setup(m){return(c,d)=>(s(),a("div",i,[e(r,{style:{"flex-shrink":"0"},ref:"orderRef",isSystem:""},null,512),e(o),e(t,{ref:"detailRef"},null,512)]))}};export{h as default};

dist/assets/lodash-BgJbRuYL.js

@@ -1,4 +1,4 @@
-import{B as jt,C as rp}from"./index-CrZDS_S7.js";var Je={exports:{}};/**
+import{B as jt,C as rp}from"./index-Db3iIaOe.js";var Je={exports:{}};/**
  * @license
  * Lodash <https://lodash.com/>
  * Copyright OpenJS Foundation and other contributors <https://openjsf.org/>

dist/assets/padding-Ch9Ano5D.js

@@ -1 +1 @@
-import{_ as e,c as t,h as c}from"./index-CrZDS_S7.js";const n={},o={style:{width:"1rem",height:"100%"}};function r(s,_){return t(),c("div",o)}const i=e(n,[["render",r]]);export{i as p};
+import{_ as e,c as t,h as c}from"./index-Db3iIaOe.js";const n={},o={style:{width:"1rem",height:"100%"}};function r(s,_){return t(),c("div",o)}const i=e(n,[["render",r]]);export{i as p};

dist/assets/pay.vue_vue_type_style_index_0_scoped_7f298acd_lang-B6ZqZT0L.js

@@ -1 +1 @@
-import{G as t}from"./index-CrZDS_S7.js";function n(r){return t.post("user/cart/create",r)}function s(r){return t.get("user/cart/lst",{params:r})}function o(r,e){return t.post(`user/cart/change/${r}`,e)}function u(r){return t.post("v2/order/check",r)}function c(r){return t.post("user/cart/delete",r)}function p(r){return t.post("v2/order/create",r)}function d(r,e){return t.post(`order/pay/${r}`,e)}function f(r){return t.get("micropay_query",{params:r})}function A(r,e){return t.get(`admin/${r}/order_list`,{params:e})}function m(r,e){return t.get(`verifier/${r}/order/${e}`)}function g(r){return t.get("order_lading",{params:r})}function $(r,e,i){return t.post(`verifier/${r}/${e}`,i)}function l(r,e){return t.get(`admin/${r}/statistics`,{params:e})}function v(r,e){return t.get(`admin/${r}/order_price`,{params:e})}function h(r,e){return t.get("order/list",{params:e})}export{s as a,o as b,c,n as d,A as e,g as f,f as g,v as h,l as i,$ as j,p as k,d as l,u as o,h as s,m as v};
+import{G as t}from"./index-Db3iIaOe.js";function n(r){return t.post("user/cart/create",r)}function s(r){return t.get("user/cart/lst",{params:r})}function o(r,e){return t.post(`user/cart/change/${r}`,e)}function u(r){return t.post("v2/order/check",r)}function c(r){return t.post("user/cart/delete",r)}function p(r){return t.post("v2/order/create",r)}function d(r,e){return t.post(`order/pay/${r}`,e)}function f(r){return t.get("micropay_query",{params:r})}function A(r,e){return t.get(`admin/${r}/order_list`,{params:e})}function m(r,e){return t.get(`verifier/${r}/order/${e}`)}function g(r){return t.get("order_lading",{params:r})}function $(r,e,i){return t.post(`verifier/${r}/${e}`,i)}function l(r,e){return t.get(`admin/${r}/statistics`,{params:e})}function v(r,e){return t.get(`admin/${r}/order_price`,{params:e})}function h(r,e){return t.get("order/list",{params:e})}export{s as a,o as b,c,n as d,A as e,g as f,f as g,v as h,l as i,$ as j,p as k,d as l,u as o,h as s,m as v};

dist/assets/shop-BJxq9Fz-.js

@@ -1 +1 @@
-import{G as e}from"./index-CrZDS_S7.js";function u(t,r){return e.get(`server/${t}/product/lst`,{params:r})}function p(t,r){return e.get(`store/product/detail/${t}`,{params:r})}function o(t,r){return e.post(`user_free_trial/${t}`,r)}function n(t,r){return e.get(`server/${t}/product/title`,{params:r})}function i(t,r,s){return e.post(`server/${t}/product/status/${r}`,s)}function c(t,r){return e.get(`server/${t}/category/list`,{params:r})}function d(t,r){return e.post(`server/${t}/product/create`,r)}function f(t,r,s){return e.post(`server/${t}/product/update/${r}`,s)}function g(t,r,s){return e.get(`server/${t}/product/detail/${r}`,{params:s})}function l(t){return e.get("product/spu/lst",{params:t})}function $(t,r){return e.get(`store/merchant/category/lst/${t}`,{params:r})}export{l as a,d as b,c,f as d,n as e,i as f,p as g,$ as m,g as p,u as s,o as u};
+import{G as e}from"./index-Db3iIaOe.js";function u(t,r){return e.get(`server/${t}/product/lst`,{params:r})}function p(t,r){return e.get(`store/product/detail/${t}`,{params:r})}function o(t,r){return e.post(`user_free_trial/${t}`,r)}function n(t,r){return e.get(`server/${t}/product/title`,{params:r})}function i(t,r,s){return e.post(`server/${t}/product/status/${r}`,s)}function c(t,r){return e.get(`server/${t}/category/list`,{params:r})}function d(t,r){return e.post(`server/${t}/product/create`,r)}function f(t,r,s){return e.post(`server/${t}/product/update/${r}`,s)}function g(t,r,s){return e.get(`server/${t}/product/detail/${r}`,{params:s})}function l(t){return e.get("product/spu/lst",{params:t})}function $(t,r){return e.get(`store/merchant/category/lst/${t}`,{params:r})}export{l as a,d as b,c,f as d,n as e,i as f,p as g,$ as m,g as p,u as s,o as u};

dist/index.html

@@ -40,8 +40,8 @@
         }
       }
     </style>
-    <script type="module" crossorigin src="./assets/index-CrZDS_S7.js"></script>
-    <link rel="stylesheet" crossorigin href="./assets/index-DmD4W-o0.css">
+    <script type="module" crossorigin src="./assets/index-Db3iIaOe.js"></script>
+    <link rel="stylesheet" crossorigin href="./assets/index-BbwxVKIL.css">
   </head>
   <body>
     <div id="app"></div>

src/layout/myAside.vue

@@ -14,7 +14,7 @@ const list = ref([
   { name: "order", title: "收银订单", ico: "DataLine", count: 0 },
   { name: "orderSystem", title: "平台订单", ico: "DataAnalysis", count: 0 },
   { name: "saleHome", title: "批发", ico: "Van", count: 0 },
-  { name: "saleOrder", title: "批发订单", ico: "Tickets", count: 1 },
+  { name: "saleOrder", title: "批发订单", ico: "Tickets", count: 0 },
   { name: "convert", title: "核销", ico: "FullScreen", count: 0 },
   { name: "shop", title: "商品", ico: "ShoppingBag", count: 0 },
   { name: "orderCount", title: "订单统计", ico: "PieChart", count: 0 },

src/views/order/indexCount.vue

@@ -88,7 +88,7 @@ const cellClick = (row, column) => {
 <template>
   <div v-loading="loading" element-loading-text="加载中" class="my-order">
     <div class="from" v-if="formData.today">
-      <div class="form-card green">
+      <!-- <div class="form-card green">
         <div>{{ formData.today.payPrice }}</div>
         <div class="tips">今日线上收银金额</div>
       </div>
@@ -99,16 +99,22 @@ const cellClick = (row, column) => {
       <div class="form-card green">
         <div>{{ formData.month.payPrice }}</div>
         <div class="tips">本月线上收银金额</div>
-      </div>
+      </div> -->
       <div class="form-card">
         <div>{{ (formData.today.cashPayment + formData.today.payPrice).toFixed(2) }}</div>
-        <div class="tips">今日收银 线上+现金 总金额</div>
+        <div class="tips">今日收银 平台+线上+现金 总金额</div>
+      </div>
+      <div class="form-card">
+        <div>
+          {{ (formData.yesterday.cashPayment + formData.yesterday.payPrice).toFixed(2) }}
+        </div>
+        <div class="tips">昨日收银 平台+线上+现金 总金额</div>
       </div>
       <div class="form-card">
         <div>{{ (formData.month.cashPayment + formData.month.payPrice).toFixed(2) }}</div>
-        <div class="tips">本月收银 线上+现金 总金额</div>
+        <div class="tips">本月收银 平台+线上+现金 总金额</div>
       </div>
-      <div class="form-card red">
+      <!-- <div class="form-card red">
         <div>{{ formData.today.cashPayment }}</div>
         <div class="tips">今日现金收银金额</div>
       </div>
@@ -119,24 +125,6 @@ const cellClick = (row, column) => {
       <div class="form-card red">
         <div>{{ formData.month.cashPayment }}</div>
         <div class="tips">本月现金收银金额</div>
-      </div>
-      <div class="form-card">
-        <div>
-          {{ (formData.yesterday.cashPayment + formData.yesterday.payPrice).toFixed(2) }}
-        </div>
-        <div class="tips">昨日收银 线上+现金 总金额</div>
-      </div>
-      <!-- <div class="form-card">
-            <div>{{formData.today.orderNum}}</div>
-            <div class="tips">今日订单数</div>
-        </div>
-        <div class="form-card">
-            <div>{{formData.yesterday.orderNum}}</div>
-            <div class="tips">昨日订单数</div>
-        </div>
-        <div class="form-card">
-            <div>{{formData.month.orderNum}}</div>
-            <div class="tips">本月订单数</div>
       </div> -->
     </div>
     <div class="table">
@@ -144,7 +132,8 @@ const cellClick = (row, column) => {
         <el-table-column prop="day" label="日期" width="260" />
         <el-table-column prop="total" label="订单数量" />
         <el-table-column prop="cash_payment" label="现金收银金额" />
-        <el-table-column prop="pay_price" label="线上收银金额" />
+        <el-table-column prop="cash_registe" label="线上收银金额" />
+        <el-table-column prop="pay_price" label="平台交易额" />
         <el-table-column label="总金额">
           <template #default="scope">
             {{ (((+scope.row.pay_price || 0) + (+scope.row.cash_payment || 0))).toFixed(2) }}

src/views/saleOrder/component/order.vue

@@ -200,7 +200,7 @@ onMounted(()=>{
               <span v-if="item.pay_type == 1">(微信支付)</span>
               <span v-if="item.pay_type == 9">(商户余额支付)</span>
               <span v-if="item.pay_type == 10">(对公转账)</span>
-              <span class="manage-btn">待处理</span>
+              <!-- <span class="manage-btn">待处理</span> -->
             </div>
             <div v-else style="color: #ff4a00">未支付</div>
           </div>