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

6.11(添加微信支付

Browse Source
This commit is contained in:
Hong
2024-06-11 18:43:36 +08:00
parent da4dfc7b08
commit c713f502f6
13 changed files with 254 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
manifest.json
View File

@@ -2,8 +2,8 @@
"name" : "滴友之家",
"appid" : "__UNI__F2BE74F",
"description" : "",
"versionName" : "1.3.7",
"versionCode" : 137,
"versionName" : "1.3.8",
"versionCode" : 138,
"transformPx" : false,
"app-plus" : {
"usingComponents" : true,
@@ -65,6 +65,11 @@
"payment" : {
"alipay" : {
"__platform__" : [ "ios", "android" ]
},
"weixin" : {
"__platform__" : [ "ios", "android" ],
"appid" : "wx4aebc21c2e0b4858",
"UniversalLinks" : "https://cms.diyouzhijia.com/universal/apple-app-site-association.txt/"
}
},
"share" : {
@@ -89,7 +94,16 @@
},
"splashscreen" : {
"androidStyle" : "common",
"useOriginalMsgbox" : true
"useOriginalMsgbox" : true,
"iosStyle" : "storyboard",
"android" : {
"hdpi" : "static/logo.9.png",
"xhdpi" : "static/logo.9.png",
"xxhdpi" : "static/logo.9.png"
},
"ios" : {
"storyboard" : "static/CustomStoryboard.zip"
}
},
"icons" : {
"android" : {

62
pages/carShop/mine/wallet/reconciliation/reconciliation.vue
View File

@@ -14,7 +14,8 @@
<view class="reconciliation-title f-a-i f-jcsb">
<view>
<view class="reconciliation-title-cont">工单对账(元)</view>
<view class="reconciliation-title-num">420/已结算</view>
<view v-show="endTab==2" class="reconciliation-title-num">已结算:{{settlementNum}}</view>
<view v-show="endTab==2" class="reconciliation-title-num">未结算:{{unsettledNum}}</view>
</view>
<view class="">
<image src="@/static/images/carshop/user/money.png" mode=""></image>
@@ -26,9 +27,9 @@
<view :class="['tab',endTab==1?'end-tab':'']" @click="endTabFn(1)">对账单</view>
<view :class="['tab',endTab==2?'end-tab':'']" @click="endTabFn(2)">结算单</view>
</view>
<view class="f-a-i">
<view style="margin-right: 8rpx;">本月</view>
<u-icon name="arrow-down-fill" color="#aeaeae" size="20"></u-icon>
<view class="f-a-i" @click="timeShow=true">
<view style="margin-right: 8rpx;">{{timedata?timedata:timeStr}}</view>
<u-icon name="arrow-down-fill" color="#aeaeae" size="12"></u-icon>
</view>
</view>
<z-paging ref="paging" id="billList" :fixed="false" :style="{width: '100%',height:listTop}"
@@ -66,13 +67,16 @@
<view class="billList-time">{{item.month}}</view>
<view class="f-a-i f-jcsb billList-status">
<view class="">{{item.isSettlement?'已结算':'未结算'}}</view>
<view class="billList-price">{{item.newTotalPrice?item.newTotalPrice:item.totalPrice}}</view>
<view class="billList-price">{{item.newTotalPrice?item.newTotalPrice:item.totalPrice}}
</view>
</view>
</view>
</view>
</z-paging>
</view>
</view>
<!-- 时间筛选选择 -->
<u-datetime-picker :show="timeShow" v-model="timeStr" mode="year-month" :formatter="formatter" @confirm="timeConfirm" @cancel="timeShow=false" @close="timeShow=false"></u-datetime-picker>
</view>
</template>
@@ -89,10 +93,24 @@
//列表
billList: [],
//tabbar选择
endTab: 1
endTab: 1,
//时间筛选
timeShow: false,
timeStr:uni.$u.timeFormat(Number(new Date()), 'yyyy-mm'),
timedata:'',
//结算总金额
settlementNum:0,
//未结算
unsettledNum:0
};
},
methods: {
//确定时间
timeConfirm(e){
this.timeShow=false
this.timedata=uni.$u.timeFormat(e.value, 'yyyy-mm')
this.$refs.paging.refresh();
},
//tabbar切换
endTabFn(type) {
this.endTab = type
@@ -105,15 +123,33 @@
if (this.endTab == 1) {
getReconciliationList({
page: pageNo,
limit: pageSize
limit: pageSize,
specificDateStr:this.timedata
}).then(res => {
console.log(res.data.list);
this.$refs.paging.complete(res.data.list);
})
} else {
getStatementList({
page: pageNo,
limit: pageSize
limit: pageSize,
yearMonthStr:this.timedata
}).then(res => {
console.log(res.data.list);
let addNum=0
let addNum2=0
res.data.list.forEach(item=>{
if(item.isSettlement){
let num=item.newTotalPrice?Number(item.newTotalPrice):Number(item.totalPrice)
addNum+=num
}else{
let num=item.newTotalPrice?Number(item.newTotalPrice):Number(item.totalPrice)
addNum2+=num
}
})
console.log(addNum);
this.settlementNum=addNum
this.unsettledNum=addNum2
this.$refs.paging.complete(res.data.list);
})
}
@@ -128,6 +164,16 @@
back() {
uni.navigateBack()
},
//过滤
formatter(type, value) {
if (type === 'year') {
return `${value}年`
}
if (type === 'month') {
return `${value}月`
}
return value
},
},
mounted() {
const query = uni.createSelectorQuery().in(this);

18
pages/driver/mine/every_day_card/every_day_card.vue
View File

@@ -528,6 +528,24 @@
})
})
} else {
prepay(this.payData).then(res => {
paymentFn(this.payData.payType, res.data.alipayRequest).then(res => {
if (res.channel.serviceReady) {
uni.showToast({
icon: 'success',
title: '支付成功'
})
this.topUpTypeShow = false
uni.hideLoading()
this.$refs.paging.refresh();
}
})
}).catch(err => {
uni.navigateTo({
url: `/pages/serve/coupons/payresult?resultType=err`
})
})
return
uni.showToast({
title: '目前不支持微信',
duration: 2000,

49
pages/driver/mine/my_activity/my_activity.vue
View File

@@ -265,6 +265,55 @@
})
}
} else {
if (this.helpGenre == 0) {
paycardAPI(this.payData).then(res => {
this.topUpTypeShow = false
paymentFn(this.payData.payType, res.data.alipayRequest).then(res => {
if (res.channel.serviceReady) {
uni.navigateTo({
url: `/pages/driver/serve/coupons/payresult?resultType=res`
})
}
}).catch(err => {
uni.navigateTo({
url: `/pages/driver/serve/coupons/payresult?resultType=err`
})
})
})
} else if (this.helpGenre == 1) {
//租车
frontPayPayrental(this.payData).then(res => {
this.topUpTypeShow = false
paymentFn(this.payData.payType, res.data.alipayRequest).then(res => {
if (res.channel.serviceReady) {
uni.navigateTo({
url: `/pages/driver/serve/coupons/payresult?resultType=res`
})
}
}).catch(err => {
uni.navigateTo({
url: `/pages/driver/serve/coupons/payresult?resultType=err`
})
})
})
} else {
//买车
frontPayCarSell(this.payData).then(res => {
this.topUpTypeShow = false
paymentFn(this.payData.payType, res.data.alipayRequest).then(res => {
if (res.channel.serviceReady) {
uni.navigateTo({
url: `/pages/driver/serve/coupons/payresult?resultType=res`
})
}
}).catch(err => {
uni.navigateTo({
url: `/pages/driver/serve/coupons/payresult?resultType=err`
})
})
})
}
return
uni.showToast({
title: '目前不支持微信支付',
duration: 2000,

16
pages/driver/mine/my_order/buyCars/buy_cars_order.vue
View File

@@ -230,6 +230,22 @@
})
} else {
//买车
frontPayCarSell(this.payData).then(res => {
this.topUpTypeShow = false
paymentFn(this.payData.payType, res.data.alipayRequest).then(res => {
if (res.channel.serviceReady) {
uni.navigateTo({
url: `/pages/driver/serve/coupons/payresult?resultType=res`
})
}
}).catch(err => {
uni.navigateTo({
url: `/pages/driver/serve/coupons/payresult?resultType=err`
})
})
})
return
uni.showToast({
title: '目前不支持微信支付',
duration: 2000,

15
pages/driver/mine/my_order/buyCars/buy_cars_particulars.vue
View File

@@ -200,6 +200,21 @@
})
} else {
frontPayCarSell(payData).then(res => {
this.topUpTypeShow = false
paymentFn(payData.payType, res.data.alipayRequest).then(res => {
if (res.channel.serviceReady) {
uni.navigateTo({
url: `/pages/driver/serve/coupons/payresult?resultType=res`
})
}
}).catch(err => {
uni.navigateTo({
url: `/pages/driver/serve/coupons/payresult?resultType=err`
})
})
})
return
uni.showToast({
title: '目前不支持微信支付',
duration: 2000,

16
pages/driver/mine/my_order/rentCars/rent_order.vue
View File

@@ -261,8 +261,22 @@
})
})
})
} else {
frontPayPayrental(this.payData).then(res => {
this.topUpTypeShow = false
paymentFn(this.payData.payType, res.data.alipayRequest).then(res => {
if (res.channel.serviceReady) {
uni.navigateTo({
url: `/pages/driver/serve/coupons/payresult?resultType=res`
})
}
}).catch(err => {
uni.navigateTo({
url: `/pages/driver/serve/coupons/payresult?resultType=err`
})
})
})
return
uni.showToast({
title: '目前不支持微信支付',
duration: 2000,

15
pages/driver/mine/my_order/rentCars/rent_particulars.vue
View File

@@ -171,6 +171,21 @@
})
} else {
frontPayPayrental(payData).then(res => {
this.topUpTypeShow = false
paymentFn(payData.payType, res.data.alipayRequest).then(res => {
if (res.channel.serviceReady) {
uni.navigateTo({
url: `/pages/driver/serve/coupons/payresult?resultType=res`
})
}
}).catch(err => {
uni.navigateTo({
url: `/pages/driver/serve/coupons/payresult?resultType=err`
})
})
})
return
uni.showToast({
title: '目前不支持微信支付',
duration: 2000,

33
pages/driver/mine/my_order/serveOrder/serve_order.vue
View File

@@ -448,6 +448,39 @@
}
} else {
if(this.payData.orderFlag){
frontPayintegral(this.payData).then(res => {
this.topUpTypeShow = false
paymentFn(this.payData.payType, res.data.alipayRequest).then(res => {
if (res.channel.serviceReady) {
uni.navigateTo({
url: `/pages/driver/serve/coupons/payresult?resultType=res`
})
}
}).catch(err => {
uni.navigateTo({
url: `/pages/driver/serve/coupons/payresult?resultType=err`
})
})
})
}else{
paycardAPI(this.payData).then(res => {
this.topUpTypeShow = false
paymentFn(this.payData.payType, res.data.alipayRequest).then(res => {
if (res.channel.serviceReady) {
uni.navigateTo({
url: `/pages/driver/serve/coupons/payresult?resultType=res`
})
}
}).catch(err => {
uni.navigateTo({
url: `/pages/driver/serve/coupons/payresult?resultType=err`
})
})
}).catch(err => {
})
}
return
uni.showToast({
title: '目前不支持微信支付',
duration: 2000,

21
pages/driver/serve/coupons/cou_order.vue
View File

@@ -248,12 +248,9 @@
})
})
} else if (this.topUpType == 'zfb') {
// console.log(this.orderInfo, '提交信息');
paycardAPI(this.orderInfo).then(res => {
this.topUpTypeShow = false
// console.log(res.data.alipayRequest, '支付宝支付返回数据');
paymentFn(this.orderInfo.payType, res.data.alipayRequest).then(res => {
// console.log(res, '支付结果');
if (res.channel.serviceReady) {
uni.redirectTo({
url: `/pages/driver/serve/coupons/payresult?resultType=res`
@@ -268,14 +265,18 @@
} else {
paycardAPI(this.orderInfo).then(res => {
this.topUpTypeShow = false
console.log(res.data, '微信支付返回数据');
paymentFn(this.orderInfo.payType, res.data.alipayRequest).then(res => {
if (res.channel.serviceReady) {
uni.redirectTo({
url: `/pages/driver/serve/coupons/payresult?resultType=res`
})
}
}).catch(err => {
uni.redirectTo({
url: `/pages/driver/serve/coupons/payresult?resultType=err`
})
})
})
// uni.showToast({
// title: '目前不支持微信支付',
// duration: 2000,
// icon: 'none'
// });
}
},
//类型

8
pages/driver/showroom/confirmOrder/confirmOrder.vue
View File

@@ -572,7 +572,7 @@
this.navPayOnFn()
})
}
} else if (this.topUpType == 'zfb') {
} else {
if (this.orderType == 2) {
frontPayPayrental(this.payData).then(res => {
this.topUpTypeShow = false
@@ -596,12 +596,6 @@
})
}).catch(err => {})
}
} else {
uni.showToast({
title: '目前不支持微信支付',
duration: 2000,
icon: 'none'
});
}
},
topUpTypeClose() {

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

@@ -68,6 +68,7 @@
: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-title">选择支付方式</view>
<view>
<view class="top-up-popup-type f-jcsb f-a-i">
@@ -239,7 +240,7 @@
url: `/pages/driver/welfare/payment_state/payment_state?resultType=err`
})
})
} else if (this.topUpType == 'zfb') {
} else {
frontPayintegral(this.orderInfo).then(res => {
this.topUpTypeShow = false
paymentFn(this.orderInfo.payType, res.data.alipayRequest).then(res => {
@@ -254,14 +255,7 @@
})
})
})
} else {
uni.showToast({
title: '目前不支持微信支付',
duration: 2000,
icon: 'none'
});
}
}
},
//关闭支付
topUpTypeClose() {
@@ -435,4 +429,11 @@
justify-content: center;
align-items: center;
}
.top-up-popup-allprice {
font-size: 32rpx;
font-weight: 500;
color: #000000;
padding: 24rpx 0;
border-bottom: 1rpx solid #E6E6E6;
}
</style>

BIN
证书/汽车系统账号.docx
View File

Binary file not shown.