[企业认证格式修改及企业认证range默认值处理同步易货]

pages/company/approve.vue

@@ -7,7 +7,8 @@
 		<view class="white-box">
 			<view class="inputs logo">
 				<label>企业LOGO</label>
-				<image class="logo-cover" :src="logo.showpath || require('@/static/icons/add-icon.png')" @click="updImg('logo')" mode="aspectFill"></image>
+				<image class="logo-cover" :src="logo.showpath || require('@/static/icons/add-icon.png')"
+					@click="updImg('logo')" mode="aspectFill"></image>
 			</view>
 			<view class="inputs">
 				<label>企业名称</label>
@@ -15,7 +16,8 @@
 			</view>
 			<view class="inputs">
 				<label>企业行业</label>
-				<picker v-if="industry.length > 0" :range="industry" :value="industryIndex" range-key="title" @change="changePicker" data-type="industry">
+				<picker v-if="industry.length > 0" :range="industry" :value="industryIndex" range-key="title"
+					@change="changePicker" data-type="industry">
 					<view class="picker-text nowrap">
 						{{industry[industryIndex].title}}
 						<uni-icons class="picker-icon" type="arrowdown"></uni-icons>
@@ -26,12 +28,17 @@
 				<label>经营类目</label>
 				<view class="picker-text nowrap" @click="opnePopup">
 					<block v-if="categorys.length > 0">
-						<text class="text-item" v-for="(item, index) in category" :key="index" v-if="item.check">{{item.name}}</text>
+						<text class="text-item" v-for="(item, index) in category" :key="index"
+							v-if="item.check">{{item.name}}</text>
 					</block>
 					<block v-else>选择经营类目</block>
 					<uni-icons class="picker-icon" type="arrowdown"></uni-icons>
 				</view>
 			</view>
+			<view class="inputs" v-if="is_range">
+				<label>经营范围</label>
+				<textarea :auto-height='true' v-model="range" placeholder="输入经营范围" />
+			</view>
 			<view class="inputs">
 				<label>法人姓名</label>
 				<input type="text" v-model="corporate" placeholder="输入法人姓名" />
@@ -46,7 +53,8 @@
 			</view>
 			<view class="inputs logo">
 				<label>营业执照</label>
-				<image class="license-cover" :src="license.showpath || require('@/static/icons/add-icon.png')" @click="updImg('license')" mode="aspectFill"></image>
+				<image class="license-cover" :src="license.showpath || require('@/static/icons/add-icon.png')"
+					@click="updImg('license')" mode="aspectFill"></image>
 			</view>
 			<view class="btns">
 				<button type="default" size="default" @click="submitApplies">提交认证</button>
@@ -60,7 +68,8 @@
 					<view class="subtitle">请选择经营类目</view>
 				</view>
 				<view class="category-flex">
-					<view class="category-flex-item" :class="{'show' : item.check}" v-for="(item, index) in category" :key="index" @click="item.check = !item.check">{{item.name}}</view>
+					<view class="category-flex-item" :class="{'show' : item.check}" v-for="(item, index) in category"
+						:key="index" @click="item.check = !item.check">{{item.name}}</view>
 				</view>
 				<view class="btns">
 					<button type="default" size="default" @click="affirmCategory">确定</button>
@@ -71,8 +80,15 @@
 </template>
 
 <script>
