cyl/master-0804
wangxia 4 months ago
parent 40c8881f86
commit 551ee1c19e

@ -98,10 +98,10 @@
</div> </div>
</div> </div>
</scroll-view> </scroll-view>
<div hover-class="none" style="position: fixed; right: 20px; bottom: 20px; z-index: 0" hover-stop-propagation="false" @click="toRecord" v-if="isLogin"> <div hover-class="none" style="position: fixed; right: 20px; bottom: 20px; z-index: 0" hover-stop-propagation="false" @click="toRecord" v-if="isLogin && userInfo.agencyId">
<g-panel-image :url="cdnBaseImg + 'quick_application0610.svg'" size="96" /> <g-panel-image :url="cdnBaseImg + 'quick_application0610.svg'" size="96" />
</div> </div>
<g-filter :show.sync="whichOneShow" @hideDrawer="(e)=>whichOneShow = e" ref="filterChild" top="43px" :getFilterDataNew="getFilterData" @filterObj="receiveFromChild"></g-filter> <g-filter :show.sync="whichOneShow" @hideDrawer="(e) => (whichOneShow = e)" ref="filterChild" top="43px" :getFilterDataNew="getFilterData" @filterObj="receiveFromChild"></g-filter>
<u-popup v-model="showPop" mode="bottom" uZindex="9999" border-radius="12" :closeable="true" :mask-close-able="true"> <u-popup v-model="showPop" mode="bottom" uZindex="9999" border-radius="12" :closeable="true" :mask-close-able="true">
<div class="g_fs_18 g_text_c g_pt_32"> <div class="g_fs_18 g_text_c g_pt_32">
@ -215,7 +215,9 @@ export default {
return { return {
scrollTo: "", scrollTo: "",
selectedCity: "全国", selectedCity: "全国",
whichOneShow:'', agencyInfo: uni.getStorageSync("agencyInfo"),
userInfo: uni.getStorageSync("apply-userinfo"),
whichOneShow: "",
toTop: false, // toTop: false, //
getFilterData: { getFilterData: {
sex: "-1", sex: "-1",

@ -65,7 +65,7 @@
@clickItem="goPage('/root/bind/order?active=0')" @clickItem="goPage('/root/bind/order?active=0')"
/> />
</view> </view>
<view class="g_mt_10"> <view class="g_mt_10" v-if="userInfo.agencyId">
<g-panel-card-num :list="billDataList" titleNav="/root/person/applyIndex" :border="true" :speed="1" :marginBottom="16" cusType="num" :height="26" :num="5" cusTitle="报名工单(我报的)" @clickItem="goOrder" /> <g-panel-card-num :list="billDataList" titleNav="/root/person/applyIndex" :border="true" :speed="1" :marginBottom="16" cusType="num" :height="26" :num="5" cusTitle="报名工单(我报的)" @clickItem="goOrder" />
<!-- <g-panel-card-num :list="todayDataList" <!-- <g-panel-card-num :list="todayDataList"
titleNav="/root/person/todayData" titleNav="/root/person/todayData"

@ -2,7 +2,7 @@
<view class="p-root-bind-my-main g_flex_column_center flex_center g_w_all g_h_all g_bg_f_5 g_kuaishou" :style="{ 'background-image': showBg ? 'url(' + cdnBaseImg + 'share_bg.svg)' : '' }" :class="showBg ? 'g_pt_32' : ''"> <view class="p-root-bind-my-main g_flex_column_center flex_center g_w_all g_h_all g_bg_f_5 g_kuaishou" :style="{ 'background-image': showBg ? 'url(' + cdnBaseImg + 'share_bg.svg)' : '' }" :class="showBg ? 'g_pt_32' : ''">
<view class="g_flex_row_center g_fs_22 g_c_3 g_fw_600 g_mb_24" v-if="showBg"></view> <view class="g_flex_row_center g_fs_22 g_c_3 g_fw_600 g_mb_24" v-if="showBg"></view>
<!-- #ifdef APP-PLUS || MP-WEIXIN --> <!-- #ifdef APP-PLUS || MP-WEIXIN -->
<image :src="shareJobImg" show-menu-by-longpress style="width: 343px; height: 555px; margin: 0 auto; display: block" mode=""></image> <image :src="shareJobImg" show-menu-by-longpress style="width: 343px; height: 635px; margin: 0 auto; display: block" mode=""></image>
<view class="g_text_c g_fs_16 g_mt_12 g_mb_12 g_fw_600">长按图片转发给微信好友</view> <view class="g_text_c g_fs_16 g_mt_12 g_mb_12 g_fw_600">长按图片转发给微信好友</view>
<!-- #endif --> <!-- #endif -->
<!-- #ifdef APP-PLUS --> <!-- #ifdef APP-PLUS -->
@ -348,7 +348,7 @@ export default {
success(res) { success(res) {
console.log("res111", res); console.log("res111", res);
canvas.width = res.width; canvas.width = res.width;
canvas.height = res.height; canvas.height = res.height + 250;
mycenter = canvas.width; mycenter = canvas.width;
myheight = canvas.height; myheight = canvas.height;
const img = canvas.createImage(); const img = canvas.createImage();
@ -356,11 +356,11 @@ export default {
console.log("img111", img); console.log("img111", img);
img.onload = (info) => { img.onload = (info) => {
// //
that.G.roundRect1(ctx, 0, 0, canvas.width, canvas.height, 0, baseColor); that.G.roundRect1(ctx, 0, 0, canvas.width, canvas.height + 250, 0, baseColor);
// //
that.G.roundRect1(ctx, (mycenter - canvas.width + 120) / 2, 280, canvas.width - 120, canvas.height - 360, 180, "#fff"); that.G.roundRect1(ctx, (mycenter - canvas.width + 120) / 2, 280, canvas.width - 120, canvas.height - 360, 180, "#fff");
// //
that.G.roundRect1(ctx, (mycenter - 800) / 2, canvas.height - 300, 800, 136, 135, baseColor); that.G.roundRect1(ctx, (mycenter - 800) / 2, canvas.height - 600, 800, 136, 135, baseColor);
let qrTop = 1195; let qrTop = 1195;
// //
that.G.roundRect1(ctx, (mycenter - 600) / 2 - 5, qrTop, 136, 136, 80, baseColor); that.G.roundRect1(ctx, (mycenter - 600) / 2 - 5, qrTop, 136, 136, 80, baseColor);
@ -370,7 +370,11 @@ export default {
that.G.roundRect1(ctx, (mycenter - 600) / 2 - 5, qrTop + 475, 136, 136, 80, baseColor); that.G.roundRect1(ctx, (mycenter - 600) / 2 - 5, qrTop + 475, 136, 136, 80, baseColor);
// //
that.G.roundRect1(ctx, (mycenter - 600) / 2 + 470, qrTop + 475, 136, 136, 80, baseColor); that.G.roundRect1(ctx, (mycenter - 600) / 2 + 470, qrTop + 475, 136, 136, 80, baseColor);
that.G.fillTextLineBreak(ctx, "扫一扫关注我的发单号", (mycenter - "扫一扫关注我的发单号".length * 54) / 2 + 40, canvas.height - 215, "扫一扫关注我的发单号".length * 54, 58, "#333", 54, 600); // //
that.G.fillTextLineBreak(ctx, "扫一扫关注我的发单号", (mycenter - "扫一扫关注我的发单号".length * 54) / 2 + 40, canvas.height - 515, "扫一扫关注我的发单号".length * 54, 58, "#333", 54, 600); //
that.G.drawCenteredText(ctx, mycenter, canvas.height - 300, [{ content: "该图片请不要发给工友", color: "#d30000", fontWeight: 500, fontSize: 72 }]);
that.G.drawCenteredText(ctx, mycenter, canvas.height - 200, [{ content: "关注后能直接看到单子的代理费/佣金", color: "#333", fontWeight: 500, fontSize: 48 }]);
// //
that.G.roundRect_yuan(ctx, (mycenter - 360) / 2, 110, 360, "#ffffff"); that.G.roundRect_yuan(ctx, (mycenter - 360) / 2, 110, 360, "#ffffff");
@ -381,7 +385,7 @@ export default {
console.log("res333", res); console.log("res333", res);
img.src = res.path; img.src = res.path;
img.onload = () => { img.onload = () => {
that.G.roundRect(ctx, img, (mycenter - 800) / 2 + 100, canvas.height - 265, 70, 70, 0); that.G.roundRect(ctx, img, (mycenter - 800) / 2 + 100, canvas.height - 565, 70, 70, 0);
resolve(true); resolve(true);
}; };
}, },

@ -557,7 +557,7 @@ export default {
let path; let path;
console.log("that.loginInfo", that.loginInfo); console.log("that.loginInfo", that.loginInfo);
// id___ // id___
path = `/root/detail/job?scene=id=${that.jobDetail.id}_${that.jobDetail.agencyId}_${that.shareUserId || that.loginInfo.user.id}_${that.sharreUserAgencyId || that.loginInfo.agencyId}`; path = `/root/detail/job?scene=id=${that.jobDetail.id}_${that.jobDetail.agencyId}_${that.shareUserId || that.loginInfo.user.id}_${that.shareUserAgencyId ? (that.isFans == 2 ? that.loginInfo.agencyId : that.shareUserAgencyId) : that.loginInfo.agencyId}`;
return { return {
promise: new Promise((resolve, reject) => { promise: new Promise((resolve, reject) => {
uni.showLoading({ uni.showLoading({
@ -678,25 +678,29 @@ export default {
}, },
onLoad(options) { onLoad(options) {
console.log("详情", options); console.log("详情", options);
let loginUrl;
if (options.id) { if (options.id) {
this.uid = options.id; this.uid = options.id;
loginUrl = "/root/person/loginIndex?type=detail&path=/root/detail/job";
} else if (options.scene) { } else if (options.scene) {
var sceneStr = decodeURIComponent(options.scene); var sceneStr = decodeURIComponent(options.scene);
var sceneJson = this.G.sceneToJson(sceneStr); var sceneJson = this.G.sceneToJson(sceneStr);
console.log("sceneJson===", sceneJson); console.log("sceneJson===", sceneJson);
console.log('id对应的角色','职位id_职位项目方_分享人_分享人团队');
// id___ // id___
this.uid = sceneJson.id.split("_")[0]; //id this.uid = sceneJson.id.split("_")[0]; //id
this.shareJobAgencyId = sceneJson.id.split("_")[1]; //id this.shareJobAgencyId = sceneJson.id.split("_")[1]; //id
this.shareUserId = sceneJson.id.split("_")[2]; //id this.shareUserId = sceneJson.id.split("_")[2]; //id
this.shareUserAgencyId = sceneJson.id.split("_")[3]; //id this.shareUserAgencyId = sceneJson.id.split("_")[3]; //id
this.isSharePage = true; this.isSharePage = true;
loginUrl = `/root/person/loginIndex?type=detail&path=/root/detail/job&scene=${JSON.stringify(sceneJson)}`;
} }
this.from = options.from || "home"; this.from = options.from || "home";
if (!uni.getStorageSync("apply-token")) { if (!uni.getStorageSync("apply-token")) {
console.log("apply-token"); console.log("apply-token");
console.log("options.scene", options.scene);
uni.reLaunch({ uni.reLaunch({
url: "/root/person/loginIndex?type=detail&path=/root/detail/job&scene=" + options.scene, url: loginUrl,
}); });
return; return;
} }
@ -988,8 +992,9 @@ export default {
if (that.isFans !== false) { if (that.isFans !== false) {
params.isFans = that.isFans; params.isFans = that.isFans;
} }
that.shareUserId && (params.agencyUserId = that.shareUserId); that.shareUserId && (params.agencyUserId = that.isFans == 2 ? '' : that.shareUserId);
that.shareUserAgencyId && (params.shareUserAgencyId = that.shareUserAgencyId); // ,id,
that.shareUserAgencyId && (params.shareUserAgencyId = that.isFans == 2 ? that.loginInfo.agencyId : that.shareUserAgencyId);
uni.navigateTo({ uni.navigateTo({
url: `/root/home/quickApplication?params=${JSON.stringify(params)}`, url: `/root/home/quickApplication?params=${JSON.stringify(params)}`,
}); });

@ -37,7 +37,7 @@
</div> </div>
<div class="g_h_10"></div> <div class="g_h_10"></div>
<div class> <div class>
<quickLogin @successLogin="successLogin" v-if="!agencyInfo.id"> <quickLogin @successLogin="successLogin" v-if="!isLogin">
<div style="width: calc(100vw - 40px)" class> <div style="width: calc(100vw - 40px)" class>
<g-button btnText="申请关注" size="auto" type="primary" class></g-button> <g-button btnText="申请关注" size="auto" type="primary" class></g-button>
</div> </div>
@ -245,6 +245,7 @@ export default {
onShow() { onShow() {
let that = this; let that = this;
that.isLogin = uni.getStorageSync("apply-token") ? true : false; // uni.getStorageSync("apply-token"); that.isLogin = uni.getStorageSync("apply-token") ? true : false; // uni.getStorageSync("apply-token");
console.log("that.isLogin", that.isLogin);
this.loginInfo = uni.getStorageSync("apply-userinfo"); this.loginInfo = uni.getStorageSync("apply-userinfo");
that.G.Get("/checkUserLogin", {}, (res) => { that.G.Get("/checkUserLogin", {}, (res) => {
console.log("checkUserLogin", res); console.log("checkUserLogin", res);
@ -299,10 +300,12 @@ export default {
return new Promise((reso, reject) => { return new Promise((reso, reject) => {
that.G.Get(that.api.login_agencyInfo, {}, (aRes) => { that.G.Get(that.api.login_agencyInfo, {}, (aRes) => {
console.log("获取团队信息:", aRes); console.log("获取团队信息:", aRes);
if (aRes.agency) {
that.disabled = aRes.agency.fullName ? true : false; that.disabled = aRes.agency.fullName ? true : false;
that.agencyInfo = { ...aRes.agency, fullName: aRes.agency.fullName ? aRes.agency.fullName : that.agencyInfo.fullName }; that.agencyInfo = { ...aRes.agency, fullName: aRes.agency.fullName ? aRes.agency.fullName : that.agencyInfo.fullName };
uni.setStorageSync("agencyInfo", aRes.agency); uni.setStorageSync("agencyInfo", aRes.agency);
}
setTimeout(() => { setTimeout(() => {
reso(); reso();
}, 200); }, 200);
@ -679,7 +682,9 @@ export default {
let that = this; let that = this;
this.isLogin = true; this.isLogin = true;
console.log("successLogin", e); console.log("successLogin", e);
that.getDefault("init"); that.getAgencyInfo().then(() => {
that.getAgencyById().then(() => {
// that.query.page++;
if (that.info.recordStatus == 3 || that.info.recordStatus == 4 || that.info.recordStatus == 6) { if (that.info.recordStatus == 3 || that.info.recordStatus == 4 || that.info.recordStatus == 6) {
that.handleSubmit(); that.handleSubmit();
} else { } else {
@ -690,6 +695,9 @@ export default {
}); });
} }
} }
that.getDefault("init");
});
});
}, },
jobLogin() { jobLogin() {
let that = this; let that = this;

@ -160,7 +160,7 @@ export default {
if (params.type == 1 || params.type == 2) that.jobType = params.type; if (params.type == 1 || params.type == 2) that.jobType = params.type;
if (params.agencyId) that.updateInfo.upAgencyId = params.agencyId; if (params.agencyId) that.updateInfo.upAgencyId = params.agencyId;
params.isFans && (that.isFans = params.isFans); (params.isFans === 0 || params.isFans) && (that.isFans = params.isFans);
params.agencyUserId && (that.updateInfo.agencyUserId = params.agencyUserId); // id params.agencyUserId && (that.updateInfo.agencyUserId = params.agencyUserId); // id
params.shareUserAgencyId && (that.updateInfo.agencyId = params.shareUserAgencyId); // id params.shareUserAgencyId && (that.updateInfo.agencyId = params.shareUserAgencyId); // id
this.updateInfo.interviewTimeStr = ""; this.updateInfo.interviewTimeStr = "";
@ -321,7 +321,7 @@ export default {
icon: "", icon: "",
label: "报名职位", label: "报名职位",
result: that.updateInfo.jobName, result: that.updateInfo.jobName,
path: "/root/other/search?from=record", path: '',
placeholder: "请选择报名职位", placeholder: "请选择报名职位",
fontColor: that.updateInfo.jobName == "请选择报名职位" ? "g_c_9" : "g_c_3", fontColor: that.updateInfo.jobName == "请选择报名职位" ? "g_c_9" : "g_c_3",
tip: "applia-job", tip: "applia-job",

@ -128,7 +128,8 @@ export default {
console.log("options", options); console.log("options", options);
this.fromPageType = options.type; this.fromPageType = options.type;
if (options.type == "detail") { if (options.type == "detail") {
this.currentId = options.scene; this.currentId = `id%3D${JSON.parse(options.scene).id}`;
console.log('this.currentId',this.currentId);
} }
}, },
goHome() { goHome() {

@ -1260,7 +1260,7 @@ let data = {
let totalWidth = 0; let totalWidth = 0;
segments.forEach((segment) => { segments.forEach((segment) => {
ctx.font = `${segment.fontWeight} ${segment.fontSize}px Arial`; ctx.font = `${segment.fontWeight} ${segment.fontSize}px Arial`;
totalWidth += ((ctx.measureText(segment.content).width) + segment.space || 0); totalWidth += ((ctx.measureText(segment.content).width) + (segment.space || 0));
}); });
return totalWidth; return totalWidth;
}, },
@ -1269,7 +1269,7 @@ let data = {
// 计算总宽度 // 计算总宽度
const totalWidth = this.calculateTotalWidth(ctx, textSegments); const totalWidth = this.calculateTotalWidth(ctx, textSegments);
console.log('totalWidth', totalWidth, textSegments);
// 计算起始X坐标居中位置 // 计算起始X坐标居中位置
const centerX = x; const centerX = x;
const startX = (centerX - totalWidth) / 2; const startX = (centerX - totalWidth) / 2;
@ -1288,7 +1288,7 @@ let data = {
ctx.fillText(segment.content, currentX, centerY); ctx.fillText(segment.content, currentX, centerY);
// 更新X坐标为下一段文本做准备, 文本长度为1的时候使用字体大小 // 更新X坐标为下一段文本做准备, 文本长度为1的时候使用字体大小
currentX += ((ctx.measureText(segment.content).width) + segment.space || 0); currentX += ((ctx.measureText(segment.content).width) + (segment.space || 0));
}); });
}, },
/** /**

Loading…
Cancel
Save