三轮车任务

components/company/company.vue

@@ -295,8 +295,6 @@
 									<u-loading-icon color="#333"></u-loading-icon>
 								</template>
 							</u--image>
-							<view style="border-top:1px dashed #0022C7;margin:20rpx 0">
-							</view>
 							<u--image class="image" @click="priview(company.qualification.business_licenseB)"
 								:src="company.qualification.business_licenseB"
 								v-if="company.qualification.business_licenseB" :lazy-load="true">
@@ -481,7 +479,7 @@
 
 <style lang="scss" scoped>
 	.personnel_list {
-		padding: 28rpx 0;
+		// padding: 28rpx 0;
 
 		.cards {
 			margin: 0 auto;

components/companyFinance/companyFinance.vue

@@ -105,7 +105,6 @@
 		mounted() {
 			uni.$on('companyInfo', (e) => {
 				this.company = e;
-				console.log(this.company);
 				this.initLoad();
 			})
 		},

pages.json

@@ -273,7 +273,7 @@
 			"path": "companySign/companySign",
 			"style": {
 				"navigationBarTitleText": "签约公司详情",
-					"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationBarBackgroundColor": "#0122C7",
 				"navigationBarTextStyle": "white"
 			}

subpkg/companySign/companySign.vue

@@ -2,14 +2,16 @@
 	<view class="">
 		<company :id="id" type="company"></company>
 		<view class="need_contract" v-if="!company.contract||!company.contract.status||!company.company.is_contract">
-			<view class="title">电子合同</view>
+			<!-- <view class="title">电子合同</view> -->
 			<picker v-if="company.contract&&company.contract.check_status==0||!company.contract"
 				:range="contractTypeList" range-key="name" @change="changeType">
-				<u-button class="btns">
+				<button class="btns" style="width: 694rpx; margin: 0 auto;border-radius: 54rpx;overflow: hidden;background-color: #0122c7;color: #fff;">
 					<u-icon name="../../static/img/company/HT.png" size="20" style="margin-right: 10rpx;"></u-icon>
 					发起合同
-				</u-button>
+				</button>
-				<!-- <mybtn text="生成合同" position="false"></mybtn> -->
+				<!-- <view style="width: 694rpx; margin: 0 auto;border-radius: 54rpx;overflow: hidden;">
+          <mybtn text="生成合同" :position="false"><u-icon name="../../static/img/company/HT.png" size="20" style="margin-right: 10rpx;"></u-icon></mybtn>
+        </view> -->
 			</picker>
 			<view v-if="company.contract&&company.contract.check_status==1">
 				<button class="btn tips_center">合同已生成,请等待审核</button>
@@ -34,7 +36,7 @@
 				</view>
 				<u-line color="#999999FF" style="margin: 31rpx 0;"></u-line>
 				<view class="bottom">
-					<button class="send_btn" @click="addContract">发送合同</button>
+					<button class="send_btn" @click="clickContract(2)">发送合同</button>
 				</view>
 			</view>
 			<view v-if="company.contract&&company.contract.check_status==3" class="card">
@@ -61,6 +63,7 @@
 				</view>
 			</view>
 		</view>
+    <u-modal :show="modelShow" title="提醒" :content="modelType==1?'请检查信息无误后再生成合同':'请检查合同无误后再发送'" closeOnClickOverlay showCancelButton cancel-text="我再看看" confirm-text="确认无误" close="modelShow=false" @cancel="modelShow=false" @confirm="modelType==1?createContract():addContract();modelShow=false"></u-modal>
 	</view>
 </template>
 
@@ -90,7 +93,10 @@
 				typeShow: false,
 				timer: null, // 计时器
 				timerCount: 0, //倒计时
-				contractTypeList: []
+				contractTypeList: [],
+        modelShow: false,
+        modelType: 1,
+        nowContractType: -1
 			}
 		},
 		onLoad(options) {
@@ -122,11 +128,13 @@
 			},
 			changeType(e) {
 				// console.log(this.contractTypeList[e.detail.value]);
-				this.createContract({
+        this.nowContractType = e.detail.value;
-					party_b: this.id,
+        this.clickContract(1);
-					contract_type: this.contractTypeList[e.detail.value].id,
+				// this.createContract({
-					type: 1 //1-公司,2-个人
+				// 	party_b: this.id,
-				})
+				// 	contract_type: this.contractTypeList[e.detail.value].id,
+				// 	type: 1 //1-公司,2-个人
+				// })
 			},
 			// 查看合同
 			naviToContract(file) {
@@ -144,41 +152,39 @@
 				})
 				this.contractTypeList = res.data;
 			},
+      clickContract(e){
+        this.modelType = e;
+        this.modelShow = true;
+      },
 			// 生成合同
 			async createContract(data) {
-				uni.showModal({
-					content: '请检查信息无误后再生成合同',
-					confirmText: '确认无误',
-					cancelText: '我再看看',
-					confirmColor: '#3175f9',
-					success: async (e) => {
-						if (e.confirm) {
         uni.showLoading({
         	title: '合同生成中',
         	mask: true
         })
         let res = await initiateContract({
-								party_b: data.party_b,
+        	party_b: this.id,
-								contract_type: data.contract_type,
+        	contract_type: this.contractTypeList[this.nowContractType].id,
-								type: data.type
+        	type: 1
         })
         this.initCompany();
         uni.hideLoading();
         Toast(res.msg || '合同已生成');
         this.navTo('/subpkg/submit/submit?type=' + 1);
-						}
+				// uni.showModal({
-					}
+				// 	content: '请检查信息无误后再生成合同',
-				})
+				// 	confirmText: '确认无误',
+				// 	cancelText: '我再看看',
+				// 	confirmColor: '#3175f9',
+				// 	success: async (e) => {
+				// 		if (e.confirm) {
+							
+				// 		}
+				// 	}
+				// })
 			},
 			// 发送合同
 			async addContract(data) {
-				uni.showModal({
-					content: '请检查合同无误后再发送',
-					confirmText: '确认无误',
-					cancelText: '我再看看',
-					confirmColor: '#3175f9',
-					success: async (e) => {
-						if (e.confirm) {
         try {
         	uni.showLoading({
         		title: '合同发送中',
@@ -196,9 +202,17 @@
         	uni.hideLoading();
         	Toast(e.msg || '合同发送失败');
         }
-						}
+				// uni.showModal({
-					}
+				// 	content: '请检查合同无误后再发送',
-				})
+				// 	confirmText: '确认无误',
+				// 	cancelText: '我再看看',
+				// 	confirmColor: '#3175f9',
+				// 	success: async (e) => {
+				// 		if (e.confirm) {
+							
+				// 		}
+				// 	}
+				// })
 			},
 			// 发送短信
 			async getPostsms() {
@@ -239,7 +253,9 @@
 			},
 		},
 		onPullDownRefresh() {
+      this.initCompany().then(()=>{
         uni.stopPullDownRefresh()
+      })
 		}
 	}
 </script>