From 5c01c7a88f820da93bcb725c2a46cabc0090ec76 Mon Sep 17 00:00:00 2001 From: ChenQiuYu Date: Fri, 16 May 2025 09:31:42 +0800 Subject: [PATCH 1/4] dev --- src/assets/scss/main.scss | 4 - src/components/SearchInput.vue | 11 +- src/components/common/goods/GoodsDetail.vue | 190 +++++++++--------- .../common/service/ServiceDetail.vue | 131 ++++++------ .../inventory/purchase/AddOrder.vue | 6 +- src/views/LayoutSocial.vue | 78 ++++--- 6 files changed, 228 insertions(+), 192 deletions(-) diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss index dd9b46c..8c6e5a3 100644 --- a/src/assets/scss/main.scss +++ b/src/assets/scss/main.scss @@ -108,11 +108,7 @@ body { .clear-margin { margin: 0; } -.el-popper.is-light.type-popper, .el-popper.is-light>.el-popper__arrow:before{ - background:#F5FAFF; -} .el-popper.is-light.type-popper{ - background:#F5FAFF; padding: 0; } .el-popper.is-light.id-code-popper{ diff --git a/src/components/SearchInput.vue b/src/components/SearchInput.vue index 21090ec..67605b9 100644 --- a/src/components/SearchInput.vue +++ b/src/components/SearchInput.vue @@ -1,5 +1,4 @@ @@ -96,9 +95,11 @@ const removeTraceAbility = (code: any) => { \ No newline at end of file diff --git a/src/components/inventory/goods/Edit.vue b/src/components/inventory/goods/Edit.vue index cd514fe..d8d0c38 100644 --- a/src/components/inventory/goods/Edit.vue +++ b/src/components/inventory/goods/Edit.vue @@ -693,7 +693,6 @@ const contrastCodeConfirm = (data: any) => { } let save = async (isClose:Boolean) => { try { - await formRef.value.validate() if (!edit_data.value.purchaseUnitPrice || edit_data.value.purchaseUnitPrice<1){ ElMessage.error('参考进价不能为空或小于1'); diff --git a/src/components/inventory/purchase/AddOrder.vue b/src/components/inventory/purchase/AddOrder.vue index 8805456..e9be5ef 100644 --- a/src/components/inventory/purchase/AddOrder.vue +++ b/src/components/inventory/purchase/AddOrder.vue @@ -3,7 +3,8 @@ title="新增" :height="760" :show-footer="true">
- + @@ -48,12 +49,12 @@ - + - + - +
- + @@ -87,91 +90,103 @@
添加商品
- + +
+ + 搜索 +
- - - - - - - - +
+ + + + + + + + - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + +
- - + + @@ -18,12 +18,13 @@ - + @@ -34,7 +35,7 @@ \ No newline at end of file diff --git a/src/components/member/memberProfile/Grant.vue b/src/components/member/memberProfile/Grant.vue index 64ce4e0..801bbe3 100644 --- a/src/components/member/memberProfile/Grant.vue +++ b/src/components/member/memberProfile/Grant.vue @@ -1,48 +1,63 @@ \ No newline at end of file diff --git a/src/views/member/index.vue b/src/views/member/index.vue index 6258f7f..fb669db 100644 --- a/src/views/member/index.vue +++ b/src/views/member/index.vue @@ -74,7 +74,7 @@ }} - {{ certTypeList.find((item: any) => item.id == listItem.certType)?.name }} + {{ certTypeList.find((item: any) => item.id == Number(listItem.certType))?.name }} > {{ listItem.certNo || "-" }} @@ -152,12 +152,8 @@
- - - - - - + + @@ -235,8 +231,6 @@ const init = () => { }); }); getChargeList(listItem.value.id); - - }); }; const getVipIntegral = (id: any) => { @@ -307,6 +301,7 @@ const btn = (item: any, i: number) => { //点击发放 const openGrant = () => { isGrant.value = true + console.log(listItem.value) } //消费时间 const tableData = ref([]) @@ -604,10 +599,12 @@ const certTypeList = ref(Object.entries(psnCertTypes).map(([id, name]) => ( display: flex; flex-direction: column; min-height: 0; + .list { flex: 1; min-height: 0; } + .bottom { width: 100%; height: 60px; From 46d91fb241627cd9f695f8aafa2651cf08acf7bf Mon Sep 17 00:00:00 2001 From: ChenQiuYu Date: Fri, 16 May 2025 14:15:40 +0800 Subject: [PATCH 4/4] dev --- .../images/charge/药慧精灵智慧诊所_files/1.png | Bin 0 -> 1723 bytes public/static/images/member/1.png | Bin 0 -> 1425 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 public/static/images/charge/药慧精灵智慧诊所_files/1.png create mode 100644 public/static/images/member/1.png diff --git a/public/static/images/charge/药慧精灵智慧诊所_files/1.png b/public/static/images/charge/药慧精灵智慧诊所_files/1.png new file mode 100644 index 0000000000000000000000000000000000000000..399711410fa4e539cdb4ca9c031d96013fe47560 GIT binary patch literal 1723 zcmV;s21NOZP)Px*bxA})RA@u(SZ!!iR~UYe%gv3cjl)&ePQj0jWJ`s%FzbYEFlzs`Cv zc6!tRAp}!XQxJ>AAel^N`)t^-0X!a$$Z^~|rOp%+AX+mR<3Ig=f5r9d*Ru<)udgR9 zEiGwDl0p`X<#$R7qA0#@Hk<2Co;=BqkB?`^cQ_n0Q_~#By;91WVgiIQ{v;ZW9`gBo zWhxq%%Qah9SGN)X90;M9_LLAp?CEs+r${97yx;GqeU#>QyOR!w<1oi@{Y9LrWkU-B zqSP#k;$KIP9)0od-Mh+Qnasp_o_`r3G@EY*LI?$tI)3~(Q8Pt}!sGG8Ef&j5rJ{5e zK-DudGrx6obST-eTCLF6*C+BkUz3}eTws|@UG41bw5T;TFffp`*=*YoLg7+mi3QNR z*REX~K6dO_IbA?)Z7sC4v|O^;Y};8Dlt?6gId$sP_E0FKbU$$5z)Vd|jSC_4Jxjda zJ}iLR#>U3_&YU^J(ZP4@*a5qC?GnspvzuiyQ51cFK%jMWbX4iSckf=@(9qC{5c-lO zo)BVNP#^CD0973VLP%OJjs;Nrg$oysoIZV80o2&o2s?M~{KjlHx3Vlq6h$Ez41PE= zGNJ;K8X6itMFag za%PdRqjU`b(NHKfTg=5;GC->I5d@(^D@y4FyKmpVG{*Q!j`XR`l|EFYx?HX$rH_Wq zR%PB*bT2;(27{1uzf(P&gbu?DP2+Wrr15PfricQWw43bOXwOQlH=-OOmu|a&mHhYHG?t-$V2X zzH#G5`UHP$GMT<&d4gx^=TST!#}gA1%AKP&wSLt9l)ANT^XAQ>)9Iue!P7c21V~d? zs!39lW0G9eYm#K@h{`Feh7`QPU=Zby0-aua4?PBeZ&meB6d=|kVYFY#Xxr$5ij6A? zAVSCr0C*Ju>N3Yldr#+MxH6SWEh<`8L{_U6>-FrYIE_RiUknWmDeR|ZGhKiPA=@yT)3 zqS2_A)q7(`lGCx&o}B`SQgb?;zSrO1ugiNY0#wO7I~9;KnM{tiwYBMfW)}g9x~q#k zyTQT1WO;dcQJ$R&=)KFAFZ+jwhYfjeMnRRrvr_@JkByBTG3vb;1tdw*(E0P{-9|mT zeDkV+sH*K&Rc%IMe7@j6dyOuZC5}p)Cq3^oKrB1Y+UHq@7 R-?IP!002ovPDHLkV1mWdDt-U} literal 0 HcmV?d00001 diff --git a/public/static/images/member/1.png b/public/static/images/member/1.png new file mode 100644 index 0000000000000000000000000000000000000000..9ad309acba8b02ccb55e3ed2450b89c21a08e894 GIT binary patch literal 1425 zcmV;C1#bF@P)Px)OG!jQR9Hu?mwjxN%&xPTayKbFO1*2RyF z(`F%&%%F*jE;D{*%eHK0j>VV|#o`D3qlpRX=FF7H#E%|Qnamj7*xX&g6FboU| z{$}v8$=>q#-|y{cI5GumXM*37%3LC|hk=`bs)#i_@Dk=9OmAEGeq;ixQrWfMco~=z z5%|RL<8N+`Del;B)@y4F*1Q< zTlS!2X<~lM-lyu{1k=TL{$*C(Q0+=NEjFoMsNQh1K?5@NOLoAGyM5iy*A0TKr9Hb^ zvU`BqGa+yYSW^1he*rJbl#YAf!?FB_*T9rI~e!<;H!Wu104hUfda4qs5!;eOhe!yxhoI#FL%Cp1=v!ICCD!U%S*}{ zmc`NQWcvn(>-Nq6Lax3T*R6Q&z-Wxvlsi8=fn;0XIzw%Oua%frQfmnDB96z-@xvb+ zcXJ+ZnN5ijL+H%Va1sk3l8_2xT(KuROyLm(Ia_97Qp}WJ@wC48S3r+5~z@;-F;W7JZ zdRyK7&8h4{Uu{-3UYLc&YlSV9bP=X6f?ZoS!U4`tG~wFRC$mSa<_?36g3BrMjyDF^VEt$&Rn(jz+21N@=SAD1NeD7H2jV6;4m?c2LV2m2d{I|<9 znEr{yb}bvKO?P!!G32do&(0k~SDUx%BM{gVdLRIIBeskdi#zu}yXaVj>?guXQ}ivt zJqEiadMhNbi{h-CrwB}8j)Wo}{n5$xd*iU22CHCbyy)TB7rC$KV57muot+cbY60$Ct2Q{<3u*p}|66PrI*>mj+OPcn^h=dK0apvh^NKQRR@?YZkE|H4`Dc>5^M zx(+wCLB<-x#xTtVE<}XwS3S)~PL5$o3xdN5F1LKMRd6uM2_EaO8Tk2uUtcm7c?`eu z?IR6uKf5RskXE)GuCG%3IvnfKgz;Q>!eR;|*B2HEunX+f;o-VHA9mUJqy}Ubf!$l- z6d-sn^uSTXBbIkhPCAzVe?r5YJGU<}8qbgSY+an2(u?w_WP9!^d$;tkPI%7rqe!j{#SRpnZmyRA&;pnNvEf5I5 zN|CMEwB0G5Pj}Rx$_soh&5~`I7r?$zLA#$mM7lZM(a?4J!2dy f#ea_qJQe>R