From b7a4fad4f68978b36722e1e6466330426fd44f8e Mon Sep 17 00:00:00 2001 From: LuoShijie Date: Tue, 7 Nov 2023 00:17:38 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E7=BD=97=E4=B8=96=E6=9D=B0=EF=BC=9Afeat?= =?UTF-8?q?=EF=BC=9A=E5=95=86=E9=93=BA=E5=B1=95=E7=A4=BA=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8F=90=E4=BE=9B=E5=88=A0=E9=99=A4=E5=92=8C=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/ShowShopList/ShowShopList.vue | 13 +++- .../ShowShopListItem/ShowShopListItem.vue | 67 +++++++++++++++--- static/shoplist/dp_icon_pj.png | Bin 0 -> 1459 bytes static/shoplist/dp_icon_sc.png | Bin 0 -> 1292 bytes 4 files changed, 68 insertions(+), 12 deletions(-) create mode 100644 static/shoplist/dp_icon_pj.png create mode 100644 static/shoplist/dp_icon_sc.png diff --git a/components/ShowShopList/ShowShopList.vue b/components/ShowShopList/ShowShopList.vue index 95f17c1..c8294a0 100644 --- a/components/ShowShopList/ShowShopList.vue +++ b/components/ShowShopList/ShowShopList.vue @@ -6,6 +6,7 @@ :shopInfo="item" :is-adshow="isADshow" :show-style="showStyle" + @delItem="handleDel" > @@ -15,6 +16,7 @@ * @property {Array} shopInfoList 对象数组，（带图片）需要展示的商铺列表 * @property {Number} showStyle 展示商铺的样式类型(0为首页默认) * @property {Boolean} isADshow 是否显示推广广告 + * @property {Boolean} isEdit 是否显示编辑和删除 */ export default { name:"ShowShopList", @@ -27,7 +29,7 @@ showStyle:{ type: Number, default() { - return 0 + return 1 } }, isADshow: { @@ -76,6 +78,15 @@ }, computed: { + }, + methods: { + handleDel(shopid){ + console.log("删除了商铺", shopid); + // const delindex = this.shopInfoList.findIndex((item,index)=> item.shopid === shopid) + // TODO：不能直接修改 + // if(delindex !== -1) this.shopInfoList = this.shopInfoList.slice(delindex,1) + // console.log(this.shopInfoList); + } } } diff --git a/components/ShowShopListItem/ShowShopListItem.vue b/components/ShowShopListItem/ShowShopListItem.vue index c18883f..c08d77e 100644 --- a/components/ShowShopListItem/ShowShopListItem.vue +++ b/components/ShowShopListItem/ShowShopListItem.vue @@ -35,7 +35,8 @@ - + + @@ -61,14 +62,26 @@ {{shopInfo.phoneNum}} - + + - 已将该店推给 + 已将该店推给 {{shopInfo.promotionNum}} 位潜在客户 我也要推广>> + + + + + 编辑 + + + + 删除 + + @@ -89,7 +102,7 @@ showStyle:{ type: Number, default() { - return 1 + return 0 } }, isADShow: { @@ -97,17 +110,33 @@ default() { return true } + }, + isEdit: { + type: Boolean, + default() { + return false + } } }, data() { return { - + delshopid: 0, } }, computed: { + }, + methods: { + handleEdit(shopid) { + // TODO 完成页面跳转 + console.log("edit clicked"); + console.log(shopid); + }, + handleDel(shopid) { + this.$emit('delItem', shopid) + } } } @@ -161,10 +190,16 @@ } } } - .cart-and-date { - display: flex; + + .bottom-common { border-top: 1px solid #f7f7f7; padding-top: 5px; + display: flex; + > view { + display: flex; + } + } + .cart-and-date { margin-bottom: 6px; justify-content: space-between; font-weight: 500; @@ -174,17 +209,27 @@ } >view { flex:1; - display: flex; >view { margin-right: 4px; } } } + .del-and-edit{ + margin-top: 6px; + justify-content: flex-end; + >view{ + margin-left: 38rpx; + } + text { + margin-left: 4px; + color: #666666; + } + } .list-ads { - border-top: 1px solid #f7f7f7; - padding-top: 5px; - display: flex; justify-content: space-between; + text { + color: #359867; + } } } diff --git a/static/shoplist/dp_icon_pj.png b/static/shoplist/dp_icon_pj.png new file mode 100644 index 0000000000000000000000000000000000000000..d7e9d377b1d655d05b8a9756dc14857e93ba88df GIT binary patch literal 1459 zcmV;k1x)&hP)Px)ZAnByR7gv$mS0R$R~*OhIrmR{xj?DfB65w60U;D2Sl?V0cu>MZAnK4zAY^Yo zG|m87;@swv&P>)NbXlrwk%e|9M#&Oqz$NMf4~vUg`k+#`*hZan2rZSi^w0fs?mf#X zl;8pzB)dtI-t_kOIrn_Ozwhq=>VLd2#$bGW99k?E(A3nV0|0cewm!xf`u%>|WHLd9 zVP5-fy>%dja5x;+nwpw4ilTtu?>CN(ja@(pwVpkDwq6uPIah>`1AzeR^?Ex}snkcB zrr9WpVmI@09LIe%Ffj0mEX%CNC&ZNIgZm#ojUaaP19*j(-6Zj`bH3pG1fFqO(YW9*w~mWo6WXXR8)Any1IT~S@ti4 zP;Bqsy)wWUv!PI^)a7zL-?eL(x3{;~4Izw5lB5s zcTZ2x`ReNGS48`%sVUlGu|R{tu5pq`YtOf}wM_y5k|QG{ zr{nQ>@0l}aDr2!&?7)EoY7W3K%x0oxO&;SD_`b1Iywe8j*~@EG;akEfB5jB@#@v9r_<^5Q3xT-3!V2Z0RRBz z+S=OQFDWT`Wipvcwgi};pEqW+Sqp@4J3@$Gd5c_qnx?U?>xiPLcqWsHV2o1+gTb_E z0I_LpZ7t37JWtbf0n4(CEX#21>UCY$d7jU{c=3WbNZsldOG+oy-$z*a#RaK?Dyu8Hic7K^jB#sRZ4(`Vo&*Y*apQdiN`!<9y z<#0IOSz20(*zI;b5D3tMAmqm9{QUfDfYQ=Z{OHjmBD6*VQBjn#(b3V{G)>F>{rw%Q zS(Kj#larI(j~_q&f@Rs?IF9>C*Y(t9MkaX%LRc)z@-c+azWVz5{zHcj{YVy>OVj*B zGn>ugjT<-GgTY{*EX!|TjG4^>0078nGzM)p+xIOkEk7fK!W9)2ORJ{}GLtdJ=7NF( zD@9QzlAfC_o_`JippeGnI4%;4#S(ROb>x288TnI%AP5Brp+b)1I1&&46m~r*$8n^q zbxD%sOeT|NSvF&{*;JBStAI5fx}|eb{(t0rlt?6WyWOslZCSgJzX3!Pkw$!5(}Ms2 N002ovPDHLkV1nZ2#-9KH literal 0 HcmV?d00001 diff --git a/static/shoplist/dp_icon_sc.png b/static/shoplist/dp_icon_sc.png new file mode 100644 index 0000000000000000000000000000000000000000..e9a4159ffde455200654e81d778dc27330dc4087 GIT binary patch literal 1292 zcmV+n1@roeP)Px(#z{m$R7gwhR$oY4R~SF%+#Bz_=}nB9XjA9Zi8$;eg}C`3QYY#dt~1?Kgh^vu z5oFLluX~W;3KM6wNV`!j+k<1q2hm9&E?rAHMRf5Gc)Pj9EQLtI=3+WcuSw3mXB;sd zuDW)QgMM(}@||gq!E_4Uu)xN&2K5Mnwih<$yetgP&1tyUXsYHE_7$^jvS2?PS#!NI}HvMiTE z2oV6_pTQ7CQE0@QXU?4ItgNgIK?oB^Iv|8l1A9g&G+9|$f}$wd5WykByC~+-~=KilXF08ZJVRVHk#G*%XFh=sFZi zS(b?`%UG7>7{(aWjHn=leyyym9BOQAOhCKc&YU`RNXx0HAQ_2q7sLW5}}XUPaLFq=|piCC@+zg+U=W#3+qu8U_+1VFOCewYbRvS<1 z=H}*J$j!|S8jZ$Hj^nn6hlgW((NWj}fdF^?`t>(AH#bL%i;G{auC5m8p3~_xdA;86 zv$M0$HZ?VUySuxq`2GIu>FMd8)6&u|+HAHj)oL}~+1cUy`}=)7&ktIy*2|@(r4oct zNv01&p%8!V+O>B>q0nb1PoAu^SS)v`1H0W`y|%XY&508yYz++!c8x|O&&|!fbo=)0 z#q{*_53N?~Rg7^=qtRq`cX!_x1mW|}&dy5(1qFZ7N=jw`eLkONbaeEb-|rtVo6T=E zG&Fn{4u|2bTes>~R#wIe3JN;UpFckmi^cH#{JhEGaLgP(e*7bw&DOuMv9YVy>y5p= zy+7%6x|?lnZI_CQio%aFprz{f`?Yqv-MYTMe#LAypS4&lu1F*TT`t$_OG`_mg@uLh z*VNREs8lNK^Z86uQ&V@1Mq_t-d;1jtfE16%b9#Du?&);8FWTGNKPW6L{NtH}XAu40 zs%Uw6S?hE<&-r}5ezV#9j>Te`{x5wHjYf0(`ufC-jEtK$o9)tLeGm?Zh4Jz6y7~Ee zyTM@iq@$ywhmLrs(^Syk4(=zPGn`I2w(% zV&dY~*4AsXEUTY}Z72r_g5asDs`|8~q-2p063oxf-=%jSkqI5yqA2oewK|g!Vn7HT zBZR0FMNuJyScDLz#00}Il=GW=WRi-vI!>c|4w-0000 Date: Tue, 7 Nov 2023 10:55:04 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E9=82=93=E6=B4=81=EF=BC=9A=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E5=AE=9A=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/InputAndSwiper/InputAndSwiper.vue | 67 +++++++++++++------- 1 file changed, 45 insertions(+), 22 deletions(-) diff --git a/components/InputAndSwiper/InputAndSwiper.vue b/components/InputAndSwiper/InputAndSwiper.vue index 6697869..1428a6a 100644 --- a/components/InputAndSwiper/InputAndSwiper.vue +++ b/components/InputAndSwiper/InputAndSwiper.vue @@ -31,62 +31,85 @@ "https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg" ] } - }, - position: { - type: String, - default () { - return '定位' - } } }, data() { return { - + position: '定位1' }; }, options: { styleIsolation: 'shared', // 解除样式隔离 }, created() { - // this.getLocation() + this.open() }, methods: { - getLocation() { + getLocation1() { + let qqmapsdk = new QQMapWX({ + key: 'ZRKBZ-Q7FWL-GVZPK-MCRBU-4XFB5-ATBDB' + }); uni.getLocation({ type: 'wgs84', // geocode: true, // 返回城市信息 // enableHighAccuracy: false, // 开启高精度模式 success: function(res) { - let qqmapsdk = new QQMapWX({ - key: 'ZRKBZ-Q7FWL-GVZPK-MCRBU-4XFB5-ATBDB' - }); + console.log('res.latitude', res.latitude); + console.log('res.longitude', res.longitude); qqmapsdk.reverseGeocoder({ location: { latitude: res.latitude, longitude: res.longitude }, success: (re) => { + console.log("解析地址成功", res); console.log(re.result.ad_info.city, '成都市=='); console.log(re.result.ad_info.district, '武侯区=='); + this.position = re.result.ad_info.city + console.log('thisposition', this.position); }, fail: (re) => { console.log(re, '失败信息'); } }) - } + }, + fail: () => { + console.log("获取经纬度失败"); + }, }); }, //提示用户开启定位服务 open() { - // uni.authorize({ - // scope: 'scope.userLocation', - // success: function() { - // console.log('授权成功'); - // }, - // fail: function() { - // console.log('授权失败'); - // } - // }) + var that=this + uni.authorize({ + scope: 'scope.userLocation', + success: function() { + console.log('授权成功'); + that.getLocation1() + }, + fail: function() { + console.log('授权失败'); + uni.showModal({ + content: '检测到您没打开获取信息功能权限，是否去设置打开？', + confirmText: "确认", + cancelText: '取消', + success: (res) => { + if (res.confirm) { + uni.openSetting({ + success: (res) => { + console.log(res); + that.getLocation1(); + } + }) + } else { + console.log('取消'); + return false; + } + } + }) + return false; + } + }) // wx.getSetting({ // success: (res) => { // if (res.authSetting['scope.userLocation'] === false) { From 9d701e7442600ee477a0303634ca33983af9822e Mon Sep 17 00:00:00 2001 From: LuoShijie Date: Tue, 7 Nov 2023 21:41:15 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E7=BD=97=E4=B8=96=E6=9D=B0=EF=BC=9Afaet?= =?UTF-8?q?=EF=BC=9ASearchShopList=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E7=A7=8D=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/SearchShopList/SearchShopList.vue | 29 ++++- .../SearchShopListItem/SearchShopListItem.vue | 115 +++++++++++++++++- components/ShowShopList/ShowShopList.vue | 6 + .../ShowShopListItem/ShowShopListItem.vue | 3 +- pages/index/index.vue | 2 +- 5 files changed, 146 insertions(+), 9 deletions(-) diff --git a/components/SearchShopList/SearchShopList.vue b/components/SearchShopList/SearchShopList.vue index 4627a85..5fd1b56 100644 --- a/components/SearchShopList/SearchShopList.vue +++ b/components/SearchShopList/SearchShopList.vue @@ -4,6 +4,8 @@ v-for="item in shopInfoList" :key="searchid" :shopInfo="item" + :show-style="showStyle" + @delItem="handleDel" > @@ -20,6 +22,18 @@ }; }, props: { + showStyle:{ + type: Number, + default() { + return 0 + } + }, + isEdit: { + type: Boolean, + default() { + return false + } + }, shopInfoList: { type: Array, default() { @@ -33,7 +47,8 @@ pos: '锦江区', category: '餐饮美食', uname: 'A先生', - sqr: 500 + sqr: 500, + yjtzText: "423万元" }, { searchid: 2, @@ -44,11 +59,21 @@ pos: '锦江区', category: '餐饮美食', uname: '王先生', - sqr: 200 + sqr: 200, + yjtzText: "423万元" } ] } } + }, + methods: { + handleDel(shopid){ + console.log("删除了商铺", shopid); + // const delindex = this.shopInfoList.findIndex((item,index)=> item.shopid === shopid) + // TODO：不能直接修改 + // if(delindex !== -1) this.shopInfoList = this.shopInfoList.slice(delindex,1) + // console.log(this.shopInfoList); + } } } diff --git a/components/SearchShopListItem/SearchShopListItem.vue b/components/SearchShopListItem/SearchShopListItem.vue index 2665eac..b714832 100644 --- a/components/SearchShopListItem/SearchShopListItem.vue +++ b/components/SearchShopListItem/SearchShopListItem.vue @@ -3,6 +3,28 @@ {{shopInfo.title}} + + + + 租金：{{shopInfo.price}}元/月 + 预计投资：{{shopInfo.yjtzText}} + + + + + + + {{shopInfo.category}} + + + + + + {{shopInfo.pos}} + + + + @@ -23,7 +45,8 @@ {{shopInfo.phoneNum}} - + + @@ -43,6 +66,18 @@ 发布日期：{{shopInfo.date}} + + + + + 编辑 + + + + 删除 + + + @@ -66,7 +101,18 @@ } } }, - + showStyle: { + type:Number, + default() { + return 0 + } + }, + isEdit: { + type:Boolean, + default(){ + return false + } + } }, data() { @@ -77,6 +123,15 @@ }, computed: { + }, + methods: { + handleEdit(searchid) { + // TODO 完成页面跳转 + console.log("点击了编辑ID为",searchid); + }, + handleDel(searchid) { + this.$emit('delItem', searchid) + } } } @@ -91,7 +146,26 @@ font-size: 12px; .list-container { display: flex; - height: 90px; + height: auto; + } + .bottom-common { + border-top: 1px solid #f7f7f7; + padding-top: 5px; + display: flex; + > view { + display: flex; + } + } + .del-and-edit{ + margin-top: 6px; + justify-content: flex-end; + >view{ + margin-left: 38rpx; + } + text { + margin-left: 4px; + color: #666666; + } } .text-area { display: flex; @@ -103,13 +177,43 @@ >view { display: flex; >view { - flex:1; display: flex; >view { margin-right: 4px; } } } + + .style2 { + display: flex; + flex-direction: column; + color: #CC3333; + font-weight: 500; + .rent-and-cost { + text{ + margin-right: 26rpx; + } + margin-top: 5px; + padding-top: 5px; + padding-bottom: 6px; + } + .cart-and-pos{ + > view{ + margin-right: 27px; + display: flex; + } + display: flex; + border-top: 1px solid #f7f7f7; + padding-top: 5px; + margin-bottom: 5px; + justify-content: start; + font-weight: 500; + text { + color: #CC3333; + line-height: 12px; + } + } + } .pos-and-sqr { justify-content: space-between; margin-top: 5px; @@ -119,6 +223,7 @@ line-height: 12px; } >view { + flex:1; display: flex; >view { margin-right: 4px; @@ -126,6 +231,7 @@ } } .cart-and-date { + display: flex; border-top: 1px solid #f7f7f7; padding-top: 5px; justify-content: space-between; @@ -133,6 +239,7 @@ text { color: #CC3333; line-height: 12px; + margin-right: 48rpx; } } } diff --git a/components/ShowShopList/ShowShopList.vue b/components/ShowShopList/ShowShopList.vue index c8294a0..d6c99dc 100644 --- a/components/ShowShopList/ShowShopList.vue +++ b/components/ShowShopList/ShowShopList.vue @@ -38,6 +38,12 @@ return true } }, + isEdit: { + type: Boolean, + default() { + return false + } + }, shopInfoList: { type: Array, default() { diff --git a/components/ShowShopListItem/ShowShopListItem.vue b/components/ShowShopListItem/ShowShopListItem.vue index c08d77e..5e03e70 100644 --- a/components/ShowShopListItem/ShowShopListItem.vue +++ b/components/ShowShopListItem/ShowShopListItem.vue @@ -131,8 +131,7 @@ methods: { handleEdit(shopid) { // TODO 完成页面跳转 - console.log("edit clicked"); - console.log(shopid); + console.log("点击了编辑ID为",shopid); }, handleDel(shopid) { this.$emit('delItem', shopid) diff --git a/pages/index/index.vue b/pages/index/index.vue index 54da2f1..0f2f41c 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -32,7 +32,7 @@ data() { return { notice: '寒雨连江夜入吴 平明送客楚山孤 洛阳亲友如相问 一片冰心在玉壶', - chooseIndex: 0, + chooseIndex: 1, statisticsNum: [231753, 1345] } }, From c443043533559cbc371278581aa18618b4bbd7c6 Mon Sep 17 00:00:00 2001 From: LuoShijie Date: Wed, 8 Nov 2023 00:19:10 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E7=BD=97=E4=B8=96=E6=9D=B0=EF=BC=9Afaet?= =?UTF-8?q?=EF=BC=9A=E5=BA=97=E9=93=BA=E8=BD=AC=E8=AE=A9=E3=80=81=E5=BA=97?= =?UTF-8?q?=E9=93=BA=E9=80=89=E5=9D=80=E9=A1=B5=E9=9D=A2=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/DropDown/DropDown.vue | 50 ++++++++++++++++++ components/DropDown/DropDownItem.vue | 8 +++ components/ShowShopList/ShowShopList.vue | 2 +- .../{ => HomeMainContent}/HomeNavCard.vue | 0 .../{ => HomeMainContent}/HomeNoticeBar.vue | 0 .../{ => HomeMainContent}/Statistics.vue | 0 pages/index/index.vue | 8 +-- pages/shopAddress/shopAddress.vue | 19 +++++-- pages/shopTransfer/shopTransfer.vue | 45 ++++++++++++++-- static/dropdown/dp_icon_hlxia.png | Bin 0 -> 270 bytes static/dropdown/dp_icon_lxia.png | Bin 0 -> 273 bytes 11 files changed, 118 insertions(+), 14 deletions(-) create mode 100644 components/DropDown/DropDown.vue create mode 100644 components/DropDown/DropDownItem.vue rename pages/index/{ => HomeMainContent}/HomeNavCard.vue (100%) rename pages/index/{ => HomeMainContent}/HomeNoticeBar.vue (100%) rename pages/index/{ => HomeMainContent}/Statistics.vue (100%) create mode 100644 static/dropdown/dp_icon_hlxia.png create mode 100644 static/dropdown/dp_icon_lxia.png diff --git a/components/DropDown/DropDown.vue b/components/DropDown/DropDown.vue new file mode 100644 index 0000000..80034ea --- /dev/null +++ b/components/DropDown/DropDown.vue @@ -0,0 +1,50 @@ + + + + + \ No newline at end of file diff --git a/components/DropDown/DropDownItem.vue b/components/DropDown/DropDownItem.vue new file mode 100644 index 0000000..02409e3 --- /dev/null +++ b/components/DropDown/DropDownItem.vue @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/components/ShowShopList/ShowShopList.vue b/components/ShowShopList/ShowShopList.vue index d6c99dc..043493c 100644 --- a/components/ShowShopList/ShowShopList.vue +++ b/components/ShowShopList/ShowShopList.vue @@ -29,7 +29,7 @@ showStyle:{ type: Number, default() { - return 1 + return 0 } }, isADshow: { diff --git a/pages/index/HomeNavCard.vue b/pages/index/HomeMainContent/HomeNavCard.vue similarity index 100% rename from pages/index/HomeNavCard.vue rename to pages/index/HomeMainContent/HomeNavCard.vue diff --git a/pages/index/HomeNoticeBar.vue b/pages/index/HomeMainContent/HomeNoticeBar.vue similarity index 100% rename from pages/index/HomeNoticeBar.vue rename to pages/index/HomeMainContent/HomeNoticeBar.vue diff --git a/pages/index/Statistics.vue b/pages/index/HomeMainContent/Statistics.vue similarity index 100% rename from pages/index/Statistics.vue rename to pages/index/HomeMainContent/Statistics.vue diff --git a/pages/index/index.vue b/pages/index/index.vue index 0f2f41c..78900ff 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -20,9 +20,9 @@ - diff --git a/pages/shopTransfer/shopTransfer.vue b/pages/shopTransfer/shopTransfer.vue index 7cbd61a..6ed7966 100644 --- a/pages/shopTransfer/shopTransfer.vue +++ b/pages/shopTransfer/shopTransfer.vue @@ -1,6 +1,12 @@ @@ -9,7 +15,30 @@ export default { data() { return { - + value1: 1, + value2: 2, + options1: [{ + label: '默认排序', + value: 1, + }, + { + label: '距离优先', + value: 2, + }, + { + label: '价格优先', + value: 3, + } + ], + options2: [{ + label: '去冰', + value: 1, + }, + { + label: '加冰', + value: 2, + }, + ], } }, methods: { @@ -18,6 +47,12 @@ } - diff --git a/static/dropdown/dp_icon_hlxia.png b/static/dropdown/dp_icon_hlxia.png new file mode 100644 index 0000000000000000000000000000000000000000..e8ecd9824f0a2a127b2eccc12d237683724586d4 GIT binary patch literal 270 zcmV+p0rCEcP)Px#$Vo&&R47xGkFgEHFc3xmxr7N2f&rikwjyR=2m%!YumvN~5Y_>kG=Ux>3I+fv z60(saVnvZH!Ik&_yZfKu8OeDMz#0I(%W^Z#^GDl8?SGgp- z0E^baR4BC!f|BzDKPx#%Sl8*R47xG&^-=%yTa^HoLMe3tFzjaPt&-sx!01nSWjF`0 z`xC~3fl_JD##TC!I+2`_rBn}wbsq^{KWGb zauY>SY^_b3AQ2^6>-sNVU`yUA*Ym*-*pT;NjG1z-R>(u&_xq0HtT+l0t+m#-_vb$V XMKnE)V-co~00000NkvXXu0mjfyw7e{ literal 0 HcmV?d00001 From 52fe2a05fca17ba651ff6fcbc2c9277ebf438e20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com> Date: Wed, 8 Nov 2023 11:22:19 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E9=82=93=E6=B4=81=EF=BC=9A=E5=9C=B0?= =?UTF-8?q?=E7=90=86=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/InputAndSwiper/InputAndSwiper.vue | 34 +++++++++++++------- manifest.json | 7 ++-- pages.json | 26 ++++++++------- pages/index/HomeMainContent/HomeNavCard.vue | 7 +++- pages/index/map/map.vue | 18 ++++++++--- 5 files changed, 62 insertions(+), 30 deletions(-) diff --git a/components/InputAndSwiper/InputAndSwiper.vue b/components/InputAndSwiper/InputAndSwiper.vue index 1428a6a..4c7c95c 100644 --- a/components/InputAndSwiper/InputAndSwiper.vue +++ b/components/InputAndSwiper/InputAndSwiper.vue @@ -35,25 +35,37 @@ }, data() { return { - position: '定位1' + position: '定位12', + location: '' }; }, options: { styleIsolation: 'shared', // 解除样式隔离 }, created() { + console.log('createsd'); this.open() + console.log('location', this.location); + }, + watch: { + location(val) { + console.log('foo变化了，变化后的值是', val) + // 具体操作=>doSomething + } + }, + onShow() { + console.log('onshow'); + // const location = this.open() + // console.log('location', this.location); }, methods: { getLocation1() { let qqmapsdk = new QQMapWX({ key: 'ZRKBZ-Q7FWL-GVZPK-MCRBU-4XFB5-ATBDB' }); - uni.getLocation({ + uni.getFuzzyLocation({ type: 'wgs84', - // geocode: true, // 返回城市信息 - // enableHighAccuracy: false, // 开启高精度模式 - success: function(res) { + success(res) { console.log('res.latitude', res.latitude); console.log('res.longitude', res.longitude); qqmapsdk.reverseGeocoder({ @@ -65,24 +77,24 @@ console.log("解析地址成功", res); console.log(re.result.ad_info.city, '成都市=='); console.log(re.result.ad_info.district, '武侯区=='); - this.position = re.result.ad_info.city - console.log('thisposition', this.position); + this.location = re.result.ad_info + console.log('success', this.location); }, fail: (re) => { console.log(re, '失败信息'); } }) }, - fail: () => { - console.log("获取经纬度失败"); + fail(err) { + console.log("获取经纬度失败", err); }, }); }, //提示用户开启定位服务 open() { - var that=this + var that = this uni.authorize({ - scope: 'scope.userLocation', + scope: 'scope.userFuzzyLocation', success: function() { console.log('授权成功'); that.getLocation1() diff --git a/manifest.json b/manifest.json index 942d70f..a87efa3 100644 --- a/manifest.json +++ b/manifest.json @@ -59,9 +59,12 @@ // 获取当前的地理位置、速度 配置 "scope.userLocation": { "desc": "你的位置信息将用于小程序位置接口的效果展示" + }, + "scope.userFuzzyLocation": { + "desc": "你的位置信息将用于小程序位置的效果展示" } - } - + }, + "requiredPrivateInfos": ["choosePoi", "chooseAddress", "getFuzzyLocation"] }, "mp-alipay": { "usingComponents": true diff --git a/pages.json b/pages.json index 40348e8..80023ad 100644 --- a/pages.json +++ b/pages.json @@ -97,17 +97,16 @@ } } - - ,{ - "path" : "pages/Partnerships/Partnerships", - "style" : - { - "navigationBarTitleText": "成功合伙人", - "enablePullDownRefresh": false - } - - } - ], + + , { + "path": "pages/Partnerships/Partnerships", + "style": { + "navigationBarTitleText": "成功合伙人", + "enablePullDownRefresh": false + } + + } + ], "tabBar": { "color": "#CCCCCC", "borderStyle": "white", @@ -146,6 +145,11 @@ "navigationBarBackgroundColor": "#F8F8F8", "backgroundColor": "#F8F8F8" }, + "permission": { + "scope.userFuzzyLocation": { + "desc": "你的位置信息将用于小程序位置的效果展示" + } + }, "uniIdRouter": {}, "condition": { //模式配置，仅开发期间生效 "current": 0, //当前激活的模式(list 的索引项) diff --git a/pages/index/HomeMainContent/HomeNavCard.vue b/pages/index/HomeMainContent/HomeNavCard.vue index c180164..3270311 100644 --- a/pages/index/HomeMainContent/HomeNavCard.vue +++ b/pages/index/HomeMainContent/HomeNavCard.vue @@ -1,6 +1,6 @@ @@ -45,11 +45,19 @@ } ], shopList: { + shopid: 1, imageUrl: 'https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg', title: '琴行铺面转让', promotionNum: 23, - price: 5000, - date: '2023-11-02' + price: 6000, + date: '2023-11-02', + pos: '锦江区', + exactPos: '锦江区-汇源南路366号', + sqr: 100, + zrfText: "转让费：20万", + category: '餐饮美食', + uname: "张先生", + phoneNum: 13348946108, } } }, @@ -119,8 +127,8 @@ position: absolute; z-index: 1; bottom: 60rpx; - left: 10%; - transform: translateX(-10%); + left: 50%; + transform: translateX(-50%); .list-border { margin: 0; From 02f57c1827fbd5afc0519f0b4cf45595bef801f6 Mon Sep 17 00:00:00 2001 From: dengj <209192278@qq.com> Date: Wed, 8 Nov 2023 14:19:13 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E9=82=93=E6=B4=81:=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=AE=9A=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/InputAndSwiper/InputAndSwiper.vue | 27 ++++++-------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/components/InputAndSwiper/InputAndSwiper.vue b/components/InputAndSwiper/InputAndSwiper.vue index 4c7c95c..77316e2 100644 --- a/components/InputAndSwiper/InputAndSwiper.vue +++ b/components/InputAndSwiper/InputAndSwiper.vue @@ -35,8 +35,7 @@ }, data() { return { - position: '定位12', - location: '' + position: '' }; }, options: { @@ -45,21 +44,10 @@ created() { console.log('createsd'); this.open() - console.log('location', this.location); - }, - watch: { - location(val) { - console.log('foo变化了，变化后的值是', val) - // 具体操作=>doSomething - } - }, - onShow() { - console.log('onshow'); - // const location = this.open() - // console.log('location', this.location); }, methods: { getLocation1() { + var that = this let qqmapsdk = new QQMapWX({ key: 'ZRKBZ-Q7FWL-GVZPK-MCRBU-4XFB5-ATBDB' }); @@ -74,11 +62,12 @@ longitude: res.longitude }, success: (re) => { - console.log("解析地址成功", res); - console.log(re.result.ad_info.city, '成都市=='); - console.log(re.result.ad_info.district, '武侯区=='); - this.location = re.result.ad_info - console.log('success', this.location); + console.log("解析地址成功", re); + console.log(re.result.ad_info.city,); + console.log(re.result.ad_info.district, ); + let city=re.result.ad_info.city + let district=re.result.ad_info.district + that.position = city.slice(0,2) + district.slice(0,2) }, fail: (re) => { console.log(re, '失败信息'); From 87c0c73cf537eab9ae6c102a20aab6ea64f0140c Mon Sep 17 00:00:00 2001 From: LuoShijie Date: Thu, 9 Nov 2023 14:10:42 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E7=BD=97=E4=B8=96=E6=9D=B0=EF=BC=9Afix?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/DropDown/DropDown.vue | 72 ++++++++++++------- components/DropDown/DropDownItem.vue | 12 +++- .../ShowShopListItem/ShowShopListItem.vue | 14 +++- pages/shopAddress/shopAddress.vue | 12 ++-- pages/shopTransfer/shopTransfer.vue | 42 ++++------- 5 files changed, 90 insertions(+), 62 deletions(-) diff --git a/components/DropDown/DropDown.vue b/components/DropDown/DropDown.vue index 80034ea..c3bec0a 100644 --- a/components/DropDown/DropDown.vue +++ b/components/DropDown/DropDown.vue @@ -1,12 +1,21 @@