shaogen1995 hai 7 meses
pai
achega
a6cae1183f

+ 2 - 2
hot/src/views/Home.vue

@@ -366,8 +366,8 @@ export default {
           padding: 0px 50px;
           padding: 0px 50px;
           .smImgBox {
           .smImgBox {
             width: 100%;
             width: 100%;
-            height: 100%;
-            cursor: zoom-in;
+            height: 100%; 
+            // cursor: zoom-in;
             & > img {
             & > img {
               pointer-events: none;
               pointer-events: none;
               width: 100%;
               width: 100%;

+ 1 - 2
scene/src/views/gui/components/share.vue

@@ -6,9 +6,8 @@
         <img src="../../../assets/img/close.png" alt="" />
         <img src="../../../assets/img/close.png" alt="" />
       </div>
       </div>
     </div>
     </div>
-
     <div class="shaTxt">
     <div class="shaTxt">
-      <p>{{isMobile?'长按保存二维码':'请使用手机扫码二维码'}}或</p>
+      <p>{{isMobile?'长按保存二维码':'请用手机微信扫描二维码'}}或</p>
       <p>复制分享链接</p>
       <p>复制分享链接</p>
     </div>
     </div>
 
 

BIN=BIN
web/src/assets/img/expert.png


BIN=BIN
web/src/assets/img/goods.png


BIN=BIN
web/src/assets/img/home.png


+ 0 - 1
web/src/pages/A3goods/A3look/index.module.scss

@@ -30,7 +30,6 @@
         .Limg {
         .Limg {
           width: 100%;
           width: 100%;
           height: 100%;
           height: 100%;
-          cursor: zoom-in;
 
 
           img {
           img {
             pointer-events: none;
             pointer-events: none;

+ 9 - 7
web/src/pages/A3goods/A3look/index.tsx

@@ -38,13 +38,15 @@ function A3look({ closeFu, id, isApp }: Props) {
   // 点击图片查看大图
   // 点击图片查看大图
   const lookBigImg = useCallback(
   const lookBigImg = useCallback(
     (url: string) => {
     (url: string) => {
-      if (isApp) {
-        ImageViewer.show({ image: baseURL + url })
-      } else {
-        store.dispatch({
-          type: 'layout/lookBigImg',
-          payload: { url: baseURL + url, show: true }
-        })
+      if (1 + 1 !== 2) {
+        if (isApp) {
+          ImageViewer.show({ image: baseURL + url })
+        } else {
+          store.dispatch({
+            type: 'layout/lookBigImg',
+            payload: { url: baseURL + url, show: true }
+          })
+        }
       }
       }
     },
     },
     [isApp]
     [isApp]

+ 12 - 0
web/src/pages/A3goods/index.module.scss

@@ -4,6 +4,18 @@
   position: relative;
   position: relative;
   background-image: url('../../assets/img/goods/bg.jpg');
   background-image: url('../../assets/img/goods/bg.jpg');
   :global {
   :global {
+    .A3btn {
+      position: absolute;
+      z-index: 99;
+      right: calc(5% - 15px);
+      top: 20px;
+      & > img {
+        margin-right: 15px;
+        width: 50px;
+        cursor: pointer;
+      }
+    }
+
     .A3top {
     .A3top {
       height: 90px;
       height: 90px;
       display: flex;
       display: flex;

+ 12 - 2
web/src/pages/A3goods/index.tsx

@@ -13,8 +13,8 @@ import 'swiper/css'
 import 'swiper/css/free-mode'
 import 'swiper/css/free-mode'
 import 'swiper/css/mousewheel'
 import 'swiper/css/mousewheel'
 
 
-import { getDictList, getExpertList, getGoodsList } from '@/store/action/all'
-import { DictType, ExpertType, GoodsRow } from '@/types'
+import { getDictList, getGoodsList } from '@/store/action/all'
+import { DictType, ExpertType } from '@/types'
 import { Input, Pagination } from 'antd'
 import { Input, Pagination } from 'antd'
 import { baseURL } from '@/utils/http'
 import { baseURL } from '@/utils/http'
 import A3look from './A3look'
 import A3look from './A3look'
@@ -22,7 +22,11 @@ import A3look from './A3look'
 // 图片导入
 // 图片导入
 import topBgImg from '@/assets/img/goods/topBg.png'
 import topBgImg from '@/assets/img/goods/topBg.png'
 import nullImg from '@/assets/img/goods/null.png'
 import nullImg from '@/assets/img/goods/null.png'
+import homeImg from '@/assets/img/home.png'
+import expertImg from '@/assets/img/expert.png'
+
 import { FromDataType } from '../A4expert/data'
 import { FromDataType } from '../A4expert/data'
+import history from '@/utils/history'
 
 
 function A3goods() {
 function A3goods() {
   const [topArr, setTopArr] = useState<DictType[]>([])
   const [topArr, setTopArr] = useState<DictType[]>([])
@@ -79,6 +83,12 @@ function A3goods() {
     <div className={styles.A3goods}>
     <div className={styles.A3goods}>
       <LeftTopLogo />
       <LeftTopLogo />
 
 
+      {/* 右侧按钮 */}
+      <div className='A3btn' hidden={!!editId}>
+        <img src={homeImg} alt='' onClick={() => history.push('/')} title='首页' />
+        <img src={expertImg} alt='' onClick={() => history.push('/expert')} title='专家风采' />
+      </div>
+
       {/* 顶部 */}
       {/* 顶部 */}
       <div className='A3top' hidden={!!editId}>
       <div className='A3top' hidden={!!editId}>
         <img className='A3topll' src={topBgImg} alt='' />
         <img className='A3topll' src={topBgImg} alt='' />

+ 2 - 2
web/src/pages/A4expert/A4look/index.module.scss

@@ -32,7 +32,7 @@
           height: 100%;
           height: 100%;
 
 
           & > div {
           & > div {
-            cursor: zoom-in;
+            // cursor: zoom-in;
             width: 100%;
             width: 100%;
             height: 100%;
             height: 100%;
             img {
             img {
@@ -115,7 +115,7 @@
   :global {
   :global {
     .Lcolse {
     .Lcolse {
       z-index: 10;
       z-index: 10;
-      cursor: pointer;
+      // cursor: pointer;
       position: absolute;
       position: absolute;
       top: 10px;
       top: 10px;
       right: 10px;
       right: 10px;

+ 9 - 7
web/src/pages/A4expert/A4look/index.tsx

@@ -52,13 +52,15 @@ function A4look({ editId, closeFu, isApp }: Props) {
   // 点击图片查看大图
   // 点击图片查看大图
   const lookBigImg = useCallback(
   const lookBigImg = useCallback(
     (url: string) => {
     (url: string) => {
-      if (isApp) {
-        ImageViewer.show({ image: baseURL + url })
-      } else {
-        store.dispatch({
-          type: 'layout/lookBigImg',
-          payload: { url: baseURL + url, show: true }
-        })
+      if (1 + 1 !== 2) {
+        if (isApp) {
+          ImageViewer.show({ image: baseURL + url })
+        } else {
+          store.dispatch({
+            type: 'layout/lookBigImg',
+            payload: { url: baseURL + url, show: true }
+          })
+        }
       }
       }
     },
     },
     [isApp]
     [isApp]

+ 12 - 0
web/src/pages/A4expert/index.module.scss

@@ -4,6 +4,18 @@
   position: relative;
   position: relative;
   background-image: url('../../assets/img/expert/bg.jpg');
   background-image: url('../../assets/img/expert/bg.jpg');
   :global {
   :global {
+    .A4btn {
+      position: absolute;
+      z-index: 99;
+      right: calc(5% - 15px);
+      top: 20px;
+      & > img {
+        margin-right: 15px;
+        width: 50px;
+        cursor: pointer;
+      }
+    }
+
     .A4top {
     .A4top {
       height: 90px;
       height: 90px;
       display: flex;
       display: flex;

+ 10 - 0
web/src/pages/A4expert/index.tsx

@@ -22,7 +22,11 @@ import { baseURL } from '@/utils/http'
 // 图片导入
 // 图片导入
 import topBgImg from '@/assets/img/expert/topBg.png'
 import topBgImg from '@/assets/img/expert/topBg.png'
 import nullImg from '@/assets/img/goods/null.png'
 import nullImg from '@/assets/img/goods/null.png'
+import homeImg from '@/assets/img/home.png'
+import goodsImg from '@/assets/img/goods.png'
+
 import A4look from './A4look'
 import A4look from './A4look'
+import history from '@/utils/history'
 
 
 function A4expert() {
 function A4expert() {
   const [topArr, setTopArr] = useState<DictType[]>([])
   const [topArr, setTopArr] = useState<DictType[]>([])
@@ -91,6 +95,12 @@ function A4expert() {
     <div className={styles.A4expert}>
     <div className={styles.A4expert}>
       <LeftTopLogo />
       <LeftTopLogo />
 
 
+      {/* 右侧按钮 */}
+      <div className='A4btn' hidden={!!editId}>
+        <img src={homeImg} alt='' onClick={() => history.push('/')} title='首页' />
+        <img src={goodsImg} alt='' onClick={() => history.push('/goods')} title='精品典藏' />
+      </div>
+
       <div className='A4top' hidden={!!editId}>
       <div className='A4top' hidden={!!editId}>
         <img className='A4topll' src={topBgImg} alt='' />
         <img className='A4topll' src={topBgImg} alt='' />
         <div className='A4toprr'>
         <div className='A4toprr'>