caoliancun/MP-XiaoXing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
xiaozhiyong
2025-05-26 14:35:03 +08:00
parent 76299211a9
commit 9f0072b506
16 changed files with 209 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
App.vue
View File

@@ -86,7 +86,7 @@
// data.isOverShare = true
view.onShareAppMessage = () => { //重写分享配置
return {
title: '百川加油',
title: '清正源油加油',
path: "/pages/index/startPage/startPage", //若无path 默认跳转分享页
// imageUrl:'/image/onshowMessage.png' //若无imageUrl 截图当前页面
imageUrl: 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/login-bg.png',

2
BagMoney/pages/reCharge/reCharge.vue
View File

@@ -170,7 +170,7 @@
let payData = {
openId: uni.getStorageSync('openid'),
unionId: uni.getStorageSync('unionid'),
appId: "wxc1d226ac9c5bea36",
appId: "wxf3d6c15e3b087447",
rechargeSource: 'WECHAT_APPETS',
rechargeAmount: this.reChargeMoney + '',
createSource: 'XOIL_DRIVER_WECHAT_APPLET',

2
BagSetup/setup/setup.vue
View File

@@ -75,7 +75,7 @@
</view>
<view class="cu-item arrow">
<view class="content">
关于佰川能源
关于清正源油能源
</view>
<view class="value">
版本{{'1.0.0'}}

1
BagStation/pages/makeOrder/makeOrder.vue
View File

@@ -122,6 +122,7 @@
this.getSiteInfo(option.siteId)
this.activeCur = option.activeCur
}
},
methods: {
obtainUrlPathParameterTarget(url) {

47
BagStation/pages/makeOrder/orderPaying.vue
View File

@@ -2,7 +2,7 @@
<view>
<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
<block slot="backText">返回</block>
<block slot="content">佰川收银台</block>
<block slot="content">清正源油收银台</block>
</cu-custom>
<view class="">
<view class="padding-xl text-center">
@@ -16,7 +16,8 @@
</view>
<view class=" radius my-shadow solid-top margin margin-top-0">
<view class="cu-list menu" v-if="!isCompany">
<view class="cu-item" v-show="order.wxPayStatus" @tap="selWX">
<view class="cu-item" v-if="order.wxPayStatus && order.dispatchPaymentMethod !== 'JIAOLIANPAY'" @tap="selWX">
<view class="content">
<view class="text-left">
<view class="site-icon-sm">
@@ -33,6 +34,10 @@
</view>
</view>
</view>
<!-- <view class="cu-item" v-show="order.personalStatus" @tap="selectPersonCard(order.personalAccount)">
<view class="content">
<view class="text-left">
@@ -160,12 +165,15 @@
</view>
</view>
</view>
<view class="padding placeholder-hidden">
<!-- <view class="padding placeholder-hidden">
<button class="cu-btn block lg bg-main-oil" @tap="payOrder">立即支付</button>
<button class="cu-btn margin-top block lg " @tap="cancelOrder(order.orderSerialNumber)">取消订单</button>
</view>
</view> -->
<view class="padding fixed-bar-bottom">
<button class="cu-btn block lg bg-main-oil" @tap="payOrder">立即支付</button>
<jl-pay v-if="order.dispatchPaymentMethod === 'JIAOLIANPAY'" :orderNo="order.orderNo" :amount="order.resultAmount" :returnUrl="order.pagePath" @navigateTo="navigateTo">
<button class="cu-btn block lg bg-main-oil" >立即支付</button>
</jl-pay>
<button v-else class="cu-btn block lg bg-main-oil" @tap="payOrder">立即支付</button>
<button class="cu-btn margin-top block lg " @tap="cancelOrder(order.orderSerialNumber)">取消订单</button>
</view>
</view>
@@ -219,6 +227,13 @@
this.payMethod = oilItem.payMethod
}
console.log('orderinfo',this.order)
if(this.order.dispatchPaymentMethod === 'JIAOLIANPAY') {
this.order.resultAmount = this.order.realAmount * 100
}
console.log('fafafdfadsfasdf',this.order.wxPayStatus && this.order.dispatchPaymentMethod !== 'JIAOLIANPAY')
},
onShow() {
this.datatime = this.timF(this.order.createTime);
@@ -244,6 +259,20 @@
}
},
methods: {
navigateTo(e) {
if (e.detail.success) {
// 支付成功操作
uni.redirectTo({
url: '/BagStation/pages/makeOrder/payResult?status=success&&payMethod=' +
this.payMethod
})
} else {
uni.showToast({
title: '支付失败，请重试',
icon: 'none'
})
}
},
timF(date) {
date = date.substring(0, 19)
date = date.replace(/-/g, '/')
@@ -304,19 +333,19 @@
// payChannel: 'WECHAT_MINIAPPS_PAYMENT', //微信小程序支付 WECHAT_APP_PAYMENT微信APP支付
// openId: uni.getStorageSync('openid'),
// unionId: uni.getStorageSync('unionid'),
// appId: 'wxc1d226ac9c5bea36',
// appId: 'wxf3d6c15e3b087447',
// payCode: 'WECHAT_ORDER_PAY_WECHAT', //APP填WECHAT_ORDER_PAY_APP，小程序填
// orderId: this.order.orderSerialNumber,
// payClient: 'XOIL_DRIVER_WECHAT_APPLET' //"支付端。安卓XOIL_DRIVER_ANDROID，小程序
payChannel: 'WECHAT_MINIAPPS_PAYMENT', //微信小程序支付 WECHAT_APP_PAYMENT微信APP支付
openId: uni.getStorageSync('openid'),
unionId: uni.getStorageSync('unionid'),
appId: 'wxc1d226ac9c5bea36',
appId: 'wxf3d6c15e3b087447',
payCode: 'WECHAT_ORDER_PAY_WECHAT', //APP填WECHAT_ORDER_PAY_APP，小程序填
orderId: this.order.orderSerialNumber,
payClient: 'XOIL_DRIVER_WECHAT_APPLET', //"支付端。安卓XOIL_DRIVER_ANDROID，小程序
userIp: (this.userIp ? this.userIp : "36.57.160.59"),
merchantNo: '10089145264'
merchantNo: '10090808247'
}
oilPayApi.aggregatePay(payData).then(res => {
@@ -329,7 +358,7 @@
title: res.msg
})
oilPayApi.wxPayIntegral({
appId: 'wxc1d226ac9c5bea36',
appId: 'wxf3d6c15e3b087447',
orderId: this.order.orderSerialNumber
})
uni.redirectTo({

2
BagStation/pages/routePlain/routePlain.vue
View File

@@ -332,7 +332,7 @@
} else {
uni.showModal({
title:'请您登录',
content:"登录佰川加油才可以加油 |˛˙꒳​˙)♡",
content:"登录清正源油加油才可以加油 |˛˙꒳​˙)♡",
confirmText:'去登陆',
success: (res) => {
if(res.confirm){

2
BagStation/pages/stationDetail/stationDetail.vue
View File

@@ -314,7 +314,7 @@
if(!user){
uni.showModal({
title: '请您登录',
content: "登录佰川加油才可以加油 |˛˙꒳​˙)♡",
content: "登录清正源油加油才可以加油 |˛˙꒳​˙)♡",
confirmText: '去登陆',
success: (res) => {
if (res.confirm) {

2
Financial/pages/index.vue
View File

@@ -171,7 +171,7 @@
statype: seniorPage.statype,
queryDate: seniorPage.queryDate,
lastQueryDate: seniorPage.lastQueryDate,
appId: 'wxc1d226ac9c5bea36',
appId: 'wxf3d6c15e3b087447',
openId: uni.getStorageSync('openid'),
unionId: uni.getStorageSync('unionid')
}

4
api/oil-identity.js
View File

@@ -15,7 +15,7 @@ export default {
method: 'post',
data:{
code:code,
appId:'wxc1d226ac9c5bea36'
appId:'wxf3d6c15e3b087447'
}
})
},
@@ -25,7 +25,7 @@ export default {
method: 'post',
data:{
...data,
appId:'wxc1d226ac9c5bea36'
appId:'wxf3d6c15e3b087447'
}
})
},

98
manifest.json
View File

@@ -1,28 +1,28 @@
{
"name" : "XiaoXing",
"appid" : "__UNI__62FBBA8",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
"transformPx" : false,
"name": "XiaoXing",
"appid": "__UNI__62FBBA8",
"description": "",
"versionName": "1.0.0",
"versionCode": "100",
"transformPx": false,
/* 5+App特有相关 */
"app-plus" : {
"usingComponents" : true,
"nvueCompiler" : "uni-app",
"compilerVersion" : 3,
"splashscreen" : {
"alwaysShowBeforeRender" : true,
"waiting" : true,
"autoclose" : true,
"delay" : 0
"app-plus": {
"usingComponents": true,
"nvueCompiler": "uni-app",
"compilerVersion": 3,
"splashscreen": {
"alwaysShowBeforeRender": true,
"waiting": true,
"autoclose": true,
"delay": 0
},
/* 模块配置 */
"modules" : {},
"modules": {},
/* 应用发布信息 */
"distribute" : {
"distribute": {
/* android打包配置 */
"android" : {
"permissions" : [
"android": {
"permissions": [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
@@ -48,47 +48,51 @@
]
},
/* ios打包配置 */
"ios" : {},
"ios": {},
/* SDK配置 */
"sdkConfigs" : {}
"sdkConfigs": {}
}
},
/* 快应用特有相关 */
"quickapp" : {},
"quickapp": {},
/* 小程序特有相关 */
"mp-weixin" : {
"appid" : "wxc1d226ac9c5bea36",
"setting" : {
"urlCheck" : true,
"es6" : false,
"postcss" : false
"mp-weixin": {
"appid": "wxf3d6c15e3b087447",
"setting": {
"urlCheck": true,
"es6": false,
"postcss": false
},
"usingComponents" : true,
"permission" : {
"scope.userLocation" : {
"desc" : "需要获取您的位置，用于查看附近油站"
"usingComponents": true,
"permission": {
"scope.userLocation": {
"desc": "需要获取您的位置，用于查看附近油站"
}
},
"plugins" : {
"chooseocation" : {
"version" : "1.0.6",
"provider" : "wx76a9a06e5b4e693e"
"plugins": {
"chooseocation": {
"version": "1.0.6",
"provider": "wx76a9a06e5b4e693e"
},
"routePlan" : {
"version" : "1.0.12",
"provider" : "wx50b5593e81dd937a"
"routePlan": {
"version": "1.0.12",
"provider": "wx50b5593e81dd937a"
},
"jl-pay-plugin": {
"version": "1.0.1",
"provider": "wx2f4eb78ea48ce8ea"
}
},
"requiredPrivateInfos" : [ "getLocation" ]
"requiredPrivateInfos": ["getLocation"]
},
"mp-alipay" : {
"usingComponents" : true,
"appid" : "2021002150632366"
"mp-alipay": {
"usingComponents": true,
"appid": "2021002150632366"
},
"mp-baidu" : {
"usingComponents" : true
"mp-baidu": {
"usingComponents": true
},
"mp-toutiao" : {
"usingComponents" : true
"mp-toutiao": {
"usingComponents": true
}
}

17
pages.json
View File

@@ -3,20 +3,20 @@
{
"path": "pages/index/startPage/startPage",
"style": {
"navigationBarTitleText": "佰川加油"
"navigationBarTitleText": "清正源油加油"
}
},
{
"path": "pages/tabbar/home/home",
"style": {
"navigationBarTitleText": "佰川加油" // "enablePullDownRefresh": true
"navigationBarTitleText": "清正源油加油" // "enablePullDownRefresh": true
}
},
{
"path": "pages/tabbar/order/orderList/orderList",
"style": {
"navigationBarTitleText": "佰川加油", // "enablePullDownRefresh": true
"navigationBarTitleText": "清正源油加油", // "enablePullDownRefresh": true
"enablePullDownRefresh": true
}
},
@@ -24,7 +24,7 @@
{
"path": "pages/tabbar/station/stationList",
"style": {
"navigationBarTitleText": "佰川加油", // "enablePullDownRefresh": true
"navigationBarTitleText": "清正源油加油", // "enablePullDownRefresh": true
"enablePullDownRefresh": true
}
},
@@ -32,7 +32,7 @@
{
"path": "pages/tabbar/user/user",
"style": {
"navigationBarTitleText": "佰川加油" // "enablePullDownRefresh": true
"navigationBarTitleText": "清正源油加油" // "enablePullDownRefresh": true
}
}
@@ -236,7 +236,10 @@
"path": "pages/makeOrder/orderPaying",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"usingComponents": {
"jl-pay": "plugin://jl-pay-plugin/jl-pay"
}
}
}, {
@@ -291,7 +294,7 @@
"allowsBounceVertical": "NO"
},
"navigationBarBackgroundColor": "#f33e54",
"navigationBarTitleText": "佰川加油",
"navigationBarTitleText": "清正源油加油",
"navigationStyle": "custom",
"navigationBarTextStyle": "white"
},

93
pages/index/startPage/startPage.vue
View File

@@ -1,6 +1,6 @@
<template>
<view class="page-content">
<image src="../../../static/img/start.jpg" width="" mode="widthFix"></image>
<image src="../../../static/img/start-second.jpg" width="" mode="widthFix"></image>
</view>
</template>
@@ -59,50 +59,61 @@
this.getFilterData()
}
}
setTimeout(() => {
if (key == '在线') {
uni.switchTab({
url: '/pages/tabbar/home/home',
})
} else {
uni.redirectTo({
url: '/BagAuth/pages/login/login'
})
}
}, 2500)
// 在页面中定义插屏广告
let interstitialAd = null
// let interstitialAd = null
// 在页面onLoad回调事件中创建插屏广告实例
if (wx.createInterstitialAd) {
interstitialAd = wx.createInterstitialAd({
adUnitId: 'adunit-a7faf57adeed211f'
})
}
interstitialAd.onLoad((err) => {
// console.log('onLoad event emit', err)
})
interstitialAd.onError((err) => {
setTimeout(() => {
if (key == '在线') {
uni.switchTab({
url: '/pages/tabbar/home/home',
})
} else {
uni.redirectTo({
url: '/BagAuth/pages/login/login'
})
}
}, 2000)
})
// if (wx.createInterstitialAd) {
// interstitialAd = wx.createInterstitialAd({
// adUnitId: 'adunit-a7faf57adeed211f'
// })
// }
// interstitialAd.onLoad((err) => {
// // console.log('onLoad event emit', err)
// })
// interstitialAd.onError((err) => {
// setTimeout(() => {
// if (key == '在线') {
// uni.switchTab({
// url: '/pages/tabbar/home/home',
// })
// } else {
// uni.redirectTo({
// url: '/BagAuth/pages/login/login'
// })
// }
// }, 2000)
// })
// 在适合的场景显示插屏广告
if (interstitialAd) {
interstitialAd.show().catch((err) => {
// console.error(err)
})
}
interstitialAd.onClose(res => {
setTimeout(() => {
if (key == '在线') {
uni.switchTab({
url: '/pages/tabbar/home/home',
})
} else {
uni.redirectTo({
url: '/BagAuth/pages/login/login'
})
}
}, 1000)
})
// if (interstitialAd) {
// interstitialAd.show().catch((err) => {
// // console.error(err)
// })
// }
// interstitialAd.onClose(res => {
// setTimeout(() => {
// if (key == '在线') {
// uni.switchTab({
// url: '/pages/tabbar/home/home',
// })
// } else {
// uni.redirectTo({
// url: '/BagAuth/pages/login/login'
// })
// }
// }, 1000)
// })
},
onReady(option) {
const updateManager = uni.getUpdateManager();

2
pages/tabbar/qrCenter/qrCenter.vue
View File

@@ -1,7 +1,7 @@
<template>
<view class="page-content">
<cu-custom class="bg-main-oil" bgColor="bg-main-oil">
<block slot="content">佰川加油</block>
<block slot="content">清正源油加油</block>
</cu-custom>
<view class="margin-top-lg">
<swiper class="screen-swiper text-center square-dot" :indicator-dots="true"

2
pages/tabbar/station/stationList.vue
View File

@@ -484,7 +484,7 @@
// } else {
// uni.showModal({
// title: '请您登录',
// content: "登录佰川加油才可以加油 |˛˙꒳​˙)♡",
// content: "登录清正源油加油才可以加油 |˛˙꒳​˙)♡",
// confirmText: '去登陆',
// success: (res) => {
// if (res.confirm) {

BIN
static/img/start-second.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 92 KiB

2
utils/request.js
View File

@@ -4,7 +4,7 @@ import utils from '@/utils/encode'
// const env = process.env.NODE_ENV
const env = 'production' /* */
// const env = 'test'
const testUrl = 'http://192.168.110.77:38080'
const testUrl = 'http://192.168.110.200:38080'
// const productUrl = 'http://121.196.213.68/adminapi' //预生产
const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new