From 64b9727d22e44df5c0e37118129e2969171b9be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=B1=AA?= <781521347@qq.com> Date: Sat, 20 Nov 2021 18:35:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 2 +- components/mask/shopList.vue | 7 +- components/uni-countdown/uni-countdown.vue | 7 +- manifest.json | 2 +- pages.json | 3 + pages/index/index.vue | 21 +++- pages/index/selectCampus.vue | 2 + pages/index/tasksdetails.vue | 54 ++++++---- pages/my/index.vue | 49 ++++----- pages/my/zhifubao.vue | 40 ++++--- pages/order/index.vue | 35 ++++--- pages/order/release.vue | 15 +-- pagesB/pages/member/chongzhi.vue | 5 +- pagesB/pages/member/feedback.vue | 74 +++++-------- pagesB/pages/my/setting.vue | 116 +++++++++++++++------ pagesB/pages/my/zhifubao.vue | 53 ---------- static/img/logo.png | Bin 30376 -> 61408 bytes 17 files changed, 257 insertions(+), 228 deletions(-) delete mode 100644 pagesB/pages/my/zhifubao.vue diff --git a/App.vue b/App.vue index 6ce6b2b..8da6430 100644 --- a/App.vue +++ b/App.vue @@ -21,7 +21,7 @@ } } }); - // 微信单笔提现最大金额 + // 粉丝福利号 that.$Request.getT('/common/type/170').then(res => { if (res.code == 0) { if (res.data && res.data.value) { diff --git a/components/mask/shopList.vue b/components/mask/shopList.vue index 2ff91fc..b0d5abb 100644 --- a/components/mask/shopList.vue +++ b/components/mask/shopList.vue @@ -9,12 +9,12 @@ 剩余{{item.endNum}} - 返还{{item.memberMoney*100}}积分 + 返还{{item.memberMoneys}}积分 - 虎泉 + {{item.district}} 距离：{{item.distance}} @@ -129,8 +129,9 @@ align-items: flex-end; padding-top: 8rpx; .address{ - width: 60rpx; + min-width: 60rpx; height: 32rpx; + padding: 0 4rpx; background: #FF4848; line-height: 32rpx; text-align: center; diff --git a/components/uni-countdown/uni-countdown.vue b/components/uni-countdown/uni-countdown.vue index 3d40207..80fa403 100644 --- a/components/uni-countdown/uni-countdown.vue +++ b/components/uni-countdown/uni-countdown.vue @@ -39,7 +39,7 @@ }, showColon: { type: Boolean, - default: true + default: false }, backgroundColor: { type: String, @@ -193,8 +193,9 @@ /* #endif */ justify-content: center; line-height: 18rpx; - padding: 5rpx; + /* padding: 5rpx; */ font-size: 28rpx; + margin-top: -4rpx; color: #999999; } @@ -207,7 +208,7 @@ width: 30rpx; height: 20rpx; line-height: 20rpx; - margin: 5rpx 0; + /* margin: 5rpx 0; */ text-align: center; font-size: 28rpx; color: #999999; diff --git a/manifest.json b/manifest.json index 3baaf96..4bc6fd2 100644 --- a/manifest.json +++ b/manifest.json @@ -180,7 +180,7 @@ "base" : "/waimai_h5/" }, "devServer" : { - "https" : true + "https" : false } } } diff --git a/pages.json b/pages.json index 85a04b3..58bf89a 100644 --- a/pages.json +++ b/pages.json @@ -398,6 +398,9 @@ } ], "globalStyle": { + // #ifdef H5 + "navigationStyle": "custom", + // #endif "navigationBarTextStyle": "black", "navigationBarTitleText": "番茄饭团", "navigationBarBackgroundColor": "#FFFFFF", diff --git a/pages/index/index.vue b/pages/index/index.vue index b9669e8..7c23501 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -2,7 +2,10 @@ - {{city}} + + + {{city}} + @@ -365,6 +368,9 @@ } }) // #endif + // #ifdef H5 + window.location.href = this.meituanList.url; + // #endif } else if (classify == 2) { //饿了么 // #ifdef MP-WEIXIN uni.navigateToMiniProgram({ @@ -375,6 +381,9 @@ } }) // #endif + // #ifdef H5 + window.location.href = this.elemeList.url; + // #endif } } else { this.goLogin(); @@ -607,7 +616,6 @@ success: res => { console.log(res, 'aaaa') // #ifdef H5 - console.log('123243') that.loAcquire(res.longitude,res.latitude) // #endif // #ifdef MP-WEIXIN @@ -917,10 +925,15 @@ } .nav .citys { - // width: 100rpx; font-size: 28rpx; font-weight: 500; + display: flex; + align-items: center; margin-right: 10rpx; + image{ + width: 24rpx; + height: 24rpx; + } } .nav .search { @@ -966,7 +979,7 @@ .bill { display: flex; - justify-content: space-between; + justify-content: space-around; width: 100%; padding: 0 32rpx; margin-top: 30rpx; diff --git a/pages/index/selectCampus.vue b/pages/index/selectCampus.vue index e2015a4..7f7c65f 100644 --- a/pages/index/selectCampus.vue +++ b/pages/index/selectCampus.vue @@ -127,6 +127,8 @@ const that = this; const lat = this.$queue.getData('latitude'); const lon = this.$queue.getData('longitude'); + console.log(uni.getStorageSync('latitude'),'aaaaa') + console.log(uni.getStorageSync('longitude'),'aaaaa') uni.chooseLocation({ latitude: lat, longitude: lon, diff --git a/pages/index/tasksdetails.vue b/pages/index/tasksdetails.vue index 0c62011..2e0d422 100644 --- a/pages/index/tasksdetails.vue +++ b/pages/index/tasksdetails.vue @@ -52,7 +52,7 @@ - {{info.classify == 1 ? '饿了么' : '美团' }}会员满{{info.memberPrice}}减{{info.memberMoney}} {{info.classify == 1 ? '饿了么' : '美团' }}非会员满{{info.price}}减{{info.money}} + 番茄会员满{{info.memberPrice}}减{{info.memberMoney}}积分,非会员满{{info.price}}减{{info.money}}积分 @@ -61,12 +61,12 @@ - 番茄会员满{{info.memberPrice}}元返{{info.memberMoney}}元 + 加入番茄会员 开通会员 - + @@ -74,7 +74,7 @@ 添加客服微信进入番茄饭团福利群 - 添加 + 添加 @@ -90,9 +90,6 @@ 立即抢单 - 复制店名 @@ -197,6 +194,7 @@ } }, onLoad(e) { + console.log(this.$queue.getData('mobile') == undefined) this.goodsId = e.goodsId; this.latitude = e.latitude; this.longitude = e.longitude; @@ -514,11 +512,17 @@ }) } uni.navigateTo({ - url: '/pages/my/customer' + url: '/pagesB/pages/my/customer' }); }, // 立即下单 打开美团外卖 btns() { + if(this.$queue.getData('mobile') == undefined){ + uni.navigateTo({ + url: '/pages/public/mobile' + }) + return + } if (uni.getStorageSync('sendorderMsg')) { uni.requestSubscribeMessage({ tmplIds: this.arr, @@ -551,6 +555,9 @@ } }) // #endif + //#ifdef H5 + window.location.href = this.info.url; + //#endif } else if (this.info.classify == 1) { //饿了么 // #ifdef MP-WEIXIN uni.navigateToMiniProgram({ @@ -561,6 +568,9 @@ } }) // #endif + //#ifdef H5 + window.location.href = this.info.url; + //#endif } }, 500); } else { @@ -824,8 +834,9 @@ height: 82rpx; padding: 26rpx 30rpx; display: flex; + } - + .shop .bottom .text { font-size: 28rpx; font-weight: 500; @@ -842,7 +853,13 @@ .welfare { margin: 32rpx; } - + .bottomcontent{ + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + padding: 0 32rpx; + } .welfare .top { width: 100%; height: 96rpx; @@ -882,6 +899,7 @@ .content .bottom { height: 100px; display: flex; + justify-content: space-between; background-color: #FFFFFF; } @@ -907,19 +925,15 @@ } .bottom .add { - width: 48px; - height: 19px; + width: 96rpx; + height: 38rpx; background: linear-gradient(141deg, #FF4848 0%, #FF2929 100%); - opacity: 1; - border-radius: 10px; - font-size: 12px; - font-family: PingFang SC; + border-radius: 20rpx; + font-size: 24rpx; font-weight: 500; color: #FFFFFF; - padding-left: 12px; - padding-top: 2px; - margin-left: 50px; - margin-top: 10px; + line-height: 38rpx; + text-align: center; } // 底部按钮 diff --git a/pages/my/index.vue b/pages/my/index.vue index 5b733b8..22231e3 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -4,9 +4,16 @@