shaogen1995 2 years ago
parent
commit
3a6f938c72

+ 1 - 1
QJKK/src/framework/show/component/rightInco.vue

@@ -95,7 +95,7 @@ export default {
     //点击复制链接
     copyPcTxt() {
       // 存储传递过来的数据
-      let OrderNumber = window.location.origin;
+      let OrderNumber = window.location.origin+'/YHT/index.html';
       // 创建一个input 元素
       // createElement() 方法通过指定名称创建一个元素
       let newInput = document.createElement("input");

+ 1 - 1
SWKK/src/components/Rbottom.vue

@@ -288,7 +288,7 @@ export default {
     //点击复制链接
     copyPcTxt() {
       // 存储传递过来的数据
-      let OrderNumber = window.location.origin;
+      let OrderNumber = window.location.origin+'/YHT/index.html';
       // 创建一个input 元素
       // createElement() 方法通过指定名称创建一个元素
       let newInput = document.createElement("input");

+ 48 - 24
vue/src/views/Goods/components/Img.vue

@@ -20,23 +20,32 @@
     <viewer class="viewerCla" ref="viewer" :images="lookPics">
       <img :src="lookPics[0]" alt="" />
     </viewer>
-    <div class="imgMain">
-      <div class="swiper-container">
-        <div class="swiper-wrapper">
-          <div
-            class="swiper-slide"
-            v-for="i in 5"
-            :key="i"
-            @click="lookImg(require('@/assets/img/Home/bac.jpg'))"
-          >
-            <img v-lazy="require('@/assets/img/Home/bac.jpg')" alt="" />
+    <template v-if="info.imgNum">
+      <div class="imgMain">
+        <div class="swiper-container">
+          <div class="swiper-wrapper">
+            <div
+              class="swiper-slide"
+              v-for="i in info.imgNum"
+              :key="i"
+              @click="lookImg(require('@/assets/img/Home/bac.jpg'))"
+            >
+              <img v-lazy="require('@/assets/img/Home/bac.jpg')" alt="" />
+            </div>
           </div>
         </div>
+        <div class="swiper-button-prev swiper-button-white"></div>
+        <div class="swiper-button-next swiper-button-white"></div>
       </div>
-      <div class="swiper-button-prev swiper-button-white"></div>
-      <div class="swiper-button-next swiper-button-white"></div>
+      <div class="swiper-pagination"></div>
+    </template>
+    <div class="imgMain2" v-else>
+      <img
+        v-lazy="require('@/assets/img/Home/bac.jpg')"
+        alt=""
+        @click="lookImg(require('@/assets/img/Home/bac.jpg'))"
+      />
     </div>
-    <div class="swiper-pagination"></div>
   </div>
 </template>
 
@@ -75,17 +84,19 @@ export default {
   created() {},
   //生命周期 - 挂载完成(可以访问DOM元素)
   mounted() {
-    new Swiper(".swiper-container", {
-      slidesPerView: 1,
-      // 如果需要前进后退按钮
-      navigation: {
-        nextEl: ".swiper-button-next",
-        prevEl: ".swiper-button-prev",
-      },
-      pagination: {
-        el: ".swiper-pagination",
-      },
-    });
+    if (this.info.imgNum) {
+      new Swiper(".swiper-container", {
+        slidesPerView: 1,
+        // 如果需要前进后退按钮
+        navigation: {
+          nextEl: ".swiper-button-next",
+          prevEl: ".swiper-button-prev",
+        },
+        pagination: {
+          el: ".swiper-pagination",
+        },
+      });
+    }
   },
   beforeCreate() {}, //生命周期 - 创建之前
   beforeMount() {}, //生命周期 - 挂载之前
@@ -163,6 +174,19 @@ export default {
       color: transparent;
     }
   }
+  .imgMain2 {
+    margin: 120px auto 0;
+    position: relative;
+    width: 1400px;
+    height: 700px;
+    text-align: center;
+    & > img {
+      cursor: pointer;
+      width: 900px;
+      height: 700px;
+      object-fit: cover;
+    }
+  }
   .swiper-container {
     width: 900px;
     height: 700px;

+ 26 - 15
vue/src/views/Goods/components/Three.vue

@@ -17,7 +17,7 @@
               v-for="(item, index) in dataRes1"
               :key="index"
             >
-              <img v-lazy="require('@/assets/img/Home/demo.png')" alt="" />
+              <img v-lazy="`https://4dscene.4dage.com/culturalrelics/YHTLSJNG/images/${item.bs}.jpg`" alt="" />
               <div
                 class="name"
                 :class="{
@@ -37,7 +37,7 @@
               v-for="(item, index) in dataRes2"
               :key="index"
             >
-              <img v-lazy="require('@/assets/img/Home/demo.png')" alt="" />
+              <img v-lazy="`https://4dscene.4dage.com/culturalrelics/YHTLSJNG/images/${item.bs}.jpg`" alt="" />
               <div
                 class="name"
                 :class="{
@@ -75,7 +75,7 @@
       </div>
       <div class="modelBox" v-if="modelBoxShow">
         <iframe
-          src="http://4dscene.4dage.com/culturalrelics/YHTLSJNG/Model2.html?m=yht49"
+          :src="`http://4dscene.4dage.com/culturalrelics/YHTLSJNG/Model2.html?m=${info.bs}`"
           frameborder="0"
         ></iframe>
         <div class="txtInfo">
@@ -173,6 +173,11 @@ export default {
         }, 100);
       }
     },
+    data() {
+      this.elDom = document.querySelector(".main");
+      this.elDom.scrollLeft = 0
+      this.getData();
+    },
   },
   //方法集合
   methods: {
@@ -220,6 +225,21 @@ export default {
     mouseup(e) {
       this.move = false;
     },
+
+    // 封装一个获取数据的方法
+    getData() {
+      this.dataRes1 = this.data.filter((v, i) => i % 2 === 0);
+      this.dataRes2 = this.data.filter((v, i) => !(i % 2 === 0));
+      let boxDom = document.querySelector(".bacXian");
+      let dataLength;
+      if (this.dataRes1.length === this.dataRes2.length)
+        dataLength = this.dataRes2.length + 0.6;
+      else if (this.dataRes1.length > this.dataRes2.length)
+        dataLength = this.dataRes1.length;
+      else dataLength = this.dataRes2.length;
+
+      boxDom.style.width = 300 * dataLength + "px";
+    },
   },
   //生命周期 - 创建完成(可以访问当前this实例)
   created() {},
@@ -239,17 +259,7 @@ export default {
       }, 40);
     }, 5000);
 
