|
@@ -1,5 +1,5 @@
|
|
|
<template>
|
|
|
- <view style="padding: 16px;font-size: 14px;">
|
|
|
+ <view style="padding: 16px;font-size: 14px;background-color: #f7f7f7;min-height: 100vh;">
|
|
|
<tn-nav-bar fixed alpha customBack>
|
|
|
<view slot="back" class='tn-custom-nav-bar__back' @click="goBack">
|
|
|
<text class='icon tn-icon-left'></text>
|
|
@@ -59,7 +59,6 @@
|
|
|
"text": ""
|
|
|
}],
|
|
|
lxSessionKey: '',
|
|
|
- openId: '',
|
|
|
unionid: '',
|
|
|
canSave:true,
|
|
|
phoneNum:'',
|
|
@@ -70,6 +69,7 @@
|
|
|
onLoad() {
|
|
|
const appBaseInfo = wx.getAppBaseInfo();
|
|
|
this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
|
|
|
+ console.error(wx.getAccountInfoSync().miniProgram.envVersion);
|
|
|
},
|
|
|
onShow(){
|
|
|
if(uni.getStorageSync('agreeInfo')){
|
|
@@ -87,7 +87,7 @@
|
|
|
uni.navigateBack()
|
|
|
return;
|
|
|
}else{
|
|
|
- uni.navigateTo({
|
|
|
+ uni.reLaunch({
|
|
|
url: '/pages/index/index'
|
|
|
})
|
|
|
}
|
|
@@ -189,8 +189,13 @@
|
|
|
wx.getUserInfo({
|
|
|
success: function(res) {
|
|
|
console.error(res);
|
|
|
- res.encryptedData = encodeURIComponent(encodeURIComponent(e.detail.encryptedData));
|
|
|
- res.iv = encodeURIComponent(encodeURIComponent(e.detail.iv));
|
|
|
+ if(wx.getAccountInfoSync()&&wx.getAccountInfoSync().miniProgram.envVersion=='develop'){
|
|
|
+ res.encryptedData = encodeURIComponent(encodeURIComponent(e.detail.encryptedData));
|
|
|
+ res.iv = encodeURIComponent(encodeURIComponent(e.detail.iv));
|
|
|
+ }else{
|
|
|
+ res.encryptedData = (encodeURIComponent(e.detail.encryptedData));
|
|
|
+ res.iv = (encodeURIComponent(e.detail.iv));
|
|
|
+ }
|
|
|
res.lxSessionKey = that.lxSessionKey;
|
|
|
that.getPhone(res)
|
|
|
}
|