Leadfyy.co
/
uniapp-shikongwang
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/uniapp-shikongwang

master
Enzo 4 years ago
parent
2f3b772787 cc935ca9ea
commit
9a3a87e369
7 changed files with 28 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      pages/FQA/index.vue
  2. 2
      pages/agreement/agreement.vue
  3. 2
      pages/collect/index.vue
  4. 3
      pages/goodsDetail/index.vue
  5. 26
      pages/index/index.vue
  6. 2
      pages/order/index.vue
  7. 2
      pages/shopOrder/index.vue

2
pages/FQA/index.vue
View File

@ -3,7 +3,7 @@
<rich-text :nodes="content" v-if="content"></rich-text> <rich-text :nodes="content" v-if="content"></rich-text>
<my-nocontent v-else></my-nocontent> <my-nocontent v-else></my-nocontent>
<!-- 回到顶部 --> <!-- 回到顶部 -->
<u-back-top :scroll-top="pageScrollTop"></u-back-top>
<u-back-top :scroll-top="pageScrollTop" :custom-style="{background: 'rgba(51, 51 51, 0.3)'}"></u-back-top>
</view> </view>
</template> </template>

2
pages/agreement/agreement.vue
View File

@ -3,7 +3,7 @@
<rich-text :nodes="detail.content" v-if="detail.content"></rich-text> <rich-text :nodes="detail.content" v-if="detail.content"></rich-text>
<my-nocontent v-else></my-nocontent> <my-nocontent v-else></my-nocontent>
<!-- 回到顶部 --> <!-- 回到顶部 -->
<u-back-top :scroll-top="pageScrollTop"></u-back-top>
<u-back-top :scroll-top="pageScrollTop" :custom-style="{background: 'rgba(51, 51 51, 0.3)'}"></u-back-top>
</view> </view>
</template> </template>

2
pages/collect/index.vue
View File

@ -27,7 +27,7 @@
<my-nocontent v-else></my-nocontent> <my-nocontent v-else></my-nocontent>
</view> </view>
<!-- 回到顶部 --> <!-- 回到顶部 -->
<u-back-top :scroll-top="pageScrollTop"></u-back-top>
<u-back-top :scroll-top="pageScrollTop" :custom-style="{background: 'rgba(51, 51 51, 0.3)'}"></u-back-top>
</skeleton> </skeleton>
</view> </view>
</template> </template>

3
pages/goodsDetail/index.vue
View File

@ -78,7 +78,8 @@
<button class="btn" @click="toAddOrder">立即抢购</button> <button class="btn" @click="toAddOrder">立即抢购</button>
</view> </view>
<!-- 回到顶部 --> <!-- 回到顶部 -->
<u-back-top :scroll-top="pageScrollTop"></u-back-top>
<!-- <u-back-top :scroll-top="pageScrollTop" :custom-style="{background: 'rgba(51, 51 51, 0.3)'}" :icon-style="{color: '#ffffff'}"></u-back-top> -->
<u-back-top :scroll-top="pageScrollTop" :custom-style="{background: 'rgba(51, 51 51, 0.3)'}"></u-back-top>
</block> </block>
</skeleton> </skeleton>
</view> </view>

26
pages/index/index.vue
View File

@ -11,13 +11,17 @@
<view class="right"> <view class="right">
<view class="lf-line-2 title">{{ item.name }}</view> <view class="lf-line-2 title">{{ item.name }}</view>
<view class="lf-flex tips"> <view class="lf-flex tips">
<view class="lf-row-between lf-flex-1" v-if="item.specs[0]">
<view class="lf-flex">
<view class="u-line-progress" v-if="item.specs[0].sold_percent"> <view class="u-line-progress" v-if="item.specs[0].sold_percent">
<u-line-progress :percent="item.specs[0].sold_percent" height="20" :striped="true" active-color="#FE9903" :show-percent="false" inactive-color="#F5F5F5"></u-line-progress> <u-line-progress :percent="item.specs[0].sold_percent" height="20" :striped="true" active-color="#FE9903" :show-percent="false" inactive-color="#F5F5F5"></u-line-progress>
</view> </view>
<block v-if="item.specs[0]">
<text class="progress lf-m-r-10">{{ item.specs[0].sold_percent_text }}</text> <text class="progress lf-m-r-10">{{ item.specs[0].sold_percent_text }}</text>
</view>
<view>
<text class="bought">{{ item.specs[0].sold_stock_text }}</text> <text class="bought">{{ item.specs[0].sold_stock_text }}</text>
</block>
</view>
</view>
</view> </view>
<view class="lf-row-between price"> <view class="lf-row-between price">
<lf-price :price="item.specs[0].selling_price" v-if="item.specs[0]"></lf-price> <lf-price :price="item.specs[0].selling_price" v-if="item.specs[0]"></lf-price>
@ -33,7 +37,7 @@
<my-nocontent v-else></my-nocontent> <my-nocontent v-else></my-nocontent>
</view> </view>
<!-- 回到顶部 --> <!-- 回到顶部 -->
<u-back-top :scroll-top="pageScrollTop"></u-back-top>
<u-back-top :scroll-top="pageScrollTop" :custom-style="{background: 'rgba(51, 51 51, 0.3)'}"></u-back-top>
</view> </view>
</view> </view>
</template> </template>
@ -122,12 +126,16 @@
} }
}, },
onPullDownRefresh(){ onPullDownRefresh(){
let tab_item = this.tab_list[this.current];
tab_item.page = 1;
tab_item.isPage = true;
tab_item.loadingClass = true;
tab_item.loadingText = '正在加载中';
this.getGoodsList();
// 新版逻辑，刷新则整个数据全部重新获取
this.getCategoryList();
// 旧版逻辑，刷新只刷tab下的商品列表
// let tab_item = this.tab_list[this.current];
// tab_item.page = 1;
// tab_item.isPage = true;
// tab_item.loadingClass = true;
// tab_item.loadingText = '正在加载中';
// this.getGoodsList();
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
}, },
onShareAppMessage(){ onShareAppMessage(){

2
pages/order/index.vue
View File

@ -43,7 +43,7 @@
<my-nocontent v-else></my-nocontent> <my-nocontent v-else></my-nocontent>
</view> </view>
<!-- 回到顶部 --> <!-- 回到顶部 -->
<u-back-top :scroll-top="pageScrollTop"></u-back-top>
<u-back-top :scroll-top="pageScrollTop" :custom-style="{background: 'rgba(51, 51 51, 0.3)'}"></u-back-top>
</view> </view>
</view> </view>
</template> </template>

2
pages/shopOrder/index.vue
View File

@ -39,7 +39,7 @@
<my-nocontent v-else></my-nocontent> <my-nocontent v-else></my-nocontent>
</view> </view>
<!-- 回到顶部 --> <!-- 回到顶部 -->
<u-back-top :scroll-top="pageScrollTop"></u-back-top>
<u-back-top :scroll-top="pageScrollTop" :custom-style="{background: 'rgba(51, 51 51, 0.3)'}"></u-back-top>
</view> </view>
</view> </view>
</template> </template>

Write Preview
Loading…
Cancel
Save