Просмотр исходного кода

Merge branch 'sit' of daiyanrong/live-telecast-ui-h5 into master

戴艳蓉 3 лет назад
Родитель
Сommit
a465bd2ac6
63 измененных файлов с 22 добавлено и 6 удалено
  1. 0 0
      dist/index.html
  2. 0 1
      dist/static/css/chunk-6198b04f.95134792.css
  3. 1 0
      dist/static/css/chunk-f5afb352.9dc949d3.css
  4. BIN
      dist/static/img/image10@2x.b20eac73.png
  5. BIN
      dist/static/img/image11@2x.617e5679.png
  6. BIN
      dist/static/img/image12@2x.951650f1.png
  7. BIN
      dist/static/img/image13@2x.508002b4.png
  8. BIN
      dist/static/img/image14@2x.d1d6ae83.png
  9. BIN
      dist/static/img/image15@2x.1ecbac1b.png
  10. BIN
      dist/static/img/image16@2x.b9c418da.png
  11. BIN
      dist/static/img/image1@2x.ff9936eb.png
  12. BIN
      dist/static/img/image2@2x.6d7085fc.png
  13. BIN
      dist/static/img/image3@2x.891e1777.png
  14. BIN
      dist/static/img/image4@2x.0891a769.png
  15. BIN
      dist/static/img/image5@2x.808cea7d.png
  16. BIN
      dist/static/img/image6@2x.2d6b3c86.png
  17. BIN
      dist/static/img/image7@2x.1a42627e.png
  18. BIN
      dist/static/img/image8@2x.f2494f10.png
  19. 0 0
      dist/static/img/image9@2x.8e62750e.png
  20. 0 0
      dist/static/js/app.e598d27e.js
  21. BIN
      dist/static/js/app.e598d27e.js.gz
  22. 0 0
      dist/static/js/chunk-6198b04f.8eb797ab.js
  23. 0 0
      dist/static/js/chunk-f5afb352.53fc86e9.js
  24. BIN
      src/assets/images/goods/1/image10@2x.png
  25. BIN
      src/assets/images/goods/1/image11@2x.png
  26. BIN
      src/assets/images/goods/1/image12@2x.png
  27. BIN
      src/assets/images/goods/1/image13@2x.png
  28. BIN
      src/assets/images/goods/1/image14@2x.png
  29. BIN
      src/assets/images/goods/1/image15@2x.png
  30. BIN
      src/assets/images/goods/1/image16@2x.png
  31. BIN
      src/assets/images/goods/1/image1@2x.png
  32. BIN
      src/assets/images/goods/1/image2@2x.png
  33. BIN
      src/assets/images/goods/1/image3@2x.png
  34. BIN
      src/assets/images/goods/1/image4@2x.png
  35. BIN
      src/assets/images/goods/1/image5@2x.png
  36. BIN
      src/assets/images/goods/1/image6@2x.png
  37. BIN
      src/assets/images/goods/1/image7@2x.png
  38. BIN
      src/assets/images/goods/1/image8@2x.png
  39. BIN
      src/assets/images/goods/1/image9@2x.png
  40. BIN
      src/assets/images/goods/2/image10@2x.png
  41. 0 0
      src/assets/images/goods/2/image11@2x.png
  42. 0 0
      src/assets/images/goods/2/image12@2x.png
  43. 0 0
      src/assets/images/goods/2/image13@2x.png
  44. 0 0
      src/assets/images/goods/2/image14@2x.png
  45. 0 0
      src/assets/images/goods/2/image15@2x.png
  46. 0 0
      src/assets/images/goods/2/image16@2x.png
  47. 0 0
      src/assets/images/goods/2/image17@2x.png
  48. 0 0
      src/assets/images/goods/2/image18@2x.png
  49. 0 0
      src/assets/images/goods/2/image19@2x.png
  50. 0 0
      src/assets/images/goods/2/image1@2x.png
  51. 0 0
      src/assets/images/goods/2/image20@2x.png
  52. 0 0
      src/assets/images/goods/2/image21@2x.png
  53. 0 0
      src/assets/images/goods/2/image22@2x.png
  54. 0 0
      src/assets/images/goods/2/image23@2x.png
  55. 0 0
      src/assets/images/goods/2/image2@2x.png
  56. 0 0
      src/assets/images/goods/2/image3@2x.png
  57. 0 0
      src/assets/images/goods/2/image4@2x.png
  58. 0 0
      src/assets/images/goods/2/image5@2x.png
  59. 0 0
      src/assets/images/goods/2/image6@2x.png
  60. 0 0
      src/assets/images/goods/2/image7@2x.png
  61. 0 0
      src/assets/images/goods/2/image8@2x.png
  62. 0 0
      src/assets/images/goods/2/image9@2x.png
  63. 21 5
      src/views/goods/index.vue

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/index.html


+ 0 - 1
dist/static/css/chunk-6198b04f.95134792.css

@@ -1 +0,0 @@
-.goods[data-v-4c8cf3c8]{background:#e6e6dc;position:fixed;width:100%;height:100%}.goods .list[data-v-4c8cf3c8]{position:relative;width:100%;height:100%;overflow-y:scroll}.goods .list img[data-v-4c8cf3c8]{display:inline-block;width:100%;margin:-8px 0 0 0}.goods .header[data-v-4c8cf3c8]{position:absolute;z-index:2;height:46px;width:100%;top:0;left:0}.goods .header .van-icon[data-v-4c8cf3c8]{height:46px;width:46px;line-height:46px;text-align:center;font-size:18px;color:#fff}

+ 1 - 0
dist/static/css/chunk-f5afb352.9dc949d3.css

@@ -0,0 +1 @@
+.goods[data-v-37d5a5da]{background:#e6e6dc;position:fixed;width:100%;height:100%}.goods .list[data-v-37d5a5da]{position:relative;width:100%;height:100%;overflow-y:scroll}.goods .list img[data-v-37d5a5da]{display:inline-block;width:100%;margin:-8px 0 0 0}.goods .header[data-v-37d5a5da]{position:absolute;z-index:2;height:46px;width:100%;top:0;left:0}.goods .header .van-icon[data-v-37d5a5da]{height:46px;width:46px;line-height:46px;text-align:center;font-size:18px;color:#fff}

BIN
dist/static/img/image10@2x.b20eac73.png


BIN
dist/static/img/image11@2x.617e5679.png


BIN
dist/static/img/image12@2x.951650f1.png


BIN
dist/static/img/image13@2x.508002b4.png


BIN
dist/static/img/image14@2x.d1d6ae83.png


BIN
dist/static/img/image15@2x.1ecbac1b.png


BIN
dist/static/img/image16@2x.b9c418da.png


BIN
dist/static/img/image1@2x.ff9936eb.png


BIN
dist/static/img/image2@2x.6d7085fc.png


BIN
dist/static/img/image3@2x.891e1777.png


BIN
dist/static/img/image4@2x.0891a769.png


BIN
dist/static/img/image5@2x.808cea7d.png


BIN
dist/static/img/image6@2x.2d6b3c86.png


BIN
dist/static/img/image7@2x.1a42627e.png


BIN
dist/static/img/image8@2x.f2494f10.png


+ 0 - 0
src/assets/images/goods/image10@2x.png → dist/static/img/image9@2x.8e62750e.png


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/static/js/app.e598d27e.js


BIN
dist/static/js/app.28359a22.js.gz → dist/static/js/app.e598d27e.js.gz


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/static/js/chunk-6198b04f.8eb797ab.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/static/js/chunk-f5afb352.53fc86e9.js


BIN
src/assets/images/goods/1/image10@2x.png


BIN
src/assets/images/goods/1/image11@2x.png


BIN
src/assets/images/goods/1/image12@2x.png


BIN
src/assets/images/goods/1/image13@2x.png


BIN
src/assets/images/goods/1/image14@2x.png


BIN
src/assets/images/goods/1/image15@2x.png


BIN
src/assets/images/goods/1/image16@2x.png


BIN
src/assets/images/goods/1/image1@2x.png


BIN
src/assets/images/goods/1/image2@2x.png


BIN
src/assets/images/goods/1/image3@2x.png


BIN
src/assets/images/goods/1/image4@2x.png


BIN
src/assets/images/goods/1/image5@2x.png


BIN
src/assets/images/goods/1/image6@2x.png


BIN
src/assets/images/goods/1/image7@2x.png


BIN
src/assets/images/goods/1/image8@2x.png


BIN
src/assets/images/goods/1/image9@2x.png


BIN
src/assets/images/goods/2/image10@2x.png


+ 0 - 0
src/assets/images/goods/image11@2x.png → src/assets/images/goods/2/image11@2x.png


+ 0 - 0
src/assets/images/goods/image12@2x.png → src/assets/images/goods/2/image12@2x.png


+ 0 - 0
src/assets/images/goods/image13@2x.png → src/assets/images/goods/2/image13@2x.png


+ 0 - 0
src/assets/images/goods/image14@2x.png → src/assets/images/goods/2/image14@2x.png


+ 0 - 0
src/assets/images/goods/image15@2x.png → src/assets/images/goods/2/image15@2x.png


+ 0 - 0
src/assets/images/goods/image16@2x.png → src/assets/images/goods/2/image16@2x.png


+ 0 - 0
src/assets/images/goods/image17@2x.png → src/assets/images/goods/2/image17@2x.png


+ 0 - 0
src/assets/images/goods/image18@2x.png → src/assets/images/goods/2/image18@2x.png


+ 0 - 0
src/assets/images/goods/image19@2x.png → src/assets/images/goods/2/image19@2x.png


+ 0 - 0
src/assets/images/goods/image1@2x.png → src/assets/images/goods/2/image1@2x.png


+ 0 - 0
src/assets/images/goods/image20@2x.png → src/assets/images/goods/2/image20@2x.png


+ 0 - 0
src/assets/images/goods/image21@2x.png → src/assets/images/goods/2/image21@2x.png


+ 0 - 0
src/assets/images/goods/image22@2x.png → src/assets/images/goods/2/image22@2x.png


+ 0 - 0
src/assets/images/goods/image23@2x.png → src/assets/images/goods/2/image23@2x.png


+ 0 - 0
src/assets/images/goods/image2@2x.png → src/assets/images/goods/2/image2@2x.png


+ 0 - 0
src/assets/images/goods/image3@2x.png → src/assets/images/goods/2/image3@2x.png


+ 0 - 0
src/assets/images/goods/image4@2x.png → src/assets/images/goods/2/image4@2x.png


+ 0 - 0
src/assets/images/goods/image5@2x.png → src/assets/images/goods/2/image5@2x.png


+ 0 - 0
src/assets/images/goods/image6@2x.png → src/assets/images/goods/2/image6@2x.png


+ 0 - 0
src/assets/images/goods/image7@2x.png → src/assets/images/goods/2/image7@2x.png


+ 0 - 0
src/assets/images/goods/image8@2x.png → src/assets/images/goods/2/image8@2x.png


+ 0 - 0
src/assets/images/goods/image9@2x.png → src/assets/images/goods/2/image9@2x.png


+ 21 - 5
src/views/goods/index.vue

@@ -22,23 +22,39 @@ export default {
     return {
       title: null,
       showList: [],
-
+      showList: [],
+      list: [
+        {
+          index: 1,
+          total: 16,
+        },
+        {
+          index: 2,
+          total: 23,
+        },
+      ],
       loading: false,
     };
   },
   async created() {
     this.showList = [];
-    this.getImgList();
+     let index = this.$route.query.index;
+    this.getImgList(index ? index : 0);
   },
 
   methods: {
     onClickLeft() {
       window.history.back(-1);
     },
-    getImgList() {
-      for (let i = 0; i < 23; i++) {
+    getImgList(index) {
+       let total = 0;
+      let findi = this.list.findIndex((v) => v.index === (Number(index)+1) );
+      if (findi !== -1) {
+        total = this.list[findi].total;
+      }
+      for (let i = 0; i < total; i++) {
         this.showList.push(
-          require(`@/assets/images/goods/image${i + 1}@2x.png`)
+          require(`@/assets/images/goods/${(Number(index)+1)}/image${i + 1}@2x.png`)
         );
       }
     },

Некоторые файлы не были показаны из-за большого количества измененных файлов