Commit 4554ff24 authored by ZJG's avatar ZJG

1

parent a3a74b3d
...@@ -372,7 +372,7 @@ ...@@ -372,7 +372,7 @@
</view> </view>
<view class="s-c-r prices"> <view class="s-c-r prices">
<span style='margin-top: 3px;font-size: 11px;'></span> <span style='margin-top: 3px;font-size: 11px;'></span>
<span style='font-weight: bold;'>{{isdistributor==true? x.Price:x.B2CPrice}}</span> <span style='font-weight: bold;'>{{$utils.getretailer()==true? x.Price:x.B2CPrice}}</span>
<span style='margin-top: 3px;font-size: 11px;'></span> <span style='margin-top: 3px;font-size: 11px;'></span>
</view> </view>
</view> </view>
...@@ -404,7 +404,7 @@ ...@@ -404,7 +404,7 @@
</view> </view>
<view class="s-c-r prices" v-if="index==0"> <view class="s-c-r prices" v-if="index==0">
<span style='margin-top: 3px;font-size: 11px;'></span> <span style='margin-top: 3px;font-size: 11px;'></span>
<span style='font-weight: bold;'>{{isdistributor==true? x.Price:x.B2CPrice}}</span> <span style='font-weight: bold;'>{{$utils.getretailer()==true? x.Price:x.B2CPrice}}</span>
<span style='margin-top: 3px;font-size: 11px;'></span> <span style='margin-top: 3px;font-size: 11px;'></span>
</view> </view>
<view class="s-c-r sold" v-if="index==x.SiteList.length-1"> <view class="s-c-r sold" v-if="index==x.SiteList.length-1">
...@@ -565,7 +565,7 @@ ...@@ -565,7 +565,7 @@
StartDate:'', StartDate:'',
EndDate:'', EndDate:'',
}, },
isdistributor:false,
} }
...@@ -581,7 +581,6 @@ ...@@ -581,7 +581,6 @@
this.msg.ArriveCityType = this.carMsg.ArriveCityType; this.msg.ArriveCityType = this.carMsg.ArriveCityType;
this.msg.Q_Date = this.carMsg.Q_Date; this.msg.Q_Date = this.carMsg.Q_Date;
} }
this.isdistributor = this.$utils.getretailer()
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
this.gettimeList() this.gettimeList()
...@@ -851,9 +850,7 @@ ...@@ -851,9 +850,7 @@
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
// this.showAuth=false; // this.showAuth=false;
this.init(); this.init();
if(this.u.IsDistrbutorUser && this.u.IsDistrbutorUser ==1){
this.isdistributor = true
}
}, },
//关闭登录窗口 //关闭登录窗口
gbAuth(){ gbAuth(){
......
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
}) })
this.markers = []; this.markers = [];
if(this.details.type == 1){ if(this.details.type == 1){
// this.src_latitude = ((Number((this.upcar[0].Lonlat.split(',')[1])) + Number(this.upcar[this.upcar.length-1].Lonlat.split(',')[1]) )/2).toString(); // this.src_latitude = ((Number((this.upcar[0].Lonlat.split(',')[1])) + Number(this.upcar[this.upcar.length-1].Lonlat.split(',')[1]) )/2).toString();
// this.src_longitude = ((Number((this.upcar[0].Lonlat.split(',')[0])) + Number(this.upcar[this.upcar.length-1].Lonlat.split(',')[0]) )/2).toString();; // this.src_longitude = ((Number((this.upcar[0].Lonlat.split(',')[0])) + Number(this.upcar[this.upcar.length-1].Lonlat.split(',')[0]) )/2).toString();;
this.src_latitude = this.upcar[0].Lonlat.split(',')[1]; this.src_latitude = this.upcar[0].Lonlat.split(',')[1];
......
...@@ -254,6 +254,7 @@ ...@@ -254,6 +254,7 @@
} }
}, },
onLoad(options){ onLoad(options){
this.current = options.status || 0;
let currentPages = getCurrentPages(); let currentPages = getCurrentPages();
let u = "/" + currentPages[currentPages.length - 1].route; let u = "/" + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync("basedata") ? let pages = wx.getStorageSync("basedata") ?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment