fd

pages/index/index.vue

@@ -97,7 +97,7 @@
 				<!-- <navigator url="/pages/edit/pro_manage/pro_manage"> -->
 				<view class="jiu_min">
 					<view>
-						<image class="img" src="/static/icon/20.png" mode=""></image>
+						<image class="img" src="/static/icon/spgl.png" mode=""></image>
 					</view>
 					<view>商品管理</view>
 				</view>
@@ -144,7 +144,7 @@
 				<navigator url="/pages/storeCategory/storeCategory?type=1">
 					<view class="jiu_min">
 						<view>
-							<image class="img" src="/static/icon/6.png" mode=""></image>
+							<image class="img" src="/static/icon/eleclass.png" mode=""></image>
 						</view>
 						<view>商品分类</view>
 					</view>
@@ -191,7 +191,7 @@
 				<navigator url="/pages/order/shopOrder">
 					<view class="jiu_min">
 						<view>
-							<image class="img" src="/static/icon/8.png" mode=""></image>
+							<image class="img" src="/static/icon/eleguanli.png" mode=""></image>
 						</view>
 						<view>订单管理</view>
 					</view>
@@ -204,7 +204,7 @@
 				<navigator url="/pages/hotelOrder/hotelOrder">
 					<view class="jiu_min">
 						<view>
-							<image class="img" src="/static/icon/8.png" mode=""></image>
+							<image class="img" src="/static/icon/eleguanli.png" mode=""></image>
 						</view>
 						<view>订单管理</view>
 					</view>
@@ -227,7 +227,7 @@
 				<navigator url="/pages/LuckDraw/homenav/homenav">
 					<view class="jiu_min">
 						<view>
-							<image class="img" src="/static/news/liwuiocn.png" mode=""></image>
+							<image class="img" src="/static/icon/liwuiocn.png" mode=""></image>
 						</view>
 						<view>抽奖活动</view>
 					</view>
@@ -245,7 +245,7 @@
 				</navigator>
 			</view>
 
-			<view class="jiu_max ">
+			<view class="jiu_max " v-if="shop_type == 'ele'">
 				<navigator url="/pages/Printer/AddPrinter">
 					<view class="jiu_min">
 						<view>
@@ -256,7 +256,7 @@
 				</navigator>
 			</view>
 
-			<view class="jiu_max " @tap="shops">
+			<view class="jiu_max " @tap="shops" v-if="shop_type == 'ele'">
 				<view class="jiu_min">
 					<view>
 						<image class="img" src="/static/news/turntable.png" mode=""></image>
@@ -265,7 +265,7 @@
 				</view>
 			</view>
 
-			<view class="jiu_max ">
+			<view class="jiu_max " v-if="shop_type == 'ele'">
 				<navigator url="/pages/deliveryCost/deliveryCost">
 					<view class="jiu_min">
 						<view>
@@ -277,7 +277,7 @@
 			</view>
 			<!-- hgService.showSafeSetting(); -->
 
-			<view class="jiu_max " v-if="is_bld">
+			<view class="jiu_max " v-if="shop_type == 'ele'&&is_bld">
 				<navigator url="/pages/eleProduct/eleProduct?edit=1">
 					<view class="jiu_min">
 						<view>
@@ -288,7 +288,7 @@
 				</navigator>
 			</view>
 
-			<view class="jiu_max " v-if="is_bld">
+			<view class="jiu_max " v-if="shop_type == 'ele'&&is_bld">
 				<navigator url="/pages/eleProduct/eleProduct?edit=2">
 					<view class="jiu_min">
 						<view>
@@ -300,9 +300,9 @@
 			</view>
 
 
-			<view class="jiu_max " @click="download" v-if="is_bld">
+			<view class="jiu_max " @click="download" v-if="shop_type == 'ele'&&is_bld">
 				<view>
-					<view class="jiu_min">
+					<view class="jiu_min"> 
 						<view>
 							<image class="img" src="/static/icon/download.png" mode=""></image>
 						</view>
@@ -313,11 +313,11 @@
 
 
 			<!-- url="/pages/publishActivities/activityList/activityList" -->
-			<view class="jiu_max ">
+			<view class="jiu_max " v-if="shop_type == 'ele'">
 				<navigator url="/pages/publishActivities/activityList/activityList">
 					<view class="jiu_min">
 						<view>
-							<image class="img" src="/static/icon/download.png" mode=""></image>
+							<image class="img" src="/static/icon/0yuan.png" mode=""></image>
 						</view>
 						<view>0元领活动</view>
 					</view>

pages/publishActivities/activityDetail/activityDetail.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="">
 			<view class="" style="text-align: center;height: 120upx;line-height: 120upx;font-weight: bold;font-size: 32upx;">
-				以有 <text style="color: #21B94C;font-size: 60upx;">{{receivePeopleNumber}}</text>人领取   还剩{{unreceivePeopleNumber}}人未领取
+				已有 <text style="color: #21B94C;font-size: 60upx;">{{receivePeopleNumber}}</text>人领取   还剩{{unreceivePeopleNumber}}人未核销
 			</view>
 		</view>
 		<view class="" style="height: 160upx;padding: 0 24upx;background-color: rgb(255, 255, 255);margin-bottom: 20upx;" v-if="getDetail.length > 0 " v-for="(item,index) in getDetail">

pages/publishActivities/activityList/activityList.vue

@@ -23,7 +23,7 @@
 						</label> -->
 						<image class="thumbnail" :src="staticUrl + item.picture" mode=""></image>
 						<view class="infobox" style="width: 70%;">
-							<view class="title oneline" style="height:40upx ;">{{item.goods_name}}</view>
+							<view class="title oneline" style="height:45upx ;">{{item.goods_name}}</view>
 							<!-- <view class="time">上架时间：{{item.create_time}}</view> -->
 							<view>
 								<view style="font-size:26rpx;font-weight:bold;">领取时间：</view>