Skip to content

M
mallapp
Commit 419ef051 authored by 吴春's avatar 吴春
Browse files
Options

1111

parent 0a9ebd79
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 20 deletions
components/tradeActivity/tradeIndex.vue
View file @ 419ef051
......@@ -11,14 +11,9 @@
</view>
</scroll-view>
</view>
<!-- 空状态 -->
<view class="tradeIndex-empty" v-if="!loading && listData.length === 0">
<image class="tradeIndex-empty-icon"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/empty.png" mode="aspectFit" />
<text class="tradeIndex-empty-text">暂无内容</text>
</view>
<!-- 内容区 -->
<view v-if="listData.length > 0" class="tradeIndex-content">
<view class="tradeIndex-content">
<!-- 瀑布流 -->
<view class="tradeIndex-waterfall" v-if="listData.length > 0">
<view class="waterfall-left">
......@@ -68,9 +63,17 @@
</view>
</view>
</view>
<!-- 空状态 -->
<view class="tradeIndex-empty" v-else>
<image class="tradeIndex-empty-icon"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/empty.png" mode="aspectFit" />
<text class="tradeIndex-empty-text">暂无内容</text>
</view>
</view>
<!-- 加载更多按钮 -->
<view class="tradeIndex-loadmore" v-if="listData.length > 0 && !noMore" @click="loadMore">
<view class="tradeIndex-loadmore" :class="{ loading: loading }" v-if="listData.length > 0 && !noMore"
@click="loadMore">
<view class="loadmore-spinner" v-if="loading"></view>
<text v-if="loading">加载中...</text>
<text v-else>点击加载更多</text>
</view>
......@@ -412,6 +415,27 @@
box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
}
.tradeIndex-loadmore.loading {
pointer-events: none;
opacity: 0.7;
}
.loadmore-spinner {
width: 32rpx;
height: 32rpx;
border: 3rpx solid #e0e0e0;
border-top-color: #999;
border-radius: 50%;
margin-right: 12rpx;
animation: spin 0.8s linear infinite;
}
@keyframes spin {
to {
transform: rotate(360deg);
}
}
.tradeIndex-loadmore text {
display: flex;
align-items: center;
......
pages/kotra/brand/list.vue
View file @ 419ef051
......@@ -3,7 +3,7 @@
'background-color': '#f6f6f6',
height: contentHeight + 'px',
overflow: 'hidden',
'--main-color': mainColor,
'--main-color': '#017EDF',
}">
<view :class="[FilterCriShow?'FilterBgBox':'']">
<view class="brandHeadBgBox"
......@@ -39,7 +39,7 @@
<!-- <view style="display: flex; align-items: center">
<view style="flex: 1; overflow: hidden">
<u-tabs bg-color="#f6f6f6" :is-scroll="true" name="ClassName" :list="typeList"
:active-color="mainColor" :current="active" @change="changeHandler" :show-bar="true"
:active-color="'#017EDF'" :current="active" @change="changeHandler" :show-bar="true"
:activeFontSize="34" :bold="true" height="100" duration="0" font-size="28"></u-tabs>
</view>
</view> -->
......@@ -86,7 +86,7 @@
:style="{
'flex': '1',
'height': '72rpx',
'background': mainColor,
'background': '#017EDF',
'border-radius': '10rpx',
'display': 'flex',
'align-items': 'center',
......@@ -105,16 +105,16 @@
style="flex: 1; padding: 16rpx 20rpx; background: #fff; border-radius: 8rpx; border: 1rpx solid #e0e0e0; display: flex; flex-direction: row; justify-content: space-between; align-items: center;"
:class="msg.IsInChengdu == 0 ? 'active-option' : ''"
@click="changeFirstStoreTest(0)">
<text style="font-size: 24rpx; color: #333;">未在成都落地</text>
<u-icon v-if="msg.IsInChengdu == 0" name="checkmark" :color="mainColor"
<text style="flex: 1; font-size: 24rpx; color: #333; text-align: center;">未在成都落地</text>
<u-icon v-if="msg.IsInChengdu == 0" name="checkmark" :color="'#017EDF'"
size="32"></u-icon>
</view>
<view
style="flex: 1; padding: 16rpx 20rpx; background: #fff; border-radius: 8rpx; border: 1rpx solid #e0e0e0; display: flex; flex-direction: row; justify-content: space-between; align-items: center;"
:class="msg.IsInChengdu == 1 ? 'active-option' : ''"
@click="changeFirstStoreTest(1)">
<text style="font-size: 24rpx; color: #333;">成都落地</text>
<u-icon v-if="msg.IsInChengdu == 1" name="checkmark" :color="mainColor"
<text style="flex: 1; font-size: 24rpx; color: #333; text-align: center;">成都落地</text>
<u-icon v-if="msg.IsInChengdu == 1" name="checkmark" :color="'#017EDF'"
size="32"></u-icon>
</view>
</view>
......@@ -126,7 +126,7 @@
:style="{
'flex': '1',
'height': '72rpx',
'background': mainColor,
'background': '#017EDF',
'border-radius': '10rpx',
'display': 'flex',
'align-items': 'center',
......@@ -163,7 +163,7 @@
<view v-if="!FilterCriShow" style="flex: 1; overflow: hidden;padding-left: 32rpx;"
class="brandTabBox">
<u-tabs bg-color="none" :is-scroll="true" name="ClassName" :list="typeList"
:active-color="mainColor" inactive-color="#000000" :active-item-style="activeItemStyleBrand"
:active-color="'#017EDF'" inactive-color="#000000" :active-item-style="activeItemStyleBrand"
:current="active" @change="changeHandler" :show-bar="false" :activeFontSize="28"
:bold="true" height="45" duration="0" font-size="26" gutter="29"
class="custom-tab-list"></u-tabs>
......@@ -274,7 +274,6 @@
return {
showAuth: false,
u: {},
mainColor: "",
active: 0,
searchKey: "",
typeList: [],
......@@ -422,7 +421,6 @@
// }
},
created() {
this.mainColor = this.$uiConfig.mainColor;
},
mounted() {
uni.setNavigationBarTitle({
......
plugin/api.js
View file @ 419ef051
......@@ -3,7 +3,7 @@ export default {
Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
Vue.prototype.host2 = "https://mallApi.oytour.com" //电商接口
Vue.prototype.host2 = "http://127.0.0.1:5000"
//Vue.prototype.host2 = "http://127.0.0.1:5000"
//Vue.prototype.host2 = "http://192.168.5.56:8029"
// Vue.prototype.host3 = "https://jjeduapi.oytour.com" //进阶小课堂以前接口
Vue.prototype.UploadConfig = function() { //本地上传配置
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment