main
fanfan 7 months ago
parent f19e336860
commit 096e5e0310
  1. 2
      pages/index/index.vue
  2. 2
      pages/invoice/edit.vue
  3. 186
      pages/user/index.vue

@ -868,8 +868,6 @@
},
getSuggest() {
this.LeftList = [];
this.RightList = []
//
Api.recommended().then(res => {
let arr = res.data.goodsList

@ -198,7 +198,7 @@
})
} else {
uni.showToast({
title: '请求成功无返回详情',
title: result.message,
icon: 'none',
duration: 2000
})

@ -7,7 +7,8 @@
<view class="box_1">
<image :src="$picUrl+'/static/default-logo.png'" v-if="!isLogin || !userInfo.avatar_url" class="image_2"
@click="goLogin()"></image>
<image :src="userInfo.avatar_url" @click="goJump('/pages/news1/setting')" v-else class="image_2"></image>
<image :src="userInfo.avatar_url" @click="goJump('/pages/news1/setting')" v-else class="image_2">
</image>
<view class="group_1">
<view class="image-text_1" v-if="!isLogin" @click="goLogin()">
未登录
@ -18,7 +19,8 @@
<text lines="1" class="text-group_1">{{userInfo.nick_name}}</text>
<image :src="$picUrl+'/static/user/weChat.png'" class="thumbnail_1"></image>
</button>
<view class="text-wrapper_1" :style="{'width': userInfo.user_type==20?'130rpx':'100rpx' }" v-if="isLogin" @click="wechatLogin">
<view class="text-wrapper_1" :style="{'width': userInfo.user_type==20?'130rpx':'100rpx' }"
v-if="isLogin" @click="wechatLogin">
<text lines="1" class="text_1" v-if="userInfo.user_type==40">店长</text>
<text lines="1" class="text_1" v-else-if="userInfo.user_type==30">分销</text>
<text lines="1" class="text_1" v-else-if="userInfo.user_type==20">Plus会员</text>
@ -32,12 +34,14 @@
<button open-type="contact" v-if="isLogin"></button>
</view>
<!-- / -->
<view class="group_4" @click="lookMemberCode('2')" v-if="userInfo.user_type == 20 || userInfo.user_type==40">
<view class="group_4" @click="lookMemberCode('2')"
v-if="userInfo.user_type == 20 || userInfo.user_type==40">
<image :src="$picUrl+'/static/user/code.png'" class="thumbnail_2"></image>
<text lines="1" class="text_3">会员码</text>
</view>
<!-- -->
<view class="group_5" @click="lookMemberCode('3')" v-if="userInfo.user_type == 30 || userInfo.user_type==40">
<view class="group_5" @click="lookMemberCode('3')"
v-if="userInfo.user_type == 30 || userInfo.user_type==40">
<image :src="$picUrl+'/static/user/code.png'" class="thumbnail_3"></image>
<text lines="1" class="text_4">分销码</text>
</view>
@ -529,10 +533,34 @@
<view class="price">
<text style="font-size: 20rpx;"></text>
<text style="font-weight: bold;font-size: 36rpx;">{{item.goods_price_min}}</text>
<text style="font-size: 20rpx;margin-left:10rpx;">到手价</text>
<text style="font-size: 20rpx;margin-left:10rpx;"></text>
<text
style="color: #949494;font-size: 22rpx;text-decoration: line-through;">{{item.line_price_min}}</text>
</view>
<view class="goodsInfo1">
<view class="oneTip">
{{item.cmmdty_model}}
</view>
</view>
<view class="goodsSend">
<view class="sendLeft">
<view class="left_1">
{{item.goods_source}}
</view>
<view class="left_2">
{{Number(item.discount)}}
</view>
</view>
<view class="sendRight">
<text v-if="item.delivery_time==0">24小时内发货</text>
<text v-if="item.delivery_time==1">48小时内发货</text>
<text v-if="item.delivery_time==2">72小时内发货</text>
<text v-if="item.delivery_time==3">7天内发货</text>
<text v-if="item.delivery_time==4">15天内发货</text>
<text v-if="item.delivery_time==5">30天内发货</text>
<text v-if="item.delivery_time==6">45天内发货</text>
</view>
</view>
<!-- <view class="comment">
<text>{{item.goods_sales}}条评论</text>
<text style="margin-left:20rpx;">{{item.remaizhishu}}%好评率</text>
@ -547,7 +575,8 @@
</view>
<view class="memberCode" v-if="memberCode" @click="memberCode=false">
<view class="codeMain1" v-if="lookMemberType == 2">
<image class="bg" :show-menu-by-longpress="true" src="https://www.royaum.com.cn/static/1@2x.png"></image>
<image class="bg" :show-menu-by-longpress="true" src="https://www.royaum.com.cn/static/1@2x.png">
</image>
<image class="code" :show-menu-by-longpress="true" :src="qrcode"></image>
<view class="btn" @click.stop="goMember('hy')"></view>
<!-- <view class="myCode">
@ -563,7 +592,8 @@
</view> -->
</view>
<view class="codeMain2" v-if="lookMemberType == 3">
<image class="bg" :show-menu-by-longpress="true" src="https://www.royaum.com.cn/static/2@2x.png"></image>
<image class="bg" :show-menu-by-longpress="true" src="https://www.royaum.com.cn/static/2@2x.png">
</image>
<image class="code" :show-menu-by-longpress="true" :src="qrcode"></image>
<view class="btn" @click.stop="goMember('fx')"></view>
</view>
@ -607,14 +637,14 @@
}
},
onShow(options) {
if(uni.getStorageSync("userInfo").user_id){
if (uni.getStorageSync("userInfo").user_id) {
this.isLogin = true
this.onRefreshPage()
}else{
} else {
this.userInfo = {}
this.isLogin = false
this.actionCountsInfo={}
this.orderTodoInfo={
this.actionCountsInfo = {}
this.orderTodoInfo = {
distribution_order: {},
goods_order: {},
service_order: {},
@ -660,7 +690,9 @@
},
headImgUpload(avatarUrl) {
const app = this
const imageList=[{path: avatarUrl}]
const imageList = [{
path: avatarUrl
}]
//
return new Promise((resolve, reject) => {
if (imageList.length > 0) {
@ -966,6 +998,96 @@
}
</script>
<style lang="scss" scoped>
.goodsInfo1 {
display: flex;
align-items: center;
margin-bottom: 10rpx;
.oneTip {
padding: 0 16rpx;
height: 42rpx;
background: #F6F6F6;
border-radius: 10rpx 10rpx 10rpx 10rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
font-size: 24rpx;
color: #333333;
line-height: 42rpx;
text-align: left;
font-style: normal;
text-transform: none;
margin-top: 6rpx;
max-width: 300rpx;
display: -webkit-box;
-webkit-box-orient: vertical;
overflow: hidden;
-webkit-line-clamp: 1;
white-space: nowrap;
}
}
.goodsSend {
display: flex;
justify-content: space-between;
align-items: center;
.sendLeft {
width: 120rpx;
border: 1rpx solid #F21A1C;
border-radius: 10rpx;
height: 42rpx;
display: flex;
justify-content: space-between;
align-items: center;
.left_1 {
height: 100%;
width: 50rpx;
line-height: 36.5rpx;
font-family: PingFang SC, PingFang SC;
font-weight: bold;
font-size: 30rpx;
color: #F21A1C;
text-align: center;
}
.left_2 {
height: 100%;
width: 70rpx;
background-color: #F21A1C;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
font-size: 24rpx;
color: #FFFFFF;
line-height: 36rpx;
text-align: center;
font-style: normal;
text-transform: none;
}
}
.sendRight {
height: 42rpx;
background: #FDEDED;
padding: 0 10rpx;
border-radius: 10rpx 10rpx 10rpx 10rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
font-size: 24rpx;
color: #F21A1C;
line-height: 42rpx;
text-align: left;
font-style: normal;
text-transform: none;
}
}
.delPrice {
font-size: 20rpx;
font-weight: 500;
color: #F21A1C;
}
.page {
background-color: rgba(247, 248, 250, 1.000000);
position: relative;
@ -1062,13 +1184,17 @@
.name {
margin-left: 6rpx;
font-size: 24rpx;
font-weight: 400;
color: #1E1E1E;
flex: 1;
font-weight: bold;
font-size: 30rpx;
flex: 1;
display: -webkit-box;
-webkit-box-orient: vertical;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
-webkit-line-clamp: 2;
height: 90rpx;
line-height: 45rpx;
}
}
@ -1144,7 +1270,8 @@
flex-direction: column;
justify-content: space-between;
margin: 2rpx 0 0 24rpx;
button:after{
button:after {
border: none !important;
}
}
@ -2097,15 +2224,18 @@
display: flex;
align-items: center;
justify-content: center;
.codeMain1{
.codeMain1 {
width: 702rpx;
height: 702rpx;
position: relative;
.bg{
.bg {
width: 100%;
height: 100%;
}
.code{
.code {
width: 170rpx;
height: 170rpx;
border-radius: 50%;
@ -2114,7 +2244,8 @@
bottom: 55rpx;
z-index: 2;
}
.btn{
.btn {
width: 220rpx;
height: 50rpx;
position: absolute;
@ -2124,15 +2255,18 @@
z-index: 3;
}
}
.codeMain2{
.codeMain2 {
width: 702rpx;
height: 889rpx;
position: relative;
.bg{
.bg {
width: 100%;
height: 100%;
}
.code{
.code {
width: 150rpx;
height: 150rpx;
border-radius: 50%;
@ -2142,7 +2276,8 @@
margin-left: -75rpx;
z-index: 2;
}
.btn{
.btn {
width: 400rpx;
height: 50rpx;
position: absolute;
@ -2152,6 +2287,7 @@
z-index: 3;
}
}
.codeMain {
width: 560rpx;
height: 714rpx;

Loading…
Cancel
Save