Commit bd491b51 authored by 王炽's avatar 王炽

666666

parent ac921b9e
...@@ -141,7 +141,7 @@ const handleAuthPhoneClick = () => { ...@@ -141,7 +141,7 @@ const handleAuthPhoneClick = () => {
// 检查任务结果并更新全局状态 // 检查任务结果并更新全局状态
const checkAndUpdateTaskResult = async () => { const checkAndUpdateTaskResult = async () => {
const integralStore = useIntegralStore(); const integralStore = useIntegralStore();
await integralStore.queryTodoResult(); await integralStore.queryTodoResultServer();
console.log('queryTodoResult:', integralStore.queryTodoResult); console.log('queryTodoResult:', integralStore.queryTodoResult);
if(integralStore.queryTodoResult?.length > 0) { if(integralStore.queryTodoResult?.length > 0) {
...@@ -157,6 +157,7 @@ onMounted(async () => { ...@@ -157,6 +157,7 @@ onMounted(async () => {
//关闭了任务奖励弹窗 //关闭了任务奖励弹窗
const handleCloseTaskCompleteTips = async () => { const handleCloseTaskCompleteTips = async () => {
console.log('点击了任务奖励弹窗的关闭按钮/好的按钮');
await checkAndUpdateTaskResult(); await checkAndUpdateTaskResult();
} }
...@@ -267,7 +268,7 @@ const handleCloseTaskComplete = () => { ...@@ -267,7 +268,7 @@ const handleCloseTaskComplete = () => {
}; };
const handleAcceptTaskComplete = () => {//当前未用到 const handleAcceptTaskComplete = () => {//当前未用到
console.log('接受任务完成奖励'); // console.log('接受任务完成奖励');
// globalStore.isShowTaskComplete = false; // globalStore.isShowTaskComplete = false;
// 这里可以添加接受奖励后的逻辑 // 这里可以添加接受奖励后的逻辑
}; };
...@@ -277,6 +278,8 @@ const handleCloseTaskPop = () => { ...@@ -277,6 +278,8 @@ const handleCloseTaskPop = () => {
globalStore.closeTaskPop(); globalStore.closeTaskPop();
}; };
//去完成按钮,完成任务
const handleTaskClick = async (data) => { const handleTaskClick = async (data) => {
console.log('任务点击:', data); console.log('任务点击:', data);
...@@ -309,14 +312,28 @@ const handleTaskClick = async (data) => { ...@@ -309,14 +312,28 @@ const handleTaskClick = async (data) => {
url: extra1.url url: extra1.url
}); });
break; break;
case 'EXCHANGE_GOODS'://完成首单优选消费 case '"FirstOrder"'://完成首单优选消费
const extra2 = JSON.parse(data?.task?.taskTodoExtra?.extra); const extra2 = JSON.parse(data?.task?.taskTodoExtra?.extra);
console.log('extra66666:', extra2); console.log('extra666661111:', extra2);
jump({ jump({
type: JumpType.H5, type: JumpType.MINI,
url: extra2.url url: 'subPackages/xmhMainProcess/member/index?entrySource=xmh_wechatmp_points_recgoodsbot',
extra: {envVersion: "release", appId: "wx4205ec55b793245e"}
}); });
break; break;
case 'EXCHANGE_GOODS'://消费商品
const extra3 = JSON.parse(data?.task?.taskTodoExtra?.extra);
if(extra3.length > 0) {
let url = 'subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_north';
url = url.replace('{productId}', extra3[0].itemId).replace('{skuId}', extra3[0].skuId);
jump({
type: JumpType.MINI,
url: url,
extra: {envVersion: "release", appId: "wx4205ec55b793245e",embedded: true}
})
}
break;
case 'FollowWx'://关注公众号 case 'FollowWx'://关注公众号
globalStore.closeTaskPop(); // 先关闭TaskPop globalStore.closeTaskPop(); // 先关闭TaskPop
setTimeout(() => { setTimeout(() => {
......
...@@ -77,7 +77,7 @@ export const useIntegralStore = defineStore("integral", { ...@@ -77,7 +77,7 @@ export const useIntegralStore = defineStore("integral", {
return res; return res;
// } // }
}, },
async queryTodoResult(isdebug = false) { async queryTodoResultServer(isdebug = false) {
if(isdebug) { if(isdebug) {
this._queryTodoResult = queryTodoResultMock; this._queryTodoResult = queryTodoResultMock;
return queryTodoResultMock; return queryTodoResultMock;
......
...@@ -2305,6 +2305,8 @@ const handleGoodsItemClick = (goodsItem, googidx) => { ...@@ -2305,6 +2305,8 @@ const handleGoodsItemClick = (goodsItem, googidx) => {
}; };
console.log('goodsItem.url:', url);
extra.embedded = true; //半屏拉起小程序 extra.embedded = true; //半屏拉起小程序
jump({ jump({
...@@ -2666,6 +2668,8 @@ const handleGoodsItemClick = (goodsItem, googidx) => { ...@@ -2666,6 +2668,8 @@ const handleGoodsItemClick = (goodsItem, googidx) => {
vipCardMd(vipLevel.value, false); vipCardMd(vipLevel.value, false);
const item = vipIntegral.value.vipCardInfo; const item = vipIntegral.value.vipCardInfo;
console.log('item66666777777:', item);
if (item.url == "") { if (item.url == "") {
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment