Compare commits
No commits in common. "bac6a56c2e841cff802dae24624a860186d79f32" and "7948826a2ab8132c96e28515ea45df44aa1961c3" have entirely different histories.
bac6a56c2e
...
7948826a2a
|
|
@ -50,7 +50,7 @@
|
|||
"quickapp" : {},
|
||||
/* 小程序特有相关 */
|
||||
"mp-weixin" : {
|
||||
"appid" : "wx2128cb0ee735d71a",
|
||||
"appid" : "",
|
||||
"setting" : {
|
||||
"urlCheck" : false
|
||||
},
|
||||
|
|
|
|||
|
|
@ -32,15 +32,13 @@
|
|||
</view>
|
||||
<view class="textA">
|
||||
<view class="money">
|
||||
￥{{item.price}}
|
||||
|
||||
￥{{item.price_text}}
|
||||
</view>
|
||||
<view class="btn" v-if="item.customized==1">
|
||||
可定制
|
||||
</view>
|
||||
</view>
|
||||
<view class="memberPrice" v-if="ifMember && ifMemberPrice && item.vip_price">
|
||||
会员价：￥{{item.vip_price}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<uni-load-more :status="moreState"></uni-load-more>
|
||||
|
|
@ -73,18 +71,14 @@
|
|||
size: 10,
|
||||
is_home: 0,
|
||||
},
|
||||
ifMember:false,
|
||||
ifMemberPrice:false
|
||||
|
||||
}
|
||||
},
|
||||
onLoad() {
|
||||
this.getNavData()
|
||||
|
||||
},
|
||||
onShow() {
|
||||
this.ifMember = uni.getStorageSync('ifMember');
|
||||
this.ifMemberPrice = uni.getStorageSync('ifMemberPrice');
|
||||
},
|
||||
|
||||
methods: {
|
||||
|
||||
|
||||
|
|
@ -320,13 +314,12 @@
|
|||
}
|
||||
.classifyConList .list {
|
||||
width: 276rpx;
|
||||
/* height: 373rpx; */
|
||||
height: 373rpx;
|
||||
margin-top: 30rpx;
|
||||
margin-right: 28rpx;
|
||||
position: relative;
|
||||
border-radius: 30rpx;
|
||||
background-color: #FFFFFF;
|
||||
padding-bottom: 20rpx;
|
||||
}
|
||||
|
||||
.classifyConList .list:nth-child(2n) {
|
||||
|
|
@ -349,7 +342,6 @@
|
|||
-webkit-box-orient: vertical;
|
||||
font-size: 24rpx;
|
||||
margin-top: 15rpx;
|
||||
height: 90rpx;
|
||||
line-height: 44rpx;
|
||||
padding: 0 12rpx;
|
||||
font-weight: bold;
|
||||
|
|
@ -363,9 +355,9 @@
|
|||
box-sizing: border-box;
|
||||
width: 100%;
|
||||
align-items: center;
|
||||
/* position: absolute;
|
||||
position: absolute;
|
||||
left: 0rpx;
|
||||
bottom: 32rpx; */
|
||||
bottom: 32rpx;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
|
|
@ -393,8 +385,4 @@
|
|||
line-height: 28rpx;
|
||||
background-color: #D33333;
|
||||
}
|
||||
|
||||
.memberPrice{
|
||||
font-size: 28rpx;font-weight: bold;padding-left: 20rpx;margin-top: 10rpx;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -18,9 +18,8 @@
|
|||
<view class="dz" v-if="item.customized==1">
|
||||
可定制
|
||||
</view>
|
||||
<view class="money" style="display: flex;">
|
||||
<text >￥</text>{{ commodityData.detail.price}}
|
||||
<view v-if="ifMember && ifMemberPrice && commodityData.detail.vip_price" style="margin-left: 40rpx;">会员价：<text >￥</text> {{ commodityData.detail.vip_price}}</view>
|
||||
<view class="money">
|
||||
<text >￥</text>{{ commodityData.detail.price_text}}
|
||||
</view>
|
||||
<view class="specification" @click="specificationFun()">
|
||||
<view class="text">
|
||||
|
|
@ -67,15 +66,14 @@
|
|||
</view>
|
||||
<view class="textA">
|
||||
<view class="money">
|
||||
<text >￥</text>{{item.price}}
|
||||
|
||||
<text >￥</text>{{item.price_text}}
|
||||
</view>
|
||||
<view class="btn" v-if="item.customized==1">
|
||||
可定制
|
||||
</view>
|
||||
</view>
|
||||
<view class="memberPrice" v-if="ifMember && ifMemberPrice && item.vip_price">
|
||||
会员价：￥{{item.vip_price}}
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
|
|
@ -90,10 +88,9 @@
|
|||
<view class="popup" :class="popupState?'popupB':''">
|
||||
<image class="imgGb" @click="specificationFunState()" src="../../static/47.png" mode=""></image>
|
||||
<view class="popupTitle">
|
||||
<image class="img" @click="previewImg(commodityData.sku[current].picture || commodityData.detail.cover)" :src="commodityData.sku[current].picture || commodityData.detail.cover" mode="aspectFill"></image>
|
||||
<image class="img" @click="previewImg(commodityData.detail.cover)" :src="commodityData.detail.cover" mode="aspectFill"></image>
|
||||
<view class="money" v-if="money">
|
||||
<text >￥</text> {{money}}
|
||||
<view v-if="ifMember && ifMemberPrice && vip_price" style="margin-left: 40rpx;margin-bottom: 10rpx;">会员价：<text >￥</text> {{vip_price}}</view>
|
||||
</view>
|
||||
<view class="money textmoney" v-else>
|
||||
暂无报价
|
||||
|
|
@ -130,17 +127,9 @@
|
|||
indicatorDots: true,
|
||||
commodityData:{},
|
||||
money:"",
|
||||
vip_price:"",
|
||||
popupState:false,
|
||||
ifMember:false,
|
||||
ifMemberPrice:false,
|
||||
current:0
|
||||
popupState:false
|
||||
}
|
||||
},
|
||||
onShow() {
|
||||
this.ifMember = uni.getStorageSync('ifMember');
|
||||
this.ifMemberPrice = uni.getStorageSync('ifMemberPrice');
|
||||
},
|
||||
onLoad(option) {
|
||||
this.id=option.id
|
||||
this.getData()
|
||||
|
|
@ -151,10 +140,10 @@
|
|||
phoneNumber: this.commodityData.purchase_phone //仅为示例
|
||||
});
|
||||
},
|
||||
|
||||
specificationFun(){
|
||||
this.popupState=true
|
||||
this.money=this.commodityData.sku[0].price
|
||||
this.vip_price=this.commodityData.sku[0].vip_price
|
||||
this.popupState=true
|
||||
this.money=this.commodityData.sku[0].price_text
|
||||
for (var i = 0; i < this.commodityData.sku.length; i++) {
|
||||
this.commodityData.sku[i].state=false
|
||||
}
|
||||
|
|
@ -177,11 +166,10 @@
|
|||
for (var i = 0; i < this.commodityData.sku.length; i++) {
|
||||
this.commodityData.sku[i].state=false
|
||||
}
|
||||
this.commodityData.sku[index].state =true
|
||||
this.money=this.commodityData.sku[index].price;
|
||||
this.vip_price = this.commodityData.sku[index].vip_price;
|
||||
this.current = index;
|
||||
this.commodityData.sku=[...this.commodityData.sku]
|
||||
this.commodityData.sku[index].state =true
|
||||
this.money=this.commodityData.sku[index].price_text
|
||||
|
||||
this.commodityData.sku=[...this.commodityData.sku]
|
||||
},
|
||||
details(id) {
|
||||
uni.navigateTo({
|
||||
|
|
@ -427,11 +415,10 @@
|
|||
|
||||
.classifyConList .list {
|
||||
width: 320rpx;
|
||||
/* height: 433rpx; */
|
||||
height: 433rpx;
|
||||
margin-top: 30rpx;
|
||||
border-radius: 30rpx;
|
||||
background-color: #FFFFFF;
|
||||
padding-bottom: 30rpx;
|
||||
}
|
||||
|
||||
.classifyConList .list .img {
|
||||
|
|
@ -485,7 +472,4 @@
|
|||
line-height: 58rpx;
|
||||
|
||||
}
|
||||
.memberPrice{
|
||||
font-size: 28rpx;font-weight: bold;padding-left: 20rpx;margin-top: 10rpx;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -35,11 +35,8 @@
|
|||
</view>
|
||||
|
||||
<view class="money">
|
||||
<view class="moneyNum" style="display: flex;">
|
||||
<text >￥</text>{{item.price}}
|
||||
<view v-if="ifMember && ifMemberPrice && item.vip_price">
|
||||
<text style="margin-left: 40rpx;">会员价：￥</text>{{item.vip_price}}
|
||||
</view>
|
||||
<view class="moneyNum">
|
||||
<text >￥</text>{{item.price_text}}
|
||||
</view>
|
||||
<view class="btn" v-if="item.customized==1">
|
||||
可定制
|
||||
|
|
@ -77,22 +74,14 @@
|
|||
page: 1,
|
||||
size: 10,
|
||||
is_home: 1,
|
||||
},
|
||||
ifMember:false,
|
||||
ifMemberPrice:false
|
||||
}
|
||||
}
|
||||
},
|
||||
onShow() {
|
||||
this.ifMember = uni.getStorageSync('ifMember');
|
||||
this.ifMemberPrice = uni.getStorageSync('ifMemberPrice');
|
||||
},
|
||||
onLoad() {
|
||||
if(uni.getStorageSync('userData')) {
|
||||
this.getbannerData()
|
||||
this.getNavData()
|
||||
}
|
||||
this.getUserData();
|
||||
|
||||
this.getbannerData()
|
||||
this.getNavData()
|
||||
|
||||
|
||||
},
|
||||
onReachBottom() {
|
||||
this.arr.size=this.arr.size+this.num
|
||||
|
|
@ -109,37 +98,6 @@
|
|||
}
|
||||
},
|
||||
methods: {
|
||||
getUserData(){
|
||||
if(!uni.getStorageSync('userData')) {
|
||||
uni.login({
|
||||
success:(res)=> {
|
||||
console.log(res);
|
||||
this.request({
|
||||
url: this.host + "/api/user/login",
|
||||
type:"POST",
|
||||
data: {
|
||||
code: res.code,
|
||||
},
|
||||
success:(data)=>{
|
||||
uni.setStorageSync('userData',data.data.data);
|
||||
this.request({
|
||||
url: this.host + "/api/user/info",
|
||||
type: "post",
|
||||
success: (res) => {
|
||||
res.data.data.is_vip ? this.ifMember = true : this.ifMember = false;
|
||||
uni.setStorageSync('ifMember',this.ifMember);
|
||||
res.data.data.vip_switch ? this.ifSwitchMember = true : this.ifSwitchMember = false;
|
||||
uni.setStorageSync('ifMemberPrice',this.ifSwitchMember);
|
||||
}
|
||||
})
|
||||
this.getbannerData()
|
||||
this.getNavData()
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
getHomeData() {
|
||||
this.moreState="loading"
|
||||
this.request({
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<view class="imgCon">
|
||||
<image class="img" :src="userInfo.headimgurl" mode="aspectFill"></image>
|
||||
</view>
|
||||
<view class="name" v-if="userInfo.nickname">
|
||||
<view class="name">
|
||||
{{userInfo.nickname}}
|
||||
</view>
|
||||
<view class="Id" v-if="userInfo.vip_code">
|
||||
|
|
@ -83,14 +83,6 @@
|
|||
<image class="arrows" src="../../static/jt.png" mode=""></image>
|
||||
</view>
|
||||
</navigator>
|
||||
<view class="con" v-if="ifMember">
|
||||
<view class="listName">
|
||||
<view class="text">是否显示会员价</view>
|
||||
</view>
|
||||
<view class="" style="margin-right: -20rpx;">
|
||||
<switch :checked="ifSwitchMember" @change="switchMember" style="transform: scale(.7);" color="#D33333" />
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="make" v-if="memberState">
|
||||
<view class="member">
|
||||
|
|
@ -165,9 +157,7 @@
|
|||
phone: "",
|
||||
invitee: "",
|
||||
invitee_vip_code: ""
|
||||
},
|
||||
ifMember:true,//是否是会员
|
||||
ifSwitchMember:false,//是否开启显示会员价
|
||||
}
|
||||
|
||||
}
|
||||
},
|
||||
|
|
@ -186,17 +176,12 @@
|
|||
}
|
||||
},
|
||||
mounted() {
|
||||
this.ifSwitchMember = uni.getStorageSync('ifMemberPrice');
|
||||
|
||||
console.log(uni.getStorageSync('userData'))
|
||||
this.getUserData()
|
||||
|
||||
},
|
||||
methods: {
|
||||
// 是否显示会员价切换事件
|
||||
switchMember(e){
|
||||
this.ifSwitchMember = e.detail.value;
|
||||
uni.setStorageSync('ifMemberPrice',this.ifSwitchMember);
|
||||
this.changeInformation('vip_switch',this.ifSwitchMember ? 1 : 0);
|
||||
},
|
||||
getUserData(){
|
||||
this.requestToken({
|
||||
url: this.host + "/api/user/info",
|
||||
|
|
@ -204,10 +189,6 @@
|
|||
success: (res) => {
|
||||
|
||||
this.userInfo = res.data.data
|
||||
this.userInfo.is_vip ? this.ifMember = true : this.ifMember = false;
|
||||
uni.setStorageSync('ifMember',this.ifMember);
|
||||
this.userInfo.vip_switch ? this.ifSwitchMember = true : this.ifSwitchMember = false;
|
||||
uni.setStorageSync('ifMemberPrice',this.ifSwitchMember);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,15 +21,13 @@
|
|||
</view>
|
||||
<view class="textA">
|
||||
<view class="money">
|
||||
<text >￥</text>{{item.price}}
|
||||
<text >￥</text>{{item.price_text}}
|
||||
</view>
|
||||
<view class="btn" v-if="item.customized==1">
|
||||
可定制
|
||||
</view>
|
||||
</view>
|
||||
<view class="memberPrice" v-if="ifMember && ifMemberPrice && item.vip_price">
|
||||
会员价：￥{{item.vip_price}}
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
|
@ -52,18 +50,12 @@
|
|||
arr: {
|
||||
page: 1,
|
||||
size: 10,
|
||||
},
|
||||
ifMember:false,
|
||||
ifMemberPrice:false
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.customBar=uni.getStorageSync('customBar')+"rpx"
|
||||
this.customBar=uni.getStorageSync('customBar')+20+"rpx"
|
||||
},
|
||||
onShow() {
|
||||
this.ifMember = uni.getStorageSync('ifMember');
|
||||
this.ifMemberPrice = uni.getStorageSync('ifMemberPrice');
|
||||
},
|
||||
onReachBottom() {
|
||||
this.arr.size= this.arr.size+this.num
|
||||
|
||||
|
|
@ -111,6 +103,7 @@
|
|||
this.HomeData = res.data.data.list
|
||||
this.total = res.data.data.total
|
||||
if( (this.arr.page*this.arr.size) <=this.total ){
|
||||
|
||||
}else{
|
||||
this.loadState="no-more"
|
||||
|
||||
|
|
@ -132,7 +125,6 @@
|
|||
padding-right: 40rpx;
|
||||
padding-left: 40rpx;
|
||||
z-index: 2;
|
||||
padding-top: 20rpx;
|
||||
}
|
||||
.int {
|
||||
width: 670rpx;
|
||||
|
|
@ -193,12 +185,11 @@
|
|||
|
||||
.classifyConList .list {
|
||||
width: 320rpx;
|
||||
/* height: 433rpx; */
|
||||
height: 433rpx;
|
||||
margin-top: 30rpx;
|
||||
border-radius: 30rpx;
|
||||
background-color: #FFFFFF;
|
||||
position: relative;
|
||||
padding-bottom: 30rpx;
|
||||
}
|
||||
|
||||
.classifyConList .list .img {
|
||||
|
|
@ -216,7 +207,6 @@
|
|||
-webkit-box-orient: vertical;
|
||||
font-size: 28rpx;
|
||||
margin-top: 15rpx;
|
||||
height: 100rpx;
|
||||
line-height: 50rpx;
|
||||
padding: 0 12rpx;
|
||||
font-weight: bold;
|
||||
|
|
@ -227,9 +217,9 @@
|
|||
display: flex;
|
||||
margin-top: 10rpx;
|
||||
padding: 0 12rpx;
|
||||
/* position: absolute;
|
||||
position: absolute;
|
||||
bottom: 35rpx;
|
||||
left: 0rpx; */
|
||||
left: 0rpx;
|
||||
width: 100%;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
|
|
@ -252,7 +242,4 @@
|
|||
line-height: 28rpx;
|
||||
background-color: #D33333;
|
||||
}
|
||||
.memberPrice{
|
||||
font-size: 28rpx;font-weight: bold;padding-left: 20rpx;margin-top: 10rpx;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
BIN
static/23.png
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 72 KiB |
BIN
static/47.png
|
Before Width: | Height: | Size: 924 B After Width: | Height: | Size: 2.0 KiB |
BIN
static/fh.png
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 4.2 KiB |
BIN
static/fl.png
|
Before Width: | Height: | Size: 640 B After Width: | Height: | Size: 1.2 KiB |
BIN
static/fla.png
|
Before Width: | Height: | Size: 683 B After Width: | Height: | Size: 1.2 KiB |
BIN
static/gb.png
|
Before Width: | Height: | Size: 907 B After Width: | Height: | Size: 2.2 KiB |
BIN
static/grzl.png
|
Before Width: | Height: | Size: 759 B After Width: | Height: | Size: 1.0 KiB |
BIN
static/guig.png
|
Before Width: | Height: | Size: 501 B After Width: | Height: | Size: 568 B |
BIN
static/gy.png
|
Before Width: | Height: | Size: 678 B After Width: | Height: | Size: 787 B |
BIN
static/home.png
|
Before Width: | Height: | Size: 474 B After Width: | Height: | Size: 721 B |
BIN
static/homea.png
|
Before Width: | Height: | Size: 504 B After Width: | Height: | Size: 727 B |
BIN
static/hy.png
|
Before Width: | Height: | Size: 863 B After Width: | Height: | Size: 2.2 KiB |
BIN
static/index.png
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 4.5 KiB |
BIN
static/jt.png
|
Before Width: | Height: | Size: 317 B After Width: | Height: | Size: 445 B |
|
After Width: | Height: | Size: 3.9 KiB |
BIN
static/may.png
|
Before Width: | Height: | Size: 530 B After Width: | Height: | Size: 829 B |
BIN
static/my.png
|
Before Width: | Height: | Size: 508 B After Width: | Height: | Size: 835 B |
BIN
static/nz.png
|
Before Width: | Height: | Size: 712 B After Width: | Height: | Size: 892 B |
BIN
static/sq.png
|
Before Width: | Height: | Size: 524 B After Width: | Height: | Size: 1.2 KiB |
BIN
static/ss.png
|
Before Width: | Height: | Size: 629 B After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 464 B After Width: | Height: | Size: 1.3 KiB |