更新
This commit is contained in:
parent
7b82ecd876
commit
1dc9449e47
@ -2,8 +2,8 @@
|
||||
"name" : "惠农生活",
|
||||
"appid" : "__UNI__3A527D1",
|
||||
"description" : "",
|
||||
"versionName" : "1.9.6",
|
||||
"versionCode" : 196,
|
||||
"versionName" : "1.9.7",
|
||||
"versionCode" : 197,
|
||||
"transformPx" : false,
|
||||
/* 5+App特有相关 */
|
||||
"app-plus" : {
|
||||
@ -132,12 +132,7 @@
|
||||
"name" : "amapIvoVHpJR"
|
||||
}
|
||||
},
|
||||
"oauth" : {
|
||||
"weixin" : {
|
||||
"appid" : "wx9d68c92b550ddd1e",
|
||||
"UniversalLinks" : "https://shop.lihaink.cn/"
|
||||
}
|
||||
},
|
||||
"oauth" : {},
|
||||
"ad" : {},
|
||||
"push" : {},
|
||||
"speech" : {}
|
||||
|
@ -142,6 +142,8 @@
|
||||
</checkbox-group>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- <button @click="wxLogin">微信登录</button> -->
|
||||
</div>
|
||||
<div class="bottom"></div>
|
||||
<view class="settlementAgreement" v-if="showAgreement">
|
||||
@ -523,10 +525,12 @@ import { Toast } from "../../../libs/uniApi";
|
||||
provider: 'weixin',
|
||||
// onlyAuthorize: true,
|
||||
success: function(loginRes) {
|
||||
self.appUserInfo = loginRes
|
||||
console.log(loginRes);
|
||||
self.appUserInfo = loginRes;
|
||||
self.wxLoginApi()
|
||||
},
|
||||
fail(error) {
|
||||
console.log(error);
|
||||
uni.showToast({
|
||||
title: '登录失败',
|
||||
icon: 'none',
|
||||
@ -547,11 +551,16 @@ import { Toast } from "../../../libs/uniApi";
|
||||
commonAuth({
|
||||
auth: {
|
||||
type: 'app_wechat',
|
||||
auth: {
|
||||
code: that.appUserInfo.authResult.access_token,
|
||||
openid: that.appUserInfo.authResult.openid,
|
||||
phone: this.account,
|
||||
}
|
||||
// auth: {
|
||||
// code: that.appUserInfo.authResult.access_token,
|
||||
// openid: that.appUserInfo.authResult.openid,
|
||||
// phone: this.account,
|
||||
// }
|
||||
auth: {
|
||||
code: that.appUserInfo.authResult.access_token,
|
||||
openid: that.appUserInfo.authResult.openid,
|
||||
phone: this.account,
|
||||
}
|
||||
}
|
||||
}).then(res => {
|
||||
const data = res.data;
|
||||
@ -590,6 +599,7 @@ import { Toast } from "../../../libs/uniApi";
|
||||
}
|
||||
uni.hideLoading();
|
||||
}).catch(res => {
|
||||
console.log(res);
|
||||
uni.hideLoading();
|
||||
uni.showToast({
|
||||
title: res.message || res,
|
||||
|
Loading…
x
Reference in New Issue
Block a user