Merge branch 'master' of http://119.23.210.103:3000/wy/mj_firm_former

src/views/component/fenzhuangweizhi.vue

@@ -515,7 +515,7 @@ p {
     top: 0px;
     left: 0px;
     background: white;
-    z-index: 99999999!important;
+    z-index: 2147483647!important;
   }
   .top-content {
     width: 100%;

src/views/component/weiZhiChangGui.vue

@@ -512,7 +512,7 @@ p {
     top: 0px;
     left: 0px;
     background: white;
-    z-index: 100025  !important;
+    z-index: 2147483647  !important;
   }
   .top-content {
     width: 100%;

src/views/component/wuliaoPosition.vue

@@ -515,7 +515,7 @@ p {
     top: 0px;
     left: 0px;
     background: white;
-    z-index: 99999999!important;
+    z-index: 2147483647!important;
   }
   .top-content {
     width: 100%;

src/views/sample/reservedSample.vue

@@ -157,11 +157,12 @@
                     :key="ind"
                     :style="{
                       background:
-                        it.wei_zhi_zhuang_ta == '空余' ? '#E6A23C' : '',
+                        it.yang_pin_bian_hao ? '#E6A23C' : '',
                     }"
                   >
                     <div class="top-dsc">
                       <div class="position">
+                        <p>{{it.wei_zhi_zhuang_ta }}</p>
                         <p>存放位置：{{ it.wei_zhi_bian_hao_ }}</p>
                         <p>样品编号：{{ it.yang_pin_bian_hao }}</p>
                         <p>
@@ -189,7 +190,7 @@
                       </div>
                       <div class="right-content">
                         <p>
-                          {{ it.wei_zhi_zhuang_ta || it.yang_pin_ming_che }}
+                          {{ it.yang_pin_ming_che|| it.wei_zhi_zhuang_ta  }}
                         </p>
                       </div>
                       <!-- <div class="condition">{{ it.cun_chu_tiao_jian }}</div> -->
@@ -281,7 +282,7 @@ export default {
       curdPost("sql", sqlString)
         .then((response) => {
           this_.sampleOption = response.variables.data;
-          this_.sampleOption.pop();
+          // this_.sampleOption.pop();
         })
     },
     onSubmits(sql) {

src/views/system/jbdScan/goods/caigourukudan.vue

@@ -53,7 +53,7 @@
                         font-size: 10px;
                       "
                     >
-                      日期:<span style="margin-left: 10px">{{
+                      日期　　　:<span style="margin-left: 10px">{{
                         item1[0].dao_ku_ri_qi_
                       }}</span>
                     </div>
@@ -98,7 +98,9 @@
                           {{ item1[0].dao_huo_shu_liang }}
                         </td>
                         <td style="width: 60px">{{ item1[0].dan_wei_ }}</td>
-                        <td style="width: 60px">{{ item1[0].dan_jia_han_shui_ }}</td>
+                        <td style="width: 60px">
+                          {{ item1[0].dan_jia_han_shui_ }}
+                        </td>
                         <td style="width: 45px">{{ item1[0].shui_lv_ }}</td>
                         <td style="width: 45px">{{ item1[0].dan_jia_ }}</td>
                         <td style="width: 45px">{{ item1[0].shui_e_ }}</td>
@@ -227,6 +229,23 @@ export default {
       let b = parseFloat(num2);
       return a.toFixed("2") * 1 + b.toFixed("2") * 1;
     },
+    toDecimal2(x) {
+      var f = parseFloat(x);
+      if (isNaN(f)) {
+        return false;
+      }
+      var f = Math.round(x * 100) / 100;
+      var s = f.toString();
+      var rs = s.indexOf(".");
+      if (rs < 0) {
+        rs = s.length;
+        s += ".";
+      }
+      while (s.length <= rs + 2) {
+        s += "0";
+      }
+      return s;
+    },
     getInit() {
       // console.log(this.obj)
       // var idStr = "";
@@ -241,23 +260,21 @@ export default {
       let this_ = this;
       let name1, name2, name3;
       let time1, time2, time3;
-      let chushi =0;
+      let chushi = 0;
       id.forEach((item) => {
         let sql = `select * FROM t_wljsysjlb WHERE id_='${item}'`;
         repostCurd("sql", sql).then((res) => {
           let data = res.variables.data;
           // let s2 = `select NAME_,CREATE_TIME_ FROM ibps_party_employee where id_ =(select CREATE_BY_ FROM ibps_bpm_oper_log WHERE PROC_INST_ID_ = (SELECT PROC_INST_ID_ FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item}' )AND NODE_ID_ = 'Activity_1pha4py' ORDER BY CREATE_TIME_ DESC LIMIT 1)`;
-          let s2 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y年%m月%d日') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item}') AND b.NODE_ID_ = 'Activity_1pha4py' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
+          let s2 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item}') AND b.NODE_ID_ = 'Activity_1pha4py' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
           repostCurd("sql", s2).then((res) => {
-
             name2 = res.variables.data[0].NAME_ || 0;
             time2 = res.variables.data[0].CREATE_TIME_ || 0;
             data["name2"] = name2;
             data["time2"] = time2;
             // let s3 = `select NAME_,CREATE_TIME_ FROM ibps_party_employee where id_ =(select CREATE_BY_ FROM ibps_bpm_oper_log WHERE PROC_INST_ID_ = (SELECT PROC_INST_ID_ FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item}' )AND NODE_ID_ = 'Activity_04ff3k5' ORDER BY CREATE_TIME_ DESC LIMIT 1)`;
-            let s3 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y年%m月%d日') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item}') AND b.NODE_ID_ = 'Activity_04ff3k5' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
+            let s3 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item}') AND b.NODE_ID_ = 'Activity_04ff3k5' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
             repostCurd("sql", s3).then((res) => {
-
               name3 = res.variables.data[0].NAME_ || 0;
               time3 = res.variables.data[0].CREATE_TIME_ || 0;
               data["name3"] = name3;
@@ -266,7 +283,10 @@ export default {
                 data["heji"] = this.addNumber(chushi, it.jin_e_);
                 chushi = data["heji"];
               });
+
+              data["heji"] = this_.toDecimal2(data["heji"]);
               this_.list.push(data);
+              chushi = 0;
               console.log(this_.list);
             });
           });

src/views/system/jbdScan/goods/chnangguirukudan.vue

@@ -48,7 +48,7 @@
                         font-size: 10px;
                       "
                     >
-                      日期:<span style="margin-left: 10px">{{
+                      日期 :<span style="margin-left: 10px">{{
                         item1.dao_huo_ri_qi_
                       }}</span>
                     </div>
@@ -90,7 +90,9 @@
                         </td>
                         <td style="width: 45px">{{ item.shu_liang_ }}</td>
                         <td style="width: 45px">{{ item.dan_wei_ }}</td>
-                        <td style="width: 60px">{{ item.dan_jia_han_shui_ }}</td>
+                        <td style="width: 60px">
+                          {{ item.dan_jia_han_shui_ }}
+                        </td>
                         <td style="width: 45px">{{ item.shui_lv_ }}</td>
                         <td style="width: 45px">{{ item.dan_jia_ }}</td>
                         <td style="width: 45px">{{ item.shui_e_ }}</td>
@@ -201,6 +203,23 @@ export default {
       this.$refs.easyPrint.print();
       // this.$refs.easyPrint.window.print()
     },
+    toDecimal2(x) {
+      var f = parseFloat(x);
+      if (isNaN(f)) {
+        return false;
+      }
+      var f = Math.round(x * 100) / 100;
+      var s = f.toString();
+      var rs = s.indexOf(".");
+      if (rs < 0) {
+        rs = s.length;
+        s += ".";
+      }
+      while (s.length <= rs + 2) {
+        s += "0";
+      }
+      return s;
+    },
     addNumber(num1, num2) {
       let a = parseFloat(num1);
       let b = parseFloat(num2);
@@ -212,7 +231,6 @@ export default {
         idStr += item + ",";
       });
       idStr = idStr.substring(0, idStr.length - 1);
-
       this.getLook(idStr);
     },
     getLook(id) {
@@ -229,7 +247,7 @@ export default {
           let sql1 = `select * FROM t_cgysjlb  WHERE FIND_IN_SET(wai_jian_,'${item.id_}')`;
           repostCurd("sql", sql1).then((res) => {
             let data = res.variables.data;
-            let s2 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y年%m月%d日') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}') AND b.NODE_ID_ = 'Activity_04lhxla' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
+            let s2 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}') AND b.NODE_ID_ = 'Activity_04lhxla' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
             repostCurd("sql", s2).then((res) => {
               console.log(res.variables.data);
               name2 = res.variables.data[0].NAME_;
@@ -237,22 +255,23 @@ export default {
               console.log(name2, "name2");
               data["name2"] = name2;
               data["time2"] = time2;
-              let s3 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y年%m月%d日') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}') AND b.NODE_ID_ = 'Activity_1dk76gy' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
+              let s3 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}') AND b.NODE_ID_ = 'Activity_1dk76gy' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
               console.log(s3);
               repostCurd("sql", s3).then((res) => {
                 name3 = res.variables.data[0].NAME_;
                 time3 = res.variables.data[0].CREATE_TIME_;
                 data["name3"] = name3;
                 data["time3"] = time3;
-                 data["gong_ying_shang_"] = item.gong_ying_shang_;
+                data["gong_ying_shang_"] = item.gong_ying_shang_;
                 data["cai_gou_ding_dan_"] = item.cai_gou_ding_dan_;
                 data["dao_huo_ri_qi_"] = item.dao_huo_ri_qi_;
                 data.forEach((it) => {
-                  debugger
                   data["heji"] = this.addNumber(chushi, it.jin_e_);
                   chushi = data["heji"];
                 });
+                data["heji"] =this_.toDecimal2(data["heji"]);
                 this_.list.push(data);
+                chushi = 0;
                 console.log(this_.list, 1111111111);
               });
             });

src/views/system/jbdScan/goods/lingliaodan.vue

@@ -47,7 +47,7 @@
                         font-size: 10px;
                       "
                     >
-                      领料日期:<span style="margin-left: 10px">{{
+                      领 料 日 期：<span style="margin-left: 10px">{{
                         item1.ling_liao_ri_qi_
                       }}</span>
                     </div>
@@ -57,7 +57,7 @@
                   <table border="1">
                     <thead>
                       <tr>
-                        <th style="width: 40px">序号</th>
+                        <th style="width: 40px;line-height:22px;">序号</th>
                         <th style="font-weight: normal">物料编码</th>
                         <th style="font-weight: normal">物料名称</th>
                         <th>货号</th>
@@ -90,7 +90,7 @@
                         <td style="width: 60px">{{ item.dan_jia_ }}</td>
                         <td style="width: 60px">{{ item.jin_e_ }}</td>
                         <td style="width: 80px">{{ item.yong_tu_ }}</td>
-                        <td style="width: 120px">{{ item.beizhu }}</td>
+                        <td style="width: 120px">{{ item.bei_zhu_ }}</td>
                       </tr>
                     </tbody>
                     <tfoot
@@ -215,7 +215,23 @@ export default {
       d = d < 10 ? "0" + d : d; //日期不满10天显示前加0
       return y + "-" + m + "-" + d;
     },
-
+    toDecimal2(x) {
+      var f = parseFloat(x);
+      if (isNaN(f)) {
+        return false;
+      }
+      var f = Math.round(x * 100) / 100;
+      var s = f.toString();
+      var rs = s.indexOf(".");
+      if (rs < 0) {
+        rs = s.length;
+        s += ".";
+      }
+      while (s.length <= rs + 2) {
+        s += "0";
+      }
+      return s;
+    },
     getLook(id) {
       let this_ = this;
       let sql = `select * FROM t_crkjlb WHERE FIND_IN_SET(id_,'${id}')`;
@@ -236,13 +252,13 @@ export default {
                 data["name1"] = name1;
               });
             }
-            let s2 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y年%m月%d日') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}') AND b.NODE_ID_ = 'Activity_0dbdxg7' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`
+            let s2 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}') AND b.NODE_ID_ = 'Activity_0t9dfi3' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`
             repostCurd("sql", s2).then((res) => {
               name2 = res.variables.data[0].NAME_;
               time2 = res.variables.data[0].CREATE_TIME_;
               data["name2"] = name2;
               data["time2"] = time2;
-              let s3 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y年%m月%d日') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}') AND b.NODE_ID_ = 'Activity_0dbdxg7' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
+              let s3 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}') AND b.NODE_ID_ = 'Activity_0dbdxg7' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
               repostCurd("sql", s3).then((res) => {
                 name3 = res.variables.data[0].NAME_;
                 time3 = res.variables.data[0].CREATE_TIME_;
@@ -257,7 +273,10 @@ export default {
                   data["heji"] = this.addNumber(chushi, it.jin_e_);
                   chushi = data["heji"];
                 });
+                
+                 data["heji"] =this_.toDecimal2(data["heji"]);
                 this_.list.push(data);
+                chushi = 0;
                 console.log(this_.list)
               });
             });

src/views/warehouse/cangku.vue

@@ -89,13 +89,19 @@
                       :key="index"
                       class="goods-dsc"
                       :style="{
-                        background:
-                          it.cun_fang_wei_zhi_ == '空' ? '' : '#67c23a',
+                        background: it.wu_liao_bian_ma_ ? '' : '#67c23a',
                       }"
                     >
                       <div class="top-dsc">
                         <div class="position">
-                          <p>名称：{{ it.wu_liao_ming_chen || 空 }}</p>
+                          <div style="display:flex;justify-content: flex-start;text-align: left;">
+                            <span> 名称：</span>
+                            <p style="width: 80px">
+                              
+                              {{ it.wu_liao_ming_chen || 空 }}
+                            </p>
+                          </div>
+
                           <p>
                             编码：{{
                               it.wu_liao_bian_ma_ || it.wu_liao_bian_ma_
@@ -208,9 +214,7 @@ export default {
       let sqlString = `select distinct qu_yu_,cun_chu_tiao_jian from t_ck where cang_ku_ming_chen = '${cang_ku}' order by qu_yu_ asc`;
       var this_ = this;
       curdPost("sql", sqlString).then((response) => {
-
         this_.quyu_arr = response.variables.data;
-                console.log(this_.quyu_arr)
         if (!this.firstLoadActive) {
           this_.formInline.qu_yu_value = "";
         }
@@ -264,7 +268,6 @@ export default {
       // var sqlString = `select * from t_mjwlgl where cang_ku_ming_chen = '${this.formInline.cang_ku_ming_chen_value}' and qu_yu_ = '${this.formInline.qu_yu_value}'`;
       let py = this.formInline.qu_yu_value.split("号")[1].replace(/^\s*/g, "");
       let num = this.formInline.qu_yu_value.split("号")[0];
-      console.log(py, "111111111");
       let quyu = this.sqlSlice(py);
       let type = (quyu + num).replace(/^\s*/g, "");
       var sqlString =
@@ -274,7 +277,6 @@ export default {
         "'%" +
         type +
         "%'";
-      console.log(sqlString, type, "按钮");
       this.queryLoad(sqlString, type);
     },
     queryLoad(sql, py) {
@@ -292,10 +294,9 @@ export default {
         " and cang_ku_ming_chen ='" +
         this.formInline.cang_ku_ming_chen_value +
         "' ORDER BY wei_zhi_ ASC ";
-        console.log(py)
-        let weiSlice ="SUBSTR(wei_zhi_, 1, 6)"
+      let weiSlice = "SUBSTR(wei_zhi_, 1, 6)";
       if (py.includes("WHPG")) {
-        weiSlice = 'SUBSTR(wei_zhi_, 1, 7)';
+        weiSlice = "SUBSTR(wei_zhi_, 1, 7)";
       }
       let classSql =
         `select DISTINCT ${weiSlice} AS wei_zhi_  from t_ck where wei_zhi_ like ` +
@@ -305,31 +306,32 @@ export default {
         " and cang_ku_ming_chen ='" +
         this.formInline.cang_ku_ming_chen_value +
         "' ORDER BY wei_zhi_ ASC ";
-      console.log(classSql, "classSql");
       curdPost("sql", sqltype).then((res) => {
         typeData = res.variables.data; //查询具体仓库某个货架的所有位置
-        console.log(typeData, "位置");
         curdPost("sql", sql).then((res) => {
           datas = res.variables.data; //具体仓库某个货架的所有物料数据
-          console.log(datas, "数据");
           typeData.forEach((item) => {
             typeArr[item.wei_zhi_] = [];
             if (datas.length == 0) {
+              //没有物料信息
               typeArr[item.wei_zhi_].push(item);
             } else {
               datas.forEach((it, index) => {
+                console.log(item.wei_zhi_, it.cun_fang_wei_zhi_);
                 if (item.wei_zhi_ == it.cun_fang_wei_zhi_) {
                   typeArr[item.wei_zhi_].push(it);
                 } else if (
                   item.wei_zhi_ != it.cun_fang_wei_zhi_ &&
                   index == datas.length - 1
                 ) {
-                  typeArr[item.wei_zhi_].push(item);
+                  if (!typeArr[item.wei_zhi_].length) {
+                    typeArr[item.wei_zhi_].push(item);
+                  }
                 }
               });
             }
           });
-          console.log(typeArr, "22222222222222");
+          console.log(typeArr);
           curdPost("sql", classSql).then((res2) => {
             let resData = res2.variables.data;
             resData.forEach((item) => {
@@ -338,10 +340,8 @@ export default {
               labelsMap[layer] = [];
               for (var prop in typeArr) {
                 if (typeArr.hasOwnProperty(prop)) {
-                  // console.log(prop,item.wei_zhi_);
                   if (prop.includes(item.wei_zhi_)) {
                     labelsMap[layer].push(...typeArr[prop]);
-                    //  console.log(labelsMap)
                   }
                 }
               }
@@ -371,7 +371,6 @@ export default {
         "  and cang_ku_ming_chen = '" +
         this.formInline.cang_ku_ming_chen_value +
         "'";
-      // console.log(sqlString, type);
       this.queryLoad(sqlString, type);
       this.formInline.qu_yu_value = value;
       this.quyuShow = value;
@@ -546,7 +545,7 @@ p {
               cursor: pointer;
               // width: 170px;
               // height: 80px;
-              padding: 6px 12px;
+              padding: 6px 6px;
               border-radius: 5px;
               background: #e6a23c;
               margin-left: 12px;
@@ -557,14 +556,14 @@ p {
                 display: flex;
                 justify-content: space-between;
                 font-size: 12px;
-                height: 18px;
-                line-height: 18px;
+                // height: 18px;
+                // line-height: 18px;
                 .position > p {
                   text-align: left;
                   // color: #fbe8ff;
                 }
                 .right-content > p {
-                  margin-left: 15px;
+                  margin-left: 2px;
                   // color: #fbe8ff;
                   text-align: left;
                 }
@@ -575,9 +574,9 @@ p {
               .bottom-dsc {
                 width: 100%;
                 font-size: 18px;
-                height: 42px;
-                line-height: 60px;
-                margin-top: 20px;
+                // height: 42px;
+                // line-height: 60px;
+                // margin-top: 20px;
                 // color: #fbe8ff;
               }
               .goods-demo {