Compare commits
3 Commits
e2672d627e
...
caolc1
| Author | SHA1 | Date | |
|---|---|---|---|
|
9fdf924026 | ||
|
|
95be701567 | ||
|
|
a60f7b1bff |
19
App.vue
19
App.vue
@@ -238,16 +238,15 @@
|
||||
},
|
||||
|
||||
onShow: function() {
|
||||
console.log(12388)
|
||||
uni.getLocation({
|
||||
type: 'wgs84',
|
||||
success: function(res) {
|
||||
uni.setStorageSync('location', {
|
||||
longitude: res.longitude + '',
|
||||
latitude: res.latitude + ''
|
||||
})
|
||||
}
|
||||
});
|
||||
// uni.getLocation({
|
||||
// type: 'wgs84',
|
||||
// success: function(res) {
|
||||
// uni.setStorageSync('location', {
|
||||
// longitude: res.longitude + '',
|
||||
// latitude: res.latitude + ''
|
||||
// })
|
||||
// }
|
||||
// });
|
||||
console.log('onReady')
|
||||
const token = uni.getStorageSync('Authorization')
|
||||
const openid = uni.getStorageSync('openid')
|
||||
|
||||
@@ -96,33 +96,23 @@
|
||||
|
||||
</view>
|
||||
<!-- 底部去支付 -->
|
||||
<view class="" v-if="activePay||qrcodePay">
|
||||
<view class="btn bg-white placeholder-hidden">
|
||||
<view class="">
|
||||
<!-- <view class="btn bg-white placeholder-hidden">
|
||||
<view class="flex bg-white padding flex-direction">
|
||||
<button class="cu-btn block bg-main-oil lg" v-if="activePay" @tap="makePay">
|
||||
<image class="site-icon margin-right-sm" :src="imgURL+'site-yz.png'" mode="widthFix">
|
||||
</image>
|
||||
一键支付
|
||||
</button>
|
||||
<!-- <button v-if="qrcodePay" class="cu-btn block bg-main-oil margin-tb-sm lg" @tap="siteQrPay">
|
||||
<image class="site-icon margin-right-sm" :src="imgURL+'site-qr.png'" mode="widthFix">
|
||||
</image>
|
||||
二维码支付
|
||||
</button> -->
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="btn bg-white fixed ">
|
||||
<view class="flex bg-white padding flex-direction">
|
||||
<button class="cu-btn block bg-main-oil lg" v-if="activePay" @tap="makePay">
|
||||
<button class="cu-btn block bg-main-oil lg" @tap="makePay">
|
||||
<image class="site-icon margin-right-sm" :src="imgURL+'site-yz.png'" mode="widthFix">
|
||||
</image>
|
||||
一键支付
|
||||
</button>
|
||||
<!-- <button v-if="qrcodePay" class="cu-btn block bg-main-oil margin-tb-sm lg" @tap="siteQrPay">
|
||||
<image class="site-icon margin-right-sm" :src="imgURL+'site-qr.png'" mode="widthFix">
|
||||
</image>
|
||||
二维码支付
|
||||
</button> -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -38,12 +38,12 @@
|
||||
<picker-view disabled :value="region" @change="bindChange" ref="showHide">
|
||||
<picker-view-column>
|
||||
<view class="center" v-for="(item, index) in areaCodeList" :key="index">
|
||||
{{ item.areaName }}
|
||||
{{ areaNameDf(item) }}
|
||||
</view>
|
||||
</picker-view-column>
|
||||
<picker-view-column>
|
||||
<picker-view-column v-if="areaCodeList[areaIndex[0]]&& areaCodeList[areaIndex[0]].childList ">
|
||||
<view class="center" v-for="(item, index) in areaCodeList[areaIndex[0]].childList" :key="index">
|
||||
{{ item.areaName }}
|
||||
{{ areaNameDf(item) }}
|
||||
</view>
|
||||
</picker-view-column>
|
||||
<!-- <picker-view-column v-if="areaCodeList[areaIndex[0]]">
|
||||
@@ -118,15 +118,17 @@
|
||||
},
|
||||
created() {
|
||||
|
||||
console.log('%c 子组件参数↓','font-size:30px;color:red')
|
||||
console.log('%c 子组件参数↓','font-size:30px;color:red');
|
||||
|
||||
},
|
||||
mounted() {
|
||||
if(this.areaCodeList1.length == 0){
|
||||
this.areaCodeList = uni.getStorageSync('areaCodeList') || []
|
||||
this.areaCodeList = uni.getStorageSync('areaCodeList') || [];
|
||||
}else{
|
||||
this.areaCodeList = this.areaCodeList1
|
||||
}
|
||||
this.areaCodeList.unshift({areaName:'全部'})
|
||||
this.areaCodeList.unshift({areaName:'全部'});
|
||||
console.log(this.areaCodeList,'==')
|
||||
this.$forceUpdate();
|
||||
},
|
||||
computed: {
|
||||
@@ -152,6 +154,9 @@
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
areaNameDf(e){
|
||||
return e.areaName
|
||||
},
|
||||
//选择值改变事件 省市区级联选择
|
||||
bindChange(e,ccc) {
|
||||
// 用于对比滑动的是哪一列数据
|
||||
|
||||
@@ -100,19 +100,26 @@
|
||||
})
|
||||
interstitialAd.onError((err) => {
|
||||
setTimeout(() => {
|
||||
if (key == '在线') {
|
||||
uni.switchTab({
|
||||
url: '/pages/tabbar/home/home',
|
||||
fail: (err) => {
|
||||
console.log(err)
|
||||
}
|
||||
// url:'/BagStation/orderDetail/orderDetail'
|
||||
})
|
||||
} else {
|
||||
uni.redirectTo({
|
||||
url: '/BagAuth/pages/login/login'
|
||||
})
|
||||
}
|
||||
uni.switchTab({
|
||||
url: '/pages/tabbar/home/home',
|
||||
fail: (err) => {
|
||||
console.log(err)
|
||||
}
|
||||
// url:'/BagStation/orderDetail/orderDetail'
|
||||
})
|
||||
// if (key == '在线') {
|
||||
// uni.switchTab({
|
||||
// url: '/pages/tabbar/home/home',
|
||||
// fail: (err) => {
|
||||
// console.log(err)
|
||||
// }
|
||||
// // url:'/BagStation/orderDetail/orderDetail'
|
||||
// })
|
||||
// } else {
|
||||
// uni.redirectTo({
|
||||
// url: '/BagAuth/pages/login/login'
|
||||
// })
|
||||
// }
|
||||
}, 2000)
|
||||
console.log('onError event emit', err)
|
||||
})
|
||||
|
||||
@@ -260,6 +260,7 @@
|
||||
this.tools.userLocationChenk().then(res => {
|
||||
this.refreshLocation();
|
||||
}).catch(err => {});
|
||||
this.getSiteList()
|
||||
},
|
||||
onLoad() {
|
||||
// this.refreshLocation()
|
||||
@@ -268,7 +269,6 @@
|
||||
} else {
|
||||
this.isFilterData=true
|
||||
}
|
||||
this.getSiteList()
|
||||
},
|
||||
|
||||
onPullDownRefresh() {
|
||||
@@ -430,31 +430,36 @@
|
||||
|
||||
},
|
||||
toDetail(item) {
|
||||
let itemS = encodeURIComponent(JSON.stringify(item))
|
||||
if (uni.getStorageSync('user')) {
|
||||
uni.navigateTo({
|
||||
url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
|
||||
fail: (err) => {
|
||||
// console.log(err)
|
||||
},
|
||||
success: () => {
|
||||
// console.log('err')
|
||||
}
|
||||
})
|
||||
} else {
|
||||
uni.showModal({
|
||||
title: '请您登录',
|
||||
content: "登录小星加油才可以加油 |˛˙꒳˙)♡",
|
||||
confirmText: '去登陆',
|
||||
success: (res) => {
|
||||
if (res.confirm) {
|
||||
uni.reLaunch({
|
||||
url: '../../../BagAuth/pages/login/login'
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
let itemS = encodeURIComponent(JSON.stringify(item));
|
||||
uni.navigateTo({
|
||||
url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
|
||||
fail: (err) => {},
|
||||
success: () => {}
|
||||
})
|
||||
// if (uni.getStorageSync('user')) {
|
||||
// uni.navigateTo({
|
||||
// url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
|
||||
// fail: (err) => {
|
||||
// // console.log(err)
|
||||
// },
|
||||
// success: () => {
|
||||
// // console.log('err')
|
||||
// }
|
||||
// })
|
||||
// } else {
|
||||
// uni.showModal({
|
||||
// title: '请您登录',
|
||||
// content: "登录小星加油才可以加油 |˛˙꒳˙)♡",
|
||||
// confirmText: '去登陆',
|
||||
// success: (res) => {
|
||||
// if (res.confirm) {
|
||||
// uni.reLaunch({
|
||||
// url: '../../../BagAuth/pages/login/login'
|
||||
// })
|
||||
// }
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
},
|
||||
nameSelect(value, item) {
|
||||
this.title2 = item.text
|
||||
|
||||
@@ -4,11 +4,11 @@ import utils from '@/utils/encode'
|
||||
// const env = process.env.NODE_ENV
|
||||
const env = 'production'/* */
|
||||
// const env = 'test'
|
||||
const testUrl = 'http://192.168.0.254:38080'
|
||||
// const testUrl = 'http://192.168.0.254:38080'
|
||||
// const productUrl = 'http://121.196.213.68/adminapi' //预生产
|
||||
|
||||
// const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new
|
||||
const productUrl = 'http://uat.xingoil.com/adminapi' // 生产，加密 new
|
||||
const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new
|
||||
// const productUrl = 'http://uat.xingoil.com/adminapi' // 生产，加密 new
|
||||
const service = axios.create({
|
||||
baseURL: env == 'production' ? productUrl : testUrl,
|
||||
// baseURL: testUrl,
|
||||
|
||||
Reference in New Issue
Block a user