caoliancun/MP-XiaoXing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

caolc #12

Merged
caoliancun merged 4 commits from caolc into master 2023-06-06 15:58:22 +08:00
Conversation 0 Commits 4 Files Changed 6 +102 -15
6 changed files with 102 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
BagAuth/pages/login/components/loginBottom.vue
View File

@@ -17,16 +17,27 @@
<script> <script>
export default { export default {
name: 'loginBottom', name: 'loginBottom',
props:{
checked:{
type:Boolean,
default:false
}
},
data() { data() {
return { return {
count: 0, count: 0,
hotline: '4008-56-5355' hotline: '4008-56-5355'
} }
}, },
watch:{
checked(n){
}
},
methods: { methods: {
onChange() { onChange() {
this.count++ let checked = !this.checked
this.$emit('onCheck', this.count % 2 != 0) this.$emit('onCheck', checked)
}, },
toAgree(link) { toAgree(link) {
uni.navigateTo({ uni.navigateTo({

81
BagAuth/pages/login/login.vue
View File

@@ -23,21 +23,41 @@
<view class="gray-text">加载中...</view> <view class="gray-text">加载中...</view>
</view> </view>
<view class="margin-lg flex flex-direction text-center"> <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"> @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 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> -->
<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>
</view> </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> </view>
</template> </template>
@@ -54,7 +74,7 @@
data() { data() {
return { return {
// imgsrc:require('../../../BagStation/static/img/login-bg.png'), // imgsrc:require('../../../BagStation/static/img/login-bg.png'),
checked:false, checked: false,
userHandle: false, userHandle: false,
TabCur: 0, TabCur: 0,
accuntSource: false, accuntSource: false,
@@ -138,6 +158,7 @@
}, url).then(res => { }, url).then(res => {
if (res.code == 20000) { if (res.code == 20000) {
this.loginSuccess(res) this.loginSuccess(res)
}else{
} }
}) })
}, },
@@ -212,6 +233,8 @@
uni.switchTab({ uni.switchTab({
url: '/pages/tabbar/home/home' url: '/pages/tabbar/home/home'
}) })
}else{
console.log('禁摩登录i失败==================')
} }
}, },
} }
@@ -219,6 +242,56 @@
</script> </script>
<style> <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 { .login-bg {
width: 100%; width: 100%;
} }

7
BagStation/pages/makeOrder/orderPaying.vue
View File

@@ -285,7 +285,7 @@
this.cooling = true this.cooling = true
setTimeout(() => { setTimeout(() => {
this.cooling = false this.cooling = false
}, 5000) }, 5000);
if (this.activePay == 0) { if (this.activePay == 0) {
this.selfCardPay() this.selfCardPay()
} else if (this.activePay == 2) { } else if (this.activePay == 2) {
@@ -315,7 +315,8 @@
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
} }
oilPayApi.aggregatePay(payData).then(res => { oilPayApi.aggregatePay(payData).then(res => {
@@ -391,7 +392,7 @@
"orderSerialNumber": this.order.orderSerialNumber, //类型：String 必有字段 备注：订单编号 "orderSerialNumber": this.order.orderSerialNumber, //类型：String 必有字段 备注：订单编号
"payChannel": "BALANCE_PAYMENT", //类型：String 必有字段 备注：支付渠道（BALANCE_PAYMENT：余额支付） "payChannel": "BALANCE_PAYMENT", //类型：String 必有字段 备注：支付渠道（BALANCE_PAYMENT：余额支付）
"orderMethod": "CUSTOMER_ACTIVE", //类型：String 必有字段 备注：订单产生方式（CUSTOMER_ACTIVE：客户扫码支付：客户扫描油站二维码完成支付） "orderMethod": "CUSTOMER_ACTIVE", //类型：String 必有字段 备注：订单产生方式（CUSTOMER_ACTIVE：客户扫码支付：客户扫描油站二维码完成支付）
"createSource": "XOIL_DRIVER_WECHAT_APPLET" "createSource": "XOIL_DRIVER_WECHAT_APPLET",
} }
oilOrderApi.payOrder(payData).then(res => { oilOrderApi.payOrder(payData).then(res => {
if (res.code == 20000) { if (res.code == 20000) {

4
components/site-item/site-item.vue
View File

@@ -1,5 +1,5 @@
<template> <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 " <view class="cu-avatar radius lg "
:style="'background-image:url('+(siteItem.siteImages?siteItem.siteImages:defaultLogo)+');'"> :style="'background-image:url('+(siteItem.siteImages?siteItem.siteImages:defaultLogo)+');'">
</view> </view>
@@ -110,6 +110,8 @@
distanceFilter(value) { distanceFilter(value) {
if (value) { if (value) {
return value > 1000 ? ((value / 1000).toFixed(2) + 'km') : (value + 'm') return value > 1000 ? ((value / 1000).toFixed(2) + 'km') : (value + 'm')
}else{
return '0.00km'
} }
}, },
moneyFormat(value) { moneyFormat(value) {

2
manifest.json
View File

@@ -1,6 +1,6 @@
{ {
"name" : "XiaoXing", "name" : "XiaoXing",
"appid" : "__UNI__EA8D131", "appid" : "__UNI__62FBBA8",
"description" : "", "description" : "",
"versionName" : "1.0.0", "versionName" : "1.0.0",
"versionCode" : "100", "versionCode" : "100",

4
utils/request.js
View File

@@ -7,8 +7,8 @@ const env = 'production'/* */
const testUrl = 'http://192.168.0.45:38080' const testUrl = 'http://192.168.0.45: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
const productUrl = 'http://uat.xingoil.com/adminapi' // 生产，加密 new // const productUrl = 'http://uat.xingoil.com/adminapi' // 生产，加密 new
const service = axios.create({ const service = axios.create({
baseURL: env == 'production' ? productUrl : testUrl, baseURL: env == 'production' ? productUrl : testUrl,
// baseURL: testUrl, // baseURL: testUrl,