1

pages/admin/business/index.vue

@@ -64,14 +64,14 @@
 						icon: 'iconfont icon-shangjiaguanli'
 					});
 				}
-				if(this.service.is_goods){
+				if(this.service.is_offline){
 					list.push({
 						title: '我要收款',
 						url: '/pages/admin/qrcode/index?mer_id=' + merId,
 						icon: 'haiyuefont haiyue-shoukuang'
 					});
 				}
-				if(this.service.is_goods){
+				if(this.service.is_offline){
 					list.push({
 						title: '基本信息',
 						url: '/pages/admin/shopInfo/index?mer_id=' + merId,

pages/shop/css/shop.css

@@ -84,7 +84,7 @@
 	font-weight: bold;
 }
 .content .content-list .list-container .list-item{
-	background-color: #F2F2F2;
+	background-color: #F9F9F9;
 	display: flex;
 	border-radius: 20rpx;
 	margin: 24rpx 28rpx;

pages/shop/index.vue

@@ -40,7 +40,8 @@
 						<view class="item-content">
 							<view class="right-center-left">
 								<view class="center-left-score">
-									<text class="iconfont icon-shitixing"></text>
+									<!-- <text class="iconfont icon-shitixing"></text>/ -->
+									<image src="@/static/images/xingxing.png" mode="" style="width: 12px;height: 12px;"></image>
 									<text>{{item.service_score}}分</text>
 								</view>
 								<view class="center-left-time" v-if="item.config&&item.config.mer_take_time">营业时间:{{item.config.mer_take_time.join('-')}}</view>
@@ -103,7 +104,6 @@
 			uni.showTabBar({animation: false});
 			let location=uni.getStorageSync('locationCity');
 			if(location){
-				console.log('location: ',location);
 				this.latitude=location.lat;
 				this.longitude=location.lon;
 				this.city=location.city;

pages/shop/search/index.vue

@@ -38,7 +38,7 @@
 			</view>
 			<!-- 商品 -->
 			<block>
-				<view v-if="!is_switch" class='list acea-row row-between-wrapper on'>
+				<view v-if="!is_switch" class='list acea-row row-between-wrapper on' style="margin-top: 0;">
 					<view class='item on' hover-class='none' v-for="(item,index) in productList" :key="index"
 					 @click="godDetail(item)">
 						<view class='pictrue on'>
@@ -74,7 +74,7 @@
 						</block>
 					</view>
 				</view>
-				<view v-else class='list'>
+				<view v-else class='list' style="margin-top: 0;">
 					<WaterfallsFlow :wfList='productList' @itemTap="godDetail" :type="1" @goShop="goShop"/>
 				</view>
 				<view class='noCommodity' v-if="productList.length==0 && where.page > 1">

pages/shop_details/index.vue

@@ -14,7 +14,8 @@
         <view class="title_right">
           <view class="txt">{{ shopInfo.mer_name }}</view>
           <view class="grade">
-            <text class="iconfont icon-shitixing"></text>
+            <!-- <text class="iconfont icon-shitixing"></text> -->
+			<image src="@/static/images/xingxing.png" mode="" style="width: 12px;height: 12px;"></image>
             <text>评分{{ shopInfo.service_score }}分</text>
           </view>
           <view class="desc" v-if="shopInfo.detail&&shopInfo.detail.promise"