master
xiaozhiyong 7 months ago
parent 7fae7312ea
commit abf4716820
  1. 32
      BagAuth/pages/login/login.vue
  2. 2
      components/site-item/site-item.vue
  3. 1
      components/sl-filter/filter-view.vue
  4. 43
      pages/index/startPage/startPage.vue

@ -27,18 +27,18 @@
@getphonenumber="decryptPhoneNumber"> @getphonenumber="decryptPhoneNumber">
<!-- <text class="cuIcon-weixin padding-right-xs"> </text> --> <!-- <text class="cuIcon-weixin padding-right-xs"> </text> -->
<text> <text>
手机号快捷登录 一键登录
</text> </text>
</button> </button>
<button v-else class="cu-btn round bg-main-oil lg text-lg" @click="$refs.popup.open('center')"> <button v-else class="cu-btn round bg-main-oil lg text-lg" @click="$refs.popup.open('center')">
<!-- <text class="cuIcon-weixin padding-right-xs"> </text> --> <!-- <text class="cuIcon-weixin padding-right-xs"> </text> -->
<text> <text>
手机号快捷登录 一键登录
</text> </text>
</button> </button>
<!-- <button class="cu-btn margin-top round lg" @tap="refuseEmpower"> <button class="cu-btn margin-top round lg" @tap="refuseEmpower">
输入手机号码登录 输入手机号码登录
</button> --> </button>
<button class="cu-btn bg-0 margin-top round text-sm" @tap="refuseLogin"> <button class="cu-btn bg-0 margin-top round text-sm" @tap="refuseLogin">
跳过 跳过
</button> </button>
@ -50,7 +50,10 @@
使用协议及隐私保护 使用协议及隐私保护
</view> </view>
<view class="protocol_content"> <view class="protocol_content">
为了更好地保障您的合法权益请您阅读并同意 <text style=" color: black; font-weight: 600;" @click="$refs.loginBottom.toAgree('baichuanUserAgree')">用户协议</text> <text style=" color: black; font-weight: 600;" @click="$refs.loginBottom.toAgree('baichuanPrivacyAgreement')">隐私政策</text> 为了更好地保障您的合法权益请您阅读并同意 <text style=" color: black; font-weight: 600;"
@click="$refs.loginBottom.toAgree('baichuanUserAgree')">用户协议</text> <text
style=" color: black; font-weight: 600;"
@click="$refs.loginBottom.toAgree('baichuanPrivacyAgreement')">隐私政策</text>
</view> </view>
<view class="protocol_footer"> <view class="protocol_footer">
<button @click="$refs.popup.close()" class="protocol_footer_close">取消</button> <button @click="$refs.popup.close()" class="protocol_footer_close">取消</button>
@ -73,7 +76,7 @@
}, },
data() { data() {
return { return {
loginType:false, loginType: false,
// imgsrc:require('../../../BagStation/static/img/login-bg.png'), // imgsrc:require('../../../BagStation/static/img/login-bg.png'),
checked: false, checked: false,
userHandle: false, userHandle: false,
@ -90,11 +93,11 @@
sessionKey: '', sessionKey: '',
nickName: '', nickName: '',
loginOut: uni.getStorageSync('loginOut') ? true : false, loginOut: uni.getStorageSync('loginOut') ? true : false,
scanningParams:null scanningParams: null
} }
}, },
onLoad(e) { onLoad(e) {
if(e.loginType){ if (e.loginType) {
this.loginType = Boolean(e.loginType); this.loginType = Boolean(e.loginType);
} }
uni.clearStorageSync() uni.clearStorageSync()
@ -106,7 +109,7 @@
this.onceCode = code this.onceCode = code
oilIdentityApi.sendCode(this.onceCode).then(res => { oilIdentityApi.sendCode(this.onceCode).then(res => {
if (res.code === 20000) { if (res.code === 20000) {
if(e.scanningParams) { if (e.scanningParams) {
// //
this.scanningParams = e.scanningParams this.scanningParams = e.scanningParams
} }
@ -143,7 +146,7 @@
this.checked = val this.checked = val
}, },
refuseLogin() { refuseLogin() {
uni.setStorageSync('loginType',false) uni.setStorageSync('loginType', false)
uni.switchTab({ uni.switchTab({
url: '/pages/tabbar/home/home' url: '/pages/tabbar/home/home'
}) })
@ -164,8 +167,7 @@
}, url).then(res => { }, url).then(res => {
if (res.code == 20000) { if (res.code == 20000) {
this.loginSuccess(res) this.loginSuccess(res)
}else{ } else {}
}
}) })
}, },
refuseEmpower() { refuseEmpower() {
@ -231,7 +233,7 @@
// } // }
// }) // })
// }, 1000); // }, 1000);
if(this.scanningParams) { if (this.scanningParams) {
uni.redirectTo({ uni.redirectTo({
url: `/BagStation/pages/makeOrder/makeOrder?q=${this.scanningParams}` url: `/BagStation/pages/makeOrder/makeOrder?q=${this.scanningParams}`
}) })
@ -241,8 +243,8 @@
uni.switchTab({ uni.switchTab({
url: '/pages/tabbar/home/home' url: '/pages/tabbar/home/home'
}) })
}else{ } else {
if(!this.loginType){ if (!this.loginType) {
this.refuseLogin() this.refuseLogin()
} }
} }

@ -96,7 +96,7 @@
}, },
filters: { filters: {
channelCodeFamt(value) { channelCodeFamt(value) {
console.log(value) // console.log(value)
if (!value) { if (!value) {
return '未知' return '未知'
// ( XOIL WJY LV TY YDJY) // ( XOIL WJY LV TY YDJY)

@ -120,7 +120,6 @@
}, },
created() { created() {
console.log('%c 子组件参数↓','font-size:30px;color:red')
}, },
mounted() { mounted() {
if(this.areaCodeList1.length == 0){ if(this.areaCodeList1.length == 0){

@ -64,9 +64,9 @@
// 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)
@ -76,10 +76,6 @@
if (key == '在线') { if (key == '在线') {
uni.switchTab({ uni.switchTab({
url: '/pages/tabbar/home/home', url: '/pages/tabbar/home/home',
fail: (err) => {
// console.log(err)
}
// url:'/BagStation/orderDetail/orderDetail'
}) })
} else { } else {
uni.redirectTo({ uni.redirectTo({
@ -87,30 +83,25 @@
}) })
} }
}, 2000) }, 2000)
// console.log('onError event emit', err)
}) })
// 广 // 广
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',
fail: (err) => { })
// console.log(err) } else {
} uni.redirectTo({
// url:'/BagStation/orderDetail/orderDetail' url: '/BagAuth/pages/login/login'
}) })
} else { }
uni.redirectTo({ }, 1000)
url: '/BagAuth/pages/login/login'
})
}
}, 2000)
}) })
}, },
onReady(option) { onReady(option) {

Loading…
Cancel
Save