diff --git a/components/mybtn/mybtn.vue b/components/mybtn/mybtn.vue index b16cf7a..4066659 100644 --- a/components/mybtn/mybtn.vue +++ b/components/mybtn/mybtn.vue @@ -1,6 +1,6 @@ @@ -10,6 +10,14 @@ text: { type: String, default: '新增' + }, + position:{ + type: Boolean, + default: true + }, + disabled:{ + type: Boolean, + default: false } }, data(){ @@ -37,4 +45,16 @@ line-height: 90rpx; background-color: $theme-oa-color; } + .no_positon{ + width: 100%; + border-radius: 0; + color: #fff; + height: 90rpx; + line-height: 90rpx; + background-color: $theme-oa-color; + } + .disabled{ + background-color: #666; + color: #eee; + } \ No newline at end of file diff --git a/pages.json b/pages.json index da91a11..571f4f4 100644 --- a/pages.json +++ b/pages.json @@ -392,6 +392,15 @@ "navigationBarTextStyle": "white" } + }, { + "path": "submit/submit", + "style": { + "navigationBarTitleText": "提交审核", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } + }] }], "globalStyle": { diff --git a/static/img/contract/ok_b.png b/static/img/contract/ok_b.png new file mode 100644 index 0000000..ede6cbc Binary files /dev/null and b/static/img/contract/ok_b.png differ diff --git a/subpkg/companySign/companySign.vue b/subpkg/companySign/companySign.vue index b6d2fff..c62cc00 100644 --- a/subpkg/companySign/companySign.vue +++ b/subpkg/companySign/companySign.vue @@ -4,9 +4,11 @@ + + @@ -116,6 +118,7 @@ }); Toast('合同已生成'); this.initCompany(); + this.naviTo('/subpkg/submit/submit'); if (this.userInfo.contract.check_status == 3) { this.timerCount = 60; this.timer = setInterval(() => { @@ -142,8 +145,15 @@ id: this.id }) Toast('短信已发送'); + this.naviTo('/subpkg/submit/submit'); } }, + naviTo(url) { + url ? + uni.navigateTo({ + url: url + }) : Toast('暂未开放') + }, }, onPullDownRefresh() { uni.stopPullDownRefresh() diff --git a/subpkg/personnel/personnel.vue b/subpkg/personnel/personnel.vue index f91a9fa..2087d2c 100644 --- a/subpkg/personnel/personnel.vue +++ b/subpkg/personnel/personnel.vue @@ -3,283 +3,314 @@ - - - + + + - + - + {{item.nickname}} - 电话: - {{item.phone||item.account}} + 电话: + {{item.phone||item.account}} - 分管片区: + 分管片区: {{ item.city_name+item.area_name+item.street_name }} - - - 所属公司: - - {{item.company.company_name}} - + + + 所属公司: + + {{item.company.company_name}} + - + - + --> - - + + - + + \ No newline at end of file diff --git a/subpkg/submit/submit.vue b/subpkg/submit/submit.vue new file mode 100644 index 0000000..b895f3f --- /dev/null +++ b/subpkg/submit/submit.vue @@ -0,0 +1,71 @@ + + + + +