miniprogram / shengxian · 提交

转到一个项目

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

816

内嵌 并排对比
正在显示 13 个修改的文件 包含 151 行增加 和 88 行删除
... ... @@ -9,12 +9,12 @@
@font-face {
font-family: 'iconfont'; /* project id 636259 */
src: url('//at.alicdn.com/t/font_636259_poikis0x03j.eot');
src: url('//at.alicdn.com/t/font_636259_poikis0x03j.eot?#iefix') format('embedded-opentype'),
url('//at.alicdn.com/t/font_636259_poikis0x03j.woff2') format('woff2'),
url('//at.alicdn.com/t/font_636259_poikis0x03j.woff') format('woff'),
url('//at.alicdn.com/t/font_636259_poikis0x03j.ttf') format('truetype'),
url('//at.alicdn.com/t/font_636259_poikis0x03j.svg#iconfont') format('svg');
src: url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.eot');
src: url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.eot?#iefix') format('embedded-opentype'),
url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.woff2') format('woff2'),
url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.woff') format('woff'),
url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.ttf') format('truetype'),
url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.svg#iconfont') format('svg');
}
/**
* Eric Meyer's Reset CSS v2.0 (http://meyerweb.com/eric/tools/css/reset/)
... ... @@ -277,7 +277,7 @@ input, textarea {
height: 86rpx;
width: 100%;
overflow: hidden;
line-height: 80rpx;
line-height: 86rpx;
background: #fff;
display: flex;
font-size: 34rpx;
... ... @@ -325,7 +325,9 @@ input, textarea {
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon-aaa::before{
content: "\e605"
}
.icon-vip:before {
content: "\e62f";
}
... ...
// pages/index/goodsDetial/goodsDetial.js
const app = getApp();
const WxParse = require('../../../wxParse/wxParse/wxParse.js');
Page({
/**
... ... @@ -280,6 +281,7 @@ Page({
let that = this
app.post(url, params).then(r => {
console.log(r);
WxParse.wxParse('content', 'html', r.data.info.content, this, 5);
for (let i = 0; i < r.data.attr.attr_sku.length; i++) {
for (let x = 0; x < r.data.attr.attr_sku[i].item.length; x++) {
r.data.attr.attr_sku[i].item[x].t = false;
... ...
<!--pages/index/goodsDetial/goodsDetial.wxml-->
<import src="../../../wxParse/wxParse/wxParse.wxml" />
<view class='big_box'>
<view class='detail_container {{show||shows||basicInfo?"active":""}}'>
<view class='banner'>
... ... @@ -83,13 +84,16 @@
<view class='iconfont icon-jinru '></view>
</view>
<view class='graphic_ingredients_box ' wx:if='{{goods.info.more.images.length>0}}'>
<view class='graphic_ingredients' bindtap='get_recipe'>
<view class='graphic_ingredients' bindtap='get_recipe'>
<view class='graphic_ingredients_background'>
<view class='graphic_ingredients_border'>浏览图文食谱</view>
</view>
</view>
</view>
</view>
<view class='templates' id='NAV{{two}}'>
<template is="wxParse" data="{{wxParseData:content.nodes}}" />
</view>
<view class='item_list7' wx:if='{{goods.attr.attr_cook.length>0}}'>
<view class='list_content'>
... ... @@ -171,7 +175,6 @@
</view>
</view>
</view>
<view id='NAV{{two}}'></view>
<view class='item_list3' wx:if='{{goods.promotion.length>0}}'>
<view class='package_title'>购买含本商品套餐更优惠</view>
<view class='package_box' bindtap='jump_goodsDetial2' data-id='{{item.promotion_id}}' wx:for='{{goods.promotion}}' wx:key='{{item.id}}'>
... ...
/* pages/index/goodsDetial/goodsDetial.wxss */
@import "../../../wxParse/wxParse/wxParse.wxss";
page {
background: #f3f5f5;
width: 100%;
... ... @@ -79,6 +79,7 @@ page {
.item_list {
padding: 32rpx 25rpx;
box-sizing: border-box;
background-color: #fff;
margin-bottom: 20rpx;
}
... ... @@ -247,6 +248,7 @@ white-space: nowrap;
.item_list7 {
padding: 31rpx 25rpx 25rpx 25rpx;
box-sizing: border-box
}
.attribute {
... ... @@ -653,24 +655,38 @@ white-space: nowrap;
display: flex;
align-items: center;
justify-content: center;
padding: 10rpx;
box-sizing: border-box
}
.graphic_ingredients_border {
font-size: 38rpx;
color: #fff;
width: 430rpx;
height: 90rpx;
width:100%;
height: 100%;
border: 1rpx solid #fff;
display: flex;
align-items: center;
justify-content: center;
}
.templates{
width: 100%!important;
margin: 20rpx auto 0!important;
}
.wxParse-p{
width: 100%;
margin: 0 auto
}
.wxParse-img{
width: 100%!important;
margin: 0 auto!important
}
.content_item{
margin-bottom:120rpx;
}
.item_list6 {
padding: 30rpx 25rpx;
box-sizing: border-box
}
.collocation_title {
... ...
... ... @@ -88,7 +88,8 @@ Page({
sku_values:'',
ast:'',
scrolltop:0,
stock:-1
stock:-1,
xiaban:{}
},
//获取购物车数量
fetchCartNum() {
... ... @@ -623,7 +624,7 @@ Page({
groupList: r.data.group
})
}
time()
time()
let sst = setInterval(time, 1000)
if (ele.minutes == 0 && ele.seconds < 0) {
clearInterval(sst)
... ... @@ -647,9 +648,9 @@ Page({
commentList: r.data.comment,
packageCategories: r.data.package_categories,
sku_values:sku_values,
message:r.data.messageCount
message:r.data.messageCount,
xiaban:r.data.goHiThumbIndex
})
console.log(that.data.groupList,'groupList')
})
},
//跳转至问题反馈
... ...
... ... @@ -45,9 +45,10 @@
<view class='real_save'>
<view class='safe_box'>
<view bindtap='go_mind_detect'>
<view class='real_anxin'>
<!-- <view class='real_anxin'>
<image src='../imgs/anxin.png' class='anxin'></image>
</view>
</view> -->
<text class='iconfont icon-aaa'></text>
<text>安心检测</text>
</view>
<view bindtap='go_selectSource'>
... ... @@ -62,7 +63,7 @@
</view>
<!-- <navigator url='{{banner.url}}'> -->
<view class='classfy' bindtap='go_hi_carousel'>
<image src='{{banner.image}}'></image>
<image src='{{xiaban.image}}'></image>
</view>
<!-- </navigator> -->
<view class="safety_box function">
... ... @@ -137,8 +138,8 @@
<image class='goods_img_image' src='{{item.more.thumbnail}}'></image>
</view>
<view class='good_right'>
<view class='good_name goods_name_margin_top'>{{item.title}}</view>
<view class='good_stand'>{{item.excerpt}}</view>
<view class='good_name goods_name_margin_top yititle'>{{item.title}}</view>
<view class='good_stand yititle'>{{item.excerpt}}</view>
<view class='good_price_three'>
<text class='good_pprice'><text class='rmb'>￥</text>{{item.price}}</text>
<text class='good_oprice'><text class='rmb'>￥</text>{{item.old_price}}</text>
... ... @@ -161,7 +162,7 @@
</view>
<view class='ad_box' bindtap='show_ad' wx:if='{{showad}}'>
<image src='{{imgUrl}}atan@2x.png' mode='widthFix' catchtap='goad'></image>
<image src='{{banner.image}}' mode='widthFix' catchtap='goad'></image>
<view class='iconfont icon-quxiao'></view>
</view>
</view>
... ... @@ -181,7 +182,7 @@
</view>
</view>
<view class='good_right goods_right'>
<view class='good_name'>{{item.title}}</view>
<view class='good_name yititle'>{{item.title}}</view>
<view class='good_stand'></view>
<view class='good_price_progressaa'>
<progress show-info border-radius='4' activeColor='#ffda44' stroke-width='8' percent='{{item.percent}}' font-size='12'></progress>
... ... @@ -216,7 +217,7 @@
</view>
<view class='collocation_content'>
<view class='zhongtu_title_hei'>{{item.title}}</view>
<view class='zhongtu_title_hei ertitle'>{{item.title}}</view>
<view class='introduce introduces'>{{item.excerpt}}</view>
<view>
<view class='price_big_boxa'>
... ... @@ -311,8 +312,8 @@
<view class='good_btn cart_icons'>
<view class='iconfont icon-gouwuche' catchtap='show_cart_mask' data-goods='{{item.id}}'></view>
</view>
<view class='goods_for_font_one'>{{item.title}}</view>
<view class='goods_for_font_two'>{{item.excerpt}}</view>
<view class='goods_for_font_one santitle'>{{item.title}}</view>
<view class='goods_for_font_two sanexcerpt'>{{item.excerpt}}</view>
<view class='goods_for_font_three'>
<view class='goods_for_font_three_one'>
<view>￥</view>
... ... @@ -355,7 +356,7 @@
<view class='good_btn cart_icons '>
<view class='iconfont icon-gouwuche ' catchtap='show_cart_mask' data-goods='{{item.id}} '></view>
</view>
<view class='goods_for_font_one '>{{item.title}}</view>
<view class='goods_for_font_one santitle'>{{item.title}}</view>
<progress show-info border-radius='4 ' activeColor='#ffda44 ' stroke-width='8 ' percent='{{item.percent}} ' font-size='12 '></progress>
<text class='group_font'>已拼{{item.group_number}}份\t\t\t\t目标{{item.group_min_number}}份</text>
<view class='goods_for_font_threes'>
... ... @@ -406,15 +407,11 @@
</block>
<block wx:if='{{navs==item.id}}' wx:for='{{packageCategories}}' wx:key='{{item.id}}'>
<view class='padding-top_nav'>
<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'>
<block wx:for='{{navsPhotos}}' wx:key='{{item}}'>
<swiper-item bindtap='jump_special_list' data-specialid='{{item.id}}'>
<image src='{{item.url}}' class="slide-image"></image>
</swiper-item>
</block>
<block wx:for='{{navsPhotos}}' wx:key='{{item}}'>
<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'>
<block wx:for='{{item.more.photos}}' wx:key='{{item}}'>
<!-- next-margin='40rpx' previous-margin='10rpx' circular='true' autoplay='true' display-multiple-items='1' class='swiper_banner_box' -->
<swiper-item bindtap='jump_special_list' data-specialid='{{item.id}}'>
<image src='{{item.url}}' class="slide-image"></image>
<image src='{{item.url}}' class="slide-image uiuiui"></image>
</swiper-item>
</block>
</swiper>
... ... @@ -456,8 +453,8 @@
<image src='{{item.thumbnail}}' class='goods_img_image'></image>
</view>
<view class='good_right'>
<view class='good_name goods_name_margin_top'>{{item.title}}</view>
<view class='good_stand'>{{item.excerpt}}</view>
<view class='good_name goods_name_margin_top yititle'>{{item.title}}</view>
<view class='good_stand yiexcerpt'>{{item.excerpt}}</view>
<view class='good_price_three'>
<text class='good_pprice'><text class='rmb'>￥</text>{{item.price}}</text>
<text class='good_oprice'><text class='rmb'>￥</text>{{item.old_price}}</text>
... ... @@ -476,7 +473,7 @@
</view>
</view>
<view class='ad_box' bindtap='show_ad' wx:if='{{showad}}'>
<image src='{{imgUrl}}atan@2x.png' mode='widthFix' catchtap='goad'></image>
<image src='{{banner.image}}' mode='widthFix' catchtap='goad'></image>
<view class='iconfont icon-quxiao'></view>
</view>
</view>
... ... @@ -499,7 +496,7 @@
</view>
<view class='collocation_content'>
<view>{{item.title}}</view>
<view class='zhongtu_title_hei'>{{item.title}}</view>
<view class='introduce introduces'>{{item.excerpt}}</view>
<view>
<view class='price_big_box'>
... ... @@ -537,8 +534,8 @@
<image src='{{item.thumbnail}}'></image>
</view>
<view class='goods_for_font'>
<view class='goods_for_font_one'>{{item.title}}</view>
<view class='goods_for_font_two'>{{item.excerpt}}</view>
<view class='goods_for_font_one santitle'>{{item.title}}</view>
<view class='goods_for_font_two sanexcerpt'>{{item.excerpt}}</view>
<view class='goods_for_font_three'>
<view class='goods_for_font_three_one'>
<view>￥</view>
... ... @@ -565,20 +562,10 @@
</block>
<block wx:if='{{nav==item.id}}' wx:for='{{category}}' wx:key='{{item.id}}'>
<view class='padding-top_nav'>
<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}}'>
<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}}'>
<block wx:for='{{two_banner}}' wx:key='{{item}}'>
<swiper-item bindtap='jump_web' data-jump='{{item.jump}}'>
<image src='{{item.url}}' class="slide-image {{currentIndex == 0 ? 'active': ''}}"></image>
</swiper-item>
</block>
<block wx:for='{{two_banner}}' wx:key='{{item}}'>
<swiper-item bindtap='jump_web' data-jump='{{item.jump}}'>
<image src='{{item.url}}' class="slide-image {{currentIndex == 0 ? 'active': ''}}"></image>
</swiper-item>
</block>
<block wx:for='{{two_banner}}' wx:key='{{item}}'>
<swiper-item bindtap='jump_web' data-jump='{{item.jump}}'>
<image src='{{item.url}}' class="slide-image {{currentIndex == 0 ? 'active': ''}}"></image>
<swiper-item class='nopadding' bindtap='jump_web' data-jump='{{item.jump}}'>
<image src='{{item.url}}' mode='aspectFill' class="slide-image uiuiui {{currentIndex == 0 ? 'active': ''}}"></image>
</swiper-item>
</block>
</swiper>
... ... @@ -626,8 +613,8 @@
<image src='{{item.more.thumbnail}}' class='goods_img_image'></image>
</view>
<view class='good_right goods_rights'>
<view class='good_name'>{{item.title}}</view>
<view class='good_stand'>{{item.excerpt}}</view>
<view class='good_name yititle'>{{item.title}}</view>
<view class='good_stand yiexcerpt'>{{item.excerpt}}</view>
<view class='good_price_threea'>
<text class='good_pprice'><text class='rmb'>￥</text>{{item.price}}</text>
<text class='good_oprice'><text class='rmb'>￥</text>{{item.old_price}}</text>
... ... @@ -649,7 +636,7 @@
</view>
</view>
<view class='ad_box' bindtap='show_ad' wx:if='{{showad}}'>
<image src='{{imgUrl}}atan@2x.png' mode='widthFix' catchtap='goad'></image>
<image src='{{banner.image}}' mode='widthFix' catchtap='goad'></image>
<view class='iconfont icon-quxiao'></view>
</view>
</view>
... ... @@ -674,7 +661,7 @@
</view>
<view class='collocation_content'>
<view>{{item.title}}</view>
<view class='zhongtu_title_hei'>{{item.title}}</view>
<view class='introduce introduces'>{{item.excerpt}}</view>
<view>
<view class='price_big_box'>
... ... @@ -719,8 +706,8 @@
<view class='good_btn cart_icons'>
<view class='iconfont icon-gouwuche' catchtap='show_cart_mask' data-goods='{{item.id}}'></view>
</view>
<view class='goods_for_font_one'>{{item.title}}</view>
<view class='goods_for_font_two'>{{item.excerpt}}</view>
<view class='goods_for_font_one santitle'>{{item.title}}</view>
<view class='goods_for_font_two sanexcerpt'>{{item.excerpt}}</view>
<view class='goods_for_font_three'>
<view class='goods_for_font_three_one'>
<view>￥</view>
... ... @@ -765,7 +752,7 @@
<text>热卖</text>
</view>
<view class='all_classify_two_item' wx:for='{{packageCategories}}' wx:key='{{item.id}}' data-navid='{{item.id}}' data-flag='{{true}}' bindtap='jump_category_nav'>
<image src='{{item.more.thumbnail}}'></image>
<image src='{{item.more.thumbnail}}'></image>
<text>{{item.name}}</text>
</view>
<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 {
background-color: #fff;
}
.safe_box {
height: 31rpx;
height: 36rpx;
display: flex;
align-items: center;
justify-content: space-around;
... ... @@ -375,8 +375,8 @@ page {
}
.good_img {
width: 200rpx;
height: 200rpx;
width: 200rpx!important;
height: 200rpx!important;
position: relative;
border-radius: 16rpx;
overflow: hidden;
... ... @@ -402,11 +402,21 @@ page {
line-height: 32rpx;
margin-bottom: 16rpx;
}
.yititle{
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.good_stand {
height: 20rpx;
height: 23rpx;
line-height: 23rpx;
margin-bottom: 25rpx;
margin-bottom: 22rpx;
}
.yiexcerpt{
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.goods_right{
... ... @@ -415,7 +425,8 @@ page {
}
.goods_rights{
padding-top:30rpx;
box-sizing: border-box
box-sizing: border-box;
width: calc(100% - 220rpx);
}
.goods_right{
padding-top:8rpx
... ... @@ -606,6 +617,7 @@ page {
.ad_box .iconfont {
color: #fff;
margin-top: 20rpx;
}
.vipvip {
... ... @@ -851,9 +863,10 @@ page {
.all_classify_two {
padding: 30rpx 50rpx 52rpx 50rpx;
box-sizing: border-box;
/* display: flex;
display: flex;
flex-wrap: wrap;
justify-content: space-around; */
justify-content: flex-start;
align-content: flex-start;
}
.all_classify_two_item {
... ... @@ -865,7 +878,11 @@ page {
color: rgba(34, 34, 34, 1);
margin-bottom: 48rpx;
margin-right: 16rpx;
float: left;
display: flex;
justify-content: flex-start;
align-items: center;
flex-direction: column;
/* float: left; */
}
.all_classify_two_item:nth-child(3n) {
... ... @@ -873,7 +890,7 @@ page {
}
.all_classify_two_item image {
width: 100%;
width: 120rpx;
height: 120rpx;
margin-bottom: 20rpx;
}
... ... @@ -1175,7 +1192,7 @@ page {
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(34,34,34,1);
/* overflow: hidden; */
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
... ... @@ -1391,7 +1408,11 @@ page {
line-height: 32rpx;
margin-bottom: 9rpx;
}
.santitle{
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap
}
.goods_for_font_two {
height: 23rpx;
font-size: 24rpx;
... ... @@ -1401,7 +1422,11 @@ page {
line-height: 23rpx;
margin-bottom: 27rpx;
}
.sanexcerpt{
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap
}
.goods_for_font_three {
height: 29rpx;
display: flex;
... ... @@ -1500,7 +1525,7 @@ page {
}
.padding-top_nav {
/* padding-top: 20rpx; */
padding-top: 200rpx;
box-sizing: border-box;
/* margin-top:200rpx */
}
... ... @@ -1514,7 +1539,7 @@ page {
position: fixed;
right: 46rpx;
bottom: 46rpx;
z-index: 99999;
z-index: 99;
width: 66rpx;
height: 66rpx;
border-radius: 33rpx;
... ... @@ -1721,7 +1746,7 @@ padding-left: 30rpx
.scroll_view_class {
height: 100%;
/* padding-bottom:74rpx; */
/* padding-bottom:24rpx; */
box-sizing: border-box;
}
... ... @@ -1949,5 +1974,17 @@ color:rgba(18,25,27,1);
.oneone{
width: 20rpx;
height: 2rpx;
background: red
}
.icon-aaa{
font-size: 36rpx!important;
color: #222;
font-weight: 500;
line-height: 36rpx;
margin-left: -2rpx
}
.nopadding{
/* padding: 0 */
/* background: red; */
/* padding-top: 200rpx; */
}
\ No newline at end of file
... ...
... ... @@ -4,10 +4,10 @@
<view class='iconfont icon-fanhui' catchtap='get_back'></view>
<view class='coupons'>{{current}}/{{imageList.length}}</view>
</view>
<swiper bindchange='changeImage'>
<swiper bindchange='changeImage' class='swiper'>
<swiper-item wx:for='{{imageList}}' wx:for-index='index' wx:key='{{index}}'>
<view class='banner_img'>
<image src='{{item.url}}'></image>
<image src='{{item.url}}' mode='widthFix'></image>
</view>
<!-- <view class='content_item'>
<view class='production_step'>步骤2</view>
... ...
/* pages/index/production_steps/production_steps.wxss */
page{
width: 100%;
height: 100%;
height: 100%;
overflow: hidden
}
.big_box{
width: 100%;
height: 100%;
}
.banner{
/* position: absolute;
top: 0;
left: 0; */
}
.swiper{
width: 100%;
height: 100%;
}
.banner_img{
width: 750rpx;
width: 100%;
height: 100%;
}
.banner_img image{
... ...
... ... @@ -247,7 +247,6 @@ Page({
let sku_values=''
app.post(url).then(r => {
if (r.code == 1) {
console.log(r.data)
for (let i = 0; i < r.data.attr.attr_sku.length; i++) {
for (let x = 0; x < r.data.attr.attr_sku[i].item.length; x++) {
r.data.attr.attr_sku[i].item[x].t = false;
... ...
... ... @@ -19,7 +19,7 @@ Page({
getget(){
wx.navigateBack({
})
})
},
//获取关键字
get_keyWords(e){
... ... @@ -30,9 +30,11 @@ get_keyWords(e){
},
//删除打出的字
clear_keyword(){
console.log(this.data.value)
this.setData({
value:''
})
console.log(this.data.value)
},
//发起搜索
send_search(){
... ...
... ... @@ -3,7 +3,7 @@
<view class='banner'>
<view class='iconfont icon-fanhui' bindtap='getget'></view>
<view class='input_box'>
<view>
<view class='input_box_child'>
<input type="text" placeholder='{{hothothot}}' placeholder-class='banner_input' value='{{value}}' bindinput='get_keyWords' class='input_placeholder'></input>
</view>
<view class='iconfont icon-quxiao' bindtap='clear_keyword'></view>
... ...
... ... @@ -40,6 +40,9 @@ page {
position: relative;
padding: 0 20rpx;
}
.input_box_child{
width: 94%
}
.banner_input {
font-size: 24rpx;
... ... @@ -51,6 +54,7 @@ page {
color: #455255;
position: absolute;
right: 20rpx;
z-index:999
}
.content_item {
... ... @@ -119,5 +123,5 @@ page {
font-size:24rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
width: 186%!important
width: 100%!important;
}
... ...