1
This commit is contained in:
caolc
@@ -17,16 +17,27 @@
|
||||
<script>
|
||||
export default {
|
||||
name: 'loginBottom',
|
||||
props:{
|
||||
checked:{
|
||||
type:Boolean,
|
||||
default:false
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
count: 0,
|
||||
hotline: '4008-56-5355'
|
||||
}
|
||||
},
|
||||
watch:{
|
||||
checked(n){
|
||||
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
onChange() {
|
||||
this.count++
|
||||
this.$emit('onCheck', this.count % 2 != 0)
|
||||
let checked = !this.checked
|
||||
this.$emit('onCheck', checked)
|
||||
},
|
||||
toAgree(link) {
|
||||
uni.navigateTo({
|
||||
|
||||
@@ -23,21 +23,41 @@
|
||||
<view class="gray-text">加载中...</view>
|
||||
</view>
|
||||
<view class="margin-lg flex flex-direction text-center">
|
||||
<button class="cu-btn round bg-main-oil lg text-lg" open-type="getPhoneNumber"
|
||||
<button v-if=checked class="cu-btn round bg-main-oil lg text-lg" open-type="getPhoneNumber"
|
||||
@getphonenumber="decryptPhoneNumber">
|
||||
<text class="cuIcon-weixin padding-right-xs"> </text>
|
||||
<text>
|
||||
微信用户一键登录
|
||||
</text>
|
||||
</button>
|
||||
<!-- <button class="cu-btn margin-top round lg" @tap="refuseEmpower">
|
||||
<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>
|
||||
微信用户一键登录
|
||||
</text>
|
||||
</button>
|
||||
<!-- <button class="cu-btn margin-top round lg" @tap="refuseEmpower">
|
||||
输入手机号码登录
|
||||
</button> -->
|
||||
<button class="cu-btn bg-0 margin-top round text-sm" @tap="refuseLogin">
|
||||
跳过
|
||||
</button>
|
||||
</view>
|
||||
<loginBottom @onCheck="checkAgree" />
|
||||
<loginBottom ref='loginBottom' :checked='checked' @onCheck="checkAgree" />
|
||||
<uni-popup ref='popup'>
|
||||
<view class="protocol_body">
|
||||
<view class="protocol_header">
|
||||
使用协议及隐私保护
|
||||
</view>
|
||||
<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>。
|
||||
</view>
|
||||
<view class="protocol_footer">
|
||||
<button @click="$refs.popup.close()" class="protocol_footer_close">取消</button>
|
||||
<button @click="checked=true;$refs.popup.close();" class="protocol_footer_confirm">确定</button>
|
||||
</view>
|
||||
</view>
|
||||
</uni-popup>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@@ -54,7 +74,7 @@
|
||||
data() {
|
||||
return {
|
||||
// imgsrc:require('../../../BagStation/static/img/login-bg.png'),
|
||||
checked:false,
|
||||
checked: false,
|
||||
userHandle: false,
|
||||
TabCur: 0,
|
||||
accuntSource: false,
|
||||
@@ -138,6 +158,7 @@
|
||||
}, url).then(res => {
|
||||
if (res.code == 20000) {
|
||||
this.loginSuccess(res)
|
||||
}else{
|
||||
}
|
||||
})
|
||||
},
|
||||
@@ -212,6 +233,8 @@
|
||||
uni.switchTab({
|
||||
url: '/pages/tabbar/home/home'
|
||||
})
|
||||
}else{
|
||||
console.log('禁摩登录i失败==================')
|
||||
}
|
||||
},
|
||||
}
|
||||
@@ -219,6 +242,56 @@
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.protocol_footer_close {
|
||||
width: 185rpx;
|
||||
border-radius: 94rpx 94rpx 94rpx 94rpx;
|
||||
opacity: 1;
|
||||
border: 1px solid #000000;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
|
||||
.protocol_footer_confirm {
|
||||
width: 185rpx;
|
||||
background: #FD0505;
|
||||
border-radius: 56rpx 56rpx 56rpx 56rpx;
|
||||
opacity: 1;
|
||||
font-size: 26rpx;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
|
||||
.protocol_footer {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
|
||||
.protocol_content {
|
||||
font-size: 32rpx;
|
||||
font-family: PingFang SC-Medium, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #666666;
|
||||
line-height: 46rpx;
|
||||
margin: 60rpx 0;
|
||||
}
|
||||
|
||||
.protocol_header {
|
||||
width: 330rpx;
|
||||
height: 32rpx;
|
||||
font-size: 36rpx;
|
||||
color: #000000;
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.protocol_body {
|
||||
background: #FFFFFF;
|
||||
border-radius: 20rpx 20rpx 20rpx 20rpx;
|
||||
opacity: 1;
|
||||
padding: 70rpx 50rpx;
|
||||
max-width: 634rpx;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.login-bg {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<view class="cu-item cur padding no-mr-border site-item" :style="{height:siteItem.oilProductCodeAndPrices.length>3?'220rpx !important':listHeight?listHeight + 'rpx !important':''}">
|
||||
<view class="cu-item cur padding no-mr-border site-item" :style="{height:siteItem.oilProductCodeAndPrices?siteItem.oilProductCodeAndPrices.length>3?'220rpx !important':listHeight?listHeight + 'rpx !important':'': ''}">
|
||||
<view class="cu-avatar radius lg "
|
||||
:style="'background-image:url('+(siteItem.siteImages?siteItem.siteImages:defaultLogo)+');'">
|
||||
</view>
|
||||
@@ -110,6 +110,8 @@
|
||||
distanceFilter(value) {
|
||||
if (value) {
|
||||
return value > 1000 ? ((value / 1000).toFixed(2) + 'km') : (value + 'm')
|
||||
}else{
|
||||
return '0.00km'
|
||||
}
|
||||
},
|
||||
moneyFormat(value) {
|
||||
|
||||
@@ -7,8 +7,8 @@ const env = 'production'/* */
|
||||
const testUrl = 'http://192.168.0.45: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