From 9f0072b5068fee82d250fce0cc7c378642e2efc1 Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Mon, 26 May 2025 14:35:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 2 +- BagMoney/pages/reCharge/reCharge.vue | 2 +- BagSetup/setup/setup.vue | 2 +- BagStation/pages/makeOrder/makeOrder.vue | 1 + BagStation/pages/makeOrder/orderPaying.vue | 47 ++++- BagStation/pages/routePlain/routePlain.vue | 2 +- .../pages/stationDetail/stationDetail.vue | 2 +- Financial/pages/index.vue | 2 +- api/oil-identity.js | 4 +- manifest.json | 190 +++++++++--------- pages.json | 17 +- pages/index/startPage/startPage.vue | 93 +++++---- pages/tabbar/qrCenter/qrCenter.vue | 2 +- pages/tabbar/station/stationList.vue | 2 +- static/img/start-second.jpg | Bin 0 -> 93855 bytes utils/request.js | 2 +- 16 files changed, 209 insertions(+), 161 deletions(-) create mode 100644 static/img/start-second.jpg diff --git a/App.vue b/App.vue index 485b3c5..1a3aab5 100644 --- a/App.vue +++ b/App.vue @@ -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', diff --git a/BagMoney/pages/reCharge/reCharge.vue b/BagMoney/pages/reCharge/reCharge.vue index 7d78c70..73c9d8d 100644 --- a/BagMoney/pages/reCharge/reCharge.vue +++ b/BagMoney/pages/reCharge/reCharge.vue @@ -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', diff --git a/BagSetup/setup/setup.vue b/BagSetup/setup/setup.vue index 3a1b49d..8c4d026 100644 --- a/BagSetup/setup/setup.vue +++ b/BagSetup/setup/setup.vue @@ -75,7 +75,7 @@ - 关于佰川能源 + 关于清正源油能源 版本{{'1.0.0'}} diff --git a/BagStation/pages/makeOrder/makeOrder.vue b/BagStation/pages/makeOrder/makeOrder.vue index 61b4017..1bf91d5 100644 --- a/BagStation/pages/makeOrder/makeOrder.vue +++ b/BagStation/pages/makeOrder/makeOrder.vue @@ -122,6 +122,7 @@ this.getSiteInfo(option.siteId) this.activeCur = option.activeCur } + }, methods: { obtainUrlPathParameterTarget(url) { diff --git a/BagStation/pages/makeOrder/orderPaying.vue b/BagStation/pages/makeOrder/orderPaying.vue index 04a2608..906652e 100644 --- a/BagStation/pages/makeOrder/orderPaying.vue +++ b/BagStation/pages/makeOrder/orderPaying.vue @@ -2,7 +2,7 @@ 返回 - 佰川收银台 + 清正源油收银台 @@ -16,7 +16,8 @@ - + + @@ -33,6 +34,10 @@ + + + + - + + + + @@ -218,6 +226,13 @@ } else { 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() { @@ -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({ diff --git a/BagStation/pages/routePlain/routePlain.vue b/BagStation/pages/routePlain/routePlain.vue index 44236ba..24bc74b 100644 --- a/BagStation/pages/routePlain/routePlain.vue +++ b/BagStation/pages/routePlain/routePlain.vue @@ -332,7 +332,7 @@ } else { uni.showModal({ title:'请您登录', - content:"登录佰川加油才可以加油 |˛˙꒳​˙)♡", + content:"登录清正源油加油才可以加油 |˛˙꒳​˙)♡", confirmText:'去登陆', success: (res) => { if(res.confirm){ diff --git a/BagStation/pages/stationDetail/stationDetail.vue b/BagStation/pages/stationDetail/stationDetail.vue index bdf023e..a0a0a4a 100644 --- a/BagStation/pages/stationDetail/stationDetail.vue +++ b/BagStation/pages/stationDetail/stationDetail.vue @@ -314,7 +314,7 @@ if(!user){ uni.showModal({ title: '请您登录', - content: "登录佰川加油才可以加油 |˛˙꒳​˙)♡", + content: "登录清正源油加油才可以加油 |˛˙꒳​˙)♡", confirmText: '去登陆', success: (res) => { if (res.confirm) { diff --git a/Financial/pages/index.vue b/Financial/pages/index.vue index 1813b07..ac8199b 100644 --- a/Financial/pages/index.vue +++ b/Financial/pages/index.vue @@ -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') } diff --git a/api/oil-identity.js b/api/oil-identity.js index ebf3406..cbf6a60 100644 --- a/api/oil-identity.js +++ b/api/oil-identity.js @@ -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' } }) }, diff --git a/manifest.json b/manifest.json index a520b77..f0ac489 100644 --- a/manifest.json +++ b/manifest.json @@ -1,94 +1,98 @@ { - "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 - }, - /* 模块配置 */ - "modules" : {}, - /* 应用发布信息 */ - "distribute" : { - /* android打包配置 */ - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - /* ios打包配置 */ - "ios" : {}, - /* SDK配置 */ - "sdkConfigs" : {} - } - }, - /* 快应用特有相关 */ - "quickapp" : {}, - /* 小程序特有相关 */ - "mp-weixin" : { - "appid" : "wxc1d226ac9c5bea36", - "setting" : { - "urlCheck" : true, - "es6" : false, - "postcss" : false - }, - "usingComponents" : true, - "permission" : { - "scope.userLocation" : { - "desc" : "需要获取您的位置，用于查看附近油站" - } - }, - "plugins" : { - "chooseocation" : { - "version" : "1.0.6", - "provider" : "wx76a9a06e5b4e693e" - }, - "routePlan" : { - "version" : "1.0.12", - "provider" : "wx50b5593e81dd937a" - } - }, - "requiredPrivateInfos" : [ "getLocation" ] - }, - "mp-alipay" : { - "usingComponents" : true, - "appid" : "2021002150632366" - }, - "mp-baidu" : { - "usingComponents" : true - }, - "mp-toutiao" : { - "usingComponents" : true - } -} + "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 + }, + /* 模块配置 */ + "modules": {}, + /* 应用发布信息 */ + "distribute": { + /* android打包配置 */ + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + /* ios打包配置 */ + "ios": {}, + /* SDK配置 */ + "sdkConfigs": {} + } + }, + /* 快应用特有相关 */ + "quickapp": {}, + /* 小程序特有相关 */ + "mp-weixin": { + "appid": "wxf3d6c15e3b087447", + "setting": { + "urlCheck": true, + "es6": false, + "postcss": false + }, + "usingComponents": true, + "permission": { + "scope.userLocation": { + "desc": "需要获取您的位置，用于查看附近油站" + } + }, + "plugins": { + "chooseocation": { + "version": "1.0.6", + "provider": "wx76a9a06e5b4e693e" + }, + "routePlan": { + "version": "1.0.12", + "provider": "wx50b5593e81dd937a" + }, + "jl-pay-plugin": { + "version": "1.0.1", + "provider": "wx2f4eb78ea48ce8ea" + } + }, + "requiredPrivateInfos": ["getLocation"] + }, + "mp-alipay": { + "usingComponents": true, + "appid": "2021002150632366" + }, + "mp-baidu": { + "usingComponents": true + }, + "mp-toutiao": { + "usingComponents": true + } +} \ No newline at end of file diff --git a/pages.json b/pages.json index 0beffd7..8185a84 100644 --- a/pages.json +++ b/pages.json @@ -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" }, diff --git a/pages/index/startPage/startPage.vue b/pages/index/startPage/startPage.vue index 89516a5..a862d16 100644 --- a/pages/index/startPage/startPage.vue +++ b/pages/index/startPage/startPage.vue @@ -1,6 +1,6 @@ @@ -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(); diff --git a/pages/tabbar/qrCenter/qrCenter.vue b/pages/tabbar/qrCenter/qrCenter.vue index e900098..f6f5c9a 100644 --- a/pages/tabbar/qrCenter/qrCenter.vue +++ b/pages/tabbar/qrCenter/qrCenter.vue @@ -1,7 +1,7 @@