小程序优化

feat/task1-c-wallet
devil_gong 2019-11-26 18:43:35 +08:00
parent 5d080401f6
commit 4746456738
29 changed files with 174 additions and 74 deletions

View File

@ -71,6 +71,7 @@ textarea {
.br-r { border-right: solid 1px #efefef; }
/* 虚线边框 */
.br-dashed { border: dashed 1px #efefef; }
.br-b-dashed { border-bottom: dashed 1px #efefef; }
.br-t-dashed { border-top: dashed 1px #efefef; }
.br-l-dashed { border-left: dashed 1px #efefef; }

View File

@ -62,6 +62,7 @@ App({
"user_order_comments": "订单评论",
"coupon": "领劵中心",
"user_coupon": "优惠劵",
"extraction_address": "自提地址",
},
// 请求地址
@ -645,4 +646,27 @@ App({
}
},
// 登录校验
is_login_check(res) {
if(res.code == -400)
{
my.clearStorage();
my.confirm({
title: '温馨提示',
content: '授权用户信息',
confirmButtonText: '确认',
cancelButtonText: '暂不',
success: (result) => {
if (result.confirm) {
my.navigateTo({
url: "/pages/login/login?event_callback=init"
});
}
},
});
return false;
}
return true;
},
});

View File

@ -1,8 +1,8 @@
<view a:if="{{data_list.length > 0}}" class="{{common_is_exhibition_mode == 1 ? '' : 'page'}}">
<view a:for="{{data_list}}" class="goods-item oh bg-white {{common_is_exhibition_mode == 1 ? 'exhibition-mode-data' : ''}}">
<view a:if="{{data_list.length > 0}}" class="{{common_site_type == 1 ? '' : 'page'}}">
<view a:for="{{data_list}}" class="goods-item oh bg-white {{common_site_type == 1 ? 'exhibition-mode-data' : ''}}">
<swipe-action index="{{index}}" restore="{{swipe_index === null || swipe_index !== index}}" right="{{item.right}}" onRightItemClick="right_item_event" onSwipeStart="swipe_start_event" extra="{{index}}">
<!-- 选择 -->
<view a:if="{{common_is_exhibition_mode != 1}}" onTap="selectedt_event" data-type="node" data-index="{{index}}" class="fl selected">
<view a:if="{{common_site_type != 1}}" onTap="selectedt_event" data-type="node" data-index="{{index}}" class="fl selected">
<image class="icon" src="/images/default-select{{(item.is_error || 0) == 1 ? '-disabled' : ((item.selected || false) ? '-active' : '')}}-icon.png" mode="widthFix" />
</view>
@ -43,13 +43,13 @@
<!-- 操作导航 -->
<view a:if="{{data_list.length > 0}}" class="buy-nav oh wh-auto br-t">
<!-- 展示型 -->
<block a:if="{{common_is_exhibition_mode == 1}}">
<block a:if="{{common_site_type == 1}}">
<view class="exhibition-mode">
<button class="bg-main wh-auto" type="default" onTap="exhibition_submit_event" hover-class="none">{{common_is_exhibition_mode_btn_text}}</button>
</view>
</block>
<!-- 销售 -->
<!-- 销售,自提,虚拟销售 -->
<block a:else>
<view class="nav-base bg-white fl single-text">
<view onTap="selectedt_event" data-type="all" class="fl selected">

View File

@ -10,8 +10,8 @@ Page({
is_selected_all: false,
buy_submit_disabled_status: true,
// 是否展示型
common_is_exhibition_mode: 0,
// 站点模式
common_site_type: 0,
common_is_exhibition_mode_btn_text: null,
customer_service_tel: null,
},
@ -93,8 +93,8 @@ Page({
data_bottom_line_status: true,
data_list_loding_msg: '购物车空空如也',
// 是否展示型
common_is_exhibition_mode: data.common_is_exhibition_mode || 0,
// 站点模式
common_site_type: data.common_site_type || 0,
common_is_exhibition_mode_btn_text: data.common_is_exhibition_mode_btn_text || '立即咨询',
customer_service_tel: data.customer_service_tel || null,
});

View File

@ -120,13 +120,13 @@
<image src="{{goods_favor_icon}}" mode="scaleToFill" />
<text class="dis-block cr-888">{{goods_favor_text}}</text>
</view>
<view class="fr {{common_is_exhibition_mode == 1 ? 'exhibition-mode' : ''}}">
<view class="fr {{common_site_type == 1 ? 'exhibition-mode' : ''}}">
<!-- 展示型 -->
<block a:if="{{common_is_exhibition_mode == 1}}">
<block a:if="{{common_site_type == 1}}">
<button class="bg-main fl" type="default" onTap="exhibition_submit_event" hover-class="none">{{nav_submit_text}}</button>
</block>
<!-- 销售型 -->
<!-- 销售型,自提点,虚拟销售 -->
<block a:else>
<button class="bg-warning fl" type="default" onTap="cart_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">加入购物车</button>
<button class="bg-main fl" type="default" onTap="buy_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">{{nav_submit_text}}</button>

View File

@ -47,8 +47,8 @@ Page({
// 购物车快捷导航
quick_nav_cart_count: 0,
// 是否展示
common_is_exhibition_mode: 0,
// 站点类
common_site_type: 0,
customer_service_tel: null,
},
@ -161,9 +161,9 @@ Page({
}
}
// 是否展示型
var common_is_exhibition_mode = data.common_is_exhibition_mode || 0;
if (common_is_exhibition_mode == 1) {
// 站点模式 - 是否展示型
var common_site_type = data.common_site_type || 0;
if (common_site_type == 1) {
nav_submit_text = data.common_is_exhibition_mode_btn_text || '立即咨询';
}
@ -171,7 +171,7 @@ Page({
this.setData({
nav_submit_text: nav_submit_text,
nav_submit_is_disabled: nav_submit_is_disabled,
common_is_exhibition_mode: common_is_exhibition_mode,
common_site_type: common_site_type,
customer_service_tel: data.customer_service_tel || null,
});
} else {

View File

@ -118,7 +118,7 @@ Page({
// 清除缓存
clear_storage(e) {
my.clearStorage()
my.clearStorage();
app.showToast('清除缓存成功', 'success');
},

View File

@ -78,6 +78,7 @@ textarea {
.br-r { border-right: solid 1px #efefef; }
/* 虚线边框 */
.br-dashed { border: dashed 1px #efefef; }
.br-b-dashed { border-bottom: dashed 1px #efefef; }
.br-t-dashed { border-top: dashed 1px #efefef; }
.br-l-dashed { border-left: dashed 1px #efefef; }

View File

@ -57,6 +57,7 @@ App({
"user_order_comments": "订单评论",
"coupon": "领劵中心",
"user_coupon": "优惠劵",
"extraction_address": "自提地址",
},
// 请求地址
@ -499,4 +500,27 @@ App({
}
},
// 登录校验
is_login_check(res) {
if(res.code == -400)
{
swan.clearStorage();
swan.showModal({
title: '温馨提示',
content: '授权用户信息',
confirmText: '确认',
cancelText: '暂不',
success: (result) => {
if (result.confirm) {
swan.navigateTo({
url: "/pages/login/login?event_callback=init"
});
}
},
});
return false;
}
return true;
},
});

View File

@ -10,8 +10,8 @@ Page({
is_selected_all: false,
buy_submit_disabled_status: true,
// 是否展示型
common_is_exhibition_mode: 0,
// 站点模式
common_site_type: 0,
common_is_exhibition_mode_btn_text: null,
customer_service_tel: null,
},
@ -76,8 +76,8 @@ Page({
data_bottom_line_status: true,
data_list_loding_msg: '购物车空空如也',
// 是否展示型
common_is_exhibition_mode: data.common_is_exhibition_mode || 0,
// 站点模式
common_site_type: data.common_site_type || 0,
common_is_exhibition_mode_btn_text: data.common_is_exhibition_mode_btn_text || '立即咨询',
customer_service_tel: data.customer_service_tel || null,
});

View File

@ -1,7 +1,7 @@
<view s-if="data_list.length > 0" class="page">
<view s-for="item, index in data_list" s-key="key" class="goods-item oh bg-white {{common_is_exhibition_mode == 1 ? 'exhibition-mode-data' : ''}}">
<view s-for="item, index in data_list" s-key="key" class="goods-item oh bg-white {{common_site_type == 1 ? 'exhibition-mode-data' : ''}}">
<!-- 选择 -->
<view s-if="common_is_exhibition_mode != 1" bindtap="selectedt_event" data-type="node" data-index="{{index}}" class="fl selected">
<view s-if="common_site_type != 1" bindtap="selectedt_event" data-type="node" data-index="{{index}}" class="fl selected">
<image class="icon" src="/images/default-select{{(item.is_error || 0) == 1 ? '-disabled' : ((item.selected || false) ? '-active' : '')}}-icon.png" mode="widthFix" />
</view>
@ -46,13 +46,13 @@
<!-- 操作导航 -->
<view s-if="data_list.length > 0" class="buy-nav oh wh-auto br-t">
<!-- 展示型 -->
<block s-if="common_is_exhibition_mode == 1">
<block s-if="common_site_type == 1">
<view class="exhibition-mode">
<button class="bg-main wh-auto" type="default" bindtap="exhibition_submit_event" hover-class="none">{{common_is_exhibition_mode_btn_text}}</button>
</view>
</block>
<!-- 销售 -->
<!-- 销售,自提,虚拟销售 -->
<block s-else>
<view class="nav-base bg-white fl single-text">
<view bindtap="selectedt_event" data-type="all" class="fl selected">

View File

@ -50,8 +50,8 @@ Page({
// 购物车快捷导航
quick_nav_cart_count: 0,
// 是否展示
common_is_exhibition_mode: 0,
// 站点类
common_site_type: 0,
customer_service_tel: null,
},
@ -152,9 +152,9 @@ Page({
}
}
// 是否展示型
var common_is_exhibition_mode = data.common_is_exhibition_mode || 0;
if (common_is_exhibition_mode == 1) {
// 站点模式 - 是否展示型
var common_site_type = data.common_site_type || 0;
if (common_site_type == 1) {
nav_submit_text = data.common_is_exhibition_mode_btn_text || '立即咨询';
}
@ -162,7 +162,7 @@ Page({
this.setData({
nav_submit_text: nav_submit_text,
nav_submit_is_disabled: nav_submit_is_disabled,
common_is_exhibition_mode: common_is_exhibition_mode,
common_site_type: common_site_type,
customer_service_tel: data.customer_service_tel || null,
});

View File

@ -124,13 +124,13 @@
<image src="{{goods_favor_icon}}" mode="scaleToFill" />
<text class="dis-block cr-888">{{goods_favor_text}}</text>
</view>
<view class="fr {{common_is_exhibition_mode == 1 ? 'exhibition-mode' : ''}}">
<view class="fr {{common_site_type == 1 ? 'exhibition-mode' : ''}}">
<!-- 展示型 -->
<block s-if="common_is_exhibition_mode == 1">
<block s-if="common_site_type == 1">
<button class="bg-main fl" type="default" bindtap="exhibition_submit_event" hover-class="none">{{nav_submit_text}}</button>
</block>
<!-- 销售型 -->
<!-- 销售型,自提点,虚拟销售 -->
<block s-else>
<button class="bg-warning fl" type="default" bindtap="cart_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">加入购物车</button>
<button class="bg-main fl" type="default" bindtap="buy_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">{{nav_submit_text}}</button>

View File

@ -62,6 +62,7 @@ App({
"user_order_comments": "订单评论",
"coupon": "领劵中心",
"user_coupon": "优惠劵",
"extraction_address": "自提地址",
},
// 请求地址
@ -527,4 +528,27 @@ App({
}
},
// 登录校验
is_login_check(res) {
if(res.code == -400)
{
qq.clearStorage();
qq.showModal({
title: '温馨提示',
content: '授权用户信息',
confirmText: '确认',
cancelText: '暂不',
success: (result) => {
if (result.confirm) {
qq.navigateTo({
url: "/pages/login/login?event_callback=init"
});
}
},
});
return false;
}
return true;
},
});

View File

@ -78,6 +78,7 @@ textarea {
.br-r { border-right: solid 1px #efefef; }
/* 虚线边框 */
.br-dashed { border: dashed 1px #efefef; }
.br-b-dashed { border-bottom: dashed 1px #efefef; }
.br-t-dashed { border-top: dashed 1px #efefef; }
.br-l-dashed { border-left: dashed 1px #efefef; }

View File

@ -10,8 +10,8 @@ Page({
is_selected_all: false,
buy_submit_disabled_status: true,
// 是否展示型
common_is_exhibition_mode: 0,
// 站点模式
common_site_type: 0,
common_is_exhibition_mode_btn_text: null,
customer_service_tel: null,
},
@ -76,8 +76,8 @@ Page({
data_bottom_line_status: true,
data_list_loding_msg: '购物车空空如也',
// 是否展示型
common_is_exhibition_mode: data.common_is_exhibition_mode || 0,
// 站点模式
common_site_type: data.common_site_type || 0,
common_is_exhibition_mode_btn_text: data.common_is_exhibition_mode_btn_text || '立即咨询',
customer_service_tel: data.customer_service_tel || null,
});

View File

@ -1,7 +1,7 @@
<view qq:if="{{data_list.length > 0}}" class="page">
<view qq:for="{{data_list}}" qq:key="key" class="goods-item oh bg-white {{common_is_exhibition_mode == 1 ? 'exhibition-mode-data' : ''}}">
<view qq:for="{{data_list}}" qq:key="key" class="goods-item oh bg-white {{common_site_type == 1 ? 'exhibition-mode-data' : ''}}">
<!-- -->
<view qq:if="{{common_is_exhibition_mode != 1}}" bindtap="selectedt_event" data-type="node" data-index="{{index}}" class="fl selected">
<view qq:if="{{common_site_type != 1}}" bindtap="selectedt_event" data-type="node" data-index="{{index}}" class="fl selected">
<image class="icon" src="/images/default-select{{(item.is_error || 0) == 1 ? '-disabled' : ((item.selected || false) ? '-active' : '')}}-icon.png" mode="widthFix" />
</view>
@ -44,13 +44,13 @@
<!-- -->
<view qq:if="{{data_list.length > 0}}" class="buy-nav oh wh-auto br-t">
<!-- -->
<block qq:if="{{common_is_exhibition_mode == 1}}">
<block qq:if="{{common_site_type == 1}}">
<view class="exhibition-mode">
<button class="bg-main wh-auto" type="default" bindtap="exhibition_submit_event" hover-class="none">{{common_is_exhibition_mode_btn_text}}</button>
</view>
</block>
<!-- -->
<!-- ,, -->
<block qq:else>
<view class="nav-base bg-white fl single-text">
<view bindtap="selectedt_event" data-type="all" class="fl selected">

View File

@ -53,8 +53,8 @@ Page({
// 购物车快捷导航
quick_nav_cart_count: 0,
// 是否展示型
common_is_exhibition_mode: 0,
// 站点模式
common_site_type: 0,
customer_service_tel: null,
},
@ -160,9 +160,9 @@ Page({
}
}
// 是否展示型
var common_is_exhibition_mode = data.common_is_exhibition_mode || 0;
if (common_is_exhibition_mode == 1) {
// 站点模式 - 是否展示型
var common_site_type = data.common_site_type || 0;
if (common_site_type == 1) {
nav_submit_text = data.common_is_exhibition_mode_btn_text || '立即咨询';
}
@ -170,7 +170,7 @@ Page({
this.setData({
nav_submit_text: nav_submit_text,
nav_submit_is_disabled: nav_submit_is_disabled,
common_is_exhibition_mode: common_is_exhibition_mode,
common_site_type: common_site_type,
customer_service_tel: data.customer_service_tel || null,
});
} else {

View File

@ -131,13 +131,13 @@
<image src="{{goods_favor_icon}}" mode="scaleToFill" />
<text class="dis-block cr-888">{{goods_favor_text}}</text>
</view>
<view class="fr {{common_is_exhibition_mode == 1 ? 'exhibition-mode' : ''}}">
<view class="fr {{common_site_type == 1 ? 'exhibition-mode' : ''}}">
<!-- -->
<block qq:if="{{common_is_exhibition_mode == 1}}">
<block qq:if="{{common_site_type == 1}}">
<button class="bg-main fl" type="default" bindtap="exhibition_submit_event" hover-class="none">{{nav_submit_text}}</button>
</block>
<!-- -->
<!-- ,, -->
<block qq:else>
<button class="bg-warning fl" type="default" bindtap="cart_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}"></button>
<button class="bg-main fl" type="default" bindtap="buy_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">{{nav_submit_text}}</button>

View File

@ -118,7 +118,7 @@ Page({
// 清除缓存
clear_storage(e) {
qq.clearStorage()
qq.clearStorage();
app.showToast("清除缓存成功", "success");
},

View File

@ -62,6 +62,7 @@ App({
"user_order_comments": "订单评论",
"coupon": "领劵中心",
"user_coupon": "优惠劵",
"extraction_address": "自提地址",
},
// 请求地址
@ -588,4 +589,27 @@ App({
}
},
// 登录校验
is_login_check(res) {
if(res.code == -400)
{
tt.clearStorage();
tt.showModal({
title: '温馨提示',
content: '授权用户信息',
confirmText: '确认',
cancelText: '暂不',
success: (result) => {
if (result.confirm) {
tt.navigateTo({
url: "/pages/login/login?event_callback=init"
});
}
},
});
return false;
}
return true;
},
});

View File

@ -79,6 +79,7 @@ textarea {
.br-r { border-right: solid 1px #efefef; }
/* 虚线边框 */
.br-dashed { border: dashed 1px #efefef; }
.br-b-dashed { border-bottom: dashed 1px #efefef; }
.br-t-dashed { border-top: dashed 1px #efefef; }
.br-l-dashed { border-left: dashed 1px #efefef; }

View File

@ -10,8 +10,8 @@ Page({
is_selected_all: false,
buy_submit_disabled_status: true,
// 是否展示型
common_is_exhibition_mode: 0,
// 站点模式
common_site_type: 0,
common_is_exhibition_mode_btn_text: null,
customer_service_tel: null,
},
@ -76,8 +76,8 @@ Page({
data_bottom_line_status: true,
data_list_loding_msg: '购物车空空如也',
// 是否展示型
common_is_exhibition_mode: data.common_is_exhibition_mode || 0,
// 站点模式
common_site_type: data.common_site_type || 0,
common_is_exhibition_mode_btn_text: data.common_is_exhibition_mode_btn_text || '立即咨询',
customer_service_tel: data.customer_service_tel || null,
});

View File

@ -1,7 +1,7 @@
<view tt:if="{{data_list.length > 0}}" class="page">
<view tt:for="{{data_list}}" tt:key="key" class="goods-item oh bg-white {{common_is_exhibition_mode == 1 ? 'exhibition-mode-data' : ''}}">
<view tt:for="{{data_list}}" tt:key="key" class="goods-item oh bg-white {{common_site_type == 1 ? 'exhibition-mode-data' : ''}}">
<!-- 选择 -->
<view tt:if="{{common_is_exhibition_mode != 1}}" bindtap="selectedt_event" data-type="node" data-index="{{index}}" class="fl selected">
<view tt:if="{{common_site_type != 1}}" bindtap="selectedt_event" data-type="node" data-index="{{index}}" class="fl selected">
<image class="icon" src="/images/default-select{{(item.is_error || 0) == 1 ? '-disabled' : ((item.selected || false) ? '-active' : '')}}-icon.png" mode="widthFix" />
</view>
@ -44,13 +44,13 @@
<!-- 操作导航 -->
<view tt:if="{{data_list.length > 0}}" class="buy-nav oh wh-auto br-t">
<!-- 展示型 -->
<block tt:if="{{common_is_exhibition_mode == 1}}">
<block tt:if="{{common_site_type == 1}}">
<view class="exhibition-mode">
<button class="bg-main wh-auto" type="default" bindtap="exhibition_submit_event" hover-class="none">{{common_is_exhibition_mode_btn_text}}</button>
</view>
</block>
<!-- 销售 -->
<!-- 销售,自提,虚拟销售 -->
<block tt:else>
<view class="nav-base bg-white fl single-text">
<view bindtap="selectedt_event" data-type="all" class="fl selected">

View File

@ -48,8 +48,8 @@ Page({
// 购物车快捷导航
quick_nav_cart_count: 0,
// 是否展示型
common_is_exhibition_mode: 0,
// 站点模式
common_site_type: 0,
customer_service_tel: null,
},
@ -155,9 +155,9 @@ Page({
}
}
// 是否展示型
var common_is_exhibition_mode = data.common_is_exhibition_mode || 0;
if (common_is_exhibition_mode == 1) {
// 站点模式 - 是否展示型
var common_site_type = data.common_site_type || 0;
if (common_site_type == 1) {
nav_submit_text = data.common_is_exhibition_mode_btn_text || '立即咨询';
}
@ -165,7 +165,7 @@ Page({
this.setData({
nav_submit_text: nav_submit_text,
nav_submit_is_disabled: nav_submit_is_disabled,
common_is_exhibition_mode: common_is_exhibition_mode,
common_site_type: common_site_type,
customer_service_tel: data.customer_service_tel || null,
});
} else {

View File

@ -131,13 +131,13 @@
<image src="{{goods_favor_icon}}" mode="scaleToFill" />
<text class="dis-block cr-888">{{goods_favor_text}}</text>
</view>
<view class="fr {{common_is_exhibition_mode == 1 ? 'exhibition-mode' : ''}}">
<view class="fr {{common_site_type == 1 ? 'exhibition-mode' : ''}}">
<!-- 展示型 -->
<block tt:if="{{common_is_exhibition_mode == 1}}">
<block tt:if="{{common_site_type == 1}}">
<button class="bg-main fl" type="default" bindtap="exhibition_submit_event" hover-class="none">{{nav_submit_text}}</button>
</block>
<!-- 销售型 -->
<!-- 销售型,自提点,虚拟销售 -->
<block tt:else>
<button class="bg-warning fl" type="default" bindtap="cart_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">加入购物车</button>
<button class="bg-main fl" type="default" bindtap="buy_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">{{nav_submit_text}}</button>

View File

@ -117,7 +117,7 @@ Page({
// 清除缓存
clear_storage(e) {
tt.clearStorage()
tt.clearStorage();
app.showToast("清除缓存成功", "success");
},

View File

@ -10,7 +10,7 @@ Page({
is_selected_all: false,
buy_submit_disabled_status: true,
// 是否展示型
// 站点模式
common_site_type: 0,
common_is_exhibition_mode_btn_text: null,
customer_service_tel: null,

View File

@ -184,7 +184,7 @@ Page({
}
}
// 是否展示型
// 站点模式 - 是否展示型
var common_site_type = data.common_site_type || 0;
if (common_site_type == 1) {
nav_submit_text = data.common_is_exhibition_mode_btn_text || '立即咨询';