1119修改内容提交

2code/web/h5_pro/src/App.vue

@@ -12,6 +12,26 @@ export default {
 </script>
 
 <style lang="less">
+
+
+
+@import url('http://at.alicdn.com/t/font_922658_mxy3lhercr.css');
+
+// .iconfont {
+//   font-family:"iconfont" !important;
+//   font-size:16px;
+//   font-style:normal;
+//   -webkit-font-smoothing: antialiased;
+//   -moz-osx-font-smoothing: grayscale;
+// }
+
+// .icon-fanhui:before { content: "\e6be"; }
+
+// .icon-huaban:before { content: "\e60d"; }
+
+// .icon-youkeduantubiao_gaojishaixuan:before { content: "\e637"; }
+
+
 @r:100rem;
   *{
     padding: 0;

2code/web/h5_pro/src/assets/iconfont/iconfont.svg

+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2013-9-30: Created.
+-->
+<svg>
+<metadata>
+Created by iconfont
+</metadata>
+<defs>
+
+<font id="iconfont" horiz-adv-x="1024" >
+  <font-face
+    font-family="iconfont"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="1024"
+    ascent="896"
+    descent="-128"
+  />
+    <missing-glyph />
+    
+    <glyph glyph-name="fanhui" unicode="&#59070;" d="M597.333333 896L170.666667 384l426.666666-512h256L426.666667 384 853.333333 896H597.333333z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="huaban" unicode="&#58893;" d="M422.912 135.168C358.4 185.344 291.84 230.4 231.936 281.6a339.968 339.968 0 0 0-86.016 117.248A141.312 141.312 0 0 0 213.504 588.8c64 34.304 129.024 15.36 185.856-54.272 31.232-37.888 41.472-36.352 66.048 8.192a141.312 141.312 0 0 0 130.56 90.112 147.968 147.968 0 0 0 144.384-118.272c4.608-13.312 7.168-35.84 32.256-32.768s15.872 28.672 14.336 41.984a192.512 192.512 0 0 1-358.4 57.856L409.6 600.576a185.344 185.344 0 0 1-220.672 31.232 196.096 196.096 0 0 1-102.4-204.8c15.872-99.328 80.896-162.816 157.696-219.648 51.2-36.352 96.256-73.728 144.896-109.568 14.336-11.264 29.184-35.328 51.2-10.752s-2.048 36.352-17.408 48.128z m425.472 227.328a150.016 150.016 0 0 1-148.48 19.968c-4.608 10.752-8.704 19.456-12.8 28.16a135.68 135.68 0 0 1-184.832 67.584 153.6 153.6 0 0 1-85.504-187.392c23.552-86.016 54.784-169.472 82.944-256 9.216-27.648 27.648-20.48 51.2-12.8 59.904 20.992 120.32 39.936 180.224 60.928a508.416 508.416 0 0 1 87.552 36.352 146.432 146.432 0 0 1 29.696 243.2z m-16.384-153.6a250.88 250.88 0 0 0-92.16-65.536c-61.44-24.064-126.464-39.424-195.584-59.904-25.6 71.68-55.296 141.312-74.752 213.504a120.832 120.832 0 0 0 11.776 97.28 102.4 102.4 0 0 0 99.84 47.616 86.528 86.528 0 0 0 68.608-79.36c7.68-54.272 13.824-57.344 60.416-32.256a93.696 93.696 0 0 0 109.056-8.704 83.968 83.968 0 0 0 12.8-112.128z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="youkeduantubiao_gaojishaixuan" unicode="&#58935;" d="M733.1 400.6c56.6 56.6 56.6 148.3 0 204.9-56.6 56.6-148.3 56.6-204.9 0-56.6-56.6-56.6-148.3 0-204.9s148.3-56.6 204.9 0zM120.1 603c-13.3 0-24.1 10.8-24.1 24.1v48.3c0 13.3 10.8 24.1 24.1 24.1h193.2c13.3 0 24.1-10.8 24.1-24.1v-48.3c0-13.3-10.8-24.1-24.1-24.1H120.1z m643.7-301.5c-93.8-62.1-221.3-51.9-303.9 30.7-94.3 94.3-94.3 247.2 0 341.5 94.3 94.3 247.2 94.3 341.5 0 82.6-82.6 92.8-210.2 30.7-303.9l88.8-88.8c9.4-9.4 9.4-24.7 0-34.1l-34.1-34.1c-9.4-9.4-24.7-9.4-34.1 0l-88.9 88.7z m-643.7 11.8c-13.3 0-24.1 10.8-24.1 24.1v48.3c0 13.3 10.8 24.1 24.1 24.1h241.5c13.3 0 24.1-10.8 24.1-24.1v-48.3c0-13.3-10.8-24.1-24.1-24.1H120.1z m0-289.8c-13.3 0-24.1 10.8-24.1 24.1V96c0 13.3 10.8 24.1 24.1 24.1h772.7c13.3 0 24.1-10.8 24.1-24.1v-48.3c0-13.3-10.8-24.1-24.1-24.1H120.1z"  horiz-adv-x="1024" />
+
+    
+
+
+  </font>
+</defs></svg>

2code/web/h5_pro/src/components/CHeader/index.vue

 <template>
     <div class="header" :class="{'seach-header':seach}">
-        <span v-if="!noBack" class="back" @click="bankFun">返回</span>
+        <span v-if="!noBack" class="back" @click="bankFun"><i class="iconfont icon-fanhui"></i></span>
         <span v-if="!seach">{{title}}</span>
         <div class="seach-wrapper" v-if="seach">
+
             <input class="seach-input" type="text" placeholder="请输入关键字" v-model="storeName" @keyup.enter="handleSeach">
 
             <span class="select-wrapper" @click='handleShowSheet'>{{cityItem.name}}</span>
@@ -55,6 +56,9 @@ export default {
         this.showSheet = !this.showSheet;
     },
     handleCancle(){
+        let obj = {name:'西安',codeC:'610100'}
+        const cityItem = sessionStorage.getItem('cityItem')
+        this.cityItem = cityItem?JSON.parse(cityItem):obj
         this.showSheet = !this.showSheet;
     },
     handleConfirm(){
@@ -112,9 +116,10 @@ export default {
       justify-content: space-between;
       margin-top: 20/@r;
       box-shadow: 2px 2px 2px rgba(0,0,0,.2)
+
     }
     input.seach-input {
-      width: 500/@r;
+      display: block;
       background: none;
       border: none;
       border: solid 1px #dedede;
@@ -127,6 +132,7 @@ export default {
     }
 
     .select-wrapper{
+        display: block;
         right: 0/@r;
         top: 0/@r;
         background: none;

2code/web/h5_pro/src/views/home/components/HShopList.vue

@@ -4,8 +4,9 @@
             <div class="img" :style="{'background-image':`url(${data.storeHomePic})`}"></div>
             <div class="item-infro">
                 <div class="name" >{{data.storeName}}</div>
-                <div class="details">{{data.brief}}</div>
+                <div class="details"><i class="iconfont icon-shijian"></i> {{data.storeBusinessTimeStart}}-{{data.storeBusinessTimeEnd}}    <i class="iconfont icon-xiaofei"></i>{{data.consumeInterval}}</div>
                 <div class="details">{{data.storePosition}}</div>
+                <!-- <div class="details">{{data.brief}}</div> -->
             </div>
         </div>
 </template>
@@ -48,6 +49,14 @@ export default {
         .details{
             font-size: 24/@r;
             color: #999;
+            i{
+                color: #de4b4b;
+                vertical-align: -4/@r;
+
+                &.icon-xiaofei{
+                    margin-left: 20/@r;
+                }
+            }
         }
     }
 

2code/web/h5_pro/src/views/home/components/HStaff.vue

@@ -2,7 +2,7 @@
     <div class="staff-item">
         <div class="img" :style="{'background-image':`url(${data.workerHomePic})`}"></div>
         <div class="infro">{{data.workerName}}:{{data.brief}} </div>
-        <span class="clicks">点击量:{{data.clicks}}</span>
+        <span class="clicks"><i class="iconfont icon-xinaixin"></i>{{data.clicks}}</span>
     </div>
 </template>
 
@@ -61,6 +61,10 @@ export default {
             color: #fff;
             padding: 8/@r 8/@r;
             border-radius: 10/@r;
+            i{
+                font-size: 24/@r;
+                margin-right: 6/@r;
+            }
         }
     }
 </style>

2code/web/h5_pro/src/views/shopDetails/index.vue

@@ -3,7 +3,7 @@
         <c-header title="商家详情"></c-header>
         <div class="shop-main-infro">
             <div class="shop-name">{{shopData.storeName}}</div>
-            <div class="brief">{{shopData.brief}}</div>
+            <div class="infro"><i class="iconfont icon-shijian"></i> {{shopData.storeBusinessTimeStart}}-{{shopData.storeBusinessTimeEnd}}    <i class="iconfont icon-xiaofei"></i>{{shopData.consumeInterval}}</div>
             <div class="address">{{shopData.province}} {{shopData.cityName}} {{shopData.county}} {{shopData.storePosition}}</div>
         </div>
 
@@ -15,6 +15,7 @@
                 <div class="employee-item" v-for="(item,idx) in workerData" :key="idx" @click="toWorkerDetails(item.workerId)">
                     <div class="img" :style="{'background-image':`url(${item.workerHomePic})`}"></div>
                     <div class="infro">个人简介：{{item.brief}}</div>
+                    <span class="clicks"><i class="iconfont icon-xinaixin"></i>{{item.clicks}}</span>
                 </div>
             
             </div>
@@ -87,6 +88,19 @@ export default {
         color: #666;
         margin-top: 10/@r;
     }
+    .infro{
+        font-size: 24/@r;
+        color: #999;
+        margin: 10/@r;
+        i{
+            color: #de4b4b;
+            vertical-align: -4/@r;
+
+            &.icon-xiaofei{
+                margin-left: 20/@r;
+            }
+        }
+    }
 }
 
 .employee-wrapper{
@@ -100,6 +114,7 @@ export default {
         height: 400/@r;
         background: #f0f0f0;
         margin-bottom: 30/@r;
+        position: relative;
         .img{
             height: 250/@r;
             background: rgba(222,75,75,.5) ;
@@ -118,6 +133,22 @@ export default {
             -webkit-line-clamp: 3;
             overflow: hidden;
         }
+        .clicks{
+            position: absolute;
+            left: 10/@r;
+            top: 10/@r;
+            // color: #fff;
+            font-size: 24/@r;
+            // text-shadow: 2px 2px 2px rgba(0, 0, 0, .5);
+            background: rgba(222, 75, 75, .8);
+            color: #fff;
+            padding: 8/@r 8/@r;
+            border-radius: 10/@r;
+            i{
+                font-size: 24/@r;
+                margin-right: 6/@r;
+            }
+        }
     }
 }
 

2code/web/h5_pro/src/views/shopList/components/MoreShop.vue

 <template>
     <div class="more-shop">
-        <div class="choose-btn" @click="taggleModelFun">筛选条件</div>
+        <div class="choose-btn" @click="taggleModelFun"><i class="iconfont icon-youkeduantubiao_gaojishaixuan"></i></div>
         <div class="choose-content" :class="{active:show}">
             <div class="bg" @click="handleCancle"></div>
             <div class="content">

2code/web/h5_pro/src/views/shopList/components/SItem.vue

@@ -3,8 +3,9 @@
         <div class="img" :style="{'background-image':`url(${data.storeHomePic})`}"></div>
         <div class="item-infro">
             <div class="title">{{data.storeName}}</div>
-            <div class="infro">{{data.storePosition}}</div>
-            <div class="adress">{{data.brief}}</div>
+            <div class="infro position">{{data.storePosition}}</div>
+            <div class="infro"><i class="iconfont icon-shijian"></i> {{data.storeBusinessTimeStart}}-{{data.storeBusinessTimeEnd}}    <i class="iconfont icon-xiaofei"></i>{{data.consumeInterval}}</div>
+            <!-- <div class="adress">{{data.brief}}</div> -->
         </div>
     </div>
 </template>
@@ -41,6 +42,17 @@ export default {
     .infro {
       font-size: 24 / @r;
       color: #999;
+      i{
+        color: #de4b4b;
+        // margin-right: 10/@r;
+        vertical-align: -4/@r;
+        &.icon-xiaofei{
+            margin-left: 20/@r;
+        }
+      }
+      &.position{
+        margin: 10/@r 0;
+      }
     }
     .adress {
       font-size: 24 / @r;

2code/web/h5_pro/src/views/workerDetails/index.vue

@@ -5,18 +5,52 @@
             <div class="img" :style="{'background-image':`url(${workerData.workerHomePic})`}"></div>
             
             <div class="infro">
-                <div class="name">{{workerData.workerName}}<span class="clicks">点击量:{{workerData.clicks}}</span></div>
+                <div class="name">{{workerData.workerName}}<span class="clicks"><i class="iconfont icon-xinaixin"></i>{{workerData.clicks}}</span></div>
                 <div class="bref-wrapper">{{workerData.brief}}</div>
-                <div class="bref" v-html="workerData.workerResume"></div>
+                
+                <div class="other-infro">
+                    <div class="item">
+                        <span class="name-text">年龄</span>
+                        <span class="number-text">{{workerData.workerAge}}</span>
+                        <span class="unit-text">岁</span>
+                    </div>
+                    <div class="item">
+                        <span class="name-text">身高</span>
+                        <span class="number-text">{{workerData.workerHeight}}</span>
+                        <span class="unit-text">cm</span>
+                    </div>
+                    <div class="item">
+                        <span class="name-text">体重</span>
+                        <span class="number-text">{{workerData.workerWeight}}</span>
+                        <span class="unit-text">kg</span>
+                    </div>
+                    <div class="item">
+                        <span class="name-text">胸围</span>
+                        <span class="number-text">{{workerData.workerBust}}</span>
+                        <span class="unit-text">cm</span>
+                    </div>
+                    <div class="item">
+                        <span class="name-text">腰围</span>
+                        <span class="number-text">{{workerData.workerWaist}}</span>
+                        <span class="unit-text">cm</span>
+                    </div>
+                    <div class="item">
+                        <span class="name-text">臀围</span>
+                        <span class="number-text">{{workerData.workerHipline}}</span>
+                        <span class="unit-text">cm</span>
+                    </div>
+                </div>
+
+                <div class="bref" v-html="workerData.workerResume||'<span>正在努力搜集她的信息~~</span>'"></div>
             </div>
         </div>
 
-        <div class="store-content">
+        <div class="store-content" @click="toStoreDetails(workerData.storeId)">
             <div class="img" :style="{'background-image':`url(${workerData.storeHomePic})`}"></div>
             <div class="item-infro">
                 <div class="title">{{workerData.storeName}}</div>
-                <div class="adress">{{workerData.brief}}</div>
-                <div class="infro">{{workerData.storePosition}}</div>
+                <div class="adress">{{workerData.storeBrief}}</div>
+                <div class="infro">{{workerData.workerAncestral}}</div>
             </div>
         </div>
     </div>
@@ -55,8 +89,12 @@ export default {
         },
 
         handleScroll(){
-            // const ele = document.getElementById('scrollContainer');
-            // console.log(ele.getBoundingClientRect())
+            
+
+        },
+
+        toStoreDetails(id){
+            this.$router.push({ path:`/shopDetails/${id}`})
         }
     }
 }
@@ -65,7 +103,7 @@ export default {
 <style lang="less" scoped>
 @r:100rem;
 .worker-details{
-    padding-bottom: 220/@r;
+    margin-bottom: 220/@r;
     .img{
         height: 900/@r;
         background-color: #dedede;
@@ -83,10 +121,15 @@ export default {
                 font-weight: 700;
                 font-size: 24/@r;
                 margin-left: 24/@r;
-                background: #de4b4b;
-                color: #fff;
+                
+                color: #666;
                 padding: 8/@r 8/@r;
                 border-radius: 10/@r;
+                i{
+                    font-size: 24/@r;
+                    // margin-right: 6/@r;
+                    color: #de4b4b;
+                }
             }
         }
         .bref-wrapper{
@@ -95,6 +138,58 @@ export default {
             margin-top: 10/@r;
 
         }
+
+        .other-infro{
+            display: flex;
+            justify-content: space-between;
+            flex-wrap: wrap;
+            margin-top: 20/@r;
+            .item{
+                width: 31%;
+                border:solid 4/@r #de4b4b;
+                border-radius: 8/@r;
+                margin-bottom: 20/@r;
+                
+                position: relative;
+                height: 140/@r;
+                .name-text{
+                    font-size: 32/@r;
+                    position: absolute;
+                    top:10/@r;
+                    left: 10/@r;
+                    z-index: 1001;
+                    color: #666;
+                }
+
+                .unit-text{
+                    position: absolute;
+                    width: 100%;
+                    text-align: center;
+                    top: 0;
+                    left: 0;
+                    font-size: 100/@r;
+                    color: rgba(0, 0, 0, .3);
+                    z-index: 999;
+                    filter: blur(2/@r);
+                }
+
+                .number-text{
+                    position: absolute;
+                    width: 100%;
+                    text-align: center;
+                    top: 40/@r;
+                    left: 0;
+                    font-size: 60/@r;
+                    color: #de4b4b;
+                    z-index: 1000;
+                    font-weight: 700;
+                    // font-family: '宋体'
+                }
+                
+
+            }
+        }
+        
         .bref{
             background: #dedede;
             min-height: 300/@r;
@@ -119,6 +214,7 @@ export default {
     box-sizing: border-box;
     padding: 30/@r;
     background: #de4b4b;
+    z-index: 10003;
 
     .img {
         width: 160 / @r;
@@ -133,15 +229,16 @@ export default {
         margin-left: 28/@r;
         .title {
         font-size: 32 / @r;
-        color: #333;
+        color: #fff;
+        font-weight: 700;
         }
         .infro {
-        font-size: 24 / @r;
-        color: #999;
+        font-size: 28 / @r;
+        color: #fff;
         }
         .adress {
         font-size: 24 / @r;
-        color: #666;
+        color: #fff;
         }
     }
 }

2code/web/h5_pro/src/views/workerList/components/MoreWorker.vue

 <template>
     <div class="more-shop">
-        <div class="choose-btn" @click="taggleModelFun">筛选条件</div>
+        <div class="choose-btn" @click="taggleModelFun"><i class="iconfont icon-youkeduantubiao_gaojishaixuan"></i></div>
         <div class="choose-content" :class="{active:show}">
             <div class="bg" @click="handleCancle"></div>
             <div class="content">

2code/web/h5_pro/src/views/workerList/components/WStaff.vue

@@ -2,7 +2,7 @@
     <div class="staff-item">
         <div class="img" :style="{'background-image':`url(${data.workerHomePic})`}"></div>
         <div class="infro">{{data.workerName}}:{{data.brief}}</div>
-        <span class="clicks">点击量:{{data.clicks}}</span>
+        <span class="clicks"><i class="iconfont icon-xinaixin"></i>{{data.clicks}}</span>
     </div>
 </template>
 
@@ -59,6 +59,10 @@ export default {
         color: #fff;
         padding: 8/@r 8/@r;
         border-radius: 10/@r;
+        i{
+            font-size: 24/@r;
+            margin-right: 6/@r;
+        }
     }
 }
 </style>