cyl/master-im
wangxia 5 months ago
parent d38d38eb57
commit 5bdbf5637f

@ -1,7 +1,7 @@
<template>
<view :class="isLogin ? '' : 'm-login-false'">
<view class="m-panel" :class="!loading && speed == 0 ? 'g_bg_f_5' : ''">
<view class="link g_bg_f" :class="!loading && speed == 0 ? '' : ''">
<view class="link" :class="!loading && speed == 0 ? '' : ''">
<g-loading bg="#f5f5f5" v-if="loading && speed == -1" />
<view v-if="!loading && speed == 0 && isLogin" style="background-color: #f5f5f5">
<view>
@ -18,7 +18,7 @@
</view>
<scroll-view v-if="speed > 0" :style="{ height: `calc(100vh - ${navInfo.statusBarHeight + 62}px)` }" :scroll-y="true" @scrolltolower="reachBottom" :lower-threshold="100">
<view class="" style="min-height: calc(100% - 90px)">
<view class="item g_pt_18 g_pl_10 g_pr_10" hover-class="g_bg_f_5" v-for="(item, index) in query.list" :key="index" @click="goDetail(item, index)">
<view class="item g_pt_18 g_pl_10 g_pr_10 g_bg_f" hover-class="g_bg_f_5" v-for="(item, index) in query.list" :key="index" @click="goDetail(item, index)">
<view class="g_border_e_b g_flex_row_start g_pb_18">
<view class="g_flex_none g_mr_12 g_w_44 g_h_44 g_radius_50 g_flex_c" @click.stop="goTel(item.tel)">
<image :src="cdnBaseImg + 'tel.svg'" class="g_w_44 g_h_44" v-if="item.tel"></image>
@ -36,10 +36,11 @@
</view>
</view>
</view>
</view>
<view class="g_bg_f_5">
<g-panel-hr :str="query.isFinish >= 0 && query.isFinish < query.size ? speed + '个工单' : '加载中'" />
</view>
<!-- <view class="g_bg_f_5">
<g-panel-hr :str="query.isFinish >= 0 && query.isFinish < query.size ? speed + '个工单' : '加载中'" />
</view> -->
<!-- #ifdef H5 -->
<view class="g-h-100"></view>
<!-- #endif -->

@ -30,9 +30,9 @@
</view>
<view class="g_flex_1 g_flex_column_center">
<view class="g_flex_row_end">
<view class="g_flex_row_end">
<view class="g_flex_row_end flex_end">
<!-- 通用类型 -->
<view class="g_fs_16 g_ell_1 g_lh_1_2" style="max-width:45vw" :class="item.fontColor" v-if="item.result">{{ item.result }}</view>
<view class="g_fs_16 g_ell_1 g_lh_1_2 g_c_8" style="max-width:45vw" :class="item.fontColor" v-if="item.result">{{ item.result }}</view>
<!-- 迷你二维码 -->
<view class="g_flex_rowRight_columnCenter" v-if="item.tip == 'code'">
<i class="iconfont icon-a-erweimabeifen2 g_fs_21 g_c_c" style="font-size: 21px"></i>
@ -42,7 +42,7 @@
<img :src="item.value" alt="" class="g_w_48 g_h_48 g_radius_50" />
</view>
<!-- 右箭头 -->
<view class="g_flex_column_center" v-if="item.type != 'slot'">
<view class="g_flex_column_center flex_center" v-if="item.type != 'slot'">
<i class="iconfont icon-gengduo11 g_c_c"></i>
</view>
</view>

