Merge remote-tracking branch 'origin/master'

src/views/activitypage/registeruser.vue

@@ -163,14 +163,17 @@
         methods: {
             registertype(a){
                 this.search.empType = a;
+                this.cur_page = 1;
                 this.userlistget();
             },
             submitTypes(a){
                 this.search.hasProjectRequirement = a;
+                this.cur_page = 1;
                 this.userlistget();
             },
             isauth(a){
                 this.search.authenticationState = a;
+                this.cur_page = 1;
                 this.userlistget();
 
             },

src/views/contactusview/contactusphone.vue

@@ -10,11 +10,12 @@
             <div class="divtext">
                 <span class="iconfont icon-wechat"></span>
                 <p><span style="font-weight: bold">{{$t('bottomNav.kfWechat')}}：</span>techbookservice</p>
+                <p style="margin-top: 0.3rem"><span style="font-weight: bold;">{{$t('projectdynamics.contactnumber')}}：</span>0316-6175185</p>
             </div>
             <div class="divtext">
                 <span class="iconfont icon-dingwei"></span>
-                <p><span style="font-weight: bold">{{$t('Otherjson.bjAddress')}}</span>{{$t('Otherjson.addresstext')}}</p>
                 <p><span style="font-weight: bold">{{$t('Otherjson.hbAddress')}}</span>{{$t('Otherjson.hbAddressText')}}</p>
+                <p><span style="font-weight: bold">{{$t('Otherjson.bjAddress')}}</span>{{$t('Otherjson.addresstext')}}</p>
             </div>
         </div>
         <div>

src/views/innovatecompany/lreleaseproject/viewproject.vue

@@ -763,6 +763,11 @@
                     if(response.code == 0) {
                         window.addEventListener('scroll', this.menu);
                         this.addData = response.result;
+                        if(response.result.projectOtherNumberDTO){
+                            this.addData.projectOtherNumberDTO = response.result.projectOtherNumberDTO;
+                        }else{
+                            this.addData.projectOtherNumberDTO = {};
+                        }
                         this.stateauth = response.msg;
                         this.authenticationState = response.result.authenticationState;
                         this.authContent = response.result.authContent;