From 015a3c6f33e1b32eb14eef7d33835123c458edd3 Mon Sep 17 00:00:00 2001 From: THK3121 Date: Fri, 9 Jun 2023 16:05:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=88=97=E8=A1=A8=E6=94=B9?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/columnGoods/goods_search_con/index.vue | 645 +++++++++++++------ pages/product/addGoods/modifyPrice.vue | 1 + static/images/clock.png | Bin 0 -> 474 bytes static/images/dingwei.png | Bin 0 -> 506 bytes static/images/guanbi.png | Bin 0 -> 877 bytes static/images/phone.png | Bin 0 -> 417 bytes static/images/shangpu.png | Bin 0 -> 386 bytes 7 files changed, 453 insertions(+), 193 deletions(-) create mode 100644 static/images/clock.png create mode 100644 static/images/dingwei.png create mode 100644 static/images/guanbi.png create mode 100644 static/images/phone.png create mode 100644 static/images/shangpu.png diff --git a/pages/columnGoods/goods_search_con/index.vue b/pages/columnGoods/goods_search_con/index.vue index 04eb1bd..8c69c14 100644 --- a/pages/columnGoods/goods_search_con/index.vue +++ b/pages/columnGoods/goods_search_con/index.vue @@ -8,12 +8,13 @@ - + - - + + @@ -22,7 +23,8 @@ - + {{downMenu[downKey].title}} @@ -45,12 +47,13 @@ - + {{item.title}} 筛选 - + @@ -61,12 +64,12 @@ - + 已售罄 - + @@ -77,7 +80,8 @@ ￥{{item.price}} - + ￥{{item.svip_price}} @@ -85,9 +89,12 @@ - {{item.merchant.type_name}} - 自营 - {{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}} + {{item.merchant.type_name}} + 自营 + {{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}} 领券 包邮 @@ -116,7 +123,8 @@ - + {{loadTitle}} @@ -134,32 +142,51 @@ - - - - - {{item.mer_name}} - - {{item.type_name}} - 自营 - - - - - - {{item.product_score}} - - {{item.distance}} - - + + + + + + + +

{{item.mer_name}}

+ + + + {{item.service_phone}} + + + + + + {{item.mer_take_time[0]}}-{{item.mer_take_time[1]}} + + + + + + + +

+ {{item.mer_address}} +

+ + + + +

+ {{item.mer_info}} +

