1

build/assets/index-B4i2xPTZ.js

@@ -1 +1 @@
-import{A as U,_ as I,u as R,r as u,o as S,b as s,c as b,h as L,e as v,f as e,w as t,p as m,g as B,y as C,z as E,D as K,E as w}from"./index-D_1OygAr.js";function N(a){return U.post("/login/account",a)}const M=a=>(C("data-v-f9ff2ce9"),a=a(),E(),a),T={class:"body"},q={class:"login"},z=M(()=>v("div",{class:"title"},"里海收银系统 - 登录",-1)),A={__name:"index",setup(a){const d=R(),y=K(),h=u(null),p=u(null),n=u({account:"",password:"",terminal:1}),_=()=>{if(!n.value.account)return w({message:"请填写账号",type:"error"});if(!n.value.password)return w({message:"请填写密码",type:"error"});N(n.value).then(l=>{var o;(o=l.data)!=null&&o.token&&(d.setToken(l.data.token),d.setUserInfo(l.data),y.push("/"))}).catch(l=>{})};return S(()=>{}),(l,o)=>{const k=s("User"),f=s("el-icon"),i=s("el-input"),c=s("el-form-item"),g=s("Lock"),x=s("el-button"),V=s("el-form");return b(),L("div",T,[v("div",q,[z,e(V,null,{default:t(()=>[e(c,null,{default:t(()=>[e(i,{ref_key:"accRef",ref:h,modelValue:n.value.account,"onUpdate:modelValue":o[0]||(o[0]=r=>n.value.account=r),placeholder:"请输入账号",onKeydown:o[1]||(o[1]=m(r=>p.value.focus(),["enter"]))},{prefix:t(()=>[e(f,null,{default:t(()=>[e(k)]),_:1})]),_:1},8,["modelValue"])]),_:1}),e(c,null,{default:t(()=>[e(i,{ref_key:"pwdRef",ref:p,modelValue:n.value.password,"onUpdate:modelValue":o[2]||(o[2]=r=>n.value.password=r),type:"password",placeholder:"请输入密码","show-password":"",onKeydown:m(_,["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:_},{default:t(()=>[B("登录")]),_:1})]),_:1})]),_:1})])])}}},$=I(A,[["__scopeId","data-v-f9ff2ce9"]]);export{$ as default};
+import{A as U,_ as I,u as R,r as u,o as S,b as s,c as b,h as L,e as v,f as e,w as t,p as m,g as B,y as C,z as E,D as K,E as w}from"./index-DHeiRjQX.js";function N(a){return U.post("/login/account",a)}const M=a=>(C("data-v-f9ff2ce9"),a=a(),E(),a),T={class:"body"},q={class:"login"},z=M(()=>v("div",{class:"title"},"里海收银系统 - 登录",-1)),A={__name:"index",setup(a){const d=R(),y=K(),h=u(null),p=u(null),n=u({account:"",password:"",terminal:1}),_=()=>{if(!n.value.account)return w({message:"请填写账号",type:"error"});if(!n.value.password)return w({message:"请填写密码",type:"error"});N(n.value).then(l=>{var o;(o=l.data)!=null&&o.token&&(d.setToken(l.data.token),d.setUserInfo(l.data),y.push("/"))}).catch(l=>{})};return S(()=>{}),(l,o)=>{const k=s("User"),f=s("el-icon"),i=s("el-input"),c=s("el-form-item"),g=s("Lock"),x=s("el-button"),V=s("el-form");return b(),L("div",T,[v("div",q,[z,e(V,null,{default:t(()=>[e(c,null,{default:t(()=>[e(i,{ref_key:"accRef",ref:h,modelValue:n.value.account,"onUpdate:modelValue":o[0]||(o[0]=r=>n.value.account=r),placeholder:"请输入账号",onKeydown:o[1]||(o[1]=m(r=>p.value.focus(),["enter"]))},{prefix:t(()=>[e(f,null,{default:t(()=>[e(k)]),_:1})]),_:1},8,["modelValue"])]),_:1}),e(c,null,{default:t(()=>[e(i,{ref_key:"pwdRef",ref:p,modelValue:n.value.password,"onUpdate:modelValue":o[2]||(o[2]=r=>n.value.password=r),type:"password",placeholder:"请输入密码","show-password":"",onKeydown:m(_,["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:_},{default:t(()=>[B("登录")]),_:1})]),_:1})]),_:1})])])}}},$=I(A,[["__scopeId","data-v-f9ff2ce9"]]);export{$ as default};

build/assets/index-B6AQZ00J.css

@@ -0,0 +1 @@
+@charset "UTF-8";.my-order[data-v-ede11fac]{border-radius:1.2rem;height:100%;background-color:#fff;width:30rem;position:relative;overflow:hidden}.my-order .header-nav[data-v-ede11fac]{display:flex;flex-direction:column;justify-content:space-between;padding:1rem;height:3.5rem}.my-order .header-nav span[data-v-ede11fac]{color:#ff4a00}.my-order .header-nav .nav-item[data-v-ede11fac]{font-weight:700}.my-order .header-nav .nav-item-btn[data-v-ede11fac]{display:flex;justify-content:space-between;align-items:center}.my-order .header-input[data-v-ede11fac]{padding:1rem;padding-top:0;height:2.5rem;border-bottom:.0625rem solid #eee}.my-order .order-lists[data-v-ede11fac]{height:calc(100vh - 16.45rem);overflow-y:auto}.my-order .order-lists .item[data-v-ede11fac]{padding:1rem;border-bottom:.0625rem solid #eee}.my-order .order-lists .item .top[data-v-ede11fac]{display:flex;justify-content:space-between;align-items:flex-end}.my-order .order-lists .item .top .sn[data-v-ede11fac]{font-weight:700;font-size:.9rem}.my-order .order-lists .item .top .cahier[data-v-ede11fac]:before{content:"平台";font-weight:400;font-size:.7rem;padding:.1rem;margin-right:.2rem;border:.0625rem solid #2ec479;color:#2ec479;border-radius:.187rem}.my-order .order-lists .item .top .cahier2[data-v-ede11fac]:before{content:"平台";font-weight:400;font-size:.7rem;padding:.1rem;margin-right:.2rem;border:.0625rem solid #ff4a00;color:#ff4a00;border-radius:.187rem}.my-order .order-lists .item .top .create-time[data-v-ede11fac]{font-size:.8rem}.my-order .order-lists .item .shop[data-v-ede11fac]{display:flex;justify-content:space-between}.my-order .order-lists .item .shop .right[data-v-ede11fac]{flex-shrink:0;display:flex;flex-direction:column;justify-content:center}.my-order .order-lists .item .shop .right .money[data-v-ede11fac]{font-size:1rem;color:#ff4a00;font-weight:700}.my-order .order-lists .item .shop .right .count[data-v-ede11fac]{font-size:.7rem;color:#999}.my-order .order-lists .item .shop .left[data-v-ede11fac]{height:4.5rem;display:flex;align-items:center}.my-order .order-lists .item .shop .left .shop-img[data-v-ede11fac]{width:3.5rem;height:3.5rem;border-radius:.3rem;margin-right:.4rem}.my-order .order-lists .item .shop .left .shop-name[data-v-ede11fac]{font-size:.9rem;color:#333;display:-webkit-box;-webkit-box-orient:vertical;overflow:hidden;-webkit-line-clamp:3}.my-order .order-lists .item .bottom[data-v-ede11fac]{display:flex;justify-content:space-between;font-size:.9rem;color:#777}.my-order .order-lists .item .bottom .manage-btn[data-v-ede11fac]{color:#fff;background-color:#e6a23c;border-radius:.2rem;padding:0 .2rem;margin-left:.5rem}.my-order .order-lists .item-active[data-v-ede11fac]{background-color:#efefef}.my-order .load-end[data-v-ede11fac]{text-align:center;padding:1rem;color:#333;font-size:.8rem}.my-order[data-v-4a81916c]{border-radius:1.2rem;height:100%;flex:1;background-color:#fff;position:relative;overflow:hidden}.my-order .detail[data-v-4a81916c]{height:calc(100vh - 10.25rem);box-sizing:border-box;position:relative}.my-order .detail .table[data-v-4a81916c]{padding:1rem 1rem 6rem;overflow-y:auto;height:100%}.my-order .detail .table .table-title[data-v-4a81916c]{font-weight:700}.my-order .detail .table .table-info[data-v-4a81916c]{display:flex;flex-wrap:wrap;color:#777;font-size:.9rem;padding-bottom:1rem;margin-bottom:1rem;border-bottom:.0625rem solid #eee}.my-order .detail .table .table-info[data-v-4a81916c]:last-child{border-bottom:none}.my-order .detail .table .table-info .info-item[data-v-4a81916c]{width:33%;display:flex;padding-top:1rem}.my-order .detail .table .table-info .info-item .info-item-title[data-v-4a81916c]{flex-shrink:0;padding-right:1rem}.my-card{display:flex}::-webkit-scrollbar{width:.315rem}::-webkit-scrollbar-track{background-color:#f1f1f1}::-webkit-scrollbar-thumb{background-color:#ccc;border-radius:.315rem}::-webkit-scrollbar-thumb:hover{background-color:#999}

build/assets/index-BVJbm-Wd.js

@@ -1 +1 @@
-import{b as t,c,h as a,e,f as o,w as d,g as l}from"./index-D_1OygAr.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-DHeiRjQX.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};

build/assets/index-BnPZfNXe.css

@@ -1 +0,0 @@
-@charset "UTF-8";.my-order[data-v-5dff8507]{border-radius:1.2rem;height:100%;background-color:#fff;width:30rem;position:relative;overflow:hidden}.my-order .header-nav[data-v-5dff8507]{display:flex;flex-direction:column;justify-content:space-between;padding:1rem;height:3.5rem}.my-order .header-nav span[data-v-5dff8507]{color:#ff4a00}.my-order .header-nav .nav-item[data-v-5dff8507]{font-weight:700}.my-order .header-nav .nav-item-btn[data-v-5dff8507]{display:flex;justify-content:space-between;align-items:center}.my-order .header-input[data-v-5dff8507]{padding:1rem;padding-top:0;height:2.5rem;border-bottom:.0625rem solid #eee}.my-order .order-lists[data-v-5dff8507]{height:calc(100vh - 16.45rem);overflow-y:auto}.my-order .order-lists .item[data-v-5dff8507]{padding:1rem;border-bottom:.0625rem solid #eee}.my-order .order-lists .item .top[data-v-5dff8507]{display:flex;justify-content:space-between;align-items:flex-end}.my-order .order-lists .item .top .sn[data-v-5dff8507]{font-weight:700;font-size:.9rem}.my-order .order-lists .item .top .cahier[data-v-5dff8507]:before{content:"收银";font-weight:400;font-size:.7rem;padding:.1rem;margin-right:.2rem;border:.0625rem solid #2ec479;color:#2ec479;border-radius:.187rem}.my-order .order-lists .item .top .cahier2[data-v-5dff8507]:before{content:"平台";font-weight:400;font-size:.7rem;padding:.1rem;margin-right:.2rem;border:.0625rem solid #ff4a00;color:#ff4a00;border-radius:.187rem}.my-order .order-lists .item .top .create-time[data-v-5dff8507]{font-size:.8rem}.my-order .order-lists .item .shop[data-v-5dff8507]{display:flex;justify-content:space-between}.my-order .order-lists .item .shop .right[data-v-5dff8507]{flex-shrink:0;display:flex;flex-direction:column;justify-content:center}.my-order .order-lists .item .shop .right .money[data-v-5dff8507]{font-size:1rem;color:#ff4a00;font-weight:700}.my-order .order-lists .item .shop .right .count[data-v-5dff8507]{font-size:.7rem;color:#999}.my-order .order-lists .item .shop .left[data-v-5dff8507]{height:4.5rem;display:flex;align-items:center}.my-order .order-lists .item .shop .left .shop-img[data-v-5dff8507]{width:3.5rem;height:3.5rem;border-radius:.3rem;margin-right:.4rem}.my-order .order-lists .item .shop .left .shop-name[data-v-5dff8507]{font-size:.9rem;color:#333;display:-webkit-box;-webkit-box-orient:vertical;overflow:hidden;-webkit-line-clamp:3}.my-order .order-lists .item .bottom[data-v-5dff8507]{display:flex;justify-content:space-between;font-size:.9rem;color:#777}.my-order .order-lists .item .bottom .manage-btn[data-v-5dff8507]{color:#fff;background-color:#e6a23c;border-radius:.2rem;padding:0 .2rem;margin-left:.5rem}.my-order .order-lists .item-active[data-v-5dff8507]{background-color:#efefef}.my-order .load-end[data-v-5dff8507]{text-align:center;padding:1rem;color:#333;font-size:.8rem}.my-order[data-v-870cbbd4]{border-radius:1.2rem;height:100%;flex:1;background-color:#fff;position:relative;overflow:hidden}.my-order .detail[data-v-870cbbd4]{height:100%;box-sizing:border-box;position:relative}.my-order .detail .table[data-v-870cbbd4]{padding:1rem 1rem 6rem;overflow-y:auto;height:100%}.my-order .detail .table .table-title[data-v-870cbbd4]{font-weight:700}.my-order .detail .table .table-info[data-v-870cbbd4]{display:flex;flex-wrap:wrap;color:#777;font-size:.9rem;padding-bottom:1rem;margin-bottom:1rem;border-bottom:.0625rem solid #eee}.my-order .detail .table .table-info[data-v-870cbbd4]:last-child{border-bottom:none}.my-order .detail .table .table-info .info-item[data-v-870cbbd4]{width:33%;display:flex;padding-top:1rem}.my-order .detail .table .table-info .info-item .info-item-title[data-v-870cbbd4]{flex-shrink:0;padding-right:1rem}.my-order .detail .footer[data-v-870cbbd4]{position:absolute;bottom:0;left:0;width:100%;height:6rem;box-sizing:border-box;background-color:#fff;display:flex;justify-content:flex-end;align-items:center;padding:0 2rem;border-top:.0625rem solid #eee}.my-card{display:flex}::-webkit-scrollbar{width:.315rem}::-webkit-scrollbar-track{background-color:#f1f1f1}::-webkit-scrollbar-thumb{background-color:#ccc;border-radius:.315rem}::-webkit-scrollbar-thumb:hover{background-color:#999}

build/assets/index-CIMQCAdc.css

@@ -0,0 +1 @@
+@charset "UTF-8";.my-order[data-v-4002e8c0]{border-radius:1.2rem;height:100%;background-color:#fff;width:30rem;position:relative;overflow:hidden}.my-order .header-nav[data-v-4002e8c0]{display:flex;flex-direction:column;justify-content:space-between;padding:1rem;height:3.5rem}.my-order .header-nav span[data-v-4002e8c0]{color:#ff4a00}.my-order .header-nav .nav-item[data-v-4002e8c0]{font-weight:700}.my-order .header-nav .nav-item-btn[data-v-4002e8c0]{display:flex;justify-content:space-between;align-items:center}.my-order .header-input[data-v-4002e8c0]{padding:1rem;padding-top:0;height:2.5rem;border-bottom:.0625rem solid #eee}.my-order .order-lists[data-v-4002e8c0]{height:calc(100vh - 16.45rem);overflow-y:auto}.my-order .order-lists .item[data-v-4002e8c0]{padding:1rem;border-bottom:.0625rem solid #eee}.my-order .order-lists .item .top[data-v-4002e8c0]{display:flex;justify-content:space-between;align-items:flex-end}.my-order .order-lists .item .top .sn[data-v-4002e8c0]{font-weight:700;font-size:.9rem}.my-order .order-lists .item .top .cahier[data-v-4002e8c0]:before{content:"收银";font-weight:400;font-size:.7rem;padding:.1rem;margin-right:.2rem;border:.0625rem solid #2ec479;color:#2ec479;border-radius:.187rem}.my-order .order-lists .item .top .cahier2[data-v-4002e8c0]:before{content:"平台";font-weight:400;font-size:.7rem;padding:.1rem;margin-right:.2rem;border:.0625rem solid #ff4a00;color:#ff4a00;border-radius:.187rem}.my-order .order-lists .item .top .create-time[data-v-4002e8c0]{font-size:.8rem}.my-order .order-lists .item .shop[data-v-4002e8c0]{display:flex;justify-content:space-between}.my-order .order-lists .item .shop .right[data-v-4002e8c0]{flex-shrink:0;display:flex;flex-direction:column;justify-content:center}.my-order .order-lists .item .shop .right .money[data-v-4002e8c0]{font-size:1rem;color:#ff4a00;font-weight:700}.my-order .order-lists .item .shop .right .count[data-v-4002e8c0]{font-size:.7rem;color:#999}.my-order .order-lists .item .shop .left[data-v-4002e8c0]{height:4.5rem;display:flex;align-items:center}.my-order .order-lists .item .shop .left .shop-img[data-v-4002e8c0]{width:3.5rem;height:3.5rem;border-radius:.3rem;margin-right:.4rem}.my-order .order-lists .item .shop .left .shop-name[data-v-4002e8c0]{font-size:.9rem;color:#333;display:-webkit-box;-webkit-box-orient:vertical;overflow:hidden;-webkit-line-clamp:3}.my-order .order-lists .item .bottom[data-v-4002e8c0]{display:flex;justify-content:space-between;font-size:.9rem;color:#777}.my-order .order-lists .item .bottom .manage-btn[data-v-4002e8c0]{color:#fff;background-color:#e6a23c;border-radius:.2rem;padding:0 .2rem;margin-left:.5rem}.my-order .order-lists .item-active[data-v-4002e8c0]{background-color:#efefef}.my-order .load-end[data-v-4002e8c0]{text-align:center;padding:1rem;color:#333;font-size:.8rem}.my-order[data-v-f20a49e0]{border-radius:1.2rem;height:100%;flex:1;background-color:#fff;position:relative;overflow:hidden}.my-order .detail[data-v-f20a49e0]{height:100%;box-sizing:border-box;position:relative}.my-order .detail .table[data-v-f20a49e0]{padding:1rem 1rem 6rem;overflow-y:auto;height:100%}.my-order .detail .table .table-title[data-v-f20a49e0]{font-weight:700}.my-order .detail .table .table-info[data-v-f20a49e0]{display:flex;flex-wrap:wrap;color:#777;font-size:.9rem;padding-bottom:1rem;margin-bottom:1rem;border-bottom:.0625rem solid #eee}.my-order .detail .table .table-info[data-v-f20a49e0]:last-child{border-bottom:none}.my-order .detail .table .table-info .info-item[data-v-f20a49e0]{width:33%;display:flex;padding-top:1rem}.my-order .detail .table .table-info .info-item .info-item-title[data-v-f20a49e0]{flex-shrink:0;padding-right:1rem}.my-order .detail .footer[data-v-f20a49e0]{position:absolute;bottom:0;left:0;width:100%;height:6rem;box-sizing:border-box;background-color:#fff;display:flex;justify-content:flex-end;align-items:center;padding:0 2rem;border-top:.0625rem solid #eee}.my-card{display:flex}::-webkit-scrollbar{width:.315rem}::-webkit-scrollbar-track{background-color:#f1f1f1}::-webkit-scrollbar-thumb{background-color:#ccc;border-radius:.315rem}::-webkit-scrollbar-thumb:hover{background-color:#999}

build/assets/index-Dd9dkOgL.css

@@ -1 +0,0 @@
-@charset "UTF-8";.my-order[data-v-7c238eef]{border-radius:1.2rem;height:100%;background-color:#fff;width:30rem;position:relative;overflow:hidden}.my-order .header-nav[data-v-7c238eef]{display:flex;flex-direction:column;justify-content:space-between;padding:1rem;height:3.5rem}.my-order .header-nav span[data-v-7c238eef]{color:#ff4a00}.my-order .header-nav .nav-item[data-v-7c238eef]{font-weight:700}.my-order .header-nav .nav-item-btn[data-v-7c238eef]{display:flex;justify-content:space-between;align-items:center}.my-order .header-input[data-v-7c238eef]{padding:1rem;padding-top:0;height:2.5rem;border-bottom:.0625rem solid #eee}.my-order .order-lists[data-v-7c238eef]{height:calc(100vh - 16.45rem);overflow-y:auto}.my-order .order-lists .item[data-v-7c238eef]{padding:1rem;border-bottom:.0625rem solid #eee}.my-order .order-lists .item .top[data-v-7c238eef]{display:flex;justify-content:space-between;align-items:flex-end}.my-order .order-lists .item .top .sn[data-v-7c238eef]{font-weight:700;font-size:.9rem}.my-order .order-lists .item .top .cahier[data-v-7c238eef]:before{content:"平台";font-weight:400;font-size:.7rem;padding:.1rem;margin-right:.2rem;border:.0625rem solid #2ec479;color:#2ec479;border-radius:.187rem}.my-order .order-lists .item .top .cahier2[data-v-7c238eef]:before{content:"平台";font-weight:400;font-size:.7rem;padding:.1rem;margin-right:.2rem;border:.0625rem solid #ff4a00;color:#ff4a00;border-radius:.187rem}.my-order .order-lists .item .top .create-time[data-v-7c238eef]{font-size:.8rem}.my-order .order-lists .item .shop[data-v-7c238eef]{display:flex;justify-content:space-between}.my-order .order-lists .item .shop .right[data-v-7c238eef]{flex-shrink:0;display:flex;flex-direction:column;justify-content:center}.my-order .order-lists .item .shop .right .money[data-v-7c238eef]{font-size:1rem;color:#ff4a00;font-weight:700}.my-order .order-lists .item .shop .right .count[data-v-7c238eef]{font-size:.7rem;color:#999}.my-order .order-lists .item .shop .left[data-v-7c238eef]{height:4.5rem;display:flex;align-items:center}.my-order .order-lists .item .shop .left .shop-img[data-v-7c238eef]{width:3.5rem;height:3.5rem;border-radius:.3rem;margin-right:.4rem}.my-order .order-lists .item .shop .left .shop-name[data-v-7c238eef]{font-size:.9rem;color:#333;display:-webkit-box;-webkit-box-orient:vertical;overflow:hidden;-webkit-line-clamp:3}.my-order .order-lists .item .bottom[data-v-7c238eef]{display:flex;justify-content:space-between;font-size:.9rem;color:#777}.my-order .order-lists .item .bottom .manage-btn[data-v-7c238eef]{color:#fff;background-color:#e6a23c;border-radius:.2rem;padding:0 .2rem;margin-left:.5rem}.my-order .order-lists .item-active[data-v-7c238eef]{background-color:#efefef}.my-order .load-end[data-v-7c238eef]{text-align:center;padding:1rem;color:#333;font-size:.8rem}.my-order[data-v-fbbcbf15]{border-radius:1.2rem;height:100%;flex:1;background-color:#fff;position:relative;overflow:hidden}.my-order .detail[data-v-fbbcbf15]{height:calc(100vh - 10.25rem);box-sizing:border-box;position:relative}.my-order .detail .table[data-v-fbbcbf15]{padding:1rem 1rem 6rem;overflow-y:auto;height:100%}.my-order .detail .table .table-title[data-v-fbbcbf15]{font-weight:700}.my-order .detail .table .table-info[data-v-fbbcbf15]{display:flex;flex-wrap:wrap;color:#777;font-size:.9rem;padding-bottom:1rem;margin-bottom:1rem;border-bottom:.0625rem solid #eee}.my-order .detail .table .table-info[data-v-fbbcbf15]:last-child{border-bottom:none}.my-order .detail .table .table-info .info-item[data-v-fbbcbf15]{width:33%;display:flex;padding-top:1rem}.my-order .detail .table .table-info .info-item .info-item-title[data-v-fbbcbf15]{flex-shrink:0;padding-right:1rem}.my-card{display:flex}::-webkit-scrollbar{width:.315rem}::-webkit-scrollbar-track{background-color:#f1f1f1}::-webkit-scrollbar-thumb{background-color:#ccc;border-radius:.315rem}::-webkit-scrollbar-thumb:hover{background-color:#999}

build/assets/index-iYPaIwEX.css

@@ -1 +1 @@
-@charset "UTF-8";.my-order[data-v-c1565278]{border-radius:1.2rem;height:100%;background-color:#fff;width:30rem;position:relative;overflow:hidden}.my-order .header-nav[data-v-c1565278]{display:flex;justify-content:space-between;padding:1rem;height:1.5rem}.my-order .header-nav span[data-v-c1565278]{color:#ff4a00}.my-order .header-nav .nav-item-clear[data-v-c1565278]{display:flex;align-items:center;font-size:.8rem;cursor:pointer}.my-order .header-input[data-v-c1565278]{padding:1rem;padding-top:0;height:2.5rem;border-bottom:.0625rem solid #eee}.my-order .order-lists[data-v-c1565278]{height:calc(100vh - 16.45rem);overflow-y:auto}.my-order .order-lists .item[data-v-c1565278]{padding:1rem;border-bottom:.0625rem solid #eee}.my-order .order-lists .item .top[data-v-c1565278]{display:flex;justify-content:space-between;align-items:flex-end}.my-order .order-lists .item .top .sn[data-v-c1565278]{font-weight:700;font-size:.9rem}.my-order .order-lists .item .top .cahier[data-v-c1565278]:before{content:"收银";font-weight:400;font-size:.7rem;padding:.1rem;margin-right:.2rem;border:.0625rem solid #2ec479;color:#2ec479;border-radius:.187rem}.my-order .order-lists .item .top .cahier2[data-v-c1565278]:before{content:"平台";font-weight:400;font-size:.7rem;padding:.1rem;margin-right:.2rem;border:.0625rem solid #ff4a00;color:#ff4a00;border-radius:.187rem}.my-order .order-lists .item .top .create-time[data-v-c1565278]{font-size:.8rem}.my-order .order-lists .item .shop[data-v-c1565278]{display:flex;justify-content:space-between}.my-order .order-lists .item .shop .right[data-v-c1565278]{flex-shrink:0;display:flex;flex-direction:column;justify-content:center}.my-order .order-lists .item .shop .right .money[data-v-c1565278]{font-size:1rem;color:#ff4a00;font-weight:700}.my-order .order-lists .item .shop .right .count[data-v-c1565278]{font-size:.7rem;color:#999}.my-order .order-lists .item .shop .left[data-v-c1565278]{height:4.5rem;display:flex;align-items:center}.my-order .order-lists .item .shop .left .shop-img[data-v-c1565278]{width:3.5rem;height:3.5rem;border-radius:.3rem;margin-right:.4rem}.my-order .order-lists .item .shop .left .shop-name[data-v-c1565278]{font-size:.9rem;color:#333;display:-webkit-box;-webkit-box-orient:vertical;overflow:hidden;-webkit-line-clamp:3}.my-order .order-lists .item .bottom[data-v-c1565278]{display:flex;justify-content:space-between;font-size:.9rem;color:#777}.my-order .order-lists .item .bottom .manage-btn[data-v-c1565278]{color:#fff;background-color:#e6a23c;border-radius:.2rem;padding:0 .2rem;margin-left:.5rem}.my-order .order-lists .item-active[data-v-c1565278]{background-color:#efefef}.my-order .load-end[data-v-c1565278]{text-align:center;padding:1rem;color:#333;font-size:.8rem}.my-order[data-v-13a64fee]{border-radius:1.2rem;height:100%;flex:1;background-color:#fff;position:relative;overflow:hidden}.my-order .detail[data-v-13a64fee]{height:100%;box-sizing:border-box;position:relative}.my-order .detail .table[data-v-13a64fee]{padding:1rem 1rem 6rem;overflow-y:auto;height:100%}.my-order .detail .table .table-title[data-v-13a64fee]{font-weight:700}.my-order .detail .table .table-info[data-v-13a64fee]{display:flex;flex-wrap:wrap;color:#777;font-size:.9rem;padding-bottom:1rem;margin-bottom:1rem;border-bottom:.0625rem solid #eee}.my-order .detail .table .table-info[data-v-13a64fee]:last-child{border-bottom:none}.my-order .detail .table .table-info .info-item[data-v-13a64fee]{width:33%;display:flex;padding-top:1rem}.my-order .detail .table .table-info .info-item .info-item-title[data-v-13a64fee]{flex-shrink:0;padding-right:1rem}.my-order .detail .footer[data-v-13a64fee]{position:absolute;bottom:0;left:0;width:100%;height:6rem;box-sizing:border-box;background-color:#fff;display:flex;justify-content:flex-end;align-items:center;padding:0 2rem;border-top:.0625rem solid #eee}.my-card{display:flex}.my-card .my-code{height:70%;width:100%;display:flex;flex-direction:column;justify-content:center;align-items:center}.my-card .my-code .box{width:38rem;position:relative}.my-card .my-code .box .input{width:100%;height:3rem;box-sizing:border-box;border-radius:4rem;border:.0625rem solid #1890ff;padding:0 1rem;font-size:1.1rem}.my-card .my-code .box .input:focus{outline:none;box-shadow:0 0 .31rem #1890ff;transition:all .2s ease-in-out}.my-card .my-code .box .btn{position:absolute;right:0;top:0;width:5rem;height:100%;border-radius:0 4rem 4rem 0;background:#1890ff;color:#fff;display:flex;justify-content:center;align-items:center;cursor:pointer}::-webkit-scrollbar{width:.31rem}::-webkit-scrollbar-track{background-color:#f1f1f1}::-webkit-scrollbar-thumb{background-color:#ccc;border-radius:.31rem}::-webkit-scrollbar-thumb:hover{background-color:#999}
+@charset "UTF-8";.my-order[data-v-c1565278]{border-radius:1.2rem;height:100%;background-color:#fff;width:30rem;position:relative;overflow:hidden}.my-order .header-nav[data-v-c1565278]{display:flex;justify-content:space-between;padding:1rem;height:1.5rem}.my-order .header-nav span[data-v-c1565278]{color:#ff4a00}.my-order .header-nav .nav-item-clear[data-v-c1565278]{display:flex;align-items:center;font-size:.8rem;cursor:pointer}.my-order .header-input[data-v-c1565278]{padding:1rem;padding-top:0;height:2.5rem;border-bottom:.0625rem solid #eee}.my-order .order-lists[data-v-c1565278]{height:calc(100vh - 16.45rem);overflow-y:auto}.my-order .order-lists .item[data-v-c1565278]{padding:1rem;border-bottom:.0625rem solid #eee}.my-order .order-lists .item .top[data-v-c1565278]{display:flex;justify-content:space-between;align-items:flex-end}.my-order .order-lists .item .top .sn[data-v-c1565278]{font-weight:700;font-size:.9rem}.my-order .order-lists .item .top .cahier[data-v-c1565278]:before{content:"收银";font-weight:400;font-size:.7rem;padding:.1rem;margin-right:.2rem;border:.0625rem solid #2ec479;color:#2ec479;border-radius:.187rem}.my-order .order-lists .item .top .cahier2[data-v-c1565278]:before{content:"平台";font-weight:400;font-size:.7rem;padding:.1rem;margin-right:.2rem;border:.0625rem solid #ff4a00;color:#ff4a00;border-radius:.187rem}.my-order .order-lists .item .top .create-time[data-v-c1565278]{font-size:.8rem}.my-order .order-lists .item .shop[data-v-c1565278]{display:flex;justify-content:space-between}.my-order .order-lists .item .shop .right[data-v-c1565278]{flex-shrink:0;display:flex;flex-direction:column;justify-content:center}.my-order .order-lists .item .shop .right .money[data-v-c1565278]{font-size:1rem;color:#ff4a00;font-weight:700}.my-order .order-lists .item .shop .right .count[data-v-c1565278]{font-size:.7rem;color:#999}.my-order .order-lists .item .shop .left[data-v-c1565278]{height:4.5rem;display:flex;align-items:center}.my-order .order-lists .item .shop .left .shop-img[data-v-c1565278]{width:3.5rem;height:3.5rem;border-radius:.3rem;margin-right:.4rem}.my-order .order-lists .item .shop .left .shop-name[data-v-c1565278]{font-size:.9rem;color:#333;display:-webkit-box;-webkit-box-orient:vertical;overflow:hidden;-webkit-line-clamp:3}.my-order .order-lists .item .bottom[data-v-c1565278]{display:flex;justify-content:space-between;font-size:.9rem;color:#777}.my-order .order-lists .item .bottom .manage-btn[data-v-c1565278]{color:#fff;background-color:#e6a23c;border-radius:.2rem;padding:0 .2rem;margin-left:.5rem}.my-order .order-lists .item-active[data-v-c1565278]{background-color:#efefef}.my-order .load-end[data-v-c1565278]{text-align:center;padding:1rem;color:#333;font-size:.8rem}.my-order[data-v-76c1152d]{border-radius:1.2rem;height:100%;flex:1;background-color:#fff;position:relative;overflow:hidden}.my-order .detail[data-v-76c1152d]{height:100%;box-sizing:border-box;position:relative}.my-order .detail .table[data-v-76c1152d]{padding:1rem 1rem 6rem;overflow-y:auto;height:100%}.my-order .detail .table .table-title[data-v-76c1152d]{font-weight:700}.my-order .detail .table .table-info[data-v-76c1152d]{display:flex;flex-wrap:wrap;color:#777;font-size:.9rem;padding-bottom:1rem;margin-bottom:1rem;border-bottom:.0625rem solid #eee}.my-order .detail .table .table-info[data-v-76c1152d]:last-child{border-bottom:none}.my-order .detail .table .table-info .info-item[data-v-76c1152d]{width:33%;display:flex;padding-top:1rem}.my-order .detail .table .table-info .info-item .info-item-title[data-v-76c1152d]{flex-shrink:0;padding-right:1rem}.my-order .detail .footer[data-v-76c1152d]{position:absolute;bottom:0;left:0;width:100%;height:6rem;box-sizing:border-box;background-color:#fff;display:flex;justify-content:flex-end;align-items:center;padding:0 2rem;border-top:.0625rem solid #eee}.my-card{display:flex}.my-card .my-code{height:70%;width:100%;display:flex;flex-direction:column;justify-content:center;align-items:center}.my-card .my-code .box{width:38rem;position:relative}.my-card .my-code .box .input{width:100%;height:3rem;box-sizing:border-box;border-radius:4rem;border:.0625rem solid #1890ff;padding:0 1rem;font-size:1.1rem}.my-card .my-code .box .input:focus{outline:none;box-shadow:0 0 .31rem #1890ff;transition:all .2s ease-in-out}.my-card .my-code .box .btn{position:absolute;right:0;top:0;width:5rem;height:100%;border-radius:0 4rem 4rem 0;background:#1890ff;color:#fff;display:flex;justify-content:center;align-items:center;cursor:pointer}::-webkit-scrollbar{width:.31rem}::-webkit-scrollbar-track{background-color:#f1f1f1}::-webkit-scrollbar-thumb{background-color:#ccc;border-radius:.31rem}::-webkit-scrollbar-thumb:hover{background-color:#999}

build/assets/indexCount-CkFCB90o.js

@@ -1 +1 @@
-import{f as i}from"./merchant-D-hsYo3C.js";import{_ as d,r as a,b as s,l as p,v as m,c as u,h,e as v,f as e,w as f}from"./index-D_1OygAr.js";const b={"element-loading-text":"加载中",class:"my-order"},g={class:"table"},x={__name:"indexCount",setup(w){const o=a([]),n=a({page_no:1,page_size:15}),r=a(!1);return(()=>{i(n.value).then(l=>{o.value=l.data.lists})})(),(l,B)=>{const t=s("el-table-column"),c=s("el-table"),_=p("loading");return m((u(),h("div",b,[v("div",g,[e(c,{data:o.value,style:{width:"100%"}},{default:f(()=>[e(t,{prop:"record_date",label:"时间",width:"260"}),e(t,{prop:"cashier_cash_total_amount",label:"现金收银金额(元)"}),e(t,{prop:"cashier_total_amount",label:"线上收银金额(元)"}),e(t,{prop:"platofrm_total_amount",label:"平台订单金额(元)"}),e(t,{prop:"total_amount",label:"总金额(元)"})]),_:1},8,["data"])])])),[[_,r.value]])}}},y=d(x,[["__scopeId","data-v-d25755c6"]]);export{y as default};
+import{f as i}from"./merchant-DxVgBGiP.js";import{_ as d,r as a,b as s,l as p,v as m,c as u,h,e as v,f as e,w as f}from"./index-DHeiRjQX.js";const b={"element-loading-text":"加载中",class:"my-order"},g={class:"table"},x={__name:"indexCount",setup(w){const o=a([]),n=a({page_no:1,page_size:15}),r=a(!1);return(()=>{i(n.value).then(l=>{o.value=l.data.lists})})(),(l,B)=>{const t=s("el-table-column"),c=s("el-table"),_=p("loading");return m((u(),h("div",b,[v("div",g,[e(c,{data:o.value,style:{width:"100%"}},{default:f(()=>[e(t,{prop:"record_date",label:"时间",width:"260"}),e(t,{prop:"cashier_cash_total_amount",label:"现金收银金额(元)"}),e(t,{prop:"cashier_total_amount",label:"线上收银金额(元)"}),e(t,{prop:"platofrm_total_amount",label:"平台订单金额(元)"}),e(t,{prop:"total_amount",label:"总金额(元)"})]),_:1},8,["data"])])])),[[_,r.value]])}}},y=d(x,[["__scopeId","data-v-d25755c6"]]);export{y as default};

build/assets/merchant-DxVgBGiP.js

@@ -1 +1 @@
-import{A as a}from"./index-D_1OygAr.js";function i(){return a.get("/merchant/Merchant/amount_account")}function r(n){return a.get("/merchant/Merchant/taking_lists",{params:n})}function c(){return a.get("/merchant/Merchant/taking_info")}function e(n){return a.post("/merchant/Merchant/withdraw",n)}function o(n){return a.get("/financial/FinancialRecord/lists",{params:n})}function s(n){return a.get("/financial/FinancialRecord/api_lists",{params:n})}export{i as a,c as b,e as c,r as d,s as e,o as f};
+import{A as a}from"./index-DHeiRjQX.js";function i(){return a.get("/merchant/Merchant/amount_account")}function r(n){return a.get("/merchant/Merchant/taking_lists",{params:n})}function c(){return a.get("/merchant/Merchant/taking_info")}function e(n){return a.post("/merchant/Merchant/withdraw",n)}function o(n){return a.get("/financial/FinancialRecord/lists",{params:n})}function s(n){return a.get("/financial/FinancialRecord/api_lists",{params:n})}export{i as a,c as b,e as c,r as d,s as e,o as f};

build/assets/padding-CGeVIEC_.js

@@ -1 +1 @@
-import{_ as e,c as t,h as c}from"./index-D_1OygAr.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-DHeiRjQX.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};

build/assets/store-BKcq1Vfo.js

@@ -1 +1 @@
-import{A as e}from"./index-D_1OygAr.js";function s(r){return e.post("/cart/cart/create",r)}function a(r){return e.get("/cart/cart/list",{params:r})}function o(r){return e.post("/store_order/StoreOrder/checkOrder",r)}function i(r){return e.post("/cart/cart/delete",r)}function n(r){return e.post("/store_order/StoreOrder/createOrder",r)}function c(r){return e.post("/store_order/StoreOrder/pay",r)}function d(r){return e.get("/store_order/StoreOrder/lists",{params:r})}function u(r){return e.get("/order/cashierinfo/lists",{params:r})}function p(r){return e.get("/store_order/storeOrder/detail",{params:r})}function f(r){return e.post("/store_order/StoreOrder/writeoff_order",r)}function O(r){return e.post("/user/address/merchant_create",r)}function A(r){return e.get("/order/OpurchaseOrder/lists",{params:r})}function h(r){return e.get("/order/OpurchaseOrder/sub_orders",{params:r})}export{a,s as b,i as c,u as d,p as e,n as f,c as g,A as h,h as i,O as m,o,d as s,f as w};
+import{A as e}from"./index-DHeiRjQX.js";function s(r){return e.post("/cart/cart/create",r)}function a(r){return e.get("/cart/cart/list",{params:r})}function o(r){return e.post("/store_order/StoreOrder/checkOrder",r)}function i(r){return e.post("/cart/cart/delete",r)}function n(r){return e.post("/store_order/StoreOrder/createOrder",r)}function c(r){return e.post("/store_order/StoreOrder/pay",r)}function d(r){return e.get("/store_order/StoreOrder/lists",{params:r})}function u(r){return e.get("/order/cashierinfo/lists",{params:r})}function p(r){return e.get("/store_order/storeOrder/detail",{params:r})}function f(r){return e.post("/store_order/StoreOrder/writeoff_order",r)}function O(r){return e.post("/user/address/merchant_create",r)}function A(r){return e.get("/order/OpurchaseOrder/lists",{params:r})}function h(r){return e.get("/order/OpurchaseOrder/sub_orders",{params:r})}export{a,s as b,i as c,u as d,p as e,n as f,c as g,A as h,h as i,O as m,o,d as s,f as w};

build/index.html

@@ -56,8 +56,8 @@
         }
       }
     </style>
-    <script type="module" crossorigin src="./assets/index-D_1OygAr.js"></script>
+    <script type="module" crossorigin src="./assets/index-DHeiRjQX.js"></script>
-    <link rel="stylesheet" crossorigin href="./assets/index-CC6Kyg6-.css">
+    <link rel="stylesheet" crossorigin href="./assets/index-BUGaIO07.css">
   </head>
   <body>
     <div id="app"></div>

src/layout/index.vue

@@ -12,6 +12,7 @@ const connection = new Push({
   app_key: '2ce3ce22329517213caa7dad261f5695',
 });
 
+
 // 浏览器监听user-1
 const user_channel = connection.subscribe(`store_merchant_${userStore.userInfo.store_id}`);
 // const user_channel = connection.subscribe(`store_merchant_${1}`);
@@ -38,6 +39,10 @@ user_channel.on('close', function () {
   
 });
 
+// setTimeout(()=>{
+//     mitt.emit('new_order');
+// }, 2000)
+
 const KeyboardEvent = (e)=>{
   console.log('按下', e.keyCode);
   if(e.keyCode == 16) mitt.emit('shift');

src/layout/myAside.vue

@@ -35,12 +35,14 @@ const newOrder = (e) => {
         // 播放音频
         audio.play();
         isPlaying = true;
+        console.log('播放中');
         // 添加ended事件监听器来检测播放结束
         audio.addEventListener('ended', function () {
             isPlaying = false;
         });
     } catch (error) {
-        console.error(error)
+        console.error(error);
+        isPlaying = false;
     }
 };
 

src/views/convert/component/detail.vue

@@ -187,11 +187,12 @@ onUnmounted(() => {
                     <div class="info-item">
                         <div class="info-item-title">支付方式:</div>
                         <div class="info-item-info">
-                            <span v-if="formData.pay_type == 9">微信收款</span>
+                            <span v-if="formData.pay_type_name">{{ formData.pay_type_name }}</span>
-                            <span v-if="formData.pay_type == 17">现金支付</span>
+                            <span v-else-if="formData.pay_type == 9">微信收款</span>
-                            <span v-if="formData.pay_type == 13">支付宝收款</span>
+                            <span v-else-if="formData.pay_type == 17">现金支付</span>
-                            <span v-if="formData.pay_type == 3">余额支付</span>
+                            <span v-else-if="formData.pay_type == 13">支付宝收款</span>
-                            <span v-if="formData.pay_type == 1">微信支付</span>
+                            <span v-else-if="formData.pay_type == 3">余额支付</span>
+                            <span v-else-if="formData.pay_type == 1">微信支付</span>
                         </div>
                     </div>
                 </div>
@@ -210,7 +211,7 @@ onUnmounted(() => {
                     </el-table-column>
                     <el-table-column prop="cart_info.price" label="单价" width="150" />
                     <el-table-column prop="cart_info.cart_num" label="数量" width="150" />
-                    <el-table-column prop="cart_info.total" label="总价" width="150">
+                    <el-table-column prop="cart_info.total_price" label="总价" width="150">
                     </el-table-column>
                 </el-table>
             </div>

src/views/order/component/detail.vue

@@ -141,14 +141,8 @@ onUnmounted(() => {
 <template>
     <div class="my-order">
         <div class="detail" v-if="formData.id" v-loading="loading">
-      <div
+            <div class="table" v-infinite-scroll="getOrderList" :infinite-scroll-distance="300"
-        class="table"
+                :infinite-scroll-delay="300" style="overflow: auto" :infinite-scroll-immediate="false">
-        v-infinite-scroll="getOrderList"
-        :infinite-scroll-distance="300"
-        :infinite-scroll-delay="300"
-        style="overflow: auto"
-        :infinite-scroll-immediate="false"
-      >
                 <div class="table-title">订单信息</div>
                 <div class="table-info">
                     <div class="info-item">
@@ -182,11 +176,12 @@ onUnmounted(() => {
                     <div class="info-item">
                         <div class="info-item-title">支付方式:</div>
                         <div class="info-item-info">
-                <span v-if="formData.pay_type == 9">微信收款</span>
+                            <span v-if="formData.pay_type_name">{{ formData.pay_type_name }}</span>
-                            <span v-if="formData.pay_type == 17">现金支付</span>
+                            <span v-else-if="formData.pay_type == 9">微信收款</span>
-                            <span v-if="formData.pay_type == 13">支付宝收款</span>
+                            <span v-else-if="formData.pay_type == 17">现金支付</span>
-                            <span v-if="formData.pay_type == 3">余额支付</span>
+                            <span v-else-if="formData.pay_type == 13">支付宝收款</span>
-                            <span v-if="formData.pay_type == 1">微信支付</span>
+                            <span v-else-if="formData.pay_type == 3">余额支付</span>
+                            <span v-else-if="formData.pay_type == 1">微信支付</span>
                         </div>
                     </div>
                 </div>
@@ -198,17 +193,14 @@ onUnmounted(() => {
                     <el-table-column label="商品信息">
                         <template #default="{ row }">
                             <div style="display: flex; align-items: center">
-                <el-image
+                                <el-image style="height: 3rem; width: 3rem" :src="row.cart_info?.image"></el-image>
-                  style="height: 3rem; width: 3rem"
-                  :src="row.cart_info?.image"
-                ></el-image>
                                 <span style="margin-left: 0.5rem">{{ row.cart_info?.name }}</span>
                             </div>
                         </template>
                     </el-table-column>
                     <el-table-column prop="cart_info.price" label="单价" width="150" />
                     <el-table-column prop="cart_info.cart_num" label="数量" width="150" />
-          <el-table-column prop="cart_info.total" label="总价" width="150">
+                    <el-table-column prop="cart_info.total_price" label="总价" width="150">
                     </el-table-column>
                 </el-table>
             </div>
@@ -242,6 +234,7 @@ onUnmounted(() => {
             .table-title {
                 font-weight: bold;
             }
+
             .table-info {
                 display: flex;
                 flex-wrap: wrap;
@@ -259,6 +252,7 @@ onUnmounted(() => {
                     width: 33%;
                     display: flex;
                     padding-top: 1rem;
+
                     .info-item-title {
                         flex-shrink: 0;
                         padding-right: 1rem;

src/views/order/component/order.vue

@@ -75,10 +75,10 @@ const getOrderList = (reload = false) => {
         .then((res) => {
             if (reload) orderList.value = res.data.lists;
             else orderList.value = [...orderList.value, ...res.data.lists];
+            if (where.value.page_no == 1 && orderList.value.length > 0) mitt.emit("set-sale-order-detail", orderList.value[0]);
             if (res.data.lists.length < where.value.page_size) loadEnd.value = true;
             else where.value.page_no++;
             activeStore.value = 0;
-            mitt.emit("set-sale-order-detail", orderList.value[0]);
             total.value = res.data.count;
             loading.value = false;
         })
@@ -93,14 +93,20 @@ const setForm = (item, index) => {
     mitt.emit("set-sale-order-detail", item);
 };
 
+const dialogVisible = ref(false);
+
 onMounted(() => {
     mitt.on("update-sale-order-detail", (item) => {
         console.log("===");
         orderList.value[activeStore.value].paid = 1;
     });
+    mitt.on("new_order", ()=>{
+        if(!dialogVisible.value) dialogVisible.value = true;
+    });
 });
 onUnmounted(() => {
     mitt.off("update-sale-order-detail");
+    mitt.off("new_order");
 })
 </script>
 
@@ -117,8 +123,7 @@ onUnmounted(() => {
                 </el-radio-group>
                 <el-date-picker v-model="date" type="daterange" start-placeholder="开始时间" end-placeholder="结束时间"
                     size="small" value-format="YYYY/MM/DD" :disabled-date="disabledDate" @change="changeDate"
-          :clearable="false"
+                    :clearable="false" style="width: 14rem; margin-left: 1rem" />
-                    style="width: 14rem; margin-left: 1rem" />
             </div>
         </div>
         <div class="header-input">
@@ -176,6 +181,17 @@ onUnmounted(() => {
             <div v-if="loadEnd" class="load-end">没有更多了</div>
             <div v-if="loading" class="load-end">加载中...</div>
         </div>
+        <el-dialog v-model="dialogVisible" title="新订单提醒" width="500">
+            <span>您有新订单了, 是否立即刷新</span>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button @click="dialogVisible = false">稍后刷新</el-button>
+                    <el-button type="primary" @click="getOrderList(true);dialogVisible = false;">
+                        立即刷新
+                    </el-button>
+                </div>
+            </template>
+        </el-dialog>
     </div>
 </template>
 

src/views/saleOrder/component/detail.vue

@@ -191,11 +191,12 @@ onUnmounted(() => {
                     <div class="info-item">
                         <div class="info-item-title">支付方式:</div>
                         <div class="info-item-info">
-                            <span v-if="formData.pay_type == 9">微信收款</span>
+                            <span v-if="formData.pay_type_name">{{ formData.pay_type_name }}</span>
-                            <span v-if="formData.pay_type == 17">现金支付</span>
+                            <span v-else-if="formData.pay_type == 9">微信收款</span>
-                            <span v-if="formData.pay_type == 13">支付宝收款</span>
+                            <span v-else-if="formData.pay_type == 17">现金支付</span>
-                            <span v-if="formData.pay_type == 3">余额支付</span>
+                            <span v-else-if="formData.pay_type == 13">支付宝收款</span>
-                            <span v-if="formData.pay_type == 1">微信支付</span>
+                            <span v-else-if="formData.pay_type == 3">余额支付</span>
+                            <span v-else-if="formData.pay_type == 1">微信支付</span>
                         </div>
                     </div>
                 </div>
@@ -214,7 +215,7 @@ onUnmounted(() => {
                     </el-table-column>
                     <el-table-column prop="cart_info.price" label="单价" width="150" />
                     <el-table-column prop="cart_info.cart_num" label="数量" width="150" />
-                    <el-table-column prop="cart_info.total" label="总价" width="150">
+                    <el-table-column prop="cart_info.total_price" label="总价" width="150">
                     </el-table-column>
                 </el-table>
             </div>

src/views/saleOrder/component/order.vue

@@ -75,11 +75,11 @@ const getOrderList = (reload = false) => {
     .then((res) => {
       if (reload) orderList.value = res.data.lists;
       else orderList.value = [...orderList.value, ...res.data.lists];
+      if (where.value.page_no == 1 && orderList.value.length > 0) mitt.emit("set-sale-order-detail", orderList.value[0]);
       if (res.data.lists.length < where.value.page_size) loadEnd.value = true;
       else where.value.page_no++;
       activeStore.value = 0;
       console.log(where.value.page_no);
-      if(where.value.page_no == 1 && orderList.value.length > 0) mitt.emit("set-sale-order-detail", orderList.value[0]);
       total.value = res.data.count;
       loading.value = false;
     })