Merge branch 'chongqing-yashichuangneng-qsl' into 'chongqing-yashichuangneng'

merge chongqing-yashichuangneng-qsl into chongqing-yashichuangneng

See merge request duoji/duoji-frontend!6

src/router/index.js

@@ -93,15 +93,15 @@ const routes = [{
             },
             component: () => import('@/views/historyCheck/index'),
         },
-        {
-            path: 'stockHistory',
-            name: 'stockHistory',
-            meta: {
-                icon: 'file-excel',
-                name: '库位历史',
-            },
-            component: () => import('@/views/stockLog/index'),
-        },
+        // {
+        //     path: 'stockHistory',
+        //     name: 'stockHistory',
+        //     meta: {
+        //         icon: 'file-excel',
+        //         name: '库位历史',
+        //     },
+        //     component: () => import('@/views/stockLog/index'),
+        // },
         {
             path: 'stockLogDetail',
             name: 'stockLogDetail',
@@ -136,24 +136,24 @@ const routes = [{
             },
             component: () => import('@/views/cameraManage/model')
         },
-        {
-            path: 'productSpecManage',
-            name: 'productSpecManage',
-            meta: {
-                icon: 'pushpin',
-                name: '品规管理'
-            },
-            component: () => import('@/views/productSpecManage/index')
-        },
-        {
-            path: 'repertoryManage',
-            name: 'repertoryManage',
-            meta: {
-                icon: 'wallet',
-                name: '库存管理'
-            },
-            component: () => import('@/views/repertoryManage/index')
-        },
+        // {
+        //     path: 'productSpecManage',
+        //     name: 'productSpecManage',
+        //     meta: {
+        //         icon: 'pushpin',
+        //         name: '品规管理'
+        //     },
+        //     component: () => import('@/views/productSpecManage/index')
+        // },
+        // {
+        //     path: 'repertoryManage',
+        //     name: 'repertoryManage',
+        //     meta: {
+        //         icon: 'wallet',
+        //         name: '库存管理'
+        //     },
+        //     component: () => import('@/views/repertoryManage/index')
+        // },
         
         {
             path: 'cameraManage/ioTable',

src/views/historyCheck/index.vue

@@ -106,7 +106,11 @@
             <template>
                 <span style="height:100%;">
                     <happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box" style="width:320px;height:90px;">
-                        <viewer><img class="historyImg" :src="imgUrl+text.pic"/></viewer>
+                        <viewer>
+                            <img class="historyImg" :src="imgUrl+text.pic"/>
+                            <img class="historyImg" :src="imgUrl+text.pic+'.jpg'"/>
+                            <img class="historyImg" :src="imgUrl+text.pic+'.jpg.jpg'"/>
+                        </viewer>
                     </happy-scroll>
                 </span>