@ -125,11 +125,11 @@
</view>
<!-- 手机号 -->
<view class="form-new-tel g_flex_rowRight_columnCenter g_w_all" v-if="item.tip == 'slot-mobile'">
<u-input type="number" :custom-style="{ fontSize: item.fontSize || ' 16px' }" :clearable="false" :password-icon="false" :maxlength="11" :placeholder="item.placeholder" input-align="right" class="g_text_r g_w_all" placeholder-style="color:#999;font-size:16px;line-height:1" v-model="item.value" @blur="(e) => handleMobile(e, item, index)" />
<u-input type="number" :custom-style="{ fontSize: item.fontSize || ' 16px' }" :clearable="false" :password-icon="false" :maxlength="11" :placeholder="item.placeholder" input-align="right" class="g_text_r g_w_all" placeholder-style="color:#999;font-size:16px;line-height:1" v-model="item.value" @blur="(e) => handleMobile(e, item, index)" @input="(e) => handleMobile(e, item, index)" />
</view>
<!-- 多文本输入 -->
<view class="form-new-textarea g_flex_rowRight_columnCenter g_w_all" v-if="item.tip == 'slot-more-word'" style="width: calc(100%)">
<textarea class="weui-input g_text_r g_fs_16" v-model="item.value" :placeholder="item.placeholder" placeholder-style="color:#999999;font-size:16px" :maxlength="-1" auto-height style="min-height: 24px; width: 200px; line-height: 16px" @blur="(e) => handleMoreWord(e, item, index)"></textarea>
<textarea class="weui-input g_text_r g_fs_16" v-model="item.value" :placeholder="item.placeholder" placeholder-style="color:#999999;font-size:16px" :maxlength="-1" auto-height style="min-height: 24px; width: 200px; line-height: 16px" @blur="(e) => handleMoreWord(e, item, index)" @input="(e) => handleMoreWord(e, item, index)"></textarea>
</view>
<!-- 时间 -->
<view class="form-new-time g_flex_rowRight_columnCenter g_w_all" v-if="item.tip == 'slot-time'">

@ -41,7 +41,7 @@
</view>
</view>
<view class="g_mt_24 g_flex_row_center">
<g-button icon="icon-yemian-1 " width="260" height="48" btnText="一键免密登录" type="default" openType="getPhoneNumber" @clickTel="getphonenumber" />
<g-button width="260" height="48" btnText="一键免密登录" type="default" openType="getPhoneNumber" @clickTel="getphonenumber" />
</view>
<!-- #endif -->
</view>

