Commit 73871a9c authored by tao.huang's avatar tao.huang

fix: 公共属性修改

parent 6e63601e
...@@ -2,7 +2,6 @@ import sensors, { ...@@ -2,7 +2,6 @@ import sensors, {
enableVue3MpClick, enableVue3MpClick,
} from "./js_sdk/Sensorsdata-UniPlugin-JS/index"; } from "./js_sdk/Sensorsdata-UniPlugin-JS/index";
const init = (SENSORS_URL) => { const init = (SENSORS_URL) => {
sensors.setPara({ sensors.setPara({
name: "sensors", name: "sensors",
...@@ -29,7 +28,7 @@ const login = (ext) => { ...@@ -29,7 +28,7 @@ const login = (ext) => {
console.log("login", ext); console.log("login", ext);
sensors.register({ sensors.register({
miniName: "飞鹤星妈会", miniName: "飞鹤星妈会",
...ext ...ext,
}); });
sensors.login(ext.memberid); sensors.login(ext.memberid);
}; };
...@@ -53,48 +52,47 @@ const login = (ext) => { ...@@ -53,48 +52,47 @@ const login = (ext) => {
const sensorLog = (evt) => { const sensorLog = (evt) => {
const _dataset = evt.currentTarget.dataset; const _dataset = evt.currentTarget.dataset;
const logObj = _dataset.log; const logObj = _dataset.log;
if(!logObj){ if (!logObj) {
return; return;
} }
const { xcxPage,xcxClick } = logObj; const { xcxPage, xcxClick } = logObj;
let trackObj = {}; let trackObj = {};
for (let key in logObj) { for (let key in logObj) {
trackObj[key] = logObj[key]; trackObj[key] = logObj[key];
} }
if(xcxPage && xcxPage.length > 0){ if (xcxPage && xcxPage.length > 0) {
sensors.track('xcxPage', { sensors.track("xcxPage", {
...trackObj ...trackObj,
}); });
} }
if(xcxClick && xcxClick.length > 0){ if (xcxClick && xcxClick.length > 0) {
sensors.track('xcxClick', { sensors.track("xcxClick", {
...trackObj ...trackObj,
}); });
} }
};
}
/** /**
* 主动通过配置数据触发埋点 * 主动通过配置数据触发埋点
* @param {*} evt * @param {*} evt
*/ */
const sensorLogTake = (logObj) => { const sensorLogTake = (logObj) => {
if(!logObj){ if (!logObj) {
return; return;
} }
const evt = { const evt = {
currentTarget: { currentTarget: {
dataset: { dataset: {
log: logObj log: logObj,
} },
} },
} };
sensorLog(evt); sensorLog(evt);
} };
export default { export default {
init, init,
sensors, sensors,
login, login,
sensorLog, sensorLog,
sensorLogTake sensorLogTake,
}; };
...@@ -572,7 +572,9 @@ const onSubmit = async (e) => { ...@@ -572,7 +572,9 @@ const onSubmit = async (e) => {
}); });
uni.navigateBack(); uni.navigateBack();
showLoading(); showLoading();
await Promise.all([userStore.loadBabyInfo(), userStore.loadUserInfo()]); await userStore.loadUserInfo();
await userStore.loadBabyInfo();
await userStore.loadHomeInfo();
hideLoading(); hideLoading();
} else { } else {
uni.showToast({ uni.showToast({
......
import { defineStore } from "pinia"; import { defineStore } from "pinia";
import { fetchHomeInfo } from "../api/home.js"; import { fetchHomeInfo } from "../api/home.js";
import md from "../md.js"; import md from "../md.js";
import { useUserStore } from "./user.js";
export const useHomeStore = defineStore("homeInfo", { export const useHomeStore = defineStore("homeInfo", {
state: () => { state: () => {
...@@ -39,13 +40,17 @@ export const useHomeStore = defineStore("homeInfo", { ...@@ -39,13 +40,17 @@ export const useHomeStore = defineStore("homeInfo", {
this.setHomeInfo(data); this.setHomeInfo(data);
// 通过参数传入的方式使用 $sensors // 通过参数传入的方式使用 $sensors
const userStore = useUserStore();
md.login({
miniopenid: data?.unionId, const mdData = {
memberid: data?.memberId, programLogin: this.isLogin ? "登录" : "未注册",
programLogin: "登录", miniopenid: data?.unionId,
memberType: data?.gradeName, memberType: data?.gradeName,
}); memberid: data?.memberId,
wxNickName: userStore.userInfo?.memberName,
};
md.login(mdData);
} }
}, },
}, },
......
...@@ -100,7 +100,7 @@ export const useUserStore = defineStore("userInfo", { ...@@ -100,7 +100,7 @@ export const useUserStore = defineStore("userInfo", {
console.log("userInfo", data); console.log("userInfo", data);
if (data?.memberId !== "not_login") { if (data?.memberId !== "not_login") {
this.userInfo = data; this.userInfo = data;
} }
}, },
/** /**
...@@ -132,8 +132,6 @@ export const useUserStore = defineStore("userInfo", { ...@@ -132,8 +132,6 @@ export const useUserStore = defineStore("userInfo", {
async loadHomeInfo() { async loadHomeInfo() {
const homeStore = useHomeStore(); const homeStore = useHomeStore();
await homeStore.loadHomeInfo(); await homeStore.loadHomeInfo();
}, },
/** /**
...@@ -159,7 +157,7 @@ export const useUserStore = defineStore("userInfo", { ...@@ -159,7 +157,7 @@ export const useUserStore = defineStore("userInfo", {
async wxAutoLogin() { async wxAutoLogin() {
uni.login({ uni.login({
provider: "weixin", provider: "weixin",
success: async(res) => { success: async (res) => {
console.log("wxAutoLogin", res); console.log("wxAutoLogin", res);
if (res.errMsg === "login:ok") { if (res.errMsg === "login:ok") {
await this.autoLoginByCode(res.code); await this.autoLoginByCode(res.code);
......
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