Compare commits

...

4 Commits

Author SHA1 Message Date
Seep e9130e4433 change 1 year ago
Seep 42db5ebe1c rebuild 1 year ago
Seep 4bb66de792 change: api动态 1 year ago
Seep f94abe9f36 change: appid动态 1 year ago
  1. 2
      common/api.js
  2. 6
      common/config.js
  3. 11
      pages/home/home.vue
  4. 14
      pages/login/login.vue
  5. 2
      pages/my/richText.vue
  6. 1
      pages/shoukuan/shoukuan.vue
  7. 2
      unpackage/dist/build/h5/index.html
  8. 1
      unpackage/dist/build/h5/static/js/index.db06b8f4.js
  9. 1
      unpackage/dist/build/h5/static/js/index.f97c888e.js
  10. 1
      unpackage/dist/build/h5/static/js/pages-AddressEdit-AddressEdit.097bd0c6.js
  11. 1
      unpackage/dist/build/h5/static/js/pages-AddressEdit-AddressEdit.700ce6c4.js
  12. 1
      unpackage/dist/build/h5/static/js/pages-AddressEdit-AddressEdit~pages-ChangePassword-ChangePassword~pages-ConfirmOrder-ConfirmOrder~pa~7711bde9.4b83de12.js
  13. 1
      unpackage/dist/build/h5/static/js/pages-AddressList-AddressList.ec5e50d0.js
  14. 1
      unpackage/dist/build/h5/static/js/pages-AddressList-AddressList.faf25640.js
  15. 1
      unpackage/dist/build/h5/static/js/pages-ChangePassword-ChangePassword~pages-ConfirmOrder-ConfirmOrder~pages-Information-Information~pa~05613995.38ee249c.js
  16. 1
      unpackage/dist/build/h5/static/js/pages-ChangePassword-ChangePassword~pages-ConfirmOrder-ConfirmOrder~pages-Information-Information~pa~05613995.92060c9c.js
  17. 1
      unpackage/dist/build/h5/static/js/pages-Information-Information~pages-OrderDetails-OrderDetails.26d684f4.js
  18. 1
      unpackage/dist/build/h5/static/js/pages-Information-Information~pages-OrderDetails-OrderDetails~pages-warehouse-buy.a1a1f36a.js
  19. 1
      unpackage/dist/build/h5/static/js/pages-MyCoupon-MyCoupon.14c380ae.js
  20. 1
      unpackage/dist/build/h5/static/js/pages-MyCoupon-MyCoupon.3277b599.js
  21. 1
      unpackage/dist/build/h5/static/js/pages-Setting-Setting.65e3e6d1.js
  22. 1
      unpackage/dist/build/h5/static/js/pages-Setting-Setting.c0b9d5e3.js
  23. 1
      unpackage/dist/build/h5/static/js/pages-bind-bind.0c04bb23.js
  24. 1
      unpackage/dist/build/h5/static/js/pages-bind-bind.186a5772.js
  25. 1
      unpackage/dist/build/h5/static/js/pages-bind-bind~pages-my-mySign~pages-my-recharge~pages-my-withdraw.4f063d1f.js
  26. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fans.6d109315.js
  27. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fans.a8aa6df6.js
  28. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fansOrder.0f755586.js
  29. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fansOrder.e5fa87bb.js
  30. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fenxiao~pages-my-incomeExpenditureDetail~pages-my-richText~pages-qianggou-productDetai~3aaf6e4c.9a70890d.js
  31. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fenxiao~pages-my-my.f04522c9.js
  32. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fenxiao~pages-my-my.fb9ff1ca.js
  33. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fenxiao~pages-my-richText~pages-qianggou-productDetails.f1a0efd4.js
  34. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-yongjin.9a6f51d1.js
  35. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-yongjin.b9991098.js
  36. 1
      unpackage/dist/build/h5/static/js/pages-home-home.79676a5a.js
  37. 1
      unpackage/dist/build/h5/static/js/pages-home-home.7f8f8d38.js
  38. 2
      unpackage/dist/build/h5/static/js/pages-home-sign.526dbcab.js
  39. 1
      unpackage/dist/build/h5/static/js/pages-login-login.56f8facd.js
  40. 1
      unpackage/dist/build/h5/static/js/pages-login-login.bec5a1e5.js
  41. 1
      unpackage/dist/build/h5/static/js/pages-my-incomeExpenditureDetail.5921c733.js
  42. 1
      unpackage/dist/build/h5/static/js/pages-my-incomeExpenditureDetail.cda55856.js
  43. 2
      unpackage/dist/build/h5/static/js/pages-my-invite.240c61c6.js
  44. 2
      unpackage/dist/build/h5/static/js/pages-my-invite.c1dc9551.js
  45. 3
      unpackage/dist/build/h5/static/js/pages-my-mySign.5669d9fb.js
  46. 3
      unpackage/dist/build/h5/static/js/pages-my-mySign.a66185b7.js
  47. 1
      unpackage/dist/build/h5/static/js/pages-my-recharge.87073a0f.js
  48. 1
      unpackage/dist/build/h5/static/js/pages-my-recharge.c1936ccd.js
  49. 1
      unpackage/dist/build/h5/static/js/pages-my-richText.6d69e52b.js
  50. 1
      unpackage/dist/build/h5/static/js/pages-my-richText.e01c0611.js
  51. 1
      unpackage/dist/build/h5/static/js/pages-my-withdraw.6146f2e6.js
  52. 1
      unpackage/dist/build/h5/static/js/pages-my-withdraw.9bf5b4fb.js
  53. 1
      unpackage/dist/build/h5/static/js/pages-qianggou-productDetails.c7072671.js
  54. 1
      unpackage/dist/build/h5/static/js/pages-qianggou-productDetails.f33f97cf.js
  55. 1
      unpackage/dist/build/h5/static/js/pages-qianggou-productList.280bda13.js
  56. 1
      unpackage/dist/build/h5/static/js/pages-qianggou-productList.ee9ec315.js
  57. 1
      unpackage/dist/build/h5/static/js/pages-qianggou-qianggou.0bb728d9.js
  58. 1
      unpackage/dist/build/h5/static/js/pages-qianggou-qianggou.aae92b46.js
  59. 1
      unpackage/dist/build/h5/static/js/pages-shoukuan-shoukuan.4c9af00f.js
  60. 1
      unpackage/dist/build/h5/static/js/pages-shoukuan-shoukuan.f215ca43.js
  61. 1
      unpackage/dist/build/h5/static/js/pages-shouyi-shouyi.10be13b3.js
  62. 1
      unpackage/dist/build/h5/static/js/pages-shouyi-shouyi.884918b1.js
  63. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-buy.6a8f2ed3.js
  64. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-buy.d1cb7d20.js
  65. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-pay.782a7d85.js
  66. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-pay.a07ebde0.js
  67. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-sell.9315cdb1.js
  68. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-sell.fa51d5b8.js
  69. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-weituo.82e7ee6f.js
  70. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-weituo.fdef85fc.js
  71. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  72. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  73. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  74. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/components/ClassifyData/ClassifyData.js.map
  75. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/components/DialogBox/DialogBox.js.map
  76. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/components/GoodsAttr/GoodsAttr.js.map
  77. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/components/GoodsCoupon/GoodsCoupon.js.map
  78. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/components/GoodsServe/GoodsServe.js.map
  79. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/components/TabBar/TabBar.js.map
  80. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/components/mescroll-uni/components/mescroll-empty.js.map
  81. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/components/mescroll-uni/components/mescroll-top.js.map
  82. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/components/mescroll-uni/mescroll-body.js.map
  83. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/components/mescroll-uni/mescroll-uni.js.map
  84. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/components/navbar.js.map
  85. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/AccountSecurity/AccountSecurity.js.map
  86. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/AddressEdit/AddressEdit.js.map
  87. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/AddressList/AddressList.js.map
  88. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/ChangePassword/ChangePassword.js.map
  89. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/ConfirmOrder/ConfirmOrder.js.map
  90. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/GoodsDetails/GoodsDetails.js.map
  91. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/GoodsEvaluateList/GoodsEvaluateList.js.map
  92. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/GoodsOn/GoodsOn.js.map
  93. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/Information/Information.js.map
  94. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/MyCoupon/MyCoupon.js.map
  95. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/MyOrderList/MyOrderList.js.map
  96. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/OrderDetails/OrderDetails.js.map
  97. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/SearchGoodsList/SearchGoodsList.js.map
  98. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/Setting/Setting.js.map
  99. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/bind/bind.js.map
  100. 2
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cart/cart.js.map
  101. Some files were not shown because too many files have changed in this diff Show More

