From 934051fc70140c6205a32399a0271ea8c56be8e1 Mon Sep 17 00:00:00 2001 From: YWQ HK IX <568170040@qq.com> Date: Sat, 10 Dec 2022 18:18:58 +0800 Subject: [PATCH] uploaf --- assets/images/certification.png | Bin 0 -> 979 bytes assets/images/chevron.png | Bin 0 -> 376 bytes assets/images/merchantImgCover.png | Bin 0 -> 8454 bytes assets/images/siteImg.png | Bin 0 -> 985 bytes components/shop/shop.js | 92 ++++++++++ components/shop/shop.json | 3 + components/shop/shop.wxml | 58 +++++++ components/shop/shop.wxss | 205 +++++++++++++++++++++++ ext.json | 23 +-- pages/coupon/detail/index.js | 30 ++-- pages/coupon/detail/index.json | 1 + pages/coupon/detail/index.wxml | 3 +- pages/dateLsit/dateLsit.wxss | 3 +- pages/spellGroup/mySpellGroup/index.js | 48 ++++-- pages/spellGroup/mySpellGroup/index.json | 3 +- pages/spellGroup/mySpellGroup/index.wxml | 20 ++- 16 files changed, 439 insertions(+), 50 deletions(-) create mode 100644 assets/images/certification.png create mode 100644 assets/images/chevron.png create mode 100644 assets/images/merchantImgCover.png create mode 100644 assets/images/siteImg.png create mode 100644 components/shop/shop.js create mode 100644 components/shop/shop.json create mode 100644 components/shop/shop.wxml create mode 100644 components/shop/shop.wxss diff --git a/assets/images/certification.png b/assets/images/certification.png new file mode 100644 index 0000000000000000000000000000000000000000..143e7c828b97b0f600e3ea9cc68e8399f27fc8fa GIT binary patch literal 979 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 literal 0 HcmV?d00001 diff --git a/assets/images/siteImg.png b/assets/images/siteImg.png new file mode 100644 index 0000000000000000000000000000000000000000..42fdd84f297f32585418d471ff27cbbfab7538c2 GIT binary patch literal 985 zcmV;~119{5P)Px&lSxEDR9Hu~mrHCDR}_Z-W7nh$#Ew_+H3|Z;;*Hd9phSwVd3Qk-b_9eVR3dFv zf$AAi5hR!~g-S&r@u;d6HWdXHgy)Qr!fSyLs1jXOpq6+{fKV2d5K3a=g9Z_ZojZ5N zN$Z_`&-wrFoVoYhF`}}pr9SDJ& zlQMT|Xx^|#P;j!xiD;d&8pZ>Wv1jNi^&I0q2-DRubV^98SqtE~h6f<25-2k-oSMnq z)d6%l*#$A8J3%o*+7(4td?~u-Tn7IhkbF@{dqtFu>AA)Q0LxXeV`4OEVw3fBaIFHs zyOdpmICUyb2tSIny*Uy<-Z%!vCS`1l=7=WiUd;duvQyGBqW~0K(;~2;j4j7L5=-~o zt{H$pza*u#AqqgzHGgLCdR1&Z(LcVv@%)6Dr4`i{#|(+_H?$7?JM=>0s43(X2Wy%R$b!5 zbanN9T;Tga!TDw}QOpHUH%f>;=CVv>_Fh+SOpUtdnqLC^!{`9$D z7~6=jFRUVeof+Fx8GC<}*hn216!P-sX)v$R3KN|XY3s8n<~4O-P_W<{e-Y52GGO5E zl(eTsH6Ibc6KC6m5+&Zf(F`?9aB1SC%>JJL6~GrS=FMhiJ~`Bgh}I_4)^D|#kEjFh zABB0Cz+2vII?$1nv_7xZd{h8$=0o1}{|7*%t=5s4`#G-xI?*~X`sI&600000NkvXX Hu0mjfXkEUu literal 0 HcmV?d00001 diff --git a/components/shop/shop.js b/components/shop/shop.js new file mode 100644 index 0000000..a0d2f08 --- /dev/null +++ b/components/shop/shop.js @@ -0,0 +1,92 @@ +Component({ + properties: { + mallList: { + value: [], + type: Array + } + }, + + data: { + list: [], // 广场、商户列表 + mallNum: 0, // 适用商户数量 + }, + + methods: { + // 跳转详情页 + gotoDetail(e) { + console.log(e); + wx.navigateTo({ + url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}&mallTenantId=${e.currentTarget.dataset.tenantid}` + }) + }, + + // 跳转资质页面 + // goCertification(e) { + // wx.navigateTo({ + // url: `/pages/shopCertification/index?id=${e.currentTarget.dataset.id}` + // }) + // }, + + //跳转地图页面 + goMap(e) { + let { + latitude, + longitude + } = e.currentTarget.dataset.item + console.log(latitude, longitude); + wx.openLocation({ + latitude: Number(latitude), + longitude: Number(longitude), + scale: 18, + success() { + console.log("打开地图成功"); + }, + fail(err) { + console.log("打开地图失败:", err.errMsg); + }, + }); + }, + + goFitShop() { + const arr = [] + this.data.list.forEach(item => { + item.merchantVoList.forEach(el => { + arr.push(el) + }) + }) + wx.navigateTo({ + url: `/pages/fitShop/fitShop?list=${JSON.stringify(arr)}`, + success: (res) => { }, + fail: (res) => { }, + }); + }, + + expandList(e) { + const index = e.currentTarget.dataset.index + const arr = this.data.list + arr[index].expand = !arr[index].expand + this.setData({ + list: arr + }) + } + }, + + ready() { + this.setData({ + list: JSON.parse(JSON.stringify(this.properties.mallList)) + }) + + console.log(this.data.mallList, 'mallList'); + let mallNum = 0 + this.data.list.forEach(item => { + mallNum += item.merchantVoList.length + }) + this.setData({ + mallNum: mallNum + }) + }, + + created() { + + } +}) \ No newline at end of file diff --git a/components/shop/shop.json b/components/shop/shop.json new file mode 100644 index 0000000..32640e0 --- /dev/null +++ b/components/shop/shop.json @@ -0,0 +1,3 @@ +{ + "component": true +} \ No newline at end of file diff --git a/components/shop/shop.wxml b/components/shop/shop.wxml new file mode 100644 index 0000000..0247f52 --- /dev/null +++ b/components/shop/shop.wxml @@ -0,0 +1,58 @@ + + + 适用门店 + + {{'共'+mallNum+'家门店适用'}} + + + + + + {{item.mallName}} + + + + + + + {{item.merchantVoList.length+'家门店适用'}} + + + + + + + + + + + + {{item.addr}} + + + + + + \ No newline at end of file diff --git a/components/shop/shop.wxss b/components/shop/shop.wxss new file mode 100644 index 0000000..2ff71cf --- /dev/null +++ b/components/shop/shop.wxss @@ -0,0 +1,205 @@ +.components { + display: block; + height: auto; + margin-top: 15rpx; + background-color: #fff; +} + +.components .header { + height: 70rpx; +} + +.components .header .applyshop { + float: left; + font-size: 30rpx; + line-height: 70rpx; + text-indent: 1em; + color: #333; + background: #fff; + font-weight: bold; +} + +.components .header .goShop { + float: right; + font-size: 22rpx; + height: 70rpx; + line-height: 70rpx; + text-indent: 1em; + color: #a6a6a6; + background: #fff; + font-weight: bold; + margin-right: 25rpx; +} + +.components .header .rightArrow { + float: right; + display: block; + width: 14rpx; + margin: 24rpx 30rpx 0 10rpx; +} + +.components .body { + border-bottom: 10rpx solid #f4f5f9; +} + +.components .body .mall { + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 15rpx; + margin-bottom: 15rpx; + padding-left: 25rpx; + padding-right: 65rpx; +} + +.components .body .mall .img { + width: 120rpx; + height: 120rpx; +} + +.components .body .mall .mallItem { + display: flex; + justify-content: space-between; + align-items: center; +} + +.components .body .mall .mallItem .title { + font-size: 35rpx; +} + +.components .body .goExpand { + text-align: center; + font-size: 25rpx; + color: #a6a6a6; +} + +.components .body .goExpand .rightArrowDown { + position: relative; + left: 50%; + transform: translate(-50%); + display: block; + width: 14rpx; + transform: rotate(90deg); +} + +.components .body .goExpand .rightArrowUp { + position: relative; + left: 50%; + transform: translate(-50%); + display: block; + width: 14rpx; + transform: rotate(-90deg); +} + +.components .body .shop .posi { + /* position: relative; */ + width: 100%; + background: #FFF; + margin-bottom: 20rpx; +} + +.components .body .shop .posi .posi_logo { + position: relative; + width: 92%; + display: flex; + padding: 20rpx 0; + background: #fff; + margin: 0 auto; +} + +.components .body .shop .posi .posi_logo .img { + display: block; + width: 100rpx; + height: 100rpx; + border-radius: 16rpx; + margin-right: 16rpx; + border: 1px solid #e5e5e5; +} + +.components .body .shop .posi .posi_logo .name { + font-size: 32rpx; + color: #333; + letter-spacing: 0; + width: 500rpx; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; +} + +.components .body .shop .posi .posi_logo .shopVoList { + white-space: nowrap !important; + overflow-y: scroll; + height: 90rpx !important; + width: 360rpx; + font-size: 16px; + color: #333; + letter-spacing: 0; +} + +.components .body .shop .posi .posi_logo .shopVoList .name { + font-size: 23rpx !important; + color: #b8b8b8 !important; +} + +.components .body .shop .posi .posi_logo .telBox { + position: absolute; + right: 0; + top: 0; + bottom: 0; + margin: auto; +} + +.components .body .shop .posi .posi_logo .telBox .telImg { + width: 50rpx; + height: 50rpx; + margin-top: 20rpx; +} + +.components .body .shop .posi .posi_logo .telBox .telText { + text-align: center; + color: #b8b8b8 !important; + font-size: 20rpx; +} + +.components .body .shop .posi .posi_logo .certificationBox { + position: absolute; + right: 35rpx; + top: 0; + bottom: 0; + margin: auto; +} + +.components .body .shop .posi .posi_logo .certificationBox .certificationImg { + width: 50rpx; + height: 50rpx; + margin-top: 20rpx; +} + +.components .body .shop .posi .posi_logo .certificationBox .telText { + text-align: center; + color: #b8b8b8 !important; + font-size: 20rpx; +} + +.components .body .shop .posi .siteBox { + overflow: hidden; + width: 92%; + margin: 0 auto 1rpx auto; + padding-bottom: 10rpx; +} + +.components .body .shop .posi .siteBox .siteText { + width: 90%; + float: left; + font-size: 24rpx; + color: #333; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +.components .body .shop .posi .siteBox .siteImg { + float: right; + width: 40rpx; + height: 40rpx; +} \ No newline at end of file diff --git a/ext.json b/ext.json index 3c0587f..34dfe10 100644 --- a/ext.json +++ b/ext.json @@ -1,7 +1,14 @@ { "ext": { "attr": { - "mchId": "1602801645", + "car": { + "etcp": { + "etcpAppId": "wx192b7d2e8dcbefd0", + "etcpVersion": "release", + "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" + } + }, + "mchId": "1604439800", "imgProxy": [ { "newUrl": "https://ctest.malls.iformall.com/img", @@ -17,16 +24,12 @@ } ], "configUrl": "https://ctest.malls.iformall.com/C/api", - "etcpAppId": "wx219a81b9c87aa4f7", - "etcpVersion": "release", "businessSwitch": "1", - "businessVersion": "1", - "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback", "ifHaveWebSocket": "0", "ifHaveCarModular": "1" }, - "name": "富茂光谷测试版", - "weappId": "wx219a81b9c87aa4f7", + "name": "金泸商务", + "weappId": "wx649b3be73c1afe47", "appVersion": "C.test.5.2.0" }, "debug": false, @@ -74,15 +77,15 @@ }, "plugins": { "auto-points-plugin": { - "version": "2.4.0", + "version": "1.3.0", "provider": "wxfab2bf944bfc4da6" }, "live-player-plugin": { - "version": "1.2.5", + "version": "1.3.4", "provider": "wx2b03c6e691cd7370" } }, - "extAppid": "wx219a81b9c87aa4f7", + "extAppid": "wx649b3be73c1afe47", "extEnable": true, "permission": { "scope.userLocation": { diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 5c9461b..32bb0f2 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -95,6 +95,7 @@ Page({ contentType: 0, page: 1,//查询商户优惠券page idList: [], + mallList: "" }, /** * 显示分享弹框 @@ -600,26 +601,25 @@ Page({ couponChannelId: couponChannelId } }).then(res => { - if (res.data && res.data.length) { - let merchantVoList = res.data - let idList = [] - merchantVoList.map(item => { - idList.push(item.id) - }) - this.setData({ - idList: idList - }) - this.getCouponList(idList) //获取推荐列表 - } + const keys = Object.keys(res.data) + const mallList = [] + keys.forEach(item => { + const arr = item.split('|') + const obj = { + tenantId: arr[0], + mallName: arr[1], + merchantVoList: res.data[item], + expand: true + } + mallList.push(obj) + }) this.setData({ - merchantVoList: res.data + mallList: mallList }) + console.log(this.data.mallList, 'mallList'); }) }, - - - getDetail: function (couponChannelId, flag) { let that = this; let data = {}; diff --git a/pages/coupon/detail/index.json b/pages/coupon/detail/index.json index 0af1d50..95d6fe2 100644 --- a/pages/coupon/detail/index.json +++ b/pages/coupon/detail/index.json @@ -3,6 +3,7 @@ "c-shareposter": "../../../../components/shareposter/index", "navbar": "../../../../components/navbar/navbar", "store": "../../../../components/store/index", + "shop": "../../../../components/shop/shop", "c-coupons": "../../../components/coupons/index" }, "navigationBarTitleText": "", diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index 0c18e93..92d8764 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -117,7 +117,8 @@ - + + diff --git a/pages/dateLsit/dateLsit.wxss b/pages/dateLsit/dateLsit.wxss index 2d517fc..f485389 100644 --- a/pages/dateLsit/dateLsit.wxss +++ b/pages/dateLsit/dateLsit.wxss @@ -21,7 +21,6 @@ font-size: 32rpx; font-weight: 700; margin-left: 10rpx; - height: 60rpx; line-height: 60rpx; } @@ -55,4 +54,4 @@ height: 60rpx; line-height: 60rpx; color: rgba(0, 0, 0, 0.3); -} +} \ No newline at end of file diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js index 5001a08..ee0dcff 100644 --- a/pages/spellGroup/mySpellGroup/index.js +++ b/pages/spellGroup/mySpellGroup/index.js @@ -50,15 +50,16 @@ Page({ display: "none", orderGroupId: '', merchantVoList: [], - goHomeUrl:"", + goHomeUrl: "", + mallList: '' }, /** * 生命周期函数--监听页面加载 - */ + */ onLoad: function (options) { this.setData({ - mouldType:app.globalData.mouldType, + mouldType: app.globalData.mouldType, mouldConfig: app.globalData.mouldConfig, goHomeUrl: app.globalData.goHomeUrl, }) @@ -163,7 +164,7 @@ Page({ }, /** * 直接购买 - */ + */ gotoBuy(e) { let that = this; this.setData({ @@ -335,7 +336,7 @@ Page({ data: { couponId: couponId } - }).then(res => { + }).then(res => { that.setData({ disOrderNumber: res.data.orderNumber, couponChannelId: res.data.couponChannelId, @@ -473,10 +474,33 @@ Page({ data.salePrice = (data.salePrice / 100).toFixed(2); data.validStartDate = utils.formatTime(data.validStartDate, 'yyyy-MM-dd') data.validEndDate = utils.formatTime(data.validEndDate, 'yyyy-MM-dd') - that.setData({ - data, - merchantVoList: data.merchantVoList - }); + // that.setData({ + // data, + // merchantVoList: data.merchantVoList + // }); + Http.get({ + url: config.api.couponMerchant, + data: { + couponChannelId: couponChannelId + } + }).then(res => { + const keys = Object.keys(res.data) + const mallList = [] + keys.forEach(item => { + const arr = item.split('|') + const obj = { + tenantId: arr[0], + mallName: arr[1], + merchantVoList: res.data[item], + expand: true + } + mallList.push(obj) + }) + this.setData({ + mallList: mallList + }) + console.log(this.data.mallList, 'mallList'); + }) }); }, /** @@ -671,7 +695,7 @@ Page({ }); } }).then(res => { - console.log(res,"123") + console.log(res, "123") if (typeof (res) != "undefined") { let orderId = "" + res.data.mainOrderId; that.setData({ @@ -734,7 +758,7 @@ Page({ }) .catch(err => { that.setData({ - canSpell: true, + canSpell: true, canBuyIf: true }) wx.showToast({ @@ -762,7 +786,7 @@ Page({ }) } }) - + }, /** * 生命周期函数--监听页面显示 diff --git a/pages/spellGroup/mySpellGroup/index.json b/pages/spellGroup/mySpellGroup/index.json index 111bcc2..a0d878a 100644 --- a/pages/spellGroup/mySpellGroup/index.json +++ b/pages/spellGroup/mySpellGroup/index.json @@ -3,6 +3,7 @@ "enablePullDownRefresh": true, "usingComponents": { "navbar": "../../../../components/navbar/navbar", - "store": "../../../../components/store/index" + "store": "../../../../components/store/index", + "shop": "../../../../components/shop/shop" } } \ No newline at end of file diff --git a/pages/spellGroup/mySpellGroup/index.wxml b/pages/spellGroup/mySpellGroup/index.wxml index c2c9903..6b5ae80 100644 --- a/pages/spellGroup/mySpellGroup/index.wxml +++ b/pages/spellGroup/mySpellGroup/index.wxml @@ -1,12 +1,12 @@ - +