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 @@
+
+
+
+
+
+
+
@@ -85,13 +92,13 @@
-
+
联系我们
-
+
@@ -257,7 +264,6 @@
convertibleMoney: 0,
exchangedMoney: 0,
}
-
}
},
onLoad() {
@@ -278,11 +284,9 @@
}
}
})
-
-
-
},
onShow() {
+ console.log(Math.ceil(Math.random()*3))
this.$Request.getT('/userMoney/userMoneyDetail?userId=' + this.userId).then(res => { //我的积分
if (res.code == 0) {
console.log(res)
@@ -333,6 +337,10 @@
}
},
methods: {
+ //h5随机头像
+ randomAvater(){
+
+ },
// 开启订阅消息
openMsg() {
var that = this
@@ -888,7 +896,7 @@
background: #ffffff;
border-radius: 24rpx;
padding: 20rpx 0 30rpx;
- margin: 30rpx;
+ margin: 30rpx auto;
.title{
width: 100%;
padding:0 30rpx 6rpx;
@@ -1044,12 +1052,6 @@
}
}
- .tui-order-text,
- .tui-tool-text {
- font-size: 22rpx;
- color: #000000;
- }
-
.tui-icon-box image {
width: 72rpx;
height: 72rpx;
@@ -1074,7 +1076,6 @@
.tui-box {
width: 100%;
- height: 120px;
background: #fff;
box-shadow: 0 3rpx 20rpx rgba(183, 183, 183, 0.3);
border-radius: 10rpx;
@@ -1097,10 +1098,6 @@
color: #333;
}
- .tui-tool-box {
- margin-top: 20rpx;
- }
-
// 收藏夹
.addTo {
display: flex;
@@ -1117,14 +1114,18 @@
.tui-tool-box{
width: 100%;
padding: 0 30rpx;
- display: flex;
.tui-tool-item {
+ width: 100%;
display: flex;
align-items: center;
- justify-content: center;
- flex-direction: column;
- padding-top: 10rpx;
- margin-right: 30rpx;
+ padding: 12rpx 0;
+ font-size: 28rpx;
+ .tui-tool-icon {
+ width: 45rpx;
+ height: 45rpx;
+ display: block;
+ margin-right: 10rpx;
+ }
}
}
@@ -1137,7 +1138,7 @@
width: 90rpx;
height: 90rpx;
display: block;
- padding: 4upx;
+ padding: 4rpx;
}
.tui-badge-icon {
diff --git a/pages/my/zhifubao.vue b/pages/my/zhifubao.vue
index cdd7cd1..3c4bdda 100644
--- a/pages/my/zhifubao.vue
+++ b/pages/my/zhifubao.vue
@@ -1,13 +1,14 @@
@@ -28,26 +29,35 @@
}
-
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 4432e2f..9dfeb32 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -30,7 +30,7 @@
{{item.goodsTitle}}
- 返还{{item.memberMoney*100}}积分
+ 返还{{item.memberMoneys}}积分
@@ -61,14 +61,14 @@
放弃任务
上传凭证
+ @tap.stop="shangchuan(item)">上传凭证
- 结束后自动审核
+ 结束后自动审核
@@ -157,7 +157,7 @@
},
methods: {
// 放弃任务
- fangqi(item) {
+ fangqi(id) {
uni.showModal({
// title: '温馨提示',
content: '确认要放弃吗？',
@@ -191,9 +191,9 @@
this.getList()
},
// 上传凭证
- shangchuan(id) {
+ shangchuan(item) {
uni.navigateTo({
- url: '/pages/order/release?orderId=' + id
+ url: '/pages/order/release?orderId=' + item.id + '&classify=' + item.classify
});
},
timeFormat(param) {
@@ -379,9 +379,13 @@
justify-content: flex-end;
font-size: 28rpx;
font-weight: 500;
- color: #999999;
width: 100%;
height: 100%;
+ .word{
+ color: #999;
+ margin-left: 10rpx;
+ margin-top: -4rpx;
+ }
}
.huixian {
@@ -399,8 +403,11 @@
}
.main {
+
padding: 100rpx 20rpx 0;
-
+ /* #ifndef MP-WEIXIN */
+ padding-top: 20rpx;
+ /* #endif */
.card-box-order {
.list-item {
background: #FFFFFF;
@@ -451,7 +458,7 @@
border-radius: 4rpx;
}
.info-box{
- width: 450rpx;
+ width: 350rpx;
margin-left: 18rpx;
.shop-name{
width: 100%;
@@ -482,7 +489,7 @@
.info-right {
// margin-left: 150upx;
// height: 100upx;
-
+ text-align: right;
.logotitle {
width: 100%;
display: flex;
@@ -825,10 +832,10 @@
z-index: 999;
/* #endif */
/* #ifdef H5 */
- position: fixed;
- top: 44px;
- left: 0;
- z-index: 999;
+ // position: fixed;
+ // top: 44px;
+ // left: 0;
+ // z-index: 999;
/* #endif */
/* #ifdef MP-WEIXIN */
position: fixed;
diff --git a/pages/order/release.vue b/pages/order/release.vue
index 34cedbc..0ea83bd 100644
--- a/pages/order/release.vue
+++ b/pages/order/release.vue
@@ -19,17 +19,8 @@
- 请选择订单类型：
-
-
-
-
- {{array[index]}}
-
-
-
-
-
+ 订单平台：
+ {{className}}
@@ -81,11 +72,13 @@
changeSelectStyle: '',
title: 'picker',
array: ['美团', '饿了么'],
+ className: '',
index: 0,
}
},
onLoad(e) {
this.orderId = e.orderId;
+ this.className = e.classify == 1 ? '饿了么' : '美团';
},
methods: {
// 放弃任务
diff --git a/pagesB/pages/member/chongzhi.vue b/pagesB/pages/member/chongzhi.vue
index 7802d73..f404358 100644
--- a/pagesB/pages/member/chongzhi.vue
+++ b/pagesB/pages/member/chongzhi.vue
@@ -306,9 +306,7 @@
});
} else if (this.zhifubao && this.zhifubaoName && this.type == 1) {
let userId = this.$queue.getData('userId');
- this.$Request.postT('/userMoney/cashMoney?userId=' + userId + '&money=' + this.jifen + '&type=' + this
- .type).then(
- res => {
+ this.$Request.postT('/userMoney/cashMoney?userId=' + userId + '&money=' + this.jifen + '&type=' + this.type).then(res => {
if (res.code === 0) {
this.getUserInfointegral(userId)
uni.showModal({
@@ -325,7 +323,6 @@
}
},
duihuanjilu() {
- console.log('111')
uni.navigateTo({
url: '/pagesB/pages/member/jifen'
});
diff --git a/pagesB/pages/member/feedback.vue b/pagesB/pages/member/feedback.vue
index 537a041..eddcf93 100644
--- a/pagesB/pages/member/feedback.vue
+++ b/pagesB/pages/member/feedback.vue
@@ -4,21 +4,14 @@
请选择问题反馈类型：
-
-
- {{item.name}}
-
+
+ {{item.name}}
-
-
-
+
-
-
-
+
+
+
+ {{item.title}}
+
+
+
@@ -17,13 +14,37 @@
@@ -43,26 +85,42 @@
page {
background: #F6F6F6;
}
-
- .top {
- margin: 0 16px;
- background: #FFFFFF;
- opacity: 1;
- border-radius: 6px;
- margin-top: 16px;
- }
-
-
+ .setting-box{
+ width: 698rpx;
+ border-radius: 12rpx;
+ background: #fff;
+ margin: 30rpx auto 0;
+ .setting-item{
+ width: 100%;
+ height: 72rpx;
+ display: flex;
+ align-items: center;
+ font-size: 28rpx;
+ color: #000;
+ border-bottom: 2rpx solid #EFEFEF;
+ padding: 0 24rpx;
+ image{
+ width: 32rpx;
+ height: 32rpx;
+ margin-right: 20rpx;
+ }
+ }
+ .arrow-box{
+ image{
+ width: 32rpx;
+ height: 32rpx;
+ }
+ }
+ }
button {
- width: 152px;
- height: 32px;
+ width: 306rpx;
+ height: 64rpx;
+ line-height: 64rpx;
background: linear-gradient(141deg, #FF4848 0%, #FF2929 100%);
- border-radius: 16px;
- font-size: 12px;
- font-family: PingFang SC;
- font-weight: 400;
+ border-radius: 32rpx;
+ font-size: 28rpx;
color: #FFFFFF;
- margin-top: 10px;
+ margin-top: 70rpx;
}
diff --git a/pagesB/pages/my/zhifubao.vue b/pagesB/pages/my/zhifubao.vue
deleted file mode 100644
index cdd7cd1..0000000
--- a/pagesB/pages/my/zhifubao.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/static/img/logo.png b/static/img/logo.png
index c558379..3ef01b8 100644
Binary files a/static/img/logo.png and b/static/img/logo.png differ