mkm/OfficeApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

首次登录没有头像

Browse Source
This commit is contained in:
zmj 2023-12-12 11:08:18 +08:00
parent 96d2552de2
commit 6dc0e69392
6 changed files with 611 additions and 622 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/companyFinance/companyFinance.vue
View File

@ -7,7 +7,7 @@
<view class="price" v-else>0.00</view>
</view>
<view class="item" @click="navTo('/subpkg/withdrawDeposit/company')">
<view>公司收益总金额(元)</view>
<view>公司预计收益总金额(元)</view>
<view class="price" v-if="company.company_money">{{cCount(+company.company_money)}}</view>
<view class="price" v-else>0.00</view>
</view>
@ -46,7 +46,8 @@
<view class="t_title">收益来源：</view>
<view class="tips">
<text v-if="item.change_type==202" style="color: #46be61;">{{item.type_desc}}</text>
<text v-else-if="item.change_type==203" style="color: #ff7c32;">{{item.type_desc}}</text>
<text v-else-if="item.change_type==203"
style="color: #ff7c32;">{{item.type_desc}}</text>
<text v-else="item.change_type==203">{{item.type_desc}}</text>
</view>
</view>
@ -114,7 +115,9 @@
url: url,
success: (res) => {
uni.hideLoading();
res.eventChannel.emit('company_money', { company_money: this.company.company_money })
res.eventChannel.emit('company_money', {
company_money: this.company.company_money
})
}
})
} else Toast('暂未开放')
@ -251,7 +254,7 @@
&:before {
display: inline-block;
content: '账户收益';
content: '预计收益';
width: 137rpx;
height: 49rpx;
line-height: 49rpx;

14
pages/oaHome/oaHome.vue
View File

@ -270,7 +270,14 @@
};
},
async onLoad() {
// console.log('asdashg')
if (uni.getStorageSync('USER_INFO')) {
let userData = JSON.parse(uni.getStorageSync('USER_INFO'))
this.initUserInfo(userData);
// console.log(545)
}
console.log(7787878)
await this.$onLaunched;
this.is_captain = JSON.parse(uni.getStorageSync("USER_INFO") || '{}')?.is_captain
this.options.data = bj;
@ -286,6 +293,10 @@
}
});
// #endif
},
onReachBottom() {
if (this.flag) return
@ -314,6 +325,9 @@
// }
// this.getUserIndex()
// this.getIndexList()
let user_id = JSON.parse(uni.getStorageSync("USER_INFO")).id
this.getOrderList();
console.log("show")

68
subpkg/finance/finance.vue
View File

@ -4,24 +4,14 @@
<view class="top">
<view>
<view v-if="user_id == 0" class="accont">
<u--image
:showLoading="true"
:src="userInfo.avatar || '../../static/img/public/man.png'"
width="44px"
height="44px"
shape="circle"
></u--image>
<u--image :showLoading="true" :src="userInfo.avatar || '../../static/img/public/man.png'"
width="44px" height="44px" shape="circle"></u--image>
<view class="name">{{ userInfo.nickname }}</view>
<!-- <u-icon name="setting-fill" color="white" size="20"></u-icon> -->
</view>
<view v-else class="accont">
<u--image
:showLoading="true"
:src="userInfo.avatar || '../../static/img/public/man.png'"
width="44px"
height="44px"
shape="circle"
></u--image>
<u--image :showLoading="true" :src="userInfo.avatar || '../../static/img/public/man.png'"
width="44px" height="44px" shape="circle"></u--image>
<view class="name">{{ userInfo.nickname }}</view>
<!-- <u-icon name="setting-fill" color="white" size="20"></u-icon> -->
@ -33,22 +23,14 @@
</view>
<view class="center">
<view class="title">
<text style="margin-right: 20rpx">账户总金额(元)</text
><uni-icons
@click="updateEye()"
:type="eyeType ? 'eye-filled' : 'eye-slash-filled'"
color="#fff"
></uni-icons>
<text style="margin-right: 20rpx">账户总金额(元)</text><uni-icons @click="updateEye()"
:type="eyeType ? 'eye-filled' : 'eye-slash-filled'" color="#fff"></uni-icons>
</view>
<view class="price" v-show="eyeType"
>{{ all_money }}元</view
>
<view class="price" v-show="eyeType">{{ all_money }}元</view>
<view class="price" v-show="!eyeType">****元</view>
<view class="bubble">
<!-- <image src="../../static/img/contract/bubble.png"></image> -->
<view class="text" v-show="eyeType"
>可提现金额{{ userInfo.user_money || 0.0 }}元</view
>
<view class="text" v-show="eyeType">可提现金额{{ userInfo.user_money || 0.0 }}元</view>
<view class="text" v-show="!eyeType">可提现金额****元</view>
</view>
</view>
@ -62,7 +44,7 @@
</view>
<u-line direction="col" length="40%" color="#999999FF"></u-line>
<view class="item">
<view>个人收益金额(元)</view>
<view>个人预计收益金额(元)</view>
<view class="num" v-show="eyeType">{{
userInfo.user_money || 0.0
}}</view>
@ -72,11 +54,7 @@
</view>
<view class="bill">
<view style="width: 100%; height: 90rpx; background-color: #fff"></view>
<uni-section
titleFontSize="32rpx"
type="line"
title="账单流水"
></uni-section>
<uni-section titleFontSize="32rpx" type="line" title="账单流水"></uni-section>
<!-- <u-subsection :list="billTypeList" :current="current" mode="subsection"></u-subsection> -->
<!-- <view class="type_box">
<view class="type">
@ -128,11 +106,8 @@
<text v-if="item.change_type == 202" style="color: #46be61">{{
item.type_desc
}}</text>
<text
v-else-if="item.change_type == 203"
style="color: #ff7c32"
>{{ item.type_desc }}</text
>
<text v-else-if="item.change_type == 203"
style="color: #ff7c32">{{ item.type_desc }}</text>
<text v-else="item.change_type == 203">{{
item.type_desc
}}</text>
@ -171,12 +146,8 @@
</view>
-->
<u-loadmore
:status="loadConfig.status"
:loading-text="loadConfig.loadingText"
:loadmore-text="loadConfig.loadmoreText"
:nomore-text="loadConfig.nomoreText"
/>
<u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText"
:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
</view>
<!-- 月账单 -->
<view class="bill_list" v-show="current == 1">
@ -187,15 +158,13 @@
</view>
<view class="bottom">
<view class="left">
<view>个人收益金额(元)</view>
<view>个人预计收益金额(元)</view>
<view class="num">{{ item.income }}</view>
</view>
<view class="right">
<view
>支出金额:{{
<view>支出金额:{{
item.expenditure > 0 ? item.expenditure : "0.00"
}}</view
>
}}</view>
<view>入账金额:{{ item.income > 0 ? item.income : "0.00" }}</view>
</view>
</view>
@ -424,8 +393,7 @@ page {
background-repeat: no-repeat;
background-size: 100% 100%;
.text {
}
.text {}
}
}

