yangjie
/
high-mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. 修改登录方式

Browse Source
yj-dev
杨杰 3 years ago
parent 5f55f72b51
commit f38fa69985
8 changed files with 989 additions and 899 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      Utils/Api.js
  2. 46
      pages/goods/externalCoupon/externalCoupon.vue
  3. 1
      pages/goods/goods.vue
  4. 32
      pages/order/confirmation.vue
  5. 65
      pages/tabBar/user/user.vue
  6. 50
      pages/userLogin/userLogin.vue
  7. 16
      subPages/recharge-centre/recharge-centre.vue
  8. 1672
      subPages/unionComfirmation/unionComfirmation.vue

6
Utils/Api.js
Unescape View File

@ -30,7 +30,11 @@ export const updateUserPayPwd = params => {
//获取用户信息 //获取用户信息
export const findUser = params => { export const findUser = params => {
return POST('GET', `${base}/highUser/findUser`, params).then(res => res.data); return POST('GET', `${base}/highUser/findUser`, params).then(res => res.data);
} }
//绑定用户电话
export const loginByPhone = params => {
return POST('GET', `${base}/wechat/loginByPhone`, params).then(res => res.data);
};
//微信登录 //微信登录
export const WXlogin = params => { export const WXlogin = params => {
return POST('GET', `${base}/wechat/login`, params).then(res => res.data); return POST('GET', `${base}/wechat/login`, params).then(res => res.data);

46
pages/goods/externalCoupon/externalCoupon.vue
Unescape View File

@ -14,7 +14,7 @@
</view> </view>
</view> </view>
<view class="line1 mart15"></view> <view class="line1 mart15"></view>
<button class="coupne-btn width60w mart20 marb20" v-if="userInfo == 1" lang="zh_CN" @click="getuserinfo" <button class="coupne-btn width60w mart20 marb20" v-if="userInfo == 1" lang="zh_CN" open-type="getPhoneNumber" @getphonenumber="loginByPhone"
withCredentials="true">点击领取</button> withCredentials="true">点击领取</button>
<button class="coupne-btn width60w mart20 marb20" v-else @click="receiveDiscount">点击领取</button> <button class="coupne-btn width60w mart20 marb20" v-else @click="receiveDiscount">点击领取</button>
<view class="width90 mart10 fcor666">去使用</view> <view class="width90 mart10 fcor666">去使用</view>
@ -62,7 +62,8 @@
getDiscountByQrCode, getDiscountByQrCode,
receiveDiscount, receiveDiscount,
HandleCode, HandleCode,
getUserInfo getUserInfo,
loginByPhone
} from '../../../Utils/Api.js'; } from '../../../Utils/Api.js';
// import authorize from '../../../components/Authorize'; // import authorize from '../../../components/Authorize';
let app = getApp(); let app = getApp();
@ -249,6 +250,47 @@
// }) // })
}, },
// 微信获取手机号
loginByPhone(PhoneNumber) {
if(PhoneNumber.detail.iv == undefined){
uni.showToast({
title: "用户取消授权",
icon: "none"
});
return;
}
let params = {
openId: app.globalData.openId,
iv: PhoneNumber.detail.iv,
encryptedData: PhoneNumber.detail.encryptedData
}
loginByPhone(params).then(res => {
if (res.return_code == '000000') {
uni.showToast({
title: '手机号授权成功',
icon: 'none',
duration: 2000
})
this.user = res.return_data.object.highUser;
app.globalData.token = res.return_data.uniqueCode;
app.globalData.userInfo = res.return_data
.object
.highUser;
uni.setStorage({
key: "user",
data: res.return_data
.object
.highUser
})
uni.setStorage({
key: "token",
data: res.return_data.uniqueCode
})
this.receiveDiscount();
this.userInfo = 2;
}
});
},
//商品跳转 //商品跳转
toGoods(e) { toGoods(e) {
if (app.globalData.userInfo) { if (app.globalData.userInfo) {

1
pages/goods/goods.vue
Unescape View File

@ -119,7 +119,6 @@
<script> <script>
import { import {
getCouponById, getCouponById,
GetPhoneNumber,
getUserInfo getUserInfo
} from "../../Utils/Api.js"; } from "../../Utils/Api.js";
// import authorize from '../../components/Authorize.vue' // import authorize from '../../components/Authorize.vue'

32
pages/order/confirmation.vue
Unescape View File

@ -127,8 +127,8 @@
</view> </view>
</view> </view>
<!-- #ifdef MP --> <!-- #ifdef MP -->
<button class="btn" open-type="getPhoneNumber" v-if="user.phone == null" <button class="btn" open-type="getPhoneNumber" v-if="user == null"
@getphonenumber="getPhoneNumber">立即支付</button> @getphonenumber="loginByPhone">立即支付</button>
<button class="btn" v-else @tap="toPay">立即支付</button> <button class="btn" v-else @tap="toPay">立即支付</button>
<!-- #endif --> <!-- #endif -->
<!-- #ifdef H5 --> <!-- #ifdef H5 -->
@ -154,7 +154,7 @@
</view> </view>
</view> </view>
</wybPopup> </wybPopup>
<ssPaymentPassword ref="paymentPassword" :mode="1" @submit="submitHandle"/> <ssPaymentPassword ref="paymentPassword" :mode="1" @submit="submitHandle" />
</view> </view>
</template> </template>
@ -162,7 +162,7 @@
import { import {
addOrder, addOrder,
getCouponById, getCouponById,
GetPhoneNumber, loginByPhone,
getUserNormalDiscountList, getUserNormalDiscountList,
bindUserPhone, bindUserPhone,
orderToPay, orderToPay,
@ -214,7 +214,7 @@
this.getCouponById(); this.getCouponById();
}, },
onShow() { onShow() {
let that =this; let that = this;
that.paytype = ''; that.paytype = '';
that.user = app.globalData.userInfo; that.user = app.globalData.userInfo;
that.getUserNormalDiscountList(); that.getUserNormalDiscountList();
@ -351,20 +351,32 @@
}) })
}, },
// 微信获取手机号 // 微信获取手机号
getPhoneNumber(PhoneNumber) { loginByPhone(PhoneNumber) {
if (PhoneNumber.detail.iv == undefined) {
uni.showToast({
title: "用户取消授权",
icon: "none"
});
return;
}
let params = { let params = {
openId: app.globalData.openId, openId: app.globalData.openId,
iv: PhoneNumber.detail.iv, iv: PhoneNumber.detail.iv,
encryptedData: PhoneNumber.detail.encryptedData encryptedData: PhoneNumber.detail.encryptedData
} }
GetPhoneNumber(params).then(res => { loginByPhone(params).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
app.globalData.userInfo = res.return_data app.globalData.userInfo = res.return_data
.object .object
.highUser; .highUser;
this.user = res.return_data this.user = res.return_data
.object .object
.highUser; .highUser;
app.globalData.token = res.return_data.uniqueCode;
uni.setStorage({
key: "token",
data: res.return_data.uniqueCode
})
uni.setStorage({ uni.setStorage({
key: "user", key: "user",
data: res.return_data data: res.return_data
@ -390,7 +402,7 @@
}) })
let goods = { let goods = {
"memDiscountId": this.memDiscountId, "memDiscountId": this.memDiscountId,
"identificationCode":app.globalData.identificationCode, "identificationCode": app.globalData.identificationCode,
"highChildOrderList": [{ "highChildOrderList": [{
"goodsType": 1, "goodsType": 1,
"goodsId": this.couponId, "goodsId": this.couponId,
@ -529,7 +541,7 @@
}, },
submitHandle(e) { submitHandle(e) {
this.PaymentPassword = e.value; this.PaymentPassword = e.value;
if(this.PaymentPassword == ''){ if (this.PaymentPassword == '') {
uni.showToast({ uni.showToast({
title: '请勿手动关闭弹窗', title: '请勿手动关闭弹窗',
icon: 'none', icon: 'none',

65
pages/tabBar/user/user.vue
Unescape View File

@ -14,7 +14,7 @@
</view> </view>
<!-- 昵称,个性签名 --> <!-- 昵称,个性签名 -->
<view class="right"> <view class="right">
<view class="username" v-if="!user.name">请授权登录</view> <view class="username" v-if="user && user.infoCompleteStatus == 1" @click="jumplogin">点击获取信息</view>
<view class="username" v-else>{{user.name}}</view> <view class="username" v-else>{{user.name}}</view>
<view class="font14 fcorfff" v-if="!user.gold">积分: 0</view> <view class="font14 fcorfff" v-if="!user.gold">积分: 0</view>
<view class="font14 fcorfff" v-else>积分: {{user.gold}} 个</view> <view class="font14 fcorfff" v-else>积分: {{user.gold}} 个</view>
@ -22,8 +22,8 @@
</view> </view>
<!-- 二维码按钮 --> <!-- 二维码按钮 -->
<!-- #ifdef MP --> <!-- #ifdef MP -->
<button class="erweima fotct aliitem font14" v-if="user.phone == null" open-type="getPhoneNumber" <button class="erweima fotct aliitem font14" v-if="user == null" open-type="getPhoneNumber"
@getphonenumber="getPhoneNumber"> @getphonenumber="loginByPhone">
<image src="../../../static/img/jingbi.png"></image> 充值金额 <image src="../../../static/img/jingbi.png"></image> 充值金额
</button> </button>
<button class="erweima fotct aliitem font14" v-else @click="toDeposit"> <button class="erweima fotct aliitem font14" v-else @click="toDeposit">
@ -132,7 +132,7 @@
</template> </template>
<script> <script>
import { import {
GetPhoneNumber, loginByPhone,
findUser findUser
} from "../../../Utils/Api.js"; } from "../../../Utils/Api.js";
// import authorize from '../../../components/Authorize'; // import authorize from '../../../components/Authorize';
@ -177,25 +177,24 @@
icon: "pingjia" icon: "pingjia"
} }
], ],
huafeiList:[ huafeiList: [{
text: '待支付',
icon: "fukuan"
},
{ {
text: '待支付', text: '已支付',
icon: "fukuan" icon: "fahuo"
}, },
{ {
text: '已支付', text: '已完成',
icon: "fahuo" icon: "shouhuo"
}, }, {
{ text: '已取消',
text: '已完成', icon: "pingjia"
icon: "shouhuo" }, {
}, { text: '已退款',
text: '已取消', icon: "tuihuo"
icon: "pingjia" }
}, {
text: '已退款',
icon: "tuihuo"
}
], ],
// 工具栏列表 // 工具栏列表
mytoolbarList: [{ mytoolbarList: [{
@ -324,17 +323,29 @@
} }
}); });
}, },
getPhoneNumber(PhoneNumber) { loginByPhone(PhoneNumber) {
if (PhoneNumber.detail.iv == undefined) {
uni.showToast({
title: "用户取消授权",
icon: "none"
});
return;
}
let params = { let params = {
openId: app.globalData.openId, openId: app.globalData.openId,
iv: PhoneNumber.detail.iv, iv: PhoneNumber.detail.iv,
encryptedData: PhoneNumber.detail.encryptedData encryptedData: PhoneNumber.detail.encryptedData
} }
GetPhoneNumber(params).then(res => { loginByPhone(params).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
app.globalData.userInfo = res.return_data app.globalData.userInfo = res.return_data
.object .object
.highUser; .highUser;
app.globalData.token = res.return_data.uniqueCode;
uni.setStorage({
key: "token",
data: res.return_data.uniqueCode
})
uni.setStorage({ uni.setStorage({
key: "user", key: "user",
data: res.return_data data: res.return_data
@ -351,6 +362,12 @@
url: '/pages/login/register?id=2' url: '/pages/login/register?id=2'
}) })
}, },
//跳转用户信息
jumplogin() {
uni.navigateTo({
url: '../../userLogin/userLogin'
})
},
//扫码 //扫码
toScan() { toScan() {
uni.scanCode({ uni.scanCode({

50
pages/userLogin/userLogin.vue
Unescape View File

@ -1,12 +1,12 @@
<template> <template>
<view> <view>
<image mode="widthFix" class="width90 mart20" v-if="!user" :src="imagewxUrl+imgadres"></image> <image mode="widthFix" class="width90 mart20" v-if="user && user.infoCompleteStatus == 1" :src="imagewxUrl+imgadres"></image>
<image mode="widthFix" class="width90 mart20" v-if="!user.phone && user" :src="imagewxUrl+imgadres1"></image> <image mode="widthFix" class="width90 mart20" v-if="!user" :src="imagewxUrl+imgadres1"></image>
<!-- #ifdef MP --> <!-- #ifdef MP -->
<view class="mart30 width90 height50 fcorfff backcor008 fotct btns font16 fontlet" v-if="!user" @click="getuserinfo"> <view class="mart30 width90 height50 fcorfff backcor008 fotct btns font16 fontlet" v-if="user && user.infoCompleteStatus == 1" @click="getuserinfo">
授权并登录</view> 授权并登录</view>
<button class="mart30 width90 height50 fcorfff backcor008 fotct btns font16 fontlet" v-if="!user.phone && user" <button class="mart30 width90 height50 fcorfff backcor008 fotct btns font16 fontlet" v-if="!user"
open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">授权手机号</button> open-type="getPhoneNumber" @getphonenumber="loginByPhone">授权手机号</button>
<!-- <button class="mart30 width90 height50 fcorfff backcor008 fotct btns font16" v-if="user.phone && user" <!-- <button class="mart30 width90 height50 fcorfff backcor008 fotct btns font16" v-if="user.phone && user"
@click="reqmessage">授权获取消息通知</button> --> @click="reqmessage">授权获取消息通知</button> -->
<!-- #endif --> <!-- #endif -->
@ -21,7 +21,7 @@
const app = getApp(); const app = getApp();
import { import {
getUserInfo, getUserInfo,
GetPhoneNumber loginByPhone
} from "../../Utils/Api.js" } from "../../Utils/Api.js"
export default { export default {
data() { data() {
@ -64,7 +64,7 @@
key: "token", key: "token",
data: res.return_data.uniqueCode data: res.return_data.uniqueCode
}) })
if (res.return_data.object.highUser.phone) { if (res.return_data.object.highUser.infoCompleteStatus == 0) {
uni.navigateBack({ uni.navigateBack({
}) })
} }
@ -84,35 +84,29 @@
}) })
that.isShowAuth = false that.isShowAuth = false
}, },
//获取订阅号授权
// reqmessage() {
// uni.requestSubscribeMessage({
// tmplIds: ['oUvaCPeeOg4wH6HTvCcSabU6FnzXUXOBXsqBYAPOV-U'],
// success(res) {
// uni.navigateBack({})
// },
// fail: (res) => {
// uni.navigateBack({})
// }
// })
// },
// 微信获取手机号 // 微信获取手机号
getPhoneNumber(PhoneNumber) { loginByPhone(PhoneNumber) {
if(PhoneNumber.detail.iv == undefined){
uni.showToast({
title: "用户取消授权",
icon: "none"
});
return;
}
let params = { let params = {
openId: app.globalData.openId, openId: app.globalData.openId,
iv: PhoneNumber.detail.iv, iv: PhoneNumber.detail.iv,
encryptedData: PhoneNumber.detail.encryptedData encryptedData: PhoneNumber.detail.encryptedData
} }
GetPhoneNumber(params).then(res => { loginByPhone(params).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
uni.showToast({ uni.showToast({
title: '授权成功', title: '手机号授权成功',
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}) })
uni.navigateBack({
})
this.user = res.return_data.object.highUser; this.user = res.return_data.object.highUser;
app.globalData.token = res.return_data.uniqueCode;
app.globalData.userInfo = res.return_data app.globalData.userInfo = res.return_data
.object .object
.highUser; .highUser;
@ -122,6 +116,14 @@
.object .object
.highUser .highUser
}) })
uni.setStorage({
key: "token",
data: res.return_data.uniqueCode
})
if(res.return_data.object.highUser.infoCompleteStatus == 0){
uni.navigateBack({
})
}
} }
}); });
}, },

16
subPages/recharge-centre/recharge-centre.vue
Unescape View File

@ -22,35 +22,35 @@
</view> </view>
<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;"> <view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
<view style="width: 5%;" class="flleft">1:</view> <view style="width: 5%;" class="flleft">1:</view>
<view style="margin-left: 5%;">慢充话费与营业厅充值一样，只是到账时间稍长。充值过程中可能出现分批到账的情况，但是总金额不会少，请耐心等待如72小时未到账请联系客服查询。</view> <view style="margin-left: 5%;">慢充话费与营业厅充值一样，只是到账时间稍长。充值过程中可能出现分批到账的情况，但是总金额不会少，请耐心等待。</view>
</view> </view>
<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;"> <view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
<view style="width: 5%;" class="flleft">2:</view> <view style="width: 5%;" class="flleft">2:</view>
<view style="margin-left: 5%;">此业务为话费慢充，平均4-5小时到账，最晚72小时内到账。月末月初为充值高峰期，话费可能会有延迟，请您耐心等待或在48小时后联系客服确认订单状态。</view> <view style="margin-left: 5%;">此业务为话费慢充，日常72小时内到账，如遇月初、月末高峰期或系统更新到账时间会有一定延迟，敬请谅解！急单勿拍！</view>
</view> </view>
<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;"> <view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
<view style="width: 5%;" class="flleft">3:</view> <view style="width: 5%;" class="flleft">3:</view>
<view style="margin-left: 5%;">由于优惠有限，每个手机号30天内仅支持2次充值(不限金额)，如1号充值1单，29号充值1单，第三单需要在第31号才能充值，请根据自己话费使用情况选择对应金额。 </view> <view style="margin-left: 5%;">目前仅支持(移动、联通、电信三网号段)， 运营商黑名单号码(长期欠费或非实名制认证)、携号转网，空号、虚拟卡（如165.167.170.171.162等等虚拟号段）、副卡号码或做过某些特殊套餐绑定的卡暂不支持充值，请勿下单。</view>
</view> </view>
<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;"> <view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
<view style="width: 5%;" class="flleft">4:</view> <view style="width: 5%;" class="flleft">4:</view>
<view style="margin-left: 5%;">目前仅支持(移动、联通、电信三网号段)，165、167 170、171、162等虚拟号段暂不支持充值，携号转网号码暂不能充值，否则损失自负无法退款。</view> <view style="margin-left: 5%;">停机号码需要额外补缴欠费后，慢充话费才能到账。<text class="fcoreb5">此服务为虚拟充值类服务，无特殊情况不支持退款，下单前请确认充值的号码无误。</text></view>
</view> </view>
<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;"> <view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
<view style="width: 5%;" class="flleft">5:</view> <view style="width: 5%;" class="flleft">5:</view>
<view style="margin-left: 5%;">停机号码需要额外补缴欠费后，慢充话费才能到账。此服务为虚拟充值类服务，无特殊情况不支持退款。</view> <view style="margin-left: 5%;">空号、错号充值后不支持退款，请您务必核对确认号码无误后再进行充值。非空号欠费可充，欠费1个月导致空号的不能充值，损失自负无法退款。</view>
</view> </view>
<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;"> <view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
<view style="width: 5%;" class="flleft">6:</view> <view style="width: 5%;" class="flleft">6:</view>
<view style="margin-left: 5%;">空号、错号充值后不支持退款，请您务必核对确认号码无误后再进行充值。非空号欠费可充，欠费1个月导致空号的不能充值，损失自负无法退款。</view> <view style="margin-left: 5%;"><text class="fcoreb5">本充值业务不提供发票</text>。如需发票请在运营商手机客户端储开取电子发票，也可以凭身份证到运营商实体营业厅打印发票。</view>
</view> </view>
<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;"> <view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
<view style="width: 5%;" class="flleft">7:</view> <view style="width: 5%;" class="flleft">7:</view>
<view style="margin-left: 5%;">本充值业务不提供发票。如需发票请在运营商手机客户端储开取电子发票，也可以凭身份证到运营商实体营业厅打印发票。 </view> <view style="margin-left: 5%;">如遇系统维护充值失败，将72小时后原路退款到付款账户。 </view>
</view> </view>
<view class="mart5 width80 font14 fcor999 fontwig6 marb40" style="list-style-type: decimal;"> <view class="mart5 width80 font14 fcor999 fontwig6 marb40" style="list-style-type: decimal;">
<view style="width: 5%;" class="flleft">8:</view> <view style="width: 5%;" class="flleft">8:</view>
<view style="margin-left: 5%;">如遇系统维护充值失败，将72小时后原路退款到付款账户。</view> <view style="margin-left: 5%;">请登录所属运营商app（手机营业厅）查看充值号码的到账情况，如金额有出入或未到账，请截图充值记录明细反馈给客服。</view>
</view> </view>
<view class="height100p"></view> <view class="height100p"></view>
<view class="bombtn width94 font16"> <view class="bombtn width94 font16">

1672
subPages/unionComfirmation/unionComfirmation.vue
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save