From 22962e3dcd27452e090b0f367a6a80836963b35e Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Wed, 15 Nov 2023 17:58:30 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/addInvoicing/index.vue | 8 ++++++-- pages/users/user_invoice_list/index.vue | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/components/addInvoicing/index.vue b/components/addInvoicing/index.vue index 511dc88..74ae59a 100644 --- a/components/addInvoicing/index.vue +++ b/components/addInvoicing/index.vue @@ -1,5 +1,5 @@ From f8f958e4a7426a469bbc98f8bd949cf3bec5bd39 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Wed, 15 Nov 2023 19:09:02 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B8=E9=94=80?= =?UTF-8?q?=E8=BF=87=E7=9A=84=E6=A0=B8=E9=94=80=E7=A0=81=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order_details/index.vue | 39 +++++++++++++++++++++++++++++----- static/images/used.png | Bin 0 -> 11208 bytes 2 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 static/images/used.png diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index 69e7b32..7625e9d 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -397,10 +397,11 @@ - + + - {{orderInfo.verify_code}} + {{orderInfo.verify_code}} @@ -778,7 +779,7 @@ showMaoLocation: function() { if (!this.orderInfo.take.mer_take_location[0] || !this.orderInfo.take.mer_take_location[1]) return this .$util.Tips({ - title: '请设置允许商城访问您的位置！' + title: '商家未设置具体位置！请联系商家！' }); let that = this, lat = parseFloat(that.orderInfo.take.mer_take_location[0]), @@ -1522,9 +1523,21 @@ width: 290rpx; height: 290rpx; margin: 0 auto; + position: relative; + .used-img{ + width: 175.23rpx; + height: 175.23rpx; + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + } } - - .grayBg .pictrue image { + .used-white{ + opacity: 0.2; + } + + .grayBg .pictrue .image { width: 100%; height: 100%; display: block; @@ -1665,6 +1678,22 @@ background: #ffffff; border-radius: 16rpx 16rpx 0 0; position: relative; + + .used{ + position: absolute; + bottom: 0; + left: 0; + width: 100%; + height: 450rpx; + background-color: rgba(255, 255, 255, 0.8); + display: flex; + justify-content: center; + align-items: center; + image{ + width: 175.23rpx; + height: 175.23rpx; + } + } .iconfont { font-size: 24rpx; diff --git a/static/images/used.png b/static/images/used.png new file mode 100644 index 0000000000000000000000000000000000000000..dd061d245f746f0090f645d6cd4d12bea2c4b8dd GIT binary patch literal 11208 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 K%T>!*hW#I{_GMuJ literal 0 HcmV?d00001 From 72d91272fb374ecb1ad5172d3fc046a20d34e17d Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Thu, 16 Nov 2023 09:06:03 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=8D=A1=E7=89=87=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/WaterfallsFlowItem/WaterfallsFlowItemo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue b/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue index 3d278f7..4bf5e29 100644 --- a/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue +++ b/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue @@ -177,7 +177,7 @@ .price { margin-left: 21rpx; - margin-bottom: 10rpx; + // margin-bottom: 10rpx; color: #F84221; font-size: 44rpx; font-weight: 600; From 8beb5a3d8b077e1b7ce06ca9234bfab72cb0f2db Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Thu, 16 Nov 2023 09:45:29 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=82=AC=E6=B5=AE=E7=90=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/users/order_list/index.vue | 2 +- pages/users/order_list/indexCopy.vue | 2 +- pages/users/order_list/order.vue | 2 +- pages/users/order_list/relase.vue | 2 +- pages/users/order_list/search.vue | 2 +- pages/users/user_invoice_form/index.vue | 2 +- pages/users/user_invoicing/index.vue | 2 +- pages/users/user_return_list/index.vue | 2 +- pages/users/user_spread_code/index.vue | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue index dffbc8b..7acf0c2 100644 --- a/pages/users/order_list/index.vue +++ b/pages/users/order_list/index.vue @@ -294,7 +294,7 @@ - + diff --git a/pages/users/order_list/indexCopy.vue b/pages/users/order_list/indexCopy.vue index 0ea1728..c8b06fa 100644 --- a/pages/users/order_list/indexCopy.vue +++ b/pages/users/order_list/indexCopy.vue @@ -331,7 +331,7 @@ - + diff --git a/pages/users/order_list/order.vue b/pages/users/order_list/order.vue index 59c3119..072b2d9 100644 --- a/pages/users/order_list/order.vue +++ b/pages/users/order_list/order.vue @@ -293,7 +293,7 @@ - + diff --git a/pages/users/order_list/relase.vue b/pages/users/order_list/relase.vue index 495fcae..d605485 100644 --- a/pages/users/order_list/relase.vue +++ b/pages/users/order_list/relase.vue @@ -335,7 +335,7 @@ - + diff --git a/pages/users/order_list/search.vue b/pages/users/order_list/search.vue index c8d9063..bece705 100644 --- a/pages/users/order_list/search.vue +++ b/pages/users/order_list/search.vue @@ -224,7 +224,7 @@ - + diff --git a/pages/users/user_invoice_form/index.vue b/pages/users/user_invoice_form/index.vue index d38bd44..e62aa5e 100644 --- a/pages/users/user_invoice_form/index.vue +++ b/pages/users/user_invoice_form/index.vue @@ -99,7 +99,7 @@ - + diff --git a/pages/users/user_invoicing/index.vue b/pages/users/user_invoicing/index.vue index 61fbe16..8c48d0d 100644 --- a/pages/users/user_invoicing/index.vue +++ b/pages/users/user_invoicing/index.vue @@ -104,7 +104,7 @@ - + diff --git a/pages/users/user_return_list/index.vue b/pages/users/user_return_list/index.vue index a620ac8..5056dd1 100644 --- a/pages/users/user_return_list/index.vue +++ b/pages/users/user_return_list/index.vue @@ -26,7 +26,7 @@ {{loadTitle}} - + diff --git a/pages/users/user_spread_code/index.vue b/pages/users/user_spread_code/index.vue index 2b0bb2d..cff52b4 100644 --- a/pages/users/user_spread_code/index.vue +++ b/pages/users/user_spread_code/index.vue @@ -33,7 +33,7 @@ - + Date: Thu, 16 Nov 2023 19:09:57 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=9A=E4=BD=8D?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 8 + pages/select_address/select_address.vue | 217 ++++++++++++++++++++++++ pages/store/settled/index.vue | 4 +- static/images/re_address.png | Bin 0 -> 1427 bytes 4 files changed, 227 insertions(+), 2 deletions(-) create mode 100644 pages/select_address/select_address.vue create mode 100644 static/images/re_address.png diff --git a/pages.json b/pages.json index 29cd046..6c1f031 100644 --- a/pages.json +++ b/pages.json @@ -178,6 +178,14 @@ "enablePullDownRefresh": false } + }, + { + "path" : "pages/select_address/select_address", + "style" : + { + "navigationBarTitleText" : "选择位置", + "enablePullDownRefresh" : false + } } ], "subPackages": [{ diff --git a/pages/select_address/select_address.vue b/pages/select_address/select_address.vue new file mode 100644 index 0000000..c93b55e --- /dev/null +++ b/pages/select_address/select_address.vue @@ -0,0 +1,217 @@ + + + + + \ No newline at end of file diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue index 4a64586..761b331 100644 --- a/pages/store/settled/index.vue +++ b/pages/store/settled/index.vue @@ -648,7 +648,7 @@ `${this.business[0][this.index2[0]].name} ${this.business[1][this.index2[1]].name} ${this.business[2][this.index2[2]].name}` this.area_id = this.business[0][this.index2[0]].code this.street_id = this.business[1][this.index2[1]].code - + if(this.merchantData.mer_type==12) return ; //市级供应链不需要查询镇农科公司 merstreet({ street_code: this.street_id }).then((res) => { @@ -1046,7 +1046,7 @@ }); if (!this.mer_storeType) return that.$util.Tips({ - title: '请选择商户类型' + title: '请选择店铺类型' }) if (!this.business_name) return that.$util.Tips({ title: '请选择店铺所在地' diff --git a/static/images/re_address.png b/static/images/re_address.png new file mode 100644 index 0000000000000000000000000000000000000000..3d7daacacbe74f5ad618f3ebf80168e07d8bb9a9 GIT binary patch literal 1427 zcmV;E1#J3>P)Px)O-V#SR9HvtnO}%hRUF5^zjIe-W_L6fwW7$q3qEY1R1ZB!J=_@;6pL0WFf!cG zK*>lUsE42pdax&rjD(DmHY9w|XvGC>=R!q64+d?t4}y0$h)iME*%{~VdguJ&-nlc~ z9q-J!cV-j>@6)p9{LcBD@A;nJ`7?yO?4!Gk7x#c~_l$K^Vcz)gN=Iq~fat1#OQ%a{ zm+1S;S2{J2wt)XNR;QPt=Xnws1j7K)icm1-SrAN?JUWLP-`sCrEwnm-mVkL<{{!=7 zeg}lTAWFvSoY@BBSVE&ittcNG*f#VxK^P8E(*g4YKxq)xdV^qG0=NL8bpU*u_``Em zXACDz>!UaWjtuNh|8nX%1)?p14jh0-%MvGwC|+=9$ zyXtQW4oO~LpAA&1#VwzAvxlJHy_Cmn=ef8#Y_Org3x>W+3i{H|UuTlz*7mpnt<<-( z{oes_^E8Cyp{1sEqQ0F_U^}ay258W&T$a4O$F$D00uVQ*Xy}8QpwrES3J1>UGyY<8 z^0Lqy)rWBb>+5?~6zLh?7PHBm)vHuEZ#=YWsYqP)7u#>iob^PzAaUaDjD8VBkGnAo za(?x4^Y3fH_*)eAlDW`+r~u;<5s%b&$da#>KwtNo)@&S@U?xd{UnW7TZfTn_1R~x2 zzm&Y8+q8aB0P6+`%BesYawIiA^@^%qSa~U{pCr%@RV+)+q)f}~2rvO7iSf%V0ncaq zzhYo#hk&D40$1`Vjad;iIpdLaOQ`FjX9vK} z%R=3wB)F-N# z1*31b6ryrRWNz&M@2MQTA~D+<7SYb#JwWj%&d8;3~{0MAfp&$>`SPI@|I@M zaeynZ+E~Xfp{|nt?c-Mv4fs=LGxPpb1A9aTE*X8hiRfreS;j=33ma6sr&8g7pK~?n zir2;n@~uQ}`j4PRRKN?F{>LQv(Bg*_OgPM&JMxfHg>f&JDZgtVvyBD02OjSV6!=E-vhb2h*=qer3I|)SJOw%>>@UB%_0JC1GKmH0HVrWHBb~leB6=vFp350n{5fW+DPR=yL$%-+Scqr zn;F*x@dYX6**TQXM4kRH4cY>(Z_wRrG|08VpA2ronXJE;MV*Y>4%`k%)Yy(H9JSMS h>fHlwN4+Sq{{bP^yh}74A58!N002ovPDHLkV1n1Ut^xo6 literal 0 HcmV?d00001 From 2a7a95c5a752ad1b0cfb9c779fc9c5a8686326bc Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Fri, 17 Nov 2023 15:38:21 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E5=A4=9A=E8=A7=84=E6=A0=BC=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/shortPopup.vue | 75 ++++++++++++++++++++------ pages/goods_details/index.vue | 2 +- pages/nongKe/cloud_entrepot/indexb.vue | 2 +- pages/nongKe/cloud_entrepot/indexh.vue | 2 +- 4 files changed, 62 insertions(+), 19 deletions(-) diff --git a/components/shortPopup.vue b/components/shortPopup.vue index 372dd30..e34c339 100644 --- a/components/shortPopup.vue +++ b/components/shortPopup.vue @@ -32,10 +32,16 @@ - 规格选中 - - {{item||'默认'}} - + + {{att.attr_name}} + + + {{item.attr}} + + + 购买数量 @@ -45,7 +51,7 @@ - 商品库存 {{(sku[sku_key] && sku[sku_key].stock)||change.stock}} + 商品库存 {{(sku[changeSkuKey] && sku[changeSkuKey].stock)||change.stock}} @@ -65,9 +71,16 @@