Loki
/
zsw-farm-bxg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改.vue中的 rem为rpx,修改部分页面错误样式,授权页增加微信和app的判断

zyh
gaoxs 5 years ago
parent
3fa8054983
commit
2a2c544991
47 changed files with 943 additions and 919 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
      assets/css/style.css
  2. 2
      assets/css/style.css.map
  3. 5
      assets/css/style.less
  4. 16
      components/CouponListWindow.vue
  5. 2
      components/CouponWindow.vue
  6. 10
      components/Home.vue
  7. 2
      components/Loading.vue
  8. 40
      components/Payment.vue
  9. 10
      components/PriceChange.vue
  10. 2
      components/ShareInfo.vue
  11. 44
      components/StorePoster.vue
  12. 38
      components/SwitchWindow.vue
  13. 68
      components/WriteOff.vue
  14. 5
      pages/Loading/index.vue
  15. 12
      pages/NotDefined/index.vue
  16. 2
      pages/activity/DargainDetails/index.vue
  17. 18
      pages/activity/GoodsSeckill/index.vue
  18. 4
      pages/activity/GroupDetails/index.vue
  19. 2
      pages/activity/Poster/index.vue
  20. 6
      pages/activity/SeckillDetails/index.vue
  21. 37
      pages/authorization/index.vue
  22. 2
      pages/home/index.vue
  23. 2
      pages/launch/index.vue
  24. 54
      pages/order/Logistics/index.vue
  25. 17
      pages/order/MyOrder/index.vue
  26. 98
      pages/order/OrderDetails/index.vue
  27. 2
      pages/order/OrderSubmission/index.vue
  28. 2
      pages/orderAdmin/AdminOrderList/index.vue
  29. 38
      pages/orderAdmin/OrderCancellation/index.vue
  30. 6
      pages/orderAdmin/Statistics/index.vue
  31. 4
      pages/shop/EvaluateList/index.vue
  32. 2
      pages/shop/GoodSearch/index.vue
  33. 76
      pages/shop/GoodsCon/index.vue
  34. 2
      pages/shop/GoodsEvaluate/index.vue
  35. 2
      pages/shop/GoodsList/index.vue
  36. 4
      pages/shop/ShoppingCart/index.vue
  37. 58
      pages/shop/news/NewsDetail/index.vue
  38. 4
      pages/user/ChangePassword/index.vue
  39. 24
      pages/user/CustomerList/index.vue
  40. 50
      pages/user/Recharge/index.vue
  41. 90
      pages/user/User/index.vue
  42. 2
      pages/user/UserVip/index.vue
  43. 2
      pages/user/address/AddressManagement/index.vue
  44. 2
      pages/user/promotion/Poster/index.vue
  45. 2
      pages/user/promotion/UserPromotion/index.vue
  46. 2
      pages/user/signIn/Integral/index.vue
  47. 6
      pages/user/signIn/Sign/index.vue

2
assets/css/style.css
View File

File diff suppressed because one or more lines are too long

2
assets/css/style.css.map
View File

File diff suppressed because one or more lines are too long

5
assets/css/style.less
Unescape View File

