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

This commit is contained in:
gaoxs
2020-03-19 19:05:50 +08:00
parent 3fa8054983
commit 2a2c544991
47 changed files with 922 additions and 898 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -77,6 +77,11 @@
height: 100%;
border-radius: 0.06*100rpx;
}
.goodList .item .pictrue image {
width: 100%;
height: 100%;
border-radius: 0.06*100rpx;
}
.goodList .item .pictrue .numPic {
position: absolute;
@ -2255,12 +2260,12 @@
text-align: center;
font-size: 0.26*100rpx;
color: #aaa;
position: relative;
}
position: relative;
}
.user .wrapper .nav .item text{
display: block;
display: block;
}
.user .wrapper .nav .item~.item:after {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -41,7 +41,8 @@ export default {
this.toLaunch();
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");
// this.toLaunch();
if (this.$deviceType == 'App') {
@ -70,7 +71,7 @@ export default {
};
</script>
<style scoped>
<style scoped lang="less">
.lottie-bg {
position: fixed;
left: 0;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -56,7 +56,7 @@
></StorePoster>
</view>
</template>
<style scoped>
<style scoped lang="less">
.noscroll {
height: 100%;
overflow: hidden;
@ -215,10 +215,10 @@ export default {
});
})
.catch(err => {
uni.showToast({
title: err.msg || err.response.data.msg,
icon: 'none',
duration: 2000
uni.showToast({
title: err.msg || err.response.data.msg,
icon: 'none',
duration: 2000
});
});
}
@ -226,8 +226,8 @@ export default {
}
};
</script>
<style scoped>
<style scoped lang="less">
.product-con .nav {
padding: 0 0.2rem;
padding: 0 0.2*100rpx;
}
</style>

View File

@ -1,192 +1,213 @@
<template>
<view class="container">
<view v-if="!isAuthorization">
<view class="getUserInfo">
<text>您还未允许微信登录授权请点击下方按钮允许微信授权登录</text>
<view style="height:20rpx"></view>
<button type="primary" open-type="getUserInfo" @getuserinfo="getUserInfo">允许微信登录授权</button>
<view style="height:20rpx"></view>
<button @click="back">取消微信登录授权</button>
</view>
</view>
</view>
<view class="container">
<view v-if="!$store.getters.token&&$deviceType=='Weixin'">
<view class="getUserInfo">
<text>您还未允许微信登录授权请点击下方按钮允许微信授权登录</text>
<button type="primary" open-type="getUserInfo" @getuserinfo="getUserInfo">允许微信登录授权</button>
<view style="height:20rpx"></view>
<button @click="back">取消微信登录授权</button>
</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>
</template>
<script>
import { mapState, mapMutations, mapActions } from "vuex";
// 组件
// import request from "@//api/request";
import { wxappAuth, getUser } from "@/api/user";
import dayjs from "dayjs";
import cookie from "@/utils/store/cookie";
import { login } from "@/utils";
import {
mapState,
mapMutations,
mapActions
} from "vuex";
// 组件
// import request from "@//api/request";
import {
wxappAuth,
getUser
} from "@/api/user";
import dayjs from "dayjs";
import cookie from "@/utils/store/cookie";
import {
login
} from "@/utils";
export default {
data() {
return {};
},
computed: {
...mapState(["isAuthorization"])
},
onShow() {
this.UPDATE_AUTHORIZATIONPAGE(true);
},
onHide() {
this.UPDATE_AUTHORIZATIONPAGE(false);
this.changeAuthorization(false);
},
onUnload() {
this.UPDATE_AUTHORIZATIONPAGE(false);
this.changeAuthorization(false);
},
methods: {
...mapActions(["changeAuthorization", "setUserInfo"]),
...mapMutations(["UPDATE_AUTHORIZATIONPAGE", "CHANGE_TABTAR"]),
back() {
this.$yrouter.switchTab({
path: "/pages/home/index",
query: {}
});
},
getUserInfo(data) {
if (data.detail.errMsg == "getUserInfo:fail auth deny") {
uni.showToast({
title: "取消授权",
icon: "none",
duration: 2000
});
return;
}
uni.showLoading({
title: "登录中"
});
login({
success: () => {}
});
}
},
onUnload() {},
mounted() {}
};
export default {
data() {
return {};
},
computed: {
...mapState(["isAuthorization"])
},
onShow() {
this.UPDATE_AUTHORIZATIONPAGE(true);
},
onHide() {
this.UPDATE_AUTHORIZATIONPAGE(false);
this.changeAuthorization(false);
},
onUnload() {
this.UPDATE_AUTHORIZATIONPAGE(false);
this.changeAuthorization(false);
},
methods: {
...mapActions(["changeAuthorization", "setUserInfo"]),
...mapMutations(["UPDATE_AUTHORIZATIONPAGE", "CHANGE_TABTAR"]),
back() {
this.$yrouter.switchTab({
path: "/pages/home/index",
query: {}
});
},
getUserInfo(data) {
if (data.detail.errMsg == "getUserInfo:fail auth deny") {
uni.showToast({
title: "取消授权",
icon: "none",
duration: 2000
});
return;
}
uni.showLoading({
title: "登录中"
});
login({
success: () => {}
});
},
toLogin() {
this.$yrouter.push({
path: "/pages/user/Login/index",
query: {}
});
}
},
onUnload() {},
mounted() {}
};
</script>
<style lang="less">
.sp-cell {
height: 20rpx;
}
.sp-cell {
height: 20rpx;
}
.getUserInfo {
display: flex;
align-items: center;
flex-direction: column;
padding: 30px;
.getUserInfo {
display: flex;
align-items: center;
flex-direction: column;
padding: 30px;
p {
margin-bottom: 20px;
}
}
text {
font-size: 30rpx;
text-align: center;
margin-bottom: 20px;
}
}
.container {
flex: 1;
display: flex;
flex-direction: column;
justify-content: flex-start;
position: relative;
}
.container {
flex: 1;
display: flex;
flex-direction: column;
justify-content: flex-start;
position: relative;
}
.tab-bar {
font-size: 0;
display: flex;
align-items: center;
background: rgba(255, 255, 255, 0.9);
position: fixed;
bottom: 0;
left: 0;
right: 0;
z-index: 99;
border-top: 1px solid rgba(248, 248, 248, 1);
.tab-bar {
font-size: 0;
display: flex;
align-items: center;
background: rgba(255, 255, 255, 0.9);
position: fixed;
bottom: 0;
left: 0;
right: 0;
z-index: 99;
border-top: 1px solid rgba(248, 248, 248, 1);
.tab-bar-item {
flex: 1;
height: 49px;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
.tab-bar-item {
flex: 1;
height: 49px;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
&.active {
text {
color: #ee7559;
}
&.active {
text {
color: #ee7559;
}
.tab-bar-pic {
display: none;
background: #f9f9f9;
.tab-bar-pic {
display: none;
background: #f9f9f9;
&.active {
display: block;
}
}
}
&.active {
display: block;
}
}
}
.tab-bar-pic {
display: block;
background: #f9f9f9;
.tab-bar-pic {
display: block;
background: #f9f9f9;
&.active {
display: none;
}
}
}
&.active {
display: none;
}
}
}
.tab-bar-pic {
width: 25px;
height: 25px;
background: #f9f9f9;
.tab-bar-pic {
width: 25px;
height: 25px;
background: #f9f9f9;
image {
width: 25px;
height: 25px;
}
}
image {
width: 25px;
height: 25px;
}
}
.tab-bar-pic-active {
}
.tab-bar-pic-active {}
text {
font-size: 10px;
color: rgb(160, 160, 160);
line-height: 10px;
margin-top: 5px;
}
}
text {
font-size: 10px;
color: rgb(160, 160, 160);
line-height: 10px;
margin-top: 5px;
}
}
.tab-bar-bg {
padding-top: 46px;
width: 100%;
}
.tab-bar-bg {
padding-top: 46px;
width: 100%;
}
.view-item {
display: none;
width: 100%;
}
.view-item {
display: none;
width: 100%;
}
.view-item-active {
display: block;
}
.view-item-active {
display: block;
}
.getUserInfo {
display: flex;
align-items: center;
flex-direction: column;
padding: 30px;
.getUserInfo {
display: flex;
align-items: center;
flex-direction: column;
padding: 30px;
p {
margin-bottom: 20px;
}
}
p {
margin-bottom: 20px;
}
}
._van-dialog {
z-index: 99999999999;
}
</style>
._van-dialog {
z-index: 99999999999;
}
</style>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -13,54 +13,54 @@
<WriteOff :iShidden="iShidden" :orderInfo="orderInfo" @cancel="cancel" @confirm="confirm"></WriteOff>
</view>
</template>
<style scoped>
<style scoped lang="less">
.OrderCancellation .header {
background: url("https://h5.dayouqiantu.cn/static/images/writeOffBg.jpg") no-repeat;
width: 100%;
height: 3rem;
height: 3*100rpx;
background-size: 100% 100%;
}
.OrderCancellation .whiteBg {
width: 6.9rem;
width: 6.9*100rpx;
background-color: #fff;
margin: -0.93rem auto 0 auto;
padding-top: 0.8rem;
border-radius: 0.06rem 0.06rem 0 0;
margin: -0.93*100rpx auto 0 auto;
padding-top: 0.8*100rpx;
border-radius: 0.06*100rpx 0.06*100rpx 0 0;
}
.OrderCancellation .whiteBg .input {
width: 5.8rem;
width: 5.8*100rpx;
margin: 0 auto;
border-bottom: 0.01rem solid #eee;
border-bottom: 0.01*100rpx solid #eee;
}
.OrderCancellation .whiteBg .input input {
padding-bottom: 0.25rem;
font-size: 0.6rem;
padding-bottom: 0.25*100rpx;
font-size: 0.6*100rpx;
color: #282828;
width: 100%;
text-align: center;
}
.OrderCancellation .whiteBg .bnt {
font-size: 0.32rem;
font-size: 0.32*100rpx;
color: #fff;
width: 5.8rem;
height: 0.86rem;
border-radius: 0.43rem;
width: 5.8*100rpx;
height: 0.86*100rpx;
border-radius: 0.43*100rpx;
background-image: 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%);
text-align: center;
line-height: 0.86rem;
margin: 0.55rem auto 0 auto;
line-height: 0.86*100rpx;
margin: 0.55*100rpx auto 0 auto;
}
.OrderCancellation .scan {
width: 3rem;
height: 3rem;
margin: 1.1rem auto 0 auto;
width: 3*100rpx;
height: 3*100rpx;
margin: 1.1*100rpx auto 0 auto;
}
.OrderCancellation .scan image {
@ -151,9 +151,9 @@
});
},
openQRCode: function() {
let that = this;
let that = this;
// 这里需要调用扫码功能
}
}
};
</script>
</script>

