Merge branch 'master' into cyl/master-0804

cyl/master-0804
jscyl13849007907 7 months ago
commit ef646a18f2

@ -143,7 +143,7 @@ export default {
appkey: opts.appkey, appkey: opts.appkey,
needReconnect: true, needReconnect: true,
// "reconnectionAttempts": 5, // "reconnectionAttempts": 5,
debugLevel: "debug", debugLevel: "error",
apiVersion: "v2", apiVersion: "v2",
enableV2CloudConversation: true, enableV2CloudConversation: true,
}, },
@ -304,22 +304,24 @@ export default {
if (uni.getStorageSync("apply-token")) { if (uni.getStorageSync("apply-token")) {
that.G.Get(that.api.bind_getApplyNum, {}, (res) => { that.G.Get(that.api.bind_getApplyNum, {}, (res) => {
console.log("获取待处理数量:", res); console.log("获取待处理数量:", res);
if (res.approvePassHasNotRed > 0) { that.G.Get(that.api.person_applyNum, {}, (applyNum) => {
uni.setTabBarBadge({ if (res.approvePassHasNotRed + applyNum > 0) {
index: 2, uni.setTabBarBadge({
text: String(res.approvePassHasNotRed), index: 2,
fail(err) { text: String(res.approvePassHasNotRed+ applyNum),
console.log("err", err); fail(err) {
}, console.log("err", err);
}); },
} else { });
uni.removeTabBarBadge({ } else {
index: 2, uni.removeTabBarBadge({
fail(err) { index: 2,
console.log("err", err); fail(err) {
}, console.log("err", err);
}); },
} });
}
});
}); });
} }
}, },

