C端调整

@@ -9,7 +9,10 @@
         <view>
         <view>
             <view class="name Semibold">{{seller.sellername}}</view>
             <view class="name Semibold">{{seller.sellername}}</view>
             <view wx:if="{{hasSlogan && seller.slogan}}" class="slogan">“{{seller.slogan}}”</view>
             <view wx:if="{{hasSlogan && seller.slogan}}" class="slogan">“{{seller.slogan}}”</view>
-            <view class="text">{{seller.cate[0].name?seller.cate[0].name+' | ':''}}{{seller.distance?('距当前位置'+seller.distance):''}}</view>
+            <view class="text flex-ll">
+                <view class="text-item" wx:if="{{seller.cate[0].name}}">{{seller.cate[0].name}}</view>
+                <view class="text-item" wx:if="{{seller.distance}}">距当前位置{{seller.distance}}</view>
+            </view>
             <view wx:if="{{hasStat}}" class="stat">
             <view wx:if="{{hasStat}}" class="stat">
                 <stat stat="{{seller.score}}"></stat>
                 <stat stat="{{seller.score}}"></stat>
             </view>
             </view>

@@ -62,6 +62,17 @@
   line-height: 40rpx;
   line-height: 40rpx;
   margin-top: 10rpx;
   margin-top: 10rpx;
 }
 }
+.seller .text .text-item{
+  text-indent: 10rpx;
+  border-left: 2rpx solid #999999;
+  padding-right: 10rpx;
+  height: 30rpx;
+  line-height: 30rpx;
+}
+.seller .text .text-item:first-child{
+  border-left-width: 0;
+  text-indent: 0;
+}
 .seller .price{
 .seller .price{
   font-size: 30rpx;
   font-size: 30rpx;
   color: #F05522;
   color: #F05522;

@@ -45,8 +45,8 @@ Component({
             success:()=>{
             success:()=>{
               console.log('wx.showModal::success,给默认坐标');
               console.log('wx.showModal::success,给默认坐标');
               this.triggerEvent("pos",{
               this.triggerEvent("pos",{
-                latitude: 39.636911,
-                longitude: 118.150591,
+                latitude: 39.6846701,
+                longitude: 118.1763001,
               });
               });
             },
             },
           })
           })
@@ -70,9 +70,11 @@ Component({
     },
     },
     _getPos(){
     _getPos(){
       return new Promise((success, fail) => {
       return new Promise((success, fail) => {
+        let rex={latitude:'',longitude:''};
         wx.getLocation({
         wx.getLocation({
           type: 'gcj02',
           type: 'gcj02',
           success: (res) => {
           success: (res) => {
+            rex=res;
             success(res)
             success(res)
           },
           },
           fail: (res) => {
           fail: (res) => {
@@ -82,6 +84,9 @@ Component({
             console.log('wx.getLocation', res)
             console.log('wx.getLocation', res)
           }
           }
         });
         });
+        setTimeout(()=>{
+          success(rex)
+        },2000)
       })
       })
     },
     },
     showModal(e){
     showModal(e){

@@ -56,13 +56,15 @@ Page({
   /**
   /**
    * 生命周期函数--监听页面显示
    * 生命周期函数--监听页面显示
    */
    */
+  hasOnShow:true,
   onShow: function () {
   onShow: function () {
     if(this.hasMore || this.data.sellers.length==0){
     if(this.hasMore || this.data.sellers.length==0){
       this.sellers=[]
       this.sellers=[]
       this.offset=1
       this.offset=1
-      this.setData({
-        sellers:[]
-      })
+      // this.setData({
+      //   sellers:[]
+      // })
+      this.hasOnShow=true;
       this.selectComponent('#getpos').getPos();
       this.selectComponent('#getpos').getPos();
     }
     }
   },
   },
@@ -130,7 +132,10 @@ Page({
         }
         }
         seller.hasFollow=true
         seller.hasFollow=true
       })
       })
-      sellers=[...this.data.sellers,...sellers]
+      if(!this.hasOnShow){
+        sellers=[...this.data.sellers,...sellers]
+      }
+      this.hasOnShow=false;
       this.setData({
       this.setData({
         sellers:sellers,
         sellers:sellers,
         hasMore:this.hasMore,
         hasMore:this.hasMore,

@@ -16,8 +16,8 @@ const renNum=function(){
 }
 }
 const cates_version='?1.1';
 const cates_version='?1.1';
 const hasSellerConcat=true;//变量存储所有商户
 const hasSellerConcat=true;//变量存储所有商户
-const def_latitude=39.63691;
-const def_longitude=118.15059;
+const def_latitude=39.684670;
+const def_longitude=118.176300;
 Page({
 Page({
 
 
   /**
   /**
@@ -365,8 +365,8 @@ Page({
     }
     }
     let markers = [];
     let markers = [];
     let param={
     let param={
-      lat: this.user.latitude,
-      lng: this.user.longitude,
+      lat: this.user.latitude==39.6846701?'':this.user.latitude,
+      lng: this.user.longitude==118.1763001?'':this.user.longitude,
       offset: 0,
       offset: 0,
       rows: 50,
       rows: 50,
       distance: 100000,
       distance: 100000,
@@ -388,11 +388,13 @@ Page({
           now_sid.push(seller.id);
           now_sid.push(seller.id);
           let hasMark=false;
           let hasMark=false;
           if(this.sellersIds._indexOf(seller.id)<0){
           if(this.sellersIds._indexOf(seller.id)<0){
-            seller.distance=parseInt(seller.distance);
-            if(seller.distance>1000){
-              seller.distance=(seller.distance/1000).toFixed(2)+'公里'
-            }else{
-              seller.distance+='米';
+            if(seller.distance){
+              seller.distance=parseInt(seller.distance);
+              if(seller.distance>1000){
+                seller.distance=(seller.distance/1000).toFixed(2)+'公里'
+              }else{
+                seller.distance+='米';
+              }
             }
             }
             if(this.hasSellerConcat){
             if(this.hasSellerConcat){
               this.sellersIds.push(seller.id);
               this.sellersIds.push(seller.id);