qichexitong/car-system-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6.26(更新

Browse Source
This commit is contained in:
Hong
2024-06-26 20:22:11 +08:00
parent cd868cebd3
commit 94cbe810dd
17 changed files with 252 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/home/home.js
View File

@@ -31,4 +31,15 @@ export function getPlatformList(params) {
method: 'get',
params
})
}
/**
* 加入返佣 /api/front/return/commission/platform/join/{platformId}
*/
export function getPlatformJoin(platformId) {
return request({
url: `/api/front/return/commission/platform/join/${platformId}`,
method: 'get',
})
}

22
api/login/index.js
View File

@@ -43,4 +43,26 @@ export function carShopLogin(data) {
'method': 'post',
data
})
}
/**
* 注销
*/
export function userLogoff(data) {
return request({
'url': '/api/front/user/logoff',
'method': 'post',
data
})
}
/**
* 提交唯一标识cid
*/
export function updateGetuiCid(geTuiCid) {
return request({
'url': `/api/front/user/update_getui_cid/${geTuiCid}`,
'method': 'post',
})
}

11
api/system/config.js
View File

@@ -40,6 +40,17 @@ export function getUserprivacyinfo() {
})
}
/**
* 获取返佣规则
*/
export function getRebateactivitiesinfo() {
return request({
'url': '/api/front/agreement/rebateactivitiesinfo',
'method': 'get'
})
}
/**
* 获取租车用户协议 /api/front/agreement/user/rental/rule
*/

21
manifest.json
View File