@ -21,7 +21,7 @@
<view v-if="speed > 0" class="link"> <view v-if="speed > 0" class="link">
<block class="" v-for="(item, index) in jobArray" :key="index"> <block class="" v-for="(item, index) in jobArray" :key="index">
<view class="item g_position_rela g_mb_10 g_ml_12 g_mr_12 g_bg_f g_radius_8 g_border_e_b" :class="from == 'share' ? 'g_pl_32' : ''"> <view class="item g_position_rela g_mb_10 g_ml_12 g_mr_12 g_bg_f g_radius_8 g_border_e_b" :class="from == 'share' ? 'g_pl_32' : ''">
<view class="g_p_10" style="" @click="handleCard(item, index)"> <view class="g_p_10 g_position_rela" style="" @click="handleCard(item, index)">
<i class="iconfont icon-yitingzhao" v-if="item.recruitment == 2 && from != 'mine'" style="position: absolute; right: 30px; top: 50%; transform: translateY(-50%); color: #ff4d4f; font-size: 80px; z-index: 1"></i> <i class="iconfont icon-yitingzhao" v-if="item.recruitment == 2 && from != 'mine'" style="position: absolute; right: 30px; top: 50%; transform: translateY(-50%); color: #ff4d4f; font-size: 80px; z-index: 1"></i>
<view class="m-top g_flex_row_between"> <view class="m-top g_flex_row_between">
<view class="g_flex_1 g_flex_column_between"> <view class="g_flex_1 g_flex_column_between">
@ -121,7 +121,7 @@
</view> </view>
<view class="g_c_6 g_fs_12 g_pr_4 g_radius_4 g_flex_row_start flex_center" style="" v-if="userinfo.agencyId == item.agencyId"> <view class="g_c_6 g_fs_12 g_pr_4 g_radius_4 g_flex_row_start flex_center" style="" v-if="userinfo.agencyId == item.agencyId">
<div class="g_mr_4 g_fs_12 g_pl_4 g_pr_4" style="">项目方:</div> <div class="g_mr_4 g_fs_12 g_pl_4 g_pr_4" style="">项目方:</div>
{{ item.upFullName || item.upAgencyName || "-" }} {{ item.upFullName || item.upAgencyName || item.upProviderName || "-" }}
</view> </view>
</view> </view>
</view> </view>
@ -168,7 +168,7 @@ export default {
}, },
data() { data() {
return { return {
userinfo: uni.getStorageSync("apply-userinfo"), userinfo: {},
themeColor: getApp().globalData.themeColor, themeColor: getApp().globalData.themeColor,
isUseNewJob: getApp().globalData.isUseNewJob, isUseNewJob: getApp().globalData.isUseNewJob,
localBaseImg: this.G.store().localBaseImg, localBaseImg: this.G.store().localBaseImg,
@ -298,6 +298,7 @@ export default {
this.appInfo = uni.getStorageSync("miniApp-info"); this.appInfo = uni.getStorageSync("miniApp-info");
if (uni.getStorageSync("apply-token")) { if (uni.getStorageSync("apply-token")) {
this.userinfo = uni.getStorageSync("apply-userinfo");
this.isLogin = true; this.isLogin = true;
} else { } else {
this.isLogin = false; this.isLogin = false;

@ -15,10 +15,11 @@
left: 0; left: 0;
background-color: #fff; background-color: #fff;
padding-top: 12px; padding-top: 12px;
padding-bottom: constant(safe-area-inset-bottom); /*兼容 IOS<11.2*/ padding-bottom: calc(constant(safe-area-inset-bottom)); /*兼容 IOS<11.2*/
padding-bottom: env(safe-area-inset-bottom); /*兼容 IOS>11.2*/ padding-bottom: calc(env(safe-area-inset-bottom)); /*兼容 IOS>11.2*/
min-height:72px; min-height:72px;
border-top: 1rpx solid #eee; border-top: 1rpx solid #eee;
z-index: 999; z-index: 999;
box-sizing: border-box;
} }
</style> </style>

@ -67,7 +67,7 @@ export function createApp () {
uni.setStorageSync('apply-userinfo-copy', JSON.stringify(res)); uni.setStorageSync('apply-userinfo-copy', JSON.stringify(res));
uni.setStorageSync("apply-agencyId", res.user.agencyId); // 单独存储 -- 代理id方便获取 uni.setStorageSync("apply-agencyId", res.user.agencyId); // 单独存储 -- 代理id方便获取
uni.setStorageSync("apply-supplierAccount", res.supplierAccount); // 单独存储 -- 是否是发单号,方便获取 0.不是发单号 1.是发单号 uni.setStorageSync("apply-supplierAccount", res.supplierAccount); // 单独存储 -- 是否是发单号,方便获取 0.不是发单号 1.是发单号
if (res.agencyStatus == 1) { if (res.agencyId) {
G.Get(apiInfo.login_agencyInfo, {}, (aRes) => { G.Get(apiInfo.login_agencyInfo, {}, (aRes) => {
uni.setStorageSync("agencyInfo", aRes.agency); // 1是创建者 2是普通成员 uni.setStorageSync("agencyInfo", aRes.agency); // 1是创建者 2是普通成员
uni.setStorageSync("IS_CREATOR", aRes.agency.userId == res.user.id || res.admin == true ? 1 : 2); // 1是创建者 2是普通成员 uni.setStorageSync("IS_CREATOR", aRes.agency.userId == res.user.id || res.admin == true ? 1 : 2); // 1是创建者 2是普通成员
@ -98,7 +98,8 @@ export function createApp () {
uni.setStorageSync('apply-userinfo-copy', JSON.stringify(res)); uni.setStorageSync('apply-userinfo-copy', JSON.stringify(res));
uni.setStorageSync("apply-agencyId", res.user.agencyId); // 单独存储 -- 代理id方便获取 uni.setStorageSync("apply-agencyId", res.user.agencyId); // 单独存储 -- 代理id方便获取
uni.setStorageSync("apply-supplierAccount", res.supplierAccount); // 单独存储 -- 是否是发单号,方便获取 0.不是发单号 1.是发单号 uni.setStorageSync("apply-supplierAccount", res.supplierAccount); // 单独存储 -- 是否是发单号,方便获取 0.不是发单号 1.是发单号
if (res.agencyStatus == 1) { if (res.agencyId) {
// if (res.agencyStatus == 1) {
G.Get(apiInfo.login_agencyInfo, {}, (aRes) => { G.Get(apiInfo.login_agencyInfo, {}, (aRes) => {
uni.setStorageSync("agencyInfo", aRes.agency); // 1是创建者 2是普通成员 uni.setStorageSync("agencyInfo", aRes.agency); // 1是创建者 2是普通成员
uni.setStorageSync("IS_CREATOR", aRes.agency.userId == res.user.id || res.admin == true ? 1 : 2); // 1是创建者 2是普通成员 uni.setStorageSync("IS_CREATOR", aRes.agency.userId == res.user.id || res.admin == true ? 1 : 2); // 1是创建者 2是普通成员

@ -105,7 +105,7 @@
<div class="g_mb_3" style="line-height: 1">分享</div> <div class="g_mb_3" style="line-height: 1">分享</div>
<div class="" style="line-height: 1">职位</div> <div class="" style="line-height: 1">职位</div>
</div> </div>
<g-filter :show.sync="whichOneShow" @hideDrawer="(e) => (whichOneShow = e)" ref="filterChild" top="101px" :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">

@ -27,9 +27,8 @@
{{ agencyInfo.agencyName || agencyInfo.fullName || "-" }} {{ agencyInfo.agencyName || agencyInfo.fullName || "-" }}
</view> </view>
<view style="position: relative"> <view style="position: relative">
<i class="iconfont icon-gengduo11" style="line-height: 22px;font-size: 13px;margin-left: 4px;"></i> <i class="iconfont icon-gengduo11" style="line-height: 22px; font-size: 13px; margin-left: 4px"></i>
<view class="g_radius_50 g_text_c" style="position: absolute; right: -2px; top: 0; color: #fff; background-color: #ff4400; font-size: 12px; width: 6px;height:6px" v-if="waitNus"> <view class="g_radius_50 g_text_c" style="position: absolute; right: -2px; top: 0; color: #fff; background-color: #ff4400; font-size: 12px; width: 6px; height: 6px" v-if="waitNus"> </view>
</view>
</view> </view>
</view> </view>
</view> </view>
@ -178,7 +177,6 @@ export default {
scrollTop: 0, scrollTop: 0,
defaultTop: 0, defaultTop: 0,
pageSpeed: -1, pageSpeed: -1,
isLogin: null,
localBaseImg: this.G.store().localBaseImg, localBaseImg: this.G.store().localBaseImg,
cdnBaseImg: this.G.store().cdnBaseImg, cdnBaseImg: this.G.store().cdnBaseImg,
showDot: true, // showDot: true, //
@ -348,7 +346,8 @@ export default {
this.getNewApplyNum(); this.getNewApplyNum();
that.isCreator = uni.getStorageSync("IS_CREATOR") == 1 ? true : false; that.isCreator = uni.getStorageSync("IS_CREATOR") == 1 ? true : false;
that.agencyInfo = uni.getStorageSync("agencyInfo"); that.agencyInfo = uni.getStorageSync("agencyInfo");
if (uni.getStorageSync("apply-userinfo").agencyStatus == 1) { if (uni.getStorageSync("apply-userinfo").agencyId) {
// if (uni.getStorageSync("apply-userinfo").agencyStatus == 1) {
this.getCompanyInfo(); this.getCompanyInfo();
} }
}); });
@ -782,21 +781,28 @@ export default {
that.G.Get(that.api.bind_getApplyNum, {}, (res) => { that.G.Get(that.api.bind_getApplyNum, {}, (res) => {
console.log("获取待处理数量:", res); console.log("获取待处理数量:", res);
if (res.approvePassHasNotRed > 0) { if (res.approvePassHasNotRed > 0) {
uni.setTabBarBadge({
index: 2,
text: String(res.approvePassHasNotRed),
});
that.readed = false; that.readed = false;
} else { } else {
try { that.readed = true;
}
that.G.Get(that.api.person_applyNum, {}, (applyNum) => {
if (res.approvePassHasNotRed + applyNum > 0) {
uni.setTabBarBadge({
index: 2,
text: String(res.approvePassHasNotRed + applyNum),
fail(err) {
console.log("err", err);
},
});
} else {
uni.removeTabBarBadge({ uni.removeTabBarBadge({
index: 2, index: 2,
fail(err) {
console.log("err", err);
},
}); });
} catch (error) {
console.log("当前页面不是 TabBar 页面,无法移除 badge");
} }
that.readed = true; });
}
}); });
}, },
goOrder(e) { goOrder(e) {

@ -371,25 +371,25 @@ export default {
// //
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 - 515, "扫一扫关注我的发单号".length * 54, 58, "#333", 54, 600); // that.G.fillTextLineBreak(ctx, "扫一扫关注我的发单号", (mycenter - "扫一扫关注我的发单号".length * 54) / 2 , canvas.height - 515, "扫一扫关注我的发单号".length * 54, 58, that.isLightColor(baseColor) ? '#333' : '#fff', 54, 600); //
that.G.drawCenteredText(ctx, mycenter, canvas.height - 300, [{ content: "该图片请不要发给工友", color: "#d30000", fontWeight: 500, fontSize: 72 }]); 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.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");
uni.getImageInfo({ // uni.getImageInfo({
src: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/phone.png", // // src: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/phone.png", //
success(res) { // success(res) {
const img = canvas.createImage(); // const img = canvas.createImage();
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 - 565, 70, 70, 0); // that.G.roundRect(ctx, img, (mycenter - 800) / 2 + 100, canvas.height - 565, 70, 70, 0);
resolve(true); resolve(true);
}; // };
}, // },
}); // });
}; };
}, },
fail(err) { fail(err) {
@ -469,6 +469,22 @@ export default {
}, },
}); });
}, },
//
isLightColor(hexColor, threshold = 180) {
hexColor = hexColor.replace("#", "");
if (hexColor.length === 3) {
hexColor = hexColor[0] + hexColor[0] + hexColor[1] + hexColor[1] + hexColor[2] + hexColor[2];
}
const r = parseInt(hexColor.substring(0, 2), 16);
const g = parseInt(hexColor.substring(2, 4), 16);
const b = parseInt(hexColor.substring(4, 6), 16);
const brightness = (r * 299 + g * 587 + b * 114) / 1000;
return brightness > threshold;
},
// //
setShareJobImg(ctx, canvas, mycenter, funObj) { setShareJobImg(ctx, canvas, mycenter, funObj) {
let that = this; let that = this;
@ -514,7 +530,7 @@ export default {
{ content: "粉丝", color: "#666", fontWeight: 500, fontSize: 56, space: 40 }, { content: "粉丝", color: "#666", fontWeight: 500, fontSize: 56, space: 40 },
]; ];
that.G.drawCenteredText(ctx, mycenter + 20, 745, textSegments); that.G.drawCenteredText(ctx, mycenter + 20, 745, textSegments);
imgres(canvas); imgres(canvas);
}; };
}, },
fail(err) {}, fail(err) {},

@ -18,12 +18,17 @@
</div> </div>
</u-modal> </u-modal>
<!-- 非代理分流弹窗 --> <!-- 非代理分流弹窗 -->
<u-modal v-model="confirmWithoutAgency" width="90%" negativeTop="150" :showTitle="false" :confirmStyle="{ color: '#576b95', 'font-weight': 600 }" :cancelStyle="{ color: '#000', 'font-weight': 600 }" :showConfirmButton="false"> <u-modal v-model="confirmWithoutAgency" width="90%" negativeTop="150" :showTitle="false" :confirmStyle="{ color: '#576b95', 'font-weight': 600 }" :maskCloseAble="true" :cancelStyle="{ color: '#000', 'font-weight': 600 }" :showConfirmButton="false">
<div class="g_fs_17"> <div class="g_fs_17">
<div class style="padding: 24px"> <div class style="padding: 24px 24px">
<!-- <div class="g_text_c g_fw_600 g_c_0">创建团队/企业</div> --> <div class="g_text_c g_fw_600 g_c_0 g_position_rela">
<div class="g_c_9">报名助手需以企业身份使用请确认本人所在公司是否已创建团队</div> 报名助手温馨提示
<div class="g_mt_24 g_fs_15 g_flex_row_between g_p_16 g_bg_f_5 g_radius_8"> <div class="g_position_abso" style="right: -4px; top: -10px; font-size: 12px; width: 32px; height: 32px" @click="confirmWithoutAgency = false">
<i class="iconfont icon-guanbi"></i>
</div>
</div>
<div class="g_c_9 g_mt_16 g_fs_16">报名助手需以企业身份使用请确认本人所在公司是否已创建团队</div>
<div class="g_mt_16 g_fs_14 g_flex_row_between g_p_16 g_bg_f_5 g_radius_8">
<div class="g_flex_row_start flex_center"><i class="iconfont icon-sousuo1 g_mr_8" style="color: #307bf6"></i>已有团队</div> <div class="g_flex_row_start flex_center"><i class="iconfont icon-sousuo1 g_mr_8" style="color: #307bf6"></i>已有团队</div>
<div <div
class="" class=""
@ -38,7 +43,7 @@
直接搜索加入 直接搜索加入
</div> </div>
</div> </div>
<div class="g_mt_12 g_fs_15 g_flex_row_between g_p_16 g_bg_f_5 g_radius_8"> <div class="g_mt_16 g_fs_14 g_flex_row_between g_p_16 g_bg_f_5 g_radius_8">
<div class="g_flex_row_start flex_center"><i class="iconfont icon-tianjia g_mr_8" style="color: #0bb87e"></i>还没团队</div> <div class="g_flex_row_start flex_center"><i class="iconfont icon-tianjia g_mr_8" style="color: #0bb87e"></i>还没团队</div>
<div <div
class="" class=""
@ -53,9 +58,9 @@
立即创建团队 立即创建团队
</div> </div>
</div> </div>
<div class="g_mt_24"> <!-- <div class="g_mt_24">
<g-button btnText="稍后再说" size="auto" class @clickBtn="confirmWithoutAgency = false"></g-button> <g-button btnText="稍后再说" size="auto" class @clickBtn="confirmWithoutAgency = false"></g-button>
</div> </div> -->
</div> </div>
</div> </div>
</u-modal> </u-modal>
@ -149,7 +154,19 @@ export default {
// //
computed: {}, computed: {},
// //
watch: {}, watch: {
joinTeamConfirm(newVal) {
if (newVal) {
this.teamInfo = {};
this.chooseTeam = {};
}
},
submitConfirm(newVal) {
if (newVal) {
this.agencyInfo.fullName = "";
}
},
},
created() { created() {
console.log("alsdfjlasdjfl;askdfjo"); console.log("alsdfjlasdjfl;askdfjo");
}, },
@ -206,9 +223,11 @@ export default {
content: "您已发起申请,审核通过即可加入该团队", content: "您已发起申请,审核通过即可加入该团队",
success: (res) => { success: (res) => {
if (res.confirm) { if (res.confirm) {
uni.switchTab({ if (that.navNewPage) {
url: "/pages/home/index", uni.switchTab({
}); url: "/pages/home/index",
});
}
} }
}, },
}); });
@ -218,8 +237,6 @@ export default {
// //
applyFlowConfirm() { applyFlowConfirm() {
let that = this; let that = this;
this.confirmWithoutAgency = true;
return;
that.G.handleConfirm({ that.G.handleConfirm({
confirmText: "确认", confirmText: "确认",
title: "是否确认关注该发单号?", title: "是否确认关注该发单号?",

@ -248,6 +248,7 @@ export default {
this.inviteUserId = sceneJson.id.split("_")[1]; //id this.inviteUserId = sceneJson.id.split("_")[1]; //id
this.uid = sceneJson.id.split("_")[0]; // id this.uid = sceneJson.id.split("_")[0]; // id
this.fromQRCode = true; // id this.fromQRCode = true; // id
that.G.watchUserPage('/root/detail/userShare');
} else { } else {
this.uid = options.id; this.uid = options.id;
this.isShowMore = options.isShowMore ? true : false; this.isShowMore = options.isShowMore ? true : false;

@ -1,5 +1,7 @@
<template> <template>
<view class="p-root-sharejob g_w_all g_bg_f_5" hover-class="none" hover-stop-propagation="false"> <view class="p-root-sharejob g_w_all g_bg_f_5" hover-class="none" hover-stop-propagation="false">
<!-- {{ shareJobBaseImg }}
<img :src="shareJobBaseImg" alt="" /> -->
<scroll-view class="m-list" id="listBox" :style="{ height: `calc(100vh - 74px)` }" :scroll-y="true" @scrolltolower="reachBottom"> <scroll-view class="m-list" id="listBox" :style="{ height: `calc(100vh - 74px)` }" :scroll-y="true" @scrolltolower="reachBottom">
<!-- <div class="g_kuaishou"> --> <!-- <div class="g_kuaishou"> -->
<div> <div>
@ -126,6 +128,7 @@ export default {
// path += (path.indexOf("?") >= 0 ? "&" : "?") + "agencyUserId=" + app.globalData.loginUserInfo.id; // path += (path.indexOf("?") >= 0 ? "&" : "?") + "agencyUserId=" + app.globalData.loginUserInfo.id;
// } // }
if (this.checkedList.length == 0) { if (this.checkedList.length == 0) {
console.log("unpass");
throw Error; throw Error;
} else { } else {
return { return {
@ -135,14 +138,17 @@ export default {
arr.push(item.id); arr.push(item.id);
}); });
this.getCanvas(this.shareJobBaseImg, "setJob").then((res) => { this.getCanvas(this.shareJobBaseImg, "setJob").then((res) => {
console.log(res); console.log("this.shareJobBaseImg", res);
uni.hideLoading(); uni.hideLoading();
// setTimeout(() => {
resolve({ resolve({
title: "你想找的厂都有,立即查看", title: "你想找的厂都有,立即查看",
imageUrl: res.tempFilePath, imageUrl: res.tempFilePath,
path: `/root/home/shareList?scene=i=${arr.join("_")},u=${this.userInfo.agencyId}_${this.userInfo.id}`, path: `/root/home/shareList?scene=i=${arr.join("_")},u=${this.userInfo.agencyId}_${this.userInfo.id}`,
// path: '/pages/shareList/index' // path: '/pages/shareList/index'
}); });
// }, 100);
// return // return
}); });
}), }),
@ -227,7 +233,7 @@ export default {
checkedList: [], checkedList: [],
posterShow: false, posterShow: false,
navInfo: {}, navInfo: {},
shareJobBaseImg: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/poster0106.png", // shareJobBaseImg: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/poster0106_1.png", //
sharelImg: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/2023-09-01/7ca85384-9f22-474d-893f-092b61de684d_share.png", // sharelImg: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/2023-09-01/7ca85384-9f22-474d-893f-092b61de684d_share.png", //
currCode: "", currCode: "",
posterImg: "", // posterImg: "", //
@ -582,7 +588,7 @@ export default {
.select("#canvasId") .select("#canvasId")
.fields({ node: true, size: true }) .fields({ node: true, size: true })
.exec((res) => { .exec((res) => {
console.log(res); console.log("getCanvas", res);
const canvas = res[0].node; const canvas = res[0].node;
const ctx = canvas.getContext("2d"); const ctx = canvas.getContext("2d");
new Promise(function (resolve) { new Promise(function (resolve) {
@ -590,6 +596,7 @@ export default {
uni.getImageInfo({ uni.getImageInfo({
src: sharelImg, // src: sharelImg, //
success(res) { success(res) {
console.log("getImageInfo", res);
console.log(res); console.log(res);
var width = res.width; var width = res.width;
var height = res.height; var height = res.height;
@ -619,6 +626,7 @@ export default {
uni.canvasToTempFilePath({ uni.canvasToTempFilePath({
canvas: canvas1, canvas: canvas1,
success(res) { success(res) {
console.log("setShareJobImg", res);
console.log(res); console.log(res);
resolve(res); resolve(res);
}, },
@ -801,6 +809,9 @@ export default {
*/ */
setShareJobImg(ctx, canvas, funObj) { setShareJobImg(ctx, canvas, funObj) {
let that = this; let that = this;
uni.showLoading({
title: "生成中...",
});
return new Promise((imgres) => { return new Promise((imgres) => {
// ctx.arcTo() // ctx.arcTo()
let baseTop, logoLeft, titleSize, ageTop, salaryClassifyValueLeft, salaryClassifyValueTop, monthlyPaySize, roundRectHeight, fubiaotiTop; let baseTop, logoLeft, titleSize, ageTop, salaryClassifyValueLeft, salaryClassifyValueTop, monthlyPaySize, roundRectHeight, fubiaotiTop;
@ -814,27 +825,27 @@ export default {
salaryClassifyValueTop = 10; salaryClassifyValueTop = 10;
monthlyPaySize = 32; monthlyPaySize = 32;
console.log(123); console.log(123);
try { try {
that.checkedList.forEach((item, index) => { that.checkedList.forEach((item, index) => {
if (index <= 2) { if (index <= 2) {
let labelLeft = 0; let labelLeft = 0;
console.log("item1", item); console.log("item1", item);
that.G.roundRect1(ctx, 32, baseTop - 60 + baseMiddle * index, 776, roundRectHeight, 24, "#fff"); that.G.roundRect1(ctx, 32, baseTop - 60 + baseMiddle * index, 776, roundRectHeight, 24, "#fff");
that.G.fillTextLineBreak(ctx, item.jobName, logoLeft, baseTop + baseMiddle * index, 800, 20, "#333", titleSize, "500"); // that.G.fillTextLineBreak(ctx, item.jobName, logoLeft, baseTop + baseMiddle * index, 800, 20, "#333", titleSize, "500"); //
// () // ()
// that.G.fillTextLineBreak(ctx, item.cus_price == "" ? item.monthlyPay : item.salaryClassifyValue, salaryClassifyValueLeft + 500, baseTop - 10 + salaryClassifyValueTop + baseMiddle * index, 400, 20, "#ff4400", titleSize - 4, "600"); // // that.G.fillTextLineBreak(ctx, item.cus_price == "" ? item.monthlyPay : item.salaryClassifyValue, salaryClassifyValueLeft + 500, baseTop - 10 + salaryClassifyValueTop + baseMiddle * index, 400, 20, "#ff4400", titleSize - 4, "600"); //
that.G.fillTextLineBreak(ctx, item.cus_price == "月薪" ? item.monthlyPay : item.salaryClassifyValue, canvas.width - ctx.measureText(item.cus_price == "月薪" ? item.monthlyPay : item.salaryClassifyValue).width - 40 , baseTop + ageTop + baseMiddle * index, 400, 20, "#ff4400", titleSize - 4, "600"); // that.G.fillTextLineBreak(ctx, item.cus_price == "月薪" ? item.monthlyPay : item.salaryClassifyValue, canvas.width - ctx.measureText(item.cus_price == "月薪" ? item.monthlyPay : item.salaryClassifyValue).width - 40, baseTop + ageTop + baseMiddle * index, 400, 20, "#ff4400", titleSize - 4, "600"); //
// setTimeout(() => { // setTimeout(() => {
// that.G.fillTextLineBreak(ctx, item.monthlyPay, salaryClassifyValueLeft + ctx.measureText(item.salaryClassifyValue + " ").width, baseTop + salaryClassifyValueTop + baseMiddle * index, 400 , 20, "#ff4400", monthlyPaySize, "400"); // // that.G.fillTextLineBreak(ctx, item.monthlyPay, salaryClassifyValueLeft + ctx.measureText(item.salaryClassifyValue + " ").width, baseTop + salaryClassifyValueTop + baseMiddle * index, 400 , 20, "#ff4400", monthlyPaySize, "400"); //
// }, 0); // }, 0);
that.G.fillTextLineBreak(ctx, item.district, logoLeft, baseTop + ageTop + baseMiddle * index, 500, 20, "#999", monthlyPaySize); // that.G.fillTextLineBreak(ctx, item.district, logoLeft, baseTop + ageTop + baseMiddle * index, 500, 20, "#999", monthlyPaySize); //
that.G.fillTextLineBreak(ctx, "丨" + item.age, logoLeft + ctx.measureText(item.district).width, baseTop + ageTop + baseMiddle * index, 500, 20, "#999", monthlyPaySize); // that.G.fillTextLineBreak(ctx, "丨" + item.age, logoLeft + ctx.measureText(item.district).width, baseTop + ageTop + baseMiddle * index, 500, 20, "#999", monthlyPaySize); //
} }
}); });
imgres(canvas); imgres(canvas);
} catch (error) { } catch (error) {
console.log('error',error); console.log("error", error);
} }
// setTimeout(() => { // setTimeout(() => {
// },500); // },500);
}); });

@ -1,7 +1,7 @@
<template> <template>
<view class="p-root-detail-apply g_w_all g_bg_f_5 g_kuaishou g_pt_10"> <view class="p-root-detail-apply g_w_all g_bg_f_5 g_kuaishou g_pt_10">
<view class="g_flex_row_between flex_center g_p_12 g_mb_12 g_bg_f" v-if="(userRole.recordStatus == 3 || userRole.recordStatus == 4 || userRole.recordStatus == 5) && from == '短链接'"> <view class="g_flex_row_between flex_center g_p_12 g_mb_12 g_bg_f" v-if="(userRole.recordStatus == 3 || userRole.recordStatus == 4 || userRole.recordStatus == 5) && from == '短链接'">
<view>关注该代理可查看其佣金, 点击直接关注</view> <view>关注该发单号可查看其佣金, 点击直接关注</view>
<view> <view>
<g-button type="primary" size="mini" fontSize="14" btnText="关注" @clickBtn="handleSubmit"></g-button> <g-button type="primary" size="mini" fontSize="14" btnText="关注" @clickBtn="handleSubmit"></g-button>
</view> </view>

@ -1,7 +1,19 @@
<template> <template>
<view class="p-person-change g_w_all g_h_all g_bg_f_5 g_kuaishou"> <view class="p-person-change g_w_all g_h_all g_bg_f_5 g_kuaishou">
<view class="g_h_10"></view> <view class="g_h_10"></view>
<g-panel-form-slot <view class="" v-if="info.fieldName != 'address'">
<view class="g_mb_8 g_pl_12">{{ info.label }}</view>
<view class="g_bg_f g_radius_8 g_p_6" style="width: calc(100% - 60rpx); margin: 0 auto">
<!-- #ifdef APP-PLUS || H5 || MP-TOUTIAO || MP-KUAISHOU -->
<u-input type="text" :clearable="false" :password-icon="false" :customStyle="{ fontSize: '17px' }" :placeholder="info.placeholder" input-align="left" class="g_text_r g_w_all" placeholder-style="color:#999999;font-size:17px;line-height:1" v-model="info.value" style="width: calc(100vw - (106px)); flex: none; font-size: 17px" />
<!-- #endif -->
<!-- #ifdef MP-WEIXIN -->
<u-input type="text" :clearable="false" v-if="info.fieldName != 'desp'" :customStyle="{ fontSize: '17px' }" :password-icon="false" :placeholder="info.placeholder" input-align="left" class="g_text_r g_w_all" placeholder-style="color:#999999;font-size:17px;line-height:1" v-model="info.value" />
<u-input type="textarea" :clearable="false" v-else :customStyle="{ fontSize: '17px' }" :password-icon="false" :placeholder="info.placeholder" input-align="left" class="g_text_r g_w_all" placeholder-style="color:#999999;font-size:17px;line-height:1" v-model="info.value" />
<!-- #endif -->
</view>
</view>
<!-- <g-panel-form-slot
:list="[ :list="[
{ {
icon: '', icon: '',
@ -15,15 +27,8 @@
]" ]"
v-if="info.fieldName != 'address'" v-if="info.fieldName != 'address'"
> >
<slot> <slot> </slot>
<!-- #ifdef APP-PLUS || H5 || MP-TOUTIAO || MP-KUAISHOU --> </g-panel-form-slot> -->
<u-input type="text" :clearable="false" :password-icon="false" :customStyle="{ fontSize: '17px' }" :placeholder="info.placeholder" input-align="right" class="g_text_r g_w_all" placeholder-style="color:#999999;font-size:17px;line-height:1" v-model="info.value" style="width: calc(100vw - (106px)); flex: none; font-size: 17px" />
<!-- #endif -->
<!-- #ifdef MP-WEIXIN -->
<u-input type="text" :clearable="false" :customStyle="{ fontSize: '17px' }" :password-icon="false" :placeholder="info.placeholder" input-align="right" class="g_text_r g_w_all" placeholder-style="color:#999999;font-size:17px;line-height:1" v-model="info.value" />
<!-- #endif -->
</slot>
</g-panel-form-slot>
<g-panel-form-slot <g-panel-form-slot
v-else v-else
:list="[ :list="[
@ -61,8 +66,7 @@ export default {
onShareAppMessage() { onShareAppMessage() {
return this.G.shareFun(); return this.G.shareFun();
}, },
components: { components: {},
},
data() { data() {
return { return {
info: {}, info: {},
@ -147,7 +151,7 @@ export default {
this.info.value.address = e.address; this.info.value.address = e.address;
this.info.value.lat = e.lat; this.info.value.lat = e.lat;
this.info.value.lng = e.lng; this.info.value.lng = e.lng;
uni.$emit('getBossAddress',that.avatar) uni.$emit("getBossAddress", that.avatar);
}, },
}, },
}; };

@ -327,7 +327,8 @@ export default {
url: that.path, url: that.path,
}); });
} }
if ($data.agencyStatus == 1) { if ($data.agencyId) {
// if ($data.agencyStatus == 1) {
that.G.Get(that.api.login_agencyInfo, {}, (aRes) => { that.G.Get(that.api.login_agencyInfo, {}, (aRes) => {
console.log("获取团队信息:", aRes); console.log("获取团队信息:", aRes);
uni.setStorageSync("agencyInfo", aRes.agency); // 1 2 uni.setStorageSync("agencyInfo", aRes.agency); // 1 2

Loading…
Cancel
Save