|
|
@ -23,15 +23,16 @@ |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view style="display: flex; flex: 1; justify-content: flex-end;"> |
|
|
|
<view style="display: flex; flex: 1; justify-content: flex-end;"> |
|
|
|
<view class="group_2" @click="goJump('/pages/news/user/message')"> |
|
|
|
<view class="group_2"> |
|
|
|
<image :src="$picUrl+'/static/home/news.png'" class="thumbnail"></image> |
|
|
|
<image :src="$picUrl+'/static/home/news.png'" class="thumbnail"></image> |
|
|
|
<text lines="1" class="text_2">消息</text> |
|
|
|
<text lines="1" class="text_2">客服</text> |
|
|
|
|
|
|
|
<button open-type="contact" v-if="isLogin"></button> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="group_4" @click="lookMemberCode('2')" v-if="userInfo.user_type== 20"> |
|
|
|
<view class="group_4" @click="lookMemberCode('2')" v-if="userInfo.user_type == 20"> |
|
|
|
<image :src="$picUrl+'/static/user/code.png'" class="thumbnail_2"></image> |
|
|
|
<image :src="$picUrl+'/static/user/code.png'" class="thumbnail_2"></image> |
|
|
|
<text lines="1" class="text_3">会员码</text> |
|
|
|
<text lines="1" class="text_3">会员码</text> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="group_5" @click="lookMemberCode('3')" v-if="userInfo.user_type== 30"> |
|
|
|
<view class="group_5" @click="lookMemberCode('3')" v-if="userInfo.user_type == 30"> |
|
|
|
<image :src="$picUrl+'/static/user/code.png'" class="thumbnail_3"></image> |
|
|
|
<image :src="$picUrl+'/static/user/code.png'" class="thumbnail_3"></image> |
|
|
|
<text lines="1" class="text_4">分销码</text> |
|
|
|
<text lines="1" class="text_4">分销码</text> |
|
|
|
</view> |
|
|
|
</view> |
|
|
@ -234,7 +235,7 @@ |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="goodsManage" v-if="isLogin == false || userInfo.user_type>= 30"> |
|
|
|
<view class="goodsManage" v-if="isLogin == false || userInfo.user_type == 30"> |
|
|
|
<view class="manageTitle"> |
|
|
|
<view class="manageTitle"> |
|
|
|
<text lines="1" class="text_5 titleLeft">分销订单</text> |
|
|
|
<text lines="1" class="text_5 titleLeft">分销订单</text> |
|
|
|
<text lines="1" class="text_6 titleRight" @click="goJump('/pages/news3/fenxiao')">查看全部</text> |
|
|
|
<text lines="1" class="text_6 titleRight" @click="goJump('/pages/news3/fenxiao')">查看全部</text> |
|
|
@ -407,7 +408,7 @@ |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
|
|
|
|
|
|
|
|
<view class="serveIcon" @click="goJump('/pages/news1/help')"> |
|
|
|
<view class="serveIcon" @click="goJump('/pages/news1/help',1)"> |
|
|
|
<image :src="$picUrl+'/static/user/help.png'" class="icons"></image> |
|
|
|
<image :src="$picUrl+'/static/user/help.png'" class="icons"></image> |
|
|
|
<view class="serveInfo"> |
|
|
|
<view class="serveInfo"> |
|
|
|
帮助中心 |
|
|
|
帮助中心 |
|
|
@ -477,14 +478,15 @@ |
|
|
|
<view class="memberCode" v-if="memberCode" @click="memberCode=false"> |
|
|
|
<view class="memberCode" v-if="memberCode" @click="memberCode=false"> |
|
|
|
<view class="codeMain"> |
|
|
|
<view class="codeMain"> |
|
|
|
<view class="myCode"> |
|
|
|
<view class="myCode"> |
|
|
|
<text v-if="userInfo.user_type==20">我的专属会员识别码</text> |
|
|
|
<text v-if="lookMemberType == 2">我的专属会员识别码</text> |
|
|
|
<text v-if="userInfo.user_type==30">我的专属分销识别码</text> |
|
|
|
<text v-if="lookMemberType == 3">我的专属分销识别码</text> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="codeImg"> |
|
|
|
<view class="codeImg"> |
|
|
|
<image src="" mode="" class="img"></image> |
|
|
|
<image v-if="lookMemberType == 2" :src="userInfo.qrcode" class="img"></image> |
|
|
|
|
|
|
|
<image v-if="lookMemberType == 3" :src="userInfo.qrcode" class="img"></image> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="codeName"> |
|
|
|
<view class="codeName"> |
|
|
|
SJIHIHOHOOHOH |
|
|
|
{{userInfo.user_id}} |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
@ -496,9 +498,11 @@ |
|
|
|
} from '@/core/app' |
|
|
|
} from '@/core/app' |
|
|
|
import * as UserApi from '@/api/user'; |
|
|
|
import * as UserApi from '@/api/user'; |
|
|
|
import * as Api from '@/api/goods' |
|
|
|
import * as Api from '@/api/goods' |
|
|
|
|
|
|
|
import { createQrCodeImg } from '@/utils/qrcode' |
|
|
|
export default { |
|
|
|
export default { |
|
|
|
data() { |
|
|
|
data() { |
|
|
|
return { |
|
|
|
return { |
|
|
|
|
|
|
|
lookMemberType: 2, |
|
|
|
isTop: false, |
|
|
|
isTop: false, |
|
|
|
background: { |
|
|
|
background: { |
|
|
|
background: 'url(https://www.royaum.com.cn/static/news/login-bg.png) center top no-repeat', |
|
|
|
background: 'url(https://www.royaum.com.cn/static/news/login-bg.png) center top no-repeat', |
|
|
@ -557,7 +561,10 @@ |
|
|
|
load: that.isFirstload |
|
|
|
load: that.isFirstload |
|
|
|
}) |
|
|
|
}) |
|
|
|
.then(result => { |
|
|
|
.then(result => { |
|
|
|
that.userInfo = result.data.userInfo |
|
|
|
let data = result.data.userInfo |
|
|
|
|
|
|
|
data.qrcode = createQrCodeImg(data.user_id, { 'size': 500 }); |
|
|
|
|
|
|
|
console.log(data) |
|
|
|
|
|
|
|
that.userInfo = data |
|
|
|
that.getOrderInfo(); |
|
|
|
that.getOrderInfo(); |
|
|
|
that.getActionCountsInfo(); |
|
|
|
that.getActionCountsInfo(); |
|
|
|
uni.setStorageSync('userInfo', that.userInfo) |
|
|
|
uni.setStorageSync('userInfo', that.userInfo) |
|
|
@ -627,13 +634,19 @@ |
|
|
|
url: "/pages/news/recycling/orderList?type=" + type |
|
|
|
url: "/pages/news/recycling/orderList?type=" + type |
|
|
|
}) |
|
|
|
}) |
|
|
|
}, |
|
|
|
}, |
|
|
|
goJump(path){ |
|
|
|
goJump(url,type){ |
|
|
|
|
|
|
|
if(type == 1){ |
|
|
|
|
|
|
|
uni.navigateTo({ |
|
|
|
|
|
|
|
url |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
return ; |
|
|
|
|
|
|
|
} |
|
|
|
if(this.isLogin == false){ |
|
|
|
if(this.isLogin == false){ |
|
|
|
this.goLogin() |
|
|
|
this.goLogin() |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
uni.navigateTo({ |
|
|
|
uni.navigateTo({ |
|
|
|
url: path |
|
|
|
url |
|
|
|
}) |
|
|
|
}) |
|
|
|
}, |
|
|
|
}, |
|
|
|
goLogin() { |
|
|
|
goLogin() { |
|
|
@ -665,6 +678,7 @@ |
|
|
|
this.goLogin() |
|
|
|
this.goLogin() |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
this.lookMemberType = val; |
|
|
|
this.memberCode = true; |
|
|
|
this.memberCode = true; |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
@ -915,6 +929,16 @@ |
|
|
|
width: 40rpx; |
|
|
|
width: 40rpx; |
|
|
|
height: 68rpx; |
|
|
|
height: 68rpx; |
|
|
|
margin: 8rpx 0 0 48rpx; |
|
|
|
margin: 8rpx 0 0 48rpx; |
|
|
|
|
|
|
|
position: relative; |
|
|
|
|
|
|
|
button{ |
|
|
|
|
|
|
|
width: 100%; |
|
|
|
|
|
|
|
height: 100%; |
|
|
|
|
|
|
|
position: absolute; |
|
|
|
|
|
|
|
left: 0; |
|
|
|
|
|
|
|
top: 0; |
|
|
|
|
|
|
|
z-index: 2; |
|
|
|
|
|
|
|
opacity: 0; |
|
|
|
|
|
|
|
} |
|
|
|
.thumbnail { |
|
|
|
.thumbnail { |
|
|
|
width: 30rpx; |
|
|
|
width: 30rpx; |
|
|
|
height: 30rpx; |
|
|
|
height: 30rpx; |
|
|
@ -965,7 +989,7 @@ |
|
|
|
text-align: left; |
|
|
|
text-align: left; |
|
|
|
white-space: nowrap; |
|
|
|
white-space: nowrap; |
|
|
|
line-height: 20rpx; |
|
|
|
line-height: 20rpx; |
|
|
|
margin-top: 8rpx; |
|
|
|
margin-top: 12rpx; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
.group_5 { |
|
|
|
.group_5 { |
|
|
@ -994,17 +1018,19 @@ |
|
|
|
text-align: left; |
|
|
|
text-align: left; |
|
|
|
white-space: nowrap; |
|
|
|
white-space: nowrap; |
|
|
|
line-height: 20rpx; |
|
|
|
line-height: 20rpx; |
|
|
|
margin-top: 8rpx; |
|
|
|
margin-top: 12rpx; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
.plus { |
|
|
|
.plus { |
|
|
|
width: 688rpx; |
|
|
|
width: 692rpx; |
|
|
|
height: 130rpx; |
|
|
|
height: 134rpx; |
|
|
|
background: linear-gradient(180deg, #FFF0DF 0%, #EFD4B4 100%); |
|
|
|
background: url('https://www.royaum.com.cn/static/bg-1.png') center top no-repeat; |
|
|
|
|
|
|
|
background-size: 100% auto; |
|
|
|
border-radius: 8rpx; |
|
|
|
border-radius: 8rpx; |
|
|
|
opacity: 1; |
|
|
|
opacity: 1; |
|
|
|
margin: 24rpx auto 92rpx; |
|
|
|
margin: 24rpx auto 0; |
|
|
|
display: flex; |
|
|
|
display: flex; |
|
|
|
|
|
|
|
position: relative; |
|
|
|
|
|
|
|
|
|
|
|
.plusLeft { |
|
|
|
.plusLeft { |
|
|
|
.leftTop { |
|
|
|
.leftTop { |
|
|
@ -1041,15 +1067,20 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
.plusLine { |
|
|
|
.plusLine { |
|
|
|
margin: 16rpx 0 0 42rpx; |
|
|
|
height: 0; |
|
|
|
width: 0rpx; |
|
|
|
position: absolute; |
|
|
|
height: 98rpx; |
|
|
|
width: 98rpx; |
|
|
|
|
|
|
|
left: 240rpx; |
|
|
|
opacity: 1; |
|
|
|
opacity: 1; |
|
|
|
border: 2rpx solid; |
|
|
|
border: 1px solid; |
|
|
|
border-image: linear-gradient(90deg, rgba(252, 234, 213, 1), rgba(241, 184, 116, 1), rgba(242, 217, 187, 1)) 2 2; |
|
|
|
border-image: linear-gradient(90deg, #fcead5, #f1b874, #f2d9bb) 2 2; |
|
|
|
|
|
|
|
transform: rotate(90deg); |
|
|
|
|
|
|
|
top: 35px; |
|
|
|
|
|
|
|
z-index: 2; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
.plusRight { |
|
|
|
.plusRight { |
|
|
|
|
|
|
|
margin-left: 100rpx; |
|
|
|
.rightTop { |
|
|
|
.rightTop { |
|
|
|
width: 280rpx; |
|
|
|
width: 280rpx; |
|
|
|
height: 40rpx; |
|
|
|
height: 40rpx; |
|
|
@ -1769,9 +1800,8 @@ |
|
|
|
.codeMain { |
|
|
|
.codeMain { |
|
|
|
width: 560rpx; |
|
|
|
width: 560rpx; |
|
|
|
height: 714rpx; |
|
|
|
height: 714rpx; |
|
|
|
background: #FFF5E8; |
|
|
|
background-image: url('https://www.royaum.com.cn/static/bg-2.png'); |
|
|
|
border-radius: 0rpx 0rpx 0rpx 0rpx; |
|
|
|
background-size: 100% 100%; |
|
|
|
opacity: 1; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
.myCode { |
|
|
|
.myCode { |
|
|
|
width: 100%; |
|
|
|
width: 100%; |
|
|
|