微信小程序

This commit is contained in:
gongfuxiang 2019-01-01 02:53:36 +08:00
parent 014a35b3c3
commit 3902f2ae2d
39 changed files with 195 additions and 145 deletions

View File

@ -229,21 +229,21 @@ textarea {
}
.bg-main, .bg-primary, .bg-warning {
color: #fff;
color: #fff !important;
border: 0;
font-size: 34rpx;
}
.bg-main {
background: #d2364c;
background-color: #d2364c !important;
}
.bg-primary {
background: #ed6977;
background-color: #ed6977 !important;
}
.bg-warning {
background: #F37B1D;
background-color: #F37B1D !important;
}
.bg-active-main {
background: #d2364c !important;
background-color: #d2364c !important;
color: #fff !important;
}
@ -254,15 +254,15 @@ textarea {
border-radius: 0;
}
.bg-main.a-button-disabled {
background: #fbe0e5;
background-color: #fbe0e5;
color: #f7b6c2;
}
.bg-warning.a-button-disabled {
background: #ffcda6;
background-color: #ffcda6;
color: #fdae70;
}
.bg-primary.a-button-disabled {
background: #ffd2d7;
background-color: #ffd2d7;
color: #ffa0ab;
}

View File

@ -5,7 +5,7 @@ Component({
propData: Array
},
methods: {
nav_event(e) {
navigation_event(e) {
app.operation_event(e);
},
},

View File

@ -1,10 +1,10 @@
<view wx:if="{{propData.length > 0}}">
<view class="data-list bg-white spacing-mb">
<view class="data-list">
<view class="items" wx:for="{{propData}}" wx:key="key">
<view class="items-content tc" style="background-color:{{item.bg_color}}" data-value="{{item.event_value}}" data-type="{{item.event_type}}" bindtap="nav_event">
<image class="wh-auto" src="{{item.images_url}}" mode="aspectFit" />
<view class="items-content" data-value="{{item.event_value}}" data-type="{{item.event_type}}" bindtap="navigation_event" style="background-color:{{item.bg_color}}">
<image src="{{item.images_url}}" mode="aspectFit" />
</view>
<view class="title tc single-text">{{item.name}}</view>
<view class="title">{{item.name}}</view>
</view>
</view>
</view>

View File

@ -1,20 +1,28 @@
.data-list {
overflow: hidden;
overflow: hidden;
background: #fff;
margin-bottom: 20rpx;
}
.data-list .items {
width: calc(25% - 60rpx);
float: left;
padding: 30rpx;
width: calc(25% - 60rpx);
float: left;
padding: 30rpx;
}
.items-content {
border-radius: 50%;
padding: 20rpx;
border-radius: 50%;
padding: 20rpx;
}
.data-list .items image {
width: 80rpx !important;
height: 80rpx !important;
width: 80rpx !important;
height: 80rpx !important;
}
.data-list .items .title {
margin-top: 10rpx;
font-size: 32rpx;
margin-top: 10rpx;
font-size: 32rpx;
text-align:center;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
max-width: 100%;
}

View File

@ -1,5 +1,6 @@
.am-popup-content {
position: fixed;
background:#fff;
}
.am-popup-mask {

View File

@ -4,11 +4,11 @@
indicator-active-color="{{indicator_active_color}}"
autoplay="{{propData.length > 0}}"
circular="{{circular}}"
class="banner bg-white spacing-mb"
class="banner"
wx:if="{{propData.length > 0}}">
<block wx:for="{{propData}}" wx:key="key">
<swiper-item>
<image class="wh-auto" src="{{item.images_url}}" mode="widthFix" data-value="{{item.event_value}}" data-type="{{item.event_type}}" bindtap="banner_event" />
<image src="{{item.images_url}}" mode="widthFix" data-value="{{item.event_value}}" data-type="{{item.event_type}}" bindtap="banner_event" />
</swiper-item>
</block>
</swiper>

View File

@ -1,3 +1,8 @@
.banner {
height: 320rpx!important;
height: 320rpx!important;
background: #fff;
margin-bottom: 20rpx;
}
.banner image {
width: 100%;
}

View File

@ -24,7 +24,7 @@ Component({
onGridItemClick: function onGridItemClick(e) {
this.props.onGridItemClick({
detail: {
index: e.target.dataset.index
index: e.currentTarget.dataset.index
}
});
}

View File

@ -213,7 +213,7 @@ Component({
var holdSwipe = this.data.holdSwipe;
if (onRightItemClick) {
var index = e.target.dataset.index;
var index = e.currentTarget.dataset.index;
onRightItemClick({
index: index,

View File

@ -54,7 +54,7 @@ Component({
}
},
handleTabClick: function handleTabClick(e) {
var index = e.target.dataset.index;
var index = e.currentTarget.dataset.index;
if (this.props.onTabClick) {

View File

@ -75,7 +75,7 @@ Component({
}
},
handleTabClick: function handleTabClick(e) {
var _e$target$dataset = e.target.dataset,
var _e$target$dataset = e.currentTarget.dataset.
anchor = _e$target$dataset.anchor,
index = _e$target$dataset.index;

View File

@ -7,7 +7,7 @@ Page({
onLoad() {},
onShow() {
wx.setNavigationBar({title: app.data.common_pages_title.answer_form});
wx.setNavigationBarTitle({title: app.data.common_pages_title.answer_form});
this.init();
},

View File

@ -13,7 +13,7 @@ Page({
},
onShow() {
wx.setNavigationBar({title: app.data.common_pages_title.answer_list});
wx.setNavigationBarTitle({title: app.data.common_pages_title.answer_list});
},
get_data_list(is_mandatory) {

View File

@ -36,7 +36,7 @@ Page({
},
onShow() {
wx.setNavigationBar({title: app.data.common_pages_title.buy});
wx.setNavigationBarTitle({title: app.data.common_pages_title.buy});
this.init();
this.setData({is_first: 0});
},
@ -194,7 +194,7 @@ Page({
// 支付方式选择
payment_event(e) {
this.setData({ payment_id: e.target.dataset.value});
this.setData({ payment_id: e.currentTarget.dataset.value});
this.payment_list_data(this.data.payment_list);
},

View File

@ -12,7 +12,7 @@ Page({
},
onShow() {
wx.setNavigationBar({ title: app.data.common_pages_title.cart });
wx.setNavigationBarTitle({ title: app.data.common_pages_title.cart });
this.init();
},
@ -105,15 +105,15 @@ Page({
// 数量输入事件
goods_buy_number_blur(e) {
var index = e.target.dataset.index || 0;
var index = e.currentTarget.dataset.index || 0;
var buy_number = parseInt(e.detail.value) || 1;
this.goods_buy_number_func(index, buy_number);
},
// 数量操作事件
goods_buy_number_event(e) {
var index = e.target.dataset.index || 0;
var type = parseInt(e.target.dataset.type) || 0;
var index = e.currentTarget.dataset.index || 0;
var type = parseInt(e.currentTarget.dataset.type) || 0;
var temp_buy_number = parseInt(this.data.data_list[index]['stock']);
if (type == 0) {
var buy_number = temp_buy_number - 1;
@ -280,7 +280,7 @@ Page({
// 选中处理
selectedt_event(e) {
var type = e.target.dataset.type || null;
var type = e.currentTarget.dataset.type || null;
if (type != null)
{
var temp_data_list = this.data.data_list;
@ -296,7 +296,7 @@ Page({
// 节点操作
case 'node' :
var index = e.target.dataset.index || 0;
var index = e.currentTarget.dataset.index || 0;
temp_data_list[index]['selected'] = (temp_data_list[index]['selected'] == true) ? false : true;
break;
}

View File

@ -20,6 +20,6 @@ Page({
},
onShow() {
wx.setNavigationBar({title: app.data.common_pages_title.goods_attribute});
wx.setNavigationBarTitle({title: app.data.common_pages_title.goods_attribute});
},
});

View File

@ -7,10 +7,11 @@ Page({
data_list_loding_status: 1,
data_bottom_line_status: false,
data_list: [],
data_content: [],
},
onShow() {
wx.setNavigationBar({title: app.data.common_pages_title.goods_category});
wx.setNavigationBarTitle({title: app.data.common_pages_title.goods_category});
this.init();
},
@ -32,15 +33,15 @@ Page({
wx.stopPullDownRefresh();
if (res.data.code == 0) {
var data = res.data.data;
// tabs
for(var i in data) {
data[i]['title'] = data[i]['name'];
data[i]['anchor'] = data[i]['id'];
var data_content = [];
if (data.length > 0)
{
data[0]['active'] = 'nav-active';
data_content = data[0]['items'];
}
this.setData({
data_list: data,
data_content: data_content,
data_list_loding_status: data.length == 0 ? 0 : 3,
data_bottom_line_status: true,
});
@ -76,22 +77,22 @@ Page({
this.init();
},
// 处理事件
handle_event(index) {
// 导航事件
nav_event(e) {
var index = e.currentTarget.dataset.index;
var temp_data = this.data.data_list;
for(var i in temp_data)
{
temp_data[i]['active'] = (index == i) ? 'nav-active' : '';
}
this.setData({
tab_active: index,
});
},
// tab改变
change_event(index) {
this.setData({
tab_active: index,
data_list: temp_data,
data_content: temp_data[index]['items'],
});
},
// 事件
category_event(e) {
wx.navigateTo({url: '/pages/goods-search/goods-search?category_id='+e.target.dataset.value});
wx.navigateTo({ url: '/pages/goods-search/goods-search?category_id=' + e.currentTarget.dataset.value});
}
});

View File

@ -1,6 +1,4 @@
{
"usingComponents": {
"vtabs": "mini-antui/es/vtabs/index",
"vtab-content": "mini-antui/es/vtabs/vtab-content/index"
}
}

View File

@ -1,25 +1,20 @@
<vtabs
wx:if="{{data_list.length > 0}}"
tabs="{{data_list}}"
onTabClick="handle_event"
onChange="change_event"
activeTab="{{tab_active}}"
tabBarActiveTextColor="{{tab_active_text_color}}"
tabBarlineColor="{{tab_active_line_color}}"
>
<block wx:for="{{data_list}}">
<vtab-content anchor="{{item.anchor}}">
<view class="content">
<block wx:if="{{item.items.length > 0}}">
<view wx:for="{{item.items}}" wx:for-item="v" class="content-items" data-value="{{v.id}}" bindtap="category_event">
<image wx:if="{{v.icon != null}}" src="{{v.icon}}" mode="aspectFit" class="icon" />
<view class="text single-text">{{v.name}}</view>
</view>
</block>
</view>
</vtab-content>
<view class='left-nav'>
<block wx:for="{{data_list}}" wx:key="key">
<view class='items {{item.active || ""}}' data-index="{{index}}" bindtap='nav_event'>
<text>{{item.name}}</text>
</view>
</block>
</vtabs>
</view>
<view class='right-content bg-white'>
<block wx:if="{{data_content.length > 0}}">
<block wx:for="{{data_content}}" wx:key="keys" wx:for-item="v">
<view class="content-items" data-value="{{v.id}}" bindtap="category_event">
<image wx:if="{{v.icon != null}}" src="{{v.icon}}" mode="aspectFit" class="icon" />
<view class="text single-text">{{v.name}}</view>
</view>
</block>
</block>
</view>
<view wx:if="{{data_list.length == 0 && data_list_loding_status != 0}}">
<import src="/pages/common/nodata.wxml" />

View File

@ -1,9 +1,45 @@
.content {
border-left: 1px solid #eee;
box-sizing: border-box;
overflow: hidden;
padding-bottom: 120rpx;
min-height: 100vh;
/**
左侧导航
*/
.left-nav {
height: 100vh;
background: #ececec;
width: 230rpx;
overflow-x: hidden;
overflow-y: auto;
}
.left-nav .items {
height: 120rpx;
line-height: 120rpx;
font-size: 34rpx;
padding: 0 10rpx;
text-align: center;
color: #666;
border-left: 3px solid #ececec;
border-right: 3px solid #ececec;
}
.left-nav .items:not(:last-child) {
border-bottom: 1px solid #e6e6e6;
}
.nav-active {
border-left: 3px solid #e23f36 !important;
border-right: 3px solid #fff !important;
color: #e23f36;
background: #fff;
}
/**
右侧内容
*/
.right-content {
height: 100vh;
width: calc( 100% - 230rpx );
overflow-x: hidden;
overflow-y: auto;
position: absolute;
top: 0;
right: 0;
}
.content-items {
float: left;

View File

@ -37,7 +37,7 @@ Page({
},
onShow() {
wx.setNavigationBar({title: app.data.common_pages_title.goods_detail});
wx.setNavigationBarTitle({title: app.data.common_pages_title.goods_detail});
},
// 获取数据列表
@ -616,9 +616,14 @@ Page({
// 商品相册图片查看
goods_photo_view_event(e) {
var index = e.currentTarget.dataset.index;
var all = [];
for (var i in this.data.goods_photo)
{
all.push(this.data.goods_photo[i]['images']);
}
wx.previewImage({
current: index,
urls: this.data.goods_photo
urls: all
});
},

View File

@ -10,7 +10,7 @@
wx:if="{{goods_photo.length > 0}}">
<block wx:for="{{goods_photo}}" wx:key="key">
<swiper-item>
<image class="swiper-item wh-auto" bindtap="goods_photo_view_event" data-index="{{index}}" src="{{item.images}}" mode="aspectFit" bindtap="banner_event" />
<image class="swiper-item wh-auto" bindtap="goods_photo_view_event" data-index="{{index}}" src="{{item.images}}" mode="aspectFit" bindtap="goods_photo_view_event" />
</swiper-item>
</block>
</swiper>
@ -20,16 +20,16 @@
<view class="oh">
<view class="goods-title fl multi-text" style="color:{{goods.title_color}}">{{goods.title}}</view>
<view class="goods-share fr tc">
<button type="default" size="mini" open-type="share" hover-class="none" bindtap="defaultTap">
<button type="default" size="mini" open-type="share" hover-class="none">
<image src="/images/goods-detail-share-icon.png" mode="scaleToFill" class="dis-block" />
<text class="dis-block cr-888">分享</text>
</button>
</view>
</view>
<view class="goods-price">
<view class="goods-price single-text">
<text class="sales-price">¥{{goods.price}}</text>
<text wx:if="{{(goods.original_price || null) != null}}" class="original-price">¥{{goods.original_price}}</text>
<view class="fr cr-ccc">
<view class="cr-ccc sales">
<text>销量 {{goods.sales_count}}</text>
</view>
</view>
@ -77,7 +77,6 @@
</view>
<!-- 弹层 -->
<!-- <popup show="{{popup_status}}" position="bottom" onClose="popup_close_event"> -->
<component-popup prop-show="{{popup_status}}" prop-position="bottom" prop-onclose="popup_close_event">
<view class="goods-popup bg-white">
<view class="close fr oh">

View File

@ -1,4 +1,4 @@
.goods-photo .swiper-item {
.goods-photo .swiper-item, swiper {
height: 65vh !important;
display: block;
}
@ -166,11 +166,16 @@
.goods-base {
padding: 15rpx 10rpx;
}
.goods-base .goods-price .fr {
line-height: 50rpx;
.goods-base button {
background: #fff;
}
.goods-base .goods-price .sales {
position: absolute;
top: 0;
right: 0;
}
.goods-base .goods-title {
width: calc(100% - 100rpx);
width: calc(100% - 130rpx);
font-size: 32rpx;
line-height: 44rpx;
font-weight: 500;
@ -187,6 +192,8 @@
}
.goods-base .goods-price {
margin-top: 10rpx;
padding-right: 160rpx;
position: relative;
}
.page {
padding-bottom: 100rpx;

View File

@ -23,7 +23,7 @@ Page({
},
onShow() {
wx.setNavigationBar({title: app.data.common_pages_title.goods_search});
wx.setNavigationBarTitle({title: app.data.common_pages_title.goods_search});
},
// 初始化
@ -167,7 +167,7 @@ Page({
// 筛选
nav_sort_event(e) {
var index = e.target.dataset.index || 0;
var index = e.currentTarget.dataset.index || 0;
var temp_post_data = this.data.post_data;
var temp_search_nav_sort = this.data.search_nav_sort_list;
var temp_sort = (temp_search_nav_sort[index]['sort'] == 'desc') ? 'asc' : 'desc';

View File

@ -1,6 +1,6 @@
{
"enablePullDownRefresh": true,
"usingComponents": {
"popup": "mini-antui/es/popup/index"
"component-popup": "/components/popup/popup"
}
}

View File

@ -1,7 +1,7 @@
<!-- 排序 -->
<view class="nav-sort oh">
<view class="nav-sort-content">
<block wx:for="{{search_nav_sort_list}}">
<block wx:for="{{search_nav_sort_list}}" wx:key="key">
<view class="item tc fl" data-index="{{index}}" bindtap="nav_sort_event">
<text class="cr-666">{{item.name}}</text>
<image wx:if="{{(item.icon || null) != null}}" class="icon" src="/images/search-{{item.icon}}-icon.png" mode="aspectFill" />
@ -37,7 +37,7 @@
</scroll-view>
<!-- 筛选条件 popup -->
<popup show="{{is_show_popup_form}}" position="right" onClose="popup_form_event_close">
<component-popup prop-show="{{is_show_popup_form}}" prop-position="right" prop-onclose="popup_form_event_close">
<form bindsubmit="form_submit_event" class="popup-form oh bg-white">
<view class="item oh screening-price">
<view class="title cr-666">价格区间(元)
@ -53,4 +53,4 @@
</view>
<button formType="submit" class="bg-main form-submit wh-auto" disabled="{{popup_form_loading_status}}" hover-class="none">确认</button>
</form>
</popup>
</component-popup>

View File

@ -13,6 +13,9 @@
width: 30rpx;
height: 30rpx;
}
.nav-sort-content .item text, .nav-sort-content .item image {
vertical-align:middle;
}
.screening-submit {
width: 50rpx;
height: 50rpx;
@ -59,8 +62,7 @@
* 条件
*/
.popup-form {
height: calc(100vh - 20rpx);
padding: 20rpx 20rpx 0 20rpx;
height: 100vh;
}
.popup-form input {
font-size: 24rpx;
@ -68,19 +70,22 @@
line-height: 50rpx;
background: #fbfbfb;
border-radius: 6rpx;
padding: 0 6rpx;
}
.screening-price input {
width: 220rpx;
width: calc(50% - 32rpx);
}
.screening-price .separator {
margin-top: 20rpx;
margin-top: 10rpx;
width: 30rpx;
}
.popup-form .keywords input {
width: 490rpx;
.popup-form .item {
width: 480rpx;
padding: 0 20rpx;
margin-top: 20rpx;
}
.popup-form .item:not(:last-child) {
margin-bottom: 50rpx;
margin-bottom: 30rpx;
}
.popup-form .item .title {
margin-bottom: 10rpx;

View File

@ -94,16 +94,6 @@ Page({
this.init();
},
// 轮播事件
banner_event(e) {
app.operation_event(e);
},
// 导航事件
navigation_event(e) {
app.operation_event(e);
},
// 自定义分享
onShareAppMessage() {
return {

View File

@ -17,7 +17,7 @@ Page({
*/
onLoad(option) {
// 标题设置
wx.setNavigationBar({title: '手机绑定'});
wx.setNavigationBarTitle({title: '手机绑定'});
// 设置用户信息
this.setData({params: option, user: app.GetUserCacheInfo()});

View File

@ -9,7 +9,7 @@ Page({
},
onShow() {
wx.setNavigationBar({ title: app.data.common_pages_title.message });
wx.setNavigationBarTitle({ title: app.data.common_pages_title.message });
this.init();
},

View File

@ -27,7 +27,7 @@ Page({
} else {
var title = app.data.common_pages_title.user_address_save_edit;
}
wx.setNavigationBar({title: title});
wx.setNavigationBarTitle({title: title});
this.init();
},

View File

@ -13,7 +13,7 @@ Page({
},
onShow() {
wx.setNavigationBar({title: app.data.common_pages_title.user_address});
wx.setNavigationBarTitle({title: app.data.common_pages_title.user_address});
this.init();
},

View File

@ -11,7 +11,7 @@ Page({
onLoad() {},
onShow() {
wx.setNavigationBar({title: app.data.common_pages_title.user_answer_list});
wx.setNavigationBarTitle({title: app.data.common_pages_title.user_answer_list});
this.init();
},

View File

@ -9,7 +9,7 @@ Page({
},
onShow() {
wx.setNavigationBar({title: app.data.common_pages_title.user_favor});
wx.setNavigationBarTitle({title: app.data.common_pages_title.user_favor});
this.init();
},
@ -136,8 +136,8 @@ Page({
success: result => {
if (result.confirm) {
// 参数
var id = e.target.dataset.value;
var index = e.target.dataset.index;
var id = e.currentTarget.dataset.value;
var index = e.currentTarget.dataset.index;
// 加载loding
wx.showLoading({ content: "处理中..." });

View File

@ -9,7 +9,7 @@ Page({
},
onShow() {
wx.setNavigationBar({ title: app.data.common_pages_title.user_goods_browse });
wx.setNavigationBarTitle({ title: app.data.common_pages_title.user_goods_browse });
this.init();
},
@ -135,8 +135,8 @@ Page({
success: result => {
if (result.confirm) {
// 参数
var id = e.target.dataset.value;
var index = e.target.dataset.index;
var id = e.currentTarget.dataset.value;
var index = e.currentTarget.dataset.index;
// 加载loding
wx.showLoading({ content: "处理中..." });

View File

@ -9,7 +9,7 @@ Page({
},
onShow() {
wx.setNavigationBar({ title: app.data.common_pages_title.user_integral });
wx.setNavigationBarTitle({ title: app.data.common_pages_title.user_integral });
this.init();
},

View File

@ -15,7 +15,7 @@ Page({
},
onShow() {
wx.setNavigationBar({title: app.data.common_pages_title.user_order_detail});
wx.setNavigationBarTitle({title: app.data.common_pages_title.user_order_detail});
},
init() {

View File

@ -45,7 +45,7 @@ Page({
},
onShow() {
wx.setNavigationBar({title: app.data.common_pages_title.user_order});
wx.setNavigationBarTitle({title: app.data.common_pages_title.user_order});
},
init() {
@ -198,8 +198,8 @@ Page({
pay_event(e) {
this.setData({
is_show_payment_popup: true,
temp_pay_value: e.target.dataset.value,
temp_pay_index: e.target.dataset.index,
temp_pay_value: e.currentTarget.dataset.value,
temp_pay_index: e.currentTarget.dataset.index,
});
},
@ -210,7 +210,7 @@ Page({
// 支付弹窗发起支付
popup_payment_event(e) {
var payment_id = e.target.dataset.value || 0;
var payment_id = e.currentTarget.dataset.value || 0;
this.setData({payment_id: payment_id});
this.payment_popup_event_close();
this.pay_handle(this.data.temp_pay_value, this.data.temp_pay_index);
@ -299,8 +299,8 @@ Page({
success: result => {
if (result.confirm) {
// 参数
var id = e.target.dataset.value;
var index = e.target.dataset.index;
var id = e.currentTarget.dataset.value;
var index = e.currentTarget.dataset.index;
// 加载loding
wx.showLoading({ content: "处理中..." });
@ -352,8 +352,8 @@ Page({
success: result => {
if (result.confirm) {
// 参数
var id = e.target.dataset.value;
var index = e.target.dataset.index;
var id = e.currentTarget.dataset.value;
var index = e.currentTarget.dataset.index;
// 加载loding
wx.showLoading({ content: "处理中..." });
@ -406,7 +406,7 @@ Page({
// 导航事件
nav_event(e) {
this.setData({
nav_status_index: e.target.dataset.index || 0,
nav_status_index: e.currentTarget.dataset.index || 0,
data_page: 1,
});
this.get_data_list(1);

View File

@ -47,7 +47,7 @@ Page({
},
onShow() {
wx.setNavigationBar({title: app.data.common_pages_title.user});
wx.setNavigationBarTitle({title: app.data.common_pages_title.user});
this.init();
},