loumengning
/
shop
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

秒杀

undefined
xubin 4 years ago
parent
d86ba5a1de
commit
cf83bc3bfc
14 changed files with 17 additions and 14 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +8
    -5
      addons/unishop/uniapp/uni-shop/pages/flash/list.vue
  2. +1
    -1
      addons/unishop/uniapp/uni-shop/pages/index/index.vue
  3. +1
    -1
      addons/unishop/uniapp/uni-shop/pages/order/order.vue
  4. +1
    -1
      addons/unishop/uniapp/uni-shop/pages/order/orderDetail.vue
  5. +1
    -1
      addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/index.html
  6. +1
    -1
      addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.0f80cb05.js
  7. +1
    -0
      addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-flash-list.88487aed.js
  8. +0
    -1
      addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-flash-list.c4a2509a.js
  9. +0
    -1
      addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-index-index.123d8142.js
  10. +1
    -0
      addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-index-index.3d160692.js
  11. +0
    -1
      addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-order.10914fcb.js
  12. +1
    -0
      addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-order.4fa16733.js
  13. +1
    -0
      addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-orderDetail.16662cb1.js
  14. +0
    -1
      addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-orderDetail.eee89fff.js

+ 8
- 5
addons/unishop/uniapp/uni-shop/pages/flash/list.vue View File

@@ -4,7 +4,7 @@
<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{current: tabCurrentIndex === index}"
@click="tabClick(index)">
<view class="hour">
<view>{{item.starttime_hour}}</view>
<view>{{(new Date(item.starttime)).getFullYear()+'-'+((new Date(item.starttime)).getMonth()+1)+'-'+(new Date(item.starttime)).getDay()}}&nbsp{{item.starttime_hour}}</view>
<view class="text">{{state[item.state].text}}</view>
</view>
</view>
@@ -170,7 +170,7 @@
// 设置导航栏名称
setNavigationBarTitle(title) {
uni.setNavigationBarTitle({
title: 'Promotion|' + title
title: title
});
}

@@ -277,10 +277,13 @@
position: relative;

.title {
font-size: $font-lg;
color: #303133;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
word-break: break-all;
line-height: 60upx;
// overflow: hidden;
// text-overflow: ellipsis;
// white-space: nowrap;
}

.introduction {


+ 1
- 1
addons/unishop/uniapp/uni-shop/pages/index/index.vue View File

@@ -862,7 +862,7 @@
}

.title {
font-size: $font-lg;
font-size: 12px;
color: $font-color-dark;
line-height: 80upx;
}


+ 1
- 1
addons/unishop/uniapp/uni-shop/pages/order/order.vue View File

@@ -43,7 +43,7 @@
<!-- <text v-if="item.delivery_price > 0">(含运费￥{{item.delivery_price}})</text> -->
</view>
<view class="action-box b-t" v-if="item.state != 9">
<button class="action-btn" v-if="item.state == 1" @click.stop="button('cancel',item)">Cancel Order</button>
<button class="action-btn" v-if="item.state == 1" @click.stop="button('cancel',item)">Cancel</button>
<button class="action-btn recom" v-if="item.have_paid == 0" @click.stop="button('pay',item)">Pay Immediately</button>
<button class="action-btn recom" v-if="item.state == 2" @click.stop="button('refunded',item)">Refund</button>
<!-- <button class="action-btn" v-if="item.have_paid != 0 && item.have_delivered == 0">提醒发货</button> -->


+ 1
- 1
addons/unishop/uniapp/uni-shop/pages/order/orderDetail.vue View File

@@ -54,7 +54,7 @@
<!--兼容苹果系统下margin-bottom不生效-->
</view>
<view class="bottom" v-if="order.state != 9">
<button class="action-btn" v-if="order.state == 1" @click.stop="button('cancel')">Cancel Order</button>
<button class="action-btn" v-if="order.state == 1" @click.stop="button('cancel')">Cancel</button>
<button class="action-btn recom" v-if="order.have_paid == 0" @click.stop="button('pay')">Pay Immediately</button>
<button class="action-btn recom" v-if="order.state == 2" @click.stop="button('refunded',item)">Refund</button>
<!-- <button class="action-btn" v-if="order.have_paid != 0" @click.stop="button('delivery')">查看物流</button> -->


+ 1
- 1
addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/index.html View File

@@ -1,3 +1,3 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>宜家自购商城</title><script>document.addEventListener('DOMContentLoaded', function() {
document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
})</script><link rel=stylesheet href=/h5/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/h5/static/js/chunk-vendors.73b1d7ab.js></script><script src=/h5/static/js/index.2347fb58.js></script></body></html>
})</script><link rel=stylesheet href=/h5/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/h5/static/js/chunk-vendors.73b1d7ab.js></script><script src=/h5/static/js/index.0f80cb05.js></script></body></html>

addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.0f80cb05.js
File diff suppressed because it is too large
View File


+ 1
- 0
addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-flash-list.88487aed.js
File diff suppressed because it is too large
View File


+ 0
- 1
addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-flash-list.c4a2509a.js
File diff suppressed because it is too large
View File


+ 0
- 1
addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-index-index.123d8142.js
File diff suppressed because it is too large
View File


+ 1
- 0
addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-index-index.3d160692.js
File diff suppressed because it is too large
View File


+ 0
- 1
addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-order.10914fcb.js
File diff suppressed because it is too large
View File


+ 1
- 0
addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-order.4fa16733.js
File diff suppressed because it is too large
View File


+ 1
- 0
addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-orderDetail.16662cb1.js
File diff suppressed because it is too large
View File


+ 0
- 1
addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-orderDetail.eee89fff.js
File diff suppressed because it is too large
View File


Write Preview
Loading…
Cancel
Save