sunliwei/lanan-repair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
ChuShiZ 2024-09-24 21:39:50 +08:00
commit 7408339b73
8 changed files with 116 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/unpackage/ /unpackage/
unpackage/* unpackage/*
unpackage unpackage
.idea

5
.idea/.gitignore vendored
View File

@ -1,5 +0,0 @@
# 默认忽略的文件
/shelf/
/workspace.xml
# 基于编辑器的 HTTP 客户端请求
/httpRequests/

2
api/login.js
View File

@ -82,7 +82,7 @@ export function loginAppuserName(data) {
// 使用租户域名（标识），获得租户编号 // 使用租户域名（标识），获得租户编号
export function getTenantIdByWebsite(website) { export function getTenantIdByWebsite(website) {
return request({ return request({
url: '/system/tenant/getListByWebsite', url: '/admin-api/system/tenant/getListByWebsite',
method: 'get', method: 'get',
params: { params: {
website website

3
config.js
View File

@ -2,8 +2,7 @@
module.exports = { module.exports = {
//baseUrl: 'https://www.nuoyunr.com/admin-api', //baseUrl: 'https://www.nuoyunr.com/admin-api',
// baseUrl: 'https://3w823u8516.vicp.fun', // baseUrl: 'https://3w823u8516.vicp.fun',
// baseUrl: 'http://192.168.1.4:48080', baseUrl: 'http://192.168.1.4:48080',
baseUrl: 'http://localhost:48080',
imagesUrl: 'http://shequ.0315e.com/static/images/pages/', imagesUrl: 'http://shequ.0315e.com/static/images/pages/',
baseImageUrl: 'http://122.51.230.86:9000/', baseImageUrl: 'http://122.51.230.86:9000/',
//wsUrl: 'wss://www.nuoyunr.com/admin-api', //wsUrl: 'wss://www.nuoyunr.com/admin-api',

51
pages/my/cardRoll.vue
View File

@ -1,39 +1,46 @@
<template> <template>
<view class="container"> <view class="container">
<v-navigation-bar title-color="#333" background-color="#fff" title="卡卷包"> <v-navigation-bar title-color="#333" background-color="#fff" title="卡券包">
</v-navigation-bar> </v-navigation-bar>
<view class="tabbar"> <!-- <view class="tabbar">-->
<view v-for="item in tabList" :key="item.value" class="tabItem" :class="{active: activeKey === item.value}"> <!-- <view v-for="item in tabList" :key="item.value" class="tabItem" :class="{active: activeKey === item.value}">-->
{{item.title}} <!-- {{item.title}}-->
<view v-if="activeKey === item.value" class="activeLine"> <!-- <view v-if="activeKey === item.value" class="activeLine">-->
</view> <!-- </view>-->
</view> <!-- </view>-->
</view> <!-- </view>-->
<view class="body"> <view class="body">
<view class="cardItem"> <view class="cardItem">
<view class="cardItemTop"> <view class="cardItemTop" v-for="item in customInfo.couponList">
<!-- <image class="cardImg" src="" mode="aspectFill"></image> --> <!-- <image class="cardImg" src="" mode="aspectFill"></image> -->
<view class="cardImg"> <view class="cardImg">
<view class="cardImgText">车辆保养卡</view> <view v-if="item.couponType == 'lbq'" class="cardImgText">礼包券</view>
<view v-if="item.couponType == 'byk'" class="cardImgText">保养卡</view>
<image class="cardImgBg" src="../../static/images/cardRollBg.png" mode="aspectFit"></image> <image class="cardImgBg" src="../../static/images/cardRollBg.png" mode="aspectFit"></image>
</view> </view>
<view class="cardInfo"> <view class="cardInfo">
<view class="cardName">车辆保养卡</view> <view class="cardName">{{ item.couponName }}</view>
<view class="cardEndDate">2024-09-20</view> <!-- <view class="cardEndDate">2024-09-20</view>-->
</view> </view>
<view class="cardInfoRight"> <view v-if="item.outRule != 'mehx'" class="cardInfoRight">
<view class="cardNum"> <view class="cardNum">
<text class="cardNumValue">4</text>次 <text class="cardNumValue">{{ item.balance }}</text>次
</view> </view>
<view class="cardLabel">可用次数</view> <view class="cardLabel">可用次数</view>
</view> </view>
<view v-if="item.outRule == 'mehx'" class="cardInfoRight">
<view class="cardNum">
<text class="cardNumValue">{{ item.balance }}</text>元
</view> </view>
<view class="cardItemBottom"> <view class="cardLabel">余额</view>
<view class="useSm">使用说明</view>
<view class="useBtn">去使用</view>
</view> </view>
</view> </view>
<!-- <view class="cardItemBottom">-->
<!-- <view class="useSm">使用说明</view>-->
<!-- <view class="useBtn">去使用</view>-->
<!-- </view>-->
</view>
</view> </view>
</view> </view>
</template> </template>
@ -47,9 +54,10 @@
}, },
data() { data() {
return { return {
customInfo:{},
tabList: [{ tabList: [{
value: 0, value: 0,
title: '优惠卷' title: '礼包券'
}, },
{ {
value: 1, value: 1,
@ -58,7 +66,12 @@
], ],
activeKey: 0 activeKey: 0
}; };
} },
onLoad(data) {
//当前登录用户信息
this.customInfo = JSON.parse(uni.getStorageSync('customerInfo'))
console.log(this.customInfo,66)
},
} }
</script> </script>

31
pages/my/my.vue
View File

@ -1,21 +1,21 @@
<template> <template>
<view class="container"> <view class="container">
<view class="body"> <view class="body">
<VNavigationBar titleColor="rgba(0,0,0,0.9)" leftTitle="true" backgroundColor="transparent" title=" "> <VNavigationBar titleColor="rgba(0,0,0,0.9)" :leftTitle="true" backgroundColor="transparent" title=" ">
</VNavigationBar> </VNavigationBar>
<view class="body-top"> <view class="body-top">
<image class="userBmg" src="../../static/images/image1.png" mode="widthFix"></image> <image class="userBmg" src="../../static/images/image1.png" mode="widthFix"></image>
<view class="userInfo"> <view class="userInfo">
<image class="avatar" src="../../static/images/avatar.png" mode="aspectFit"></image> <image class="avatar" src="../../static/images/avatar.png" mode="aspectFit"></image>
<text class="userName">用户昵称</text> <text class="customInfo">{{customInfo.cusName}}</text>
</view> </view>
</view> </view>
<view class="level"> <view class="level">
<image class="levelIcon" src="" mode="aspectFit"></image> <image class="levelIcon" src="" mode="aspectFit"></image>
<view class="levelInfo"> <view class="levelInfo">
<text class="levelNum">Lv.2</text> <text class="levelNum">{{customInfo.levelName}}</text>
<text class="levelQy">当前可享受4项权益</text> <!-- <text class="levelQy">当前可享受4项权益</text> -->
</view> </view>
<view class="showQyBtn" @click="showEquity"> <view class="showQyBtn" @click="showEquity">
查看权益 查看权益
@ -64,14 +64,20 @@
<script> <script>
import VNavigationBar from '@/components/VNavigationBar.vue' import VNavigationBar from '@/components/VNavigationBar.vue'
import tabBarVue from '@/components/tabBar/tabBar.vue' import tabBarVue from '@/components/tabBar/tabBar.vue'
import request from "@/utils/request";
export default { export default {
components: { components: {
tabBarVue, tabBarVue,
VNavigationBar VNavigationBar
}, },
onLoad(data) {
this.getServer()
},
data() { data() {
return { return {
//用户信息
customInfo:{},
menuCard1: [ menuCard1: [
{ title: '我的资料', icon: require('@/static/icons/my-menu-icon1.png'), path: '/pages/my/myInfo' }, { title: '我的资料', icon: require('@/static/icons/my-menu-icon1.png'), path: '/pages/my/myInfo' },
{ title: '我的卡券', icon: require('@/static/icons/my-menu-icon5.png'), path: "/pages/my/cardRoll" }, { title: '我的卡券', icon: require('@/static/icons/my-menu-icon5.png'), path: "/pages/my/cardRoll" },
@ -94,6 +100,21 @@
uni.navigateTo({ uni.navigateTo({
url: '/pages/my/myEquity' url: '/pages/my/myEquity'
}) })
},
//获取当前登录用户信息
async getServer() {
const res = await request({
url: "/userClient/customer/getUserCustomer",
method: 'get',
params:{}
})
this.customInfo = res.data
uni.setStorageSync('customerInfo', JSON.stringify(this.customInfo))
// JSON.parse(JSON.stringify(files))
// const a = uni.getStorageSync('customerInfo')
// console.log(JSON.parse(a),115)
} }
} }
} }

58
pages/my/myEquity.vue
View File

@ -8,19 +8,21 @@
当前等级 当前等级
</view> </view>
<view class="levelNum"> <view class="levelNum">
Lv.2 {{ customInfo.levelName }}
</view> </view>
</view> </view>
<view class="equityTitle"> <view class="equityTitle">
<image class="leftIcon" src="../../static/icons/my-icon1.png" mode="aspectFit"></image> <image class="leftIcon" src="../../static/icons/my-icon1.png" mode="aspectFit"></image>
<view class="">尊享<text class="colorTitle">4项</text>权益</view> <!-- <view class="">尊享<text class="colorTitle">4项</text>权益</view>-->
<view class="">尊享权益</view>
<image class="rightIcon" src="../../static/icons/my-icon1.png" mode="aspectFit"></image> <image class="rightIcon" src="../../static/icons/my-icon1.png" mode="aspectFit"></image>
</view> </view>
<view class="card2"> <view class="card2">
<view v-for="(item, index) in equityList" :key="index" class="cardItem"> <!-- <view v-for="(item, index) in equityList" :key="index" class="cardItem">-->
<view class="dian"></view> <!-- <view class="dian"></view>-->
<text>{{ item.title }}</text> <!-- <text>{{ customInfo.userEquity }}</text>-->
</view> <!-- </view>-->
<text>{{ customInfo.userEquity }}</text>
</view> </view>
<view class="equityTitle"> <view class="equityTitle">
<image class="leftIcon" src="../../static/icons/my-icon1.png" mode="aspectFit"></image> <image class="leftIcon" src="../../static/icons/my-icon1.png" mode="aspectFit"></image>
@ -40,10 +42,10 @@
<view v-for="(item, index) in levelEquityList" :key="index" class="card3Tr"> <view v-for="(item, index) in levelEquityList" :key="index" class="card3Tr">
<view class="card3Td"> <view class="card3Td">
<image class="levelIcon" src="../../static/icons/my-icon2.png" mode="aspectFit"></image> <image class="levelIcon" src="../../static/icons/my-icon2.png" mode="aspectFit"></image>
<text>LV.{{item.level}}</text> <text>{{item.name}}</text>
</view> </view>
<view class="card3Td"> <view class="card3Td">
{{ item.desc }} {{ item.userEquity }}
</view> </view>
</view> </view>
</view> </view>
@ -54,12 +56,14 @@
<script> <script>
import VNavigationBar from '@/components/VNavigationBar.vue' import VNavigationBar from '@/components/VNavigationBar.vue'
import request from "@/utils/request";
export default { export default {
components: { components: {
VNavigationBar, VNavigationBar,
}, },
data() { data() {
return { return {
customInfo:{},
equityList: [{ equityList: [{
title: '进店送' title: '进店送'
}, },
@ -73,28 +77,24 @@
title: '赠送全车360' title: '赠送全车360'
}, },
], ],
levelEquityList: [{ levelEquityList: []
level: '1',
desc: '进店送精美礼品一份\n赠送原车配套空气滤芯一个\n赠送198空调雾化杀菌除味一次\n赠送全车360安全检测'
},
{
level: '2',
desc: '进店送精美礼品一份\n赠送原车配套空气滤芯一个\n赠送198空调雾化杀菌除味一次\n赠送全车360安全检测'
},
{
level: '3',
desc: '进店送精美礼品一份\n赠送原车配套空气滤芯一个\n赠送198空调雾化杀菌除味一次\n赠送全车360安全检测'
},
{
level: '4',
desc: '进店送精美礼品一份\n赠送原车配套空气滤芯一个\n赠送198空调雾化杀菌除味一次\n赠送全车360安全检测'
},
{
level: '5',
desc: '进店送精美礼品一份\n赠送原车配套空气滤芯一个\n赠送198空调雾化杀菌除味一次\n赠送全车360安全检测'
},
]
}; };
},
onLoad(data) {
//当前登录用户信息
this.customInfo = JSON.parse(uni.getStorageSync('customerInfo'))
this.getMemberList()
},
methods:{
async getMemberList() {
await request({
url: '/userClient/customer/allMember',
method: 'get'
}).then((res) => {
this.levelEquityList = res.data
})
}
} }
} }
</script> </script>

31
pages/my/myInfo.vue
View File

@ -2,20 +2,25 @@
<view class="container"> <view class="container">
<VNavigationBarVue titleColor="#333" backgroundColor="#fff" title="我的资料"></VNavigationBarVue> <VNavigationBarVue titleColor="#333" backgroundColor="#fff" title="我的资料"></VNavigationBarVue>
<view class="body"> <view class="body">
<!-- <view class="formItem">-->
<!-- <text class="formLabel">头像</text>-->
<!-- <image class="avatar" src="../../static/images/avatar.png" mode="aspectFit"></image>-->
<!-- </view>-->
<view class="formItem"> <view class="formItem">
<text class="formLabel">头像</text> <text class="formLabel">姓名</text>
<image class="avatar" src="../../static/images/avatar.png" mode="aspectFit"></image> <text class="formValue">{{ customInfo.cusName }}</text>
</view> <!-- <image class="formBtn" src="../../static/icons/homeInfoMore.png" mode="aspectFit"></image>-->
<view class="formItem">
<text class="formLabel">昵称</text>
<text class="formValue">用户昵称</text>
<image class="formBtn" src="../../static/icons/homeInfoMore.png" mode="aspectFit"></image>
</view> </view>
<view class="formItem"> <view class="formItem">
<text class="formLabel">手机号</text> <text class="formLabel">手机号</text>
<text class="formValue">157****9706</text> <text class="formValue">{{ customInfo.phoneNumber }}</text>
<image class="formBtn" src="../../static/icons/homeInfoMore.png" mode="aspectFit"></image> <!-- <image class="formBtn" src="../../static/icons/homeInfoMore.png" mode="aspectFit"></image>-->
</view>
<view class="formItem">
<text class="formLabel">联系地址</text>
<text class="formValue">{{ customInfo.address }}</text>
<!-- <image class="formBtn" src="../../static/icons/homeInfoMore.png" mode="aspectFit"></image>-->
</view> </view>
</view> </view>
</view> </view>
@ -29,9 +34,13 @@
}, },
data() { data() {
return { return {
customInfo:{}
}; };
} },
onLoad(data) {
//当前登录用户信息
this.customInfo = JSON.parse(uni.getStorageSync('customerInfo'))
},
} }
</script> </script>