feat:小程序兼容版本调整
This commit is contained in:
@@ -2,6 +2,7 @@
|
|||||||
<view class="input-area-wrapper">
|
<view class="input-area-wrapper">
|
||||||
<view v-if="!visibleWaveBtn" class="area-input">
|
<view v-if="!visibleWaveBtn" class="area-input">
|
||||||
<!-- 语音/键盘切换 -->
|
<!-- 语音/键盘切换 -->
|
||||||
|
<!-- #ifdef MP-WEIXIN -->
|
||||||
<view class="input-container-voice" @click="toggleVoiceMode">
|
<view class="input-container-voice" @click="toggleVoiceMode">
|
||||||
<image
|
<image
|
||||||
class="voice-icon"
|
class="voice-icon"
|
||||||
@@ -14,6 +15,7 @@
|
|||||||
src="https://oss.nianxx.cn/mp/static/version_101/home/input_keyboard_icon.png"
|
src="https://oss.nianxx.cn/mp/static/version_101/home/input_keyboard_icon.png"
|
||||||
/>
|
/>
|
||||||
</view>
|
</view>
|
||||||
|
<!-- #endif -->
|
||||||
|
|
||||||
<!-- 输入框/语音按钮容器 -->
|
<!-- 输入框/语音按钮容器 -->
|
||||||
<view class="input-button-container">
|
<view class="input-button-container">
|
||||||
@@ -77,8 +79,10 @@ import { ref, computed, watch, nextTick, onMounted, defineExpose } from "vue";
|
|||||||
import RecordingWaveBtn from "@/components/Speech/RecordingWaveBtn.vue";
|
import RecordingWaveBtn from "@/components/Speech/RecordingWaveBtn.vue";
|
||||||
import { getCurrentConfig } from "@/constant/base";
|
import { getCurrentConfig } from "@/constant/base";
|
||||||
|
|
||||||
|
// #ifdef MP-WEIXIN
|
||||||
const plugin = requirePlugin("WechatSI");
|
const plugin = requirePlugin("WechatSI");
|
||||||
const manager = plugin.getRecordRecognitionManager();
|
const manager = plugin.getRecordRecognitionManager();
|
||||||
|
// #endif
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
modelValue: String,
|
modelValue: String,
|
||||||
|
|||||||
@@ -22,6 +22,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.input-button-container {
|
.input-button-container {
|
||||||
|
// #ifdef MP-TOUTIAO
|
||||||
|
margin-left: 12px;
|
||||||
|
// #endif
|
||||||
flex: 1;
|
flex: 1;
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,7 +47,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<ChatCardOther class="flex flex-justify-center" :text="item.msg">
|
<ChatCardOther :text="item.msg">
|
||||||
<ActivityListComponent v-if="
|
<ActivityListComponent v-if="
|
||||||
mainPageDataModel.activityList &&
|
mainPageDataModel.activityList &&
|
||||||
mainPageDataModel.activityList.length > 0
|
mainPageDataModel.activityList.length > 0
|
||||||
|
|||||||
@@ -21,7 +21,12 @@ import { checkToken } from "@/hooks/useGoLogin";
|
|||||||
const itemList = ref([
|
const itemList = ref([
|
||||||
{
|
{
|
||||||
icon: "",
|
icon: "",
|
||||||
|
// #ifdef MP-TOUTIAO
|
||||||
|
title: "商品列表",
|
||||||
|
// #endif
|
||||||
|
// #ifdef MP-WEIXIN
|
||||||
title: "快速预定",
|
title: "快速预定",
|
||||||
|
// #endif
|
||||||
type: Command.quickBooking,
|
type: Command.quickBooking,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -29,6 +34,7 @@ const itemList = ref([
|
|||||||
title: "探索发现",
|
title: "探索发现",
|
||||||
type: Command.discovery,
|
type: Command.discovery,
|
||||||
},
|
},
|
||||||
|
// #ifdef MP-WEIXIN
|
||||||
{
|
{
|
||||||
icon: "",
|
icon: "",
|
||||||
title: "呼叫服务",
|
title: "呼叫服务",
|
||||||
@@ -39,6 +45,7 @@ const itemList = ref([
|
|||||||
title: "更多",
|
title: "更多",
|
||||||
type: Command.more,
|
type: Command.more,
|
||||||
},
|
},
|
||||||
|
// #endif
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const sendReply = (item) => {
|
const sendReply = (item) => {
|
||||||
|
|||||||
@@ -39,7 +39,12 @@ const popup = ref(null);
|
|||||||
const list = ref([
|
const list = ref([
|
||||||
{
|
{
|
||||||
icon: "https://oss.nianxx.cn/mp/static/version_101/home/ksyd.png",
|
icon: "https://oss.nianxx.cn/mp/static/version_101/home/ksyd.png",
|
||||||
|
// #ifdef MP-TOUTIAO
|
||||||
|
title: "商品列表",
|
||||||
|
// #endif
|
||||||
|
// #ifdef MP-WEIXIN
|
||||||
title: "快速预定",
|
title: "快速预定",
|
||||||
|
// #endif
|
||||||
content: "预定门票、房间、餐食",
|
content: "预定门票、房间、餐食",
|
||||||
btnText: "去预定",
|
btnText: "去预定",
|
||||||
type: Command.quickBooking,
|
type: Command.quickBooking,
|
||||||
|
|||||||
@@ -2,19 +2,12 @@
|
|||||||
<view class="container">
|
<view class="container">
|
||||||
<ModuleTitle :title="recommendTheme.themeName" />
|
<ModuleTitle :title="recommendTheme.themeName" />
|
||||||
|
|
||||||
<view class="container-scroll font-size-0 scroll-x whitespace-nowrap">
|
<view class="container-scroll font-size-0 scroll-x">
|
||||||
<view
|
<view class="whitespace-nowrap">
|
||||||
class="card-item bg-white inline-block rounded-20 mr-8"
|
<view class="card-item bg-white inline-block rounded-20 mr-8"
|
||||||
v-for="(item, index) in recommendTheme.recommendPostsList"
|
v-for="(item, index) in recommendTheme.recommendPostsList" :key="index" @click="sendReply(item)">
|
||||||
:key="index"
|
|
||||||
@click="sendReply(item)"
|
|
||||||
>
|
|
||||||
<view class="m-4 relative">
|
<view class="m-4 relative">
|
||||||
<image
|
<image class="card-img rounded-16 relative z-10" :src="item.coverPhoto" mode="aspectFill" />
|
||||||
class="card-img rounded-16 relative z-10"
|
|
||||||
:src="item.coverPhoto"
|
|
||||||
mode="aspectFill"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<view class="shadow absolute rounded-16"></view>
|
<view class="shadow absolute rounded-16"></view>
|
||||||
</view>
|
</view>
|
||||||
@@ -30,6 +23,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
|
|||||||
@@ -28,12 +28,19 @@
|
|||||||
<!-- 按钮区域 -->
|
<!-- 按钮区域 -->
|
||||||
<view class="login-btn-area">
|
<view class="login-btn-area">
|
||||||
<!-- 同意隐私协议并获取手机号按钮 -->
|
<!-- 同意隐私协议并获取手机号按钮 -->
|
||||||
<button v-if="needWxAuthLogin" class="login-btn" type="primary" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
|
<!-- #ifdef MP-WEIXIN -->
|
||||||
|
<button v-if="needWxAuthLogin" class="login-btn" type="primary" open-type="getPhoneNumber"
|
||||||
|
@getphonenumber="getPhoneNumber">
|
||||||
手机号快捷登录
|
手机号快捷登录
|
||||||
</button>
|
</button>
|
||||||
<button v-else class="login-btn" type="primary" @click="handleAgreeAndGetPhone">
|
<button v-else class="login-btn" type="primary" @click="handleAgreeAndGetPhone">
|
||||||
手机号快捷登录
|
手机号快捷登录
|
||||||
</button>
|
</button>
|
||||||
|
<!-- #endif -->
|
||||||
|
<!-- #ifdef MP-TOUTIAO -->
|
||||||
|
<button class="login-btn" type="primary" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumberHandler"
|
||||||
|
bindtap="bindPhone">登录</button>
|
||||||
|
<!-- #endif -->
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<AgreePopup ref="agreePopup" :visible="visible" :agreement="computedAgreement" @close="visible = false" />
|
<AgreePopup ref="agreePopup" :visible="visible" :agreement="computedAgreement" @close="visible = false" />
|
||||||
@@ -99,6 +106,46 @@ const getPhoneNumber = (e) => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const getPhoneNumberHandler = (e) => {
|
||||||
|
console.log(e.detail.errMsg);
|
||||||
|
console.log(e.detail.iv);
|
||||||
|
console.log(e.detail.encryptedData);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 抖音登录获取code
|
||||||
|
const codeDy = ref(null)
|
||||||
|
const loginDy = () => {
|
||||||
|
let that = this;
|
||||||
|
tt.login({
|
||||||
|
force: true,
|
||||||
|
success(res) {
|
||||||
|
const { code, errMsg, anonymousCode, isLogin } = res;
|
||||||
|
codeDy.value = code;
|
||||||
|
// console.log(`tt-login success`, errMsg);
|
||||||
|
console.log(`code(临时登录凭证, 有效期 3 分钟) : `, code);
|
||||||
|
// console.log(`anonymousCode(用于标识当前设备, 无论登录与否都会返回, 有效期 3 分钟) : `, anonymousCode);
|
||||||
|
// console.log(`isLogin(判断在当前 APP(头条、抖音等)是否处于登录状态) : `, isLogin);
|
||||||
|
// that.setData({
|
||||||
|
// hasLogin: true
|
||||||
|
// });
|
||||||
|
// tt.showToast({
|
||||||
|
// title: "登录成功"
|
||||||
|
// })
|
||||||
|
},
|
||||||
|
fail(err) {
|
||||||
|
// tt.showModal({
|
||||||
|
// title: '登录失败',
|
||||||
|
// content: JSON.stringify(err),
|
||||||
|
// showCancel: false
|
||||||
|
// });
|
||||||
|
console.log(`tt-login failed`, err.errMsg);
|
||||||
|
},
|
||||||
|
complete(res) {
|
||||||
|
console.log(`tt-login completed`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/// 登录成功返回上一页
|
/// 登录成功返回上一页
|
||||||
const loginSuccess = () => {
|
const loginSuccess = () => {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
@@ -141,6 +188,7 @@ getPrivacyAgreementData();
|
|||||||
|
|
||||||
// 页面显示时刷新token
|
// 页面显示时刷新token
|
||||||
onShow(async () => {
|
onShow(async () => {
|
||||||
|
loginDy();
|
||||||
const res = await refreshToken();
|
const res = await refreshToken();
|
||||||
needWxAuthLogin.value = res;
|
needWxAuthLogin.value = res;
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user