diff --git a/api/api.js b/api/api.js index ed6bba6..9a802ef 100644 --- a/api/api.js +++ b/api/api.js @@ -1,12 +1,12 @@ import request from "@/utils/request.js"; /** * 公共接口 ,优惠券接口 , 行业此讯 , 手机号码注册 - * + * */ /** * 获取主页数据 无需授权 - * + * */ export function getIndexData() { return request.get("index", {}, { @@ -16,7 +16,7 @@ export function getIndexData() { /** * 获取登录授权login - * + * */ export function getLogo() { return request.get('wechat/getLogo', {}, { @@ -27,7 +27,7 @@ export function getLogo() { /** * 保存form_id - * @param string formId + * @param string formId */ export function setFormId(formId) { return request.post("wechat/set_form_id", { @@ -38,7 +38,7 @@ export function setFormId(formId) { /** * 领取优惠卷 * @param int couponId - * + * */ export function setCouponReceive(couponId) { return request.post('coupon/receive', { @@ -65,7 +65,7 @@ export function getUserCoupons(data) { /** * 文章分类列表 - * + * */ export function getArticleCategoryList() { return request.get('article/category/list', {}, { @@ -76,7 +76,7 @@ export function getArticleCategoryList() { /** * 文章列表 * @param int cid - * + * */ export function getArticleList(cid, data) { return request.get('article/list/' + cid, data, { @@ -86,7 +86,7 @@ export function getArticleList(cid, data) { /** * 文章 热门列表 - * + * */ export function getArticleHotList() { return request.get('article/hot/list', {}, { @@ -96,7 +96,7 @@ export function getArticleHotList() { /** * 文章 轮播列表 - * + * */ export function getArticleBannerList() { return request.get('article/banner/list', {}, { @@ -106,8 +106,8 @@ export function getArticleBannerList() { /** * 文章详情 - * @param int id - * + * @param int id + * */ export function getArticleDetails(id) { return request.get('article/info', id, { @@ -150,7 +150,7 @@ export function registerVerify(phone) { /** * 手机号注册 * @param object data - * + * */ export function phoneRegister(data) { return request.post('register', data, { @@ -161,7 +161,7 @@ export function phoneRegister(data) { /** * 手机号修改密码 * @param object data - * + * */ export function phoneRegisterReset(data) { return request.post('register/reset', data, { @@ -172,7 +172,7 @@ export function phoneRegisterReset(data) { /** * 手机号+密码登录 * @param object data - * + * */ export function phoneLogin(data) { return request.post('login', data, { @@ -205,7 +205,7 @@ export function switchH5Login() { /** * 换绑手机号 - * + * */ export function bindingPhone(data) { return request.post('update/binding', data); @@ -213,7 +213,7 @@ export function bindingPhone(data) { /** * 换绑手机号校验 - * + * */ export function bindingVerify(data) { return request.post('update/binding/verify', data); @@ -221,7 +221,7 @@ export function bindingVerify(data) { /** * 退出登錄 - * + * */ export function logout() { return request.get('logout'); @@ -359,11 +359,19 @@ export function getinstallment(data) { }); } +// 到首页查询ip地址 -// 首页记录ip -export function logoip() { - return request.get(`login/log`, {}, { + +export function getip() { + return request.get('login/log', { noAuth: true }); } + + // 查询签约是否成功 +// export function getqytrue(data) { +// return request.get('order/getSignResult/',data,{ +// noAuth: true +// }) +// } diff --git a/components/productWindow/index.vue b/components/productWindow/index.vue index 99e0dfa..6621b0b 100644 --- a/components/productWindow/index.vue +++ b/components/productWindow/index.vue @@ -450,12 +450,18 @@ .periodization .returnthedate a { text-decoration: none; - display: block; + // display: block; margin-top: 20rpx; border: 1px solid rgb(255, 87, 51); color: #000; + // width: 100% !important; + padding: 0 20rpx; + padding-right: 40rpx; + box-sizing: border-box; + } + .returnthedate{ + width: 100% !important; } - .periodization .returnthedate a:nth-of-type(1) { width: 198rpx; height: 60rpx; diff --git a/pages/index/index.vue b/pages/index/index.vue index 9fe2302..bee4e15 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -170,6 +170,7 @@ setCouponReceive, getTheme, getAppVersion, + getip } from '@/api/api.js'; import { spread @@ -370,6 +371,9 @@ this.setTabList() }, onLoad(options) { + this.getipdz() + + if (app.globalData.isIframe) { setTimeout(() => { let active; @@ -420,7 +424,6 @@ let mapeMpQrCodeValue = this.$util.formatMpQrCodeData(qrCodeValue); app.globalData.spread = mapeMpQrCodeValue.spread; app.globalData.channelId = mapeMpQrCodeValue.channelId; - } if (options.spread) app.globalData.spread = options.spread; //非小程序扫码进入情况下,直接获取url中的分销员id保存在globalDta中 if (options.channelId) app.globalData.channelId = options.channelId; //非小程序扫码进入情况下,直接获取url中的分销员id保存在globalDta中 @@ -470,6 +473,14 @@ }) }, + // 获取IP地址 + getipdz(){ + getip().then(res => { + console.log(res,111) + }) + }, + + menusTap(url) { goPage().then(res => { if (url == '/pages/goods_cate/goods_cate') { diff --git a/pages/user/index.vue b/pages/user/index.vue index a940210..dc8f453 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -180,7 +180,7 @@ } from '@/utils/setTheme.js' import animationType from '@/utils/animationType.js' const app = getApp(); - + export default { computed: mapGetters(['isLogin', 'chatUrl', 'uid']), data() { @@ -274,7 +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(); @@ -318,7 +318,7 @@ // #endif }, methods: { - + // 查询是否进行过身份保存 getidentityq:function(){ let data = { @@ -476,7 +476,7 @@ }) }, /** - * + * * 获取个人中心图标 */ getMyMenus: function() { @@ -564,7 +564,7 @@ padding: 10rpx; box-sizing: border-box; border-radius: 20rpx; - font-size: 12px; + font-size: 12px; color: #fff; position: absolute; top: -10rpx; @@ -712,7 +712,7 @@ .num { font-size: 42rpx; font-weight: bold; - + } .txt { @@ -914,4 +914,4 @@ padding: 0 36rpx; border-radius: 20rpx; } - \ No newline at end of file + diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index 6220366..01043a9 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -1110,7 +1110,7 @@ uid: this.$store.getters.uid } getidentity(data).then(res=>{ - if (res.message == '操作成功') { + if (res.message == '操作成功' && res.data != '') { this.sfxx = '已完成' this.identification = res.data }