Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

components/store/index.vue

@@ -93,6 +93,18 @@ export default {
 			this.currentList = this.goods.catList[i].goodsList;
 			this.activeKey = i;
 		}
+	},
+	watch:{
+		goods:{
+			handler(newValue,oldValue){
+				if (this.goods.showCat) {
+					this.currentList = newValue.catList[0].goodsList;
+				} else {
+					this.currentList = newValue.list;
+				}
+			},
+			deep:true
+		}
 	}
 };
 </script>

components/store/store.vue

@@ -83,7 +83,7 @@
 			return {
 				windowWidth: 0,
 				posiTop: 0,
-				storeinfo: {},
+				// storeinfo: {},
 				position:'',
 			}
 		},
@@ -92,19 +92,6 @@
 		methods:{
 			goUrl(){
 				
-			},
-			getCurrentStore(){
-				this.request2(
-				  {
-				    url: "/api/AppletStores/GetCurrentStore",
-				    data: {storeId:0,position:this.position},
-				  },
-				  (res) => {
-					  if(res.data && res.data.storeinfo){
-						  this.storeinfo = res.data.storeinfo
-					  }
-				  }
-				);
 			},
 			goStorelist(){//门店选择
 				uni.navigateTo({

pages/reserve/storeList.vue

@@ -21,7 +21,7 @@
 									{{c.Name}} 
 								</view>
 								<view class="c-t-r">
-									距离：{{c.KM>=1000?(c.KM/1000).toFixed(2)+'km':c.KM+'m'}}
+									距离：{{c.KM>1?c.KM+'km':(c.KM*1000)+'m'}}
 								</view>
 							</view>
 							<view class="address">