mirror of
https://gitee.com/niucloud-team/javashop.git
synced 2026-05-22 00:33:42 +00:00
Niucloud JAVA版框架1.1.0更新内容
新增
* 增加小程序展示线上版本号
* 发布小程序添加自定义版本号
* 添加后台取消小程序绑定微信公众平台授权
* 管理端核销功能
* 用户端导入微信地址功能
优化
* 装修页面时可自定义底部导航
* 小程序添加版权信息展示
* 应用菜单结构优化:取消独立营销菜单,统一在应用菜单下按分类
* 分页列表增加缓存,记录当前页信息,操作完成后,返回当前页
* 开启标签栏时对标签页面进行缓存
* 统一框架装修自定义使用底部导航数据结构
修复
* 删除表单报错
* admin首页点击未安装、已安装应用,页面跳转空白
* 修复插件云安装错误时同时显示安装失败和安装完成
商城1.0.5更新内容
新增
* 用户端添加订单开具发票功能
* 管理后台添加补开发票功能
优化
* 商品列表增加相关活动的关联展示
* 限时折扣、积分商城增加批量操作
* 积分商品,若有规格未参与积分活动,则无法购买
* 复制商品,提示语优化
修复
* 满减送活动赠品设置多件,只展示1件
* 满减送赠品未扣除库存问题
* 商品列表批量设置分类后商品分类查询不到商品的问题
* 商品标签状态已经关闭添加商品时依旧可以选择
* 商家地址库联系方式搜索无效
* 商品分类拖动排序无效
* 参与满减活动再使用优惠券,订单0元申请退款时,退款金额出现负数
* 积分商城规格值设置不参与积分兑换提交订单未拦截
* 虚拟商品核销码设置的永久有效,核销时提示商品已过期
* 订单满减送退款售后点击详情报错
* 按会员标签发放优惠券异常一直未发放
* 微信支付申请退款售后点击转账跳转404
* 订单列表输入会员编号、账号点击搜索筛选不出来内容
* 多商品组商品来源选择分组,只有一个商品分类时多商品组商品展示不正确
* 商品组件排序方式选择为价格时报错
* 图文导航选择积分商品报错
2 lines
9.6 KiB
JavaScript
2 lines
9.6 KiB
JavaScript
import{d as X,k as K,u as ee,r as w,q as te,m as le,s as a,h as u,c as g,e as r,w as d,f as o,b4 as ae,Z as re,v as T,a as s,t as f,F as x,W as V,i as B,C as L,aY as oe,$ as H,b5 as ne,a9 as ie,L as de,M as se,a4 as pe,a1 as ue,aE as ce,aF as _e,b8 as me,aG as fe,bF as ve,N as be,E as ge,a3 as he}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 *//* empty css *//* empty css *//* empty css */import"./el-form-item-4ed993c7.js";/* empty css *//* empty css */import{g as xe,a as ke,b as ye,c as Ve,e as we,d as Pe}from"./printer-d03b38bb.js";const Ee={class:"main-container"},Ue={class:"panel-title !text-sm"},Ce={class:"text-[12px] text-[#b2b2b2]"},Fe={class:"text-[12px] text-[#b2b2b2]"},Te={class:"text-[12px] text-[#b2b2b2]"},Ne={class:"text-[12px] text-[#b2b2b2]"},qe={class:"panel-title !text-sm"},Me={class:"flex mb-[10px] py-[8px] bg-[#F5F7F9] text-[14px]"},$e={class:"px-[12px] w-[200px]"},Be={class:"px-[12px] w-[100px]"},Re={class:"px-[12px] w-[250px]"},Le={class:"px-[12px] w-[200px]"},Oe={class:"font-bold w-[200px] px-[12px]"},je={class:"w-[100px] px-[12px]"},De={class:"w-[250px] px-[12px]"},Se={key:0,class:"w-[300px] px-[12px] flex-1"},Ge={class:"w-[200px] px-[12px]"},We={class:"fixed-footer-wrap"},He={class:"fixed-footer"},ct=X({__name:"edit",setup(Ie){const O=K(),j=ee(),P=w(!1),N=w(!0),I=O.meta.title,Y={printer_id:O.query.printer_id||0,brand:"",printer_name:"",printer_code:"",printer_key:"",open_id:"",apikey:"",template_type:[],trigger:[],value:{},print_width:"58mm",status:1},e=te({...Y}),D=w(),Z=le(()=>({printer_name:[{required:!0,message:a("printerNamePlaceholder"),trigger:"blur"}],brand:[{required:!0,message:a("brandPlaceholder"),trigger:"blur"}],printer_code:[{required:!0,message:a("printerCodePlaceholder"),trigger:"blur"}],printer_key:[{required:!0,message:a("printerKeyPlaceholder"),trigger:"blur"}],open_id:[{required:!0,message:a("openIdPlaceholder"),trigger:"blur"}],apikey:[{required:!0,message:a("apikeyPlaceholder"),trigger:"blur"}]})),k=w([]);(async()=>{await ye({}).then(b=>{if(b.data){k.value=b.data;for(let l=0;l<k.value.length;l++){let n=k.value[l];e.value[n.key]={};let i={};for(let _=0;_<n.condition.length;_++){let m=n.condition[_];if(i[m.key]=[],m.type=="checkbox"){i[m.key]=[];for(let p=0;p<m.list.length;p++)i[m.key].push(m.list[p].value)}}for(let _ in n.trigger)e.value[n.key]["trigger_"+_]={status:1,template_id:"",print_num:1},Object.assign(e.value[n.key]["trigger_"+_],oe(i))}}e.printer_id||(N.value=!1)}),e.printer_id&&Ve(e.printer_id).then(b=>{let l=b.data;l&&Object.keys(e).forEach(n=>{if(l[n]!=null)if(n=="value")for(let i in e[n])Object.assign(e[n][i],l[n][i]);else e[n]=l[n]}),N.value=!1})})();const S=w([]);xe({}).then(b=>{S.value=b.data});const q=w({});ke({}).then(b=>{if(b.data){let l=b.data;for(let n=0;n<l.length;n++){let i=l[n];q.value[i.template_type]==null&&(q.value[i.template_type]=[]),q.value[i.template_type].push({template_id:i.template_id,template_name:i.template_name})}}});const z=async b=>{if(N.value||!b)return;if(k.value.length==0){H({type:"warning",message:a("printTypeEmpty")});return}let l=e.printer_id?we:Pe;await b.validate(async n=>{if(n){let i=!1,_="";for(let p=0;p<k.value.length;p++){let c=k.value[p];for(let E=0;E<Object.keys(c.trigger).length;E++){let y=Object.keys(c.trigger)[E];if(e.value[c.key]["trigger_"+y].status==0)continue;if(!e.value[c.key]["trigger_"+y].template_id){i=!0,_=`请设置${c.title}[${c.trigger[y]}]的小票打印模板`;break}let U=!1;for(let C=0;C<c.condition.length;C++){let F=c.condition[C];if(F.type=="checkbox"&&e.value[c.key]["trigger_"+y][F.key].length==0){i=!0,_=`请设置${c.title}[${c.trigger[y]}]的${F.title}`,U=!0;break}}if(U)break}if(i)break}if(i){H({type:"warning",message:_});return}e.template_type=[],e.trigger=[];for(let p in e.value){for(let c in e.value[p])e.trigger.push(p+"_"+c);e.template_type.push(p)}if(P.value)return;P.value=!0,l(e).then(p=>{P.value=!1,e.printer_id||j.push("/printer/list")}).catch(p=>{P.value=!1})}})},G=()=>{j.push("/printer/list")};return(b,l)=>{const n=ne,i=ie,_=de,m=se,p=pe,c=ue,E=ce,y=_e,U=me,C=fe,F=ve,A=be,W=ge,J=he;return u(),g("div",Ee,[r(i,{class:"card !border-none mb-[15px]",shadow:"never"},{default:d(()=>[r(n,{content:o(I),icon:o(ae),onBack:G},null,8,["content","icon"])]),_:1}),re((u(),T(A,{class:"page-form",model:e,rules:o(Z),"label-width":"150px",ref_key:"formRef",ref:D},{default:d(()=>[r(i,{class:"box-card !border-none",shadow:"never"},{default:d(()=>[s("h3",Ue,f(o(a)("printerSet")),1),r(m,{label:o(a)("printerName"),prop:"printer_name"},{default:d(()=>[r(_,{modelValue:e.printer_name,"onUpdate:modelValue":l[0]||(l[0]=t=>e.printer_name=t),modelModifiers:{trim:!0},clearable:"",placeholder:o(a)("printerNamePlaceholder"),class:"input-width",maxlength:"20"},null,8,["modelValue","placeholder"])]),_:1},8,["label"]),r(m,{label:o(a)("brand"),prop:"brand"},{default:d(()=>[r(c,{modelValue:e.brand,"onUpdate:modelValue":l[1]||(l[1]=t=>e.brand=t),placeholder:o(a)("brandPlaceholder"),clearable:""},{default:d(()=>[(u(!0),g(x,null,V(S.value,(t,R)=>(u(),T(p,{key:R,label:t,value:R},null,8,["label","value"]))),128))]),_:1},8,["modelValue","placeholder"])]),_:1},8,["label"]),r(m,{label:o(a)("printerCode"),prop:"printer_code"},{default:d(()=>[s("div",null,[r(_,{modelValue:e.printer_code,"onUpdate:modelValue":l[2]||(l[2]=t=>e.printer_code=t),modelModifiers:{trim:!0},clearable:"",placeholder:o(a)("printerCodePlaceholder"),class:"input-width",maxlength:"30"},null,8,["modelValue","placeholder"]),s("p",Ce,f(o(a)("printerCodeTips")),1)])]),_:1},8,["label"]),r(m,{label:o(a)("printerKey"),prop:"printer_key"},{default:d(()=>[s("div",null,[r(_,{modelValue:e.printer_key,"onUpdate:modelValue":l[3]||(l[3]=t=>e.printer_key=t),modelModifiers:{trim:!0},clearable:"",placeholder:o(a)("printerKeyPlaceholder"),class:"input-width",maxlength:"30"},null,8,["modelValue","placeholder"]),s("p",Fe,f(o(a)("printerKeyTips")),1)])]),_:1},8,["label"]),r(m,{label:o(a)("openId"),prop:"open_id"},{default:d(()=>[s("div",null,[r(_,{modelValue:e.open_id,"onUpdate:modelValue":l[4]||(l[4]=t=>e.open_id=t),modelModifiers:{trim:!0},clearable:"",placeholder:o(a)("openIdPlaceholder"),class:"input-width",maxlength:"30"},null,8,["modelValue","placeholder"]),s("p",Te,f(o(a)("openIdTips")),1)])]),_:1},8,["label"]),r(m,{label:o(a)("apikey"),prop:"apikey"},{default:d(()=>[s("div",null,[r(_,{modelValue:e.apikey,"onUpdate:modelValue":l[5]||(l[5]=t=>e.apikey=t),modelModifiers:{trim:!0},clearable:"",placeholder:o(a)("apikeyPlaceholder"),class:"input-width",maxlength:"60"},null,8,["modelValue","placeholder"]),s("p",Ne,f(o(a)("apikeyTips")),1)])]),_:1},8,["label"]),r(m,{label:o(a)("printWidth"),prop:"print_width"},{default:d(()=>[r(y,{modelValue:e.print_width,"onUpdate:modelValue":l[6]||(l[6]=t=>e.print_width=t)},{default:d(()=>[r(E,{label:"58mm"},{default:d(()=>[B("58mm")]),_:1})]),_:1},8,["modelValue"])]),_:1},8,["label"]),r(m,{label:o(a)("status")},{default:d(()=>[r(U,{modelValue:e.status,"onUpdate:modelValue":l[7]||(l[7]=t=>e.status=t),"active-value":1,"inactive-value":0},null,8,["modelValue"])]),_:1},8,["label"])]),_:1}),(u(!0),g(x,null,V(k.value,(t,R)=>(u(),T(i,{key:t.key,class:"box-card !border-none",shadow:"never"},{default:d(()=>[s("h3",qe,f(t.title),1),s("div",Me,[s("div",$e,f(o(a)("printTrigger")),1),s("div",Be,f(o(a)("status")),1),s("div",Re,f(o(a)("usePrintTemplate")),1),(u(!0),g(x,null,V(t.condition,M=>(u(),g("div",{class:"px-[12px] w-[300px] flex-1",key:M.key},f(M.title),1))),128)),s("div",Le,f(o(a)("printNum")),1)]),t.trigger?(u(!0),g(x,{key:0},V(t.trigger,(M,h)=>(u(),g("div",{class:"flex bg-[#f8f8f9] mb-[10px] py-[20px]",key:h},[e.value[t.key]["trigger_"+h]?(u(),g(x,{key:0},[s("div",Oe,f(M),1),s("div",je,[r(U,{modelValue:e.value[t.key]["trigger_"+h].status,"onUpdate:modelValue":v=>e.value[t.key]["trigger_"+h].status=v,"active-value":1,"inactive-value":0},null,8,["modelValue","onUpdate:modelValue"])]),s("div",De,[r(c,{modelValue:e.value[t.key]["trigger_"+h].template_id,"onUpdate:modelValue":v=>e.value[t.key]["trigger_"+h].template_id=v,placeholder:o(a)("请选择小票打印模板"),clearable:""},{default:d(()=>[(u(!0),g(x,null,V(q.value[t.key],v=>(u(),T(p,{key:v.template_id,label:v.template_name,value:v.template_id},null,8,["label","value"]))),128))]),_:2},1032,["modelValue","onUpdate:modelValue","placeholder"])]),(u(!0),g(x,null,V(t.condition,v=>(u(),g(x,null,[v.type=="checkbox"?(u(),g("div",Se,[r(F,{modelValue:e.value[t.key]["trigger_"+h][v.key],"onUpdate:modelValue":$=>e.value[t.key]["trigger_"+h][v.key]=$},{default:d(()=>[(u(!0),g(x,null,V(v.list,($,Q)=>(u(),T(C,{label:$.value,key:Q},{default:d(()=>[B(f($.name),1)]),_:2},1032,["label"]))),128))]),_:2},1032,["modelValue","onUpdate:modelValue"])])):L("",!0)],64))),256)),s("div",Ge,[r(c,{modelValue:e.value[t.key]["trigger_"+h].print_num,"onUpdate:modelValue":v=>e.value[t.key]["trigger_"+h].print_num=v},{default:d(()=>[r(p,{label:"1联",value:1}),r(p,{label:"2联",value:2}),r(p,{label:"3联",value:3}),r(p,{label:"4联",value:4})]),_:2},1032,["modelValue","onUpdate:modelValue"])])],64)):L("",!0)]))),128)):L("",!0)]),_:2},1024))),128))]),_:1},8,["model","rules"])),[[J,N.value]]),s("div",We,[s("div",He,[r(W,{type:"primary",loading:P.value,onClick:l[8]||(l[8]=t=>z(D.value))},{default:d(()=>[B(f(o(a)("save")),1)]),_:1},8,["loading"]),r(W,{onClick:l[9]||(l[9]=t=>G())},{default:d(()=>[B(f(o(a)("cancel")),1)]),_:1})])])])}}});export{ct as default};
|