_

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "hotel_uni",
-    "appid" : "__UNI__9140D70",
+    "appid" : "__UNI__807A871",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

pages/index/index.vue

@@ -126,6 +126,7 @@
 		<!-- 酒店推荐图片 -->
 		<view class="home-hotel-img">
 			<view class="home-hotel-img-content">
+<<<<<<< HEAD
 				<!-- <view @click="produceDetail(item.id)" class="home-hotel-img-content-item" v-for="(item,index) in goodsList" :key="index"
 					:style="{marginTop:item.marginTop || 0 }">
 					<image class="home-hotel-img-content-item-img"
@@ -135,6 +136,9 @@
 						<text class="text-top">{{item.name}}</text>
 				</view> -->
 				<view  class="home-hotel-img-content-item" v-for="(item,index) in goodsList" :key="index"
+=======
+				<view @click="produceDetail(item.id)" class="home-hotel-img-content-item" v-for="(item,index) in goodsList" :key="index"
+>>>>>>> 2ce03f3f71db2687208ef178dd9481642dc9161b
 					:style="{marginTop:item.marginTop || 0 }">
 					<image class="home-hotel-img-content-item-img"
 						:class="item.short?'home-hotel-img-content-item-img': 'home-hotel-img-content-item-img-long' "
@@ -194,7 +198,6 @@
 					<image style="width: 20rpx; height: 20rpx; " src="/static/icon/clean.png" mode="">
 				</view>
 			</view>
-
 		</uni-popup>
 		<view style="height:168rpx; background-color: #f9f9f9; "></view>
 		<tab-bar></tab-bar>
@@ -321,7 +324,11 @@
 			this.admin = this.$store.getters.userInfo
 		},
 		onLoad() {
+<<<<<<< HEAD
 			// this.getGoodsList()
+=======
+			this.getGoodsList()
+>>>>>>> 2ce03f3f71db2687208ef178dd9481642dc9161b
 			this.getAllSet()
 		},
 		methods: {