diff --git a/.gitignore b/.gitignore index b6376e3..25d626d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /xiaochengxu/unpackage /xiaochengxu/unpackage /xiaochengxu/unpackage/dist +/xiaochengxu/unpackage +/xiaochengxu/unpackage diff --git a/Laravel/app/Http/Controllers/API/H5/LoginController.php b/Laravel/app/Http/Controllers/API/H5/LoginController.php index 881b93d..eb438ee 100644 --- a/Laravel/app/Http/Controllers/API/H5/LoginController.php +++ b/Laravel/app/Http/Controllers/API/H5/LoginController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers\API\H5; +use App\Http\Controllers\API\SmsController; use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\DB; use JWT; @@ -50,10 +51,12 @@ class LoginController if(empty($member)){ return \Yz::echoError1('未找到有效用户'); } -// $code = DB::table('codes')->where(['tel'=>$info['tel'],'code'=>$info['code'],'type'=>1,'is_del'=>0])->first(); -// if(empty($code)){ -// return \Yz::echoError1('验证码错误'); -// } + // 验证通过，处理业务逻辑 + $sms=new SmsController(); + $check=$sms->CheckCode($info['tel'],$info['code']); + if(!$check){ + return \Yz::echoError1('验证码错误！'); + } $password = password_hash($info['password'], PASSWORD_DEFAULT); $u= DB::table('members')->where(['id'=>$member->id])->update(['password'=>$password]); // DB::table('codes')->where(['id'=>$code->id])->update(['is_del'=>1]); diff --git a/Laravel/app/Http/Controllers/API/LiuYanController.php b/Laravel/app/Http/Controllers/API/LiuYanController.php new file mode 100644 index 0000000..8fa7c78 --- /dev/null +++ b/Laravel/app/Http/Controllers/API/LiuYanController.php @@ -0,0 +1,24 @@ +insert([ + 'content'=>$info['content'], + 'openid'=>$info['openid'], + + ]); + if($i){ + return \Yz::Return(true,'留言成功'); + } + return \Yz::echoError1('留言失败'); + } +} diff --git a/Laravel/routes/api.php b/Laravel/routes/api.php index 9ddaa80..e6f8f8e 100644 --- a/Laravel/routes/api.php +++ b/Laravel/routes/api.php @@ -82,6 +82,7 @@ Route::group(['middleware'=>['checktoken','log'],'prefix'=>'H5'],function () { }); Route::post('mp/wxGetOpenid','App\Http\Controllers\API\Mp\LoginController@wxGetOpenid'); +Route::post('mp/LiuYanCreate','App\Http\Controllers\API\LiuYanController@Mp_Create')->middleware('log'); diff --git a/h5/pages/resetPwd.vue b/h5/pages/resetPwd.vue index e47b664..b34dfa4 100644 --- a/h5/pages/resetPwd.vue +++ b/h5/pages/resetPwd.vue @@ -17,7 +17,9 @@ 短信验证码 - + @@ -50,7 +52,7 @@ ref } from "vue" import { - ResetPassword + ResetPassword,SmsSendCode } from "@/api" import { onLoad @@ -61,7 +63,7 @@ repassword: '' , code: '' }) - + let sending = ref(false) const handleResetPwd = (logintype='') => { if(form.value.tel=='' || form.value.password=='' || form.value.repassword=='' || form.value.code==''){ uni.showToast({ @@ -91,7 +93,32 @@ } }) } + // 发送验证码 + const sendVerifyCode = () => { + if (!form.value.tel) { + uni.showToast({ + title: '请输入手机号', + icon: 'none' + }); + return; + } + sending.value = true; + // 模拟发送验证码 + SmsSendCode({ + tel: form.value.tel + }).then(res => { + sending.value = false; + if (res.status) { + + uni.showToast({ + title: '验证码已发送', + icon: 'success' + }); + } + }) + + } const handleForget = () => { // 忘记密码逻辑 uni.navigateTo({ diff --git a/xiaochengxu/api/index.js b/xiaochengxu/api/index.js index ae1a70f..9537b74 100644 --- a/xiaochengxu/api/index.js +++ b/xiaochengxu/api/index.js @@ -16,4 +16,7 @@ import { export const Login = (data) => { return sendRequest({url: BaseUrl+"mp/wxGetOpenid",method: 'POST',data:data}); } + export const LiuYan = (data) => { + return sendRequest({url: BaseUrl+"mp/LiuYanCreate",method: 'POST',data:data}); + } \ No newline at end of file diff --git a/xiaochengxu/pages.json b/xiaochengxu/pages.json index 26ed7e9..563c098 100644 --- a/xiaochengxu/pages.json +++ b/xiaochengxu/pages.json @@ -18,8 +18,7 @@ "path" : "pages/contact", "style" : { - "navigationBarTitleText" : "", - "navigationStyle": "custom" + "navigationBarTitleText" : "" } }, { diff --git a/xiaochengxu/pages/about.vue b/xiaochengxu/pages/about.vue index c6c7743..8bf8b36 100644 --- a/xiaochengxu/pages/about.vue +++ b/xiaochengxu/pages/about.vue @@ -4,50 +4,67 @@ 关于我们 - - 秦皇岛安尔然营销策划有限公司成立于2020年，致力于为客户提供营销策划、会议服务、商务咨询、庆典服务、礼仪服务。 + + 秦皇岛安尔然营销策划有限公司成立于2020年，是一家专注于提供全方位营销解决方案的专业服务机构。我们致力于为客户提供包括但不限于营销策划、会议服务、商务咨询、庆典服务及礼仪服务。 - + + 在过去的几年里，我们成功地为众多客户提供了量身定制的营销策略和服务方案，帮助他们提升了品牌形象，扩大了市场份额。我们的专业团队由一群经验丰富、富有创意的年轻人组成，他们不仅拥有深厚的行业知识，还具备敏锐的市场洞察力。 + + + 我们坚信，通过精心策划和执行每一个项目，能够为客户创造真正的价值。无论是大型国际会议还是小型企业庆典，我们都将全力以赴，确保每一场活动都成为难忘的成功案例。 + + - - 秦皇岛安尔然营销策划有限公司 + + 秦皇岛安尔然营销策划有限公司 - 您值得信赖的合作伙伴。 \ No newline at end of file diff --git a/xiaochengxu/pages/contact.vue b/xiaochengxu/pages/contact.vue index 0de76b5..0547847 100644 --- a/xiaochengxu/pages/contact.vue +++ b/xiaochengxu/pages/contact.vue @@ -1,51 +1,107 @@