From f09383426b932abbaca115b5c09a8572d6017031 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: Thu, 10 Dec 2020 19:20:16 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E7=89=A9=E4=B8=9A?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8=E6=B3=A8=E5=86=8C=E5=90=8C=E6=84=8F=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E9=AA=8C=E8=AF=812=E3=80=81=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8=E7=BB=8F=E8=90=A5=E8=8C=83=E5=9B=B4=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/company-extend/company-extend.html |  2 +-
 .../editActivitiesView.html                   |  2 +-
 .../property/editAdvert/editAdvert.html       |  2 +-
 public/pages/common/company/company.html      |  2 +-
 public/pages/common/company/company.js        | 24 ++++++++++++++++++-
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/public/components/common/company-extend/company-extend.html b/public/components/common/company-extend/company-extend.html
index d2257d3c5..b0b3c6dec 100644
--- a/public/components/common/company-extend/company-extend.html
+++ b/public/components/common/company-extend/company-extend.html
@@ -1,4 +1,4 @@
-<fieldset role="tabpanel" aria-labelledby="component-h-0" class="body current" v-bind:class="{no_display:step!=2}" aria-hidden="false">
+<fieldset role="tabpanel" aria-labelledby="component-h-0" class="body current" style="overflow: scroll;" v-bind:class="{no_display:step!=2}" aria-hidden="false">
     <h2>公司扩展信息</h2>
     <div class="row">
         <div class="col-lg-8">
diff --git a/public/components/property/editActivitiesView/editActivitiesView.html b/public/components/property/editActivitiesView/editActivitiesView.html
index 65201e803..60d65da17 100644
--- a/public/components/property/editActivitiesView/editActivitiesView.html
+++ b/public/components/property/editActivitiesView/editActivitiesView.html
@@ -28,7 +28,7 @@
                                 </select></div>
                         </div>
                         <div class="form-group row">
-                            <label class="col-sm-2 col-form-label">头部照片</label>
+                            <label class="col-sm-2 col-form-label">头部照片(800 * 595)</label>
                             <div class="col-sm-10">
                                 <vc:create path="frame/uploadImage"
                                            callBackListener="editActivitiesView"
diff --git a/public/components/property/editAdvert/editAdvert.html b/public/components/property/editAdvert/editAdvert.html
index 8d40ae372..9338bf624 100644
--- a/public/components/property/editAdvert/editAdvert.html
+++ b/public/components/property/editAdvert/editAdvert.html
@@ -113,7 +113,7 @@
                                     </select></div>
                             </div>
                             <div class="form-group row" v-if="editAdvertInfo.viewType == '8888'">
-                                <label class="col-sm-2 col-form-label">图片</label>
+                                <label class="col-sm-2 col-form-label">图片(800 * 373)</label>
                                 <div class="content-img col-sm-10">
                                     <vc:create path="frame/uploadImage"
                                                callBackListener="editAdvert"
diff --git a/public/pages/common/company/company.html b/public/pages/common/company/company.html
index 51b099308..500d90fb2 100644
--- a/public/pages/common/company/company.html
+++ b/public/pages/common/company/company.html
@@ -263,7 +263,7 @@
                                 </textarea>
                                 <br />
 
-                                <input id="acceptTerms" name="acceptTerms" type="checkbox" class="required" aria-required="true" />
+                                <input id="acceptTerms" name="acceptTerms"v-model="acceptTerms" type="checkbox" class="required" aria-required="true" />
                                 <label for="acceptTerms">我同意并遵守以上信息.</label>
                             </fieldset>
 
diff --git a/public/pages/common/company/company.js b/public/pages/common/company/company.js
index 8bab5d756..18ac81fdd 100644
--- a/public/pages/common/company/company.js
+++ b/public/pages/common/company/company.js
@@ -9,7 +9,8 @@
             step:1,
             companyInfo:{
                 errorInfo:""
-            }
+            },
+			acceptTerms: false
         },
          _initMethod:function(){
              //vc.component.initStoreType();
@@ -68,7 +69,28 @@
                     vc.component.step = vc.component.step-1;;
                 }
             },
+			
+			// 验证勾选 “同意条款”
+			validateAcceptTerms: function(){
+				return vc.validate.validate({
+				    companyBaseInfo: vc.component.acceptTerms
+				}, {
+				    'companyBaseInfo': [
+				        {
+				            limit: "required",
+				            param: "",
+				            errInfo: "请阅读须知并勾选确认"
+				        },
+				    ],
+				});
+			},
+			
             finish:function(){
+				// 验证勾选 “同意条款”
+				if(!vc.component.validateAcceptTerms()){
+					vc.component.companyInfo.errorInfo = vc.validate.errInfo;
+					return;
+				}
                 //这里写提交代码
                 console.log("提交审核",vc.component.companyInfo);
                 vc.http.post(