diff --git a/components/list/applyPage.vue b/components/list/applyPage.vue index 22e8a29..e3e9a81 100644 --- a/components/list/applyPage.vue +++ b/components/list/applyPage.vue @@ -72,6 +72,10 @@ export default { type: Boolean, default: false, }, + isLogin: { + type: Boolean, + default: false, + }, }, data() { @@ -162,7 +166,7 @@ export default { ], menuList: [], menuActive: 0, - isLogin: false, + // isLogin: false, loginInfo: {}, navInfo: {}, }; @@ -222,7 +226,7 @@ export default { that.isHaveOrder = 0; that.tabActive = 0; } - that.isLogin = uni.getStorageSync("apply-token") ? true : false; + // that.isLogin = uni.getStorageSync("apply-token") ? true : false; // console.log("that.isLogin", that.isLogin); that.loginInfo = uni.getStorageSync("apply-userinfo"); diff --git a/components/myMain.vue b/components/myMain.vue index 5237437..410b6fc 100644 --- a/components/myMain.vue +++ b/components/myMain.vue @@ -75,17 +75,17 @@ - - + + - + - - + + @@ -155,6 +155,11 @@ export default { if (uni.getStorageSync("poster_img")) { this.shareJobImg = uni.getStorageSync("poster_img"); } else { + if (this.active == 1) { + uni.showLoading({ + title: "生成中...", + }); + } this.getDetail().then(() => { this.init(); }); @@ -164,17 +169,19 @@ export default { }, lifetimes: { // 组件生命周期函数，在组件实例被从页面节点树移除时执行 - detached() { - // console.log("detacheddetacheddetacheddetacheddetached"); - uni.removeStorageSync("poster_img"); - }, + // detached() { + // // console.log("detacheddetacheddetacheddetacheddetached"); + // uni.removeStorageSync("poster_img"); + // }, }, watch: { shareJobImg(newValue, oldValue) { - // console.log("shareJobImg123", newValue); + console.log("shareJobImg123", newValue); if (newValue) { // console.log("shareJobImg345", newValue); - uni.hideLoading(); + setTimeout(() => { + uni.hideLoading(); + }, 500); } }, // $route: "init", @@ -232,27 +239,7 @@ export default { code: res.code, agencyName: res.agencyName, }); - // #endif - // #ifdef H5 - that.appCodeSize = uni.getSystemInfoSync().windowWidth * (122 / 375) * 2; - that.appCodeTop = (((uni.getSystemInfoSync().windowWidth - 32) * 2248) / 1372) * (290 / 562) + "px"; - - that.appLogoSize = uni.getSystemInfoSync().windowWidth * (68 / 375) * 2; - that.appLogoTop = (((uni.getSystemInfoSync().windowWidth - 32) * 2248) / 1372) * (36 / 562) - uni.getSystemInfoSync().windowWidth * 0.046 + "px"; - that.appLogoLeft = (uni.getSystemInfoSync().windowWidth - 74) * (24 / 303) + uni.getSystemInfoSync().windowWidth * 0.00065 + "px"; - uni.hideLoading(); - that.allowClick = true; - that.$emit("exportCode", { - code: res.code, - agencyName: res.agencyName, - }); - // #endif - - // #ifdef APP-PLUS || MP-KUAISHOU - uni.hideLoading(); - that.allowClick = true; - that.getAppCanvas("https://bocai-cms.oss-cn-beijing.aliyuncs.com/web-resource/dailibaoming/canvasBg.png"); - // console.log("canvasRes12"); + console.log("canvasRes12"); // #endif } ); diff --git a/pages.json b/pages.json index a5441b9..3c333e0 100644 --- a/pages.json +++ b/pages.json @@ -509,12 +509,12 @@ "navigationBarTitleText": "通过粉丝验证" } }, - { - "path": "myMain", - "style": { - "navigationBarTitleText": "我的名片" - } - }, + // { + // "path": "myMain", + // "style": { + // "navigationBarTitleText": "我的名片" + // } + // }, { "path": "more", "style": { diff --git a/pages/home/index.vue b/pages/home/index.vue index 5b96910..feb09a9 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -171,9 +171,6 @@ export default { that.computeCode = 1; }, 100); } else { - uni.$on("updateJobList", () => { - that.updateJobInfo(); - }); // if (uni.getStorageSync("SHOW_INVITE_ALL")) { // if (uni.getStorageSync("SHOW_INVITE_ALL") == 1 && uni.getStorageSync("SHOW_INVITE") == 1) { // that.getInviteList(); @@ -182,6 +179,9 @@ export default { // console.log('uni.getStorageSync("apply-supplierAccount")', uni.getStorageSync("apply-supplierAccount")); that.updateJobInfo(); } + uni.$on("updateJobList", () => { + that.updateJobInfo(); + }); // #ifdef MP-WEIXIN // this.searchAnimate(); // #endif @@ -251,7 +251,7 @@ export default { list: [], }, computeCode: -1, - isLogin: null, + isLogin: false, navInfo: {}, cdnBaseImg: this.G.store().cdnBaseImg, localBaseImg: this.G.store().localBaseImg, diff --git a/pages/workBench/index.vue b/pages/workBench/index.vue index 1795745..4cd0b3a 100644 --- a/pages/workBench/index.vue +++ b/pages/workBench/index.vue @@ -1,5 +1,5 @@ - - diff --git a/root/bind/search.vue b/root/bind/search.vue index 9cb618d..ceca74b 100644 --- a/root/bind/search.vue +++ b/root/bind/search.vue @@ -8,27 +8,7 @@
邀请代理/供应商关注我的发单号
-
-
-
- -
-
-
-
+
@@ -114,27 +94,27 @@ export default { onLoad(options) { console.log(options); this.active = options.active; + console.log('uni.getStorageSync("poster_img")', uni.getStorageSync("poster_img")); if (!uni.getStorageSync("poster_img")) { - uni.showLoading({ - title: "生成中...", - }); - } - if (this.active === 0) { - this.placeholder = "请输入发单号账号/手机号"; - uni.setNavigationBarTitle({ - title: "寻找发单号", - }); + console.log('uni.getStorageSync("poster_img")1', uni.getStorageSync("poster_img")); + // uni.showLoading({ + // title: "生成中...", + // }); } else { - this.placeholder = "请输入粉丝ID账号"; - uni.setNavigationBarTitle({ - title: "发展代理", + console.log('uni.getStorageSync("poster_img")2', uni.getStorageSync("poster_img")); + uni.showLoading({ + title: "加载中...", }); } + this.placeholder = "请输入粉丝ID账号"; + uni.setNavigationBarTitle({ + title: "发展代理", + }); uni.onAfterPageUnload(() => { console.log("onAfterPageUnload"); - setTimeout(() => { - uni.removeStorageSync("poster_img"); - }, 3000); + // setTimeout(() => { + uni.removeStorageSync("poster_img"); + // }, 3000); }); }, onShow() { diff --git a/root/detail/myMain.vue b/root/detail/myMain.vue deleted file mode 100644 index d43e94a..0000000 --- a/root/detail/myMain.vue +++ /dev/null @@ -1,330 +0,0 @@ - - - - diff --git a/root/person/loginIndex.vue b/root/person/loginIndex.vue index d15bc25..0df0210 100644 --- a/root/person/loginIndex.vue +++ b/root/person/loginIndex.vue @@ -27,7 +27,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -309,12 +309,13 @@ export default { uid: $data.user.id, }); if (!that.path) { + uni.$emit("updateJobList"); uni.switchTab({ url: "/pages/home/index", }); } else if (that.fromPageType == "detail" || that.fromPageType == "shareList") { console.log("that.currentId", that.currentId); - uni.$emit('updateJobDetail') + uni.$emit("updateJobDetail"); uni.reLaunch({ url: `${that.path}?scene=${that.currentId}`, });