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

Merge remote-tracking branch 'origin/yijia' into yijia

undefined
娄梦宁 4 years ago
parent
efc250cf7a 86890ec6a7
commit
11c1df60ea
5 changed files with 7 additions and 9 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +4
    -6
      addons/unishop/uniapp/uni-shop/pages/product/product.vue
  2. +1
    -1
      addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/index.html
  3. +1
    -1
      addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.72fcef22.js
  4. +1
    -0
      addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-product-product.6134e548.js
  5. +0
    -1
      addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-product-product.775bec5f.js

+ 4
- 6
addons/unishop/uniapp/uni-shop/pages/product/product.vue View File

@@ -137,10 +137,8 @@
</view>

<view class="action-btn-group" v-if="countdown && progress.number != progress.sold">
<button v-if="product.flash.text=='距开始:'" :class="{'only': flash}" type="primary" disabled class=" action-btn-gray action-btn no-border buy-now-btn">Buy
Now</button>
<button v-else :class="{'only': flash}" type="primary" class=" action-btn no-border buy-now-btn" @click="buy">Buy
Now</button>
<button v-if="product.flash.text=='距开始:'" :class="{'only': flash}" type="primary" disabled class=" action-btn-gray action-btn no-border buy-now-btn">Buy&nbspNow</button>
<button v-else :class="{'only': flash}" type="primary" class=" action-btn no-border buy-now-btn" @click="buy">Buy&nbspNow</button>
<!-- <button v-if="!flash" type="primary" class=" action-btn no-border add-cart-btn" @click="addCart">加入购物车</button> -->
</view>
<view class="p-b-btn" v-else>
@@ -1034,7 +1032,7 @@
width: 360rpx !important;
}

&:after {
/* &:after {
content: '';
position: absolute;
top: 50%;
@@ -1043,7 +1041,7 @@
height: 28upx;
width: 0;
border-right: 1px solid rgba(255, 255, 255, .5);
}
} */

.action-btn-gray {
filter: grayscale(10%) !important;


+ 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.d1284636.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.72fcef22.js></script></body></html>

addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.72fcef22.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-product-product.6134e548.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-product-product.775bec5f.js
File diff suppressed because it is too large
View File


Write Preview
Loading…
Cancel
Save