cyl/master-0819
wangxia 3 months ago
parent 185651ef47
commit 96bbee1bc4

@ -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;

@ -65,7 +65,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是普通成员
@ -96,7 +96,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>
@ -347,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();
} }
}); });

@ -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>
@ -218,8 +223,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: "是否确认关注该发单号?",

@ -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;
@ -833,7 +844,7 @@ export default {
}); });
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>

@ -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