更改部分接口传参方式

This commit is contained in:
gyq
2025-07-16 09:38:30 +08:00
parent d1621e78f1
commit 4306ba1900
8 changed files with 698 additions and 690 deletions

View File

@@ -5,6 +5,9 @@ export async function init() {
//热搜词
http.request({
url: 'common/type/249',
data: {
type: 249
}
}).then(res => {
if (res.code == 0) {
uni.setStorageSync('moreSearch', res.data.value)
@@ -18,6 +21,9 @@ export async function init() {
export const commonType = (num) => {
return http.request({
url: `/common/type/${num}`,
data:{
type: num
}
})
}

View File

@@ -16,7 +16,11 @@ export const login = (data) => {
*/
export const setSendMsg = (mobile, type) => {
return http.request({
url: '/Login/sendMsg/' + mobile + '/'+type
url: '/Login/sendMsg/' + mobile + '/' + type,
data: {
phone: mobile,
event: type
}
})
}

View File

@@ -17,7 +17,10 @@ export const selectByUserId = (data) => {
export const commonType = (type) => {
return http.request({
url: `/common/type/${type}`,
method: 'GET'
method: 'GET',
data: {
type: type
}
})
}

View File

@@ -56,7 +56,10 @@ export function insertHistory(data) {
export function getJinbiBili(data) {
return http.request({
url: 'common/type/914',
data
data: {
...data,
type: 914
}
})
}

View File

@@ -9,14 +9,14 @@ export const h5Config = {
production: 'https://web.hnsiyao.cn',
test: 'https://web-api.hnsiyao.cn',
// local: 'http://192.168.1.21:8100',
local: 'http://192.168.1.43:1333',
local: 'http://192.168.1.31:8080',
}
export const AppConfig = {
production: 'https://dj-api.hnsiyao.cn',
test: 'https://web-api.hnsiyao.cn',
// local: 'http://192.168.1.21:8100',
local: 'http://192.168.1.43:1333',
local: 'http://192.168.1.31:8080',
}
export function returnShareUrl() {

View File

@@ -118,8 +118,7 @@ function commonsProcess(showLoading, httpReqCallback, isreturm) {
if (bodyData.code != 0) {
infoBox.showToast(data.message);
return;
return Promise.reject(bodyData);
}
// 加密数据

View File

@@ -3,49 +3,54 @@
<view class="bg">
<image src="../../static/default/i_bg.png" style="width: 100%; height: 100%" mode="aspectFill"></image>
</view>
<view class="wrapper u-relative" style="padding-top: 48rpx;box-sizing: border-box;">
<view class="nav" style="width: 100%;height: 96rpx;"></view>
<view class="wrapper u-relative" style="padding-top: 48rpx; box-sizing: border-box">
<view class="nav" style="width: 100%; height: 96rpx"></view>
<view class="input-content">
<view style="font-size: 58rpx;font-weight: bold;color: #333;margin-bottom: 48rpx;">注册</view>
<view style="font-size: 58rpx; font-weight: bold; color: #333; margin-bottom: 48rpx">注册</view>
<view class="cu-form-group">
<view class="title">手机号</view>
<view class="input" style="padding-left: 20rpx;">
<input class="input" type="number" :value="data.mobile" placeholder="请输入手机号" maxlength="11" data-key="mobile"
@input="inputChange" />
<view class="input" style="padding-left: 20rpx">
<input class="input" type="number" :value="data.mobile" placeholder="请输入手机号" maxlength="11" data-key="mobile" @input="inputChange" />
</view>
</view>
<view class="cu-form-group">
<text class="title">验证码</text>
<view class="input flex" style="padding-left: 20rpx;padding-right: 20rpx;">
<input type="number" :value="data.code" placeholder="请输入验证码" maxlength="6" data-key="code"
@input="inputChange" @confirm="toRegister" />
<view class="input flex" style="padding-left: 20rpx; padding-right: 20rpx">
<input type="number" :value="data.code" placeholder="请输入验证码" maxlength="6" data-key="code" @input="inputChange" @confirm="toRegister" />
<button class="send-msg" @click="sendMsg" :disabled="data.sending">{{ data.sendTime }}</button>
</view>
</view>
<view class="cu-form-group">
<text class="title">设置密码</text>
<view class="input" style="padding-left: 20rpx;">
<input class="input" type="password" :value="data.password" placeholder="请设置新密码" placeholder-class="input-empty"
maxlength="20" minlength="6" data-key="password" @input="inputChange" @confirm="toRegister" />
<view class="input" style="padding-left: 20rpx">
<input
class="input"
type="password"
:value="data.password"
placeholder="请设置新密码"
placeholder-class="input-empty"
maxlength="20"
minlength="6"
data-key="password"
@input="inputChange"
@confirm="toRegister"
/>
</view>
</view>
<button class="confirm-btn" @click="toRegister">注册</button>
<button class="confirm-btn" @click="toLogin">登录</button>
</view>
<view class="footerView">
<u-checkbox-group>
<u-checkbox v-model="data.checked" label-size='24upx' shape="circle" @change="radioChange"></u-checkbox>
<u-checkbox v-model="data.checked" label-size="24upx" shape="circle" @change="radioChange"></u-checkbox>
</u-checkbox-group>
<view>注册即同意</view>
<!-- 协议地址 -->
<view @click="linkTo('/pages/me/privacy')" style="color: #37A6FF;">隐私政策</view>
<view @click="linkTo('/pages/me/privacy')" style="color: #37a6ff">隐私政策</view>
<view @click="linkTo('/pages/me/agreement')" style="color: #37A6FF;">用户服务协议</view>
<view @click="linkTo('/pages/me/agreement')" style="color: #37a6ff">用户服务协议</view>
</view>
</view>
</view>
@@ -53,7 +58,7 @@
<script setup>
import { reactive } from 'vue';
import { onLoad} from '@dcloudio/uni-app'
import { onLoad } from '@dcloudio/uni-app';
import { setSendMsg, register } from '@/api/login/login.js';
import { commonType } from '@/api/init.js';
import { linkTo } from '@/utils/app.js';
@@ -65,70 +70,76 @@
sending: false,
sendTime: '获取验证码',
count: 60,
relation: "",
relation: '',
invitation: '',
isregisterCode: '',
qdCodeion: '', //渠道码
checked: false,
})
checked: false
});
onLoad(async (options) => {
if (uni.getStorageSync('qdCodeion')) { data.qdCodeion = uni.getStorageSync('qdCodeion') }
if (options.qdCode) { data.qdCodeion = options.qdCode }
if (options.invitation ) { data.invitation = options.invitation }
if (uni.getStorageSync('qdCodeion')) {
data.qdCodeion = uni.getStorageSync('qdCodeion');
}
if (options.qdCode) {
data.qdCodeion = options.qdCode;
}
if (options.invitation) {
data.invitation = options.invitation;
}
let res = await commonType(3)
data.isregisterCode = res.value
})
let res = await commonType(3);
data.isregisterCode = res.value;
});
/**
* 发送验证码
*/
async function sendMsg() {
try {
if (!data.mobile) {
uni.showToast({
title: '请输入手机号',
icon: 'none',
})
icon: 'none'
});
} else if (data.mobile.length !== 11) {
uni.showToast({
title: '请输入正确的手机号',
icon: 'none',
})
icon: 'none'
});
} else {
uni.showLoading({
title: '正在发送验证码...'
})
let res = await setSendMsg(data.mobile,'login')
uni.hideLoading();
uni.hideToast();
if( res ){
});
let res = await setSendMsg(data.mobile, 'login');
console.log(res);
data.sending = true;
uni.showToast({
title: '验证码发送成功请注意查收',
icon: 'none',
duration: 1000
})
});
countDown();
} else {
uni.showModal({
showCancel: false,
title: '短信发送失败',
content: '请一分钟后再获取验证码'
}
} catch (error) {
console.log(error);
uni.showToast({
title: error.message,
icon: 'none',
duration: 1000
});
}
uni.hideLoading();
}
}
/**
* 验证码倒计时
*/
function countDown() {
console.log(data.count)
console.log(data.count);
if (data.count === 1) {
data.count = 60;
data.sending = false;
@@ -155,7 +166,7 @@
* @param {Object} e
*/
function radioChange(e) {
data.checked = e
data.checked = e;
}
/**
@@ -167,102 +178,92 @@
});
}
/**
* 注册
*/
async function toRegister() {
const {
mobile,
password,
code,
checked,
invitation,
isregisterCode,
qdCodeion
} = data;
const { mobile, password, code, checked, invitation, isregisterCode, qdCodeion } = data;
if (!mobile) {
uni.showToast({
title: '请输入账号',
icon: 'none',
duration: 1000
})
return
});
return;
}
if (!code) {
uni.showToast({
title: '请输入验证码',
icon: 'none',
duration: 1000
})
return
});
return;
}
if (!password) {
uni.showToast({
title: '请设置密码',
icon: 'none',
duration: 1000
})
return
});
return;
}
if (password.length < 6) {
uni.showToast({
title: '密码位数必须大于六位',
icon: 'none',
duration: 1000
})
return
});
return;
}
if (invitation.length == 0 && isregisterCode == '是') {
uni.showToast({
title: '请输入邀请码',
icon: 'none',
duration: 1000
})
return
});
return;
}
if (!checked) {
uni.showToast({
title: '请先同意《隐私政策》和《用户协议》',
icon: 'none',
duration: 1000
})
return
});
return;
}
data.logining = true;
uni.showLoading({
title: '注册中...'
})
let platform = ''
});
let platform = '';
// #ifdef APP
platform = 'app'
platform = 'app';
// #endif
// #ifdef H5
platform = 'h5'
platform = 'h5';
// #endif
let res = await register({
password: password,
phone: mobile,
msg: code,
inviterCode: invitation,
platform: platform,
qdCode: qdCodeion,
})
qdCode: qdCodeion
});
if (res.code === 0) {
uni.setStorageSync('token', res.token)
uni.setStorageSync('userInfo', res.user)
uni.setStorageSync('token', res.token);
uni.setStorageSync('userInfo', res.user);
uni.showToast({
title: '注册成功',
icon: 'none'
})
});
setTimeout(function () {
uni.switchTab({
url: '/pages/index/index'
});
}, 1000)
}, 1000);
} else {
uni.showModal({
showCancel: false,
@@ -271,9 +272,7 @@
});
}
uni.hideLoading();
}
</script>
<style lang="scss" scoped>
@@ -306,7 +305,6 @@
font-size: 24rpx;
color: #333333;
margin-top: 50rpx;
}
.cuIcon::before {
width: 30rpx;
@@ -314,28 +312,29 @@
margin-right: 12rpx;
}
.cuIcon-round::before {
content: "\e6d7";
content: '\e6d7';
}
.cuIcon-radiobox:before {
content: "\e75b";
color: #37A6FF;
content: '\e75b';
color: #37a6ff;
}
.send-msg {
flex-shrink: 0;
line-height: initial;
font-weight: 400;
font-size: 28rpx;
color: #EC6F48;
color: #ec6f48;
border: none;
background-color: transparent;
margin: 0;
padding: 0;
white-space: nowrap;
}
.send-msg::after {
border: none;
background-color: transparent;
}
.container {
position: relative;
width: 100%;
@@ -393,9 +392,9 @@
line-height: 100rpx;
border-radius: 16rpx;
margin-top: 40rpx;
background: #EC6F48;
background: #ec6f48;
font-size: 32rpx;
color: #FFFFFF;
color: #ffffff;
&:after {
border: none;

View File

@@ -3,28 +3,35 @@
<view class="bg">
<image src="../../static/default/i_bg.png" style="width: 100%; height: 100%" mode="aspectFill"></image>
</view>
<view class="wrapper u-relative" style="padding-top: 48rpx;box-sizing: border-box;">
<view class="wrapper u-relative" style="padding-top: 48rpx; box-sizing: border-box">
<view class="input-content">
<view style="font-size: 58rpx;font-weight: bold;color: #333;margin-bottom: 48rpx;">注册</view>
<view style="font-size: 58rpx; font-weight: bold; color: #333; margin-bottom: 48rpx">注册</view>
<view class="cu-form-group">
<view class="title">手机号</view>
<input class="input" type="number" :value="mobile" placeholder="请输入手机号" maxlength="11" data-key="mobile"
@input="inputChange" />
<input class="input" type="number" :value="mobile" placeholder="请输入手机号" maxlength="11" data-key="mobile" @input="inputChange" />
</view>
<view class="cu-form-group">
<text class="title">验证码</text>
<view class="input flex">
<input type="number" :value="code" placeholder="请输入验证码" maxlength="6" data-key="code"
@input="inputChange" @confirm="toLogin" />
<input type="number" :value="code" placeholder="请输入验证码" maxlength="6" data-key="code" @input="inputChange" @confirm="toLogin" />
<button class="send-msg" @click="sendMsg" :disabled="sending">{{ sendTime }}</button>
</view>
</view>
<view class="cu-form-group">
<text class="title">设置密码</text>
<input class="input" type="password" :value="password" placeholder="请设置新密码" placeholder-class="input-empty"
maxlength="20" minlength="6" data-key="password" @input="inputChange" @confirm="toLogin" />
<input
class="input"
type="password"
:value="password"
placeholder="请设置新密码"
placeholder-class="input-empty"
maxlength="20"
minlength="6"
data-key="password"
@input="inputChange"
@confirm="toLogin"
/>
</view>
<!-- <view class="cu-form-group"
style="border: 2upx solid whitesmoke;margin-bottom: 20px;border-radius: 30px">
@@ -39,22 +46,21 @@
</view>
<view class="footerView">
<u-checkbox-group>
<u-checkbox v-model="checked" label-size='24upx' shape="circle" @change="radioChange"></u-checkbox>
<u-checkbox v-model="checked" label-size="24upx" shape="circle" @change="radioChange"></u-checkbox>
</u-checkbox-group>
<view>同意</view>
<!-- 协议地址 -->
<navigator url="/me/setting/mimi" open-type="navigate" style="color: #37A6FF;">隐私政策</navigator>
<navigator url="/me/setting/mimi" open-type="navigate" style="color: #37a6ff">隐私政策</navigator>
<navigator url="/me/setting/xieyi" open-type="navigate" style="color: #37A6FF;">用户协议</navigator>
<navigator url="/me/setting/xieyi" open-type="navigate" style="color: #37a6ff">用户协议</navigator>
</view>
</view>
</view>
</template>
<script setup>
import { reactive } from 'vue';
import { onLoad} from '@dcloudio/uni-app'
import { onLoad } from '@dcloudio/uni-app';
import http from '@/http/http.js';
let data = reactive({
code: '',
@@ -63,42 +69,45 @@
sending: false,
sendTime: '获取验证码',
count: 60,
relation: "",
relation: '',
invitation: '',
registerCode: '',
qdCodeion: '', //渠道码
checked: false,
})
checked: false
});
onLoad((options) => {
let relation = e.invitation
let relation = e.invitation;
if (relation) {
this.relation = relation;
this.invitation = relation;
}
if (e.qdCode) {
this.qdCodeion = e.qdCode
this.qdCodeion = e.qdCode;
}
http.request({
url: 'app/common/type/3',
}).then(res => {
data: {
type: 3
}
}).then((res) => {
if (res.code == 0) {
this.registerCode = res.data.value
this.registerCode = res.data.value;
}
});
})
});
/**
* 是否同意协议
* @param {Object} e
*/
function radioChange(e) {
this.checked = e
this.checked = e;
}
function showMa() {
//查询官方邀请码
this.$Request.getT('/common/type/88').then(res => {
this.$Request.getT('/common/type/88', { type: 88 }).then((res) => {
if (res.code == 0) {
this.invitation = res.data.value;
}
@@ -106,35 +115,33 @@
}
function sendMsg() {
const {
mobile
} = this;
const { mobile } = this;
if (!mobile) {
uni.showToast({
title: '请输入手机号',
icon: 'none',
duration: 1000
})
});
} else if (mobile.length !== 11) {
uni.showToast({
title: '请输入正确的手机号',
icon: 'none',
duration: 1000
})
});
} else {
uni.showLoading({
title: '正在发送验证码...'
})
});
http.request({
url:'app/Login/sendMsg/' + mobile + '/login',
}).then(res => {
url: 'app/Login/sendMsg/' + mobile + '/login'
}).then((res) => {
if (res.code === 0) {
this.sending = true;
uni.showToast({
title: '验证码发送成功请注意查收',
icon: 'none',
duration: 1000
})
});
this.countDown();
} else {
uni.showModal({
@@ -145,14 +152,11 @@
}
uni.hideLoading();
})
});
}
}
function countDown() {
const {
count
} = this;
const { count } = this;
if (count === 1) {
this.count = 60;
this.sending = false;
@@ -171,105 +175,96 @@
}
function toLogin() {
console.log("123");
console.log('123');
uni.reLaunch({
url: '/pages/login/login'
});
}
function toRegister() {
const {
mobile,
password,
code,
checked,
invitation,
registerCode,
qdCodeion
} = this;
const { mobile, password, code, checked, invitation, registerCode, qdCodeion } = this;
if (!mobile) {
uni.showToast({
title: '请输入账号',
icon: 'none',
duration: 1000
})
return
});
return;
}
if (!code) {
uni.showToast({
title: '请输入验证码',
icon: 'none',
duration: 1000
})
return
});
return;
}
if (!password) {
uni.showToast({
title: '请设置密码',
icon: 'none',
duration: 1000
})
return
});
return;
}
if (password.length < 6) {
uni.showToast({
title: '密码位数必须大于六位',
icon: 'none',
duration: 1000
})
return
});
return;
}
if (invitation.length == 0 && registerCode == '是') {
uni.showToast({
title: '请输入邀请码',
icon: 'none',
duration: 1000
})
return
});
return;
}
if (!checked) {
uni.showToast({
title: '请先同意《隐私政策》和《用户协议》',
icon: 'none',
duration: 1000
})
return
});
return;
}
this.logining = true;
uni.showLoading({
title: '注册中...'
})
let platform = ''
});
let platform = '';
// #ifdef APP
platform = 'app'
platform = 'app';
// #endif
// #ifdef H5
platform = 'h5'
platform = 'h5';
// #endif
http.request({
url: 'app/Login/registerCode?password=' + password + '&phone=' + mobile + '&msg=' + code +
'&inviterCode=' + invitation + '&platform=' + platform + '&qdCode=' + qdCodeion,
url: 'app/Login/registerCode?password=' + password + '&phone=' + mobile + '&msg=' + code + '&inviterCode=' + invitation + '&platform=' + platform + '&qdCode=' + qdCodeion,
method: 'post'
}).then(res => {
}).then((res) => {
if (res.code === 0) {
// this.$queue.remove('invitation');
uni.setStorageSync('token', res.token)
uni.setStorageSync('userId', res.user.userId)
uni.setStorageSync('phone', res.user.phone)
uni.setStorageSync('invitationCode', res.user.invitationCode)
uni.setStorageSync('token', res.token);
uni.setStorageSync('userId', res.user.userId);
uni.setStorageSync('phone', res.user.phone);
uni.setStorageSync('invitationCode', res.user.invitationCode);
//设置渠道码
if (res.user.qdCode) {
uni.setStorageSync('qdCode', res.user.qdCode)
uni.setStorageSync('qdCode', res.user.qdCode);
}
uni.showToast({
title: '注册成功',
icon: 'none'
})
});
setTimeout(function () {
uni.navigateTo({
url: '/pages/login/appEq'
})
}, 1000)
});
}, 1000);
} else {
uni.hideLoading();
uni.showModal({
@@ -321,11 +316,11 @@
margin-right: 12rpx;
}
.cuIcon-round::before {
content: "\e6d7";
content: '\e6d7';
}
.cuIcon-radiobox:before {
content: "\e75b";
color: #37A6FF;
content: '\e75b';
color: #37a6ff;
}
}
@@ -333,7 +328,7 @@
line-height: initial;
font-weight: 400;
font-size: 28rpx;
color: #EC6F48;
color: #ec6f48;
border: none;
background-color: transparent !important;
}
@@ -382,7 +377,6 @@
}
}
.confirm-btn {
width: 100%;
height: 100rpx;
@@ -390,9 +384,9 @@
line-height: 100rpx;
border-radius: 16rpx;
margin-top: 40rpx;
background: #EC6F48;
background: #ec6f48;
font-size: 32rpx;
color: #FFFFFF;
color: #ffffff;
&:after {
border: none;