From d61915696c41b2c7ea2ed249616fab862ccfe43a Mon Sep 17 00:00:00 2001 From: yuanteng0011 <1876787513@qq.com> Date: Fri, 18 Oct 2024 13:56:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=9F=8E=E9=A1=B5=E9=9D=A2=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Shopping-cart/productmain/productmain.vue | 9 +- pages/store-home/main/main.vue | 248 +++++++++--------- .../dev/mp-weixin/assets/tianjia.187834c9.png | Bin 0 -> 1220 bytes unpackage/dist/dev/mp-weixin/common/assets.js | 2 + unpackage/dist/dev/mp-weixin/common/vendor.js | 93 +++++++ .../productmain/productmain.wxss | 8 + .../mp-weixin/pages/store-home/main/main.js | 11 +- .../mp-weixin/pages/store-home/main/main.wxml | 2 +- .../mp-weixin/pages/store-home/main/main.wxss | 126 +++++---- 9 files changed, 316 insertions(+), 183 deletions(-) create mode 100644 unpackage/dist/dev/mp-weixin/assets/tianjia.187834c9.png diff --git a/pages/Shopping-cart/productmain/productmain.vue b/pages/Shopping-cart/productmain/productmain.vue index 69cb500..837f2d8 100644 --- a/pages/Shopping-cart/productmain/productmain.vue +++ b/pages/Shopping-cart/productmain/productmain.vue @@ -113,11 +113,17 @@ } .text-wrapper { position: fixed; - + top: 0; + left: 0; + right: 0; padding: 26.25rpx 0; background-color: #f5f5dc; } .section { + position: fixed; + top: 75rpx; + right: 0; + left: 0; padding: 0 121.88rpx; background-color: #fffef8; } @@ -130,6 +136,7 @@ height: 5.63rpx; } .list { + margin-top: 134rpx; margin-bottom: 125rpx; padding: 18.75rpx 13.13rpx 0; } diff --git a/pages/store-home/main/main.vue b/pages/store-home/main/main.vue index 68f80af..9231406 100644 --- a/pages/store-home/main/main.vue +++ b/pages/store-home/main/main.vue @@ -1,76 +1,61 @@ \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/assets/tianjia.187834c9.png b/unpackage/dist/dev/mp-weixin/assets/tianjia.187834c9.png new file mode 100644 index 0000000000000000000000000000000000000000..531f024686abf99d84604d5fa9721cf6fae7dc11 GIT binary patch literal 1220 zcmV;#1UvhQP)5*Gcz19^Up!NqqZLXYh>#?aoLZY(V zNN^*nPpAb!mkYg-P!4VF?7q%SnrOW{-u2GTI%_vS$(DCK*34gTX7=rS&%iOq%oKzP z!apuo;rfdpck!@s4<3E?(8Gi%Ot2ESz?Tqk4McS?s);`!?ukAg9J-G|utjTs^iTj+ z1#`E$h+v^9CVxpxzJ@%I5Kr6!oGohDTLD%C?+cx~0dlSgp^LB%Z@_WdHiYLA9J1)O zVuVJaHmyEvAqU2Sx%*)a?B7YF)of@Xrc3=Q^K4>EFA52`V8eEJS@MG?rYr=rc zg1NKY0)m@3dT#E|B^#NR^!@;R1EnI{z8+g}ImI3@zUZ+8t36weWt_xyT77gYty8LC z?k=lC0@HvWe3a&)r5{?%T}%rV=Z^9X5=a!R_H6;To+mqmC;t}U#;aS_{I#SmBS$T2 zDSvzS4cz`^PJRCRlL5Z@@&)X|yKwqT)bMt7-;TC$5LiEvxBqkx#Y%4fJcsSST-b&7 z{rVAT1uN@dF)POf6W1{-5XZty8o^Y>%pih?5#oaL2H(m>HQG=K zU%c|JV1jfibobe4A6*-#Jj0wh9bo0G4-@3UMXQhhKDZtdEP~=ylb}!7UChe&+jHWT z-tX$gzItWGubdL^hk}h_T4DZwM#f^Z@ZG(6HCARS{8sofzu@N+&DP{*Sa8MPMMln? z3UKv;!BWeJT+Sy?n4K?ShW9YsU3pArp3GVwEARU0hn9FU`r+5%A-_03z{h8U#NXvP zv_$OO3ttY6E`!@5-U}0?;1#4#Dk@kC`TYDIiXwbMOLQjjFe@-(@hy#DzK>af*o!u4 zJS{3DFMA}g$TdfZ3wG%)W`!WwiZ;artE`-6?N1?|E=D~n;<1Tohh_CZ9KB%Y&2{mf z*$F8X17}OutQAa+o)o(Q%Sf**%G;;&drxtAV^n3(XxGR&(S~I!OXno)hDvwQ*n>)< z@3cpKmFW3%=Y0{qq!ui5@W63$p%Ck~X!UnP!QGmO?>>6~OidKi6DiZBqz;MRzS_&a zdl}P0pBiahQlE!u?YExDL|jMNVKm1nVH_&}Ko@0ZU4LII2V&n|c(guF&x}Pa#T;V! zNIs;ZWRB02OLR7|5~F|=-#gb7o8f4ST;!e|a~X#*FFlmy!SkyAql(Gm$vcNSOby5# za-852m+`h+c-mj5%bu|ZXs3KwSzDG!*smIZ5*lpa>7boQ=mB;M#8rtu>Tp#;y^1_A z_r&Zr^I9}Yaeo2$NhH=Cm20j;il@{hod`V0c$x??QGYWUZM4N?|KuSv^5j+z8}{fw ixO+QAi96<)*MOHbc$r3XXX+UM0000 { + patchMPEvent(e2); + let args = [e2]; + if (e2.detail && e2.detail.__args__) { + args = e2.detail.__args__; + } + const eventValue = invoker.value; + const invoke = () => callWithAsyncErrorHandling(patchStopImmediatePropagation(e2, eventValue), instance, 5, args); + const eventTarget = e2.target; + const eventSync = eventTarget ? eventTarget.dataset ? String(eventTarget.dataset.eventsync) === "true" : false : false; + if (bubbles.includes(e2.type) && !eventSync) { + setTimeout(invoke); + } else { + const res = invoke(); + if (e2.type === "input" && (isArray(res) || isPromise(res))) { + return; + } + return res; + } + }; + invoker.value = initialValue; + return invoker; +} +const bubbles = [ + // touch事件暂不做延迟，否则在 Android 上会影响性能，比如一些拖拽跟手手势等 + // 'touchstart', + // 'touchmove', + // 'touchcancel', + // 'touchend', + "tap", + "longpress", + "longtap", + "transitionend", + "animationstart", + "animationiteration", + "animationend", + "touchforcechange" +]; +function patchMPEvent(event) { + if (event.type && event.target) { + event.preventDefault = NOOP; + event.stopPropagation = NOOP; + event.stopImmediatePropagation = NOOP; + if (!hasOwn(event, "detail")) { + event.detail = {}; + } + if (hasOwn(event, "markerId")) { + event.detail = typeof event.detail === "object" ? event.detail : {}; + event.detail.markerId = event.markerId; + } + if (isPlainObject(event.detail) && hasOwn(event.detail, "checked") && !hasOwn(event.detail, "value")) { + event.detail.value = event.detail.checked; + } + if (isPlainObject(event.detail)) { + event.target = extend({}, event.target, event.detail); + } + } +} +function patchStopImmediatePropagation(e2, value) { + if (isArray(value)) { + const originalStop = e2.stopImmediatePropagation; + e2.stopImmediatePropagation = () => { + originalStop && originalStop.call(e2); + e2._stopped = true; + }; + return value.map((fn) => (e3) => !e3._stopped && fn(e3)); + } else { + return value; + } +} function vFor(source, renderItem) { let ret; if (isArray(source) || isString(source)) { @@ -6600,6 +6689,7 @@ function vFor(source, renderItem) { } return ret; } +const o = (value, key) => vOn(value, key); const f = (source, renderItem) => vFor(source, renderItem); const t = (val) => toDisplayString(val); function createApp$1(rootComponent, rootProps = null) { @@ -7436,5 +7526,8 @@ const createSubpackageApp = initCreateSubpackageApp(); exports._export_sfc = _export_sfc; exports.createSSRApp = createSSRApp; exports.f = f; +exports.index = index; +exports.o = o; exports.ref = ref; exports.t = t; +exports.unref = unref; diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.wxss b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.wxss index 6b07534..a0d30f9 100644 --- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.wxss +++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.wxss @@ -416,10 +416,17 @@ text.data-v-641af6de { } .text-wrapper.data-v-641af6de { position: fixed; + top: 0; + left: 0; + right: 0; padding: 26.25rpx 0; background-color: #f5f5dc; } .section.data-v-641af6de { + position: fixed; + top: 75rpx; + right: 0; + left: 0; padding: 0 121.88rpx; background-color: #fffef8; } @@ -432,6 +439,7 @@ text.data-v-641af6de { height: 5.63rpx; } .list.data-v-641af6de { + margin-top: 134rpx; margin-bottom: 125rpx; padding: 18.75rpx 13.13rpx 0; } diff --git a/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.js b/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.js index 5665a13..b891cf0 100644 --- a/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.js +++ b/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.js @@ -76,6 +76,11 @@ const _sfc_main = { imgurl: common_assets.product_img } ]); + const tap = () => { + common_vendor.index.navigateTo({ + url: "../../../pages/order/product-close/product-close" + }); + }; return (_ctx, _cache) => { return { a: common_vendor.f(sort.value, (item, index, i0) => { @@ -91,9 +96,11 @@ const _sfc_main = { b: common_vendor.t(item.product_name), c: common_vendor.t(item.detail), d: common_vendor.t(item.value), - e: index + e: index, + f: common_vendor.o(tap, index) }; - }) + }), + c: common_vendor.unref(common_assets.add_img) }; }; } diff --git a/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.wxml b/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.wxml index 3c9185e..55facf3 100644 --- a/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.wxml +++ b/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.wxml @@ -1 +1 @@ -商品{{item.b}}材料包提供材料自行DIY{{item.b}}{{item.c}}￥{{item.d}} \ No newline at end of file +商品{{item.b}}材料包提供材料自行DIY{{item.b}}{{item.c}}￥{{item.d}} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.wxss b/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.wxss index 3704141..8dd0573 100644 --- a/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.wxss +++ b/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.wxss @@ -401,29 +401,43 @@ text.data-v-7e3c386d { .mt-100.data-v-7e3c386d { margin-top: 187.5rpx; } +.scrollable-content.data-v-7e3c386d { + height: 56vh; + /* 100px 是头部和底部的高度之和 */ +} .ml-15.data-v-7e3c386d { margin-left: 28.13rpx; } +.ml-3.data-v-7e3c386d { + margin-left: 5.63rpx; +} .mt-3.data-v-7e3c386d { margin-top: 5.63rpx; } -.mt-5.data-v-7e3c386d { - margin-top: 9.38rpx; -} .mt-13.data-v-7e3c386d { margin-top: 24.38rpx; } +.mt-5.data-v-7e3c386d { + margin-top: 9.38rpx; +} .page.data-v-7e3c386d { background-color: #f5f5dc; width: 100%; overflow-y: auto; overflow-x: hidden; - height: 100%; + height: 100vh; + overflow: hidden; } .section.data-v-7e3c386d { padding: 22.5rpx 39.28rpx 16.88rpx; background-color: #f7de98; } +.pos_8.data-v-7e3c386d { + position: absolute; + left: 0; + right: 0; + top: 0; +} .text.data-v-7e3c386d { color: #c1651a; font-size: 37.5rpx; @@ -431,53 +445,61 @@ text.data-v-7e3c386d { line-height: 36.19rpx; } .section_2.data-v-7e3c386d { - padding: 7.5rpx 30.43rpx; + padding: 5.63rpx 15rpx 8.44rpx; background-color: #ffffff; border-radius: 28.13rpx; height: 63.75rpx; + width: 500.69rpx; } .image.data-v-7e3c386d { - width: 48.75rpx; - height: 48.75rpx; + width: 50.63rpx; + height: 50.63rpx; } .text-wrapper.data-v-7e3c386d { - margin-right: 5.31rpx; + margin-right: 17.42rpx; +} +.font.data-v-7e3c386d { + font-size: 26.25rpx; + font-family: STFangsong; + line-height: 18rpx; + color: #ff0000; } .image-wrapper.data-v-7e3c386d { - margin-left: 22.5rpx; - margin-right: 24.38rpx; background-color: #ffffff; border-radius: 28.13rpx; overflow: hidden; border: solid 9.38rpx #ffffff; } +.pos_1.data-v-7e3c386d { + position: absolute; + left: 22.5rpx; + right: 24.38rpx; + top: 118.13rpx; +} .image_2.data-v-7e3c386d { width: 91.25vw; height: 37.5vw; } -.group.data-v-7e3c386d { - position: relative; - border: 3px solid brown; - margin-top: 22.5rpx; -} .section_3.data-v-7e3c386d { - background-color: #FFFEF8; + padding: 8.44rpx 5.63rpx 750rpx; + background-color: #f7de98; width: 151.88rpx; } -.group_1.data-v-7e3c386d { - width: 142.5rpx; -} -.pos_5.data-v-7e3c386d { +.pos_9.data-v-7e3c386d { position: absolute; - left: 5.63rpx; - top: 5.63rpx; + left: 0; + top: 440.63rpx; } -.section_6.data-v-7e3c386d { +.group.data-v-7e3c386d { + margin: auto; + width: 137.81rpx; +} +.list-item.data-v-7e3c386d { padding: 11.25rpx 0 9.94rpx; background-color: #fffef8; border-radius: 9.38rpx; } -.list-item_1.data-v-7e3c386d:first-child { +.list-item.data-v-7e3c386d:first-child { margin-top: 0; } .image_3.data-v-7e3c386d { @@ -485,58 +507,56 @@ text.data-v-7e3c386d { width: 48.75rpx; height: 48.75rpx; } -.font_3.data-v-7e3c386d { +.font_4.data-v-7e3c386d { font-size: 30rpx; font-family: STFangsong; - line-height: 28.65rpx; + line-height: 28.26rpx; color: #c1651a; } -.text_5.data-v-7e3c386d { - line-height: 28.26rpx; -} .section_4.data-v-7e3c386d { - border: 3px solid blue; - overflow: auto; - margin-right: 7.5rpx; - padding-bottom: 790.13rpx; + padding-bottom: 879.38rpx; background-color: #f8e8c1; border-radius: 0rpx 18.75rpx 0rpx 0rpx; + width: 600.13rpx; +} +.pos_4.data-v-7e3c386d { + position: absolute; + right: 0; + top: 440.63rpx; } .section_5.data-v-7e3c386d { padding: 18.06rpx 16.24rpx 14.94rpx; - background-color: #C1651A; + background-color: #fffef8; border-radius: 0rpx 18.75rpx 0rpx 0rpx; + width: 598.13rpx; } .font_2.data-v-7e3c386d { font-size: 30rpx; font-family: STFangsong; - line-height: 28.65rpx; + line-height: 28.26rpx; color: #000000; } -.text_3.data-v-7e3c386d { - line-height: 28.26rpx; -} -.font.data-v-7e3c386d { +.font_3.data-v-7e3c386d { font-size: 22.5rpx; font-family: STFangsong; line-height: 21.56rpx; color: #727272; } -.text_4.data-v-7e3c386d { +.text_3.data-v-7e3c386d { line-height: 21.15rpx; } -.pos.data-v-7e3c386d { +.pos_5.data-v-7e3c386d { position: absolute; - border: 3px solid red; right: 15rpx; - top: 99.38rpx; + top: 543.75rpx; } -.list-item.data-v-7e3c386d { - padding: 20.63rpx 27.88rpx 22.5rpx; +.section_9.data-v-7e3c386d { + padding: 20.63rpx 22.88rpx 22.5rpx; background-color: #fffef8; border-radius: 9.38rpx; + right: 13.13rpx; } -.list-item.data-v-7e3c386d:first-child { +.list-item_2.data-v-7e3c386d:first-child { margin-top: 0; } .image_4.data-v-7e3c386d { @@ -544,20 +564,14 @@ text.data-v-7e3c386d { width: 131.25rpx; height: 131.25rpx; } -.group_5.data-v-7e3c386d { +.group_3.data-v-7e3c386d { margin-left: 24.84rpx; } -.font_4.data-v-7e3c386d { - font-size: 26.25rpx; - font-family: STFangsong; - line-height: 18rpx; - color: #ff0000; -} -.text_7.data-v-7e3c386d { - -webkit-text-stroke: 1.88rpx #ff000040; +.text_5.data-v-7e3c386d { + line-height: 28.65rpx; } .image_5.data-v-7e3c386d { - margin: 75rpx 3.77rpx 0 96.71rpx; + margin: 75rpx 5.63rpx 0 107.96rpx; border-radius: 9.38rpx; width: 56.25rpx; height: 56.25rpx;