发送验证码调整，首页滚动功能调整

hookehuyr
Commit 2079b4115036f958a4db04f675b4079ccf4defec 2079b411 1 parent 75c5fa7e
Showing 6 changed files with 17 additions and 21 deletions
src/pages/auth/index.vue
src/pages/bind/index.vue
src/pages/book/index.vue
src/pages/index/index.vue
src/pages/login/index.vue
src/utils/config.js
--- a/src/pages/auth/index.vue
View file @2079b41
+++ b/src/pages/auth/index.vue
View file @2079b41
 <!--
  * @Date: 2022-09-19 14:11:06
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2023-12-22 09:44:20
+ * @LastEditTime: 2023-12-22 15:07:20
  * @FilePath: /meihuaApp/src/pages/auth/index.vue
  * @Description: 文件描述
 -->
@@ -35,8 +35,8 @@ export default {
             title: '授权中',
           })
           request.post('/srv/?a=openid', {
-            // code: res.code
+            code: res.code
-            openid: '0002'
+            // openid: '0002'
             // openid: 'o5NFZ5cFQtLRy3aVHaZMLkjHFusI'
             // openid: 'o5NFZ5TpgG4FwYursGCLjcUJH2ak'
             // openid: 'o5NFZ5cqroPYwawCp8FEOxewtgnw'
--- a/src/pages/bind/index.vue
View file @2079b41
+++ b/src/pages/bind/index.vue
View file @2079b41
 <!--
  * @Date: 2022-09-19 14:11:06
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2023-12-22 11:18:47
+ * @LastEditTime: 2023-12-22 16:13:17
  * @FilePath: /meihuaApp/src/pages/bind/index.vue
  * @Description: 文件描述
 -->
@@ -132,7 +132,7 @@ const resetDisplay = () => {
 const getCode = async () => {
   if (isValidTel(tel.value)) {
-    const { code } = await sendSmsCodeAPI({ phone: tel.value });
+    const { code } = await sendSmsCodeAPI({ mobile: tel.value });
     if (code) {
       Taro.showToast({
         title: '验证码已发送',
--- a/src/pages/book/index.vue
View file @2079b41
+++ b/src/pages/book/index.vue
View file @2079b41
 <!--
  * @Date: 2022-09-19 14:11:06
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2023-12-21 14:52:06
+ * @LastEditTime: 2023-12-22 13:29:20
  * @FilePath: /meihuaApp/src/pages/book/index.vue
  * @Description: 订房页面
 -->
@@ -12,10 +12,10 @@
         <calendar-select @on-dates-change="onDatesChange"></calendar-select>
       </view>
       <view class="book-type">
-        <nut-tabs v-model="value" @click="onTabClick" title-scroll title-gutter="10" name="tabName" background="#FFF" color="#4C2E08" animated-time="0">
+        <!-- <nut-tabs v-model="value" @click="onTabClick" title-scroll title-gutter="10" name="tabName" background="#FFF" color="#4C2E08" animated-time="0">
           <nut-tab-pane v-for="item in tabList" :title="item.title" :pane-key="item.key">
           </nut-tab-pane>
-        </nut-tabs>
+        </nut-tabs> -->
         <view v-if="showContent" class="book-list">
           <scroll-view ref="refScrollView" :style="scrollStyle" :scroll-y="true" :scroll-with-animation="true" @scrolltolower="onScrollToLower">
             <view v-for="(item, index) in bookList" :key="index">
@@ -119,7 +119,7 @@ export default {
     this.$nextTick(async () => {
       const navHeight = await $('#navbar-page').height();
       const calHeight = await $('#book-cal').height();
-      this.indexCoverHeight = windowHeight - navHeight - calHeight - 50;
+      this.indexCoverHeight = windowHeight - navHeight - calHeight;
       if (this.$refs.refScrollView) {
         Taro.hideLoading();
         console.warn('加载完成');
--- a/src/pages/index/index.vue
View file @2079b41
+++ b/src/pages/index/index.vue
View file @2079b41
 <!--
  * @Date: 2022-09-19 14:11:06
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2023-12-22 10:16:02
+ * @LastEditTime: 2023-12-22 15:31:12
  * @FilePath: /meihuaApp/src/pages/index/index.vue
  * @Description: 首页
 -->
@@ -184,11 +184,7 @@ export default {
         // }
       // }
     },
-    async onArrowDown () {
+    onArrowDown () {
-      Taro.pageScrollTo({
-        scrollTop: this.indexCoverHeight, // 滚动到的位置
-        duration: 300 // 滚动动画的时长
-      });
       this.scrollTop = this.indexCoverHeight; // 调整滚动控件高度
     }
   },
--- a/src/pages/login/index.vue
View file @2079b41
+++ b/src/pages/login/index.vue
View file @2079b41
 <!--
  * @Date: 2022-09-19 14:11:06
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2023-12-22 11:16:07
+ * @LastEditTime: 2023-12-22 16:11:24
  * @FilePath: /meihuaApp/src/pages/login/index.vue
  * @Description: 文件描述
 -->
@@ -114,8 +114,8 @@ const login = async () => {
     return;
   } else {
     // TODO: 等待正式接口环境调整
-    // const { code, data } = await bindPhoneAPI({ phone: tel.value, sms_code: code.value });
+    const { code, data } = await bindPhoneAPI({ phone: tel.value, sms_code: code.value });
-    const { code } = await bindPhoneAPI({ phone: tel.value, sms_code: 'debug_sms_code_1805' });
+    // const { code } = await bindPhoneAPI({ phone: tel.value, sms_code: 'debug_sms_code_1805' });
     if (code) {
       Taro.showToast({
         title: '登录成功',
@@ -156,7 +156,7 @@ const resetDisplay = () => {
 const getCode = async () => {
   if (isValidTel(tel.value)) {
-    const { code } = await sendSmsCodeAPI({ phone: tel.value });
+    const { code } = await sendSmsCodeAPI({ mobile: tel.value });
     if (code) {
       Taro.showToast({
         title: '验证码已发送',
--- a/src/utils/config.js
View file @2079b41
+++ b/src/utils/config.js
View file @2079b41
 /*
  * @Date: 2022-09-19 14:11:06
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2023-12-21 17:16:34
+ * @LastEditTime: 2023-12-22 15:05:08
  * @FilePath: /meihuaApp/src/utils/config.js
  * @Description: 文件描述
  */
 // TAG：服务器环境配置
-const BASE_URL = "http://oa-dev.onwall.cn"; // 测试服务器
+const BASE_URL = "https://oa-dev.onwall.cn"; // 测试服务器
 // const BASE_URL = "https://oa.onwall.cn"; // 正式服务器
 export default BASE_URL