-    this.dataRes1 = this.data.filter((v, i) => i % 2 === 0);
-    this.dataRes2 = this.data.filter((v, i) => !(i % 2 === 0));
-    let boxDom = document.querySelector(".bacXian");
-    let dataLength;
-    if (this.dataRes1.length === this.dataRes2.length)
-      dataLength = this.dataRes2.length + 0.6;
-    else if (this.dataRes1.length > this.dataRes2.length)
-      dataLength = this.dataRes1.length;
-    else dataLength = this.dataRes2.length;
-
-    boxDom.style.width = 300 * dataLength + "px";
+    this.getData();
   },
   beforeCreate() {}, //生命周期 - 创建之前
   beforeMount() {}, //生命周期 - 挂载之前
@@ -437,6 +447,7 @@ export default {
       height: 100%;
       position: relative;
       overflow: hidden;
+      margin: 0 auto;
       .centen {
         position: absolute;
         top: 50%;
@@ -511,7 +522,7 @@ export default {
               pointer-events: none;
               width: 100px;
               height: 100px;
-              object-fit: contain;
+              object-fit: cover;
             }
           }
         }

+ 14 - 4
vue/src/views/Goods/components/Tow.vue

@@ -2,13 +2,18 @@
 <template>
   <div class="Tow">
     <div class="main">
-      <div class="row" @click="lookInfo(item)" v-for="(item,index) in data" :key="index">
+      <div
+        class="row"
+        @click="lookInfo(item)"
+        v-for="(item, index) in data"
+        :key="index"
+      >
         <div><img v-lazy="require('@/assets/img/Home/demo.png')" alt="" /></div>
-        <p>{{item.name}}</p>
+        <p>{{ item.name }}</p>
       </div>
     </div>
     <!-- 点击图片出来的页面 -->
-    <Img v-if="type === 'img'" @close="type = ''" :info='info'/>
+    <Img v-if="type === 'img'" @close="type = ''" :info="info" />
   </div>
 </template>
 