View File

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

View File

@ -7,7 +7,7 @@
<view class="start" :class="'star' + replyData.replyStar"></view>
</view>
<view>
<text class="font-color-red">{{ replyData.replyChance || 0 }}%</text>
<text class="font-color-red">{{ replyData.replyChance || 0 }}%</text>
<text>好评率</text>
</view>
</view>
@ -22,7 +22,7 @@
class="item"
:class="currentActive === navListIndex ? 'bg-color-red' : ''"
v-if="item.num"
>
>
<text>{{ item.evaluate }}({{ item.num }})</text>
</view>
</view>
@ -107,9 +107,9 @@ export default {
}
};
</script>
<style scoped>
<style scoped lang="less">
.noCommodity {
height: 8rem;
height: 8*100rpx;
background-color: #fff;
}
</style>

View File

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

View File

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

View File

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

View File

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

View File

@ -124,7 +124,7 @@
</view>
<Recommend></Recommend>
</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>
<view class="select-btn">
@ -160,7 +160,7 @@
</view>
</view>
</view>
<Authorization v-else />
<Authorization v-if="!$store.getters.token" />
</view>
</template>
<script>

View File

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

View File

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

View File

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

View File

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

View File

@ -1,359 +1,355 @@
<template>
<view class="user">
<view v-if="userInfo.uid">
<view class="header bg-color-red acea-row row-between-wrapper">
<view class="picTxt acea-row row-between-wrapper">
<view class="pictrue">
<image :src="userInfo.avatar" />
</view>
<view class="text">
<view class="acea-row row-middle">
<view class="name line1">{{ userInfo.nickname }}</view>
<view class="member acea-row row-middle" v-if="userInfo.vip">
<image :src="userInfo.vipIcon" />
<text>{{ userInfo.vipName }}</text>
</view>
</view>
<view @click="goPersonalData()" class="id" v-if="userInfo.phone">
<text>ID{{ userInfo.uid || 0}}</text>
<text class="iconfont icon-bianji1"></text>
</view>
<button
open-type="getPhoneNumber"
@getphonenumber="getPhoneNumber"
class="binding"
v-else
>
<text>绑定手机号</text>
</button>
</view>
</view>
<text class="iconfont icon-shezhi" @click="goPersonalData()"></text>
</view>
<view class="wrapper">
<view class="nav acea-row row-middle">
<view @click="goUserAccount()" class="item">
<text>我的余额</text>
<text class="num">{{ userInfo.nowMoney || 0 }}</text>
</view>
<view
@click="goUserPromotion()"
class="item"
v-if="userInfo.isPromoter === 1 || userInfo.statu === 2"
>
<text>当前佣金</text>
<text class="num">{{ userInfo.brokeragePrice || 0 }}</text>
</view>
<view @click="goIntegral()" class="item" v-else>
<text>当前积分</text>
<text class="num">{{ userInfo.integral || 0 }}</text>
</view>
<view @click="goUserCoupon()" class="item">
<text>优惠券</text>
<text class="num">{{ userInfo.couponCount || 0 }}</text>
</view>
</view>
<view class="myOrder">
<view class="title acea-row row-between-wrapper">
<text>我的订单</text>
<text @click="goMyOrder()" class="allOrder">
<text>全部订单</text>
<text class="iconfont icon-jiantou"></text>
</text>
</view>
<view class="orderState acea-row row-middle">
<view @click="goMyOrder(0)" class="item">
<view class="pictrue">
<image :src="$VUE_APP_RESOURCES_URL + '/images/dfk.png'" />
<text
class="order-status-num"
v-if="userInfo.orderStatusNum.unpaidCount > 0"
>{{ userInfo.orderStatusNum.unpaidCount }}</text>
</view>
<view>待付款</view>
</view>
<view @click="goMyOrder(1)" class="item">
<view class="pictrue">
<image :src="$VUE_APP_RESOURCES_URL+'/images/dfh.png'" />
<text
class="order-status-num"
v-if="userInfo.orderStatusNum.unshippedCount > 0"
>{{ userInfo.orderStatusNum.unshippedCount }}</text>
</view>
<view>待发货</view>
</view>
<view @click="goMyOrder(2)" class="item">
<view class="pictrue">
<image :src="$VUE_APP_RESOURCES_URL+'/images/dsh.png'" />
<text
class="order-status-num"
v-if="userInfo.orderStatusNum.receivedCount > 0"
>{{ userInfo.orderStatusNum.receivedCount }}</text>
</view>
<text>待收货</text>
</view>
<view @click="goMyOrder(3)" class="item">
<view class="pictrue">
<image :src="$VUE_APP_RESOURCES_URL+'/images/dpj.png'" />
<text
class="order-status-num"
v-if="userInfo.orderStatusNum.evaluatedCount > 0"
>{{ userInfo.orderStatusNum.evaluatedCount }}</text>
</view>
<text>待评价</text>
</view>
<view @click="goReturnList()" class="item">
<view class="pictrue">
<image :src="$VUE_APP_RESOURCES_URL+'/images/sh.png'" />
<text
class="order-status-num"
v-if="userInfo.orderStatusNum.refundCount > 0"
>{{ userInfo.orderStatusNum.refundCount }}</text>
</view>
<text>售后/退款</text>
</view>
</view>
</view>
<view class="myService">
<view class="title acea-row row-middle">
<text>我的服务</text>
</view>
<view class="serviceList acea-row row-middle">
<template v-for="(item, MyMenusIndex) in MyMenus">
<view class="item" :key="MyMenusIndex" @click="goPages(MyMenusIndex)" v-if="item.url">
<view class="pictrue">
<image :src="item.pic" />
</view>
<view>{{ item.name }}</view>
</view>
</template>
</view>
</view>
<!--<view -->
<!--class="item"-->
<!--@click="changeswitch(true)"-->
<!--v-if="userInfo.phone && isWeixin"-->
<!--&gt;-->
<!--<view class="pictrue"><image :src="$VUE_APP_RESOURCES_URL+'/images/switch.png'" /></view>-->
<!--<view>账号切换</!--<view>-->
<!--</!--<view>-->
<!-- </view>
<view class="user">
<view v-if="userInfo.uid">
<view class="header bg-color-red acea-row row-between-wrapper">
<view class="picTxt acea-row row-between-wrapper">
<view class="pictrue">
<image :src="userInfo.avatar" />
</view>
<view class="text">
<view class="acea-row row-middle">
<view class="name line1">{{ userInfo.nickname }}</view>
<view class="member acea-row row-middle" v-if="userInfo.vip">
<image :src="userInfo.vipIcon" />
<text>{{ userInfo.vipName }}</text>
</view>
</view>
<view @click="goPersonalData()" class="id" v-if="userInfo.phone">
<text>ID{{ userInfo.uid || 0}}</text>
<text class="iconfont icon-bianji1"></text>
</view>
<button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" class="binding" v-else>
<text>绑定手机号</text>
</button>
</view>
</view>
<text class="iconfont icon-shezhi" @click="goPersonalData()"></text>
</view>
<view class="wrapper">
<view class="nav acea-row row-middle">
<view @click="goUserAccount()" class="item">
<text>我的余额</text>
<text class="num">{{ userInfo.nowMoney || 0 }}</text>
</view>
<view @click="goUserPromotion()" class="item" v-if="userInfo.isPromoter === 1 || userInfo.statu === 2">
<text>当前佣金</text>
<text class="num">{{ userInfo.brokeragePrice || 0 }}</text>
</view>
<view @click="goIntegral()" class="item" v-else>
<text>当前积分</text>
<text class="num">{{ userInfo.integral || 0 }}</text>
</view>
<view @click="goUserCoupon()" class="item">
<text>优惠券</text>
<text class="num">{{ userInfo.couponCount || 0 }}</text>
</view>
</view>
<view class="myOrder">
<view class="title acea-row row-between-wrapper">
<text>我的订单</text>
<text @click="goMyOrder()" class="allOrder">
<text>全部订单</text>
<text class="iconfont icon-jiantou"></text>
</text>
</view>
<view class="orderState acea-row row-middle">
<view @click="goMyOrder(0)" class="item">
<view class="pictrue">
<image :src="$VUE_APP_RESOURCES_URL + '/images/dfk.png'" />
<text class="order-status-num" v-if="userInfo.orderStatusNum.unpaidCount > 0">{{ userInfo.orderStatusNum.unpaidCount }}</text>
</view>
<view>待付款</view>
</view>
<view @click="goMyOrder(1)" class="item">
<view class="pictrue">
<image :src="$VUE_APP_RESOURCES_URL+'/images/dfh.png'" />
<text class="order-status-num" v-if="userInfo.orderStatusNum.unshippedCount > 0">{{ userInfo.orderStatusNum.unshippedCount }}</text>
</view>
<view>待发货</view>
</view>
<view @click="goMyOrder(2)" class="item">
<view class="pictrue">
<image :src="$VUE_APP_RESOURCES_URL+'/images/dsh.png'" />
<text class="order-status-num" v-if="userInfo.orderStatusNum.receivedCount > 0">{{ userInfo.orderStatusNum.receivedCount }}</text>
</view>
<text>待收货</text>
</view>
<view @click="goMyOrder(3)" class="item">
<view class="pictrue">
<image :src="$VUE_APP_RESOURCES_URL+'/images/dpj.png'" />
<text class="order-status-num" v-if="userInfo.orderStatusNum.evaluatedCount > 0">{{ userInfo.orderStatusNum.evaluatedCount }}</text>
</view>
<text>待评价</text>
</view>
<view @click="goReturnList()" class="item">
<view class="pictrue">
<image :src="$VUE_APP_RESOURCES_URL+'/images/sh.png'" />
<text class="order-status-num" v-if="userInfo.orderStatusNum.refundCount > 0">{{ userInfo.orderStatusNum.refundCount }}</text>
</view>
<text>售后/退款</text>
</view>
</view>
</view>
<view class="myService">
<view class="title acea-row row-middle">
<text>我的服务</text>
</view>
<view class="serviceList acea-row row-middle">
<template v-for="(item, MyMenusIndex) in MyMenus">
<view class="item" :key="MyMenusIndex" @click="goPages(MyMenusIndex)" v-if="item.url">
<view class="pictrue">
<image :src="item.pic" />
</view>
<view>{{ item.name }}</view>
</view>
</template>
</view>
</view>
<!--<view -->
<!--class="item"-->
<!--@click="changeswitch(true)"-->
<!--v-if="userInfo.phone && isWeixin"-->
<!--&gt;-->
<!--<view class="pictrue"><image :src="$VUE_APP_RESOURCES_URL+'/images/switch.png'" /></view>-->
<!--<view>账号切换</!--<view>-->
<!--</!--<view>-->
<!-- </view>
</view>-->
</view>
<view style="text-align: center;margin-top: 1rem">By@意象</view>
<view class="footer-line-height"></view>
<!-- <SwitchWindow
</view>
<view class="by">
<text class="by-text">By@意象</text>
</view>
<view class="footer-line-height"></view>
<!-- <SwitchWindow
v-on:changeswitch="changeswitch"
:switchActive="switchActive"
:login_type="userInfo.login_type"
></SwitchWindow> -->
</view>
<Authorization v-else />
</view>
</view>
<Authorization v-if="!$store.getters.token" />
</view>
</template>
<script>
import { getUser, getMenuUser, bindingPhone } from "@/api/user";
import { isWeixin, VUE_APP_RESOURCES_URL } from "@/utils";
import SwitchWindow from "@/components/SwitchWindow";
import Authorization from "@/pages/authorization/index";
import { mapGetters } from "vuex";
import {
getUser,
getMenuUser,
bindingPhone
} from "@/api/user";
import {
isWeixin,
VUE_APP_RESOURCES_URL
} from "@/utils";
import SwitchWindow from "@/components/SwitchWindow";
import Authorization from "@/pages/authorization/index";
import {
mapGetters
} from "vuex";
const NAME = "User";
const NAME = "User";
export default {
name: NAME,
components: {
SwitchWindow,
Authorization
},
props: {},
data: function() {
return {
MyMenus: [],
switchActive: false,
isWeixin: false
};
},
computed: mapGetters(["userInfo"]),
methods: {
goReturnList() {
this.$yrouter.push("/pages/order/ReturnList/index");
},
goMyOrder(type) {
this.$yrouter.push({
path: "/pages/order/MyOrder/index",
query: {
type
}
});
},
goUserCoupon() {
this.$yrouter.push("/pages/user/coupon/UserCoupon/index");
},
goIntegral() {
this.$yrouter.push("/pages/user/signIn/Integral/index");
},
goUserPromotion() {
this.$yrouter.push("/pages/user/promotion/UserPromotion/index");
},
goUserAccount() {
this.$yrouter.push({
path: "/pages/user/UserAccount/index"
});
},
goPersonalData() {
this.$yrouter.push("/pages/user/PersonalData/index");
},
getPhoneNumber: function(e) {
console.log(e.mp.detail);
// 判断一下这里是不是小程序 如果是小程序,走获取微信手机号进行绑定
if (e.mp.detail.errMsg == "getPhoneNumber:ok") {
uni.showLoading({
title: "绑定中"
});
// 获取当前环境的服务商
uni.getProvider({
service: "oauth",
success: function(res) {
console.log(res.provider);
// 此处可以排除h5
if (res.provider) {
uni.login({
success: loginRes => {
bindingPhone({
code: loginRes.code,
encryptedData: e.mp.detail.encryptedData,
iv: e.mp.detail.iv
})
.then(res => {
this.User();
uni.hideLoading();
uni.showToast({
title: res.msg,
icon: "success",
duration: 2000
});
})
.catch(error => {
uni.showToast({
title: error.msg || error.response.data.msg,
icon: "none",
duration: 2000
});
});
}
});
}
}
});
} else {
uni.showToast({
title: "已拒绝授权",
icon: "none",
duration: 2000
});
}
},
changeswitch: function(data) {
this.switchActive = data;
},
User: function() {
let that = this;
// getUser().then(res => {
// that.user = res.data;
// that.orderStatusNum = res.data.orderStatusNum;
// });
},
MenuUser: function() {
let that = this;
getMenuUser().then(res => {
that.MyMenus = res.data.routine_my_menus;
});
},
goPages: function(index) {
let url = this.MyMenus[index].uniapp_url;
if (
url === "/pages/user/promotion/UserPromotion/index" &&
this.userInfo.statu === 1
) {
if (!this.userInfo.isPromoter) {
uni.showToast({
title: "您还没有推广权限!!",
icon: "none",
duration: 2000
});
return;
}
}
export default {
name: NAME,
components: {
SwitchWindow,
Authorization
},
props: {},
data: function() {
return {
MyMenus: [],
switchActive: false,
isWeixin: false
};
},
computed: mapGetters(["userInfo"]),
methods: {
goReturnList() {
this.$yrouter.push("/pages/order/ReturnList/index");
},
goMyOrder(type) {
this.$yrouter.push({
path: "/pages/order/MyOrder/index",
query: {
type
}
});
},
goUserCoupon() {
this.$yrouter.push("/pages/user/coupon/UserCoupon/index");
},
goIntegral() {
this.$yrouter.push("/pages/user/signIn/Integral/index");
},
goUserPromotion() {
this.$yrouter.push("/pages/user/promotion/UserPromotion/index");
},
goUserAccount() {
this.$yrouter.push({
path: "/pages/user/UserAccount/index"
});
},
goPersonalData() {
this.$yrouter.push("/pages/user/PersonalData/index");
},
getPhoneNumber: function(e) {
console.log(e.mp.detail);
// 判断一下这里是不是小程序 如果是小程序,走获取微信手机号进行绑定
if (e.mp.detail.errMsg == "getPhoneNumber:ok") {
uni.showLoading({
title: "绑定中"
});
// 获取当前环境的服务商
uni.getProvider({
service: "oauth",
success: function(res) {
console.log(res.provider);
// 此处可以排除h5
if (res.provider) {
uni.login({
success: loginRes => {
bindingPhone({
code: loginRes.code,
encryptedData: e.mp.detail.encryptedData,
iv: e.mp.detail.iv
})
.then(res => {
this.User();
uni.hideLoading();
uni.showToast({
title: res.msg,
icon: "success",
duration: 2000
});
})
.catch(error => {
uni.showToast({
title: error.msg || error.response.data.msg,
icon: "none",
duration: 2000
});
});
}
});
}
}
});
} else {
uni.showToast({
title: "已拒绝授权",
icon: "none",
duration: 2000
});
}
},
changeswitch: function(data) {
this.switchActive = data;
},
User: function() {
let that = this;
// getUser().then(res => {
// that.user = res.data;
// that.orderStatusNum = res.data.orderStatusNum;
// });
},
MenuUser: function() {
let that = this;
getMenuUser().then(res => {
that.MyMenus = res.data.routine_my_menus;
});
},
goPages: function(index) {
let url = this.MyMenus[index].uniapp_url;
if (
url === "/pages/user/promotion/UserPromotion/index" &&
this.userInfo.statu === 1
) {
if (!this.userInfo.isPromoter) {
uni.showToast({
title: "您还没有推广权限!!",
icon: "none",
duration: 2000
});
return;
}
}
if (
url === "/pages/orderAdmin/OrderIndex/index" &&
!this.userInfo.adminid
) {
uni.showToast({
title: "您还不是管理员!!",
icon: "none",
duration: 2000
});
return;
}
if (
url === "/pages/orderAdmin/OrderIndex/index" &&
!this.userInfo.adminid
) {
uni.showToast({
title: "您还不是管理员!!",
icon: "none",
duration: 2000
});
return;
}
this.$yrouter.push({
path: this.MyMenus[index].uniapp_url
});
}
},
watch: {
userInfo() {
this.MenuUser();
}
},
onShow() {
console.log(this.userInfo);
if (this.$store.getters.token) {
this.User();
this.MenuUser();
this.isWeixin = isWeixin();
}
}
};
this.$yrouter.push({
path: this.MyMenus[index].uniapp_url
});
}
},
watch: {
userInfo() {
this.MenuUser();
}
},
onShow() {
console.log(this.userInfo);
if (this.$store.getters.token) {
this.User();
this.MenuUser();
this.isWeixin = isWeixin();
}
}
};
</script>
<style>
.footer-line-height {
height: 1rem;
}
<style lang="less">
.footer-line-height {
height: 1*100rpx;
}
.order-status-num {
min-width: 0.33rem;
background-color: #fff;
color: #73cbb6;
border-radius: 15px;
position: absolute;
right: -0.14rem;
top: -0.15rem;
font-size: 0.2rem;
padding: 0 0.08rem;
border: 1px solid #73cbb6;
}
.order-status-num {
min-width: 0.33*100rpx;
background-color: #fff;
color: #73cbb6;
border-radius: 15px;
position: absolute;
right: -0.14*100rpx;
top: -0.15*100rpx;
font-size: 0.2*100rpx;
padding: 0 0.08*100rpx;
border: 1px solid #73cbb6;
}
.pictrue {
position: relative;
}
.pictrue {
position: relative;
}
.switch-h5 {
margin-left: 0.2rem;
}
.switch-h5 {
margin-left: 0.2*100rpx;
}
.binding {
margin-top: 0.1rem;
display: inline-block;
padding: 0.05rem 0.2rem;
background-color: #ca1f10;
border-radius: 50px;
font-size: 0.22rem;
line-height: 1.5;
border: 1px solid #e8695e;
color: #ffffff;
}
</style>
.binding {
margin-top: 0.1*100rpx;
display: inline-block;
padding: 0.05*100rpx 0.2*100rpx;
background-color: #ca1f10;
border-radius: 50px;
font-size: 0.22*100rpx;
line-height: 1.5;
border: 1px solid #e8695e;
color: #ffffff;
}
.by{
text-align:center;
margin-top: 30rpx
}
.by-text{
text-align:center;
font-size: 30rpx;
}
</style>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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