+ + + + + - 进店 - - + {{loadTitle}} - + @@ -195,23 +222,30 @@ - + + - + {{item.title}} - + + + + + @@ -232,19 +266,30 @@ storeMerchantList, getGeocoder } from '@/api/store.js'; - import {initiateAssistApi} from '@/api/activity.js'; + import { + initiateAssistApi + } from '@/api/activity.js'; import recommend from '@/components/recommend'; import rightSlider1 from '@/components/rightSlider.vue'; import rightSlider2 from '@/components/rightSlider/index'; import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue' - import { merClassifly, getStoreTypeApi } from '@/api/store.js'; - import { configMap } from "@/utils"; - import { mapGetters } from "vuex"; + import { + merClassifly, + getStoreTypeApi + } from '@/api/store.js'; + import { + configMap + } from "@/utils"; + import { + mapGetters + } from "vuex"; // #ifndef H5 import passwordPopup from '@/components/passwordPopup'; // #endif import authorize from '@/components/Authorize'; - import { HTTP_REQUEST_URL } from '@/config/app'; + import { + HTTP_REQUEST_URL + } from '@/config/app'; import { goShopDetail } from '@/libs/order.js' @@ -357,7 +402,7 @@ page: 1, limit: 10, order: '', - category_id : '', + category_id: '', type_id: '' }, storeKey: 0, @@ -374,6 +419,8 @@ merList: [], //商户分类 mTop: 0, activeIndex: 0, + show:false, //质资弹出层 + image:''//图片 }; }, onLoad: function(options) { @@ -386,8 +433,7 @@ this.getClassfication(); this.getStoreType(); }, - onReady() { - }, + onReady() {}, mounted() { uni.getStorage({ key: 'GLOBAL_DATA', @@ -411,7 +457,12 @@ } }) }, - ...configMap({margin_ico_switch: 0,margin_ico: '',hide_mer_status:0,recommend_switch: 0},mapGetters(['uid','isLogin','scrollTop','viewColor','keyColor'])), + ...configMap({ + margin_ico_switch: 0, + margin_ico: '', + hide_mer_status: 0, + recommend_switch: 0 + }, mapGetters(['uid', 'isLogin', 'scrollTop', 'viewColor', 'keyColor'])), }, // 滚动监听 onPageScroll() { @@ -429,10 +480,10 @@ this.$wechat.seeLocation({ latitude: Number(lat), longitude: Number(lon) - }).then(res=>{ + }).then(res => { console.log('success'); }) - }else{ + } else { //#endif uni.openLocation({ latitude: parseFloat(lat), @@ -445,7 +496,7 @@ console.log(res) }, }); - // #ifdef H5 + // #ifdef H5 } //#endif }, @@ -543,14 +594,15 @@ order: this.sotreParam.order, category_id: this.sotreParam.category_id, type_id: 10 - + } if (this.latitude) { serachData.location = this.latitude + ',' + this.longitude } storeMerchantList(serachData).then(res => { res.data.list.forEach(item => { - var tempNum = parseFloat(item.product_score) + parseFloat(item.service_score) + parseInt(item.postage_score) + var tempNum = parseFloat(item.product_score) + parseFloat(item.service_score) + + parseInt(item.postage_score) tempNum = tempNum / 3 / 5 * 100 item.allScore = tempNum.toFixed(2) }) @@ -558,6 +610,7 @@ this.storeList = this.storeList.concat(res.data.list) this.count = res.data.count this.loading = false + console.log(this.storeList); }) }, // 店铺排序 @@ -632,7 +685,7 @@ }) }, // 组件确定 - confirm(data,index) { + confirm(data, index) { let arr = [] if (data.brandList.length == 0) { this.where.brand_id = '' @@ -659,11 +712,12 @@ this.price = 0; this.sotreParam.page = 1 this.sotreParam.order = '', - this.rightBox2 = true + this.rightBox2 = true }, // 组件确定 confirm2(data) { - let arr1 = [],arr2 = [] + let arr1 = [], + arr2 = [] if (data.storeTypeArr.length == 0) { this.sotreParam.type_id = '' } else { @@ -752,11 +806,11 @@ that.hotPage++ that.hotScroll = res.data.list.length < that.hotLimit that.hostProduct = that.hostProduct.concat(res.data.list) - if(that.hostProduct.length == res.data.count){ + if (that.hostProduct.length == res.data.count) { uni.showToast({ - title: '推荐商品,加载完毕', - duration: 2000, // 显示时长，单位为毫秒 - icon: 'success' // 提示图标，可选值：success / loading / none + title: '推荐商品,加载完毕', + duration: 2000, // 显示时长，单位为毫秒 + icon: 'success' // 提示图标，可选值：success / loading / none }) } }); @@ -823,7 +877,23 @@ uni.navigateTo({ url: `/pages/store/home/index?id=${id}` }) + }else if(this.storeList.type_id == 12){ + uni.navigateTo({ + url: `/pages/nongKe/supply_chain/merchant?id=${id}` + }) } + }, + qctail(item){ + console.log(item); + if(item.mer_certificate == '' ){ + return + } + this.show=true + this.image=item.mer_certificate[0] + console.log(this.show); + }, + close(){ + this.show=false } }, onPullDownRefresh() { @@ -852,21 +922,22 @@ } } }, - onPullDownRefresh(){ - setTimeout(()=>{ + onPullDownRefresh() { + setTimeout(() => { const newList = this.productList.reverse(); this.productList = newList; uni.stopPullDownRefresh(); - },500) + }, 500) } } + .guanbi{ + width: 20px ; + height: 20px; + margin: 30px auto; + } + .pop{ + z-index: 1; + } + \ No newline at end of file diff --git a/pages/product/addGoods/modifyPrice.vue b/pages/product/addGoods/modifyPrice.vue index 155e80c..1687952 100644 --- a/pages/product/addGoods/modifyPrice.vue +++ b/pages/product/addGoods/modifyPrice.vue @@ -258,6 +258,7 @@ export default { }, complete(res) { console.log(res) + console.log(that.multiSpecificationList); } }); }, diff --git a/static/images/clock.png b/static/images/clock.png new file mode 100644 index 0000000000000000000000000000000000000000..c45580ab9527cd4d37465fef7d88b838c224ebae GIT binary patch literal 474 zcmV<00VV#4P)Px$lu1NER5(wq)IUg;Q51mj=Yfd+K!Zz2L{U?VE)hatWJE|qOJq8w;ABhCpj$#q zZ4E6sNQAYxCthrzAWL07za+OkE_rKa8@0y95@e5s@E&) zM}c+Vs=8Z7v;aJ4)TD7JB5I*rwyfZwphu0oHVI6t?@OpBHJf_# zkp5{`w=;4M_yBaMKdTKn4J@iJ4x7O|LLY(WYMOw9vlbDj@-6eg({xi!y;3A^fm!ug z?TF-%k0k`S155$Sz;__M-YuXD7;Qw-6e=3=bjCW;C;&Ua5-?X6Y0Lgc`#Pzt6LnH{ QW&i*H07*qoM6N<$f+zgPF#rGn literal 0 HcmV?d00001 diff --git a/static/images/dingwei.png b/static/images/dingwei.png new file mode 100644 index 0000000000000000000000000000000000000000..9728b987741a8a21db43058ff23e4d5afae7c43a GIT binary patch literal 506 zcmVPx$v`IukR5(wqlud}vQ51)tCkqmr$=(KO7Sc2+VKEC+N=-8hD;5*xW91_$JNYaN zYDzS-n1zIiBuZImYMR}Ig$+w3N|A*|ilbX+bmx8Fzp-$4_v1Y0<9E)L|FrDHiHNPh zabQPv{}s3oOsPLw?b<*QaT?eUoCRjpU&SaQx_}X22sos^sbR}N3E2dUt3Ml}?FMca zXX^W^r9O^`HNZpQf;yj$jsUCG>un&lr}Fqp-CphcGwm}8>I3$vMVw_3EvUVf;Y(nr z`aKPg0_)YQxi8B0sOMTivqf6cEze39j{yV!G_+Nri(&_XL7?>0ja04t0&T0~ wH&Ve)lu6GK8C2gjiSSoYrnC-NTxpPh173H)6KKJVaR2}S07*qoM6N<$g4}H1O#lD@ literal 0 HcmV?d00001 diff --git a/static/images/guanbi.png b/static/images/guanbi.png new file mode 100644 index 0000000000000000000000000000000000000000..d86769eb03b9c2bc52a9898b024a414cc755e637 GIT binary patch literal 877 zcmV-z1CsoSP)Px&CrLy>R9HvNm`SLQVHAg-UtvWQkx-^sm=iXLNXA%lOKix(JgkU_6}h=q*hnEu zv)CA}g(>4rL@1J}3@cMdN9V8a{_i(kSMGh6-*?{keZKRa^Lx+vL^Fn&bq8hulYyZ? zU!YSg@fmml+y^cKXC=KYyS&O6n%M+kLqN1EGY9zLFu+bpSBmE3f|yxl0IF@wY&ftV7#HuhNZM9y*94>r!jEOWr0;(N zQJG_A?SWmu$}E^hAaNXr!+4XV9W4P!@y~{9fSds40EZ+k%K4h{z(YwN@-{WIp7F&eCH+jZHM2v&Lg0j?xeD2S6?CJrbi&LW z!d?0jm?Y_G#s&jI;(G)0BpuJNbDg;zr_jqm+ye)J21$N@qz*Id788AgR2VZ$Lb%OX zNw0I(d=Lt}*g+h^VO%v`2{T8^Mt?k$_bvyd7Fg|$aFCn8XrM;Y(V~D$+c4(%jhpGM zjN@_ncger$An$>$;YPp63P%cz&uJD!WUF70*MavA@)hU+43_k`kRlAKVEk!r5NCK~ z5by~2)}}z-0iF>a;jMZ!Z6;VN>APFfy8oQMyMZ;8^eroBJv`0wvLhv%M&?}yX4Xj1 zd;^boFX!?kekyRGC_AcP#!I?dAn{&w^(lSnnVH*8@peJdn}Q?s;CDGlg$NC4eCfqQ zZx=4NQW@a2Pkn0@M)fWiO$wv%N1ORNWGh60x6$xAfh3O0uY>7c#RJ1qe$;p>`u*W$Px$TS-JgR5(wq(?2MMQ5?qc?-Qe9Ggu@mn=D3`!op<1C`5@;l7DwIP&QH)M#-cM zq?Es#!D3NLncQr5@aWX*b}lz>Z{0J!o%6n*^Pb;%exgc4RdOgnw!`xl&;v|Ky2!Fg z3{3;gz&daYi8CB-jZsA?YdYm@#xKsWXD=fKy;n(qk6r z2w0Hx96qwW2)s+$OGCnX{71b&zoeN2ngu>2?PrAodI^k3da>OAoB=sWg*2=zkhVjO zR)IcAww(i3fMH3mwwr(rU{_Muv^4%C+xA*0k)!~IT7{e31m2RI%>m(^vYb_d!rUQn zBWXLq!dz=o{6eLiRqQp}HNXz=ncQUYca0)!S<=27`7z36homap{fp$srsokFx zI1jV{2fzdH1q=Y)z+kx5R47V%BQONC0kyz&sAcHQvOuQgByIg00dtTO*26rS00000 LNkvXXu0mjf(L}Tv literal 0 HcmV?d00001 diff --git a/static/images/shangpu.png b/static/images/shangpu.png new file mode 100644 index 0000000000000000000000000000000000000000..38035e77a01f7235f5b471cf39492d6eed6c5e75 GIT binary patch literal 386 zcmV-|0e$|7P)Px$JV``BR5(xF)IUg-Q5eVZ&u_>=w5h$pHU+mkNrSFJWlK}o8YrTRATBKpA>q(e za4$hy^k-;k2`AB|B?t+coJAKK`g7ui_r|@q;l06~I@>wt;rl#%e}@wzS{V^XAE=bF ziTn6DM1${GO7f|y{R1kcT*e`0lKf}_l~NXQJITF4&@Id-S!se)_obAJ_>5~we)UfD z6mOEe8wOOvUg1%a{a(-)%qBVi2hcL6l5F>azG6Dbx4K*9;8K#8_5K2$;6ak(`s@x` zN!EKoRbnmdRKiiYs-!=|N33EJSFnW%Jj9J8M}zUdtqTsYTZ7hc74Pu^bGVBIY$SQz zms&k)8=WM3O`b|AeYJxV{pXaNqyPW_ literal 0 HcmV?d00001