Merge remote-tracking branch 'origin/dev' into dev

+viewPc
+测试打包  npm run build:stage
+生产打包  npm run build:prod

@@ -457,7 +457,7 @@ export const constantRoutes = [
           },
           {
             path: 'list/:id',
-            component: () => import('@/viewsPc/match/detail'),
+            component: () => import('@/viewsPc/match/detail_en'),
             name: 'matchDetail',
             meta: { title: '赛事详情' }
           }

@@ -399,7 +399,7 @@ export const constantRoutes = [
           },
           {
             path: 'list/:id',
-            component: () => import('@/viewsPc/match/detail'),
+            component: () => import('@/viewsPc/match/detail_en'),
             name: 'matchDetail',
             meta: { title: '赛事详情' }
           },

@@ -61,9 +61,9 @@
         </div>
       </el-dialog>
     </div>
-<!--    <div class="poCode">-->
-<!--      <el-image :preview-src-list="['/img/code.jpg']" hide-on-click-modal="true" style="width: 120px;height: 120px;" src="/img/code.jpg"/>-->
-<!--    </div>-->
+    <div class="poCode">
+      <el-image :preview-src-list="['/img/code.jpg']" hide-on-click-modal="true" style="width: 120px;height: 120px;" src="/img/code.jpg"/>
+    </div>
     <dialog-master-class ref="masterClassRef"/>
     <pick-up ref="pickupRef"></pick-up>
     <back-number ref="backNumberRef"></back-number>