liudan
/
hezhiying
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

Browse Source
ymwl
liudan 1 year ago
parent e03e8ee0b1
commit ea49140857
12 changed files with 45 additions and 50 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. 54
      pages/home/home.vue
  2. 23
      pages/login/login.vue
  3. 2
      pages/warehouse/weituo.vue
  4. 2
      unpackage/dist/build/h5/index.html
  5. 2
      unpackage/dist/build/h5/static/js/index.3cf2361b.js
  6. 2
      unpackage/dist/build/h5/static/js/pages-AddressEdit-AddressEdit.b35897e1.js
  7. 1
      unpackage/dist/build/h5/static/js/pages-home-home.0cfad50f.js
  8. 1
      unpackage/dist/build/h5/static/js/pages-home-home.359ed517.js
  9. 1
      unpackage/dist/build/h5/static/js/pages-login-login.11e68abd.js
  10. 1
      unpackage/dist/build/h5/static/js/pages-login-login.c21fc09a.js
  11. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-weituo.be81a90a.js
  12. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-weituo.ee6fc436.js

54
pages/home/home.vue
Unescape View File

@ -140,7 +140,7 @@ export default {
// #endif // #endif
}, },
onLoad() { onLoad() {
// this.H5Login() this.H5Login()
}, },
onPageScroll(e){ onPageScroll(e){
let scrollTop = e.scrollTop; let scrollTop = e.scrollTop;
@ -208,32 +208,32 @@ export default {
break; break;
} }
}, },
// getQueryString(name) { getQueryString(name) {
// let reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); let reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
// let r = window.location.search.substr(1).match(reg); let r = window.location.search.substr(1).match(reg);
// if (r !== null) return unescape(r[2]); if (r !== null) return unescape(r[2]);
// return null; return null;
// }, },
// H5Login(){ H5Login(){
// let pageUrl = window.location.href; let pageUrl = window.location.href;
// let code =this.getQueryString('code'); let code =this.getQueryString('code');
// console.log(code,"lldd"); console.log(code,"lldd");
// let appid="wx5a2c9f7e82918b85" let appid="wx5a2c9f7e82918b85"
// let redirect_uri = encodeURIComponent(pageUrl); let redirect_uri = encodeURIComponent(pageUrl);
// // let redirect_uri = pageUrl; // let redirect_uri = pageUrl;
// console.log(redirect_uri) console.log(redirect_uri)
// let authUrl = let authUrl =
// `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${redirect_uri}&response_type=code&scope=snsapi_base&state=STATE&connect_redirect=1#wechat_redirect`; `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${redirect_uri}&response_type=code&scope=snsapi_base&state=STATE&connect_redirect=1#wechat_redirect`;
// if (code) { if (code) {
// uni.setStorageSync("code",code) uni.setStorageSync("code",code)
// } else { } else {
// // window.location.href = authUrl; // window.location.href = authUrl;
// console.log("没有code") console.log("没有code")
// // return await Promise.reject("跳转授权"); // return await Promise.reject("跳转授权");
// } }
// } }
} }
}; };
</script> </script>

23
pages/login/login.vue
Unescape View File

@ -109,6 +109,15 @@ export default {
}) })
return; return;
} }
loginApi({account:this.form.phone,password:this.form.password,code:uni.getStorageSync("code")}).then(res=>{
if(res.code==1){
setUserInfo(res.data.userinfo)
setToken(res.data.userinfo.token);
uni.switchTab({
url: '/pages/my/my'
});
}else{
let pageUrl = window.location.href; let pageUrl = window.location.href;
let code =this.getQueryString('code'); let code =this.getQueryString('code');
@ -120,21 +129,7 @@ export default {
console.log(redirect_uri) console.log(redirect_uri)
let authUrl = let authUrl =
`https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${redirect_uri}&response_type=code&scope=snsapi_base&state=STATE&connect_redirect=1#wechat_redirect`; `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${redirect_uri}&response_type=code&scope=snsapi_base&state=STATE&connect_redirect=1#wechat_redirect`;
if (code) {
uni.setStorageSync("code",code)
} else {
window.location.href = authUrl; window.location.href = authUrl;
console.log("没有code")
// return await Promise.reject("跳转授权");
}
loginApi({account:this.form.phone,password:this.form.password,code:uni.getStorageSync("code")}).then(res=>{
if(res.code==1){
setUserInfo(res.data.userinfo)
setToken(res.data.userinfo.token);
uni.switchTab({
url: '/pages/my/my'
});
} }
}) })
}, },

2
pages/warehouse/weituo.vue
Unescape View File

@ -129,7 +129,7 @@
payUpGoods(params).then(res=>{ payUpGoods(params).then(res=>{
let self = this; let self = this;
jweixin.config({ jweixin.config({
debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。 debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: res.data.pay_data.appId, // 必填，公众号的唯一标识 appId: res.data.pay_data.appId, // 必填，公众号的唯一标识
timestamp: res.data.pay_data.timeStamp, // 必填，生成签名的时间戳 timestamp: res.data.pay_data.timeStamp, // 必填，生成签名的时间戳
nonceStr: res.data.pay_data.nonceStr, // 必填，生成签名的随机串 nonceStr: res.data.pay_data.nonceStr, // 必填，生成签名的随机串

2
unpackage/dist/build/h5/index.html vendored
Unescape View File

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)')) <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.c321b385.js></script><script src=/static/js/index.8622b5b7.js></script></body></html> document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.c321b385.js></script><script src=/static/js/index.3cf2361b.js></script></body></html>

2
unpackage/dist/build/h5/static/js/index.8622b5b7.js → unpackage/dist/build/h5/static/js/index.3cf2361b.js vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/h5/static/js/pages-AddressEdit-AddressEdit.16906232.js → unpackage/dist/build/h5/static/js/pages-AddressEdit-AddressEdit.b35897e1.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-home-home.0cfad50f.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-home-home.359ed517.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-login-login.11e68abd.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-login-login.c21fc09a.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-warehouse-weituo.be81a90a.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-warehouse-weituo.ee6fc436.js vendored
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save