mirror of
https://gitee.com/niucloud-team/javashop.git
synced 2026-05-27 03:03:53 +00:00
Niucloud JAVA版框架1.1.0更新内容
新增
* 增加小程序展示线上版本号
* 发布小程序添加自定义版本号
* 添加后台取消小程序绑定微信公众平台授权
* 管理端核销功能
* 用户端导入微信地址功能
优化
* 装修页面时可自定义底部导航
* 小程序添加版权信息展示
* 应用菜单结构优化:取消独立营销菜单,统一在应用菜单下按分类
* 分页列表增加缓存,记录当前页信息,操作完成后,返回当前页
* 开启标签栏时对标签页面进行缓存
* 统一框架装修自定义使用底部导航数据结构
修复
* 删除表单报错
* admin首页点击未安装、已安装应用,页面跳转空白
* 修复插件云安装错误时同时显示安装失败和安装完成
商城1.0.5更新内容
新增
* 用户端添加订单开具发票功能
* 管理后台添加补开发票功能
优化
* 商品列表增加相关活动的关联展示
* 限时折扣、积分商城增加批量操作
* 积分商品,若有规格未参与积分活动,则无法购买
* 复制商品,提示语优化
修复
* 满减送活动赠品设置多件,只展示1件
* 满减送赠品未扣除库存问题
* 商品列表批量设置分类后商品分类查询不到商品的问题
* 商品标签状态已经关闭添加商品时依旧可以选择
* 商家地址库联系方式搜索无效
* 商品分类拖动排序无效
* 参与满减活动再使用优惠券,订单0元申请退款时,退款金额出现负数
* 积分商城规格值设置不参与积分兑换提交订单未拦截
* 虚拟商品核销码设置的永久有效,核销时提示商品已过期
* 订单满减送退款售后点击详情报错
* 按会员标签发放优惠券异常一直未发放
* 微信支付申请退款售后点击转账跳转404
* 订单列表输入会员编号、账号点击搜索筛选不出来内容
* 多商品组商品来源选择分组,只有一个商品分类时多商品组商品展示不正确
* 商品组件排序方式选择为价格时报错
* 图文导航选择积分商品报错
2 lines
9.3 KiB
JavaScript
2 lines
9.3 KiB
JavaScript
import{P as H,d as W,k as G,u as Z,r as k,q as A,bV as J,h as m,c as p,e as t,w as i,a as n,t as a,f as s,s as l,i as C,Z as K,F as V,W as Q,C as x,B as X,v as ee,a6 as te,bW as ae,aj as oe,M as se,a4 as le,a1 as ne,E as re,N as ie,a9 as de,ak as ce,al as me,ab as pe,a2 as _e,a3 as ue,p as he,g as be}from"./index-a2dd70e3.js";/* empty css *//* empty css *//* empty css *//* empty css *//* empty css *//* empty css *//* empty css *//* empty css *//* empty css *//* empty css *//* empty css */import"./el-tooltip-4ed993c7.js";/* empty css *//* empty css *//* empty css *//* empty css */import"./el-form-item-4ed993c7.js";/* empty css */import{g as fe,a as ge,b as xe}from"./order-416487bb.js";import{_ as ye}from"./_plugin-vue_export-helper-c27b6911.js";function ve(f){return H.get("shop_fenxiao/order",{params:f})}const ke=f=>(he("data-v-ee2bc4fc"),f=f(),be(),f),we={class:"main-container"},Pe={class:"flex justify-between items-center"},Ce={class:"text-page-title"},Ee={class:"table-body min-h-[150px]"},De={key:0},Fe={class:"flex items-center justify-between h-[35px] mt-[10px] px-3 text-[12px] text-[#666] border-solid border-b-[1px] border-[var(--el-border-color)] bg-[var(--el-color-info-light-9)]"},Se={class:"ml-5"},Te={key:0,class:"ml-5"},Ve={class:"ml-5"},Ne={class:"flex cursor-pointer"},ze={class:"flex items-center min-w-[50px] mr-[10px]"},je=["src"],Oe={key:1,class:"w-[50px] h-[50px]",src:"",alt:""},Re={class:"flex flex-col w-[308px]"},$e={class:"multi-hidden text-[14px]"},Be={class:"text-[12px] text-[#999]"},Ue={class:"flex flex-col"},Ie={class:"text-[13px]"},Le={class:"text-[13px] mt-[5px]"},qe={class:"text-[13px]"},Me={class:"text-[13px]"},Ye={key:0,class:"flex flex-col"},He=["onClick"],We={key:0},Ge={key:1},Ze=["title","onClick"],Ae=["title","onClick"],Je={key:1},Ke={key:0},Qe=ke(()=>n("span",null,":",-1)),Xe={key:0},et={key:0,class:"text-[14px] h-[30px] leading-[30px] px-3 bg-[#fff0e5] text-[#ff7f5b]"},tt={class:"mr-[5px]"},at={class:"mt-[16px] flex justify-end"},ot=W({__name:"lists",setup(f){const N=G(),w=Z(),z=N.meta.title,j=k([]),O=k([]),R=k([]);(async()=>{j.value=await(await fe()).data,O.value=await(await ge()).data,R.value=await(await xe()).data})();const o=A({page:1,limit:10,total:0,loading:!0,data:[],searchParam:{is_settlement:"",create_time:[]}}),E=k(),y=(_=1)=>{o.loading=!0,o.page=_,ve({page:o.page,limit:o.limit,...o.searchParam}).then(r=>{o.loading=!1,o.data=[],r.data.data.forEach(h=>{let u=0;h.goods_list=[],h.shop_order.order_goods.forEach(b=>{typeof b.fenxiao_order_goods<"u"&&(u+=b.fenxiao_order_goods.length,b.fenxiao_order_goods.forEach((P,v)=>{const g=te(Object.assign(b,P));delete g.fenxiao_order_goods,g.goodsRowspan=v?0:b.fenxiao_order_goods.length,g.rowspan=0,h.goods_list.push(g)}))}),h.goods_list[0].rowspan=u,o.data.push(h)}),o.total=r.data.total,ae(o.page,o.limit,o.searchParam)}).catch(()=>{o.loading=!1})};y(J(o.searchParam).page);const D=_=>{const r=w.resolve({path:"/shop_fenxiao/detail",query:{id:_.fenxiao_member_id}});window.open(r.href,"_blank")},$=({row:_,column:r,rowIndex:h,columnIndex:u})=>u<=2?[_.goodsRowspan,_.goodsRowspan?1:0]:u>7&&u!=8?[_.rowspan,_.rowspan?1:0]:[1,1],B=_=>{const r=w.resolve("/shop/order/detail?order_id="+_.order_id);window.open(r.href,"_blank")},U=_=>{const r=w.resolve({path:"/member/detail",query:{id:_}});window.open(r.href,"_blank")},I=_=>{_&&(_.resetFields(),y())};return(_,r)=>{const h=oe,u=se,b=le,P=ne,v=re,g=ie,F=de,d=ce,S=me,L=pe,q=_e,M=ue;return m(),p("div",we,[t(F,{class:"card !border-none",shadow:"never"},{default:i(()=>[n("div",Pe,[n("span",Ce,a(s(z)),1)]),t(F,{class:"card my-[10px] !border-none table-search-wrap",shadow:"never"},{default:i(()=>[t(g,{inline:!0,model:o.searchParam,ref_key:"searchFormRef",ref:E},{default:i(()=>[t(u,{label:s(l)("createTime"),prop:"create_time"},{default:i(()=>[t(h,{modelValue:o.searchParam.create_time,"onUpdate:modelValue":r[0]||(r[0]=c=>o.searchParam.create_time=c),type:"datetimerange","value-format":"YYYY-MM-DD HH:mm:ss","start-placeholder":s(l)("startDate"),"end-placeholder":s(l)("endDate")},null,8,["modelValue","start-placeholder","end-placeholder"])]),_:1},8,["label"]),t(u,{label:s(l)("orderStatus"),prop:"is_settlement"},{default:i(()=>[t(P,{modelValue:o.searchParam.is_settlement,"onUpdate:modelValue":r[1]||(r[1]=c=>o.searchParam.is_settlement=c),placeholder:s(l)("orderStatusPlaceholder"),clearable:""},{default:i(()=>[t(b,{label:"已结算",value:1}),t(b,{label:"待结算",value:0})]),_:1},8,["modelValue","placeholder"])]),_:1},8,["label"]),t(u,null,{default:i(()=>[t(v,{type:"primary",onClick:r[2]||(r[2]=c=>y())},{default:i(()=>[C(a(s(l)("search")),1)]),_:1}),t(v,{onClick:r[3]||(r[3]=c=>I(E.value))},{default:i(()=>[C(a(s(l)("reset")),1)]),_:1})]),_:1})]),_:1},8,["model"])]),_:1}),n("div",null,[t(S,{size:"large",class:"table-top"},{default:i(()=>[t(d,{label:s(l)("orderGoods"),width:"300"},null,8,["label"]),t(d,{label:s(l)("goodsPriceNumber"),"min-width":"140"},null,8,["label"]),t(d,{label:s(l)("refundStatus"),"min-width":"100"},null,8,["label"]),t(d,{label:s(l)("goodsFenxiaoPriceNumber"),"min-width":"120"},null,8,["label"]),t(d,{label:s(l)("buyInfo"),"min-width":"120"},null,8,["label"]),t(d,{label:s(l)("fenxiaoLevel"),"min-width":"70"},null,8,["label"]),t(d,{label:s(l)("fenxiaoName"),"min-width":"120"},null,8,["label"]),t(d,{label:s(l)("calculateType"),"min-width":"130"},null,8,["label"]),t(d,{label:s(l)("goodsFenxiaoPrice"),"min-width":"120",align:"right"},null,8,["label"]),t(d,{label:s(l)("orderStatus"),"min-width":"120"},null,8,["label"]),t(d,{label:s(l)("operation"),fixed:"right",align:"right","min-width":"120"},null,8,["label"])]),_:1}),K((m(),p("div",Ee,[o.loading?x("",!0):(m(),p("div",De,[o.data.length?(m(!0),p(V,{key:0},Q(o.data,(c,Y)=>(m(),p("div",{key:Y},[n("div",Fe,[n("div",null,[n("span",null,a(s(l)("orderNo"))+":"+a(c.order_no),1),n("span",Se,a(s(l)("createTime"))+":"+a(c.create_time),1),c.pay?(m(),p("span",Te,a(s(l)("payType"))+":"+a(c.pay.type_name),1)):x("",!0),n("span",Ve,a(s(l)("countPrice"))+":¥"+a(c.commission_fenxiao),1)])]),t(S,{data:c.goods_list,size:"large","show-header":!1,"span-method":$,ref_for:!0,ref:"multipleTable"},{default:i(()=>[t(d,{align:"left",width:"300"},{default:i(({row:e})=>[n("div",Ne,[n("div",ze,[e.goods_image_thumb_mid?(m(),p("img",{key:0,class:"w-[50px] h-[50px]",src:s(X)(e.goods_image_thumb_mid),alt:""},null,8,je)):(m(),p("img",Oe))]),n("div",Re,[n("p",$e,a(e.goods_name),1),n("span",Be,a(e.sku_name),1)])])]),_:1}),t(d,{"min-width":"140"},{default:i(({row:e})=>[n("div",Ue,[n("span",Ie,"¥"+a(e.goods_money),1),n("span",Le,a(e.num)+a(s(l)("price")),1)])]),_:1}),t(d,{"min-width":"100"},{default:i(({row:e})=>[n("span",qe,a(e.status!=1&&e.status_name?e.status_name:"--"),1)]),_:1}),t(d,{"min-width":"120"},{default:i(({row:e})=>[n("span",Me,"¥"+a(e.order_goods_money),1)]),_:1}),t(d,{"min-width":"120","class-name":"border-0 border-l-[1px] border-solid border-[var(--el-table-border-color)]"},{default:i(()=>[c.shop_order.member?(m(),p("div",Ye,[n("span",{class:"text-[12px] text-primary cursor-pointer",onClick:e=>U(c.shop_order.member.member_id)},a(c.shop_order.member.nickname),9,He)])):x("",!0)]),_:2},1024),t(d,{"min-width":"70","class-name":"border-0 border-l-[1px] border-solid border-[var(--el-table-border-color)]"},{default:i(({row:e})=>[e.commission_level?(m(),p("span",We,a(e.commission_level)+"级",1)):(m(),p("span",Ge,"--"))]),_:1}),t(d,{"min-width":"120"},{default:i(({row:e})=>[e.member.nickname?(m(),p(V,{key:0},[e.member.nickname?(m(),p("span",{key:0,title:e.member.nickname,class:"multi-hidden text-primary cursor-pointer",onClick:T=>D(e)},a(e.member.nickname),9,Ze)):(m(),p("span",{key:1,title:e.member.nickname,class:"multi-hidden text-primary cursor-pointer",onClick:T=>D(e)},a(e.member.username),9,Ae))],64)):(m(),p("span",Je,"--"))]),_:1}),t(d,{"min-width":"150"},{default:i(({row:e})=>[e.calculate_type?(m(),p("span",Ke,[n("span",null,a(e.calculate_type_name),1),Qe,n("span",null,a(e.calculate_type!=1?"¥"+e.commission:e.commission_rate+"%"),1)])):x("",!0)]),_:1}),t(d,{"min-width":"120",align:"right"},{default:i(({row:e})=>[e.commission?(m(),p("span",Xe,"¥"+a(e.commission||"0.00"),1)):x("",!0)]),_:1}),t(d,{"min-width":"120","class-name":"border-0 border-l-[1px] border-solid border-[var(--el-table-border-color)]"},{default:i(({row:e})=>[n("span",null,a(e.is_settlement?"已结算":"待结算"),1)]),_:1}),t(d,{align:"right","min-width":"120"},{default:i(({row:e})=>[t(v,{type:"primary",link:"",onClick:T=>B(e)},{default:i(()=>[C(a(s(l)("orderDetail")),1)]),_:2},1032,["onClick"])]),_:1})]),_:2},1032,["data"]),c.shop_remark?(m(),p("div",et,[n("span",tt,a(s(l)("notes"))+":",1),n("span",null,a(c.shop_remark),1)])):x("",!0)]))),128)):(m(),ee(L,{key:1,"image-size":1,description:s(l)("emptyData")},null,8,["description"]))]))])),[[M,o.loading]]),n("div",at,[t(q,{"current-page":o.page,"onUpdate:current-page":r[4]||(r[4]=c=>o.page=c),"page-size":o.limit,"onUpdate:page-size":r[5]||(r[5]=c=>o.limit=c),layout:"total, sizes, prev, pager, next, jumper",total:o.total,onSizeChange:r[6]||(r[6]=c=>y()),onCurrentChange:y},null,8,["current-page","page-size","total"])])])]),_:1})])}}});const Et=ye(ot,[["__scopeId","data-v-ee2bc4fc"]]);export{Et as default};
|