Browse Source

提交代码

yh
杨豪 3 years ago
parent
commit
4fa115a18c
  1. 6
      pages.json
  2. 5
      pages/index/index.vue
  3. 213
      pages/my/index.vue
  4. 7
      pages/order/index.vue
  5. 19
      pagesB/pages/member/feedback.vue
  6. 7
      pagesB/pages/my/shareFriends.vue

6
pages.json

@ -7,7 +7,7 @@
"style": {
"backgroundColor": "#FFFFFF",
"navigationBarTitleText": "番茄饭团",
"enablePullDownRefresh": false
"enablePullDownRefresh": true
// "navigationStyle": "custom"
}
},
@ -73,7 +73,7 @@
"path": "pages/order/index",
"style": {
"navigationBarTitleText": "我的订单",
"enablePullDownRefresh": false
"enablePullDownRefresh": true
}
},
{
@ -115,7 +115,7 @@
"path": "pages/my/index",
"style": {
"navigationBarTitleText": "个人中心",
"enablePullDownRefresh": false
"enablePullDownRefresh": true
}
},

5
pages/index/index.vue

@ -230,6 +230,10 @@
// }
// })
},
onPullDownRefresh() {
this.page = 1;
this.getHaoDianTuiJian1();
},
onShow() {
let that = this;
var city = this.$queue.getData('city');
@ -482,6 +486,7 @@
this.loadingType = 2;
}
uni.hideLoading();
uni.stopPullDownRefresh()
})
},
setMorKm(m) {

213
pages/my/index.vue

@ -98,12 +98,18 @@
</view>
<view class="tui-tool-text">联系我们</view>
</view>
<view class=" tui-tool-item" @tap="goPageLogin('/pagesB/pages/my/setting')">
<view class="tui-tool-item" @tap="goPageLogin('/pagesB/pages/my/setting')">
<view class="tui-icon-box">
<image src="../../static/img/my/setting.png" class="tui-tool-icon"></image>
</view>
<view class="tui-tool-text">设置</view>
</view>
<view class="tui-tool-item">
<!-- <view class="tuandui_item_left" @tap="goPageLogin('/pages/member/yaoqing')">
团队成员{{oneUserCount}}</view> -->
<view @tap="goPageLogin('/pagesB/pages/my/shareFriends')" class="yaoqing_btn">
邀请好友</view>
</view>
<!-- <view class=" tui-tool-item" v-if="userId" @tap='loginOut()'>
<view class="tui-icon-box">
<image src="https://bwc.xianmxkj.com/img/20210828/e8f096d23a5c4cb0bf0f716901e0ce9a.png"
@ -148,8 +154,8 @@
<view @tap="goPageLogin('/pages/my/shareFriends')" class="yaoqing_btn">
邀请好友</view>
</view>
</view>
-->
</view> -->
<!-- <view class="main">
<view class="integrals-box">
<view class="integral" @tap="goPageLoginS('/pages/order/index')">
@ -336,6 +342,12 @@
}
}
},
onPullDownRefresh() {
this.getUserInfo(this.userId);
this.getUserInfointegral(this.userId);
this.getUserInfoSumMoney(this.userId);
this.checkChannel();
},
methods: {
//h5
randomAvater(){
@ -491,6 +503,7 @@
}
uni.hideLoading();
uni.stopPullDownRefresh()
});
},
goPageLoginS(url) {
@ -741,7 +754,6 @@
.nick {
font-size: 32rpx;
font-family: PingFang SC Bold, PingFang SC Bold-Bold;
font-weight: 700;
color: #333333;
}
@ -935,112 +947,111 @@
}
}
}
.info-jifen {
width: 92%;
height: 360rpx;
position: absolute;
background: #FFD900;
border-radius: 15rpx;
z-index: 15;
margin: 235upx 30upx 0;
padding: 20upx;
box-sizing: border-box;
.wdjf {
margin-top: 10rpx;
font-size: 34rpx;
font-weight: 400;
}
.info-jifen {
width: 92%;
height: 360rpx;
position: absolute;
background: #FFD900;
border-radius: 15rpx;
z-index: 15;
margin: 235upx 30upx 0;
padding: 20upx;
box-sizing: border-box;
.wdjf {
margin-top: 10rpx;
font-size: 34rpx;
font-weight: 400;
color: #806C30;
}
.shouye_item {
margin-top: 20rpx;
display: flex;
width: 100%;
color: #333333;
.shouye_item_text {
color: #806C30;
font-size: 24rpx;
}
.shouye_item {
margin-top: 20rpx;
display: flex;
width: 100%;
color: #333333;
.shouye_item_text {
color: #806C30;
font-size: 24rpx;
}
.shouye_item_money {
margin-top: 10rpx;
font-size: 38rpx;
}
.shouye_item_left {
width: 33%;
text-align: left;
}
.shouye_item_center {
width: 33%;
text-align: center;
}
.shouye_item_right {
width: 33%;
text-align: right;
}
.shouye_item_money {
margin-top: 10rpx;
font-size: 38rpx;
}
.tuandui_item {
margin-top: 20rpx;
display: flex;
width: 100%;
color: #FFFFFF;
border-top: 3rpx solid #ffff00;
padding-top: 15rpx;
.tuandui_item_left {
width: 75%;
color: #333333;
padding-top: 5rpx;
}
.shouye_item_left {
width: 33%;
text-align: left;
}
.yaoqing_btn {
margin-left: 10rpx;
background: #252323;
border-radius: 50rpx;
color: #FFFFFF;
.shouye_item_center {
width: 33%;
text-align: center;
line-height: 50rpx;
width: 150rpx;
height: 50rpx;
font-size: 30rpx;
font-weight: 500;
}
.zsy_view {
margin-top: 15rpx;
display: flex;
width: 100%;
.shouye_item_right {
width: 33%;
text-align: right;
}
.sumMoney_view {
font-size: 50rpx;
font-weight: 500;
color: #333333;
}
.tuandui_item {
margin-top: 20rpx;
display: flex;
width: 100%;
color: #FFFFFF;
border-top: 3rpx solid #ffff00;
padding-top: 15rpx;
.tuandui_item_left {
width: 75%;
color: #333333;
padding-top: 5rpx;
}
.duihuan_btn {
margin-left: 10rpx;
background: #252323;
border-radius: 50rpx;
color: #FFFFFF;
text-align: center;
line-height: 60rpx;
width: 150rpx;
height: 60rpx;
font-size: 30rpx;
font-weight: 500;
}
}
.yaoqing_btn {
margin-left: 10rpx;
background: #252323;
border-radius: 50rpx;
color: #FFFFFF;
text-align: center;
line-height: 50rpx;
width: 150rpx;
height: 50rpx;
font-size: 30rpx;
font-weight: 500;
}
.zsy_view {
margin-top: 15rpx;
display: flex;
width: 100%;
}
.sumMoney_view {
font-size: 50rpx;
font-weight: 500;
color: #333333;
width: 75%;
}
.duihuan_btn {
margin-left: 10rpx;
background: #252323;
border-radius: 50rpx;
color: #FFFFFF;
text-align: center;
line-height: 60rpx;
width: 150rpx;
height: 60rpx;
font-size: 30rpx;
font-weight: 500;
}
}
.main {

7
pages/order/index.vue

@ -155,6 +155,10 @@
this.goLogin();
}
},
onPullDownRefresh() {
this.page = 1;
this.getList();
},
methods: {
//
fangqi(id) {
@ -193,7 +197,7 @@
//
shangchuan(item) {
uni.navigateTo({
url: '/pages/order/release?orderId=' + item.id + '&classify=' + item.classify
url: '/pages/order/release?orderId=' + item.orderId + '&classify=' + item.classify
});
},
timeFormat(param) {
@ -235,6 +239,7 @@
this.loadingType = 2;
}
uni.hideLoading();
uni.stopPullDownRefresh()
});
},
fromTabSelect(index) {

19
pagesB/pages/member/feedback.vue

@ -9,7 +9,7 @@
</view>
</view>
<view>
<textarea placeholder="请填写15字以上的内容描述,我们将尽快给您回复" style="height:200rpx;" v-model="text" placeholder-style="font-size: 24rpx;color: #999999;" />
<textarea placeholder="请填写15字以上的内容描述,我们将尽快给您回复" style="height:200rpx;" v-model="sendDate.content" placeholder-style="font-size: 24rpx;color: #999999;" />
</view>
</view>
<!-- <text @tap="chooseMsg">快速键入</text> -->
@ -23,6 +23,9 @@
<text class="feedback-star" v-for="(value, key) in stars" :key="key" :class="key < sendDate.score ? 'active' : ''" @tap="chooseStar(value)"></text>
</view>
</view> -->
<view class="feedback-body">
<input class="feedback-input" v-model="sendDate.contact" placeholder="请输入qq或者邮箱方便我们联系你 " />
</view>
<view type="primary" class="button" @tap="send">提交</view>
</view>
</template>
@ -150,7 +153,7 @@
};
</script>
<style>
<style lang="scss">
page {
background-color: #F6F6F6;
}
@ -195,6 +198,18 @@
color: #999999;
margin-right: 20rpx;
}
.feedback-body{
width: 100%;
padding: 0 32rpx;
margin-top: 24rpx;
input{
background: #fff;
width: 97%;
height: 32rpx;
padding: 20rpx 12rpx;
border-radius: 8rpx;
}
}
.button {
width: 240rpx;

7
pagesB/pages/my/shareFriends.vue

@ -85,8 +85,8 @@
<view class="cu-modal" :class="modalName == 'Image' ? 'show' : ''" @tap="hideModal">
<view class="cu-dialog" v-if="backgroundImageUrl && erweimapath && haibaoShow" @tap="hideModal">
<view class="bg-img">
<!-- <wm-poster @success="posterSuccess" :imgSrc="backgroundImageUrl" :Referrer="'我的邀请码:'+invitationCode"
:QrSrc="url" :Title="tuiguang" :LineType="false"></wm-poster> -->
<wm-poster @success="posterSuccess" :imgSrc="backgroundImageUrl" :Referrer="'我的邀请码:'+invitationCode"
:QrSrc="url" :Title="tuiguang" :LineType="false"></wm-poster>
</view>
</view>
</view>
@ -138,7 +138,6 @@
}
},
onShow() {
this.$Request.getT('/team/selectMemberConfigList').then(res => {
if (res.code === 0) {
// res.data.forEach(d =>{
@ -183,6 +182,7 @@
if (!this.haibaoImg) {
this.haibaoShow = true;
this.$queue.showLoading('海报生成中...');
} else {
this.modalName = 'Image';
}
@ -215,6 +215,7 @@
});
},
async shareFc() {
let _this = this;
try {
const d = await getSharePoster({

Loading…
Cancel
Save