-	import { appliesCreate, applies, appliesInfo, appliesCategory } from '@/apis/interfaces/company'
+	import {
-	import { uploads } from '@/apis/interfaces/uploading'
+		appliesCreate,
+		applies,
+		appliesInfo,
+		appliesCategory
+	} from '@/apis/interfaces/company'
+	import {
+		uploads
+	} from '@/apis/interfaces/uploading'
 	export default {
 		data() {
 			return {
@@ -93,14 +109,17 @@
 				industryIndex: 0,
 				reason: '',
 				category: [],
-				categorys	 : []
+				categorys: [],
+				range: "",
+				is_range: false,
 			};
 		},
 		created() {
 			// 读取配置信息
 			appliesCreate().then(res => {
-				this.industry 		= res
+				this.industry = res.industries
 				this.formType = this.$Route.query.form_type
+				this.is_range = res.is_range
 				if (this.formType === 'put') {
 					appliesInfo().then(formValue => {
 						for (let val of formValue.categories) {
@@ -108,8 +127,10 @@
 								this.categorys.push(val.category_id)
 							}
 						}
+						this.range = formValue.range
 						this.name = formValue.name
-						this.industryIndex  = this.industry.findIndex(val=> val.industry_id === formValue.industry.industry_id)
+						this.industryIndex = this.industry.findIndex(val => val.industry_id === formValue
+							.industry.industry_id)
 						this.category = formValue.categories
 						this.corporate = formValue.certification.name
 						this.identity = formValue.certification.idcard
@@ -123,7 +144,8 @@
 						})
 					})
 				} else {
-					this.getAppliesCategory(res[0].industry_id)
+					console.log('11', res)
+					this.getAppliesCategory(res.industries[0].industry_id)
 				}
 			}).catch(err => {
 				uni.showToast({
@@ -158,7 +180,8 @@
 					id_card: this.identity,
 					code: this.org,
 					industry_id: this.industry[this.industryIndex].industry_id,
-					categories	: this.categorys
+					categories: this.categorys,
+					range: this.range
 				}, method).then(res => {
 					uni.showModal({
 						title: '提示',
@@ -229,24 +252,28 @@
 			padding: $padding * 2 0;
 			box-sizing: border-box;
 			@extend .vertical;
+
 			.title {
 				text-align: center;
 				font-size: $title-size + 14;
 				font-weight: bold;
 				line-height: 90rpx;
 			}
+
 			.subtitle {
 				font-size: $title-size-m;
 				color: $text-gray;
 				text-align: center;
 			}
 		}
+
 		.white-box {
 			background-color: white;
 			border-radius: $radius $radius 0 0;
 			min-height: 85vh;
 			padding: $padding $padding * 2 $padding * 2;
 			box-sizing: border-box;
+
 			.inputs {
 				position: relative;
 				margin-top: $margin;
@@ -255,6 +282,7 @@
 				padding-left: 200rpx;
 				line-height: 90rpx;
 				min-height: 90rpx;
+
 				label {
 					position: absolute;
 					top: 0;
@@ -262,30 +290,37 @@
 					width: 200rpx;
 					font-size: $title-size;
 				}
+
 				input {
 					height: 90rpx;
 					line-height: 90rpx;
 					font-size: $title-size;
 				}
+
 				.picker-text {
 					position: relative;
 					padding-right: 90rpx;
+
 					.picker-icon {
 						position: absolute;
 						right: 0;
 						top: 0;
 					}
+
 					.text-item {
 						margin-left: 10rpx;
+
 						&:first-child {
 							margin-left: 0;
 						}
 					}
 				}
 			}
+
 			.logo {
 				height: $padding + 98;
 				padding-bottom: $padding;
+
 				.logo-cover {
 					position: absolute;
 					right: 0;
@@ -295,14 +330,17 @@
 					background: $border-color-lg;
 					border-radius: 50%;
 				}
+
 				.license-cover {
 					@extend .logo-cover;
 					border-radius: 0;
 					width: 131rpx;
 				}
 			}
+
 			.btns {
 				padding-top: $padding * 2;
+
 				button {
 					background: $mian-color;
 					border-radius: 0;
@@ -310,23 +348,28 @@
 					line-height: 90rpx;
 					font-size: $title-size;
 					color: white;
+
 					&::after {
 						border: none;
 					}
 				}
 			}
 		}
+
 		// 经营类目
 		.category-popup {
 			background: #F5F5F5;
 			padding: 0 $padding * 2 $padding * 2 $padding * 2;
+
 			.header {
 				padding-bottom: $padding;
 			}
+
 			.category-flex {
 				margin: 0 -10rpx;
 				display: flex;
 				flex-wrap: wrap;
+
 				.category-flex-item {
 					margin: 10rpx;
 					background: white;
@@ -335,14 +378,17 @@
 					text-align: center;
 					font-size: $title-size-m;
 					@extend .nowrap;
+
 					&.show {
 						color: white;
 						background-color: $mian-color;
 					}
 				}
 			}
+
 			.btns {
 				padding-top: $padding * 2;
+
 				button {
 					background: $mian-color;
 					border-radius: 0;
@@ -350,6 +396,7 @@
 					line-height: 90rpx;
 					font-size: $title-size;
 					color: white;
+
 					&::after {
 						border: none;
 					}