Compare commits

...

8 Commits

Author SHA1 Message Date
liudan 24052cd692 1 1 year ago
liudan ba5bb7c450 提交 1 year ago
Seep 19998c90e6 rebuild 1 year ago
Seep da5b9392ec change 1 year ago
liudan 49d3f640ab 11 1 year ago
liudan 6bd1a32b5e 1 1 year ago
liudan 6bfcf6e72e 1 1 year ago
liudan 8c951ec8a4 新分支 1 year ago
  1. 18
      App.vue
  2. 1
      common/api.js
  3. 5
      common/config.js
  4. 4
      manifest.json
  5. 48
      pages/login/login.vue
  6. 2
      pages/my/invite.vue
  7. 1
      pages/register/findPsw.vue
  8. 1
      pages/register/register.vue
  9. 5
      pages/shoukuan/shoukuan.vue
  10. 2
      unpackage/dist/build/h5/index.html
  11. 1
      unpackage/dist/build/h5/static/js/index.cc8a90aa.js
  12. 1
      unpackage/dist/build/h5/static/js/index.e8bf8fb6.js
  13. 2
      unpackage/dist/build/h5/static/js/pages-AddressEdit-AddressEdit.5ddca3e0.js
  14. 2
      unpackage/dist/build/h5/static/js/pages-AddressList-AddressList.2c0c9cef.js
  15. 2
      unpackage/dist/build/h5/static/js/pages-ChangePassword-ChangePassword~pages-ConfirmOrder-ConfirmOrder~pages-Information-Information~pa~3d136d08.30129fb6.js
  16. 2
      unpackage/dist/build/h5/static/js/pages-MyCoupon-MyCoupon.1fa187c1.js
  17. 1
      unpackage/dist/build/h5/static/js/pages-Setting-Setting.54f13e95.js
  18. 1
      unpackage/dist/build/h5/static/js/pages-Setting-Setting.a001e8d4.js
  19. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fans.40890d5c.js
  20. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fans.422951e1.js
  21. 2
      unpackage/dist/build/h5/static/js/pages-fenxiao-fansOrder.6452f3a5.js
  22. 2
      unpackage/dist/build/h5/static/js/pages-fenxiao-fenxiao~pages-my-my.1d7db10f.js
  23. 2
      unpackage/dist/build/h5/static/js/pages-fenxiao-yongjin.19f8eb09.js
  24. 3
      unpackage/dist/build/h5/static/js/pages-home-sign.347e0a0c.js
  25. 3
      unpackage/dist/build/h5/static/js/pages-home-sign.ad24c701.js
  26. 1
      unpackage/dist/build/h5/static/js/pages-login-login.7bdbd63a.js
  27. 1
      unpackage/dist/build/h5/static/js/pages-login-login.e46e792a.js
  28. 2
      unpackage/dist/build/h5/static/js/pages-my-invite.8d2829f2.js
  29. 2
      unpackage/dist/build/h5/static/js/pages-my-invite.ba97c795.js
  30. 2
      unpackage/dist/build/h5/static/js/pages-my-richText.8f22ed82.js
  31. 2
      unpackage/dist/build/h5/static/js/pages-qianggou-productDetails.dfb63d86.js
  32. 2
      unpackage/dist/build/h5/static/js/pages-qianggou-productList.3233ad6c.js
  33. 1
      unpackage/dist/build/h5/static/js/pages-register-findPsw.e506f48a.js
  34. 1
      unpackage/dist/build/h5/static/js/pages-register-findPsw.f62b1eb8.js
  35. 1
      unpackage/dist/build/h5/static/js/pages-register-register.c9bde3aa.js
  36. 1
      unpackage/dist/build/h5/static/js/pages-register-register.eec3c0a1.js
  37. 1
      unpackage/dist/build/h5/static/js/pages-shoukuan-shoukuan.48c7b759.js
  38. 1
      unpackage/dist/build/h5/static/js/pages-shoukuan-shoukuan.be5954e9.js
  39. 1
      unpackage/dist/build/h5/static/js/pages-shouyi-shouyi.12b498f8.js
  40. 1
      unpackage/dist/build/h5/static/js/pages-shouyi-shouyi.c78fb058.js
  41. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-sell.a1cbcd90.js
  42. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-sell.d3202e09.js
  43. 2
      unpackage/dist/build/h5/static/js/pages-warehouse-weituo.84edb556.js

