sileya-ai
/
vr-shopxo-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

细节雨花

master
xindan 2021-10-12 00:18:14 +08:00
parent 9a492e0db6
commit fc42ce5895
14 changed files with 78 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pages/answer-list/answer-list.vue
View File

@ -107,11 +107,9 @@
});
// 是否还有数据
if (this.data_page > 1 && this.data_page > this.data_page_total) {
this.setData({
data_bottom_line_status: true
});
}
this.setData({
data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total)
});
} else {
this.setData({
data_list_loding_status: 0

23
pages/goods-comment/goods-comment.vue
View File

@ -175,34 +175,26 @@
} else {
var temp_data_list = this.data_list;
var temp_data = res.data.data.data;
for (var i in temp_data) {
temp_data_list.push(temp_data[i]);
}
}
this.setData({
data_list: temp_data_list,
data_total: res.data.data.total,
data_page_total: res.data.data.page_total,
data_list_loding_status: 3,
data_page: this.data_page + 1
}); // 是否还有数据
if (this.data_page > 1 && this.data_page > this.data_page_total) {
this.setData({
data_bottom_line_status: true
});
} else {
this.setData({
data_bottom_line_status: false
});
}
});
// 是否还有数据
this.setData({
data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total)
});
} else {
this.setData({
data_list_loding_status: 0
});
if (this.data_page <= 1) {
this.setData({
data_list: [],
@ -214,7 +206,6 @@
this.setData({
data_list_loding_status: 0
});
if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
app.globalData.showToast(res.data.msg);
}
@ -251,4 +242,4 @@
</script>
<style>
@import './goods-comment.css';
</style>
</style>

14
pages/goods-search/goods-search.vue
View File

@ -340,16 +340,10 @@
data_page: this.data_page + 1
});
// 是否还有数据
if (this.data_page > 1 && this.data_page > this.data_page_total) {
this.setData({
data_bottom_line_status: true
});
} else {
this.setData({
data_bottom_line_status: false
});
}
// 是否还有数据
this.setData({
data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total)
});
} else {
this.setData({
data_list_loding_status: 0,

39
pages/index/index.vue
View File

@ -50,7 +50,6 @@
<view class="goods-title multi-text margin-bottom-sm">{{item.title}}</view>
<view class="sales-price single-text">{{currency_symbol}}{{item.min_price}}</view>
<view v-if="(item.min_original_price || null) != null && item.min_original_price > 0" class="original-price single-text">{{currency_symbol}}{{item.min_original_price}}</view>
<!-- <button size="mini">抢</button> -->
<uni-icons type="cart" size="16" color="#E02020" class="icon"></uni-icons>
</view>
</navigator>
@ -99,6 +98,10 @@
</view>
</block>
</block>
<block v-else>
<!-- 提示信息 -->
<component-no-data :prop-status="data_list_loding_status" :prop-msg="data_list_loding_msg"></component-no-data>
</block>
<!--- 底部购买记录 -->
<view v-if="(plugins_salerecords_data || null) != null && (plugins_salerecords_data.data || null) != null && plugins_salerecords_data.data.length > 0" class="spacing-mb plugins-salerecords">
@ -135,10 +138,7 @@
<navigator url="/pages/answer-form/answer-form" hover-class="none">
<image mode="widthFix" :src="static_url+'answer-form.jpg'" class="wh-auto border-radius-main"></image>
</navigator>
</view>
<!-- 提示信息 -->
<component-no-data :prop-status="data_list_loding_status" :prop-msg="data_list_loding_msg"></component-no-data>
</view>
<!-- 结尾 -->
<component-bottom-line :prop-status="data_bottom_line_status"></component-bottom-line>
@ -262,16 +262,11 @@
this.setData({
currency_symbol: app.globalData.get_config('currency_symbol'),
common_shop_notice: app.globalData.get_config('config.common_shop_notice'),
home_index_floor_data_type: app.globalData.get_config(
'config.home_index_floor_data_type'),
common_app_is_enable_search: app.globalData.get_config(
'config.common_app_is_enable_search'),
common_app_is_enable_answer: app.globalData.get_config(
'config.common_app_is_enable_answer'),
common_app_is_header_nav_fixed: app.globalData.get_config(
'config.common_app_is_header_nav_fixed'),
common_app_is_online_service: app.globalData.get_config(
'config.common_app_is_online_service')
home_index_floor_data_type: app.globalData.get_config('config.home_index_floor_data_type'),
common_app_is_enable_search: app.globalData.get_config('config.common_app_is_enable_search'),
common_app_is_enable_answer: app.globalData.get_config('config.common_app_is_enable_answer'),
common_app_is_header_nav_fixed: app.globalData.get_config('config.common_app_is_header_nav_fixed'),
common_app_is_online_service: app.globalData.get_config('config.common_app_is_online_service')
});
} else {
app.globalData.is_config(this, 'init_config');
@ -311,15 +306,9 @@
navigation: data.navigation || [],
data_list: data.data_list,
data_list_loding_status: data.data_list.length == 0 ? 0 : 3,
plugins_limitedtimediscount_data: data
.plugins_limitedtimediscount_data || null,
plugins_limitedtimediscount_is_valid: (data
.plugins_limitedtimediscount_data || null) != null && (data
.plugins_limitedtimediscount_data.is_valid || 0) == 1 ? 1 :
0,
plugins_salerecords_data: (data.plugins_salerecords_data || null) ==
null || data.plugins_salerecords_data.length <= 0 ? null : data
.plugins_salerecords_data
plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null,
plugins_limitedtimediscount_is_valid: (data.plugins_limitedtimediscount_data || null) != null && (data.plugins_limitedtimediscount_data.is_valid || 0) == 1 ? 1 : 0,
plugins_salerecords_data: (data.plugins_salerecords_data || null) == null || data.plugins_salerecords_data.length <= 0 ? null : data.plugins_salerecords_data
});
// 导航购物车处理
@ -364,4 +353,4 @@
</script>
<style>
@import './index.css';
</style>
</style>

16
pages/message/message.vue
View File

@ -7,7 +7,7 @@
<text class="fw-b">{{item.title}}</text>
<text class="fr cr-base">{{item.add_time_time}}</text>
</view>
<view class="cr-gray margin-top-sm">{{item.detail}}</view>
<view class="cr-grey margin-top-lg">{{item.detail}}</view>
</view>
</view>
<view v-else>
@ -87,10 +87,6 @@
if (this.data_bottom_line_status == true) {
return false;
}
} else {
this.setData({
data_bottom_line_status: false
});
}
// 加载loding
@ -131,12 +127,10 @@
data_page: this.data_page + 1
});
// 是否还有数据
if (this.data_page > 1 && this.data_page > this.data_page_total) {
this.setData({
data_bottom_line_status: true
});
}
// 是否还有数据
this.setData({
data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total)
});
} else {
this.setData({
data_list_loding_status: 0

1
pages/user-address/user-address.vue
View File

@ -132,7 +132,6 @@
if (data.data.length > 0) {
// 获取当前默认地址
var is_default = 0;
for (var i in data.data) {
if (data.data[i]['is_default'] == 1) {
is_default = data.data[i]['id'];

8
pages/user-answer-list/user-answer-list.vue
View File

@ -135,11 +135,9 @@
});
// 是否还有数据
if (this.data_page > 1 && this.data_page > this.data_page_total) {
this.setData({
data_bottom_line_status: true
});
}
this.setData({
data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total)
});
} else {
this.setData({
data_list_loding_status: 0

15
pages/user-favor/user-favor.vue
View File

@ -146,19 +146,14 @@
data_total: res.data.data.total,
data_page_total: res.data.data.page_total,
data_list_loding_status: 3,
data_page: this.data_page + 1
data_page: this.data_page + 1,
data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total)
});
// 是否还有数据
if (this.data_page > 1 && this.data_page > this.data_page_total) {
this.setData({
data_bottom_line_status: true
});
} else {
this.setData({
data_bottom_line_status: false
});
}
this.setData({
data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total)
});
} else {
this.setData({
data_list_loding_status: 0

14
pages/user-goods-browse/user-goods-browse.vue
View File

@ -149,16 +149,10 @@
data_page: this.data_page + 1
});
// 是否还有数据
if (this.data_page > 1 && this.data_page > this.data_page_total) {
this.setData({
data_bottom_line_status: true
});
} else {
this.setData({
data_bottom_line_status: false
});
}
// 是否还有数据
this.setData({
data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total)
});
} else {
this.setData({
data_list_loding_status: 0

4
pages/user-integral/user-integral.css Normal file
View File

@ -0,0 +1,4 @@
.item-value {
right: 20rpx;
bottom: 20rpx;
}

45
pages/user-integral/user-integral.vue
View File

@ -2,18 +2,18 @@
<view>
<scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="30">
<view v-if="data_list.length > 0" class="padding-main">
<view v-for="(item, index) in data_list" :key="index" class="padding-main border-radius-main oh bg-white spacing-mb">
<view v-for="(item, index) in data_list" :key="index" class="padding-main border-radius-main oh bg-white pr spacing-mb">
<view class="oh">
<text class="fw-b">{{item.type_text}} {{item.operation_integral}}</text>
<text class="fr cr-base">{{item.add_time_time}}</text>
<view class="fl">
<text class="cr-base">原始</text>
<text class="cr-base fw-b margin-left-xs">{{item.original_integral}}</text>
<text class="cr-base margin-left-lg">最新</text>
<text class="cr-main fw-b margin-left-xs">{{item.new_integral}}</text>
</view>
<text class="fr cr-base ">{{item.add_time_time}}</text>
</view>
<view class="margin-top-sm">
<text class="cr-grey">原始</text>
<text class="cr-base margin-left-xs">{{item.original_integral}}</text>
<text class="cr-grey margin-left-xl">最新</text>
<text class="cr-main margin-left-xs">{{item.new_integral}}</text>
</view>
<view class="cr-gray margin-top-lg">{{item.msg}}</view>
<view class="cr-grey margin-top-lg">{{item.msg}}</view>
<text :class="'fw-b pa item-value '+(item.type == 1 ? 'cr-green' : 'cr-red')">{{item.type == 1 ? '+' : '-'}} {{item.operation_integral}}</text>
</view>
</view>
<view v-else>
@ -85,14 +85,10 @@
get_data_list(is_mandatory) {
// 分页是否还有数据
if ((is_mandatory || 0) == 0) {
if (this.data_bottom_line_status == true) {
return false;
}
} else {
this.setData({
data_bottom_line_status: false
});
if ((is_mandatory || 0) == 0) {
if (this.data_bottom_line_status == true) {
return false;
}
}
// 加载loding
@ -134,12 +130,10 @@
data_page: this.data_page + 1
});
// 是否还有数据
if (this.data_page > 1 && this.data_page > this.data_page_total) {
this.setData({
data_bottom_line_status: true
});
}
// 是否还有数据
this.setData({
data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total)
});
} else {
this.setData({
data_list_loding_status: 0
@ -172,5 +166,6 @@
}
};
</script>
<style>
<style>
@import './user-integral.css';
</style>

14
pages/user-order/user-order.vue
View File

@ -269,16 +269,10 @@
payment_list: res.data.data.payment_list || []
});
// 是否还有数据
if (this.data_page > 1 && this.data_page > this.data_page_total) {
this.setData({
data_bottom_line_status: true
});
} else {
this.setData({
data_bottom_line_status: false
});
}
// 是否还有数据
this.setData({
data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total)
});
} else {
this.setData({
data_list_loding_status: 0,

9
pages/user/user.css
View File

@ -67,9 +67,8 @@
width: 20%;
}
.nav-list-sub .item .item-icon {
width: 60rpx;
height: 60rpx;
margin-bottom: 6rpx;
width: 50rpx;
height: 50rpx;
}
.nav-list-sub .item .badge-icon {
top: -2px;
@ -84,8 +83,8 @@
width: 25%;
}
.nav-box .nav-item .item-icon {
width: 50rpx;
height: 50rpx;
width: 45rpx;
height: 45rpx;
}
.nav-box .nav-item .item-desc {
margin-right: 50rpx;

2
pages/user/user.vue
View File

@ -55,7 +55,7 @@
<view class="badge-icon pa">
<component-badge :prop-number="items.count"></component-badge>
</view>
<image :src="static_url+'order-icon-' + items.status + '.png'" class="item-icon" mode="aspectFill"></image>
<image class="item-icon margin-bottom-xs" :src="static_url+'order-icon-' + items.status + '.png'" mode="aspectFill"></image>
<view class="item-name cr-base">{{items.name}}</view>
</view>
</navigator>