yanghao
/
bawangcan-user
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改完善

yh
杨豪 3 years ago
parent
21b73e2ea2
commit
64b9727d22
17 changed files with 257 additions and 228 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      App.vue
  2. 7
      components/mask/shopList.vue
  3. 7
      components/uni-countdown/uni-countdown.vue
  4. 2
      manifest.json
  5. 3
      pages.json
  6. 21
      pages/index/index.vue
  7. 2
      pages/index/selectCampus.vue
  8. 52
      pages/index/tasksdetails.vue
  9. 49
      pages/my/index.vue
  10. 38
      pages/my/zhifubao.vue
  11. 35
      pages/order/index.vue
  12. 15
      pages/order/release.vue
  13. 5
      pagesB/pages/member/chongzhi.vue
  14. 72
      pagesB/pages/member/feedback.vue
  15. 110
      pagesB/pages/my/setting.vue
  16. 53
      pagesB/pages/my/zhifubao.vue
  17. BIN
      static/img/logo.png

2
App.vue
Unescape View File

@ -21,7 +21,7 @@
} }
} }
}); });
// 微信单笔提现最大金额 // 粉丝福利号
that.$Request.getT('/common/type/170').then(res => { that.$Request.getT('/common/type/170').then(res => {
if (res.code == 0) { if (res.code == 0) {
if (res.data && res.data.value) { if (res.data && res.data.value) {

7
components/mask/shopList.vue
Unescape View File

@ -9,12 +9,12 @@
<view class="surplus">剩余<text class="colR">{{item.endNum}}</text></view> <view class="surplus">剩余<text class="colR">{{item.endNum}}</text></view>
<view class="tag"> <view class="tag">
<image class="jifen" src="../../static/img/home/jifen.png"></image> <image class="jifen" src="../../static/img/home/jifen.png"></image>
<text>返还{{item.memberMoney*100}}积分</text> <text>返还{{item.memberMoneys}}积分</text>
</view> </view>
</view> </view>
</view> </view>
<view class="location"> <view class="location">
<view class="address">虎泉</view> <view class="address">{{item.district}}</view>
<view class="">距离：{{item.distance}}</view> <view class="">距离：{{item.distance}}</view>
</view> </view>
</view> </view>
@ -129,8 +129,9 @@
align-items: flex-end; align-items: flex-end;
padding-top: 8rpx; padding-top: 8rpx;
.address{ .address{
width: 60rpx; min-width: 60rpx;
height: 32rpx; height: 32rpx;
padding: 0 4rpx;
background: #FF4848; background: #FF4848;
line-height: 32rpx; line-height: 32rpx;
text-align: center; text-align: center;

7
components/uni-countdown/uni-countdown.vue
Unescape View File

@ -39,7 +39,7 @@
}, },
showColon: { showColon: {
type: Boolean, type: Boolean,
default: true default: false
}, },
backgroundColor: { backgroundColor: {
type: String, type: String,
@ -193,8 +193,9 @@
/* #endif */ /* #endif */
justify-content: center; justify-content: center;
line-height: 18rpx; line-height: 18rpx;
padding: 5rpx; /* padding: 5rpx; */
font-size: 28rpx; font-size: 28rpx;
margin-top: -4rpx;
color: #999999; color: #999999;
} }
@ -207,7 +208,7 @@
width: 30rpx; width: 30rpx;
height: 20rpx; height: 20rpx;
line-height: 20rpx; line-height: 20rpx;
margin: 5rpx 0; /* margin: 5rpx 0; */
text-align: center; text-align: center;
font-size: 28rpx; font-size: 28rpx;
color: #999999; color: #999999;

2
manifest.json
Unescape View File

@ -180,7 +180,7 @@
"base" : "/waimai_h5/" "base" : "/waimai_h5/"
}, },
"devServer" : { "devServer" : {
"https" : true "https" : false
} }
} }
} }

3
pages.json
Unescape View File

@ -398,6 +398,9 @@
} }
], ],
"globalStyle": { "globalStyle": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarTitleText": "番茄饭团", "navigationBarTitleText": "番茄饭团",
"navigationBarBackgroundColor": "#FFFFFF", "navigationBarBackgroundColor": "#FFFFFF",

21
pages/index/index.vue
Unescape View File

@ -2,7 +2,10 @@
<view class="container"> <view class="container">
<view class="containertop"> <view class="containertop">
<view class="nav"> <view class="nav">
<view @click="goSelectCity()" class="citys">{{city}}</view> <view @click="goSelectCity()" class="citys">
<image src="../../static/img/home/dizhi.png"></image>
<text>{{city}}</text>
</view>
<view class="search" @tap="goSearch()"> <view class="search" @tap="goSearch()">
<image src="@/static/img/home/search.png" mode="aspectFill"></image> <image src="@/static/img/home/search.png" mode="aspectFill"></image>
<input type="text" placeholder="请输入美食, 地点" readonly> <input type="text" placeholder="请输入美食, 地点" readonly>
@ -365,6 +368,9 @@
} }
}) })
// #endif // #endif
// #ifdef H5
window.location.href = this.meituanList.url;
// #endif
} else if (classify == 2) { //饿了么 } else if (classify == 2) { //饿了么
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
uni.navigateToMiniProgram({ uni.navigateToMiniProgram({
@ -375,6 +381,9 @@
} }
}) })
// #endif // #endif
// #ifdef H5
window.location.href = this.elemeList.url;
// #endif
} }
} else { } else {
this.goLogin(); this.goLogin();
@ -607,7 +616,6 @@
success: res => { success: res => {
console.log(res, 'aaaa') console.log(res, 'aaaa')
// #ifdef H5 // #ifdef H5
console.log('123243')
that.loAcquire(res.longitude,res.latitude) that.loAcquire(res.longitude,res.latitude)
// #endif // #endif
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
@ -917,10 +925,15 @@
} }
.nav .citys { .nav .citys {
// width: 100rpx;
font-size: 28rpx; font-size: 28rpx;
font-weight: 500; font-weight: 500;
display: flex;
align-items: center;
margin-right: 10rpx; margin-right: 10rpx;
image{
width: 24rpx;
height: 24rpx;
}
} }
.nav .search { .nav .search {
@ -966,7 +979,7 @@
.bill { .bill {
display: flex; display: flex;
justify-content: space-between; justify-content: space-around;
width: 100%; width: 100%;
padding: 0 32rpx; padding: 0 32rpx;
margin-top: 30rpx; margin-top: 30rpx;

2
pages/index/selectCampus.vue
Unescape View File

@ -127,6 +127,8 @@
const that = this; const that = this;
const lat = this.$queue.getData('latitude'); const lat = this.$queue.getData('latitude');
const lon = this.$queue.getData('longitude'); const lon = this.$queue.getData('longitude');
console.log(uni.getStorageSync('latitude'),'aaaaa')
console.log(uni.getStorageSync('longitude'),'aaaaa')
uni.chooseLocation({ uni.chooseLocation({
latitude: lat, latitude: lat,
longitude: lon, longitude: lon,

52
pages/index/tasksdetails.vue
Unescape View File

@ -52,7 +52,7 @@
</view> </view>
<view class="line"></view> <view class="line"></view>
<view class="bottom"> <view class="bottom">
<view class="text"> {{info.classify == 1 ? '饿了么' : '美团' }}会员满{{info.memberPrice}}减{{info.memberMoney}} {{info.classify == 1 ? '饿了么' : '美团' }}非会员满{{info.price}}减{{info.money}} </view> <view class="text"> 番茄会员满{{info.memberPrice}}减{{info.memberMoney}}积分,非会员满{{info.price}}减{{info.money}}积分 </view>
</view> </view>
</view> </view>
@ -61,12 +61,12 @@
<view class="top"> <view class="top">
<view class="top-left"> <view class="top-left">
<image src="../../static/img/home/huangguan.png"></image> <image src="../../static/img/home/huangguan.png"></image>
<text>番茄会员满{{info.memberPrice}}元返{{info.memberMoney}}元</text> <text>加入番茄会员</text>
</view> </view>
<view class="button" @tap="goPageLogin('/pages/my/myVIP')">开通会员</view> <view class="button" @tap="goPageLogin('/pages/my/myVIP')">开通会员</view>
</view> </view>
<view class="bottom"> <view class="bottom">
<view class="bottomcontent" style="display: flex;align-items: center;"> <view class="bottomcontent">
<view class="circle"><image src="https://download.cyjyyjy.com/fq-logo.jpg"></image></view> <view class="circle"><image src="https://download.cyjyyjy.com/fq-logo.jpg"></image></view>
<view class="jieshao"> <view class="jieshao">
<view style="font-size: 28rpx;font-weight: 500;color: #000000;"> <view style="font-size: 28rpx;font-weight: 500;color: #000000;">
@ -74,7 +74,7 @@
<view style="font-size: 24rpx;font-weight: 500;color: #000000;"> <view style="font-size: 24rpx;font-weight: 500;color: #000000;">
添加客服微信进入番茄饭团福利群</view> 添加客服微信进入番茄饭团福利群</view>
</view> </view>
<view class="add">添加</view> <view class="add" @click="fensiImage">添加</view>
</view> </view>
</view> </view>
</view> </view>
@ -90,9 +90,6 @@
<view class="payinfo" @click="btns"> <view class="payinfo" @click="btns">
<view>立即抢单</view> <view>立即抢单</view>
</view> </view>
<!-- <view class="payinfo" @click="btns">
<view>立即抢单</view>
</view> -->
<view class="payinfo" @click="copyStoreName" style="border-radius: 0px 32rpx 32rpx 0px;"> <view class="payinfo" @click="copyStoreName" style="border-radius: 0px 32rpx 32rpx 0px;">
<view>复制店名</view> <view>复制店名</view>
</view> </view>
@ -197,6 +194,7 @@
} }
}, },
onLoad(e) { onLoad(e) {
console.log(this.$queue.getData('mobile') == undefined)
this.goodsId = e.goodsId; this.goodsId = e.goodsId;
this.latitude = e.latitude; this.latitude = e.latitude;
this.longitude = e.longitude; this.longitude = e.longitude;
@ -514,11 +512,17 @@
}) })
} }
uni.navigateTo({ uni.navigateTo({
url: '/pages/my/customer' url: '/pagesB/pages/my/customer'
}); });
}, },
// 立即下单 打开美团外卖 // 立即下单 打开美团外卖
btns() { btns() {
if(this.$queue.getData('mobile') == undefined){
uni.navigateTo({
url: '/pages/public/mobile'
})
return
}
if (uni.getStorageSync('sendorderMsg')) { if (uni.getStorageSync('sendorderMsg')) {
uni.requestSubscribeMessage({ uni.requestSubscribeMessage({
tmplIds: this.arr, tmplIds: this.arr,
@ -551,6 +555,9 @@
} }
}) })
// #endif // #endif
//#ifdef H5
window.location.href = this.info.url;
//#endif
} else if (this.info.classify == 1) { //饿了么 } else if (this.info.classify == 1) { //饿了么
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
uni.navigateToMiniProgram({ uni.navigateToMiniProgram({
@ -561,6 +568,9 @@
} }
}) })
// #endif // #endif
//#ifdef H5
window.location.href = this.info.url;
//#endif
} }
}, 500); }, 500);
} else { } else {
@ -824,6 +834,7 @@
height: 82rpx; height: 82rpx;
padding: 26rpx 30rpx; padding: 26rpx 30rpx;
display: flex; display: flex;
} }
.shop .bottom .text { .shop .bottom .text {
@ -842,7 +853,13 @@
.welfare { .welfare {
margin: 32rpx; margin: 32rpx;
} }
.bottomcontent{
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 32rpx;
}
.welfare .top { .welfare .top {
width: 100%; width: 100%;
height: 96rpx; height: 96rpx;
@ -882,6 +899,7 @@
.content .bottom { .content .bottom {
height: 100px; height: 100px;
display: flex; display: flex;
justify-content: space-between;
background-color: #FFFFFF; background-color: #FFFFFF;
} }
@ -907,19 +925,15 @@
} }
.bottom .add { .bottom .add {
width: 48px; width: 96rpx;
height: 19px; height: 38rpx;
background: linear-gradient(141deg, #FF4848 0%, #FF2929 100%); background: linear-gradient(141deg, #FF4848 0%, #FF2929 100%);
opacity: 1; border-radius: 20rpx;
border-radius: 10px; font-size: 24rpx;
font-size: 12px;
font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
padding-left: 12px; line-height: 38rpx;
padding-top: 2px; text-align: center;
margin-left: 50px;
margin-top: 10px;
} }
// 底部按钮 // 底部按钮

49
pages/my/index.vue
Unescape View File

@ -4,9 +4,16 @@
<image src="https://download.cyjyyjy.com/mybackgorund.png" class="header-bg"></image> <image src="https://download.cyjyyjy.com/mybackgorund.png" class="header-bg"></image>
<view class="user-box" style="z-index:1;position: relative;"> <view class="user-box" style="z-index:1;position: relative;">
<view class="user-info-box"> <view class="user-info-box">
<!-- #ifndef H5 -->
<view class="avatar" @tap="checkLogin()"> <view class="avatar" @tap="checkLogin()">
<image :src="avatar"></image> <image :src="avatar"></image>
</view> </view>
<!-- #endif -->
<!-- #ifdef H5 -->
<view class="avatar" @tap="checkLogin()">
<image :src="avatar"></image>
</view>
<!-- #endif -->
<view class="user-info" v-if="userId"> <view class="user-info" v-if="userId">
<view class="nick-wrap"> <view class="nick-wrap">
<!-- #ifdef MP-WEIXIN --> <!-- #ifdef MP-WEIXIN -->
@ -85,13 +92,13 @@
<view class="tui-box" style="margin:0 auto;"> <view class="tui-box" style="margin:0 auto;">
<view class="tui-cell-header">番茄服务</view> <view class="tui-cell-header">番茄服务</view>
<view class="tui-tool-box"> <view class="tui-tool-box">
<view class="tui-tool-item" @tap="goPageLogin('/pages/my/customer')"> <view class="tui-tool-item" @tap="goPageLogin('/pagesB/pages/my/customer')">
<view class="tui-icon-box"> <view class="tui-icon-box">
<image src="../../static/img/my/callus.png" class="tui-tool-icon"></image> <image src="../../static/img/my/callus.png" class="tui-tool-icon"></image>
</view> </view>
<view class="tui-tool-text">联系我们</view> <view class="tui-tool-text">联系我们</view>
</view> </view>
<view class=" tui-tool-item" @tap="goPageLogin('/pages/my/setting')"> <view class=" tui-tool-item" @tap="goPageLogin('/pagesB/pages/my/setting')">
<view class="tui-icon-box"> <view class="tui-icon-box">
<image src="../../static/img/my/setting.png" class="tui-tool-icon"></image> <image src="../../static/img/my/setting.png" class="tui-tool-icon"></image>
</view> </view>
@ -257,7 +264,6 @@
convertibleMoney: 0, convertibleMoney: 0,
exchangedMoney: 0, exchangedMoney: 0,
} }
} }
}, },
onLoad() { onLoad() {
@ -278,11 +284,9 @@
} }
} }
}) })
}, },
onShow() { onShow() {
console.log(Math.ceil(Math.random()*3))
this.$Request.getT('/userMoney/userMoneyDetail?userId=' + this.userId).then(res => { //我的积分 this.$Request.getT('/userMoney/userMoneyDetail?userId=' + this.userId).then(res => { //我的积分
if (res.code == 0) { if (res.code == 0) {
console.log(res) console.log(res)
@ -333,6 +337,10 @@
} }
}, },
methods: { methods: {
//h5随机头像
randomAvater(){
},
// 开启订阅消息 // 开启订阅消息
openMsg() { openMsg() {
var that = this var that = this
@ -888,7 +896,7 @@
background: #ffffff; background: #ffffff;
border-radius: 24rpx; border-radius: 24rpx;
padding: 20rpx 0 30rpx; padding: 20rpx 0 30rpx;
margin: 30rpx; margin: 30rpx auto;
.title{ .title{
width: 100%; width: 100%;
padding:0 30rpx 6rpx; padding:0 30rpx 6rpx;
@ -1044,12 +1052,6 @@
} }
} }
.tui-order-text,
.tui-tool-text {
font-size: 22rpx;
color: #000000;
}
.tui-icon-box image { .tui-icon-box image {
width: 72rpx; width: 72rpx;
height: 72rpx; height: 72rpx;
@ -1074,7 +1076,6 @@
.tui-box { .tui-box {
width: 100%; width: 100%;
height: 120px;
background: #fff; background: #fff;
box-shadow: 0 3rpx 20rpx rgba(183, 183, 183, 0.3); box-shadow: 0 3rpx 20rpx rgba(183, 183, 183, 0.3);
border-radius: 10rpx; border-radius: 10rpx;
@ -1097,10 +1098,6 @@
color: #333; color: #333;
} }
.tui-tool-box {
margin-top: 20rpx;
}
// 收藏夹 // 收藏夹
.addTo { .addTo {
display: flex; display: flex;
@ -1117,14 +1114,18 @@
.tui-tool-box{ .tui-tool-box{
width: 100%; width: 100%;
padding: 0 30rpx; padding: 0 30rpx;
display: flex;
.tui-tool-item { .tui-tool-item {
width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; padding: 12rpx 0;
flex-direction: column; font-size: 28rpx;
padding-top: 10rpx; .tui-tool-icon {
margin-right: 30rpx; width: 45rpx;
height: 45rpx;
display: block;
margin-right: 10rpx;
}
} }
} }
@ -1137,7 +1138,7 @@
width: 90rpx; width: 90rpx;
height: 90rpx; height: 90rpx;
display: block; display: block;
padding: 4upx; padding: 4rpx;
} }
.tui-badge-icon { .tui-badge-icon {

38
pages/my/zhifubao.vue
Unescape View File

@ -1,13 +1,14 @@
<template> <template>
<view> <view>
<view class="menu"> <view class="menu">
<view class="menu-item">
<view class="tips">支付宝账号</view> <view class="tips">支付宝账号</view>
<input class="uni-input" type="number" placeholder="请输入支付宝账号" style="margin-top: 5px;"/> <input class="uni-input" type="number" placeholder="请输入支付宝账号"/>
</view>
<view class="menu-item">
<view class="tips">姓名</view>
<view class="tips" style="margin-top: 10px;">姓名</view> <input class="uni-input" type="number" placeholder="请输入真实姓名" />
<input class="uni-input" type="number" placeholder="请输入真实姓名" style="margin-top: 5px;"/> </view>
</view> </view>
<button>确认提交</button> <button>确认提交</button>
@ -28,26 +29,35 @@
} }
</script> </script>
<style> <style lang="scss">
.menu { .menu {
background-color: #FFFFFF; background-color: #FFFFFF;
margin: 0 16px; margin: 0 24rpx;
padding-top: 10px; padding-top: 20rpx;
.menu-item{
margin-top: 20rpx;
.tips{
font-size: 28rpx;
margin: 12rpx 0 0;
}
}
} }
input { input {
padding: 12rpx 0;
font-size: 24rpx;
border-bottom: 1px solid rgba(112, 112, 112, 0.10980392156862745); border-bottom: 1px solid rgba(112, 112, 112, 0.10980392156862745);
} }
button { button {
width: 152px; width: 234rpx;
height: 32px; height: 64rpx;
background: linear-gradient(141deg, #FF4848 0%, #FF2929 100%); background: linear-gradient(141deg, #FF4848 0%, #FF2929 100%);
font-size: 12px; font-size: 24rpx;
font-family: PingFang SC; font-family: PingFang SC;
border-radius: 16px; border-radius: 32rpx;
margin-top: 42px; margin-top: 84rpx;
color: #FFFFFF; color: #FFFFFF;
} }
</style> </style>

35
pages/order/index.vue
Unescape View File

@ -30,7 +30,7 @@
<view class="shop-name"> {{item.goodsTitle}}</view> <view class="shop-name"> {{item.goodsTitle}}</view>
<view class="tag"> <view class="tag">
<image class="jifen" src="../../static/img/home/jifen.png"></image> <image class="jifen" src="../../static/img/home/jifen.png"></image>
<text>返还{{item.memberMoney*100}}积分</text> <text>返还{{item.memberMoneys}}积分</text>
</view> </view>
</view> </view>
</view> </view>
@ -61,14 +61,14 @@
<view class="btn delete" v-if="item.status === 1 || item.status === 4" <view class="btn delete" v-if="item.status === 1 || item.status === 4"
@tap.stop="fangqi(item.orderId)">放弃任务</view> @tap.stop="fangqi(item.orderId)">放弃任务</view>
<view class="btn demand" v-if="item.status === 1 || item.status === 4" <view class="btn demand" v-if="item.status === 1 || item.status === 4"
@tap.stop="shangchuan(item.orderId)">上传凭证</view> @tap.stop="shangchuan(item)">上传凭证</view>
</view> </view>
<view class="countdown_time" v-else> <view class="countdown_time" v-else>
<uni-countdown color="#999999" :day="item.endTime.day" <uni-countdown color="#999999" :day="item.endTime.day"
:hour="item.endTime.hour" :minute="item.endTime.minute" :hour="item.endTime.hour" :minute="item.endTime.minute"
:second="item.endTime.second"> :second="item.endTime.second">
</uni-countdown> </uni-countdown>
<view> 结束后自动审核</view> <view class="word">结束后自动审核</view>
</view> </view>
</view> </view>
</view> </view>
@ -157,7 +157,7 @@
}, },
methods: { methods: {
// 放弃任务 // 放弃任务
fangqi(item) { fangqi(id) {
uni.showModal({ uni.showModal({
// title: '温馨提示', // title: '温馨提示',
content: '确认要放弃吗？', content: '确认要放弃吗？',
@ -191,9 +191,9 @@
this.getList() this.getList()
}, },
// 上传凭证 // 上传凭证
shangchuan(id) { shangchuan(item) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/order/release?orderId=' + id url: '/pages/order/release?orderId=' + item.id + '&classify=' + item.classify
}); });
}, },
timeFormat(param) { timeFormat(param) {
@ -379,9 +379,13 @@
justify-content: flex-end; justify-content: flex-end;
font-size: 28rpx; font-size: 28rpx;
font-weight: 500; font-weight: 500;
color: #999999;
width: 100%; width: 100%;
height: 100%; height: 100%;
.word{
color: #999;
margin-left: 10rpx;
margin-top: -4rpx;
}
} }
.huixian { .huixian {
@ -399,8 +403,11 @@
} }
.main { .main {
padding: 100rpx 20rpx 0;
padding: 100rpx 20rpx 0;
/* #ifndef MP-WEIXIN */
padding-top: 20rpx;
/* #endif */
.card-box-order { .card-box-order {
.list-item { .list-item {
background: #FFFFFF; background: #FFFFFF;
@ -451,7 +458,7 @@
border-radius: 4rpx; border-radius: 4rpx;
} }
.info-box{ .info-box{
width: 450rpx; width: 350rpx;
margin-left: 18rpx; margin-left: 18rpx;
.shop-name{ .shop-name{
width: 100%; width: 100%;
@ -482,7 +489,7 @@
.info-right { .info-right {
// margin-left: 150upx; // margin-left: 150upx;
// height: 100upx; // height: 100upx;
text-align: right;
.logotitle { .logotitle {
width: 100%; width: 100%;
display: flex; display: flex;
@ -825,10 +832,10 @@
z-index: 999; z-index: 999;
/* #endif */ /* #endif */
/* #ifdef H5 */ /* #ifdef H5 */
position: fixed; // position: fixed;
top: 44px; // top: 44px;
left: 0; // left: 0;
z-index: 999; // z-index: 999;
/* #endif */ /* #endif */
/* #ifdef MP-WEIXIN */ /* #ifdef MP-WEIXIN */
position: fixed; position: fixed;

15
pages/order/release.vue
Unescape View File

@ -19,17 +19,8 @@
<view class="order-des"> <view class="order-des">
<view class="textarea-wrap" style="display: flex;"> <view class="textarea-wrap" style="display: flex;">
<view class="uni-title uni-common-pl">请选择订单类型：</view> <view class="uni-title uni-common-pl">订单平台：</view>
<view class="uni-list"> <view>{{className}}</view>
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<picker @change="bindPickerChange" :value="index" :range="array">
<view class="uni-input">{{array[index]}}</view>
</picker>
</view>
</view>
</view>
</view> </view>
</view> </view>
<view class="order-des"> <view class="order-des">
@ -81,11 +72,13 @@
changeSelectStyle: '', changeSelectStyle: '',
title: 'picker', title: 'picker',
array: ['美团', '饿了么'], array: ['美团', '饿了么'],
className: '',
index: 0, index: 0,
} }
}, },
onLoad(e) { onLoad(e) {
this.orderId = e.orderId; this.orderId = e.orderId;
this.className = e.classify == 1 ? '饿了么' : '美团';
}, },
methods: { methods: {
// 放弃任务 // 放弃任务

5
pagesB/pages/member/chongzhi.vue
Unescape View File

@ -306,9 +306,7 @@
}); });
} else if (this.zhifubao && this.zhifubaoName && this.type == 1) { } else if (this.zhifubao && this.zhifubaoName && this.type == 1) {
let userId = this.$queue.getData('userId'); let userId = this.$queue.getData('userId');
this.$Request.postT('/userMoney/cashMoney?userId=' + userId + '&money=' + this.jifen + '&type=' + this this.$Request.postT('/userMoney/cashMoney?userId=' + userId + '&money=' + this.jifen + '&type=' + this.type).then(res => {
.type).then(
res => {
if (res.code === 0) { if (res.code === 0) {
this.getUserInfointegral(userId) this.getUserInfointegral(userId)
uni.showModal({ uni.showModal({
@ -325,7 +323,6 @@
} }
}, },
duihuanjilu() { duihuanjilu() {
console.log('111')
uni.navigateTo({ uni.navigateTo({
url: '/pagesB/pages/member/jifen' url: '/pagesB/pages/member/jifen'
}); });

72
pagesB/pages/member/feedback.vue
Unescape View File

@ -5,20 +5,13 @@
<view class="title">请选择问题反馈类型：</view> <view class="title">请选择问题反馈类型：</view>
<view class="choicebox"> <view class="choicebox">
<view class="choices"> <view class="choices">
<view style="float: left;margin-right: 10px;" v-for="(item,index) in choicelist" class="a" <view v-for="(item,index) in choicelist" class="choices-item" :key="index" :class="{changeStyle:changeSelectStyle == index}" @click="changeStyle(index)"> {{item.name}} </view>
:key="index" :class="{changeStyle:changeSelectStyle == index}" @click="changeStyle(index)">
{{item.name}}
</view> </view>
</view> </view>
</view>
<view style="height: 0px;border: 1px solid rgba(112, 112, 112, 0.10980392156862745);">
</view>
<view> <view>
<textarea auto-height placeholder="请填写15字以上的内容描述，我们将尽快给您回复" v-model="text" <textarea placeholder="请填写15字以上的内容描述，我们将尽快给您回复" style="height:200rpx;" v-model="text" placeholder-style="font-size: 24rpx;color: #999999;" />
placeholder-style="font-size: 12px;font-family: PingFang SC;font-weight: 400;color: #999999;" />
</view> </view>
</view> </view>
<!-- <text @tap="chooseMsg">快速键入</text> --> <!-- <text @tap="chooseMsg">快速键入</text> -->
</view> </view>
<!-- <view class="feedback-body"><textarea placeholder="请详细描述你的问题和意见..." v-model="sendDate.content" class="feedback-textare" /></view> <!-- <view class="feedback-body"><textarea placeholder="请详细描述你的问题和意见..." v-model="sendDate.content" class="feedback-textare" /></view>
@ -163,74 +156,63 @@
} }
.feedback-title { .feedback-title {
height: 200px; height: 400rpx;
background: #FFFFFF; background: #FFFFFF;
opacity: 1; border-radius: 12rpx;
border-radius: 6px; margin: 0 32rpx;
margin: 0 16px; margin-top: 32rpx;
margin-top: 16px;
} }
.feedback-title .content { .feedback-title .content {
margin: 0 16px; margin: 0 32rpx;
} }
.feedback-title .title { .feedback-title .title {
padding-top: 12px; padding-top: 24rpx;
margin-bottom: 8rpx; margin-bottom: 8rpx;
font-size: 14px; font-size: 28rpx;
font-family: PingFang SC;
font-weight: 400;
color: #000000; color: #000000;
} }
.feedback-submit { .feedback-submit {
background: #007aff; background: #007aff;
color: #ffffff; color: #ffffff;
margin: 20upx; margin: 20rpx;
} }
.choicebox {
height: 32px;
}
.choices { .choices {
padding-top: 10px; padding-top: 20rpx;
margin-bottom: 8px; margin-bottom: 16rpx;
display: flex;
} }
.choices-item {
.a { padding: 0 20rpx;
font-size: 24rpx;
background: #F5F5F5; background: #F5F5F5;
border: 1px solid #999999; border: 2rpx solid #999999;
opacity: 1; border-radius: 4rpx;
border-radius: 2px;
color: #999999; color: #999999;
margin-right: 20rpx;
} }
.button { .button {
width: 120px; width: 240rpx;
height: 24px; height: 52rpx;
background: linear-gradient(141deg, #FF4848 0%, #FF2929 100%); background: linear-gradient(141deg, #FF4848 0%, #FF2929 100%);
opacity: 1; border-radius: 24rpx;
border-radius: 12px; font-size: 24rpx;
font-size: 11px;
font-family: PingFang SC;
font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
padding-top: 4px; padding-top: 8rpx;
padding-left: 50px; padding-left: 100rpx;
margin: 0 auto; margin: 0 auto;
margin-top: 10px; margin-top: 20rpx;
} }
.changeStyle { .changeStyle {
background: #F8E3DF; background: #F8E3DF;
border: 1px solid #FF6A6A; border: 1px solid #FF6A6A;
opacity: 1; border-radius: 4rpx;
border-radius: 2px;
color: #FF7171; color: #FF7171;
} }
</style> </style>

110
pagesB/pages/my/setting.vue
Unescape View File

@ -1,15 +1,12 @@
<template> <template>
<view class="container"> <view class="container">
<view class="top"> <view class="setting-box" >
<view class="setting-item" v-for="item in settingList" :key="item.title" @click="navTo(item.path)">
<!-- <u-cell-group> <image :src="item.imgUrl"></image>
<u-cell-item icon="share" title="支付宝绑定" :arrow="true" value="绑定支付宝" @click="navTo('/pages/my/zhifubao')"></u-cell-item> <text>{{item.title}}</text>
<u-cell-item icon="fingerprint" title="隐私政策" :arrow="true" @click="navTo('/pages/member/mimi')"></u-cell-item> </view>
<u-cell-item icon="order" title="用户协议" :arrow="true" @click="navTo('/pages/member/xieyi')"></u-cell-item>
<u-cell-item icon="question-circle" title="意见反馈" :arrow="true" @click="navTo('/pages/member/feedback')"></u-cell-item>
</u-cell-group> -->
</view> </view>
<button>退出登录</button> <button @click="loginOut">退出登录</button>
</view> </view>
</template> </template>
@ -17,13 +14,37 @@
<script> <script>
export default { export default {
data() { data() {
return {}; return {
settingList: [
{
imgUrl: '../../../static/img/my/bangding.png',
title: '绑定支付宝',
path: '/pages/my/zhifubao'
},
{
imgUrl: '../../../static/img/my/zhiwen.png',
title: '隐私政策',
path: '/pagesB/pages/member/mimi'
},
{
imgUrl: '../../../static/img/my/xieyi.png',
title: '用户协议',
path: '/pagesB/pages/member/xieyi'
},
{
imgUrl: '../../../static/img/my/yijian.png',
title: '意见反馈',
path: '/pagesB/pages/member/feedback'
}
]
};
}, },
onShow() { onShow() {
}, },
methods: { methods: {
navTo(url) { navTo(url) {
console.log(url)
let token = this.$queue.getData("token"); let token = this.$queue.getData("token");
if (token) { if (token) {
uni.navigateTo({ uni.navigateTo({
@ -34,8 +55,29 @@
url: '/pages/public/login' url: '/pages/public/login'
}); });
} }
},
//退出登录
loginOut() {
let that = this;
uni.showModal({
title: '退出提醒',
content: '确定要退出登录么',
success: e => {
if (e.confirm) {
that.$queue.logout();
that.userId = '';
that.avatar = '/static/img/logo.png';
that.nickName = '';
that.invitationCode = '';
that.sumMoney = 0;
that.money = 0;
that.cashMoney = 0;
that.oneUserCount = 0;
} }
} }
});
},
}
} }
</script> </script>
@ -44,25 +86,41 @@
background: #F6F6F6; background: #F6F6F6;
} }
.top { .setting-box{
margin: 0 16px; width: 698rpx;
background: #FFFFFF; border-radius: 12rpx;
opacity: 1; background: #fff;
border-radius: 6px; margin: 30rpx auto 0;
margin-top: 16px; .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 { button {
width: 152px; width: 306rpx;
height: 32px; height: 64rpx;
line-height: 64rpx;
background: linear-gradient(141deg, #FF4848 0%, #FF2929 100%); background: linear-gradient(141deg, #FF4848 0%, #FF2929 100%);
border-radius: 16px; border-radius: 32rpx;
font-size: 12px; font-size: 28rpx;
font-family: PingFang SC;
font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
margin-top: 10px; margin-top: 70rpx;
} }
</style> </style>

53
pagesB/pages/my/zhifubao.vue
Unescape View File

@ -1,53 +0,0 @@
<template>
<view>
<view class="menu">
<view class="tips">支付宝账号</view>
<input class="uni-input" type="number" placeholder="请输入支付宝账号" style="margin-top: 5px;"/>
<view class="tips" style="margin-top: 10px;">姓名</view>
<input class="uni-input" type="number" placeholder="请输入真实姓名" style="margin-top: 5px;"/>
</view>
<button>确认提交</button>
</view>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
}
}
</script>
<style>
.menu {
background-color: #FFFFFF;
margin: 0 16px;
padding-top: 10px;
}
input {
border-bottom: 1px solid rgba(112, 112, 112, 0.10980392156862745);
}
button {
width: 152px;
height: 32px;
background: linear-gradient(141deg, #FF4848 0%, #FF2929 100%);
font-size: 12px;
font-family: PingFang SC;
border-radius: 16px;
margin-top: 42px;
color: #FFFFFF;
}
</style>

BIN
static/img/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 60 KiB

Write Preview
Loading…
Cancel
Save