@ -89,3 +89,5 @@ export const withdraw = (params, config = {custom: { auth: true }}) => http.post
//充值
export const getWithdrawList = (params, config = {custom: { auth: true }}) => http.post('/api/user/withdrawList', params, config);
export const getAppId = (params, config = {custom: { auth: false }}) => http.get('/api/common/getAppidByDomain', {}, config);

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

@ -90,6 +90,7 @@
</template>
<script>
import {getAppId} from '@/common/api.js'
import navbar from '@/components/navbar.vue'
import TabBar from '../../components/TabBar/TabBar.vue';
import ClassifyData from '../../components/ClassifyData/ClassifyData.vue';
@ -141,7 +142,13 @@ export default {
})
// #endif
},
onLoad() {
async onLoad() {
const res = await getAppId({});
if(res.code === 1){
uni.setStorageSync('hy-appid', res.data.wx_appid||'wx15043fd052209ad4')
}else{
uni.setStorageSync('hy-appid', 'wx15043fd052209ad4')
}
this.H5Login()
},
onPageScroll(e){
@ -221,7 +228,7 @@ export default {
let code =this.getQueryString('code');
console.log(code,"lldd");
let appid="wx15043fd052209ad4"
let appid=uni.getStorageSync('hy-appid')
let redirect_uri = encodeURIComponent(pageUrl);
// let redirect_uri = pageUrl;

@ -49,8 +49,8 @@
</template>
<script>
import {loginApi} from '@/common/api.js'
import {setToken,setUserInfo,setAgentInfo ,getToken,getUserInfo} from '@/common/auth.js'
import {loginApi, getAppId} from '@/common/api.js'
import {setToken,setUserInfo,setAgentInfo ,getToken,getUserInfo,} from '@/common/auth.js'
export default {
data() {
@ -67,7 +67,13 @@ export default {
checked:[],
};
},
onShow() {
async onShow() {
const res = await getAppId({});
if(res.code === 1){
uni.setStorageSync('hy-appid', res.data.wx_appid||'wx15043fd052209ad4')
}else{
uni.setStorageSync('hy-appid', 'wx15043fd052209ad4')
}
this.H5Login()
},
methods:{
@ -75,7 +81,7 @@ export default {
let pageUrl = window.location.href;
let code =this.getQueryString('code');
let appid="wx15043fd052209ad4"
let appid= uni.getStorageSync('hy-appid')
let redirect_uri = encodeURIComponent(pageUrl);
// let redirect_uri = pageUrl;

@ -25,7 +25,7 @@
getText(){
privacyPolicy({id:this.id}).then(res=>{
console.log(res,"-000")
console.log(res.data.content,"-000")
this.title = res.data.title
this.content = res.data.content
})

@ -251,6 +251,7 @@
if(res.code==1){
if(this.activeIndex==1){
this.yhk.code = this.mobileForm.code
updateUserInfo(this.yhk).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.aabf9ea3.js></script><script src=/static/js/index.db06b8f4.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.aabf9ea3.js></script><script src=/static/js/index.f97c888e.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

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

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

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

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save