miniprogram / shengxian · 提交

转到一个项目

作者 王旭宇
提交 5bf30d7eac354fab079a3733ce2617fc797a9886 1 个父辈 2cacbe8c

816

内嵌 并排对比
正在显示 13 个修改的文件 包含 151 行增加 和 88 行删除
@@ -9,12 +9,12 @@ @@ -9,12 +9,12 @@
9 9
10 @font-face { 10 @font-face {
11 font-family: 'iconfont'; /* project id 636259 */ 11 font-family: 'iconfont'; /* project id 636259 */
12 - src: url('//at.alicdn.com/t/font_636259_poikis0x03j.eot');  
13 - src: url('//at.alicdn.com/t/font_636259_poikis0x03j.eot?#iefix') format('embedded-opentype'),  
14 - url('//at.alicdn.com/t/font_636259_poikis0x03j.woff2') format('woff2'),  
15 - url('//at.alicdn.com/t/font_636259_poikis0x03j.woff') format('woff'),  
16 - url('//at.alicdn.com/t/font_636259_poikis0x03j.ttf') format('truetype'),  
17 - url('//at.alicdn.com/t/font_636259_poikis0x03j.svg#iconfont') format('svg'); 12 + src: url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.eot');
  13 + src: url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.eot?#iefix') format('embedded-opentype'),
  14 + url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.woff2') format('woff2'),
  15 + url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.woff') format('woff'),
  16 + url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.ttf') format('truetype'),
  17 + url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.svg#iconfont') format('svg');
18 } 18 }
19 /** 19 /**
20 * Eric Meyer's Reset CSS v2.0 (http://meyerweb.com/eric/tools/css/reset/) 20 * Eric Meyer's Reset CSS v2.0 (http://meyerweb.com/eric/tools/css/reset/)
@@ -277,7 +277,7 @@ input, textarea { @@ -277,7 +277,7 @@ input, textarea {
277 height: 86rpx; 277 height: 86rpx;
278 width: 100%; 278 width: 100%;
279 overflow: hidden; 279 overflow: hidden;
280 - line-height: 80rpx; 280 + line-height: 86rpx;
281 background: #fff; 281 background: #fff;
282 display: flex; 282 display: flex;
283 font-size: 34rpx; 283 font-size: 34rpx;
@@ -325,7 +325,9 @@ input, textarea { @@ -325,7 +325,9 @@ input, textarea {
325 -webkit-font-smoothing: antialiased; 325 -webkit-font-smoothing: antialiased;
326 -moz-osx-font-smoothing: grayscale; 326 -moz-osx-font-smoothing: grayscale;
327 } 327 }
328 - 328 +.icon-aaa::before{
  329 + content: "\e605"
  330 +}
329 .icon-vip:before { 331 .icon-vip:before {
330 content: "\e62f"; 332 content: "\e62f";
331 } 333 }
1 // pages/index/goodsDetial/goodsDetial.js 1 // pages/index/goodsDetial/goodsDetial.js
2 const app = getApp(); 2 const app = getApp();
  3 +const WxParse = require('../../../wxParse/wxParse/wxParse.js');
3 Page({ 4 Page({
4 5
5 /** 6 /**
@@ -280,6 +281,7 @@ Page({ @@ -280,6 +281,7 @@ Page({
280 let that = this 281 let that = this
281 app.post(url, params).then(r => { 282 app.post(url, params).then(r => {
282 console.log(r); 283 console.log(r);
  284 + WxParse.wxParse('content', 'html', r.data.info.content, this, 5);
283 for (let i = 0; i < r.data.attr.attr_sku.length; i++) { 285 for (let i = 0; i < r.data.attr.attr_sku.length; i++) {
284 for (let x = 0; x < r.data.attr.attr_sku[i].item.length; x++) { 286 for (let x = 0; x < r.data.attr.attr_sku[i].item.length; x++) {
285 r.data.attr.attr_sku[i].item[x].t = false; 287 r.data.attr.attr_sku[i].item[x].t = false;
1 <!--pages/index/goodsDetial/goodsDetial.wxml--> 1 <!--pages/index/goodsDetial/goodsDetial.wxml-->
  2 +<import src="../../../wxParse/wxParse/wxParse.wxml" />
2 <view class='big_box'> 3 <view class='big_box'>
3 <view class='detail_container {{show||shows||basicInfo?"active":""}}'> 4 <view class='detail_container {{show||shows||basicInfo?"active":""}}'>
4 <view class='banner'> 5 <view class='banner'>
@@ -83,13 +84,16 @@ @@ -83,13 +84,16 @@
83 <view class='iconfont icon-jinru '></view> 84 <view class='iconfont icon-jinru '></view>
84 </view> 85 </view>
85 <view class='graphic_ingredients_box ' wx:if='{{goods.info.more.images.length>0}}'> 86 <view class='graphic_ingredients_box ' wx:if='{{goods.info.more.images.length>0}}'>
86 - <view class='graphic_ingredients' bindtap='get_recipe'> 87 + <view class='graphic_ingredients' bindtap='get_recipe'>
87 <view class='graphic_ingredients_background'> 88 <view class='graphic_ingredients_background'>
88 <view class='graphic_ingredients_border'>浏览图文食谱</view> 89 <view class='graphic_ingredients_border'>浏览图文食谱</view>
89 </view> 90 </view>
90 </view> 91 </view>
91 </view> 92 </view>
92 </view> 93 </view>
  94 + <view class='templates' id='NAV{{two}}'>
  95 + <template is="wxParse" data="{{wxParseData:content.nodes}}" />
  96 + </view>
93 97
94 <view class='item_list7' wx:if='{{goods.attr.attr_cook.length>0}}'> 98 <view class='item_list7' wx:if='{{goods.attr.attr_cook.length>0}}'>
95 <view class='list_content'> 99 <view class='list_content'>
@@ -171,7 +175,6 @@ @@ -171,7 +175,6 @@
171 </view> 175 </view>
172 </view> 176 </view>
173 </view> 177 </view>
174 - <view id='NAV{{two}}'></view>  
175 <view class='item_list3' wx:if='{{goods.promotion.length>0}}'> 178 <view class='item_list3' wx:if='{{goods.promotion.length>0}}'>
176 <view class='package_title'>购买含本商品套餐更优惠</view> 179 <view class='package_title'>购买含本商品套餐更优惠</view>
177 <view class='package_box' bindtap='jump_goodsDetial2' data-id='{{item.promotion_id}}' wx:for='{{goods.promotion}}' wx:key='{{item.id}}'> 180 <view class='package_box' bindtap='jump_goodsDetial2' data-id='{{item.promotion_id}}' wx:for='{{goods.promotion}}' wx:key='{{item.id}}'>
1 /* pages/index/goodsDetial/goodsDetial.wxss */ 1 /* pages/index/goodsDetial/goodsDetial.wxss */
2 - 2 +@import "../../../wxParse/wxParse/wxParse.wxss";
3 page { 3 page {
4 background: #f3f5f5; 4 background: #f3f5f5;
5 width: 100%; 5 width: 100%;
@@ -79,6 +79,7 @@ page { @@ -79,6 +79,7 @@ page {
79 79
80 .item_list { 80 .item_list {
81 padding: 32rpx 25rpx; 81 padding: 32rpx 25rpx;
  82 + box-sizing: border-box;
82 background-color: #fff; 83 background-color: #fff;
83 margin-bottom: 20rpx; 84 margin-bottom: 20rpx;
84 } 85 }
@@ -247,6 +248,7 @@ white-space: nowrap; @@ -247,6 +248,7 @@ white-space: nowrap;
247 248
248 .item_list7 { 249 .item_list7 {
249 padding: 31rpx 25rpx 25rpx 25rpx; 250 padding: 31rpx 25rpx 25rpx 25rpx;
  251 + box-sizing: border-box
250 } 252 }
251 253
252 .attribute { 254 .attribute {
@@ -653,24 +655,38 @@ white-space: nowrap; @@ -653,24 +655,38 @@ white-space: nowrap;
653 display: flex; 655 display: flex;
654 align-items: center; 656 align-items: center;
655 justify-content: center; 657 justify-content: center;
  658 + padding: 10rpx;
  659 + box-sizing: border-box
656 } 660 }
657 661
658 .graphic_ingredients_border { 662 .graphic_ingredients_border {
659 font-size: 38rpx; 663 font-size: 38rpx;
660 color: #fff; 664 color: #fff;
661 - width: 430rpx;  
662 - height: 90rpx; 665 + width:100%;
  666 + height: 100%;
663 border: 1rpx solid #fff; 667 border: 1rpx solid #fff;
664 display: flex; 668 display: flex;
665 align-items: center; 669 align-items: center;
666 justify-content: center; 670 justify-content: center;
667 } 671 }
  672 +.templates{
  673 + width: 100%!important;
  674 + margin: 20rpx auto 0!important;
  675 +}
  676 +.wxParse-p{
  677 + width: 100%;
  678 + margin: 0 auto
  679 +}
  680 +.wxParse-img{
  681 + width: 100%!important;
  682 + margin: 0 auto!important
  683 +}
668 .content_item{ 684 .content_item{
669 margin-bottom:120rpx; 685 margin-bottom:120rpx;
670 } 686 }
671 .item_list6 { 687 .item_list6 {
672 padding: 30rpx 25rpx; 688 padding: 30rpx 25rpx;
673 - 689 + box-sizing: border-box
674 } 690 }
675 691
676 .collocation_title { 692 .collocation_title {
@@ -88,7 +88,8 @@ Page({ @@ -88,7 +88,8 @@ Page({
88 sku_values:'', 88 sku_values:'',
89 ast:'', 89 ast:'',
90 scrolltop:0, 90 scrolltop:0,
91 - stock:-1 91 + stock:-1,
  92 + xiaban:{}
92 }, 93 },
93 //获取购物车数量 94 //获取购物车数量
94 fetchCartNum() { 95 fetchCartNum() {
@@ -623,7 +624,7 @@ Page({ @@ -623,7 +624,7 @@ Page({
623 groupList: r.data.group 624 groupList: r.data.group
624 }) 625 })
625 } 626 }
626 - time() 627 + time()
627 let sst = setInterval(time, 1000) 628 let sst = setInterval(time, 1000)
628 if (ele.minutes == 0 && ele.seconds < 0) { 629 if (ele.minutes == 0 && ele.seconds < 0) {
629 clearInterval(sst) 630 clearInterval(sst)
@@ -647,9 +648,9 @@ Page({ @@ -647,9 +648,9 @@ Page({
647 commentList: r.data.comment, 648 commentList: r.data.comment,
648 packageCategories: r.data.package_categories, 649 packageCategories: r.data.package_categories,
649 sku_values:sku_values, 650 sku_values:sku_values,
650 - message:r.data.messageCount 651 + message:r.data.messageCount,
  652 + xiaban:r.data.goHiThumbIndex
651 }) 653 })
652 - console.log(that.data.groupList,'groupList')  
653 }) 654 })
654 }, 655 },
655 //跳转至问题反馈 656 //跳转至问题反馈
@@ -45,9 +45,10 @@ @@ -45,9 +45,10 @@
45 <view class='real_save'> 45 <view class='real_save'>
46 <view class='safe_box'> 46 <view class='safe_box'>
47 <view bindtap='go_mind_detect'> 47 <view bindtap='go_mind_detect'>
48 - <view class='real_anxin'> 48 + <!-- <view class='real_anxin'>
49 <image src='../imgs/anxin.png' class='anxin'></image> 49 <image src='../imgs/anxin.png' class='anxin'></image>
50 - </view> 50 + </view> -->
  51 + <text class='iconfont icon-aaa'></text>
51 <text>安心检测</text> 52 <text>安心检测</text>
52 </view> 53 </view>
53 <view bindtap='go_selectSource'> 54 <view bindtap='go_selectSource'>
@@ -62,7 +63,7 @@ @@ -62,7 +63,7 @@
62 </view> 63 </view>
63 <!-- <navigator url='{{banner.url}}'> --> 64 <!-- <navigator url='{{banner.url}}'> -->
64 <view class='classfy' bindtap='go_hi_carousel'> 65 <view class='classfy' bindtap='go_hi_carousel'>
65 - <image src='{{banner.image}}'></image> 66 + <image src='{{xiaban.image}}'></image>
66 </view> 67 </view>
67 <!-- </navigator> --> 68 <!-- </navigator> -->
68 <view class="safety_box function"> 69 <view class="safety_box function">
@@ -137,8 +138,8 @@ @@ -137,8 +138,8 @@
137 <image class='goods_img_image' src='{{item.more.thumbnail}}'></image> 138 <image class='goods_img_image' src='{{item.more.thumbnail}}'></image>
138 </view> 139 </view>
139 <view class='good_right'> 140 <view class='good_right'>
140 - <view class='good_name goods_name_margin_top'>{{item.title}}</view>  
141 - <view class='good_stand'>{{item.excerpt}}</view> 141 + <view class='good_name goods_name_margin_top yititle'>{{item.title}}</view>
  142 + <view class='good_stand yititle'>{{item.excerpt}}</view>
142 <view class='good_price_three'> 143 <view class='good_price_three'>
143 <text class='good_pprice'><text class='rmb'>￥</text>{{item.price}}</text> 144 <text class='good_pprice'><text class='rmb'>￥</text>{{item.price}}</text>
144 <text class='good_oprice'><text class='rmb'>￥</text>{{item.old_price}}</text> 145 <text class='good_oprice'><text class='rmb'>￥</text>{{item.old_price}}</text>
@@ -161,7 +162,7 @@ @@ -161,7 +162,7 @@
161 162
162 </view> 163 </view>
163 <view class='ad_box' bindtap='show_ad' wx:if='{{showad}}'> 164 <view class='ad_box' bindtap='show_ad' wx:if='{{showad}}'>
164 - <image src='{{imgUrl}}atan@2x.png' mode='widthFix' catchtap='goad'></image> 165 + <image src='{{banner.image}}' mode='widthFix' catchtap='goad'></image>
165 <view class='iconfont icon-quxiao'></view> 166 <view class='iconfont icon-quxiao'></view>
166 </view> 167 </view>
167 </view> 168 </view>
@@ -181,7 +182,7 @@ @@ -181,7 +182,7 @@
181 </view> 182 </view>
182 </view> 183 </view>
183 <view class='good_right goods_right'> 184 <view class='good_right goods_right'>
184 - <view class='good_name'>{{item.title}}</view> 185 + <view class='good_name yititle'>{{item.title}}</view>
185 <view class='good_stand'></view> 186 <view class='good_stand'></view>
186 <view class='good_price_progressaa'> 187 <view class='good_price_progressaa'>
187 <progress show-info border-radius='4' activeColor='#ffda44' stroke-width='8' percent='{{item.percent}}' font-size='12'></progress> 188 <progress show-info border-radius='4' activeColor='#ffda44' stroke-width='8' percent='{{item.percent}}' font-size='12'></progress>
@@ -216,7 +217,7 @@ @@ -216,7 +217,7 @@
216 </view> 217 </view>
217 <view class='collocation_content'> 218 <view class='collocation_content'>
218 219
219 - <view class='zhongtu_title_hei'>{{item.title}}</view> 220 + <view class='zhongtu_title_hei ertitle'>{{item.title}}</view>
220 <view class='introduce introduces'>{{item.excerpt}}</view> 221 <view class='introduce introduces'>{{item.excerpt}}</view>
221 <view> 222 <view>
222 <view class='price_big_boxa'> 223 <view class='price_big_boxa'>
@@ -311,8 +312,8 @@ @@ -311,8 +312,8 @@
311 <view class='good_btn cart_icons'> 312 <view class='good_btn cart_icons'>
312 <view class='iconfont icon-gouwuche' catchtap='show_cart_mask' data-goods='{{item.id}}'></view> 313 <view class='iconfont icon-gouwuche' catchtap='show_cart_mask' data-goods='{{item.id}}'></view>
313 </view> 314 </view>
314 - <view class='goods_for_font_one'>{{item.title}}</view>  
315 - <view class='goods_for_font_two'>{{item.excerpt}}</view> 315 + <view class='goods_for_font_one santitle'>{{item.title}}</view>
  316 + <view class='goods_for_font_two sanexcerpt'>{{item.excerpt}}</view>
316 <view class='goods_for_font_three'> 317 <view class='goods_for_font_three'>
317 <view class='goods_for_font_three_one'> 318 <view class='goods_for_font_three_one'>
318 <view>￥</view> 319 <view>￥</view>
@@ -355,7 +356,7 @@ @@ -355,7 +356,7 @@
355 <view class='good_btn cart_icons '> 356 <view class='good_btn cart_icons '>
356 <view class='iconfont icon-gouwuche ' catchtap='show_cart_mask' data-goods='{{item.id}} '></view> 357 <view class='iconfont icon-gouwuche ' catchtap='show_cart_mask' data-goods='{{item.id}} '></view>
357 </view> 358 </view>
358 - <view class='goods_for_font_one '>{{item.title}}</view> 359 + <view class='goods_for_font_one santitle'>{{item.title}}</view>
359 <progress show-info border-radius='4 ' activeColor='#ffda44 ' stroke-width='8 ' percent='{{item.percent}} ' font-size='12 '></progress> 360 <progress show-info border-radius='4 ' activeColor='#ffda44 ' stroke-width='8 ' percent='{{item.percent}} ' font-size='12 '></progress>
360 <text class='group_font'>已拼{{item.group_number}}份\t\t\t\t目标{{item.group_min_number}}份</text> 361 <text class='group_font'>已拼{{item.group_number}}份\t\t\t\t目标{{item.group_min_number}}份</text>
361 <view class='goods_for_font_threes'> 362 <view class='goods_for_font_threes'>
@@ -406,15 +407,11 @@ @@ -406,15 +407,11 @@
406 </block> 407 </block>
407 <block wx:if='{{navs==item.id}}' wx:for='{{packageCategories}}' wx:key='{{item.id}}'> 408 <block wx:if='{{navs==item.id}}' wx:for='{{packageCategories}}' wx:key='{{item.id}}'>
408 <view class='padding-top_nav'> 409 <view class='padding-top_nav'>
409 - <swiper wx:if='{{(navsPhotos.length>0)}}' next-margin='60rpx' previous-margin='10rpx' circular='true' autoplay='true' display-multiple-items='1' class='swiper_banner_box_two {{maodianFlag?"active":""}}' interval='5000'>  
410 - <block wx:for='{{navsPhotos}}' wx:key='{{item}}'>  
411 - <swiper-item bindtap='jump_special_list' data-specialid='{{item.id}}'>  
412 - <image src='{{item.url}}' class="slide-image"></image>  
413 - </swiper-item>  
414 - </block>  
415 - <block wx:for='{{navsPhotos}}' wx:key='{{item}}'> 410 + <swiper wx:if='{{(navsPhotos.length>0)}}' next-margin='40rpx' previous-margin='10rpx' circular='true' autoplay='true' display-multiple-items='1' class='swiper_banner_box {{maodianFlag?"active":""}}' interval='5000'>
  411 + <block wx:for='{{item.more.photos}}' wx:key='{{item}}'>
  412 + <!-- next-margin='40rpx' previous-margin='10rpx' circular='true' autoplay='true' display-multiple-items='1' class='swiper_banner_box' -->
416 <swiper-item bindtap='jump_special_list' data-specialid='{{item.id}}'> 413 <swiper-item bindtap='jump_special_list' data-specialid='{{item.id}}'>
417 - <image src='{{item.url}}' class="slide-image"></image> 414 + <image src='{{item.url}}' class="slide-image uiuiui"></image>
418 </swiper-item> 415 </swiper-item>
419 </block> 416 </block>
420 </swiper> 417 </swiper>
@@ -456,8 +453,8 @@ @@ -456,8 +453,8 @@
456 <image src='{{item.thumbnail}}' class='goods_img_image'></image> 453 <image src='{{item.thumbnail}}' class='goods_img_image'></image>
457 </view> 454 </view>
458 <view class='good_right'> 455 <view class='good_right'>
459 - <view class='good_name goods_name_margin_top'>{{item.title}}</view>  
460 - <view class='good_stand'>{{item.excerpt}}</view> 456 + <view class='good_name goods_name_margin_top yititle'>{{item.title}}</view>
  457 + <view class='good_stand yiexcerpt'>{{item.excerpt}}</view>
461 <view class='good_price_three'> 458 <view class='good_price_three'>
462 <text class='good_pprice'><text class='rmb'>￥</text>{{item.price}}</text> 459 <text class='good_pprice'><text class='rmb'>￥</text>{{item.price}}</text>
463 <text class='good_oprice'><text class='rmb'>￥</text>{{item.old_price}}</text> 460 <text class='good_oprice'><text class='rmb'>￥</text>{{item.old_price}}</text>
@@ -476,7 +473,7 @@ @@ -476,7 +473,7 @@
476 </view> 473 </view>
477 </view> 474 </view>
478 <view class='ad_box' bindtap='show_ad' wx:if='{{showad}}'> 475 <view class='ad_box' bindtap='show_ad' wx:if='{{showad}}'>
479 - <image src='{{imgUrl}}atan@2x.png' mode='widthFix' catchtap='goad'></image> 476 + <image src='{{banner.image}}' mode='widthFix' catchtap='goad'></image>
480 <view class='iconfont icon-quxiao'></view> 477 <view class='iconfont icon-quxiao'></view>
481 </view> 478 </view>
482 </view> 479 </view>
@@ -499,7 +496,7 @@ @@ -499,7 +496,7 @@
499 </view> 496 </view>
500 <view class='collocation_content'> 497 <view class='collocation_content'>
501 498
502 - <view>{{item.title}}</view> 499 + <view class='zhongtu_title_hei'>{{item.title}}</view>
503 <view class='introduce introduces'>{{item.excerpt}}</view> 500 <view class='introduce introduces'>{{item.excerpt}}</view>
504 <view> 501 <view>
505 <view class='price_big_box'> 502 <view class='price_big_box'>
@@ -537,8 +534,8 @@ @@ -537,8 +534,8 @@
537 <image src='{{item.thumbnail}}'></image> 534 <image src='{{item.thumbnail}}'></image>
538 </view> 535 </view>
539 <view class='goods_for_font'> 536 <view class='goods_for_font'>
540 - <view class='goods_for_font_one'>{{item.title}}</view>  
541 - <view class='goods_for_font_two'>{{item.excerpt}}</view> 537 + <view class='goods_for_font_one santitle'>{{item.title}}</view>
  538 + <view class='goods_for_font_two sanexcerpt'>{{item.excerpt}}</view>
542 <view class='goods_for_font_three'> 539 <view class='goods_for_font_three'>
543 <view class='goods_for_font_three_one'> 540 <view class='goods_for_font_three_one'>
544 <view>￥</view> 541 <view>￥</view>
@@ -565,20 +562,10 @@ @@ -565,20 +562,10 @@
565 </block> 562 </block>
566 <block wx:if='{{nav==item.id}}' wx:for='{{category}}' wx:key='{{item.id}}'> 563 <block wx:if='{{nav==item.id}}' wx:for='{{category}}' wx:key='{{item.id}}'>
567 <view class='padding-top_nav'> 564 <view class='padding-top_nav'>
568 - <swiper next-margin='60rpx' previous-margin='10rpx' circular='true' autoplay='true' display-multiple-items='1' class='swiper_banner_box_two {{maodianFlag?"active":""}}' interval='5000' wx:if='{{two_banner.length>0}}'> 565 + <swiper next-margin='40rpx' previous-margin='10rpx' circular='true' autoplay='true' display-multiple-items='1' class='swiper_banner_box' interval='5000' wx:if='{{two_banner.length>0}}'>
569 <block wx:for='{{two_banner}}' wx:key='{{item}}'> 566 <block wx:for='{{two_banner}}' wx:key='{{item}}'>
570 - <swiper-item bindtap='jump_web' data-jump='{{item.jump}}'>  
571 - <image src='{{item.url}}' class="slide-image {{currentIndex == 0 ? 'active': ''}}"></image>  
572 - </swiper-item>  
573 - </block>  
574 - <block wx:for='{{two_banner}}' wx:key='{{item}}'>  
575 - <swiper-item bindtap='jump_web' data-jump='{{item.jump}}'>  
576 - <image src='{{item.url}}' class="slide-image {{currentIndex == 0 ? 'active': ''}}"></image>  
577 - </swiper-item>  
578 - </block>  
579 - <block wx:for='{{two_banner}}' wx:key='{{item}}'>  
580 - <swiper-item bindtap='jump_web' data-jump='{{item.jump}}'>  
581 - <image src='{{item.url}}' class="slide-image {{currentIndex == 0 ? 'active': ''}}"></image> 567 + <swiper-item class='nopadding' bindtap='jump_web' data-jump='{{item.jump}}'>
  568 + <image src='{{item.url}}' mode='aspectFill' class="slide-image uiuiui {{currentIndex == 0 ? 'active': ''}}"></image>
582 </swiper-item> 569 </swiper-item>
583 </block> 570 </block>
584 </swiper> 571 </swiper>
@@ -626,8 +613,8 @@ @@ -626,8 +613,8 @@
626 <image src='{{item.more.thumbnail}}' class='goods_img_image'></image> 613 <image src='{{item.more.thumbnail}}' class='goods_img_image'></image>
627 </view> 614 </view>
628 <view class='good_right goods_rights'> 615 <view class='good_right goods_rights'>
629 - <view class='good_name'>{{item.title}}</view>  
630 - <view class='good_stand'>{{item.excerpt}}</view> 616 + <view class='good_name yititle'>{{item.title}}</view>
  617 + <view class='good_stand yiexcerpt'>{{item.excerpt}}</view>
631 <view class='good_price_threea'> 618 <view class='good_price_threea'>
632 <text class='good_pprice'><text class='rmb'>￥</text>{{item.price}}</text> 619 <text class='good_pprice'><text class='rmb'>￥</text>{{item.price}}</text>
633 <text class='good_oprice'><text class='rmb'>￥</text>{{item.old_price}}</text> 620 <text class='good_oprice'><text class='rmb'>￥</text>{{item.old_price}}</text>
@@ -649,7 +636,7 @@ @@ -649,7 +636,7 @@
649 </view> 636 </view>
650 </view> 637 </view>
651 <view class='ad_box' bindtap='show_ad' wx:if='{{showad}}'> 638 <view class='ad_box' bindtap='show_ad' wx:if='{{showad}}'>
652 - <image src='{{imgUrl}}atan@2x.png' mode='widthFix' catchtap='goad'></image> 639 + <image src='{{banner.image}}' mode='widthFix' catchtap='goad'></image>
653 <view class='iconfont icon-quxiao'></view> 640 <view class='iconfont icon-quxiao'></view>
654 </view> 641 </view>
655 </view> 642 </view>
@@ -674,7 +661,7 @@ @@ -674,7 +661,7 @@
674 </view> 661 </view>
675 <view class='collocation_content'> 662 <view class='collocation_content'>
676 663
677 - <view>{{item.title}}</view> 664 + <view class='zhongtu_title_hei'>{{item.title}}</view>
678 <view class='introduce introduces'>{{item.excerpt}}</view> 665 <view class='introduce introduces'>{{item.excerpt}}</view>
679 <view> 666 <view>
680 <view class='price_big_box'> 667 <view class='price_big_box'>
@@ -719,8 +706,8 @@ @@ -719,8 +706,8 @@
719 <view class='good_btn cart_icons'> 706 <view class='good_btn cart_icons'>
720 <view class='iconfont icon-gouwuche' catchtap='show_cart_mask' data-goods='{{item.id}}'></view> 707 <view class='iconfont icon-gouwuche' catchtap='show_cart_mask' data-goods='{{item.id}}'></view>
721 </view> 708 </view>
722 - <view class='goods_for_font_one'>{{item.title}}</view>  
723 - <view class='goods_for_font_two'>{{item.excerpt}}</view> 709 + <view class='goods_for_font_one santitle'>{{item.title}}</view>
  710 + <view class='goods_for_font_two sanexcerpt'>{{item.excerpt}}</view>
724 <view class='goods_for_font_three'> 711 <view class='goods_for_font_three'>
725 <view class='goods_for_font_three_one'> 712 <view class='goods_for_font_three_one'>
726 <view>￥</view> 713 <view>￥</view>
@@ -765,7 +752,7 @@ @@ -765,7 +752,7 @@
765 <text>热卖</text> 752 <text>热卖</text>
766 </view> 753 </view>
767 <view class='all_classify_two_item' wx:for='{{packageCategories}}' wx:key='{{item.id}}' data-navid='{{item.id}}' data-flag='{{true}}' bindtap='jump_category_nav'> 754 <view class='all_classify_two_item' wx:for='{{packageCategories}}' wx:key='{{item.id}}' data-navid='{{item.id}}' data-flag='{{true}}' bindtap='jump_category_nav'>
768 - <image src='{{item.more.thumbnail}}'></image> 755 + <image src='{{item.more.thumbnail}}'></image>
769 <text>{{item.name}}</text> 756 <text>{{item.name}}</text>
770 </view> 757 </view>
771 <view class='all_classify_two_item' wx:for='{{category}}' wx:key='{{item.id}}' data-flag='{{false}}' data-navid='{{item.id}}' bindtap='jump_category_nav'> 758 <view class='all_classify_two_item' wx:for='{{category}}' wx:key='{{item.id}}' data-flag='{{false}}' data-navid='{{item.id}}' bindtap='jump_category_nav'>
@@ -319,7 +319,7 @@ page { @@ -319,7 +319,7 @@ page {
319 background-color: #fff; 319 background-color: #fff;
320 } 320 }
321 .safe_box { 321 .safe_box {
322 - height: 31rpx; 322 + height: 36rpx;
323 display: flex; 323 display: flex;
324 align-items: center; 324 align-items: center;
325 justify-content: space-around; 325 justify-content: space-around;
@@ -375,8 +375,8 @@ page { @@ -375,8 +375,8 @@ page {
375 } 375 }
376 376
377 .good_img { 377 .good_img {
378 - width: 200rpx;  
379 - height: 200rpx; 378 + width: 200rpx!important;
  379 + height: 200rpx!important;
380 position: relative; 380 position: relative;
381 border-radius: 16rpx; 381 border-radius: 16rpx;
382 overflow: hidden; 382 overflow: hidden;
@@ -402,11 +402,21 @@ page { @@ -402,11 +402,21 @@ page {
402 line-height: 32rpx; 402 line-height: 32rpx;
403 margin-bottom: 16rpx; 403 margin-bottom: 16rpx;
404 } 404 }
  405 +.yititle{
  406 + overflow: hidden;
  407 + text-overflow: ellipsis;
  408 + white-space: nowrap;
  409 +}
405 410
406 .good_stand { 411 .good_stand {
407 - height: 20rpx; 412 + height: 23rpx;
408 line-height: 23rpx; 413 line-height: 23rpx;
409 - margin-bottom: 25rpx; 414 + margin-bottom: 22rpx;
  415 +}
  416 +.yiexcerpt{
  417 + overflow: hidden;
  418 + text-overflow: ellipsis;
  419 + white-space: nowrap;
410 } 420 }
411 421
412 .goods_right{ 422 .goods_right{
@@ -415,7 +425,8 @@ page { @@ -415,7 +425,8 @@ page {
415 } 425 }
416 .goods_rights{ 426 .goods_rights{
417 padding-top:30rpx; 427 padding-top:30rpx;
418 - box-sizing: border-box 428 + box-sizing: border-box;
  429 + width: calc(100% - 220rpx);
419 } 430 }
420 .goods_right{ 431 .goods_right{
421 padding-top:8rpx 432 padding-top:8rpx
@@ -606,6 +617,7 @@ page { @@ -606,6 +617,7 @@ page {
606 617
607 .ad_box .iconfont { 618 .ad_box .iconfont {
608 color: #fff; 619 color: #fff;
  620 + margin-top: 20rpx;
609 } 621 }
610 622
611 .vipvip { 623 .vipvip {
@@ -851,9 +863,10 @@ page { @@ -851,9 +863,10 @@ page {
851 .all_classify_two { 863 .all_classify_two {
852 padding: 30rpx 50rpx 52rpx 50rpx; 864 padding: 30rpx 50rpx 52rpx 50rpx;
853 box-sizing: border-box; 865 box-sizing: border-box;
854 - /* display: flex; 866 + display: flex;
855 flex-wrap: wrap; 867 flex-wrap: wrap;
856 - justify-content: space-around; */ 868 + justify-content: flex-start;
  869 + align-content: flex-start;
857 } 870 }
858 871
859 .all_classify_two_item { 872 .all_classify_two_item {
@@ -865,7 +878,11 @@ page { @@ -865,7 +878,11 @@ page {
865 color: rgba(34, 34, 34, 1); 878 color: rgba(34, 34, 34, 1);
866 margin-bottom: 48rpx; 879 margin-bottom: 48rpx;
867 margin-right: 16rpx; 880 margin-right: 16rpx;
868 - float: left; 881 + display: flex;
  882 + justify-content: flex-start;
  883 + align-items: center;
  884 + flex-direction: column;
  885 + /* float: left; */
869 } 886 }
870 887
871 .all_classify_two_item:nth-child(3n) { 888 .all_classify_two_item:nth-child(3n) {
@@ -873,7 +890,7 @@ page { @@ -873,7 +890,7 @@ page {
873 } 890 }
874 891
875 .all_classify_two_item image { 892 .all_classify_two_item image {
876 - width: 100%; 893 + width: 120rpx;
877 height: 120rpx; 894 height: 120rpx;
878 margin-bottom: 20rpx; 895 margin-bottom: 20rpx;
879 } 896 }
@@ -1175,7 +1192,7 @@ page { @@ -1175,7 +1192,7 @@ page {
1175 font-family:PingFang-SC-Medium; 1192 font-family:PingFang-SC-Medium;
1176 font-weight:500; 1193 font-weight:500;
1177 color:rgba(34,34,34,1); 1194 color:rgba(34,34,34,1);
1178 - /* overflow: hidden; */ 1195 + overflow: hidden;
1179 white-space: nowrap; 1196 white-space: nowrap;
1180 text-overflow: ellipsis; 1197 text-overflow: ellipsis;
1181 } 1198 }
@@ -1391,7 +1408,11 @@ page { @@ -1391,7 +1408,11 @@ page {
1391 line-height: 32rpx; 1408 line-height: 32rpx;
1392 margin-bottom: 9rpx; 1409 margin-bottom: 9rpx;
1393 } 1410 }
1394 - 1411 +.santitle{
  1412 + overflow: hidden;
  1413 + text-overflow: ellipsis;
  1414 + white-space: nowrap
  1415 +}
1395 .goods_for_font_two { 1416 .goods_for_font_two {
1396 height: 23rpx; 1417 height: 23rpx;
1397 font-size: 24rpx; 1418 font-size: 24rpx;
@@ -1401,7 +1422,11 @@ page { @@ -1401,7 +1422,11 @@ page {
1401 line-height: 23rpx; 1422 line-height: 23rpx;
1402 margin-bottom: 27rpx; 1423 margin-bottom: 27rpx;
1403 } 1424 }
1404 - 1425 +.sanexcerpt{
  1426 + overflow: hidden;
  1427 + text-overflow: ellipsis;
  1428 + white-space: nowrap
  1429 +}
1405 .goods_for_font_three { 1430 .goods_for_font_three {
1406 height: 29rpx; 1431 height: 29rpx;
1407 display: flex; 1432 display: flex;
@@ -1500,7 +1525,7 @@ page { @@ -1500,7 +1525,7 @@ page {
1500 } 1525 }
1501 1526
1502 .padding-top_nav { 1527 .padding-top_nav {
1503 - /* padding-top: 20rpx; */ 1528 + padding-top: 200rpx;
1504 box-sizing: border-box; 1529 box-sizing: border-box;
1505 /* margin-top:200rpx */ 1530 /* margin-top:200rpx */
1506 } 1531 }
@@ -1514,7 +1539,7 @@ page { @@ -1514,7 +1539,7 @@ page {
1514 position: fixed; 1539 position: fixed;
1515 right: 46rpx; 1540 right: 46rpx;
1516 bottom: 46rpx; 1541 bottom: 46rpx;
1517 - z-index: 99999; 1542 + z-index: 99;
1518 width: 66rpx; 1543 width: 66rpx;
1519 height: 66rpx; 1544 height: 66rpx;
1520 border-radius: 33rpx; 1545 border-radius: 33rpx;
@@ -1721,7 +1746,7 @@ padding-left: 30rpx @@ -1721,7 +1746,7 @@ padding-left: 30rpx
1721 1746
1722 .scroll_view_class { 1747 .scroll_view_class {
1723 height: 100%; 1748 height: 100%;
1724 - /* padding-bottom:74rpx; */ 1749 + /* padding-bottom:24rpx; */
1725 box-sizing: border-box; 1750 box-sizing: border-box;
1726 } 1751 }
1727 1752
@@ -1949,5 +1974,17 @@ color:rgba(18,25,27,1); @@ -1949,5 +1974,17 @@ color:rgba(18,25,27,1);
1949 .oneone{ 1974 .oneone{
1950 width: 20rpx; 1975 width: 20rpx;
1951 height: 2rpx; 1976 height: 2rpx;
1952 - background: red 1977 +}
  1978 +
  1979 +.icon-aaa{
  1980 + font-size: 36rpx!important;
  1981 + color: #222;
  1982 + font-weight: 500;
  1983 + line-height: 36rpx;
  1984 + margin-left: -2rpx
  1985 +}
  1986 +.nopadding{
  1987 + /* padding: 0 */
  1988 + /* background: red; */
  1989 + /* padding-top: 200rpx; */
1953 } 1990 }
@@ -4,10 +4,10 @@ @@ -4,10 +4,10 @@
4 <view class='iconfont icon-fanhui' catchtap='get_back'></view> 4 <view class='iconfont icon-fanhui' catchtap='get_back'></view>
5 <view class='coupons'>{{current}}/{{imageList.length}}</view> 5 <view class='coupons'>{{current}}/{{imageList.length}}</view>
6 </view> 6 </view>
7 - <swiper bindchange='changeImage'> 7 + <swiper bindchange='changeImage' class='swiper'>
8 <swiper-item wx:for='{{imageList}}' wx:for-index='index' wx:key='{{index}}'> 8 <swiper-item wx:for='{{imageList}}' wx:for-index='index' wx:key='{{index}}'>
9 <view class='banner_img'> 9 <view class='banner_img'>
10 - <image src='{{item.url}}'></image> 10 + <image src='{{item.url}}' mode='widthFix'></image>
11 </view> 11 </view>
12 <!-- <view class='content_item'> 12 <!-- <view class='content_item'>
13 <view class='production_step'>步骤2</view> 13 <view class='production_step'>步骤2</view>
1 /* pages/index/production_steps/production_steps.wxss */ 1 /* pages/index/production_steps/production_steps.wxss */
2 page{ 2 page{
3 width: 100%; 3 width: 100%;
4 - height: 100%; 4 + height: 100%;
5 overflow: hidden 5 overflow: hidden
6 } 6 }
7 .big_box{ 7 .big_box{
8 width: 100%; 8 width: 100%;
  9 + height: 100%;
  10 + }
  11 +.banner{
  12 + /* position: absolute;
  13 + top: 0;
  14 + left: 0; */
  15 +
  16 +}
  17 +.swiper{
  18 + width: 100%;
9 height: 100%; 19 height: 100%;
10 } 20 }
11 .banner_img{ 21 .banner_img{
12 - width: 750rpx; 22 + width: 100%;
13 height: 100%; 23 height: 100%;
14 } 24 }
15 .banner_img image{ 25 .banner_img image{
@@ -247,7 +247,6 @@ Page({ @@ -247,7 +247,6 @@ Page({
247 let sku_values='' 247 let sku_values=''
248 app.post(url).then(r => { 248 app.post(url).then(r => {
249 if (r.code == 1) { 249 if (r.code == 1) {
250 - console.log(r.data)  
251 for (let i = 0; i < r.data.attr.attr_sku.length; i++) { 250 for (let i = 0; i < r.data.attr.attr_sku.length; i++) {
252 for (let x = 0; x < r.data.attr.attr_sku[i].item.length; x++) { 251 for (let x = 0; x < r.data.attr.attr_sku[i].item.length; x++) {
253 r.data.attr.attr_sku[i].item[x].t = false; 252 r.data.attr.attr_sku[i].item[x].t = false;
@@ -19,7 +19,7 @@ Page({ @@ -19,7 +19,7 @@ Page({
19 getget(){ 19 getget(){
20 wx.navigateBack({ 20 wx.navigateBack({
21 21
22 - }) 22 + })
23 }, 23 },
24 //获取关键字 24 //获取关键字
25 get_keyWords(e){ 25 get_keyWords(e){
@@ -30,9 +30,11 @@ get_keyWords(e){ @@ -30,9 +30,11 @@ get_keyWords(e){
30 }, 30 },
31 //删除打出的字 31 //删除打出的字
32 clear_keyword(){ 32 clear_keyword(){
  33 + console.log(this.data.value)
33 this.setData({ 34 this.setData({
34 value:'' 35 value:''
35 }) 36 })
  37 + console.log(this.data.value)
36 }, 38 },
37 //发起搜索 39 //发起搜索
38 send_search(){ 40 send_search(){
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <view class='banner'> 3 <view class='banner'>
4 <view class='iconfont icon-fanhui' bindtap='getget'></view> 4 <view class='iconfont icon-fanhui' bindtap='getget'></view>
5 <view class='input_box'> 5 <view class='input_box'>
6 - <view> 6 + <view class='input_box_child'>
7 <input type="text" placeholder='{{hothothot}}' placeholder-class='banner_input' value='{{value}}' bindinput='get_keyWords' class='input_placeholder'></input> 7 <input type="text" placeholder='{{hothothot}}' placeholder-class='banner_input' value='{{value}}' bindinput='get_keyWords' class='input_placeholder'></input>
8 </view> 8 </view>
9 <view class='iconfont icon-quxiao' bindtap='clear_keyword'></view> 9 <view class='iconfont icon-quxiao' bindtap='clear_keyword'></view>
@@ -40,6 +40,9 @@ page { @@ -40,6 +40,9 @@ page {
40 position: relative; 40 position: relative;
41 padding: 0 20rpx; 41 padding: 0 20rpx;
42 } 42 }
  43 +.input_box_child{
  44 + width: 94%
  45 +}
43 46
44 .banner_input { 47 .banner_input {
45 font-size: 24rpx; 48 font-size: 24rpx;
@@ -51,6 +54,7 @@ page { @@ -51,6 +54,7 @@ page {
51 color: #455255; 54 color: #455255;
52 position: absolute; 55 position: absolute;
53 right: 20rpx; 56 right: 20rpx;
  57 + z-index:999
54 } 58 }
55 59
56 .content_item { 60 .content_item {
@@ -119,5 +123,5 @@ page { @@ -119,5 +123,5 @@ page {
119 font-size:24rpx; 123 font-size:24rpx;
120 font-family:PingFang-SC-Medium; 124 font-family:PingFang-SC-Medium;
121 font-weight:500; 125 font-weight:500;
122 - width: 186%!important 126 + width: 100%!important;
123 } 127 }