@ -2,24 +2,6 @@
export default {
onLaunch: function() {
console.log('App Launch');
let pageUrl = window.location.href;
let code =this.getQueryString('code');
console.log(code,"lldd");
let appid="wx5a2c9f7e82918b85"
let redirect_uri = encodeURIComponent(pageUrl);
// let redirect_uri = pageUrl;
console.log(redirect_uri)
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`;
if (code) {
uni.setStorageSync("code",code)
} else {
window.location.href = authUrl;
console.log("没有code")
// return await Promise.reject("");
}
},
onShow: function() {
console.log('App Show');

@ -74,4 +74,5 @@ export const orderPay = (params, config = {custom: { auth: true }}) => http.post
export const bindInvitor = (params, config = {custom: { auth: true }}) => http.post('/api/user/bindInvitor', params, config);
//上架
export const payUpGoods = (params, config = {custom: { auth: true }}) => http.post('/api/order/payUpGoods', params, config);
export const getAppidByDomain = (params, config = {custom: { auth: true }}) => http.post('/api/common/getAppidByDomain', params, config);

@ -1,2 +1,3 @@
export const $apiLinks = "https://admin.hezhiying.com.cn/" // api 接口地址
export const baseUrl = "https://admin.hezhiying.com.cn/"
let url = `${window.location.origin}/`
export const $apiLinks = url // api 接口地址
export const baseUrl = url

@ -1,6 +1,6 @@
{
"name" : "电商模板,纯前端模板,可直接使用",
"appid" : "__UNI__E0663F1",
"name" : "合之赢",
"appid" : "__UNI__64F15DD",
"description" : "",
"versionName" : "1.0.2",
"versionCode" : "100",

@ -51,7 +51,7 @@
<script>
import {loginApi} from '@/common/api.js'
import {setToken,setUserInfo,setAgentInfo ,getToken,getUserInfo} from '@/common/auth.js'
import {getAppidByDomain} from '@/common/api.js'
export default {
data() {
return {
@ -119,20 +119,43 @@ export default {
}else{
let pageUrl = window.location.href;
getAppidByDomain().then(res=>{
let code =this.getQueryString('code');
let appid=res.data.wx_appid
let redirect_uri = encodeURIComponent(pageUrl);
// let redirect_uri = pageUrl;
console.log(redirect_uri)
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`;
window.location.href = authUrl;
})
let code =this.getQueryString('code');
console.log(code,"lldd");
let appid="wx5a2c9f7e82918b85"
let redirect_uri = encodeURIComponent(pageUrl);
// let redirect_uri = pageUrl;
console.log(redirect_uri)
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`;
window.location.href = authUrl;
}
})
},
H5GetAppid(){
let pageUrl = window.location.href;
getAppidByDomain().then(res=>{
let code =this.getQueryString('code');
let appid=res.data.wx_appid
let redirect_uri = encodeURIComponent(pageUrl);
// let redirect_uri = pageUrl;
console.log(redirect_uri)
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`;
if (code) {
uni.setStorageSync("code",code)
} else {
window.location.href = authUrl;
console.log("没有code")
// return await Promise.reject("");
}
})
},
getQueryString(name) {
let reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
let r = window.location.search.substr(1).match(reg);
@ -140,6 +163,9 @@ export default {
return null;
},
},
onShow() {
this.H5GetAppid()
},
watch:{
form:{
handler(newValue, oldValue) {

@ -49,7 +49,7 @@
// uQRCode
var qr = new UQRCode();
//
qr.data = `https://www.hezhiying.com.cn/pages/register/register?mobile=${this.userInfo.mobile}`;
qr.data = `${window.location.origin}/pages/register/register?mobile=${this.userInfo.mobile}`;
// canvas
qr.size = 200;
//

@ -63,6 +63,7 @@ export default {
methods:{
getCode(){
this.timeNum = 59;
if(!this.form.mobile){
this.$refs.uToast.show({
message:'请输入手机号码'

@ -79,6 +79,7 @@ export default {
})
},
getCode(){
this.timeNum = 59;
if(!this.form.phone){
this.$refs.uToast.show({
message:'请输入手机号码'

@ -214,6 +214,7 @@
this.codeSend = false;
},
getCode(){
this.timeNum = 59;
// let event = this.activeIndex==1?'bank':this.activeIndex==2?'alipay':'wechat'
if(!this.mobileForm.phone){
this.$refs.uToast.show({
@ -255,13 +256,13 @@
})
})
}else if(this.activeIndex==2){
updateUserInfo({alipay_image:this.zfburl}).then(res=>{
updateUserInfo({alipay_image:this.zfburl,code:this.mobileForm.code}).then(res=>{
this.$refs.uToast.show({
message:'保存成功'
})
})
}else if(this.activeIndex==3){
updateUserInfo({wechat_image:this.wxurl}).then(res=>{
updateUserInfo({wechat_image:this.wxurl,code:this.mobileForm.code}).then(res=>{
this.$refs.uToast.show({
message:'保存成功'
})

@ -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)'))
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.63a62668.js></script><script src=/static/js/index.cc8a90aa.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.63a62668.js></script><script src=/static/js/index.e8bf8fb6.js></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

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