@@ -2,8 +2,8 @@
"name" : "滴友之家",
"appid" : "__UNI__F2BE74F",
"description" : "",
"versionName" : "1.4.0",
"versionCode" : 140,
"versionName" : "1.4.1",
"versionCode" : 141,
"transformPx" : false,
"app-plus" : {
"usingComponents" : true,
@@ -22,7 +22,8 @@
"Geolocation" : {},
"VideoPlayer" : {},
"Share" : {},
"Maps" : {}
"Maps" : {},
"Push" : {}
},
"distribute" : {
"android" : {
@@ -99,9 +100,15 @@
},
"push" : {
"unipush" : {
"version" : "2",
"offline" : true,
"hms" : {}
"icons" : {
"small" : {
"ldpi" : "static/logo.png",
"mdpi" : "static/logo.png",
"hdpi" : "static/logo.png",
"xhdpi" : "static/logo.png",
"xxhdpi" : "static/logo.png"
}
}
}
},
"maps" : {
@@ -115,7 +122,7 @@
"splashscreen" : {
"androidStyle" : "common",
"useOriginalMsgbox" : true,
"iosStyle" : "storyboard",
"iosStyle" : "common",
"android" : {
"hdpi" : "static/logo.9.png",
"xhdpi" : "static/logo.9.png",

16
pages.json
View File

@@ -661,13 +661,15 @@
"navigationBarTitleText": "我的",
"navigationStyle": "custom"
}
},{
"path": "pages/driver/mine/index",
"style": {
"navigationBarTitleText": "我的认证",
"navigationStyle": "custom"
}
}, {
},
// {
// "path": "pages/driver/mine/index",
// "style": {
// "navigationBarTitleText": "我的认证",
// "navigationStyle": "custom"
// }
// },
{
"path": "pages/driver/welfare/index",
"style": {
"navigationBarTitleText": "福利",

12
pages/common/textview/index.vue
View File

@@ -14,7 +14,8 @@
getClockRule,
getRentalRule,
getCarBuyWayInfo,
getAgreementApplication
getAgreementApplication,
getRebateactivitiesinfo
} from '@/api/system/config.js'
import {
articleInfo
@@ -37,6 +38,7 @@
if (options.title == '规则详情') this.getClockRuleFn()
if (options.title == '租卖协议') this.getRentalRuleFn()
if (options.title == '应用介绍') this.getAgreementApplicationFn()
if (options.title == '返佣规则') this.getRebateactivitiesinfoFn()
if (options.title == '购车方案') {
this.getCarBuyWayInfoFn(options.carBuyWayId)
}
@@ -48,17 +50,21 @@
}
},
methods: {
//获取返佣规则
getRebateactivitiesinfoFn(){
getRebateactivitiesinfo().then(res => {
this.content = JSON.parse(res.data).agreement
})
},
//获取应用介绍
getAgreementApplicationFn(){
getAgreementApplication().then(res => {
console.log(res);
this.content = JSON.parse(res.data).agreement
})
},
//获取购车方案详情
getCarBuyWayInfoFn(id){
getCarBuyWayInfo(id).then(res=>{
console.log(res);
this.title= res.data.name
this.content = res.data.content
})

3
pages/driver/home/home.vue
View File

@@ -154,6 +154,9 @@
};
},
methods: {
btnAClick() {
console.log('btnClick');
},
toDetailPages(item, index) {
uni.navigateTo({
url: `/pages/driver/index/consult_detail?id=${item.id}`

52
pages/driver/mine/set/set.vue
View File

@@ -1,34 +1,33 @@
<template>
<view class="set">
<view class="set-menu">
<view v-for="(item,index) in menuList" :key="index">
<view v-for="(item,index) in menuList" :key="index">
<view class="u-slot-title f-30 flex justify-between align-center" @click="clickFn(item)">
<view>
{{item.text}}
</view>
<image style="width: 16rpx;height: 28rpx;" src="@/static/images/icon/arrow-right.png" mode=""></image>
<image style="width: 16rpx;height: 28rpx;" src="@/static/images/icon/arrow-right.png" mode="">
</image>
</view>
<u-line color="#f5f5f5"></u-line>
</view>
<!-- <u-cell-group :border="false">
<u-cell v-for="(item,index) in menuList" :key="index" :title="item.text" :isLink="true"
@click="clickFn(item)" :customStyle="{padding:'12rpx 0rpx'}">
<view slot="title" class="u-slot-title">
<text class="u-cell-text">{{item.text}}</text>
</view>
</u-cell>
</u-cell-group> -->
</view>
<view class="set-bottom-button">
<u-button type="primary" plain shape="circle" text="注销" color="#999"
:customStyle='{height: "88rpx",marginRight: "16rpx",fontSize: "28rpx",fontWeight: 500,marginBottom: "16rpx"}'
@click="delCommFn(2)"></u-button>
<u-button type="primary" shape="circle" text="退出登录" color="#13AFA8"
:customStyle='{height: "88rpx",marginRight: "16rpx",fontSize: "28rpx",fontWeight: 500,}'
@click="delCommFn"></u-button>
@click="delCommFn(1)"></u-button>
</view>
<promptBox ref="pbox" @confirm="disposeShowFn(1)"></promptBox>
</view>
</template>
<script>
import {
userLogoff
} from "@/api/login/index.js"
import promptBox from "@/components/prompt-box/prompt-box.vue"
export default {
components: {
@@ -36,14 +35,15 @@
},
data() {
return {
enType: 1,
menuList: [{
text: '账号安全',
path: '/pages/repair/user/changeCall/changeCall'
},
{
text: '清除缓存',
path:'/pages/driver/mine/set/clear'
path: '/pages/driver/mine/set/clear'
},
{
text: '常见问题',
@@ -57,17 +57,23 @@
},
methods: {
//退出登录
delCommFn(item, index) {
this.$refs.pbox.show = true
this.$refs.pbox.tipContent.content = '您确定要退出登录吗？'
this.$refs.pbox.tipContent.cancelText = '取消'
delCommFn(type) {
this.enType = type
if (type == 1) {
this.$refs.pbox.show = true
this.$refs.pbox.tipContent.content = '您确定要退出登录吗？'
this.$refs.pbox.tipContent.cancelText = '取消'
} else {
this.$refs.pbox.show = true
this.$refs.pbox.tipContent.content = '您确定要注销此账号吗？'
this.$refs.pbox.tipContent.cancelText = '取消'
}
},
//url
clickFn(item) {
uni.navigateTo({
url: item.path
})
uni.navigateTo({
url: item.path
})
},
//退出登录
disposeShowFn() {
@@ -91,9 +97,11 @@
page {
background-color: #f5f5f5;
}
.u-slot-title{
.u-slot-title {
padding: 32rpx 0;
}
.set {
width: 100%;
height: 100vh;

74
pages/driver/rebate/rebate.vue
View File

@@ -2,6 +2,9 @@
<view class="rebate">
<view class="rebate-header-bj">
<view class="activity flex justify-end">
<view class="activity-rules" @click="nacActivityFn">活动规则</view>
</view>
<view class="rebate-header">
<image class="rebate-header-tit" src="@/static/images/home/home_rebate_tit.png" mode=""></image>
<view class="rebate-header-cont flex justify-between">
@@ -27,10 +30,10 @@
<view class="swiper-box">
<u-swiper keyName="image" :list="brannerList" height="180rpx"></u-swiper>
</view>
<view class="rebate-shop">
<z-paging use-page-scroll :fixed="false" style="max-height: 1150rpx;" ref="paging" v-model="dataList"
<view class="rebate-shop" style="max-height: 1150rpx;">
<z-paging :fixed="false" style="height: 1150rpx;width: 690rpx;" ref="paging" v-model="dataList"
@query="queryList">
<view class="rebate-shop-hea flex justify-between align-center">
<view slot="top" class="rebate-shop-hea flex justify-between align-center">
<view class="f-36 fw-5 c333">返佣平台</view>
<view class="rebate-shop-address flex align-center justify-center f-26 c333"
@click="$tab.navigateTo('/pages/driver/serve/repair/re_create/select_city')">
@@ -44,14 +47,20 @@
<image class="rebate-shop-list-image" :src="item.image" mode=""></image>
<view class="rebate-shop-list-name">
<view class="f-30 c333 fw-6">{{item.name}}</view>
<view class="f-28 c333 fw-5" style="margin-top: 10rpx;">今日返佣最高<text
class="f-28 red ml-3">{{item.ratio*100}}%</text></view>
<view class="f-28 c333 fw-5" style="margin-top: 10rpx;">今日返佣最高
<text v-if="item.way==0" class="f-28 red ml-3">
{{item.ratio*100}}%</text>
<text v-else class="f-28 red ml-3">
{{parseInt(item.eachMoney)}}元/单
</text>
</view>
</view>
<view class="rebate-shop-list-status f-30">
<view class="rebate-status1" v-if="item.status==1">已加入</view>
<view class="rebate-status3" v-else-if="item.status==2">审核中</view>
<view class="rebate-status3" v-else-if="item.status==3">未通过</view>
<view class="rebate-status4" v-else @click="joinRebateFn(item)">加入返佣</view>
<view class="rebate-status1" v-if="item.status==3">已加入</view>
<view class="rebate-status3" v-else-if="item.status==1">审核中</view>
<view class="rebate-status3" v-else-if="item.status==2">未通过</view>
<!-- <view class="rebate-status4" v-else @click="$u.throttle(joinRebateFn(item), 2000)">加入返佣</view> -->
<view class="rebate-status4" v-else @click="btnBClick(item)">加入返佣</view>
</view>
</view>
</z-paging>
@@ -96,7 +105,8 @@
<script>
import {
getPlatformList
getPlatformList,
getPlatformJoin
} from "@/api/home/home.js"
import {
mapGetters
@@ -120,11 +130,36 @@
}
},
methods: {
//查看活动规则
nacActivityFn() {
uni.navigateTo({
url: '/pages/common/textview/index?title=返佣规则'
})
},
btnBClick(item) {
uni.$u.throttle(() => {
getPlatformJoin(item.id).then(res => {
uni.navigateTo({
url: `/pages/driver/rebate/rebate_web?contract=${item.link}`
})
}).catch(err => {
uni.navigateTo({
url: '/pages/driver/mine/my_authentication/my_authentication'
})
})
}, 2000)
},
//加入返佣
joinRebateFn(item) {
console.log(item);
uni.navigateTo({
url: `/pages/driver/rebate/rebate_web?contract=${item.link}`
getPlatformJoin(item.id).then(res => {
uni.navigateTo({
url: `/pages/driver/rebate/rebate_web?contract=${item.link}`
})
}).catch(err => {
uni.navigateTo({
url: '/pages/driver/mine/my_authentication/my_authentication'
})
})
},
//获取列表
@@ -158,7 +193,7 @@
.rebate-shop {
width: 690rpx;
margin: 20rpx 0rpx 20rpx 30rpx;
margin: 0rpx 0rpx 20rpx 30rpx;
background: #ffffff;
border-radius: 16rpx;
@@ -235,12 +270,25 @@
}
.rebate {
.activity-rules {
width: 132rpx;
height: 40rpx;
border-radius: 20rpx 0 0 20rpx;
font-size: 24rpx;
background: #F68400;
color: #ffffff;
text-align: center;
line-height: 40rpx;
margin-bottom: 8rpx;
}
.rebate-header-bj {
width: 750rpx;
height: 585rpx;
background-image: url('@/static/images/home/home_rebate_bj.png');
background-size: 100%;
padding-top: 330rpx;
margin-bottom: 70rpx;
}

1
pages/driver/serve/coupons/payresult.vue
View File

@@ -77,7 +77,6 @@
}
},
onLoad(options) {
console.log(options);
//成功失败
this.resultType = options.resultType
if (options.type) this.type = options.type

24
pages/driver/serve/index.vue
View File

@@ -112,8 +112,8 @@
<u-icon name="arrow-right" color="#999999" size="14"></u-icon>
</view>
</view>
<view class="integral-list flex justify-around">
<view class="flex flex-column" v-for="(item,index) in integralList">
<view class="integral-list flex">
<view class="flex flex-column" style="margin-left: 23rpx;" v-for="(item,index) in integralList">
<view class="integral-list-image">
<image style="width: 160rpx;height: 160rpx;border-radius: 16rpx;" :src="item.image"
mode="aspectFill"></image>
@@ -128,14 +128,16 @@
</view>
<!-- 热销中心 -->
<view class="serve-hot-sales">
<view class="serve-hot-list flex align-center">
<view v-for="(item,index) in couponHotList" class="mr-24" :key="index" @click="toDetailPages(item)">
<image :src="item.image" class="serve-hot-list-image" mode=""></image>
<view class="serve-hot-list-butt fff">
<text style="margin-left: 16rpx;">￥{{parseInt(item.price)}}</text>
<view class="serve-hot-list flex align-center justify-between">
<view class="flex align-center">
<view v-for="(item,index) in couponHotList" class="mr-24" :key="index" @click="toDetailPages(item)">
<image :src="item.cover" class="serve-hot-list-image" mode=""></image>
<view class="serve-hot-list-butt fff">
<text style="margin-left: 16rpx;">￥{{parseInt(item.price)}}</text>
</view>
</view>
</view>
<view class="f-28 c666" style="width: 30rpx;" @click="toHotPages('hot')">
<view class="f-28 c666 hot-pages" style="width: 30rpx;" @click="toHotPages('hot')">
查看更多
</view>
</view>
@@ -387,11 +389,9 @@
.serve-hot-list {
height: 210rpx;
position: absolute;
top: 0;
right: 0;
padding-right: 14rpx;
padding-left: 227rpx;
.serve-hot-list-image {
width: 120rpx;
height: 120rpx;

6
pages/driver/serve/repair/real_result.vue
View File

@@ -9,7 +9,7 @@
<!-- #endif -->
<view class="re_txt"> 您的资料已经提交成功 </view>
</view>
<view class="re_inspect" @click="toBindingPage"> 返回维修页面 </view>
<view class="re_inspect" @click="toBindingPage"> 返回 </view>
<u-popup :show="showBinding" mode="center" @close="showBinding=false" :safeAreaInsetBottom='false'>
<view class="allView">
<view class="show_img">
@@ -52,9 +52,7 @@
})
},
toBindingPage(){
uni.navigateTo({
url:'/pages/driver/serve/repair/repair'
})
uni.navigateBack()
},
getMyCar(){
// 获取我的汽车

2
pages/driver/serve/repair/realname.vue
View File

@@ -133,7 +133,7 @@
certificationAPI(this.userInfo).then((res) => {
console.log(res, 'then-res');
// this.$toast('已提交')
uni.navigateTo({
uni.redirectTo({
url: `/pages/driver/serve/repair/real_result`
})
})

58
pages/driver/welfare/rightsInterests/confirm_order.vue
View File

@@ -68,7 +68,9 @@
:topUpTypeClose="topUpTypeClose" @topUpTypeFn="topUpTypeFn"></PaymentType> -->
<u-popup :show="paymentShow" @close="topUpTypeClose" :closeable="false" round="16" closeOnClickOverlay>
<view class="top-up-popup">
<view class="top-up-popup-allprice"> 合计：￥{{commodityDeta.currentPrice* commodityNum}}+{{commodityDeta.integralNum* commodityNum}}积分 </view>
<view class="top-up-popup-allprice">
合计：￥{{commodityDeta.currentPrice* commodityNum}}+{{commodityDeta.integralNum* commodityNum}}积分
</view>
<view class="top-up-popup-title">选择支付方式</view>
<view>
<view class="top-up-popup-type f-jcsb f-a-i">
@@ -196,7 +198,14 @@
}
if (type == 'wx') {
this.orderInfo.payType = 'weixin'
// #ifdef APP-ANDROID
console.log('android');
this.orderInfo.payChannel = 'wechatAndroid'
// #endif
// #ifdef APP-IOS
console.log('ios');
this.orderInfo.payChannel = 'wechatIos'
// #endif
}
if (type == 'zfb') {
this.orderInfo.payType = 'alipay'
@@ -240,7 +249,7 @@
url: `/pages/driver/welfare/payment_state/payment_state?resultType=err`
})
})
} else {
} else if (this.topUpType == 'zfb') {
frontPayintegral(this.orderInfo).then(res => {
this.topUpTypeShow = false
paymentFn(this.orderInfo.payType, res.data.alipayRequest).then(res => {
@@ -250,12 +259,54 @@
})
}
}).catch(err => {
console.log(err);
uni.redirectTo({
url: `/pages/driver/serve/coupons/payresult?resultType=err`
})
})
})
}
} else {
console.log(this.orderInfo,'微信支付');
frontPayintegral(this.orderInfo).then(res => {
this.topUpTypeShow = false
console.log(res.data);
let jsConfig = res.data.jsConfig
let orderInfo={
"appid": jsConfig.appId,
"noncestr": jsConfig.nonceStr,
"package": 'Sign=WXPay',
"partnerid": jsConfig.partnerid,
"prepayid": jsConfig.prepayId,
"timestamp": jsConfig.timeStamp,
"sign": jsConfig.paySign
}
console.log(orderInfo);
uni.requestPayment({
provider: 'wxpay',
orderInfo: orderInfo,
success: (res) => {
console.log('支付成功');
// resolve(res)
},
fail: (err) => {
console.log(err, '支付失败');
// reject(err)
}
})
// paymentFn('wxpay', obj).then(res => {
// if (res.channel.serviceReady) {
// uni.redirectTo({
// url: `/pages/driver/serve/coupons/payresult?resultType=res`
// })
// }
// }).catch(err => {
// console.log(err);
// uni.redirectTo({
// url: `/pages/driver/serve/coupons/payresult?resultType=err`
// })
// })
})
}
},
//关闭支付
topUpTypeClose() {
@@ -429,6 +480,7 @@
justify-content: center;
align-items: center;
}
.top-up-popup-allprice {
font-size: 32rpx;
font-weight: 500;

12
pages/login/driver-login.vue
View File

@@ -48,7 +48,8 @@
<script>
import {
getSendCode,
userLogin
userLogin,
updateGetuiCid
} from '@/api/login';
import {
setToken
@@ -136,6 +137,15 @@
if (this.agree) {
this.$refs.uForm.validate().then(res => {
userLogin(this.form).then(res => {
uni.getPushClientId({
success: (res) => {
updateGetuiCid(res.cid).then(res=>{
})
},
fail(err) {
console.log(err)
}
})
setToken(res.data.token)
uni.setStorageSync('userType', 'driver')
uni.switchTab({

2
utils/index.js
View File

@@ -217,7 +217,7 @@ export function formatNumber(num) {
return num.toString();
}
}
//微信支付
//支付 api type:支付类型 data:参数
export function paymentFn(type, data) {

BIN
证书/ios/个推/carsystemio_Chuxueyun.p12 Normal file
View File

Binary file not shown.