Merge branch 'master' of http://zyys.donghuajinyun.com/gitlib/jiangzaicheng/mcep-h5

src/views/login/ForgetPassView.vue

@@ -116,7 +116,7 @@
         <van-divider :style="{ margin: 0 }"></van-divider>
         <div style="margin: 16px">
           <van-button square block type="info" native-type="submit" style="background-color: #3672F1;border-radius: 5px;"
-            >登录</van-button
+            >确定</van-button
           >
         </div>
       </van-form>

src/views/main/Main.vue

@@ -9,6 +9,9 @@
 
 <template>
   <div class="d-page d-flex flex-column" style="background-color: linear-gradient(to bottom, #0B54E0, #ffffff); padding-bottom:20px;">
+
+      <scroller-view v-calculate-height pulldown="true" pullup="true" :height="10000"  class="product"  >
+
             <div class="rarle">
       <tools-bar :title="tatleName" style="width: 100%; height: calc(25vh)">
       </tools-bar>
@@ -24,9 +27,17 @@
           height: 34px;
           margin: 2% auto;
           border-radius: 10px;
-          position: absolute;
-          top: 21%;
+         
+      
+        
           left: 5%;
+            position: absolute;
+  top: 22vh;
+
+
+  display: flex;
+
+
         "
       >
         <van-col
@@ -338,7 +349,6 @@
 
 
       </div>
-      <scroller-view v-calculate-height pulldown="true" pullup="true" :height="10000"  class="product"  >
         <div
           v-for="(item, index) in productList"
           :key="index"
@@ -437,6 +447,13 @@ export default class Main extends Vue {
 		};
 
 
+    
+      created(){
+  
+      document.addEventListener('touchmove', event => {    event.preventDefault()  }, { passive: false })
+  }
+
+
   //测试
   demo() {
     this.$router.push({

src/views/recognition/Intention.vue

@@ -8,10 +8,15 @@
 -->
 
 <template>
+
+
   <div class="body">
     <div class="rarle">
       <tatle-bar :tatle="tatleName"></tatle-bar>
     </div>
+
+    <scroller-view v-calculate-height pulldown="true"  :height="10000"    >
+
     <div>
       <div class="layout">
         <van-row type="flex" class="CoolName">
@@ -151,6 +156,8 @@
 
 
     </div>
+
+    </scroller-view>
   </div>
 </template>
 

src/views/workbench/PersonLod.vue

@@ -119,9 +119,9 @@ export default class PersonLod extends Vue {
          },
       })
   }
-    retyen(){
-      this.$router.back();
-    }
+    // retyen(){
+    //   this.$router.back();
+    // }
 
     modifyPassword(){
        this.$router.push({
@@ -130,22 +130,22 @@ export default class PersonLod extends Vue {
       })
   }
 
-    onClickReturn(){
-      // console.log("1111")
-     this.$router.push({
-      name: `Mianview`,
-       params: {
-             indexed: "1"
-          }
-    })
-    //    debugger
+    // onClickReturn(){
+    //   // console.log("1111")
     //  this.$router.push({
-    //   name: "MainView",
+    //   name: `Mianview`,
     //    params: {
     //          indexed: "1"
     //       }
-    // });
-    }
+    // })
+    // //    debugger
+    // //    this.$router.push({
+    // //   name: "MainView",
+    // //   params: {
+    // //         indexed: "1"
+    // //       }
+    // // });
+    // }
 }
 </script>
 <style scoped lang="scss">

src/views/workbench/modifyInfo.vue

@@ -11,7 +11,7 @@
   <div>
 
     <div class="rarle">
-      <tatle-bar :tatle="tatleName"  style="background: #0B54E0" @onClickReturn="onClickReturn"></tatle-bar>
+      <tatle-bar :tatle="tatleName"  style="background: #0B54E0" @="onClickReturn"></tatle-bar>
     </div>
     <van-row type="flex" class="iconImg">
       <van-col span="24">
@@ -93,13 +93,6 @@ export default class PersonLod extends Vue {
   }
 
   modifyInfo(){
-       this.$router.push({
-        name: "PersonLod"
-        //参数
-      })
-  }
-
-     onClickReturn(){
       this.$router.back();
   }
 }

src/views/workbench/modifyPassword.vue

@@ -11,7 +11,7 @@
   <div>
 
     <div class="rarle">
-      <tatle-bar :tatle="tatleName"  style="background: #0B54E0" @onClickReturn="onClickReturn" ></tatle-bar>
+      <tatle-bar :tatle="tatleName"  style="background: #0B54E0"  ></tatle-bar>
     </div>
     <van-row type="flex" class="iconImg">
       <van-col span="24">
@@ -115,15 +115,12 @@ export default class PersonLod extends Vue {
     this.passwordTypeB = this.passwordTypeB === 'password' ? 'text' : 'password'
   }
   modifyInfo(){
-       this.$router.push({
-        name: "PersonLod"
-        //参数
-      })
-  }
-
-       onClickReturn(){
       this.$router.back();
   }
+
+    //    onClickReturn(){
+    //    this.$router.back();
+    //  }
 }
 </script>
 <style scoped lang="scss">