diff --git a/api/api.js b/api/api.js index 6996785..ed6bba6 100644 --- a/api/api.js +++ b/api/api.js @@ -360,12 +360,10 @@ export function getinstallment(data) { } +// 首页记录ip +export function logoip() { + return request.get(`login/log`, {}, { + noAuth: true + }); +} - - - // 查询签约是否成功 -// export function getqytrue(data) { -// return request.get('order/getSignResult/',data,{ -// noAuth: true -// }) -// } \ No newline at end of file diff --git a/config/app.js b/config/app.js index d79079f..428cbe9 100644 --- a/config/app.js +++ b/config/app.js @@ -2,33 +2,32 @@ // let domain = 'http://117.50.163.143:20410' // let domain = 'http://117.50.215.20:20410' // let domain = 'http://192.168.2.14:8081' -let domain = 'http://106.75.49.247:20410' - +// let domain = 'http://106.75.49.247:20410' +let domain = 'https://yruibao.com/prod' module.exports = { // 请求域名 格式: https://您的域名 // #ifdef MP || APP-PLUS - // HTTP_REQUEST_URL:'', - HTTP_REQUEST_URL: domain, - // H5商城地址 - HTTP_H5_URL: 'http://106.75.49.247:20410', - // HTTP_H5_URL: 'http://192.168.2.14:8081', - // HTTP_H5_URL: 'http://117.50.215.20:20410', + // HTTP_REQUEST_URL:'', + HTTP_REQUEST_URL: domain, + // H5商城地址 + HTTP_H5_URL: 'https://yruibao.com/prod', //正式 + // HTTP_H5_URL: 'http://192.168.2.14:8081', //本地 + // HTTP_H5_URL: 'http://117.50.215.20:20410', //测试 // #endif // #ifdef H5 - HTTP_REQUEST_URL:domain, + HTTP_REQUEST_URL: domain, // #endif - HEADER:{ + HEADER: { 'content-type': 'application/json', - + }, - HEADERPARAMS:{ + HEADERPARAMS: { 'content-type': 'application/x-www-form-urlencoded' }, // 回话密钥名称 请勿修改此配置 TOKENNAME: 'Authori-zation', // 缓存时间 0 永久 - EXPIRE:0, + EXPIRE: 0, //分页最多显示条数 LIMIT: 10 -}; - \ No newline at end of file +}; \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index d2761e7..7187c24 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -70,7 +70,7 @@ - + @@ -176,7 +176,8 @@ } from "@/api/user"; // #ifdef MP-WEIXIN || APP-PLUS import { - getTemlIds + getTemlIds, + logoip } from '@/api/api.js'; // #endif // #ifdef H5 @@ -434,6 +435,8 @@ if (this.isLogin && parseInt(app.globalData.spread) > 0) { silenceBindingSpread() } + + }, onShow() { @@ -449,8 +452,18 @@ }, 1000) // #endif uni.showTabBar(); + + // 调用记录ip + this.getip() }, methods: { + // 首页记录ip + getip(){ + logoip().then(res => { + console.log(res,'记录ip') + }) + }, + menusTap(url) { goPage().then(res => { if (url == '/pages/goods_cate/goods_cate') { @@ -512,13 +525,13 @@ callback(data[0]); }); }, - xieyiApp() { + xieyiApp(){ uni.navigateTo({ url: '/pages/users/web_page/index?webUel=https://admin.java.crmeb.net/useragreement/xieyi.html&title=协议内容' }) }, // #ifdef APP-PLUS - xieyiApp() { + xieyiApp(){ uni.navigateTo({ animationType: animationType.type, animationDuration: animationType.duration, @@ -526,26 +539,26 @@ }) }, // 同意隐私协议 - confirmApp() { + confirmApp(){ uni.setStorageSync('privacyStatus', true) this.privacyStatus = false }, // 关闭Model - closeModel() { + closeModel(){ this.privacyStatus = false }, // #endif // #ifdef MP || APP-PLUS - getTemlIds() { - for (var i in arrTemp) { + getTemlIds(){ + for(var i in arrTemp){ this.getTem(arrTemp[i]); } }, - getTem(data) { + getTem(data){ getTemlIds({ type: data }).then(res => { - if (res.data) { + if (res.data){ let arr = res.data.map((item) => { return item.tempId }) @@ -555,13 +568,13 @@ }, // #endif // 关闭优惠券弹窗 - onColse() { + onColse(){ this.$set(this, "window", false); }, /** * 获取我的推荐 */ - get_host_product: function() { + get_host_product: function(){ let that = this; that.loading = true; @@ -577,7 +590,7 @@ }, // 首页数据 - getIndexConfig: function() { + getIndexConfig: function(){ let that = this; //this.isNodes++; getIndexData().then(res => { @@ -588,8 +601,8 @@ that.$set(that, "imgUrls", res.data.banner); that.$set(that, "menus", res.data.menus); that.$set(that, "roll", res.data.roll ? res.data.roll : []); - that.$set(that, 'cardShow', res.data.homePageSaleListStyle == '' ? 1 : Number(res.data - .homePageSaleListStyle)); //首页商品列表模板获取配置 + that.$set(that, 'cardShow', res.data.homePageSaleListStyle == '' ? 1 : Number(res.data.homePageSaleListStyle)); //首页商品列表模板获取配置 + // console.log(this.menus,11) // 保存商品分类页配置 that.$Cache.setItem({ name: 'categoryConfig', @@ -622,7 +635,7 @@ }); }, - appVersionConfig() { + appVersionConfig(){ var that = this; //app升级 // 获取本地应用资源版本号 @@ -658,7 +671,6 @@ .iosAddress)); break; } - } } }); diff --git a/pages/user/index.vue b/pages/user/index.vue index fa70eef..29be221 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -27,7 +27,7 @@ {{userInfo.phone}} - + {{realname}} @@ -44,10 +44,10 @@ {{userInfo.nowMoney && uid ? userInfo.nowMoney:0}} 余额 - + {{userInfo.couponCount && uid ? userInfo.couponCount : 0}} 优惠券 @@ -103,7 +103,7 @@ 我的服务 + v-if="item.id != 1751 && item.id != 1754 && item.id !=1752 &&item.id !=1744"> @@ -180,6 +180,7 @@ } from '@/utils/setTheme.js' import animationType from '@/utils/animationType.js' const app = getApp(); + export default { computed: mapGetters(['isLogin', 'chatUrl', 'uid']), data() { @@ -273,6 +274,7 @@ that.$set(that, 'pageHeight', app.globalData.windowHeight); // #endif that.$set(that, 'MyMenus', app.globalData.MyMenus); + that.$set(that, 'chatConfig', Cache.getItem('chatConfig')); // #ifdef H5 that.shareApi(); @@ -323,6 +325,7 @@ uid: this.$store.getters.uid } getidentity(data).then(res=>{ + // console.log(res.data) if (res.message == '操作成功') { this.realname = '已实名' this.identification = res.data @@ -336,7 +339,7 @@ }) }, //校验token是否有效,true为有效,false为无效 - getTokenIsExist() { + getTokenIsExist(){ tokenIsExistApi().then(res => { let tokenIsExist = res.data; if (this.isLogin && tokenIsExist) { @@ -353,7 +356,7 @@ }) }, //获取授权图片 - copyrightImage() { + copyrightImage(){ copyrightApi().then(res => { if (res.data) { this.copyImage = res.data.companyImage; @@ -481,13 +484,13 @@ // if (this.MyMenus.length) return; getMenuList().then(res => { that.$set(that, 'MyMenus', res.data.routine_my_menus); + console.log(this.MyMenus,11) that.wechatUrl = res.data.routine_my_menus.filter((item) => { return item.url.indexOf('service') !== -1 }) res.data.routine_my_menus.map((item) => { if (item.url.indexOf('service') !== -1) that.servicePic = item.pic }) - // that.imgUrls = res.data.routine_my_banner if (res.data.routine_my_banner) { that.imgUrls = res.data.routine_my_banner } diff --git a/pages/users/inbound/index.vue b/pages/users/inbound/index.vue index a5454f6..08271a3 100644 --- a/pages/users/inbound/index.vue +++ b/pages/users/inbound/index.vue @@ -1,6 +1,6 @@ @@ -14,17 +14,16 @@ onShow() { }, - onLoad(option) { - - this.https = decodeURIComponent(option.https) - // console.log(option.http) + onLoad() { + this.https = this.$Cache.get('https') + // this.https = decodeURIComponent(option) + console.log(this.https,111) }, methods: { - handleGetMessage:function(e){ console.log(e) if(e.detail.data[0].result == 'success'){ - uni.navigateTo({ + uni.redirectTo({ url:'/pages/users/signin/index' }) } diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index 1ece76d..3450eef 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -85,7 +85,7 @@ - 积分抵扣 @@ -98,7 +98,7 @@ :disabled="orderInfoVo.userIntegral==0 && !useIntegral" @click="btnjf" /> - + --> - + 正在签约中,请稍等... - - + + @@ -48,23 +48,28 @@ signStatus: '', //签约状态 flag: false, text: '失败', - logoflag:true, + logoflag: true, } }, onLoad(option) { - this.id = this.$Cache.get('qyids') - this.orderNo = option.orderId + this.orderNo = this.$Cache.get('qyids') + // console.log(this.id) + // this.orderNo = option.orderId // this.shopobj = JSON.parse(option.shopobj) this.getnews(this.orderNo) this.logoflag = true + + this.timer = setInterval(() => { + this.getnews() + }, 1000); }, onShow() { - this.getnews(this.orderNo) - this.logoflag = true + }, methods: { - getnews(id) { - getqianyue(id).then(res => { + getnews(orderNo) { + getqianyue(orderNo).then(res => { + console.log(res) this.signStatus = res.data.signStatus if (this.signStatus == 2) { this.flag = true @@ -75,8 +80,11 @@ }, }, onReady() { - // 定时器 + }, + onUnload() { + // 在页面卸载时清除定时器 + clearInterval(this.timer); } } @@ -85,7 +93,7 @@ page { position: relative; } - + .logobox { width: 100%; height: 100vh; @@ -96,11 +104,12 @@ opacity: 1; padding-top: 30%; box-sizing: border-box; - background-color:#000; + background-color: #000; text-align: center; z-index: 1; } - .logobox text{ + + .logobox text { display: block; color: #fff; font-size: 14px; @@ -110,6 +119,7 @@ left: 50%; transform: translateX(-50%); } + .logoicon { width: 80rpx; height: 140rpx; @@ -119,6 +129,7 @@ left: 50%; transform: translateX(-50%); } + .Pay_success { width: 100%; margin-top: 200rpx; diff --git a/pages/users/user_money/index.vue b/pages/users/user_money/index.vue index 7f73674..26c5571 100644 --- a/pages/users/user_money/index.vue +++ b/pages/users/user_money/index.vue @@ -42,15 +42,15 @@ 充值记录 - +