15
subpkg/newPersonnel/newPersonnel.vue
View File

@ -46,7 +46,8 @@
<u--input v-model="formData.id_card" placeholder="请输入身份证号" @input="c_idcard"
type="idcard"></u--input>
</u-form-item>
<u-form-item v-if="$store.state.app.userInfo.company.company_type==18" labelWidth="auto" label="是否为小队长" required prop="is_captain" borderBottom>
<u-form-item v-if="$store.state.app.userInfo.company.company_type==18" labelWidth="auto"
label="是否为小队长" required prop="is_captain" borderBottom>
<u-radio-group v-model="formData.is_captain" style="margin: 16rpx;">
<u-radio activeColor="#0122C7" :customStyle="{marginRight: '16px'}"
v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index"
@ -54,7 +55,8 @@
</u-radio>
</u-radio-group>
</u-form-item>
<u-form-item v-if="$store.state.app.userInfo.company.company_type==41" labelWidth="auto" label="是否为服务部长" required prop="is_service_manager" borderBottom>
<u-form-item v-if="$store.state.app.userInfo.company.company_type==16" labelWidth="auto"
label="是否为服务部长" required prop="is_service_manager" borderBottom>
<u-radio-group v-model="formData.is_service_manager" style="margin: 16rpx;">
<u-radio activeColor="#0122C7" :customStyle="{marginRight: '16px'}"
v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index"
@ -295,8 +297,7 @@
</u-upload>
</u-form-item> -->
</u--form>
<button @click="modelShow=true" type="primary" class="btn"
style="margin: 28rpx;">创建</button>
<button @click="modelShow=true" type="primary" class="btn" style="margin: 28rpx;">创建</button>
</view>
<u-modal :show="modelShow" title="提示" content='请确认人员信息无误后再创建' closeOnClickOverlay showCancelButton
@close="modelShow=false" @cancel="modelShow=false" @confirm="$u.throttle(addAcountNum, 2000)"></u-modal>
@ -464,8 +465,10 @@
await this.$nextTick();
if (!this.formData.avatar) return Toast('头像未上传');
let flag = this.$refs.districtSelectorRef.validate();
if (!this.formData.qualification.id_card || !this.formData.qualification.id_card_b) return Toast('身份证未上传');
if (!this.formData.qualification.bank_account || !this.formData.qualification.bank_account_b) return Toast(
if (!this.formData.qualification.id_card || !this.formData.qualification.id_card_b) return Toast(
'身份证未上传');
if (!this.formData.qualification.bank_account || !this.formData.qualification.bank_account_b)
return Toast(
'银行卡未上传');
this.$refs.uForm.validate().then(async (e) => {
if (e && flag) {

5
subpkg/personnel/personnel.vue
View File

@ -109,7 +109,9 @@
:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
</view>
<!-- <button class="new_btn" @click.stop="navTo('/subpkg/newPersonnel/newPersonnel')">创建账号</button> -->
<mybtn v-if="$store.state.app.userInfo.company && ($store.state.app.userInfo.company.company_type==18||$store.state.app.userInfo.company.company_type==41)" text="创建账号" @click="navTo('/subpkg/newPersonnel/newPersonnel')"></mybtn>
<mybtn
v-if="$store.state.app.userInfo.company && ($store.state.app.userInfo.company.company_type==18||$store.state.app.userInfo.company.company_type==16)"
text="创建账号" @click="navTo('/subpkg/newPersonnel/newPersonnel')"></mybtn>
</view>
</template>
@ -204,6 +206,7 @@
.personnel {
padding: 28rpx 0;
padding-bottom: 160rpx;
.new_btn {
position: fixed;
bottom: 30rpx;

10
subpkg/townTask/townGather.vue
View File

@ -401,8 +401,8 @@
},
],
formData: {
"entityName": "5",
phone: "15884967539",
"entityName": "",
phone: "",
employee: "",
arableLand: "",
"breeding_training": 1, //有无养殖培训
@ -466,15 +466,12 @@
}
},
onLoad(option) {
this.taskId = option.task_id
if (option.type == 'supply') this.page = 0
townMasterTask3List({
id: option.task_id
}).then(res => {
this.pas_Info = res.data.template_info.extend.purchase_sales_info
this.pas_Info = res.data.template_info.extend.purchase_sales_info || this.pas_Info
if (option.index) {
this.readonly = true
this.flag = true
@ -601,6 +598,7 @@
},
async commit() {
console.log(this.pas_Info)
if (this.page) {
this.pas_Info.planting.push(this.formData)
await townMasterTask3Commit({