fix:3级页跳转留资

src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info.html

@@ -69,7 +69,7 @@
               <van-field @input="entOnChange('input')" @blur="entOnChange('blur')" @focus="infoCheckMap.company = ''"
                 :error-message="infoCheckMap.company" required v-model.trim="infoMap.company" label="公司名称"
                 placeholder="请输入公司名称"></van-field>
-              <van-field v-if="moduleShow.companyType" v-model="infoMap.companyType" label="公司类型"
+              <van-field v-if="moduleShow.companyType" required v-model="infoMap.companyType" label="公司类型"
                 @click="openPop('公司类型')" readonly is-link placeholder="请选择公司类型"></van-field>
               <van-field v-if="moduleShow.position" :class="{'hide-border': infoMap.position === '其他'}" required
                 v-model="infoMap.position" label="职位" @click="openPop('职位')" readonly is-link placeholder="请选择职位">
@@ -1121,6 +1121,12 @@
           }
           return true
         },
+        checkEntType() {
+          if (this.infoMap.companyType === '') {
+            return false
+          }
+          return true
+        },
         checkPosition() {
           if (!this.moduleShow.position) return true
           if (this.infoMap.position !== "" && this.infoMap.position !== '其他') {
@@ -1133,7 +1139,7 @@
           return namereg.test(this.infoMap.position_other)
         },
         isSubmitDisabled() {
-          return !this.checkName || !this.checkPhone || !this.checkEmail || !this.checkEntName || !this.checkPosition || (this.showBranch && !this.infoMap.branch)
+          return !this.checkName || !this.checkPhone || !this.checkEmail || !this.checkEntName || !this.checkEntType || !this.checkPosition || (this.showBranch && !this.infoMap.branch)
         },
         isMoreSelect() {
           return this.popInfo.label === '公司类型'
@@ -1234,7 +1240,7 @@
             }
             if (r && r.error_msg === '' && r.data) {
               this.setEchoInfo(r.data)
-              var result = checkRequiredKeys(['name', 'phone', 'company', 'position', 'branch'], r.data)
+              var result = checkRequiredKeys(['name', 'phone', 'company','companyType', 'position', 'branch'], r.data)
               if (result) {
                 var skipAuto = ['jyarticle_see3', 'article_collection', 'article_original', 'jypush_see10']
                 var _this = this
@@ -1537,6 +1543,9 @@
           this.ajaxParams.phone = this.infoMap.phone
           this.ajaxParams.mail = this.infoMap.email
           this.ajaxParams.company = this.infoMap.company
+          if (getParam('source') === 'peugeot_supplier_regist'){
+            this.ajaxParams.publish_id = getParam('infoid')
+          }
           this.ajaxParams.position = this.infoMap.position
           if (this.infoMap.position === '其他') {
             this.ajaxParams.position = '其他/' + this.infoMap.position_other
@@ -1634,6 +1643,10 @@
                     if (source.indexOf('ent-manage-app') > -1) {
                       message = '您的申请已提交，我们会尽快联系您并预约演示时间，请耐心等待～您将获得免费体验商机管理全部功能！'
                     }
+                    //
+                    if (source.indexOf('peugeot_supplier_regist') > -1) {
+                      message = '我们会尽快联系您完成供应商报名，请耐心等待。'
+                    }
 
 
 

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -897,6 +897,8 @@
               <script>
                 $(".btnn").click(function(){
                   //点击报名事件处理
+                  var infoid = window.location.pathname.split("/")[4].split(".html")[0]
+                  location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=' + 'peugeot_supplier_regist' + '&infoid=' + infoid
                   // vm.dialogTitleTop='供应商报名'
                   // vm.dialogTitle = '请完善您的个人信息，抢先对接采购单位'
                 })

src/web/templates/frontRouter/wx/bigmember/free/perfect_info.html

@@ -77,7 +77,7 @@
                         </div>
                         <van-field @input="entOnChange('input')" @blur="entOnChange('blur')" @focus="infoCheckMap.company = ''"
                                    :error-message="infoCheckMap.company" required v-model.trim="infoMap.company" label="公司名称" placeholder="请输入公司名称"></van-field>
-                        <van-field v-if="moduleShow.companyType" v-model="infoMap.companyType" label="公司类型" @click="openPop('公司类型')" readonly is-link
+                        <van-field v-if="moduleShow.companyType" v-model="infoMap.companyType" required label="公司类型" @click="openPop('公司类型')" readonly is-link
                                    placeholder="请选择公司类型"></van-field>
                         <van-field v-if="moduleShow.position" :class="{'hide-border': infoMap.position === '其他'}"  required v-model="infoMap.position" label="职位" @click="openPop('职位')" readonly is-link
                                    placeholder="请选择职位"></van-field>
@@ -777,6 +777,12 @@
         }
         return true
       },
+      checkEntType() {
+        if (this.infoMap.companyType === '') {
+          return false
+        }
+        return true
+      },
       checkPosition () {
         if (!this.moduleShow.position) return true
         if (this.infoMap.position !== "" && this.infoMap.position !== '其他') {
@@ -789,7 +795,7 @@
         return namereg.test(this.infoMap.position_other)
       },
       isSubmitDisabled () {
-        return !this.checkName || !this.checkPhone || !this.checkEmail || !this.checkEntName || !this.checkPosition || (this.showBranch && !this.infoMap.branch)
+        return !this.checkName || !this.checkPhone || !this.checkEmail || !this.checkEntName || !this.checkEntType || !this.checkPosition || (this.showBranch && !this.infoMap.branch)
       },
       isMoreSelect () {
         return this.popInfo.label === '公司类型'
@@ -910,7 +916,7 @@
           }
           if (r && r.error_msg === '' && r.data) {
             this.setEchoInfo(r.data)
-            var result = checkRequiredKeys(['name', 'phone', 'company', 'position', 'branch'], r.data)
+            var result = checkRequiredKeys(['name', 'phone', 'company','companyType', 'position', 'branch'], r.data)
             if (result) {
               var skipAuto = ['jyarticle_see3', 'article_collection', 'article_original', 'jypush_see10']
               var _this = this
@@ -922,6 +928,25 @@
           }
         })
       },
+      getParam (name) {
+        var search = document.location.search;
+        // alert(search);
+        var pattern = new RegExp("[?&]" + name + "\=([^&]+)", "g");
+        var matcher = pattern.exec(search);
+        var items = null;
+        if (null != matcher) {
+          try {
+            items = decodeURIComponent(decodeURIComponent(matcher[1]));
+          } catch (e) {
+            try {
+              items = decodeURIComponent(matcher[1]);
+            } catch (e) {
+              items = matcher[1];
+            }
+          }
+        }
+        return items
+      },
       highlightText (value, keyStr) {
         return utils.replaceKeyword(value, keyStr, '<span class="highlight-text">' + keyStr + '</span>')
       },
@@ -1211,6 +1236,9 @@
         this.ajaxParams.phone = this.infoMap.phone
         this.ajaxParams.mail = this.infoMap.email
         this.ajaxParams.company = this.infoMap.company
+        if (this.getParam('source') === 'peugeot_supplier_regist'){
+          this.ajaxParams.publish_id = this.getParam('infoid')
+        }
         this.ajaxParams.position = this.infoMap.position
         if (this.infoMap.position === '其他') {
           this.ajaxParams.position = '其他/' + this.infoMap.position_other
@@ -1325,6 +1353,10 @@
                   if (source.indexOf('ent-manage-') > -1) {
                     message = '您的申请已提交，我们会尽快联系您并预约演示时间，请耐心等待～您将获得免费体验商机管理全部功能！'
                   }
+                  //
+                  if (source.indexOf('peugeot_supplier_regist') > -1) {
+                    message = '我们会尽快联系您完成供应商报名，请耐心等待。'
+                  }
 
 
                   // 免费用户体验

src/web/templates/pc/biddetail_rec.html

@@ -70,7 +70,7 @@
       margin-left: 86px;
       width: 246px;
       height: 24px;
-      background-color: rgba(255, 58, 32, 0.2);
+      background-color: #FFEDEC;
       border-radius: 53px;
       line-height: 24px;
       font-weight: 400;
@@ -623,10 +623,10 @@
                   vm.dialogTitleTop='供应商报名'
                   vm.dialogTitle = '请完善您的个人信息，抢先对接采购单位'
                   // vm.showForm = true
-                  // var infoid = window.location.pathname.split("/")[3].split(".html")[0]
-                  // vm.isNeedSubmit('peugeot_supplier_regist', function () {
-                  //   vm.showSuccess = true
-                  // },"",infoid)
+                  var infoid = window.location.pathname.split("/")[3].split(".html")[0]
+                  vm.isNeedSubmit('peugeot_supplier_regist', function () {
+                    vm.showSuccess = true
+                  },"",infoid)
                 })
               </script>
             </div>

src/web/templates/weixin/wxinfocontent_rec.html

@@ -1254,6 +1254,8 @@ em {
     <script>
       $(".btnn").click(function(){
         //点击报名事件处理
+        var infoid = window.location.pathname.split("/")[3].split(".html")[0]
+        location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=' + 'peugeot_supplier_regist' + '&infoid=' + infoid
         // vm.dialogTitleTop='供应商报名'
         // vm.dialogTitle = '请完善您的个人信息，抢先对接采购单位'
       })