From cfcc0c15ec1b9b7e14a63ea78518c40351cb6c73 Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Sat, 14 Dec 2024 14:40:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B5=81=E6=B0=B4=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/config.js | 12 ++++++------ me/invite/cashDetail.vue | 2 +- me/invite/index.vue | 4 ++-- me/invite/moneyList.vue | 7 ++++++- pages/login/registerApp.vue | 2 +- pages/me/index.vue | 2 +- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/common/config.js b/common/config.js index f8c138b..c91f33f 100644 --- a/common/config.js +++ b/common/config.js @@ -1,14 +1,14 @@ -const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; // -const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名 -const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名 +// const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; // +// const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名 +// const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名 // const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; // // const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名 // const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名 -// const ROOTPATH1 = "http://192.168.1.5:8100/sqx_fast/"; // -// const ROOTPATH = "http://192.168.1.5:8100/sqx_fast/"; //后台服务域名 -// const ROOTPATH2 = "http://192.168.1.5:8100"; //后台服务域名 +const ROOTPATH1 = "http://192.168.1.5:8100/sqx_fast/"; // +const ROOTPATH = "http://192.168.1.5:8100/sqx_fast/"; //后台服务域名 +const ROOTPATH2 = "http://192.168.1.5:8100"; //后台服务域名 module.exports = { APIHOST: ROOTPATH, diff --git a/me/invite/cashDetail.vue b/me/invite/cashDetail.vue index 55d9ec6..0006e30 100644 --- a/me/invite/cashDetail.vue +++ b/me/invite/cashDetail.vue @@ -155,7 +155,7 @@ //钱包明细 goqianbao() { uni.navigateTo({ - url: '/me/invite/moneyList?moneyType=1' + url: '/me/invite/moneyList?moneyType=1&viewType=2' }); }, list() { diff --git a/me/invite/index.vue b/me/invite/index.vue index 8502c2f..cb2a912 100644 --- a/me/invite/index.vue +++ b/me/invite/index.vue @@ -263,12 +263,12 @@ methods: { toGold(){ uni.navigateTo({ - url:'/me/invite/moneyList?moneyType=2' + url:'/me/invite/moneyList?moneyType=2&viewType=1' }) }, toPack(){ uni.navigateTo({ - url:'/me/invite/moneyList?moneyType=1' + url:'/me/invite/moneyList?moneyType=1&viewType=1' }) }, //获取用户分销比例 diff --git a/me/invite/moneyList.vue b/me/invite/moneyList.vue index 4a86ec1..cab97b9 100644 --- a/me/invite/moneyList.vue +++ b/me/invite/moneyList.vue @@ -36,7 +36,8 @@ page: 1, limit: 10, totalCount: 0, - moneyType: null + moneyType: null, + viewType: null, } }, onLoad: function(e) { @@ -47,6 +48,9 @@ title: e.moneyType == 1 ? '红包明细' : '金币明细' }); } + if (e.viewType) { + this.viewType = e.viewType + } this.getMoney(); }, @@ -60,6 +64,7 @@ page : that.page, limit : that.limit, moneyType : this.moneyType, + viewType: this.viewType, } this.$Request.getT('app/moneyDetails/queryUserMoneyDetails', data).then(res => { diff --git a/pages/login/registerApp.vue b/pages/login/registerApp.vue index 116a761..1358e21 100644 --- a/pages/login/registerApp.vue +++ b/pages/login/registerApp.vue @@ -365,7 +365,7 @@ position: absolute; left: 0; right: 0; - bottom: 178rpx; + bottom: 278rpx; .cuIcon::before{ width: 30rpx; height: 30rpx; diff --git a/pages/me/index.vue b/pages/me/index.vue index f1ffefb..a745d8d 100644 --- a/pages/me/index.vue +++ b/pages/me/index.vue @@ -105,7 +105,7 @@ - + 金币明细