更新
This commit is contained in:
2
App.vue
2
App.vue
@@ -86,7 +86,7 @@
|
|||||||
// data.isOverShare = true
|
// data.isOverShare = true
|
||||||
view.onShareAppMessage = () => { //重写分享配置
|
view.onShareAppMessage = () => { //重写分享配置
|
||||||
return {
|
return {
|
||||||
title: '百川加油',
|
title: '清正源油加油',
|
||||||
path: "/pages/index/startPage/startPage", //若无path 默认跳转分享页
|
path: "/pages/index/startPage/startPage", //若无path 默认跳转分享页
|
||||||
// imageUrl:'/image/onshowMessage.png' //若无imageUrl 截图当前页面
|
// imageUrl:'/image/onshowMessage.png' //若无imageUrl 截图当前页面
|
||||||
imageUrl: 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/login-bg.png',
|
imageUrl: 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/login-bg.png',
|
||||||
|
|||||||
@@ -170,7 +170,7 @@
|
|||||||
let payData = {
|
let payData = {
|
||||||
openId: uni.getStorageSync('openid'),
|
openId: uni.getStorageSync('openid'),
|
||||||
unionId: uni.getStorageSync('unionid'),
|
unionId: uni.getStorageSync('unionid'),
|
||||||
appId: "wxc1d226ac9c5bea36",
|
appId: "wxf3d6c15e3b087447",
|
||||||
rechargeSource: 'WECHAT_APPETS',
|
rechargeSource: 'WECHAT_APPETS',
|
||||||
rechargeAmount: this.reChargeMoney + '',
|
rechargeAmount: this.reChargeMoney + '',
|
||||||
createSource: 'XOIL_DRIVER_WECHAT_APPLET',
|
createSource: 'XOIL_DRIVER_WECHAT_APPLET',
|
||||||
|
|||||||
@@ -75,7 +75,7 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="cu-item arrow">
|
<view class="cu-item arrow">
|
||||||
<view class="content">
|
<view class="content">
|
||||||
关于佰川能源
|
关于清正源油能源
|
||||||
</view>
|
</view>
|
||||||
<view class="value">
|
<view class="value">
|
||||||
版本{{'1.0.0'}}
|
版本{{'1.0.0'}}
|
||||||
|
|||||||
@@ -122,6 +122,7 @@
|
|||||||
this.getSiteInfo(option.siteId)
|
this.getSiteInfo(option.siteId)
|
||||||
this.activeCur = option.activeCur
|
this.activeCur = option.activeCur
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
obtainUrlPathParameterTarget(url) {
|
obtainUrlPathParameterTarget(url) {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<view>
|
<view>
|
||||||
<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
|
<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
|
||||||
<block slot="backText">返回</block>
|
<block slot="backText">返回</block>
|
||||||
<block slot="content">佰川收银台</block>
|
<block slot="content">清正源油收银台</block>
|
||||||
</cu-custom>
|
</cu-custom>
|
||||||
<view class="">
|
<view class="">
|
||||||
<view class="padding-xl text-center">
|
<view class="padding-xl text-center">
|
||||||
@@ -16,7 +16,8 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class=" radius my-shadow solid-top margin margin-top-0">
|
<view class=" radius my-shadow solid-top margin margin-top-0">
|
||||||
<view class="cu-list menu" v-if="!isCompany">
|
<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="content">
|
||||||
<view class="text-left">
|
<view class="text-left">
|
||||||
<view class="site-icon-sm">
|
<view class="site-icon-sm">
|
||||||
@@ -33,6 +34,10 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- <view class="cu-item" v-show="order.personalStatus" @tap="selectPersonCard(order.personalAccount)">
|
<!-- <view class="cu-item" v-show="order.personalStatus" @tap="selectPersonCard(order.personalAccount)">
|
||||||
<view class="content">
|
<view class="content">
|
||||||
<view class="text-left">
|
<view class="text-left">
|
||||||
@@ -160,12 +165,15 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</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 block lg bg-main-oil" @tap="payOrder">立即支付</button>
|
||||||
<button class="cu-btn margin-top block lg " @tap="cancelOrder(order.orderSerialNumber)">取消订单</button>
|
<button class="cu-btn margin-top block lg " @tap="cancelOrder(order.orderSerialNumber)">取消订单</button>
|
||||||
</view>
|
</view> -->
|
||||||
<view class="padding fixed-bar-bottom">
|
<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>
|
<button class="cu-btn margin-top block lg " @tap="cancelOrder(order.orderSerialNumber)">取消订单</button>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@@ -219,6 +227,13 @@
|
|||||||
this.payMethod = oilItem.payMethod
|
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() {
|
onShow() {
|
||||||
this.datatime = this.timF(this.order.createTime);
|
this.datatime = this.timF(this.order.createTime);
|
||||||
@@ -244,6 +259,20 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
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) {
|
timF(date) {
|
||||||
date = date.substring(0, 19)
|
date = date.substring(0, 19)
|
||||||
date = date.replace(/-/g, '/')
|
date = date.replace(/-/g, '/')
|
||||||
@@ -304,19 +333,19 @@
|
|||||||
// payChannel: 'WECHAT_MINIAPPS_PAYMENT', //微信小程序支付 WECHAT_APP_PAYMENT微信APP支付
|
// payChannel: 'WECHAT_MINIAPPS_PAYMENT', //微信小程序支付 WECHAT_APP_PAYMENT微信APP支付
|
||||||
// openId: uni.getStorageSync('openid'),
|
// openId: uni.getStorageSync('openid'),
|
||||||
// unionId: uni.getStorageSync('unionid'),
|
// unionId: uni.getStorageSync('unionid'),
|
||||||
// appId: 'wxc1d226ac9c5bea36',
|
// appId: 'wxf3d6c15e3b087447',
|
||||||
// payCode: 'WECHAT_ORDER_PAY_WECHAT', //APP填WECHAT_ORDER_PAY_APP,小程序填
|
// payCode: 'WECHAT_ORDER_PAY_WECHAT', //APP填WECHAT_ORDER_PAY_APP,小程序填
|
||||||
// orderId: this.order.orderSerialNumber,
|
// orderId: this.order.orderSerialNumber,
|
||||||
// payClient: 'XOIL_DRIVER_WECHAT_APPLET' //"支付端。安卓XOIL_DRIVER_ANDROID,小程序
|
// payClient: 'XOIL_DRIVER_WECHAT_APPLET' //"支付端。安卓XOIL_DRIVER_ANDROID,小程序
|
||||||
payChannel: 'WECHAT_MINIAPPS_PAYMENT', //微信小程序支付 WECHAT_APP_PAYMENT微信APP支付
|
payChannel: 'WECHAT_MINIAPPS_PAYMENT', //微信小程序支付 WECHAT_APP_PAYMENT微信APP支付
|
||||||
openId: uni.getStorageSync('openid'),
|
openId: uni.getStorageSync('openid'),
|
||||||
unionId: uni.getStorageSync('unionid'),
|
unionId: uni.getStorageSync('unionid'),
|
||||||
appId: 'wxc1d226ac9c5bea36',
|
appId: 'wxf3d6c15e3b087447',
|
||||||
payCode: 'WECHAT_ORDER_PAY_WECHAT', //APP填WECHAT_ORDER_PAY_APP,小程序填
|
payCode: 'WECHAT_ORDER_PAY_WECHAT', //APP填WECHAT_ORDER_PAY_APP,小程序填
|
||||||
orderId: this.order.orderSerialNumber,
|
orderId: this.order.orderSerialNumber,
|
||||||
payClient: 'XOIL_DRIVER_WECHAT_APPLET', //"支付端。安卓XOIL_DRIVER_ANDROID,小程序
|
payClient: 'XOIL_DRIVER_WECHAT_APPLET', //"支付端。安卓XOIL_DRIVER_ANDROID,小程序
|
||||||
userIp: (this.userIp ? this.userIp : "36.57.160.59"),
|
userIp: (this.userIp ? this.userIp : "36.57.160.59"),
|
||||||
merchantNo: '10089145264'
|
merchantNo: '10090808247'
|
||||||
}
|
}
|
||||||
|
|
||||||
oilPayApi.aggregatePay(payData).then(res => {
|
oilPayApi.aggregatePay(payData).then(res => {
|
||||||
@@ -329,7 +358,7 @@
|
|||||||
title: res.msg
|
title: res.msg
|
||||||
})
|
})
|
||||||
oilPayApi.wxPayIntegral({
|
oilPayApi.wxPayIntegral({
|
||||||
appId: 'wxc1d226ac9c5bea36',
|
appId: 'wxf3d6c15e3b087447',
|
||||||
orderId: this.order.orderSerialNumber
|
orderId: this.order.orderSerialNumber
|
||||||
})
|
})
|
||||||
uni.redirectTo({
|
uni.redirectTo({
|
||||||
|
|||||||
@@ -332,7 +332,7 @@
|
|||||||
} else {
|
} else {
|
||||||
uni.showModal({
|
uni.showModal({
|
||||||
title:'请您登录',
|
title:'请您登录',
|
||||||
content:"登录佰川加油才可以加油 |˛˙꒳˙)♡",
|
content:"登录清正源油加油才可以加油 |˛˙꒳˙)♡",
|
||||||
confirmText:'去登陆',
|
confirmText:'去登陆',
|
||||||
success: (res) => {
|
success: (res) => {
|
||||||
if(res.confirm){
|
if(res.confirm){
|
||||||
|
|||||||
@@ -314,7 +314,7 @@
|
|||||||
if(!user){
|
if(!user){
|
||||||
uni.showModal({
|
uni.showModal({
|
||||||
title: '请您登录',
|
title: '请您登录',
|
||||||
content: "登录佰川加油才可以加油 |˛˙꒳˙)♡",
|
content: "登录清正源油加油才可以加油 |˛˙꒳˙)♡",
|
||||||
confirmText: '去登陆',
|
confirmText: '去登陆',
|
||||||
success: (res) => {
|
success: (res) => {
|
||||||
if (res.confirm) {
|
if (res.confirm) {
|
||||||
|
|||||||
@@ -171,7 +171,7 @@
|
|||||||
statype: seniorPage.statype,
|
statype: seniorPage.statype,
|
||||||
queryDate: seniorPage.queryDate,
|
queryDate: seniorPage.queryDate,
|
||||||
lastQueryDate: seniorPage.lastQueryDate,
|
lastQueryDate: seniorPage.lastQueryDate,
|
||||||
appId: 'wxc1d226ac9c5bea36',
|
appId: 'wxf3d6c15e3b087447',
|
||||||
openId: uni.getStorageSync('openid'),
|
openId: uni.getStorageSync('openid'),
|
||||||
unionId: uni.getStorageSync('unionid')
|
unionId: uni.getStorageSync('unionid')
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ export default {
|
|||||||
method: 'post',
|
method: 'post',
|
||||||
data:{
|
data:{
|
||||||
code:code,
|
code:code,
|
||||||
appId:'wxc1d226ac9c5bea36'
|
appId:'wxf3d6c15e3b087447'
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
@@ -25,7 +25,7 @@ export default {
|
|||||||
method: 'post',
|
method: 'post',
|
||||||
data:{
|
data:{
|
||||||
...data,
|
...data,
|
||||||
appId:'wxc1d226ac9c5bea36'
|
appId:'wxf3d6c15e3b087447'
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
188
manifest.json
188
manifest.json
@@ -1,94 +1,98 @@
|
|||||||
{
|
{
|
||||||
"name" : "XiaoXing",
|
"name": "XiaoXing",
|
||||||
"appid" : "__UNI__62FBBA8",
|
"appid": "__UNI__62FBBA8",
|
||||||
"description" : "",
|
"description": "",
|
||||||
"versionName" : "1.0.0",
|
"versionName": "1.0.0",
|
||||||
"versionCode" : "100",
|
"versionCode": "100",
|
||||||
"transformPx" : false,
|
"transformPx": false,
|
||||||
/* 5+App特有相关 */
|
/* 5+App特有相关 */
|
||||||
"app-plus" : {
|
"app-plus": {
|
||||||
"usingComponents" : true,
|
"usingComponents": true,
|
||||||
"nvueCompiler" : "uni-app",
|
"nvueCompiler": "uni-app",
|
||||||
"compilerVersion" : 3,
|
"compilerVersion": 3,
|
||||||
"splashscreen" : {
|
"splashscreen": {
|
||||||
"alwaysShowBeforeRender" : true,
|
"alwaysShowBeforeRender": true,
|
||||||
"waiting" : true,
|
"waiting": true,
|
||||||
"autoclose" : true,
|
"autoclose": true,
|
||||||
"delay" : 0
|
"delay": 0
|
||||||
},
|
},
|
||||||
/* 模块配置 */
|
/* 模块配置 */
|
||||||
"modules" : {},
|
"modules": {},
|
||||||
/* 应用发布信息 */
|
/* 应用发布信息 */
|
||||||
"distribute" : {
|
"distribute": {
|
||||||
/* android打包配置 */
|
/* android打包配置 */
|
||||||
"android" : {
|
"android": {
|
||||||
"permissions" : [
|
"permissions": [
|
||||||
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
|
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
|
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
|
"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
|
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
|
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
|
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
|
||||||
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
|
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
|
"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
|
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
|
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
|
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
|
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
|
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
|
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
|
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
|
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
|
"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
|
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
|
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
|
||||||
"<uses-feature android:name=\"android.hardware.camera\"/>",
|
"<uses-feature android:name=\"android.hardware.camera\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
|
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
|
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
/* ios打包配置 */
|
/* ios打包配置 */
|
||||||
"ios" : {},
|
"ios": {},
|
||||||
/* SDK配置 */
|
/* SDK配置 */
|
||||||
"sdkConfigs" : {}
|
"sdkConfigs": {}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
/* 快应用特有相关 */
|
/* 快应用特有相关 */
|
||||||
"quickapp" : {},
|
"quickapp": {},
|
||||||
/* 小程序特有相关 */
|
/* 小程序特有相关 */
|
||||||
"mp-weixin" : {
|
"mp-weixin": {
|
||||||
"appid" : "wxc1d226ac9c5bea36",
|
"appid": "wxf3d6c15e3b087447",
|
||||||
"setting" : {
|
"setting": {
|
||||||
"urlCheck" : true,
|
"urlCheck": true,
|
||||||
"es6" : false,
|
"es6": false,
|
||||||
"postcss" : false
|
"postcss": false
|
||||||
},
|
},
|
||||||
"usingComponents" : true,
|
"usingComponents": true,
|
||||||
"permission" : {
|
"permission": {
|
||||||
"scope.userLocation" : {
|
"scope.userLocation": {
|
||||||
"desc" : "需要获取您的位置,用于查看附近油站"
|
"desc": "需要获取您的位置,用于查看附近油站"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"plugins" : {
|
"plugins": {
|
||||||
"chooseocation" : {
|
"chooseocation": {
|
||||||
"version" : "1.0.6",
|
"version": "1.0.6",
|
||||||
"provider" : "wx76a9a06e5b4e693e"
|
"provider": "wx76a9a06e5b4e693e"
|
||||||
},
|
},
|
||||||
"routePlan" : {
|
"routePlan": {
|
||||||
"version" : "1.0.12",
|
"version": "1.0.12",
|
||||||
"provider" : "wx50b5593e81dd937a"
|
"provider": "wx50b5593e81dd937a"
|
||||||
}
|
},
|
||||||
},
|
"jl-pay-plugin": {
|
||||||
"requiredPrivateInfos" : [ "getLocation" ]
|
"version": "1.0.1",
|
||||||
},
|
"provider": "wx2f4eb78ea48ce8ea"
|
||||||
"mp-alipay" : {
|
}
|
||||||
"usingComponents" : true,
|
},
|
||||||
"appid" : "2021002150632366"
|
"requiredPrivateInfos": ["getLocation"]
|
||||||
},
|
},
|
||||||
"mp-baidu" : {
|
"mp-alipay": {
|
||||||
"usingComponents" : true
|
"usingComponents": true,
|
||||||
},
|
"appid": "2021002150632366"
|
||||||
"mp-toutiao" : {
|
},
|
||||||
"usingComponents" : true
|
"mp-baidu": {
|
||||||
}
|
"usingComponents": true
|
||||||
|
},
|
||||||
|
"mp-toutiao": {
|
||||||
|
"usingComponents": true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
17
pages.json
17
pages.json
@@ -3,20 +3,20 @@
|
|||||||
{
|
{
|
||||||
"path": "pages/index/startPage/startPage",
|
"path": "pages/index/startPage/startPage",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "佰川加油"
|
"navigationBarTitleText": "清正源油加油"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "pages/tabbar/home/home",
|
"path": "pages/tabbar/home/home",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "佰川加油" // "enablePullDownRefresh": true
|
"navigationBarTitleText": "清正源油加油" // "enablePullDownRefresh": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"path": "pages/tabbar/order/orderList/orderList",
|
"path": "pages/tabbar/order/orderList/orderList",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "佰川加油", // "enablePullDownRefresh": true
|
"navigationBarTitleText": "清正源油加油", // "enablePullDownRefresh": true
|
||||||
"enablePullDownRefresh": true
|
"enablePullDownRefresh": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
{
|
{
|
||||||
"path": "pages/tabbar/station/stationList",
|
"path": "pages/tabbar/station/stationList",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "佰川加油", // "enablePullDownRefresh": true
|
"navigationBarTitleText": "清正源油加油", // "enablePullDownRefresh": true
|
||||||
"enablePullDownRefresh": true
|
"enablePullDownRefresh": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -32,7 +32,7 @@
|
|||||||
{
|
{
|
||||||
"path": "pages/tabbar/user/user",
|
"path": "pages/tabbar/user/user",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "佰川加油" // "enablePullDownRefresh": true
|
"navigationBarTitleText": "清正源油加油" // "enablePullDownRefresh": true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -236,7 +236,10 @@
|
|||||||
"path": "pages/makeOrder/orderPaying",
|
"path": "pages/makeOrder/orderPaying",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "",
|
"navigationBarTitleText": "",
|
||||||
"enablePullDownRefresh": false
|
"enablePullDownRefresh": false,
|
||||||
|
"usingComponents": {
|
||||||
|
"jl-pay": "plugin://jl-pay-plugin/jl-pay"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}, {
|
}, {
|
||||||
@@ -291,7 +294,7 @@
|
|||||||
"allowsBounceVertical": "NO"
|
"allowsBounceVertical": "NO"
|
||||||
},
|
},
|
||||||
"navigationBarBackgroundColor": "#f33e54",
|
"navigationBarBackgroundColor": "#f33e54",
|
||||||
"navigationBarTitleText": "佰川加油",
|
"navigationBarTitleText": "清正源油加油",
|
||||||
"navigationStyle": "custom",
|
"navigationStyle": "custom",
|
||||||
"navigationBarTextStyle": "white"
|
"navigationBarTextStyle": "white"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<view class="page-content">
|
<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>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -59,50 +59,61 @@
|
|||||||
this.getFilterData()
|
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回调事件中创建插屏广告实例
|
// 在页面onLoad回调事件中创建插屏广告实例
|
||||||
if (wx.createInterstitialAd) {
|
// if (wx.createInterstitialAd) {
|
||||||
interstitialAd = wx.createInterstitialAd({
|
// interstitialAd = wx.createInterstitialAd({
|
||||||
adUnitId: 'adunit-a7faf57adeed211f'
|
// adUnitId: 'adunit-a7faf57adeed211f'
|
||||||
})
|
// })
|
||||||
}
|
// }
|
||||||
interstitialAd.onLoad((err) => {
|
// interstitialAd.onLoad((err) => {
|
||||||
// console.log('onLoad event emit', err)
|
// // console.log('onLoad event emit', err)
|
||||||
})
|
// })
|
||||||
interstitialAd.onError((err) => {
|
// interstitialAd.onError((err) => {
|
||||||
setTimeout(() => {
|
// setTimeout(() => {
|
||||||
if (key == '在线') {
|
// if (key == '在线') {
|
||||||
uni.switchTab({
|
// uni.switchTab({
|
||||||
url: '/pages/tabbar/home/home',
|
// url: '/pages/tabbar/home/home',
|
||||||
})
|
// })
|
||||||
} else {
|
// } else {
|
||||||
uni.redirectTo({
|
// uni.redirectTo({
|
||||||
url: '/BagAuth/pages/login/login'
|
// url: '/BagAuth/pages/login/login'
|
||||||
})
|
// })
|
||||||
}
|
// }
|
||||||
}, 2000)
|
// }, 2000)
|
||||||
})
|
// })
|
||||||
// 在适合的场景显示插屏广告
|
// 在适合的场景显示插屏广告
|
||||||
if (interstitialAd) {
|
// if (interstitialAd) {
|
||||||
interstitialAd.show().catch((err) => {
|
// interstitialAd.show().catch((err) => {
|
||||||
// console.error(err)
|
// // console.error(err)
|
||||||
})
|
// })
|
||||||
}
|
// }
|
||||||
interstitialAd.onClose(res => {
|
// interstitialAd.onClose(res => {
|
||||||
setTimeout(() => {
|
// setTimeout(() => {
|
||||||
if (key == '在线') {
|
// if (key == '在线') {
|
||||||
uni.switchTab({
|
// uni.switchTab({
|
||||||
url: '/pages/tabbar/home/home',
|
// url: '/pages/tabbar/home/home',
|
||||||
})
|
// })
|
||||||
} else {
|
// } else {
|
||||||
uni.redirectTo({
|
// uni.redirectTo({
|
||||||
url: '/BagAuth/pages/login/login'
|
// url: '/BagAuth/pages/login/login'
|
||||||
})
|
// })
|
||||||
}
|
// }
|
||||||
}, 1000)
|
// }, 1000)
|
||||||
})
|
// })
|
||||||
},
|
},
|
||||||
onReady(option) {
|
onReady(option) {
|
||||||
const updateManager = uni.getUpdateManager();
|
const updateManager = uni.getUpdateManager();
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<view class="page-content">
|
<view class="page-content">
|
||||||
<cu-custom class="bg-main-oil" bgColor="bg-main-oil">
|
<cu-custom class="bg-main-oil" bgColor="bg-main-oil">
|
||||||
<block slot="content">佰川加油</block>
|
<block slot="content">清正源油加油</block>
|
||||||
</cu-custom>
|
</cu-custom>
|
||||||
<view class="margin-top-lg">
|
<view class="margin-top-lg">
|
||||||
<swiper class="screen-swiper text-center square-dot" :indicator-dots="true"
|
<swiper class="screen-swiper text-center square-dot" :indicator-dots="true"
|
||||||
|
|||||||
@@ -484,7 +484,7 @@
|
|||||||
// } else {
|
// } else {
|
||||||
// uni.showModal({
|
// uni.showModal({
|
||||||
// title: '请您登录',
|
// title: '请您登录',
|
||||||
// content: "登录佰川加油才可以加油 |˛˙꒳˙)♡",
|
// content: "登录清正源油加油才可以加油 |˛˙꒳˙)♡",
|
||||||
// confirmText: '去登陆',
|
// confirmText: '去登陆',
|
||||||
// success: (res) => {
|
// success: (res) => {
|
||||||
// if (res.confirm) {
|
// if (res.confirm) {
|
||||||
|
|||||||
BIN
static/img/start-second.jpg
Normal file
BIN
static/img/start-second.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 92 KiB |
@@ -4,7 +4,7 @@ import utils from '@/utils/encode'
|
|||||||
// const env = process.env.NODE_ENV
|
// const env = process.env.NODE_ENV
|
||||||
const env = 'production' /* */
|
const env = 'production' /* */
|
||||||
// const env = 'test'
|
// 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 = 'http://121.196.213.68/adminapi' //预生产
|
||||||
|
|
||||||
const productUrl = 'https://www.xingoil.com/adminapi' // 生产,加密 new
|
const productUrl = 'https://www.xingoil.com/adminapi' // 生产,加密 new
|
||||||
|
|||||||
Reference in New Issue
Block a user