diff --git a/jiuyi2/api/mine.js b/jiuyi2/api/mine.js index 0551f6fd..5f116f73 100644 --- a/jiuyi2/api/mine.js +++ b/jiuyi2/api/mine.js @@ -36,7 +36,20 @@ const mine = { url: `/user/adolescent/open`, data: param.data, method: 'GET', - load: 1, + load: true, + }) + }, + + /** + * 青少年模式解锁 + * @param {Object} param + */ + adolescentClose(param) { + return util.request({ + url: `/user/adolescent`, + path: param.path, + method: 'GET', + load: true, }) }, @@ -53,7 +66,7 @@ const mine = { }, /** - * 验证盖章后是否实名 + * 验证实名信息是否填写 * @param {Object} param */ isCertification(param) { diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js index 9f562d7c..0080a4de 100644 --- a/jiuyi2/common/js/config.js +++ b/jiuyi2/common/js/config.js @@ -6,8 +6,9 @@ const config = { // #endif // #ifndef H5 // host: 'http://91f.xyz:8080', - // host: 'http://192.168.31.61:8080', - host: 'http://192.168.31.41:8080', + // host: 'http://192.168.0.110:8080', + // host: 'http://192.168.0.105:8080', + host: 'http://192.168.0.102:8080', // #endif // 支付方式配置 payType: { diff --git a/jiuyi2/components/footerMenu/footerMenu.vue b/jiuyi2/components/footerMenu/footerMenu.vue index 7e3cc651..72271944 100644 --- a/jiuyi2/components/footerMenu/footerMenu.vue +++ b/jiuyi2/components/footerMenu/footerMenu.vue @@ -110,13 +110,13 @@ }) } // 1是商家 - if(userinfo.value.isShop == 1) { - result.push({ - name: '发布商品', - img: '/static/footerMenu1.png', - url: '/pages/release/commodity', - }) - } + // if(userinfo.value.isShop == 1) { + // result.push({ + // name: '发布商品', + // img: '/static/footerMenu1.png', + // url: '/pages/release/commodity', + // }) + // } // 追加 // result.push({ // name: '打车', diff --git a/jiuyi2/pages/login/lock.vue b/jiuyi2/pages/login/lock.vue index 6a8f2e76..250f14de 100644 --- a/jiuyi2/pages/login/lock.vue +++ b/jiuyi2/pages/login/lock.vue @@ -38,31 +38,14 @@ // md5加密 data.userPassword = CryptoJS.MD5(data.userPassword).toString(); - api.mine.checkSecondLevelCipher({ - data, - }).then(rs => { - if (rs.code === 200) { - // 更新用户信息解除青少年模式 - unLockTeenMode() - return - } - util.alert({ - content: rs.msg, - showCancel: false, - }) - }) - } - - // 解除青少年模式 - function unLockTeenMode() { - api.mine.updateUserInfo({ - data: { - userId: userinfo.value.userId, - teen - } + // 解除青少年模式 + api.mine.adolescentClose({ + path: [data.userPassword], }).then(rs => { if (rs.code == 200) { - // uni.navigateBack() + uni.switchTab({ + url: '/pages/index/index' + }) return } util.alert({ @@ -77,10 +60,10 @@ 输入登录密码解锁未成年模式 - 当前账号: {{userinfo.userPhone}} + 当前账号: {{userinfo.phoneNumber}} - + 解锁 diff --git a/jiuyi2/pages/shop/store/commodities.vue b/jiuyi2/pages/shop/store/commodities.vue index 34f8db81..6cedf741 100644 --- a/jiuyi2/pages/shop/store/commodities.vue +++ b/jiuyi2/pages/shop/store/commodities.vue @@ -74,13 +74,23 @@ }) }) } + + /** + * 跳转 + * @param {Object} url 路径 + */ + function link(url) { + uni.navigateTo({ + url + }) + }