@ -85,7 +85,7 @@
{
icon: 'icon-wodetuandui',
label: '团队管理',
result: '',
result: agencyInfo.fullName || agencyInfo.agencyName || '设置企业信息',
path: '/root/person/teamManage',
pRow: 12,
},
@ -172,6 +172,7 @@ export default {
},
data() {
return {
agencyInfo: uni.getStorageSync("agencyInfo"),
addMemberShow: false,
scrollTop: 0,
defaultTop: 0,

@ -9,10 +9,24 @@
<!-- v-if="userInfo.user.agencyRole == 1 || userInfo.user.agencyRole == 2 || userInfo.hasBill || true" -->
<view class="g_radius_8 g_p_16 g_bg_f g_text_c g_ml_10 g_mr_10" hover-class="thover" @click="goPage('/root/bind/order?active=0')">
<view class="g_fw_600 g_mb_10 g_fs_20 g_position_rela">
{{ upNum }}
{{ userNum.upNum }}
<view class="g_w_6 g_h_6 g_radius_50 g_bg_f0a" v-if="!readed" style="position: absolute; left: calc(50% + 10px); top: 0"></view>
</view>
<view class="g_c_6">关注发单号</view>
<!-- <view class="g_flex_row_between g_c_6 g_mt_12 ">
<div class="g_text_c g_flex_1">
<div class="g_fs_16 g_c_0 g_fw_600">{{ userNum.jobNum }}</div>
<div class="g_fs_14">总职位</div>
</div>
<div class="g_text_c g_flex_1">
<div class="g_fs_16 g_c_0 g_fw_600">{{ userNum.recruitmentJobNum }}</div>
<div class="g_fs_14">在招</div>
</div>
<div class="g_text_c g_flex_1">
<div class="g_fs_16 g_c_0 g_fw_600">{{ userNum.downNum }}</div>
<div class="g_fs_14">粉丝</div>
</div>
</view> -->
</view>
<!-- v-if="agencyInfo.supplierAccount == 1" -->
<view class="g_mt_10" v-if="false">
@ -84,7 +98,7 @@ export default {
authInfo: { realNameAuth: 0 }, //
userInfo: {},
agencyInfo: {},
upNum: 0,
userNum: {},
map: { num10: "0", num20: "0", num25: "0", num30: "0", num40: "0", num999: "0", user999: "0", user40: "0", user48: "0", user50: "0", agencyData: {} },
orderDataList: [
{
@ -290,7 +304,7 @@ export default {
},
(res) => {
console.log("item.", res);
that.upNum = res.upNum;
that.userNum = res;
}
);
},

@ -86,15 +86,15 @@
<view class="g_fs_14 g_c_9 g_mt_4">
<view class="g_flex_row_start">
<view class="g_flex_row_start">
<view class=""> 职位 </view>
<view class=""> 职位 </view>
<view class="g_mr_8 g_ml_5 g_c_3">
{{ item.jobNum ? item.jobNum : "0" }}
</view>
</view>
<view class="g_flex_row_start">
<view class=""> 今日更新 </view>
<view class=""> 在招 </view>
<view class="g_mr_8 g_ml_5 g_c_3">
{{ item.jobUpdateNum ? item.jobUpdateNum : "0" }}
{{ item.recruitmentJobNum ? item.recruitmentJobNum : "0" }}
</view>
</view>
<view class="g_flex_row_start">

@ -90,7 +90,10 @@ export default {
});
return false;
}
if (!/^[1][3,4,5,6,7,8,9][0-9]{9}$/.test(that.memberInfo.tel)) {
let exp = /^1[3-9]\d{9}$/;
console.log("that.memberInfo. tel", that.memberInfo.tel);
console.log("exp.test(that.memberInfo.tel)", exp.test(that.memberInfo.tel));
if (!exp.test(that.memberInfo.tel)) {
uni.showToast({
title: "请输入正确的手机号",
icon: "none",

@ -19,7 +19,8 @@
<div class="g_fs_12 g_c_9 g_pl_12">该名称会在团队成员列表显示创建人可以修改</div>
</div>
<div class="g_mt_84">
<g-button v-if="!applying && agencyInfo.agencyName" btnText="申请加入团队" type="primary" class="" @clickBtn="applyAdd"></g-button>
<g-button v-if="applying == 0 && agencyInfo.agencyName" btnText="申请加入团队" type="primary" class="" @clickBtn="applyAdd"></g-button>
<g-button v-else-if="applying == 2" btnText="已加入" type="disabled" class=""></g-button>
<g-button v-else btnText="已申请" type="disabled" class=""></g-button>
</div>
</div>
@ -37,7 +38,7 @@ export default {
userName: "",
userId: "",
},
applying: false,
applying: 0,
inviteUserId: "",
uid: "",
ing: false,
@ -108,10 +109,14 @@ export default {
checkHasApply() {
let that = this;
this.G.Post(this.api.order_checkHasApply, { agencyId: that.uid, userId: this.userInfo.id }, (res) => {
if (res.length > 0) {
that.applying = true;
if (res) {
if (res.userExist == 1) {
that.applying = 2;
} else {
that.applying = 1;
}
} else {
that.applying = false;
that.applying = 0;
}
that.ing = false;
console.log(res);

@ -15,7 +15,7 @@
<div v-for="item in memberList" :key="item.id" @click="editMember(item)" class="g_border_e_b g_flex_row_between g_fs_18" style="padding: 18px 10px">
<div class="g_flex_row_start flex_center g_fw_600">
{{ item.aliasName || item.userName }}
<div class="g_fs_12 g_pl_2 g_h_18 g_pr_2 g_radius_4 g_flex_row_center flex_center g_ml_4" :class="item.agencyRoleName ? (item.agencyRoleName == '创建人' ? 'creator' : item.agencyRoleName == '管理员' ? 'manager' : 'member') : ''">{{ item.agencyRoleName }}</div>
<div class="g_fs_12 g_pl_2 g_h_18 g_pr_2 g_radius_4 g_flex_row_center flex_center g_ml_4 g_fw_500" :class="item.agencyRoleName ? (item.agencyRoleName == '创建人' ? 'creator' : item.agencyRoleName == '管理员' ? 'manager' : 'member') : ''">{{ item.agencyRoleName }}</div>
</div>
<div class="g_flex_row_end flex_center g_c_6">
{{ item.tel }}

@ -283,7 +283,7 @@ scroll-view::-webkit-scrollbar {
font-weight: 500;
}
&_600 {
font-weight: 600;
font-weight: bold;
}
&_700 {
font-weight: 700;

Loading…
Cancel
Save