@ -77,6 +77,11 @@
height: 100%; height: 100%;
border-radius: 0.06*100rpx; border-radius: 0.06*100rpx;
} }
.goodList .item .pictrue image {
width: 100%;
height: 100%;
border-radius: 0.06*100rpx;
}
.goodList .item .pictrue .numPic { .goodList .item .pictrue .numPic {
position: absolute; position: absolute;

16
components/CouponListWindow.vue
Unescape View File

@ -47,20 +47,20 @@
></view> ></view>
</view> </view>
</template> </template>
<style scoped> <style scoped lang="less">
.coupon-list-window .iconfont { .coupon-list-window .iconfont {
font-size: 0.4rem; font-size: 40rpx;
} }
.couponNo { .couponNo {
font-size: 0.3rem; font-size: 30rpx;
font-weight: bold; font-weight: bold;
color: #fff; color: #fff;
width: 6.9rem; width: 690rpx;
height: 0.86rem; height: 86rpx;
border-radius: 0.43rem; border-radius: 43rpx;
text-align: center; text-align: center;
line-height: 0.86rem; line-height: 86rpx;
margin: 0.6rem auto; margin: 60rpx auto;
} }
</style> </style>
<script> <script>

2
components/CouponWindow.vue
Unescape View File

@ -15,7 +15,7 @@
</view> </view>
</view> </view>
</view> </view>
<view style="height:1.2rem"></view> <view style="height:120rpx"></view>
</view> </view>
<view class="lid"> <view class="lid">
<view class="bnt font-color-red" @click="checked">立即领取</view> <view class="bnt font-color-red" @click="checked">立即领取</view>

10
components/Home.vue
Unescape View File

@ -46,16 +46,16 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="less">
.mystyl { .mystyl {
display: inline-block; display: inline-block;
width: 0.64rem; width: 64rpx;
height: 0.64rem; height: 64rpx;
margin-top: 0.12rem; margin-top:12rpx;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid #e1e1e1; border: 1px solid #e1e1e1;
border-radius: 50%; border-radius: 50%;
background-size: 1.24rem auto; background-size: 124rpx auto;
background-repeat: no-repeat; background-repeat: no-repeat;
background-color: rgba(255, 255, 255, 0.9); background-color: rgba(255, 255, 255, 0.9);
} }

2
components/Loading.vue
Unescape View File

@ -2,7 +2,7 @@
<view <view
class="Loads acea-row row-center-wrapper" class="Loads acea-row row-center-wrapper"
v-if="loading || !loaded" v-if="loading || !loaded"
style="margin-top: .2rem;" style="margin-top: 20rpx;"
> >
<template v-if="loading"> <template v-if="loading">
<view <view

40
components/Payment.vue
Unescape View File

@ -98,15 +98,15 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="less" lang="less">
.payment { .payment {
position: fixed; position: fixed;
bottom: 0; bottom: 0;
left: 0; left: 0;
width: 100%; width: 100%;
border-radius: 0.16rem 0.16rem 0 0; border-radius: 0.16*100rpx 0.16*100rpx 0 0;
background-color: #fff; background-color: #fff;
padding-bottom: 0.6rem; padding-bottom: 0.6*100rpx;
z-index: 99; z-index: 99;
transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9); transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-webkit-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9); -webkit-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
@ -129,48 +129,48 @@ export default {
.payment .title { .payment .title {
text-align: center; text-align: center;
height: 1.23rem; height: 1.23*100rpx;
font-size: 0.32rem; font-size: 0.32*100rpx;
color: #282828; color: #282828;
font-weight: bold; font-weight: bold;
padding-right: 0.3rem; padding-right: 0.3*100rpx;
margin-left: 0.3rem; margin-left: 0.3*100rpx;
position: relative; position: relative;
border-bottom: 0.01rem solid #eee; border-bottom: 0.01*100rpx solid #eee;
} }
.payment .title .iconfont { .payment .title .iconfont {
position: absolute; position: absolute;
right: 0.3rem; right: 0.3*100rpx;
top: 50%; top: 50%;
transform: translateY(-50%); transform: translateY(-50%);
font-size: 0.43rem; font-size: 0.43*100rpx;
color: #8a8a8a; color: #8a8a8a;
font-weight: normal; font-weight: normal;
} }
.payment .item { .payment .item {
border-bottom: 0.01rem solid #eee; border-bottom: 0.01*100rpx solid #eee;
height: 1.3rem; height: 1.3*100rpx;
margin-left: 0.3rem; margin-left: 0.3*100rpx;
padding-right: 0.3rem; padding-right: 0.3*100rpx;
} }
.payment .item .left { .payment .item .left {
width: 6.1rem; width: 6.1*100rpx;
} }
.payment .item .left .text { .payment .item .left .text {
width: 5.4rem; width: 5.4*100rpx;
} }
.payment .item .left .text .name { .payment .item .left .text .name {
font-size: 0.32rem; font-size: 0.32*100rpx;
color: #282828; color: #282828;
} }
.payment .item .left .text .info { .payment .item .left .text .info {
font-size: 0.24rem; font-size: 0.24*100rpx;
color: #999; color: #999;
} }
@ -179,7 +179,7 @@ export default {
} }
.payment .item .left .iconfont { .payment .item .left .iconfont {
font-size: 0.45rem; font-size: 0.45*100rpx;
color: #09bb07; color: #09bb07;
} }
@ -196,7 +196,7 @@ export default {
} }
.payment .item .iconfont { .payment .item .iconfont {
font-size: 0.3rem; font-size: 0.3*100rpx;
color: #999; color: #999;
} }
</style> </style>

10
components/PriceChange.vue
Unescape View File

@ -66,15 +66,15 @@
<view class="mask" @touchmove.prevent v-show="change === true"></view> <view class="mask" @touchmove.prevent v-show="change === true"></view>
</view> </view>
</template> </template>
<style scoped> <style scoped lang="less" >
.priceChange .listChange textarea { .priceChange .listChange textarea {
border: 1px solid #eee; border: 1px solid #eee;
width: 100%; width: 100%;
height: 2rem; height: 200rpx;
margin-top: 0.5rem; margin-top: 50rpx;
border-radius: 0.1rem; border-radius: 10rpx;
color: #333; color: #333;
padding: 0.2rem; padding: 20rpx;
} }
</style> </style>
<script> <script>

2
components/ShareInfo.vue
Unescape View File

@ -5,7 +5,7 @@
</view> </view>
</view> </view>
</template> </template>
<style scoped> <style scoped lang="less">
.poster-first { .poster-first {
overscroll-behavior: contain; overscroll-behavior: contain;
} }

44
components/StorePoster.vue
Unescape View File

@ -39,83 +39,83 @@
<view class="mask"></view> <view class="mask"></view>
</view> </view>
</template> </template>
<style scoped> <style scoped lang="less" lang="less">
.poster-first { .poster-first {
overscroll-behavior: contain; overscroll-behavior: contain;
} }
.poster-pop { .poster-pop {
width: 4.5rem; width: 4.5*100rpx;
height: 8rem; height: 8*100rpx;
position: fixed; position: fixed;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
z-index: 99; z-index: 99;
top: 50%; top: 50%;
margin-top: -4.6rem; margin-top: -4.6*100rpx;
} }
.poster-pop .canvas { .poster-pop .canvas {
background-color: #ffffff; background-color: #ffffff;
height: 8rem; height: 8*100rpx;
} }
.poster-pop .poster-image { .poster-pop .poster-image {
width: 100%; width: 100%;
height: auto; height: auto;
} }
.poster-pop .canvas .image { .poster-pop .canvas .image {
width: 4.5rem; width: 4.5*100rpx;
height: 4.5rem; height: 4.5*100rpx;
display: block; display: block;
} }
.poster-pop .canvas .text { .poster-pop .canvas .text {
text-align: center; text-align: center;
color: #000000; color: #000000;
margin-top: 0.32rem; margin-top: 0.32*100rpx;
} }
.poster-pop .canvas .text.black { .poster-pop .canvas .text.black {
height: 0.68rem; height: 0.68*100rpx;
} }
.poster-pop .canvas .text.rad { .poster-pop .canvas .text.rad {
color: #ff0000; color: #ff0000;
} }
.poster-pop .canvas .code { .poster-pop .canvas .code {
height: 1.4rem; height: 1.4*100rpx;
display: flex; display: flex;
} }
.poster-pop .canvas .code .code-img { .poster-pop .canvas .code .code-img {
width: 33%; width: 33%;
padding: 0.06rem; padding: 0.06*100rpx;
} }
.poster-pop .canvas .code .code-img image{ .poster-pop .canvas .code .code-img image{
width: 100%; width: 100%;
} }
.poster-pop .canvas .code .code-text { .poster-pop .canvas .code .code-text {
width: 60%; width: 60%;
font-size: 0.12rem; font-size: 0.12*100rpx;
line-height: 1.64rem; line-height: 1.64*100rpx;
} }
.poster-pop .close { .poster-pop .close {
width: 0.46rem; width: 0.46*100rpx;
height: 0.75rem; height: 0.75*100rpx;
position: fixed; position: fixed;
right: 0; right: 0;
top: -0.73rem; top: -0.73*100rpx;
display: block; display: block;
} }
.poster-pop .save-poster { .poster-pop .save-poster {
background-color: #df2d0a; background-color: #df2d0a;
font-size: 0.22rem; font-size: 0.22*100rpx;
color: #fff; color: #fff;
text-align: center; text-align: center;
height: 0.76rem; height: 0.76*100rpx;
line-height: 0.76rem; line-height: 0.76*100rpx;
width: 100%; width: 100%;
margin-top: -0.04rem; margin-top: -0.04*100rpx;
} }
.poster-pop .keep { .poster-pop .keep {
color: #fff; color: #fff;
text-align: center; text-align: center;
font-size: 0.25rem; font-size: 0.25*100rpx;
margin-top: 0.1rem; margin-top: 0.1*100rpx;
} }
.mask { .mask {
position: fixed; position: fixed;

38
components/SwitchWindow.vue
Unescape View File

@ -23,19 +23,19 @@
<view class="mask" @touchmove.prevent v-show="switchActive === true" @click="switchClose"></view> <view class="mask" @touchmove.prevent v-show="switchActive === true" @click="switchClose"></view>
</view> </view>
</template> </template>
<style> <style lang="less">
.switchWindow { .switchWindow {
width: 5.6rem; width: 5.6*100rpx;
border-radius: 0.2rem; border-radius: 0.2*100rpx;
-webkit-border-radius: 0.2rem; -webkit-border-radius: 0.2*100rpx;
background-color: #fff; background-color: #fff;
position: fixed; position: fixed;
top: 50%; top: 50%;
left: 50%; left: 50%;
margin-left: -2.8rem; margin-left: -2.8*100rpx;
margin-top: -3rem; margin-top: -3*100rpx;
z-index: 99; z-index: 99;
padding: 0.5rem 0.3rem 0.4rem 0.3rem; padding: 0.5*100rpx 0.3*100rpx 0.4*100rpx 0.3*100rpx;
text-align: center; text-align: center;
box-sizing: border-box; box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
@ -57,8 +57,8 @@
} }
.switchWindow .pictrue { .switchWindow .pictrue {
width: 2.36rem; width: 2.36*100rpx;
height: 2.36rem; height: 2.36*100rpx;
margin: 0 auto; margin: 0 auto;
} }
@ -69,21 +69,21 @@
} }
.switchWindow .info { .switchWindow .info {
font-size: 0.32rem; font-size: 0.32*100rpx;
color: #282828; color: #282828;
margin-top: 0.44rem; margin-top: 0.44*100rpx;
font-weight: bold; font-weight: bold;
} }
.switchWindow .switchBnt { .switchWindow .switchBnt {
font-size: 0.32rem; font-size: 0.32*100rpx;
color: #fff; color: #fff;
width: 3.6rem; width: 3.6*100rpx;
height: 0.82rem; height: 0.82*100rpx;
border-radius: 0.41rem; border-radius: 0.41*100rpx;
-webkit-border-radius: 0.41rem; -webkit-border-radius: 0.41*100rpx;
margin: 0.57rem auto 0 auto; margin: 0.57*100rpx auto 0 auto;
line-height: 0.82rem; line-height: 0.82*100rpx;
background-image: linear-gradient(to right, #f67a38 0%, #f11b09 100%); background-image: linear-gradient(to right, #f67a38 0%, #f11b09 100%);
background-image: -webkit-linear-gradient(to right, #f67a38 0%, #f11b09 100%); background-image: -webkit-linear-gradient(to right, #f67a38 0%, #f11b09 100%);
background-image: -moz-linear-gradient(to right, #f67a38 0%, #f11b09 100%); background-image: -moz-linear-gradient(to right, #f67a38 0%, #f11b09 100%);
@ -93,7 +93,7 @@
background-color: #fff; background-color: #fff;
color: #999; color: #999;
background-image: none; background-image: none;
margin-top: 0.1rem; margin-top: 0.1*100rpx;
} }
</style> </style>
<script> <script>

68
components/WriteOff.vue
Unescape View File

@ -12,84 +12,84 @@
<view class="mask" @touchmove.prevent></view> <view class="mask" @touchmove.prevent></view>
</view> </view>
</template> </template>
<style scoped> <style scoped lang="less">
.WriteOff { .WriteOff {
width: 5.6rem; width: 5.6*100rpx;
height: 8rem; height: 8*100rpx;
background-color: #fff; background-color: #fff;
border-radius: 0.2rem; border-radius: 0.2*100rpx;
position: fixed; position: fixed;
top: 50%; top: 50%;
left: 50%; left: 50%;
margin-top: -4rem; margin-top: -4*100rpx;
margin-left: -2.8rem; margin-left: -2.8*100rpx;
z-index: 99; z-index: 99;
padding-top: 0.55rem; padding-top: 0.55*100rpx;
} }
.WriteOff .pictrue { .WriteOff .pictrue {
width: 3.4rem; width: 3.4*100rpx;
height: 3.4rem; height: 3.4*100rpx;
margin: 0 auto; margin: 0 auto;
} }
.WriteOff .pictrue image{ .WriteOff .pictrue image{
width: 100%; width: 100%;
height: 100%; height: 100%;
display: block; display: block;
border-radius: 0.1rem; border-radius: 0.1*100rpx;
} }
.WriteOff .num { .WriteOff .num {
font-size: 0.3rem; font-size: 0.3*100rpx;
color: #666; color: #666;
margin: 0.28rem 0 0.3rem 0; margin: 0.28*100rpx 0 0.3*100rpx 0;
} }
.WriteOff .num .see { .WriteOff .num .see {
font-size: 0.16rem; font-size: 0.16*100rpx;
color: #fff; color: #fff;
border-radius: 0.04rem; border-radius: 0.04*100rpx;
background-color: #c68937; background-color: #c68937;
padding-left: 0.05rem; padding-left: 0.05*100rpx;
margin-left: 0.12rem; margin-left: 0.12*100rpx;
} }
.WriteOff .num .see .iconfont { .WriteOff .num .see .iconfont {
font-size: 0.15rem; font-size: 0.15*100rpx;
} }
.WriteOff .tip { .WriteOff .tip {
font-size: 0.36rem; font-size: 0.36*100rpx;
color: #282828; color: #282828;
text-align: center; text-align: center;
border-top: 1px dashed #ccc; border-top: 1px dashed #ccc;
padding-top: 0.4rem; padding-top: 0.4*100rpx;
position: relative; position: relative;
} }
.WriteOff .tip:after { .WriteOff .tip:after {
content: ""; content: "";
position: absolute; position: absolute;
width: 0.25rem; width: 0.25*100rpx;
height: 0.25rem; height: 0.25*100rpx;
border-radius: 50%; border-radius: 50%;
background-color: #7f7f7f; background-color: #7f7f7f;
right: -0.125rem; right: -0.125*100rpx;
top: -0.125rem; top: -0.125*100rpx;
} }
.WriteOff .tip:before { .WriteOff .tip:before {
content: ""; content: "";
position: absolute; position: absolute;
width: 0.25rem; width: 0.25*100rpx;
height: 0.25rem; height: 0.25*100rpx;
border-radius: 50%; border-radius: 50%;
background-color: #7f7f7f; background-color: #7f7f7f;
left: -0.125rem; left: -0.125*100rpx;
top: -0.125rem; top: -0.125*100rpx;
} }
.WriteOff .sure { .WriteOff .sure {
font-size: 0.32rem; font-size: 0.32*100rpx;
color: #fff; color: #fff;
text-align: center; text-align: center;
line-height: 0.82rem; line-height: 0.82*100rpx;
height: 0.82rem; height: 0.82*100rpx;
width: 4.6rem; width: 4.6*100rpx;
border-radius: 0.41rem; border-radius: 0.41*100rpx;
margin: 0.4rem auto 0 auto; margin: 0.4*100rpx auto 0 auto;
background-image: linear-gradient(to right, #f67a38 0%, #f11b09 100%); background-image: linear-gradient(to right, #f67a38 0%, #f11b09 100%);
background-image: -webkit-linear-gradient(to right, #f67a38 0%, #f11b09 100%); background-image: -webkit-linear-gradient(to right, #f67a38 0%, #f11b09 100%);
background-image: -moz-linear-gradient(to right, #f67a38 0%, #f11b09 100%); background-image: -moz-linear-gradient(to right, #f67a38 0%, #f11b09 100%);
@ -97,7 +97,7 @@
.WriteOff .sure.cancel { .WriteOff .sure.cancel {
background-image: none; background-image: none;
color: #999; color: #999;
margin-top: 0.1rem; margin-top: 0.1*100rpx;
} }
</style> </style>
<script> <script>

5
pages/Loading/index.vue
Unescape View File

@ -41,7 +41,8 @@ export default {
this.toLaunch(); this.toLaunch();
return; return;
} }
console.log(this.$store.getters.token, 9999); console.log(this.$store.getters.token, '获取store里面的 token');
console.log(this.$store.getters.userInfo, '获取store里面的 userInfo');
cookie.get("spread"); cookie.get("spread");
// this.toLaunch(); // this.toLaunch();
if (this.$deviceType == 'App') { if (this.$deviceType == 'App') {
@ -70,7 +71,7 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped lang="less">
.lottie-bg { .lottie-bg {
position: fixed; position: fixed;
left: 0; left: 0;

12
pages/NotDefined/index.vue
Unescape View File

@ -22,21 +22,21 @@
}; };
</script> </script>
<style scoped> <style scoped lang="less">
.not-defined image{ .not-defined image{
width: 100%; width: 100%;
margin-top: 18%; margin-top: 18%;
} }
.content { .content {
padding: 0 1rem; padding: 0 1*100rpx;
text-align: center; text-align: center;
color: #44405e; color: #44405e;
font-size: 15px; font-size: 15px;
} }
.title { .title {
margin-bottom: 0.6rem; margin-bottom: 0.6*100rpx;
color: #302c48; color: #302c48;
font-size: 20px; font-size: 20px;
} }
@ -45,11 +45,11 @@
color: #fff; color: #fff;
background-color: #ef4c4c; background-color: #ef4c4c;
font-size: 16px; font-size: 16px;
padding: 0.16rem; padding: 0.16*100rpx;
border-radius: 25px; border-radius: 25px;
text-align: center; text-align: center;
width: 2.4rem; width: 2.4*100rpx;
margin: 0 auto; margin: 0 auto;
margin-top: 1rem; margin-top: 1*100rpx;
} }
</style> </style>

2
pages/activity/DargainDetails/index.vue
Unescape View File

@ -506,7 +506,7 @@ export default {
}; };
</script> </script>
<style> <style lang="less">
.bargainBnts { .bargainBnts {
display: flex; display: flex;
align-items: center; align-items: center;

18
pages/activity/GoodsSeckill/index.vue
Unescape View File

@ -194,25 +194,25 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="less">
.timeItem { .timeItem {
font-size: 0.22rem; font-size: 0.22*100rpx;
color: #282828; color: #282828;
width: 100%; width: 100%;
text-align: center; text-align: center;
padding: 0.11rem 0; padding: 0.11*100rpx 0;
height: 0.96rem; height: 0.96*100rpx;
background-color: #efc58f; background-color: #efc58f;
} }
.timeItem .time { .timeItem .time {
font-size: 0.32rem; font-size: 0.32*100rpx;
font-weight: bold; font-weight: bold;
height: 0.37rem; height: 0.37*100rpx;
line-height: 0.37rem; line-height: 0.37*100rpx;
} }
.timeItem .state { .timeItem .state {
height: 0.37rem; height: 0.37*100rpx;
line-height: 0.37rem; line-height: 0.37*100rpx;
} }
.activity { .activity {
color: #333; color: #333;

4
pages/activity/GroupDetails/index.vue
Unescape View File

@ -321,9 +321,9 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="less">
.product-con .wrapper { .product-con .wrapper {
padding-bottom: 0.26rem; padding-bottom: 0.26*100rpx;
} }
.noscroll { .noscroll {
height: 100%; height: 100%;

2
pages/activity/Poster/index.vue
Unescape View File

@ -8,7 +8,7 @@
</view> </view>
</view> </view>
</template> </template>
<style scoped> <style scoped lang="less">
.poster-poster { .poster-poster {
height: unset !important; height: unset !important;
} }

6
pages/activity/SeckillDetails/index.vue
Unescape View File

@ -56,7 +56,7 @@
></StorePoster> ></StorePoster>
</view> </view>
</template> </template>
<style scoped> <style scoped lang="less">
.noscroll { .noscroll {
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
@ -226,8 +226,8 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="less">
.product-con .nav { .product-con .nav {
padding: 0 0.2rem; padding: 0 0.2*100rpx;
} }
</style> </style>

37
pages/authorization/index.vue
Unescape View File

@ -1,25 +1,39 @@
<template> <template>
<view class="container"> <view class="container">
<view v-if="!isAuthorization"> <view v-if="!$store.getters.token&&$deviceType=='Weixin'">
<view class="getUserInfo"> <view class="getUserInfo">
<text>您还未允许微信登录授权，请点击下方按钮允许微信授权登录。</text> <text>您还未允许微信登录授权，请点击下方按钮允许微信授权登录。</text>
<view style="height:20rpx"></view>
<button type="primary" open-type="getUserInfo" @getuserinfo="getUserInfo">允许微信登录授权</button> <button type="primary" open-type="getUserInfo" @getuserinfo="getUserInfo">允许微信登录授权</button>
<view style="height:20rpx"></view> <view style="height:20rpx"></view>
<button @click="back">取消微信登录授权</button> <button @click="back">取消微信登录授权</button>
</view> </view>
</view> </view>
<view v-if="!$store.getters.token&&$deviceType!='Weixin'">
<view class="getUserInfo">
<text>请先登录</text>
<button type="primary" @click="this.toLogin">去登录</button>
</view>
</view>
</view> </view>
</template> </template>
<script> <script>
import { mapState, mapMutations, mapActions } from "vuex"; import {
mapState,
mapMutations,
mapActions
} from "vuex";
// 组件 // 组件
// import request from "@//api/request"; // import request from "@//api/request";
import { wxappAuth, getUser } from "@/api/user"; import {
wxappAuth,
getUser
} from "@/api/user";
import dayjs from "dayjs"; import dayjs from "dayjs";
import cookie from "@/utils/store/cookie"; import cookie from "@/utils/store/cookie";
import { login } from "@/utils"; import {
login
} from "@/utils";
export default { export default {
data() { data() {
@ -63,6 +77,12 @@ export default {
login({ login({
success: () => {} success: () => {}
}); });
},
toLogin() {
this.$yrouter.push({
path: "/pages/user/Login/index",
query: {}
});
} }
}, },
onUnload() {}, onUnload() {},
@ -81,7 +101,9 @@ export default {
flex-direction: column; flex-direction: column;
padding: 30px; padding: 30px;
p { text {
font-size: 30rpx;
text-align: center;
margin-bottom: 20px; margin-bottom: 20px;
} }
} }
@ -150,8 +172,7 @@ export default {
} }
} }
.tab-bar-pic-active { .tab-bar-pic-active {}
}
text { text {
font-size: 10px; font-size: 10px;

2
pages/home/index.vue
Unescape View File

@ -302,7 +302,7 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="less">
.index { .index {
background-color: #fff; background-color: #fff;
} }

2
pages/launch/index.vue
Unescape View File

@ -59,7 +59,7 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped lang="less">
.lottie-bg { .lottie-bg {
position: fixed; position: fixed;
left: 0; left: 0;

54
pages/order/Logistics/index.vue
Unescape View File

@ -43,7 +43,7 @@
<!--物流跟踪--> <!--物流跟踪-->
<view style="margin-bottom:5px;"> <view style="margin-bottom:5px;">
<view class="bg-white" style="width: 92%; margin-left: 4%;margin: auto;padding-left: 15px;padding-right: 15px;padding-top: 10px"> <view class="bg-white" style="width: 92%; margin-left: 4%;margin: auto;padding-left: 15px;padding-right: 15px;padding-top: 10px">
<view style="font-size: .26rem;color: #111111; margin: 5px 0"> <view style="font-size: 26rpx;color: #111111; margin: 5px 0">
物流跟踪 物流跟踪
<!--物流跟踪--> <!--物流跟踪-->
</view> </view>
@ -182,24 +182,24 @@
}; };
</script> </script>
<style scoped> <style scoped lang="less">
.no-express { .no-express {
margin: 1.5rem 0; margin: 1.5*100rpx 0;
} }
.no-express image { .no-express image {
width: 6rem; width: 6*100rpx;
margin: 0 auto; margin: 0 auto;
display: block; display: block;
} }
.message-text { .message-text {
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
font-size: 1rem; font-size: 1*100rpx;
font-weight: normal; font-weight: normal;
font-stretch: normal; font-stretch: normal;
line-height: 3rem; line-height: 3*100rpx;
letter-spacing: 0rem; letter-spacing: 0*100rpx;
color: #333333; color: #333333;
width: 50%; width: 50%;
} }
@ -209,8 +209,8 @@
} }
.img2 { .img2 {
width: 0.81rem; width: 0.81*100rpx;
height: 0.8rem; height: 0.8*100rpx;
float: right; float: right;
} }
@ -225,7 +225,7 @@
white-space: normal; white-space: normal;
word-wrap: break-word; word-wrap: break-word;
word-break: break-all; word-break: break-all;
font-size: 1rem; font-size: 1*100rpx;
} }
.addressshow1 { .addressshow1 {
@ -239,11 +239,11 @@
white-space: normal; white-space: normal;
word-wrap: break-word; word-wrap: break-word;
word-break: break-all; word-break: break-all;
font-size: 1rem; font-size: 1*100rpx;
} }
.orderTitle { .orderTitle {
font-size: 1rem; font-size: 1*100rpx;
color: #333333; color: #333333;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
@ -254,11 +254,11 @@
white-space: normal; white-space: normal;
word-wrap: break-word; word-wrap: break-word;
word-break: break-all; word-break: break-all;
height: 2.5rem; height: 2.5*100rpx;
} }
.orderDetail { .orderDetail {
font-size: 0.26rem; font-size: 0.26*100rpx;
color: #666666; color: #666666;
text-align: left; text-align: left;
} }
@ -271,7 +271,7 @@
.pay-button { .pay-button {
width: 88%; width: 88%;
height: 2.6rem; height: 2.6*100rpx;
position: relative; position: relative;
background-color: red; background-color: red;
color: white; color: white;
@ -281,7 +281,7 @@
ul view { ul view {
list-style: none; list-style: none;
font-size: 0.24rem; font-size: 0.24*100rpx;
} }
ul {} ul {}
@ -294,8 +294,8 @@
.track-list view { .track-list view {
position: relative; position: relative;
padding: 0 0 0.5rem 5px; padding: 0 0 0.5*100rpx 5px;
line-height: 0.3rem; line-height: 0.3*100rpx;
border-left: 1px solid #d9d9d9; border-left: 1px solid #d9d9d9;
color: #999; color: #999;
} }
@ -312,8 +312,8 @@
position: absolute; position: absolute;
left: -6.5px; left: -6.5px;
border-radius: 50%; border-radius: 50%;
width: 0.2rem; width: 0.2*100rpx;
height: 0.2rem; height: 0.2*100rpx;
top: 4px; top: 4px;
background-color: #b2b2b2; background-color: #b2b2b2;
} }
@ -321,11 +321,11 @@
.track-list view.active .node-icon { .track-list view.active .node-icon {
background-position: 0-72px; background-position: 0-72px;
background-color: #ea7c0a; background-color: #ea7c0a;
width: 0.3rem; width: 0.3*100rpx;
z-index: 2; z-index: 2;
height: 0.3rem; height: 0.3*100rpx;
position: absolute; position: absolute;
left: -0.19rem; left: -0.19*100rpx;
top: 0; top: 0;
border-radius: 50%; border-radius: 50%;
} }
@ -346,8 +346,8 @@
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
color: #999; color: #999;
left: 0.2rem; left: 0.2*100rpx;
top: 0.04rem; top: 0.04*100rpx;
} }
.track-list view.first .time { .track-list view.first .time {
@ -364,7 +364,7 @@
.track-list view.finall { .track-list view.finall {
position: relative; position: relative;
padding: 0px 0 0.5rem 5px; padding: 0px 0 0.5*100rpx 5px;
line-height: 18px; line-height: 18px;
border-color: white; border-color: white;
border-left: 1px solid #ffffff; border-left: 1px solid #ffffff;
@ -375,7 +375,7 @@
width: 1px; width: 1px;
position: absolute; position: absolute;
left: -1.5px; left: -1.5px;
height: 0.5rem; height: 0.5*100rpx;
background-color: #d9d9d9; background-color: #d9d9d9;
} }
</style> </style>

17
pages/order/MyOrder/index.vue
Unescape View File

@ -332,20 +332,21 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped lang="less">
.noCart { .noCart {
margin-top: 0.17rem; margin-top: 0.17*100rpx;
padding-top: 0.1rem; padding-top: 0.1*100rpx;
} }
.noCart .pictrue { .noCart .pictrue {
width: 4rem; width: 4*100rpx;
height: 3rem; height: 3*100rpx;
margin: 0.7rem auto 0.5rem auto; overflow: hidden;
margin: 0.7*100rpx auto 0.5*100rpx auto;
} }
.noCart .pictrue image{ .noCart .pictrue image{
width: 100%; width: 4*100rpx;
height: 100%; height: 3*100rpx;
} }
</style> </style>

98
pages/order/OrderDetails/index.vue
Unescape View File

@ -294,7 +294,7 @@
} }
}; };
</script> </script>
<style scoped> <style scoped lang="less">
.geoPage { .geoPage {
position: fixed; position: fixed;
width: 100%; width: 100%;
@ -305,31 +305,31 @@
.order-details .writeOff { .order-details .writeOff {
background-color: #fff; background-color: #fff;
margin-top: 0.13rem; margin-top: 0.13*100rpx;
padding-bottom: 0.3rem; padding-bottom: 0.3*100rpx;
} }
.order-details .writeOff .title { .order-details .writeOff .title {
font-size: 0.3rem; font-size: 0.3*100rpx;
color: #282828; color: #282828;
height: 0.87rem; height: 0.87*100rpx;
border-bottom: 1px solid #f0f0f0; border-bottom: 1px solid #f0f0f0;
padding: 0 0.3rem; padding: 0 0.3*100rpx;
line-height: 0.87rem; line-height: 0.87*100rpx;
} }
.order-details .writeOff .grayBg { .order-details .writeOff .grayBg {
background-color: #f2f5f7; background-color: #f2f5f7;
width: 5.9rem; width: 5.9*100rpx;
height: 3.84rem; height: 3.84*100rpx;
border-radius: 0.2rem 0.2rem 0 0; border-radius: 0.2*100rpx 0.2*100rpx 0 0;
margin: 0.5rem auto 0 auto; margin: 0.5*100rpx auto 0 auto;
padding-top: 0.55rem; padding-top: 0.55*100rpx;
} }
.order-details .writeOff .grayBg .pictrue { .order-details .writeOff .grayBg .pictrue {
width: 2.9rem; width: 2.9*100rpx;
height: 2.9rem; height: 2.9*100rpx;
margin: 0 auto; margin: 0 auto;
} }
@ -340,8 +340,8 @@
} }
.order-details .writeOff .gear { .order-details .writeOff .gear {
width: 5.9rem; width: 5.9*100rpx;
height: 0.3rem; height: 0.3*100rpx;
margin: 0 auto; margin: 0 auto;
} }
@ -353,78 +353,78 @@
.order-details .writeOff .num { .order-details .writeOff .num {
background-color: #f0c34c; background-color: #f0c34c;
width: 5.9rem; width: 5.9*100rpx;
height: 0.84rem; height: 0.84*100rpx;
color: #282828; color: #282828;
font-size: 0.48rem; font-size: 0.48*100rpx;
margin: 0 auto; margin: 0 auto;
border-radius: 0 0 0.2rem 0.2rem; border-radius: 0 0 0.2*100rpx 0.2*100rpx;
text-align: center; text-align: center;
padding-top: 0.04rem; padding-top: 0.04*100rpx;
} }
.order-details .writeOff .rules { .order-details .writeOff .rules {
margin: 0.46rem 0.3rem 0 0.3rem; margin: 0.46*100rpx 0.3*100rpx 0 0.3*100rpx;
border-top: 0.01rem solid #f0f0f0; border-top: 0.01*100rpx solid #f0f0f0;
padding-top: 0.1rem; padding-top: 0.1*100rpx;
} }
.order-details .writeOff .rules .item { .order-details .writeOff .rules .item {
margin-top: 0.15rem; margin-top: 0.15*100rpx;
} }
.order-details .writeOff .rules .item .rulesTitle { .order-details .writeOff .rules .item .rulesTitle {
font-size: 0.28rem; font-size: 0.28*100rpx;
color: #282828; color: #282828;
} }
.order-details .writeOff .rules .item .rulesTitle .iconfont { .order-details .writeOff .rules .item .rulesTitle .iconfont {
font-size: 0.3rem; font-size: 0.3*100rpx;
color: #333; color: #333;
margin-right: 0.08rem; margin-right: 0.08*100rpx;
margin-top: 0.05rem; margin-top: 0.05*100rpx;
} }
.order-details .writeOff .rules .item .info { .order-details .writeOff .rules .item .info {
font-size: 0.28rem; font-size: 0.28*100rpx;
color: #999; color: #999;
margin-top: 0.05rem; margin-top: 0.05*100rpx;
} }
.order-details .writeOff .rules .item .info .time { .order-details .writeOff .rules .item .info .time {
margin-left: 0.2rem; margin-left: 0.2*100rpx;
} }
.order-details .map { .order-details .map {
height: 0.86rem; height: 0.86*100rpx;
font-size: 0.3rem; font-size: 0.3*100rpx;
color: #282828; color: #282828;
line-height: 0.86rem; line-height: 0.86*100rpx;
border-bottom: 0.01rem solid #f0f0f0; border-bottom: 1rpx solid #f0f0f0;
margin-top: 0.13rem; margin-top: 0.13*100rpx;
background-color: #fff; background-color: #fff;
padding: 0 0.3rem; padding: 0 0.3*100rpx;
} }
.order-details .map .place { .order-details .map .place {
font-size: 0.26rem; font-size: 0.26*100rpx;
width: 1.76rem; width: 1.76*100rpx;
height: 0.5rem; height: 0.5*100rpx;
border-radius: 0.25rem; border-radius: 0.25*100rpx;
line-height: 0.5rem; line-height: 0.5*100rpx;
text-align: center; text-align: center;
} }
.order-details .map .place .iconfont { .order-details .map .place .iconfont {
font-size: 0.27rem; font-size: 0.27*100rpx;
height: 0.27rem; height: 0.27*100rpx;
line-height: 0.27rem; line-height: 0.27*100rpx;
margin: 0.02rem 0.03rem 0 0; margin: 0.02*100rpx 0.03*100rpx 0 0;
} }
.order-details .address .name .iconfont { .order-details .address .name .iconfont {
font-size: 0.34rem; font-size: 0.34*100rpx;
margin-left: 0.1rem; margin-left: 0.1*100rpx;
} }
</style> </style>
<script> <script>

2
pages/order/OrderSubmission/index.vue
Unescape View File

@ -153,7 +153,7 @@
ref="mychild"></AddressWindow> ref="mychild"></AddressWindow>
</view> </view>
</template> </template>
<style scoped> <style scoped lang="less">
.order-submission .wrapper .shipping select { .order-submission .wrapper .shipping select {
color: #999; color: #999;
padding-right: 0.15*100rpx; padding-right: 0.15*100rpx;

2
pages/orderAdmin/AdminOrderList/index.vue
Unescape View File

@ -326,5 +326,5 @@
}; };
</script> </script>
<style> <style lang="less">
</style> </style>

38
pages/orderAdmin/OrderCancellation/index.vue
Unescape View File

@ -13,54 +13,54 @@
<WriteOff :iShidden="iShidden" :orderInfo="orderInfo" @cancel="cancel" @confirm="confirm"></WriteOff> <WriteOff :iShidden="iShidden" :orderInfo="orderInfo" @cancel="cancel" @confirm="confirm"></WriteOff>
</view> </view>
</template> </template>
<style scoped> <style scoped lang="less">
.OrderCancellation .header { .OrderCancellation .header {
background: url("https://h5.dayouqiantu.cn/static/images/writeOffBg.jpg") no-repeat; background: url("https://h5.dayouqiantu.cn/static/images/writeOffBg.jpg") no-repeat;
width: 100%; width: 100%;
height: 3rem; height: 3*100rpx;
background-size: 100% 100%; background-size: 100% 100%;
} }
.OrderCancellation .whiteBg { .OrderCancellation .whiteBg {
width: 6.9rem; width: 6.9*100rpx;
background-color: #fff; background-color: #fff;
margin: -0.93rem auto 0 auto; margin: -0.93*100rpx auto 0 auto;
padding-top: 0.8rem; padding-top: 0.8*100rpx;
border-radius: 0.06rem 0.06rem 0 0; border-radius: 0.06*100rpx 0.06*100rpx 0 0;
} }
.OrderCancellation .whiteBg .input { .OrderCancellation .whiteBg .input {
width: 5.8rem; width: 5.8*100rpx;
margin: 0 auto; margin: 0 auto;
border-bottom: 0.01rem solid #eee; border-bottom: 0.01*100rpx solid #eee;
} }
.OrderCancellation .whiteBg .input input { .OrderCancellation .whiteBg .input input {
padding-bottom: 0.25rem; padding-bottom: 0.25*100rpx;
font-size: 0.6rem; font-size: 0.6*100rpx;
color: #282828; color: #282828;
width: 100%; width: 100%;
text-align: center; text-align: center;
} }
.OrderCancellation .whiteBg .bnt { .OrderCancellation .whiteBg .bnt {
font-size: 0.32rem; font-size: 0.32*100rpx;
color: #fff; color: #fff;
width: 5.8rem; width: 5.8*100rpx;
height: 0.86rem; height: 0.86*100rpx;
border-radius: 0.43rem; border-radius: 0.43*100rpx;
background-image: linear-gradient(to right, #f67a38 0%, #f11b09 100%); background-image: linear-gradient(to right, #f67a38 0%, #f11b09 100%);
background-image: -webkit-linear-gradient(to right, #f67a38 0%, #f11b09 100%); background-image: -webkit-linear-gradient(to right, #f67a38 0%, #f11b09 100%);
background-image: -moz-linear-gradient(to right, #f67a38 0%, #f11b09 100%); background-image: -moz-linear-gradient(to right, #f67a38 0%, #f11b09 100%);
text-align: center; text-align: center;
line-height: 0.86rem; line-height: 0.86*100rpx;
margin: 0.55rem auto 0 auto; margin: 0.55*100rpx auto 0 auto;
} }
.OrderCancellation .scan { .OrderCancellation .scan {
width: 3rem; width: 3*100rpx;
height: 3rem; height: 3*100rpx;
margin: 1.1rem auto 0 auto; margin: 1.1*100rpx auto 0 auto;
} }
.OrderCancellation .scan image { .OrderCancellation .scan image {

6
pages/orderAdmin/Statistics/index.vue
Unescape View File

@ -410,10 +410,10 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="less">
.echarts { .echarts {
width: 100%; width: 100%;
height: 5.5rem; height: 5.5*100rpx;
} }
.calendar-wrapper { .calendar-wrapper {
position: fixed; position: fixed;
@ -428,7 +428,7 @@ export default {
transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0);
} }
.statistical-page .wrapper .increase { .statistical-page .wrapper .increase {
font-size: 0.26rem; font-size: 0.26*100rpx;
} }
.statistical-page .wrapper .increase .iconfont { .statistical-page .wrapper .increase .iconfont {
margin-left: 0; margin-left: 0;

4
pages/shop/EvaluateList/index.vue
Unescape View File

@ -107,9 +107,9 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="less">
.noCommodity { .noCommodity {
height: 8rem; height: 8*100rpx;
background-color: #fff; background-color: #fff;
} }
</style> </style>

2
pages/shop/GoodSearch/index.vue
Unescape View File

@ -72,6 +72,6 @@ export default {
<style > <style >
.noCommodity { .noCommodity {
border-top: 0.05rem solid #f5f5f5; border-top: 0.05*100rpx solid #f5f5f5;
} }
</style> </style>

76
pages/shop/GoodsCon/index.vue
Unescape View File

@ -654,7 +654,7 @@ export default {
</script> </script>
<style scoped> <style scoped lang="less">
.geoPage { .geoPage {
position: fixed; position: fixed;
width: 100%; width: 100%;
@ -664,85 +664,85 @@ export default {
} }
.product-con .store-info { .product-con .store-info {
margin-top: 0.2rem; margin-top: 0.2*100rpx;
background-color: #fff; background-color: #fff;
} }
.product-con .store-info .title { .product-con .store-info .title {
padding: 0 0.3rem; padding: 0 0.3*100rpx;
font-size: 0.28rem; font-size: 0.28*100rpx;
color: #282828; color: #282828;
height: 0.8rem; height: 0.8*100rpx;
line-height: 0.8rem; line-height: 0.8*100rpx;
border-bottom: 0.01rem solid #f5f5f5; border-bottom: 0.01*100rpx solid #f5f5f5;
} }
.product-con .store-info .info { .product-con .store-info .info {
padding: 0 0.3rem; padding: 0 0.3*100rpx;
height: 1.26rem; height: 1.26*100rpx;
} }
.product-con .store-info .info .picTxt { .product-con .store-info .info .picTxt {
width: 6.15rem; width: 6.15*100rpx;
} }
.product-con .store-info .info .picTxt .pictrue { .product-con .store-info .info .picTxt .pictrue {
width: 0.76rem; width: 0.76*100rpx;
height: 0.76rem; height: 0.76*100rpx;
} }
.product-con .store-info .info .picTxt .pictrue image { .product-con .store-info .info .picTxt .pictrue image {
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 0.06rem; border-radius: 0.06*100rpx;
} }
.product-con .store-info .info .picTxt .text { .product-con .store-info .info .picTxt .text {
width: 5.22rem; width: 5.22*100rpx;
} }
.product-con .store-info .info .picTxt .text .name { .product-con .store-info .info .picTxt .text .name {
font-size: 0.3rem; font-size: 0.3*100rpx;
color: #282828; color: #282828;
} }
.product-con .store-info .info .picTxt .text .address { .product-con .store-info .info .picTxt .text .address {
font-size: 0.24rem; font-size: 0.24*100rpx;
color: #666; color: #666;
margin-top: 0.03rem; margin-top: 0.03*100rpx;
} }
.product-con .store-info .info .picTxt .text .address .iconfont { .product-con .store-info .info .picTxt .text .address .iconfont {
color: #707070; color: #707070;
font-size: 0.18rem; font-size: 0.18*100rpx;
margin-left: 0.1rem; margin-left: 0.1*100rpx;
} }
.product-con .store-info .info .picTxt .text .address .addressTxt { .product-con .store-info .info .picTxt .text .address .addressTxt {
width: 4.8rem; width: 4.8*100rpx;
} }
.product-con .store-info .info .iconfont { .product-con .store-info .info .iconfont {
font-size: 0.4rem; font-size: 0.4*100rpx;
} }
.product-con .superior { .product-con .superior {
background-color: #fff; background-color: #fff;
margin-top: 0.2rem; margin-top: 0.2*100rpx;
} }
.product-con .superior .title { .product-con .superior .title {
height: 0.98rem; height: 0.98*100rpx;
} }
.product-con .superior .title image { .product-con .superior .title image {
width: 0.3rem; width: 0.3*100rpx;
height: 0.3rem; height: 0.3*100rpx;
} }
.product-con .superior .title .titleTxt { .product-con .superior .title .titleTxt {
margin: 0 0.2rem; margin: 0 0.2*100rpx;
font-size: 0.3rem; font-size: 0.3*100rpx;
background-image: linear-gradient(to right, #f57a37 0%, #f21b07 100%); background-image: linear-gradient(to right, #f57a37 0%, #f21b07 100%);
background-image: -webkit-linear-gradient(to right, #f57a37 0%, #f21b07 100%); background-image: -webkit-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
background-image: -moz-linear-gradient(to right, #f57a37 0%, #f21b07 100%); background-image: -moz-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
@ -751,20 +751,20 @@ export default {
} }
.product-con .superior .slider-banner { .product-con .superior .slider-banner {
width: 6.9rem; width: 6.9*100rpx;
margin: 0 auto; margin: 0 auto;
padding-bottom: 0.2rem; padding-bottom: 0.2*100rpx;
} }
.product-con .superior .slider-banner .list { .product-con .superior .slider-banner .list {
width: 100%; width: 100%;
padding-bottom: 0.2rem; padding-bottom: 0.2*100rpx;
} }
.product-con .superior .slider-banner .list .item { .product-con .superior .slider-banner .list .item {
width: 2.15rem; width: 2.15*100rpx;
margin: 0 0.22rem 0.3rem 0; margin: 0 0.22*100rpx 0.3*100rpx 0;
font-size: 0.26rem; font-size: 0.26*100rpx;
} }
.product-con .superior .slider-banner .list .item:nth-of-type(3n) { .product-con .superior .slider-banner .list .item:nth-of-type(3n) {
@ -773,18 +773,18 @@ export default {
.product-con .superior .slider-banner .list .item .pictrue { .product-con .superior .slider-banner .list .item .pictrue {
width: 100%; width: 100%;
height: 2.15rem; height: 2.15*100rpx;
} }
.product-con .superior .slider-banner .list .item .pictrue image { .product-con .superior .slider-banner .list .item .pictrue image {
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 0.06rem; border-radius: 0.06*100rpx;
} }
.product-con .superior .slider-banner .list .item .name { .product-con .superior .slider-banner .list .item .name {
color: #282828; color: #282828;
margin-top: 0.12rem; margin-top: 0.12*100rpx;
} }
.product-con .superior .slider-banner .swiper-pagination-bullet { .product-con .superior .slider-banner .swiper-pagination-bullet {
@ -812,7 +812,7 @@ export default {
.generate-posters { .generate-posters {
width: 100%; width: 100%;
height: 1.7rem; height: 1.7*100rpx;
background-color: #fff; background-color: #fff;
position: fixed; position: fixed;
left: 0; left: 0;
@ -845,7 +845,7 @@ export default {
} }
.generate-posters .item .iconfont { .generate-posters .item .iconfont {
font-size: 0.8rem; font-size: 0.8*100rpx;
color: #5eae72; color: #5eae72;
} }

2
pages/shop/GoodsEvaluate/index.vue
Unescape View File

@ -62,7 +62,7 @@
</view> </view>
</view> </view>
</template> </template>
<style scoped> <style scoped lang="less">
.evaluate-con .score .textarea .list .pictrue.uploadBnt { .evaluate-con .score .textarea .list .pictrue.uploadBnt {
border: 1px solid #ddd; border: 1px solid #ddd;
} }

2
pages/shop/GoodsList/index.vue
Unescape View File

@ -266,7 +266,7 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="less">
.noCommodity { .noCommodity {
border-top: 3px solid #f5f5f5; border-top: 3px solid #f5f5f5;
padding-bottom: 1px; padding-bottom: 1px;

4
pages/shop/ShoppingCart/index.vue
Unescape View File

@ -124,7 +124,7 @@
</view> </view>
<Recommend></Recommend> <Recommend></Recommend>
</view> </view>
<view style="height:2.1rem"></view> <view style="height:210rpx"></view>
<view :class="['footer acea-row row-between-wrapper']" v-if="cartList.valid.length > 0"> <view :class="['footer acea-row row-between-wrapper']" v-if="cartList.valid.length > 0">
<view> <view>
<view class="select-btn"> <view class="select-btn">
@ -160,7 +160,7 @@
</view> </view>
</view> </view>
</view> </view>
<Authorization v-else /> <Authorization v-if="!$store.getters.token" />
</view> </view>
</template> </template>
<script> <script>

58
pages/shop/news/NewsDetail/index.vue
Unescape View File

@ -13,55 +13,55 @@
<view class="conter" v-html="articleInfo.content"></view> <view class="conter" v-html="articleInfo.content"></view>
</view> </view>
</template> </template>
<style scoped> <style scoped lang="less">
.newsDetail .picTxt { .newsDetail .picTxt {
width: 6.9rem; width: 6.9*100rpx;
height: 2rem; height: 2*100rpx;
border-radius: 0.2rem; border-radius: 0.2*100rpx;
border: 1px solid #e1e1e1; border: 1px solid #e1e1e1;
position: relative; position: relative;
margin: 0.3rem auto 0 auto; margin: 0.3*100rpx auto 0 auto;
} }
.newsDetail .picTxt .pictrue { .newsDetail .picTxt .pictrue {
width: 2rem; width: 2*100rpx;
height: 2rem; height: 2*100rpx;
} }
.newsDetail .picTxt .pictrue image{ .newsDetail .picTxt .pictrue image{
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 0.2rem 0 0 0.2rem; border-radius: 0.2*100rpx 0 0 0.2*100rpx;
display: block; display: block;
} }
.newsDetail .picTxt .text { .newsDetail .picTxt .text {
width: 4.6rem; width: 4.6*100rpx;
} }
.newsDetail .picTxt .text .name { .newsDetail .picTxt .text .name {
font-size: 0.3rem; font-size: 0.3*100rpx;
color: #282828; color: #282828;
} }
.newsDetail .picTxt .text .money { .newsDetail .picTxt .text .money {
font-size: 0.24rem; font-size: 0.24*100rpx;
margin-top: 0.4rem; margin-top: 0.4*100rpx;
font-weight: bold; font-weight: bold;
} }
.newsDetail .picTxt .text .money .num { .newsDetail .picTxt .text .money .num {
font-size: 0.36rem; font-size: 0.36*100rpx;
} }
.newsDetail .picTxt .text .y_money { .newsDetail .picTxt .text .y_money {
font-size: 0.26rem; font-size: 0.26*100rpx;
color: #999; color: #999;
text-decoration: line-through; text-decoration: line-through;
} }
.newsDetail .picTxt .label { .newsDetail .picTxt .label {
position: absolute; position: absolute;
background-color: #303131; background-color: #303131;
width: 1.6rem; width: 1.6*100rpx;
height: 0.5rem; height: 0.5*100rpx;
right: -0.07rem; right: -0.07*100rpx;
border-radius: 0.25rem 0 0.06rem 0.25rem; border-radius: 0.25*100rpx 0 0.06*100rpx 0.25*100rpx;
text-align: center; text-align: center;
line-height: 0.5rem; line-height: 0.5*100rpx;
bottom: 0.24rem; bottom: 0.24*100rpx;
} }
.newsDetail .picTxt .label .span { .newsDetail .picTxt .label .span {
background-image: linear-gradient(to right, #fff71e 0%, #f9b513 100%); background-image: linear-gradient(to right, #fff71e 0%, #f9b513 100%);
@ -75,20 +75,20 @@
position: absolute; position: absolute;
width: 0; width: 0;
height: 0; height: 0;
border-bottom: 0.08rem solid #303131; border-bottom: 0.08*100rpx solid #303131;
border-right: 0.08rem solid transparent; border-right: 0.08*100rpx solid transparent;
top: -0.08rem; top: -0.08*100rpx;
right: 0; right: 0;
} }
.newsDetail .bnt { .newsDetail .bnt {
color: #fff; color: #fff;
font-size: 0.3rem; font-size: 0.3*100rpx;
width: 6.9rem; width: 6.9*100rpx;
height: 0.9rem; height: 0.9*100rpx;
border-radius: 0.45rem; border-radius: 0.45*100rpx;
margin: 0.48rem auto 0 auto; margin: 0.48*100rpx auto 0 auto;
text-align: center; text-align: center;
line-height: 0.9rem; line-height: 0.9*100rpx;
} }
</style> </style>
<script> <script>

4
pages/user/ChangePassword/index.vue
Unescape View File

@ -24,9 +24,9 @@
<view class="confirmBnt bg-color-red" @click="confirm">确认修改</view> <view class="confirmBnt bg-color-red" @click="confirm">确认修改</view>
</view> </view>
</template> </template>
<style scoped> <style scoped lang="less">
.ChangePassword .phone input { .ChangePassword .phone input {
width: 2rem; width: 2*100rpx;
text-align: center; text-align: center;
} }
</style> </style>

24
pages/user/CustomerList/index.vue
Unescape View File

@ -41,24 +41,24 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="less">
.CustomerList { .CustomerList {
margin-top: 0.13rem; margin-top: 0.13*100rpx;
} }
.CustomerList .item { .CustomerList .item {
height: 1.38rem; height: 1.38*100rpx;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
padding: 0 0.24rem; padding: 0 0.24*100rpx;
background-color: #fff; background-color: #fff;
} }
.CustomerList .item .pictrue { .CustomerList .item .pictrue {
width: 0.9rem; width: 0.9*100rpx;
height: 0.9rem; height: 0.9*100rpx;
border-radius: 50%; border-radius: 50%;
border: 0.03rem solid #fff; border: 0.03*100rpx solid #fff;
box-shadow: 0 0 0.1rem 0.05rem #f3f3f3; box-shadow: 0 0 0.1*100rpx 0.05*100rpx #f3f3f3;
-webkit-box-shadow: 0 0 0.1rem 0.05rem #f3f3f3; -webkit-box-shadow: 0 0 0.1*100rpx 0.05*100rpx #f3f3f3;
-moz-box-shadow: 0 0 0.1rem 0.05rem #f3f3f3; -moz-box-shadow: 0 0 0.1*100rpx 0.05*100rpx #f3f3f3;
} }
.CustomerList .item .pictrue image{ .CustomerList .item .pictrue image{
width: 100%; width: 100%;
@ -66,8 +66,8 @@ export default {
border-radius: 50%; border-radius: 50%;
} }
.CustomerList .item .text { .CustomerList .item .text {
width: 5.82rem; width: 5.82*100rpx;
font-size: 0.32rem; font-size: 0.32*100rpx;
color: #000; color: #000;
} }
</style> </style>

50
pages/user/Recharge/index.vue
Unescape View File

@ -184,51 +184,51 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="less">
#iframe { #iframe {
display: none; display: none;
} }
.recharge { .recharge {
width: 7.03rem; width: 7.03*100rpx;
padding: 0.5rem 0.63rem 0.45rem; padding: 0.5*100rpx 0.63*100rpx 0.45*100rpx;
background-color: #fff; background-color: #fff;
margin: 0.2rem auto 0 auto; margin: 0.2*100rpx auto 0 auto;
border-radius: 0.1rem; border-radius: 0.1*100rpx;
} }
.recharge .nav { .recharge .nav {
height: 0.75rem; height: 0.75*100rpx;
line-height: 0.75rem; line-height: 0.75*100rpx;
padding: 0 1rem; padding: 0 1*100rpx;
} }
.recharge .nav .item { .recharge .nav .item {
font-size: 0.3rem; font-size: 0.3*100rpx;
color: #333; color: #333;
} }
.recharge .nav .item.on { .recharge .nav .item.on {
font-weight: bold; font-weight: bold;
border-bottom: 0.04rem solid #e83323; border-bottom: 0.04*100rpx solid #e83323;
} }
.recharge .info-wrapper { .recharge .info-wrapper {
text-align: center; text-align: center;
} }
.recharge .info-wrapper .money { .recharge .info-wrapper .money {
margin-top: 0.6rem; margin-top: 0.6*100rpx;
padding-bottom: 0.2rem; padding-bottom: 0.2*100rpx;
border-bottom: 1px dashed #ddd; border-bottom: 1px dashed #ddd;
} }
.recharge .info-wrapper .money text { .recharge .info-wrapper .money text {
font-size: 0.56rem; font-size: 0.56*100rpx;
color: #333; color: #333;
font-weight: bold; font-weight: bold;
} }
.recharge .info-wrapper .money input { .recharge .info-wrapper .money input {
display: inline-block; display: inline-block;
width: 3rem; width: 3*100rpx;
font-size: 0.84rem; font-size: 0.84*100rpx;
text-align: center; text-align: center;
color: #282828; color: #282828;
font-weight: bold; font-weight: bold;
padding-right: 0.7rem; padding-right: 0.7*100rpx;
} }
.recharge .info-wrapper .money input::placeholder { .recharge .info-wrapper .money input::placeholder {
color: #ddd; color: #ddd;
@ -246,25 +246,25 @@ export default {
color: #ddd; color: #ddd;
} }
.recharge .info-wrapper .tips { .recharge .info-wrapper .tips {
font-size: 0.26rem; font-size: 0.26*100rpx;
color: #888; color: #888;
margin: 0.25rem auto 0 auto; margin: 0.25*100rpx auto 0 auto;
line-height: 1.5; line-height: 1.5;
padding: 0 0.3rem; padding: 0 0.3*100rpx;
} }
.recharge .info-wrapper .tips text { .recharge .info-wrapper .tips text {
color: #ef4a49; color: #ef4a49;
} }
.recharge .info-wrapper .pay-btn { .recharge .info-wrapper .pay-btn {
display: block; display: block;
width: 5.5rem; width: 5.5*100rpx;
height: 0.86rem; height: 0.86*100rpx;
margin: 0.5rem auto 0 auto; margin: 0.5*100rpx auto 0 auto;
line-height: 0.86rem; line-height: 0.86*100rpx;
text-align: center; text-align: center;
color: #fff; color: #fff;
border-radius: 0.5rem; border-radius: 0.5*100rpx;
font-size: 0.3rem; font-size: 0.3*100rpx;
font-weight: bold; font-weight: bold;
} }
</style> </style>

90
pages/user/User/index.vue
Unescape View File

@ -18,12 +18,7 @@
<text>ID：{{ userInfo.uid || 0}}</text> <text>ID：{{ userInfo.uid || 0}}</text>
<text class="iconfont icon-bianji1"></text> <text class="iconfont icon-bianji1"></text>
</view> </view>
<button <button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" class="binding" v-else>
open-type="getPhoneNumber"
@getphonenumber="getPhoneNumber"
class="binding"
v-else
>
<text>绑定手机号</text> <text>绑定手机号</text>
</button> </button>
</view> </view>
@ -36,11 +31,7 @@
<text>我的余额</text> <text>我的余额</text>
<text class="num">{{ userInfo.nowMoney || 0 }}</text> <text class="num">{{ userInfo.nowMoney || 0 }}</text>
</view> </view>
<view <view @click="goUserPromotion()" class="item" v-if="userInfo.isPromoter === 1 || userInfo.statu === 2">
@click="goUserPromotion()"
class="item"
v-if="userInfo.isPromoter === 1 || userInfo.statu === 2"
>
<text>当前佣金</text> <text>当前佣金</text>
<text class="num">{{ userInfo.brokeragePrice || 0 }}</text> <text class="num">{{ userInfo.brokeragePrice || 0 }}</text>
</view> </view>
@ -65,50 +56,35 @@
<view @click="goMyOrder(0)" class="item"> <view @click="goMyOrder(0)" class="item">
<view class="pictrue"> <view class="pictrue">
<image :src="$VUE_APP_RESOURCES_URL + '/images/dfk.png'" /> <image :src="$VUE_APP_RESOURCES_URL + '/images/dfk.png'" />
<text <text class="order-status-num" v-if="userInfo.orderStatusNum.unpaidCount > 0">{{ userInfo.orderStatusNum.unpaidCount }}</text>
class="order-status-num"
v-if="userInfo.orderStatusNum.unpaidCount > 0"
>{{ userInfo.orderStatusNum.unpaidCount }}</text>
</view> </view>
<view>待付款</view> <view>待付款</view>
</view> </view>
<view @click="goMyOrder(1)" class="item"> <view @click="goMyOrder(1)" class="item">
<view class="pictrue"> <view class="pictrue">
<image :src="$VUE_APP_RESOURCES_URL+'/images/dfh.png'" /> <image :src="$VUE_APP_RESOURCES_URL+'/images/dfh.png'" />
<text <text class="order-status-num" v-if="userInfo.orderStatusNum.unshippedCount > 0">{{ userInfo.orderStatusNum.unshippedCount }}</text>
class="order-status-num"
v-if="userInfo.orderStatusNum.unshippedCount > 0"
>{{ userInfo.orderStatusNum.unshippedCount }}</text>
</view> </view>
<view>待发货</view> <view>待发货</view>
</view> </view>
<view @click="goMyOrder(2)" class="item"> <view @click="goMyOrder(2)" class="item">
<view class="pictrue"> <view class="pictrue">
<image :src="$VUE_APP_RESOURCES_URL+'/images/dsh.png'" /> <image :src="$VUE_APP_RESOURCES_URL+'/images/dsh.png'" />
<text <text class="order-status-num" v-if="userInfo.orderStatusNum.receivedCount > 0">{{ userInfo.orderStatusNum.receivedCount }}</text>
class="order-status-num"
v-if="userInfo.orderStatusNum.receivedCount > 0"
>{{ userInfo.orderStatusNum.receivedCount }}</text>
</view> </view>
<text>待收货</text> <text>待收货</text>
</view> </view>
<view @click="goMyOrder(3)" class="item"> <view @click="goMyOrder(3)" class="item">
<view class="pictrue"> <view class="pictrue">
<image :src="$VUE_APP_RESOURCES_URL+'/images/dpj.png'" /> <image :src="$VUE_APP_RESOURCES_URL+'/images/dpj.png'" />
<text <text class="order-status-num" v-if="userInfo.orderStatusNum.evaluatedCount > 0">{{ userInfo.orderStatusNum.evaluatedCount }}</text>
class="order-status-num"
v-if="userInfo.orderStatusNum.evaluatedCount > 0"
>{{ userInfo.orderStatusNum.evaluatedCount }}</text>
</view> </view>
<text>待评价</text> <text>待评价</text>
</view> </view>
<view @click="goReturnList()" class="item"> <view @click="goReturnList()" class="item">
<view class="pictrue"> <view class="pictrue">
<image :src="$VUE_APP_RESOURCES_URL+'/images/sh.png'" /> <image :src="$VUE_APP_RESOURCES_URL+'/images/sh.png'" />
<text <text class="order-status-num" v-if="userInfo.orderStatusNum.refundCount > 0">{{ userInfo.orderStatusNum.refundCount }}</text>
class="order-status-num"
v-if="userInfo.orderStatusNum.refundCount > 0"
>{{ userInfo.orderStatusNum.refundCount }}</text>
</view> </view>
<text>售后/退款</text> <text>售后/退款</text>
</view> </view>
@ -140,7 +116,9 @@
<!-- </view> <!-- </view>
</view>--> </view>-->
</view> </view>
<view style="text-align: center;margin-top: 1rem">By@意象</view> <view class="by">
<text class="by-text">By@意象</text>
</view>
<view class="footer-line-height"></view> <view class="footer-line-height"></view>
<!-- <SwitchWindow <!-- <SwitchWindow
v-on:changeswitch="changeswitch" v-on:changeswitch="changeswitch"
@ -148,15 +126,24 @@
:login_type="userInfo.login_type" :login_type="userInfo.login_type"
></SwitchWindow> --> ></SwitchWindow> -->
</view> </view>
<Authorization v-else /> <Authorization v-if="!$store.getters.token" />
</view> </view>
</template> </template>
<script> <script>
import { getUser, getMenuUser, bindingPhone } from "@/api/user"; import {
import { isWeixin, VUE_APP_RESOURCES_URL } from "@/utils"; getUser,
getMenuUser,
bindingPhone
} from "@/api/user";
import {
isWeixin,
VUE_APP_RESOURCES_URL
} from "@/utils";
import SwitchWindow from "@/components/SwitchWindow"; import SwitchWindow from "@/components/SwitchWindow";
import Authorization from "@/pages/authorization/index"; import Authorization from "@/pages/authorization/index";
import { mapGetters } from "vuex"; import {
mapGetters
} from "vuex";
const NAME = "User"; const NAME = "User";
@ -319,21 +306,21 @@ export default {
}; };
</script> </script>
<style> <style lang="less">
.footer-line-height { .footer-line-height {
height: 1rem; height: 1*100rpx;
} }
.order-status-num { .order-status-num {
min-width: 0.33rem; min-width: 0.33*100rpx;
background-color: #fff; background-color: #fff;
color: #73cbb6; color: #73cbb6;
border-radius: 15px; border-radius: 15px;
position: absolute; position: absolute;
right: -0.14rem; right: -0.14*100rpx;
top: -0.15rem; top: -0.15*100rpx;
font-size: 0.2rem; font-size: 0.2*100rpx;
padding: 0 0.08rem; padding: 0 0.08*100rpx;
border: 1px solid #73cbb6; border: 1px solid #73cbb6;
} }
@ -342,18 +329,27 @@ export default {
} }
.switch-h5 { .switch-h5 {
margin-left: 0.2rem; margin-left: 0.2*100rpx;
} }
.binding { .binding {
margin-top: 0.1rem; margin-top: 0.1*100rpx;
display: inline-block; display: inline-block;
padding: 0.05rem 0.2rem; padding: 0.05*100rpx 0.2*100rpx;
background-color: #ca1f10; background-color: #ca1f10;
border-radius: 50px; border-radius: 50px;
font-size: 0.22rem; font-size: 0.22*100rpx;
line-height: 1.5; line-height: 1.5;
border: 1px solid #e8695e; border: 1px solid #e8695e;
color: #ffffff; color: #ffffff;
} }
.by{
text-align:center;
margin-top: 30rpx
}
.by-text{
text-align:center;
font-size: 30rpx;
}
</style> </style>

2
pages/user/UserVip/index.vue
Unescape View File

@ -197,7 +197,7 @@ export default {
}; };
</script> </script>
<style> <style lang="less">
.banner swiper { .banner swiper {
height: 328rpx; height: 328rpx;
} }

2
pages/user/address/AddressManagement/index.vue
Unescape View File

@ -70,7 +70,7 @@
</view> </view>
</view> </view>
</template> </template>
<style scoped> <style scoped lang="less">
.address-management.on { .address-management.on {
background-color: #fff; background-color: #fff;
height: 100vh; height: 100vh;

2
pages/user/promotion/Poster/index.vue
Unescape View File

@ -128,7 +128,7 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped lang="less">
.distribution-posters { .distribution-posters {
height: 100%; height: 100%;
} }

2
pages/user/promotion/UserPromotion/index.vue
Unescape View File

@ -99,5 +99,5 @@ export default {
</script> </script>
<style> <style lang="less">
</style> </style>

2
pages/user/signIn/Integral/index.vue
Unescape View File

@ -160,7 +160,7 @@ export default {
} }
}; };
</script> </script>
<style> <style lang="less">
.list { .list {
} }
</style> </style>

6
pages/user/signIn/Sign/index.vue
Unescape View File

@ -97,10 +97,10 @@
<view class="mask" @touchmove.prevent :hidden="active === false"></view> <view class="mask" @touchmove.prevent :hidden="active === false"></view>
</view> </view>
</template> </template>
<style scoped> <style scoped lang="less">
.Loads .iconfont { .Loads .iconfont {
font-size: 0.25rem; font-size: 0.25*100rpx;
margin: 0.02rem 0 0 0.1rem; margin: 0.02*100rpx 0 0 0.1*100rpx;
} }
</style> </style>
<script> <script>

Write Preview
Loading…
Cancel
Save