9.25
This commit is contained in:
parent
72bbbaa2bb
commit
2c40ca4134
@ -203,6 +203,13 @@
|
||||
"style": {
|
||||
"navigationBarTitleText": "卡包"
|
||||
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "userRegister/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "会员注册"
|
||||
|
||||
}
|
||||
}
|
||||
]
|
||||
@ -342,8 +349,7 @@
|
||||
{
|
||||
"path": "myorder/myorder",
|
||||
"style": {
|
||||
"navigationBarTitleText": "我的订单",
|
||||
"navigationStyle": "custom"
|
||||
"navigationBarTitleText": "消费记录"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
@ -38,7 +38,7 @@
|
||||
<image src="../../static/new/n7.png" mode=""></image>
|
||||
<view class="">每日抽奖</view>
|
||||
</view>
|
||||
<view class="_bgox">
|
||||
<view class="_bgox" @click="goSignIn()">
|
||||
<image src="../../static/new/n8.png" mode=""></image>
|
||||
<view class="">签到有礼</view>
|
||||
</view>
|
||||
@ -261,6 +261,11 @@
|
||||
tabbar
|
||||
},
|
||||
methods: {
|
||||
goSignIn(){
|
||||
uni.navigateTo({
|
||||
url: '/pagesMy/signIn/index'
|
||||
})
|
||||
},
|
||||
goInvite() {
|
||||
uni.navigateTo({
|
||||
url: '/pagesMy/invite/invite'
|
||||
|
@ -6,9 +6,9 @@
|
||||
</view>
|
||||
<!-- 顶部区域 -->
|
||||
<view class="my-top">
|
||||
<view class="dis-box" v-if="userinfo">
|
||||
<view class="dis">
|
||||
<view class="touxiang" @click="goSetup">
|
||||
<view class="dis-box" v-if="!user">
|
||||
<view class="dis" @click="goSetup()">
|
||||
<view class="touxiang">
|
||||
<image src="@/static/icon/icon/newmy.png" mode="aspectFit" style="margin-right: 10px;">
|
||||
</image>
|
||||
</view>
|
||||
@ -19,15 +19,16 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="dis-box" v-else>
|
||||
<view class="dis">
|
||||
<view class="touxiang" @click="goSetup">
|
||||
|
||||
<image src="@/static/icon/icon/newmy.png" mode="aspectFit" style="margin-right: 10px;">
|
||||
</image>
|
||||
<view class="dis" @click="goSetup()">
|
||||
<view class="touxiang">
|
||||
<image v-if="user.avatar" :src="baseUrl+user.avatar" mode="aspectFit"
|
||||
style="margin-right: 10px;"></image>
|
||||
<image v-else src="@/static/icon/icon/newmy.png" mode="aspectFit"
|
||||
style="margin-right: 10px;"></image>
|
||||
</view>
|
||||
<view class="">
|
||||
<view class="user-tel">用户昵称</view>
|
||||
<view class="user-name">手机号: xxxxxxxxxxxx</view>
|
||||
<view class="user-tel">{{user.name}}</view>
|
||||
<view class="user-name">手机号: {{user.mobile}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="" @click="goMypages(2)">
|
||||
@ -46,7 +47,7 @@
|
||||
<view class="jg-box-nmb">{{countList.length || 0 }}次</view>
|
||||
</view>
|
||||
<text style="color: #999999;">|</text>
|
||||
<view class="jg-box" @click="toCoupons">
|
||||
<view class="jg-box" @click="toCoupons()">
|
||||
<view class="jg-box-title">优惠券</view>
|
||||
<view class="jg-box-nmb">{{cardsList.length || 0 }}</view>
|
||||
</view>
|
||||
@ -95,7 +96,7 @@
|
||||
积分商城
|
||||
</view>
|
||||
</view>
|
||||
<view class="centenr-sx">
|
||||
<view class="centenr-sx" @click="goSetup()">
|
||||
<view class="centenr-img">
|
||||
<image src="@/static/icon/icon/newmy5.png"></image>
|
||||
</view>
|
||||
@ -103,7 +104,7 @@
|
||||
个人资料
|
||||
</view>
|
||||
</view>
|
||||
<view class="centenr-sx">
|
||||
<view class="centenr-sx" @click="goInvte()">
|
||||
<view class="centenr-img">
|
||||
<image src="@/static/icon/icon/newmy6.png"></image>
|
||||
</view>
|
||||
@ -111,7 +112,7 @@
|
||||
邀请有礼
|
||||
</view>
|
||||
</view>
|
||||
<view class="centenr-sx">
|
||||
<view class="centenr-sx" @click="goCar()">
|
||||
<view class="centenr-img">
|
||||
<image src="@/static/icon/icon/newmy7.png"></image>
|
||||
</view>
|
||||
@ -127,7 +128,7 @@
|
||||
成长值记录
|
||||
</view>
|
||||
</view>
|
||||
<view class="centenr-sx">
|
||||
<view class="centenr-sx" @click="goCard()">
|
||||
<view class="centenr-img">
|
||||
<image src="@/static/icon/icon/newmy9.png"></image>
|
||||
</view>
|
||||
@ -135,12 +136,12 @@
|
||||
礼品卡
|
||||
</view>
|
||||
</view>
|
||||
<view class="centenr-sx">
|
||||
<view class="centenr-sx" @click="goFleet()">
|
||||
<view class="centenr-img">
|
||||
<image src="@/static/icon/icon/newmy10.png"></image>
|
||||
</view>
|
||||
<view class="centenr-size">
|
||||
副卡管理
|
||||
车队管理
|
||||
</view>
|
||||
</view>
|
||||
<view class="centenr-sx">
|
||||
@ -151,7 +152,7 @@
|
||||
我的奖品
|
||||
</view>
|
||||
</view>
|
||||
<view class="centenr-sx">
|
||||
<view class="centenr-sx" @click="goFeedback()">
|
||||
<view class="centenr-img">
|
||||
<image src="@/static/icon/icon/newmy12.png"></image>
|
||||
</view>
|
||||
@ -175,11 +176,9 @@
|
||||
return {
|
||||
query: {
|
||||
storeId: '',
|
||||
chainStoreId: '',
|
||||
couponType: '',
|
||||
useStatus: 0,
|
||||
pageNo: 1,
|
||||
pageSize: 10
|
||||
status: 0,
|
||||
page: 1,
|
||||
pageSize: 1000
|
||||
},
|
||||
querys: {
|
||||
mtUserId: '',
|
||||
@ -299,7 +298,7 @@
|
||||
url: 'business/userManager/user/getUser',
|
||||
method: 'get',
|
||||
}).then(res => {
|
||||
console.log(res, 1541);
|
||||
console.log(res, 302);
|
||||
if (res.data) {
|
||||
this.user = res.data
|
||||
uni.setStorageSync('userId', res.data.id)
|
||||
@ -376,12 +375,17 @@
|
||||
},
|
||||
goCard() {
|
||||
uni.navigateTo({
|
||||
url: '/pagesMy/CardManagement/CardManagement'
|
||||
url: '/pagesHome/RechargeRecords/RechargeRecords'
|
||||
})
|
||||
},
|
||||
govip() {
|
||||
goCar() {
|
||||
uni.navigateTo({
|
||||
url: '/pagesMy/VIP/vip'
|
||||
url: '/pagesMy/licensePlate/index'
|
||||
})
|
||||
},
|
||||
goFleet() {
|
||||
uni.navigateTo({
|
||||
url: '/pagesMy/fleetInfo/index'
|
||||
})
|
||||
},
|
||||
goFeedback() {
|
||||
@ -399,12 +403,12 @@
|
||||
params: this.query
|
||||
}).then(res => {
|
||||
if (res.data) {
|
||||
this.cardBalance = res.data.cardBalance,
|
||||
this.myPoints = res.data.points,
|
||||
/* if (res.data.refuelMoney!=null && res.data.refuelMoney!=""){
|
||||
this.refuelMoney = JSON.parse(res.data.refuelMoney);
|
||||
} */
|
||||
this.cardBalance = res.data.cardBalance
|
||||
this.myPoints = res.data.points
|
||||
/* if (res.data.refuelMoney!=null && res.data.refuelMoney!=""){
|
||||
this.refuelMoney = JSON.parse(res.data.refuelMoney);
|
||||
} */
|
||||
this.refuelMoney = JSON.parse(res.data.refuelMoney);
|
||||
console.log("333333333333333", this.refuelMoney);
|
||||
}
|
||||
})
|
||||
@ -414,7 +418,7 @@
|
||||
return;
|
||||
}
|
||||
request({
|
||||
url: 'business/marketingActivity/cardFavorable/applet',
|
||||
url: 'cardCouponUser/queryPage',
|
||||
method: 'get',
|
||||
params: this.query
|
||||
}).then(res => {
|
||||
|
@ -139,6 +139,7 @@
|
||||
}).then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.integralGiftList = res.data.records
|
||||
console.log(this.integralGiftList,142);
|
||||
}
|
||||
})
|
||||
},
|
||||
|
204
gasStation-uni/pagesHome/userRegister/index.vue
Normal file
204
gasStation-uni/pagesHome/userRegister/index.vue
Normal file
@ -0,0 +1,204 @@
|
||||
<template>
|
||||
<view class="content">
|
||||
<view class="container">
|
||||
<view class="card_box"
|
||||
style="background: url('../../static/imgs/zc.png') no-repeat;background-size: 100% 100%;">
|
||||
<view style="font-size: 16px;">会员开卡</view>
|
||||
</view>
|
||||
<view class="box-zhong">
|
||||
<view class="box-shang">
|
||||
激活立享会员特权
|
||||
</view>
|
||||
<view class="box-hang">
|
||||
<view class="dis">必填信息</view>
|
||||
</view>
|
||||
<view class="box-hang">
|
||||
<view class="">手机号</view>
|
||||
<view>
|
||||
<input v-model="value" style="text-align: right;"></input>
|
||||
</view>
|
||||
</view>
|
||||
<view class="box-hang">
|
||||
<view class="dis">选填信息</view>
|
||||
</view>
|
||||
<view class="box-hang">
|
||||
<view class="">姓名</view>
|
||||
<view>
|
||||
<input v-model="value" style="text-align: right;"></input>
|
||||
</view>
|
||||
</view>
|
||||
<view class="box-hang">
|
||||
<view class="">性别</view>
|
||||
<view>
|
||||
<input v-model="value" style="text-align: right;"></input>
|
||||
</view>
|
||||
</view>
|
||||
<view class="box-hang">
|
||||
<view class="">生日</view>
|
||||
<view>
|
||||
<input v-model="value" style="text-align: right;"></input>
|
||||
</view>
|
||||
</view>
|
||||
<view class="box-yd" @click="chooseAgree()">
|
||||
<view class="acvf" v-if="isAgree == false"></view>
|
||||
<view class="acv" v-else><u-icon name="checkbox-mark" color="#FF9655" size="14"></u-icon></view>
|
||||
<view class="dis">
|
||||
我已阅读并同意会员卡信息使用说明
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="but-sub">提交</view>
|
||||
<view style="height: 20px;"></view>
|
||||
</view>
|
||||
<view class="dis" style="text-align: center;font-size: 12px;display: flex;justify-content: center;">
|
||||
个人资料将由并仅限百业兴油站使用</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import request from '../../utils/request';
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
title: '',
|
||||
List: [],
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
totalPage: '',
|
||||
value: 'xxxxxx',
|
||||
isAgree: false
|
||||
}
|
||||
},
|
||||
onLoad() {},
|
||||
onPullDownRefresh() {
|
||||
//下拉刷新
|
||||
uni.stopPullDownRefresh()
|
||||
},
|
||||
onReachBottom() {
|
||||
// 触底加载
|
||||
if (this.pageNo >= this.totalPage) {
|
||||
|
||||
} else {
|
||||
this.pageNo++
|
||||
}
|
||||
},
|
||||
|
||||
components: {
|
||||
|
||||
},
|
||||
methods: {
|
||||
chooseAgree() {
|
||||
this.isAgree = !this.isAgree
|
||||
},
|
||||
goback() {
|
||||
uni.navigateBack()
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.content {
|
||||
background: #f4f5f6;
|
||||
}
|
||||
|
||||
.container {
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
box-sizing: border-box;
|
||||
padding-top: 11px;
|
||||
}
|
||||
|
||||
.card_box {
|
||||
width: 94%;
|
||||
height: 90px;
|
||||
margin: 0 auto;
|
||||
box-sizing: border-box;
|
||||
padding: 10px;
|
||||
color: #fff;
|
||||
font-size: 14px;
|
||||
text-align: center;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.box-zhong {
|
||||
width: 94%;
|
||||
margin: 10px auto;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.box-hang {
|
||||
background-color: white;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
box-sizing: border-box;
|
||||
padding: 15px 15px;
|
||||
border-bottom: 1px solid #f4f5f6;
|
||||
}
|
||||
|
||||
.acvf {
|
||||
border-radius: 4px;
|
||||
border: 1px solid #eee;
|
||||
height: 16px;
|
||||
width: 16px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
.acv {
|
||||
border-radius: 4px;
|
||||
border: 1px solid #FF9655;
|
||||
height: 16px;
|
||||
width: 16px;
|
||||
color: #FF9655;
|
||||
margin-right: 10px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.dis {
|
||||
color: #999999;
|
||||
}
|
||||
|
||||
.box-yd {
|
||||
display: flex;
|
||||
margin: 20px 0;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.box-shang {
|
||||
color: #333333;
|
||||
font-weight: bold;
|
||||
font-size: 16px;
|
||||
text-align: center;
|
||||
border-bottom: #EEEEEE 1px dashed;
|
||||
height: 56px;
|
||||
line-height: 56px;
|
||||
}
|
||||
|
||||
.box-end {
|
||||
text-align: center;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.but-sub {
|
||||
width: 94%;
|
||||
height: 40px;
|
||||
line-height: 40px;
|
||||
margin: 0 auto;
|
||||
background-color: #FF9655;
|
||||
color: white;
|
||||
border-radius: 5px;
|
||||
text-align: center;
|
||||
}
|
||||
</style>
|
@ -3,7 +3,7 @@
|
||||
<view class="container">
|
||||
<view class="my-header">
|
||||
<view class="my-icons" @click="goBack"> <uni-icons type="left" size="16"></uni-icons> </view>
|
||||
<view class="my-text">设置</view>
|
||||
<view class="my-text">个人资料</view>
|
||||
<view class="my-icons"></view>
|
||||
</view>
|
||||
<!-- 顶部区域 -->
|
||||
@ -13,7 +13,7 @@
|
||||
<view class="touxiang">
|
||||
<image class="touxiang" v-if="user.avatar!='' && user.avatar!=null && user.avatar!=undefined"
|
||||
:src="baseUrl + user.avatar" mode="aspectFit"></image>
|
||||
<image class="touxiang" v-else src="@/static/imgs/myx.png" mode="aspectFit"></image>
|
||||
<image class="touxiang" v-else src="@/static/icon/icon/newmy.png" mode="aspectFit"></image>
|
||||
</view>
|
||||
</button>
|
||||
<!-- #endif -->
|
||||
@ -23,7 +23,7 @@
|
||||
<view class="touxiang">
|
||||
<image class="touxiang" v-if="user.avatar!='' && user.avatar!=null && user.avatar!=undefined"
|
||||
:src="baseUrl + user.avatar" mode="aspectFit"></image>
|
||||
<image class="touxiang" v-else src="@/static/imgs/myx.png" mode="aspectFit"></image>
|
||||
<image class="touxiang" v-else src="@/static/icon/icon/newmy.png" mode="aspectFit"></image>
|
||||
</view>
|
||||
</button>
|
||||
<!-- #endif -->
|
||||
@ -37,7 +37,12 @@
|
||||
</view>
|
||||
<view class="box-hang" @click="show1 =!show1">
|
||||
<view class="">性别</view>
|
||||
<view class="dis"> <text>{{user.sex}}</text> <uni-icons type="right" size="16"></uni-icons> </view>
|
||||
<view class="dis">
|
||||
<text v-if="user.sex==1">男</text>
|
||||
<text v-else-if="user.sex==0">女</text>
|
||||
<text v-else>不详</text>
|
||||
<uni-icons type="right" size="16"></uni-icons>
|
||||
</view>
|
||||
</view>
|
||||
<view class="box-hang" @click="show=!show">
|
||||
<view class="">生日</view>
|
||||
@ -51,13 +56,13 @@
|
||||
<view class="">会员号</view>
|
||||
<view class="dis"> <text>{{user.userNo}}</text> <uni-icons type="right" size="16"></uni-icons> </view>
|
||||
</view> -->
|
||||
<view class="box-hang" @click="goEdit(2)">
|
||||
<!-- <view class="box-hang" @click="goEdit(2)">
|
||||
<view class="">车牌号</view>
|
||||
<view class="dis">
|
||||
<text v-if="!user.carNo">未填写</text>
|
||||
<text v-else>{{user.carNo}}</text> <uni-icons type="right" size="16"></uni-icons>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<!-- <view class="box-hang" @click="goEdit(3)">
|
||||
<view class="">会员支付设置</view>
|
||||
<view class="dis"> <text>已设置</text> <uni-icons type="right" size="16"></uni-icons> </view>
|
||||
|
BIN
gasStation-uni/static/imgs/zc.png
Normal file
BIN
gasStation-uni/static/imgs/zc.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 40 KiB |
Loading…
Reference in New Issue
Block a user