Merge branch 'master' of https://gitee.com/gs1-office-web-sit/gs1

package.json

@@ -32,7 +32,6 @@
     "v-clipboard": "^2.2.2",
     "vue": "^2.6.11",
     "vue-baidu-map": "^0.21.22",
-    "vue-puzzle-vcode": "^1.1.9",
     "vue-router": "^3.1.6",
     "vue-slick-carousel": "^1.0.6",
     "vue-social-share": "^0.0.3",

src/App.vue

@@ -7,7 +7,13 @@
 <script>
 export default {
   mounted() {
-    if (!!window.ActiveXObject || 'ActiveXObject' in window) {
+    function checkIE () {
+      if(!!window.ActiveXObject || 'ActiveXObject' in window){
+        return true
+      }
+      return '-ms-scroll-limit' in document.documentElement.style && '-ms-ime-align' in document.documentElement.style
+    }
+    if (checkIE()) {
       window.addEventListener('hashchange', () => {
         let currentPath = window.location.hash.slice(1)
         if (this.$route.path !== currentPath) {

src/views/MyManage/Admin/check.vue

@@ -44,6 +44,7 @@ export default {
   },
   data() {
     return {
+      
       loginInfo: {},
       query: {},
       showUnCheck: false,

src/views/MyManage/UnVerify/vendor.vue

@@ -308,7 +308,7 @@
           id="image"
           lazy
           fit="scale-down"
-          style="width: 90%; margin:0 5%"
+          style="width: 10px;height:10px;opacity:0"
           :src="imagePreview.url"
           :preview-src-list="imagePreview.srcList">
       </el-image>

src/views/MyManage/index.vue

@@ -6,7 +6,7 @@
         <SubNav/>
       </div>
       <div class="col-lg-9">
-        <router-view></router-view>
+        <router-view :key="$route.fullPath"></router-view>
       </div>
     </div>
   </div>
@@ -205,6 +205,7 @@ export default {
               name: "企业实名认证变更",
               index: 1,
               link: "/MyManage/admin/check?type=change&status=3",
+              
             },
           ],
         }

src/views/Search/internal.vue

@@ -267,7 +267,8 @@
 </template>
 
 <script>
-import Vcode from "vue-puzzle-vcode";
+// import Vcode from "vue-puzzle-vcode";
+import Vcode from "../../components/VerifyCode/VerifyCode.vue";
 import validation from "@/views/Search/validation";
 import pagination from "@/views/Search/pagination";
 import moment from "moment";