@@ -34,7 +39,12 @@ export default {
   //监听属性 类似于data概念
   computed: {},
   //监控data中的数据变化
-  watch: {},
+  watch: {
+    data() {
+      let dom = document.querySelector(".main");
+      dom.scrollTop = 0;
+    },
+  },
   //方法集合
   methods: {
     lookInfo(val) {

+ 16 - 51
vue/src/views/Goods/data.js

@@ -13,56 +13,22 @@
 export const goodsData = {
   '3D': [
     // 手稿
-    { type: 'straw', name: '民国时期赵良璋烈士用过的派克51型钢笔', age: '', sort: '书法、绘画', grain: '钢,其他金属,其他无机质', long: '13', width: '', tall: '' },
-    { type: 'straw', name: '1947年赵良璋在北平刻的"野雪"印章', age: '', sort: '文件、宣传品', grain: '其他无机质', long: '5', width: '1.1', tall: '1.2' },
-    { type: 'straw', name: '民国时期丁行烈士的水晶图章', age: '', sort: '文件、宣传品', grain: '其他金属', long: '7', width: '1.5', tall: '' },
-    { type: 'straw', name: '民国时期邓振询烈士用的私章及盒子', age: '', sort: '文件、宣传品', grain: '其他动物质', long: '2.3', width: '1.1', tall: '' },
-    { type: 'straw', name: '民国时期文绍珍烈士在国民革命军军官学校第六期学生毕业证章', age: '', sort: '文件、宣传品', grain: '铜', long: '6.4', width: '2.6', tall: '' },
-    { type: 'straw', name: '1943年丁行烈士在狱中刻的图章', age: '', sort: '文件、宣传品', grain: '石', long: '4.5', width: '1.6', tall: '' },
-    { type: 'straw', name: '民国时期成贻宾烈士在国立中央大学的校徽', age: '', sort: '文件、宣传品', grain: '铜', long: '', width: '', tall: '' },
-    { type: 'straw', name: '民国时期谭寿林烈士木刻私章(刻有“祝封贵县”)', age: '', sort: '文件、宣传品', grain: '木', long: '', width: '', tall: '' },
-    { type: 'straw', name: '民国时期周镐烈士用过的红玉石印章', age: '', sort: '文件、宣传品', grain: '宝玉石', long: '4', width: '1.5', tall: '1.5' },
-    { type: 'straw', name: '民国时期谢文锦烈士用过的印章', age: '', sort: '文件、宣传品', grain: '石', long: '3', width: '3', tall: '3.5' },
+    { bs: 'yht06', type: 'straw', name: '1943年丁行烈士在狱中刻的图章', age: '', sort: '书法、绘画', grain: '钢,其他金属,其他无机质', long: '13', width: '', tall: '' },
+    { bs: 'yht40', type: 'straw', name: '1943年丁行在狱中手磨制的石笔架', age: '', sort: '文件、宣传品', grain: '其他无机质', long: '5', width: '1.1', tall: '1.2' },
+    { bs: 'yht49', type: 'straw', name: '民国时期蒋宗銮烈士小学时竹木刻', age: '', sort: '文件、宣传品', grain: '其他金属', long: '7', width: '1.5', tall: '' },
     // 书刊
-    { type: 'book', name: '20世纪20年代高文华烈士北伐时期用的瓷杯', age: '', sort: '瓷器', grain: '瓷', long: '', width: '', tall: '10' },
-    { type: 'book', name: '民国时期谢文锦烈士用过的金边碗', age: '', sort: '瓷器', grain: '瓷', long: '', width: '', tall: '5.1' },
-    { type: 'book', name: '民国时期杜焕卿烈士用过的漱口杯', age: '', sort: '瓷器', grain: '瓷', long: '', width: '8.8', tall: '10' },
-    { type: 'book', name: '民国时期谢世炎烈士用过的铁皮箱', age: '', sort: '家具', grain: '铁', long: '81.5', width: '47.7', tall: '19.7' },
-    { type: 'book', name: '民国时期谭寿林烈士用过的书箱', age: '', sort: '家具', grain: '木', long: '63.5', width: '30.7', tall: '38.5' },
+    { bs: 'yht50', type: 'book', name: '民国时期赵良璋烈士穿过的皮夹克', age: '', sort: '瓷器', grain: '瓷', long: '', width: '', tall: '10' },
+    { bs: 'yht53', type: 'book', name: '二十世纪三十年代郭纲琳烈士在狱中用铜元磨制的铜片,上刻“健美”二字', age: '', sort: '瓷器', grain: '瓷', long: '', width: '', tall: '5.1' },
     // 用具
-    { type: 'tool', name: '民国时期谭寿林烈士用过的书箱', age: '', sort: '家具', grain: '木', long: '63.5', width: '30.7', tall: '38.5' },
-    { type: 'tool', name: '民国时期朱杏南烈士工作时联络做暗号用的陶瓷花盆和茶几', age: '', sort: '家具', grain: '瓷,木', long: '', width: '23', tall: '16' },
-    { type: 'tool', name: '民国时期石淳烈士用过的皮箱', age: '', sort: '皮革', grain: '皮革', long: '79.5', width: '47.3', tall: '19.5' },
-    { type: 'tool', name: '民国时期焦恭士烈士用过的皮箱', age: '', sort: '皮革', grain: '皮革', long: '29.5', width: '17.6', tall: '8.5' },
-    { type: 'tool', name: '民国时期何宝珍用过的皮箱', age: '', sort: '皮革', grain: '皮革', long: '65.4', width: '38.5', tall: '19.6' },
-    { type: 'tool', name: '抗战时期周镐烈士用过的皮包', age: '', sort: '皮革', grain: '皮革', long: '28', width: '39', tall: '' },
-    { type: 'tool', name: '民国时期文绍珍烈士用过的黄皮文件包', age: '', sort: '皮革', grain: '皮革', long: '33', width: '26', tall: '' },
-    { type: 'tool', name: '民国时期赵良璋烈士飞行时用的美国光学公司制造的飞行员护目眼镜盒', age: '', sort: '其他', grain: '其他金属', long: '22', width: '8.4', tall: '5.2' },
-    { type: 'tool', name: '民国时期郭纲琳烈士戴过的瑞士方形女表', age: '', sort: '其他', grain: '其他金属', long: '20.8', width: '1.5', tall: '' },
-    { type: 'tool', name: '民国时期吕惠生烈士用过的手电筒', age: '', sort: '其他', grain: '其他金属', long: '18.7', width: '4.1', tall: '' },
-    { type: 'tool', name: '民国时期夏雨初烈士用过的铜锁', age: '', sort: '其他', grain: '铜', long: '7.5', width: '1.5', tall: '3.3' },
-    { type: 'tool', name: '1930年夏雨初烈士就义时戴的眼镜', age: '', sort: '其他', grain: '玻璃,其他无机质', long: '11.8', width: '5.2', tall: '' },
-    { type: 'tool', name: '民国时期夏雨初烈士使用的油灯', age: '', sort: '其他', grain: '铜', long: '14', width: '10.5', tall: '' },
-    { type: 'tool', name: '1947年卢志英烈士在上海工作时使用的怀表', age: '', sort: '其他', grain: '铜,其他金属', long: '', width: '', tall: '' },
-    { type: 'tool', name: '二十世纪三十年代郭纲琳烈士在狱中用铜元磨的鸡心,刻有“永是勇士”', age: '', sort: '其他', grain: '铜', long: '2.5', width: '1.5', tall: '' },
-    { type: 'tool', name: '民国时期文绍珍烈士用过的闹钟', age: '', sort: '其他', grain: '铜,其他金属', long: '', width: '', tall: '' },
-    { type: 'tool', name: '二十世纪三十年代郭纲琳烈士狱中磨制的铜圆', age: '', sort: '钱币', grain: '铜', long: '', width: '', tall: '' },
-    { type: 'tool', name: '民国时期文绍珍烈士用过的剪刀', age: '', sort: '铁器、其他金属器', grain: '铁', long: '23', width: '9.6', tall: '' },
-    { type: 'tool', name: '民国时期谢士炎烈士用过的铜压条', age: '', sort: '铜器', grain: '铜', long: '25', width: '3', tall: '' },
-    { type: 'tool', name: '民国时期胡廷俊烈士自制砚台', age: '', sort: '文具', grain: '石', long: '10.5', width: '9.8', tall: '2.2' },
+    { bs: 'yht55', type: 'tool', name: '民国初期邓中夏穿过的紫色绸质背坎', age: '', sort: '家具', grain: '瓷,木', long: '', width: '23', tall: '16' },
+    { bs: 'yht61', type: 'tool', name: '1934年卢志英烈士在贵州工作时少数民族赠送给他的毛毯', age: '', sort: '皮革', grain: '皮革', long: '79.5', width: '47.3', tall: '19.5' },
     // 服装
-    { type: 'clothing', name: '民国时期杜焕卿烈士使用过的墨盒', age: '', sort: '文具', grain: '石', long: '10', width: '', tall: '2' },
-    { type: 'clothing', name: '民国时期谢士炎烈士用过的墨盒', age: '', sort: '文具', grain: '铜', long: '10.8', width: '10.8', tall: '3.8' },
-    { type: 'clothing', name: '民国时期蒋传宗烈士用过的钢笔', age: '', sort: '文具', grain: '其他无机质', long: '13', width: '1.3', tall: '' },
-    { type: 'clothing', name: '1927年夏雨初烈士在郎溪组织农民起义时用的梭镖', age: '', sort: '武器', grain: '铁', long: '30', width: '4.7', tall: '' },
-    { type: 'clothing', name: '吕惠生1943年用过的大刀', age: '', sort: '武器', grain: '其他金属', long: '68.6', width: '6.6', tall: '' },
-    { type: 'clothing', name: '民国时期国民党宪兵司令部的奠基纪念碑', age: '', sort: '玺印符牌', grain: '石', long: '93', width: '51', tall: '10' },
-    { type: 'clothing', name: '1928年冯玉祥送给谢庆云烈士的象牙筷一双', age: '', sort: '牙骨角器', grain: '棉麻纤维', long: '22', width: '', tall: '' },
-    { type: 'clothing', name: '民国时期蒋宗銮烈士小学时竹木刻', age: '', sort: '竹木雕', grain: '木', long: '21', width: '6', tall: '' },
+    { bs: 'yht63', type: 'clothing', name: '1933年郭纲琳烈士工作时期戴过的帽子', age: '', sort: '文具', grain: '石', long: '10', width: '', tall: '2' },
+    { bs: 'yht65', type: 'clothing', name: '民国时期杨斌烈士用过的床单', age: '', sort: '文具', grain: '铜', long: '10.8', width: '10.8', tall: '3.8' },
   ],
   '2D': [
     // 手稿
-    { type: 'book', name: '20世纪20年代高文华烈士北伐时期用的瓷杯', age: '', sort: '瓷器', grain: '瓷', long: '', width: '', tall: '10' },
+    {imgNum:3, type: 'book', name: '20世纪20年代高文华烈士北伐时期用的瓷杯', age: '', sort: '瓷器', grain: '瓷', long: '', width: '', tall: '10' },
     { type: 'book', name: '民国时期谢文锦烈士用过的金边碗', age: '', sort: '瓷器', grain: '瓷', long: '', width: '', tall: '5.1' },
     { type: 'book', name: '民国时期杜焕卿烈士用过的漱口杯', age: '', sort: '瓷器', grain: '瓷', long: '', width: '8.8', tall: '10' },
     { type: 'book', name: '民国时期谢世炎烈士用过的铁皮箱', age: '', sort: '家具', grain: '铁', long: '81.5', width: '47.7', tall: '19.7' },
@@ -89,7 +55,6 @@ export const goodsData = {
     { type: 'clothing', name: '1928年冯玉祥送给谢庆云烈士的象牙筷一双', age: '', sort: '牙骨角器', grain: '棉麻纤维', long: '22', width: '', tall: '' },
     { type: 'clothing', name: '民国时期蒋宗銮烈士小学时竹木刻', age: '', sort: '竹木雕', grain: '木', long: '21', width: '6', tall: '' },
     // 服装
-    { type: 'tool', name: '民国时期谭寿林烈士用过的书箱', age: '', sort: '家具', grain: '木', long: '63.5', width: '30.7', tall: '38.5' },
     { type: 'tool', name: '民国时期朱杏南烈士工作时联络做暗号用的陶瓷花盆和茶几', age: '', sort: '家具', grain: '瓷,木', long: '', width: '23', tall: '16' },
     { type: 'tool', name: '民国时期石淳烈士用过的皮箱', age: '', sort: '皮革', grain: '皮革', long: '79.5', width: '47.3', tall: '19.5' },
     { type: 'tool', name: '民国时期焦恭士烈士用过的皮箱', age: '', sort: '皮革', grain: '皮革', long: '29.5', width: '17.6', tall: '8.5' },
@@ -110,11 +75,11 @@ export const goodsData = {
     { type: 'tool', name: '民国时期谢士炎烈士用过的铜压条', age: '', sort: '铜器', grain: '铜', long: '25', width: '3', tall: '' },
     { type: 'tool', name: '民国时期胡廷俊烈士自制砚台', age: '', sort: '文具', grain: '石', long: '10.5', width: '9.8', tall: '2.2' },
     // 油画
-    {author:'作者1', type: 'Italy', name: '启蒙', age: '1999', sort: '油 画', grain: '', long: '2.03', width: '2.45', tall: '' },
-    {author:'作者1', type: 'Italy', name: '邓演达主持农工党一干会议', age: '1999', sort: '油 画', grain: '', long: '2.25', width: '3.27', tall: '' },
-    {author:'作者1', type: 'Italy', name: '被    捕', age: '1987', sort: '油 画', grain: '', long: '3.0 ', width: '2.4', tall: '' },
-    {author:'作者1', type: 'Italy', name: '在青年中间', age: '1987', sort: '油 画', grain: '', long: '2.04', width: '2.04', tall: '' },
-    {author:'作者1', type: 'Italy', name: '演    说', age: '1987', sort: '油 画', grain: '', long: '3.03', width: '1.95', tall: '' },
-    {author:'作者1', type: 'Italy', name: '马克昌就义', age: '1987', sort: '油 画', grain: '', long: '1.92', width: '2.01', tall: '' },
+    { author: '作者1', type: 'Italy', name: '启蒙', age: '1999', sort: '油 画', grain: '', long: '2.03', width: '2.45', tall: '' },
+    { author: '作者1', type: 'Italy', name: '邓演达主持农工党一干会议', age: '1999', sort: '油 画', grain: '', long: '2.25', width: '3.27', tall: '' },
+    { author: '作者1', type: 'Italy', name: '被    捕', age: '1987', sort: '油 画', grain: '', long: '3.0 ', width: '2.4', tall: '' },
+    { author: '作者1', type: 'Italy', name: '在青年中间', age: '1987', sort: '油 画', grain: '', long: '2.04', width: '2.04', tall: '' },
+    { author: '作者1', type: 'Italy', name: '演    说', age: '1987', sort: '油 画', grain: '', long: '3.03', width: '1.95', tall: '' },
+    { author: '作者1', type: 'Italy', name: '马克昌就义', age: '1987', sort: '油 画', grain: '', long: '1.92', width: '2.01', tall: '' },
   ]
 }

+ 32 - 6
vue/src/views/Goods/index.vue

@@ -34,6 +34,14 @@
           >
             {{ item.name }}
           </div>
+          <div
+            class="row"
+            @click="genre = 'Italy'"
+            :class="{ active: 'Italy' === genre }"
+            v-if="model === '2D'"
+          >
+            油画
+          </div>
         </div>
       </div>
       <div class="inputSearch" @keyup.enter="mySearch">
@@ -138,10 +146,10 @@ export default {
       txt: "",
       genreList: [
         { name: "全部", type: "all" },
-        { name: "手稿", type: "all1" },
-        { name: "书刊", type: "all2" },
-        { name: "用具", type: "all3" },
-        { name: "服装", type: "all4" },
+        { name: "手稿", type: "straw" },
+        { name: "书刊", type: "book" },
+        { name: "用具", type: "tool" },
+        { name: "服装", type: "clothing" },
       ],
       rightList: [
         { name: "首页", type: 1 },
@@ -159,6 +167,15 @@ export default {
   computed: {},
   //监控data中的数据变化
   watch: {
+    genre(val) {
+      let temp = goodsData[this.model];
+      if (val === "all") {
+        this.data = temp.filter((v) => v.name.includes(this.txt));
+      } else {
+        let temp2 = temp.filter((v) => v.type === val);
+        this.data = temp2.filter((v) => v.name.includes(this.txt));
+      }
+    },
     share(val) {
       this.$refs.ThreeRef.moveShareCut(val);
     },
@@ -175,7 +192,16 @@ export default {
   },
   //方法集合
   methods: {
-    mySearch() {},
+    mySearch() {
+      let val = this.genre;
+      let temp = goodsData[this.model];
+      if (val === "all") {
+        this.data = temp.filter((v) => v.name.includes(this.txt));
+      } else {
+        let temp2 = temp.filter((v) => v.type === val);
+        this.data = temp2.filter((v) => v.name.includes(this.txt));
+      }
+    },
     rightClisk(type) {
       if (type === 1) this.$router.replace("/");
       if (type === 2) this.music = !this.music;
@@ -191,7 +217,7 @@ export default {
     //点击复制链接
     copyPcTxt() {
       // 存储传递过来的数据
-      let OrderNumber = window.location.origin;
+      let OrderNumber = window.location.origin+'/YHT/index.html';
       // 创建一个input 元素
       // createElement() 方法通过指定名称创建一个元素
       let newInput = document.createElement("input");