Merge branch 'master' of http://116.63.33.55/git/nazw

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/index/index.js

@@ -395,11 +395,8 @@ Page({
 		};
 		break;
 		case 3: {
-			wx.navigateToMiniProgram({
-				appId: 'wxfc86707bae655315',
-				success(res) {
-					// 打开成功
-				}
+			wx.navigateTo({
+				url: '/pages/web/web?url=' + "http://221.7.85.104:9999/zfjyjgfwpt/main/mobilepage/guidepage.html",
 			})
 		};
 		break;

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/menu/menu.wxml

@@ -1,234 +1,234 @@
 <wxs module="filter" src="./util.wxs"></wxs>
 <view>
-	<!-- 头部 -->
-	<view class="head-bg">
-		<image style="width:100%;height:100%" mode="scaleToFill" src="{{imgUrl}}index_bg.png"></image>
-	</view>
-	<!-- 弹窗 -->
-	<view class="mask" catchtouchmove="preventTouchMove" wx:if="{{showModal}}"></view>
-	<view class="evaluate" wx:if="{{showModal}}">
-		<view class="conment-release">
-			<view class="title">
-				<image src="{{baseUrl + '/' + dishesDetails.imgurl}}" alt="" class="image"></image>
-				<view class="contl">{{dishesDetails.dishesName}}</view>
-			</view>
-			<view class="score">
-				<view>评分：</view>
-				<view>
-					<image style="width: 30rpx;height: 30rpx;margin: 0 5rpx;" wx:for="{{starsList}}" wx:key="index" bindtap="chooseStars" data-index="{{index}}" src="{{item}}" alt="" />
-				</view>
-			</view>
-			<view class="message">
-				<view>评论：</view>
-				<textarea bindinput='blurEvaluation' cols="30" rows="10" placeholder="说说菜品亮点和不足吧(不少于10字)"></textarea>
-			</view>
-			<view class="upload">
-				<view style="position: relative;" wx:for="{{imgList}}" wx:key="index">
-					<image style="width: 80rpx;height: 80rpx;" src="{{item}}" alt="" />
-					<view class="uploadDelete" bindtap="deleteFile" data-index="{{index}}">X</view>
-				</view>
-				<view wx:if="{{imgList.length < 4}}" class="photo" bindtap="choosePhoto">
-					<image src="{{imgUrl}}photo.png" alt=""></image>
-					<p>上传照片</p>
-				</view>
-			</view>
-			<view class="release">
-				<view bindtap="postComment">发布</view>
-			</view>
-		</view>
-		<image src="{{imgUrl}}close.png" bindtap="closeItem" class="close"></image>
-		<!-- <button bindtap="closeItem">点我可以关掉对话框</button> -->
-	</view>
-	<!-- 弹窗结尾 -->
-	<!-- content -->
-	<view class="content">
-		<!-- title -->
-		<view class="title">
-			<view>食堂菜单</view>
-			<view style="height:100%;display: flex;align-items: center;justify-content: center;">
-				<image style="width:45rpx;height:45rpx;padding-right:5rpx;" mode="aspectFit" src="{{imgUrl}}feedback.png">
-				</image>
-				<view>反馈</view>
-			</view>
-		</view>
-		<!-- 日期 -->
-		<view class="years">{{dateStr.startWeek == dateStr.endWeek?dateStr.startWeek:dateStr.startWeek + "-" + dateStr.endWeek}}</view>
-		<view class="week">
-			<view>一</view>
-			<view>二</view>
-			<view>三</view>
-			<view>四</view>
-			<view>五</view>
-			<view>六</view>
-			<view>七</view>
-		</view>
-		<view class="date">
-			<view wx:for="{{dateStr.weekList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="{{dateSelectIndex == index?'click':''}}" bindtap="selectDate" data-item="{{index}}" style="height: 35rpx;width: 35rpx;display: flex;align-items: center;justify-content: center;border-radius: 4rpx;">{{filter.getDate(item)}}
-			</view>
-		</view>
-		<!-- tip -->
-		<view>
-			<view style="background-image: url({{imgUrl}}tips.png);" class="tips">小贴士：请在当天11点后查看菜品!</view>
-		</view>
-		<!-- 菜单 -->
-		<view class="variety">
-			<!-- 左侧时间 -->
-			<view class="time-solt">
-				<view class="taps-title">
-					<view class="{{selectTimeNode==0 ? 'click time-node' : 'time-node'}}" bindtap="tapTimeNode" data-item="{{0}}">
-						<image style="height:45rpx;width:45rpx;" src="{{imgUrl}}breakfast.png" mode="aspectFit"></image>
-						<view style="padding-left:10rpx">早餐</view>
-					</view>
-					<view class="{{selectTimeNode==1 ? 'click time-node' : 'time-node'}}" bindtap="tapTimeNode" data-item="{{1}}">
-						<image style="height:45rpx;width:45rpx;" src="{{imgUrl}}lunch.png" mode="aspectFit"></image>
-						<view style="padding-left:10rpx">中餐</view>
-					</view>
-					<view class="{{selectTimeNode==2 ? 'click time-node' : 'time-node'}}" bindtap="tapTimeNode" data-item="{{2}}">
-						<image style="height:45rpx;width:45rpx;" src="{{imgUrl}}lunch.png" mode="aspectFit"></image>
-						<view style="padding-left:10rpx">晚餐</view>
-					</view>
-					<view class="{{selectTimeNode==3 ? 'click takeout-all' : 'takeout-all'}}" bindtap="tapTimeNode" data-item="{{3}}">
-						<view class="takeout">
-							<image style="height:45rpx;width:45rpx;" src="{{imgUrl}}take_out.png" mode="aspectFit"></image>
-							<view style="padding-left:10rpx">外卖预告</view>
-						</view>
-						<view class="sale-time">
-							<view>售卖时间</view>
-							<view>{{filter.getTakeoutTime(menuOrigin)}}</view>
-							<!-- <view>节日前一天:15:30</view> -->
-						</view>
-					</view>
-				</view>
-				<!-- taps-title结尾 -->
-			</view>
-			<!-- 左侧时间结尾 -->
-			<!-- 菜品 -->
-			<view class="food-all">
-				<!-- 早餐 -->
-				<view class="food-type" wx:if="{{selectTimeNode==0}}">
-					<!-- 菜品分类 -->
-					<view wx:for="{{menuCanteen.breakfastCanteen}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="food-width">
-						<view class="food-title">{{item.type}}</view>
-						<view class="food-type">
-							<!-- 1 -->
-							<view wx:for="{{item.list}}" wx:for-item="subItem" wx:for-index="subIndex" wx:key="subIndex" class="food-item">
-								<image src="{{baseUrl + '/' + subItem.imgurl}}" alt="" class="image"></image>
-								<view class="cont">
-									<p>{{subItem.dishesName}}</p>
-									<view class="comment">
-										<view bindtap="openItem" data-item="{{subItem}}" id="comentBtn">
-											<image src="{{imgUrl}}discuss.png" alt=""></image>
-											<view class="comment-word">评论</view>
-										</view>
-										<view id="fabulousBtn" bindtap="clickLike" data-parent="{{index}}" data-index="{{subIndex}}" data-item="{{subItem}}">
-											<image src="{{subItem.liked==1?imgUrl+'thumb2.png':imgUrl+'thumb.png'}}" alt=""></image>
-											<view class="comment-word">点赞</view>
-										</view>
-									</view>
-								</view>
-							</view>
-							<!-- 1 -->
-						</view>
-					</view>
-					<!-- 菜品分类结尾 -->
-				</view>
-				<!-- 早餐结尾 -->
-				<!-- 中餐 -->
-				<view class="food-type" wx:if="{{selectTimeNode==1}}">
-					<!-- 菜品分类 -->
-					<view wx:for="{{menuCanteen.lunchCanteen}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="food-width">
-						<view class="food-title">{{item.type}}</view>
-						<view class="food-type">
-							<!-- 1 -->
-							<view wx:for="{{item.list}}" wx:for-item="subItem" wx:for-index="subIndex" wx:key="subIndex" class="food-item">
-								<image src="{{baseUrl + '/' + subItem.imgurl}}" alt="" class="image"></image>
-								<view class="cont">
-									<p>{{subItem.dishesName}}</p>
-									<view class="comment">
-										<view id="comentBtn">
-											<image src="{{imgUrl}}discuss.png" alt=""></image>
-											<view bindtap="openItem" data-item="{{subItem}}" class="comment-word">评论</view>
-										</view>
-										<view id="fabulousBtn">
-											<image src="{{subItem.liked==1?imgUrl+'thumb2.png':imgUrl+'thumb.png'}}" alt=""></image>
-											<view bindtap="clickLike" data-parent="{{index}}" data-index="{{subIndex}}" data-item="{{subItem}}" class="comment-word">点赞</view>
-										</view>
-									</view>
-								</view>
-							</view>
-							<!-- 1 -->
-						</view>
-					</view>
-					<!-- 菜品分类结尾 -->
-				</view>
-				<!-- 中餐结尾 -->
-				<!-- 晚餐 -->
-				<view class="food-type" wx:if="{{selectTimeNode==2}}">
-					<!-- 菜品分类 -->
-					<view wx:for="{{menuCanteen.dinnerCanteen}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="food-width">
-						<view class="food-title">{{item.type}}</view>
-						<view class="food-type">
-							<!-- 1 -->
-							<view wx:for="{{item.list}}" wx:for-item="subItem" wx:for-index="subIndex" wx:key="subIndex" class="food-item">
-								<image src="{{baseUrl + '/' + subItem.imgurl}}" alt="" class="image"></image>
-								<view class="cont">
-									<p>{{subItem.dishesName}}</p>
-									<view class="comment">
-										<view id="comentBtn">
-											<image src="{{imgUrl}}discuss.png" alt=""></image>
-											<view bindtap="openItem" data-item="{{subItem}}" class="comment-word">评论</view>
-										</view>
-										<view id="fabulousBtn">
-											<image src="{{subItem.liked==1?imgUrl+'thumb2.png':imgUrl+'thumb.png'}}" alt=""></image>
-											<view bindtap="clickLike" data-parent="{{index}}" data-index="{{subIndex}}" data-item="{{subItem}}" class="comment-word">点赞</view>
-										</view>
-									</view>
-								</view>
-							</view>
-							<!-- 1 -->
-						</view>
-					</view>
-					<!-- 菜品分类结尾 -->
-				</view>
-				<!-- 晚餐结尾 -->
-				<!-- 外卖 -->
-				<view class="food-type" wx:if="{{selectTimeNode==3}}">
-					<!-- 菜品分类 -->
-					<view wx:for="{{menuCanteen.takeoutCanteen}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="food-width">
-						<view class="food-title">{{item.type}}</view>
-						<view class="food-type">
-							<!-- 1 -->
-							<view wx:for="{{item.list}}" wx:for-item="subItem" wx:for-index="subIndex" wx:key="subIndex" class="food-item">
-								<image src="{{baseUrl + '/' + subItem.imgurl}}" alt="" class="image"></image>
-								<view class="cont">
-									<p>{{subItem.dishesName}}</p>
-									<view class="comment">
-										<view id="comentBtn">
-											<image src="{{imgUrl}}discuss.png" alt=""></image>
-											<view bindtap="openItem" data-item="{{subItem}}" class="comment-word">评论</view>
-										</view>
-										<view id="fabulousBtn">
-											<image src="{{subItem.liked==1?imgUrl+'thumb2.png':imgUrl+'thumb.png'}}" alt=""></image>
-											<view bindtap="clickLike" data-parent="{{index}}" data-index="{{subIndex}}" data-item="{{subItem}}" class="comment-word">点赞</view>
-										</view>
-									</view>
-								</view>
-							</view>
-							<!-- 1 -->
-						</view>
-					</view>
-					<!-- 菜品分类结尾 -->
-				</view>
-				<!-- 外卖结尾 -->
-			</view>
-			<!-- 菜品结尾 -->
-		</view>
-		<!-- 菜单结尾 -->
+  <!-- 头部 -->
+  <view class="head-bg">
+    <image style="width:100%;height:100%" mode="scaleToFill" src="{{imgUrl}}index_bg.png"></image>
+  </view>
+  <!-- 弹窗 -->
+  <view class="mask" catchtouchmove="preventTouchMove" wx:if="{{showModal}}"></view>
+  <view class="evaluate" wx:if="{{showModal}}">
+    <view class="conment-release">
+      <view class="title">
+        <image src="{{baseUrl + '/' + dishesDetails.imgurl}}" alt="" class="image"></image>
+        <view class="contl">{{dishesDetails.dishesName}}</view>
+      </view>
+      <view class="score">
+        <view style="font-weight: 600;">评分：</view>
+        <view>
+          <image style="width: 30rpx;height: 30rpx;margin: 0 5rpx;" wx:for="{{starsList}}" wx:key="index" bindtap="chooseStars" data-index="{{index}}" src="{{item}}" alt="" />
+        </view>
+      </view>
+      <view class="message">
+        <view style="font-weight: 600;">评论：</view>
+        <textarea bindinput='blurEvaluation' cols="30" rows="10" placeholder="说说菜品亮点和不足吧(不少于10字)"></textarea>
+      </view>
+      <view class="upload">
+        <view style="position: relative;width: 120rpx;" wx:for="{{imgList}}" wx:key="index">
+          <image style="width: 80rpx;height: 80rpx;" src="{{item}}" alt="" />
+          <view class="uploadDelete" bindtap="deleteFile" data-index="{{index}}">X</view>
+        </view>
+        <view wx:if="{{imgList.length < 4}}" class="photo" bindtap="choosePhoto">
+          <image style="width: 40rpx;height: 35rpx;" src="{{imgUrl}}photo.png" alt=""></image>
+          <p style="margin-top: 4rpx;font-size: 20rpx;">上传照片</p>
+        </view>
+      </view>
+      <view class="release">
+        <view bindtap="postComment">发布</view>
+      </view>
+    </view>
+    <image src="{{imgUrl}}close.png" bindtap="closeItem" class="close"></image>
+    <!-- <button bindtap="closeItem">点我可以关掉对话框</button> -->
+  </view>
+  <!-- 弹窗结尾 -->
+  <!-- content -->
+  <view style="position: relative;width: 100%;">
+    <view class="content" style="position: absolute;width: 100%;top: -20rpx;">
+      <!-- title -->
+      <view class="title">
+        <view style="font-size: 38rpx;">食堂菜单</view>
+        <view style="height:100%;display: flex;align-items: center;justify-content: center;">
+          <image style="width:45rpx;height:45rpx;padding-right:5rpx;" mode="aspectFit" src="{{imgUrl}}feedback.png">
+          </image>
+          <view style="font-size: 27rpx;font-weight: 500;color: #222222;">反馈</view>
+        </view>
+      </view>
+      <!-- 日期 -->
+      <view class="years">{{dateStr.startWeek == dateStr.endWeek?dateStr.startWeek:dateStr.startWeek + "-" + dateStr.endWeek}}</view>
+      <view class="week">
+        <view>一</view>
+        <view>二</view>
+        <view>三</view>
+        <view>四</view>
+        <view>五</view>
+        <view style="color: #aaaaaa;">六</view>
+        <view style="color: #aaaaaa;">七</view>
+      </view>
+      <view class="date">
+        <view wx:for="{{dateStr.weekList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="{{dateSelectIndex == index?'click':''}}" bindtap="selectDate" data-item="{{index}}" style="height: 35rpx;width: 35rpx;display: flex;align-items: center;justify-content: center;border-radius: 4rpx;{{index >= 5 && dateSelectIndex != index?'color:#aaaaaa':'' }}">{{filter.getDate(item)}}
+        </view>
+      </view>
+      <!-- tip -->
+      <view>
+        <view style="background-image: url({{imgUrl}}tips.png);margin-bottom: 30rpx;" class="tips">小贴士：请在当天11点后查看菜品!</view>
+      </view>
+      <!-- 菜单 -->
+      <view class="variety">
+        <!-- 左侧时间 -->
+        <view class="time-solt">
+          <view class="taps-title">
+            <view class="{{selectTimeNode==0 ? 'click time-node' : 'time-node'}}" bindtap="tapTimeNode" data-item="{{0}}">
+              <image style="height:45rpx;width:45rpx;" src="{{imgUrl}}breakfast.png" mode="aspectFit"></image>
+              <view style="padding-left:10rpx">早餐</view>
+            </view>
+            <view class="{{selectTimeNode==1 ? 'click time-node' : 'time-node'}}" bindtap="tapTimeNode" data-item="{{1}}">
+              <image style="height:45rpx;width:45rpx;" src="{{imgUrl}}lunch.png" mode="aspectFit"></image>
+              <view style="padding-left:10rpx">中餐</view>
+            </view>
+            <view class="{{selectTimeNode==2 ? 'click time-node' : 'time-node'}}" bindtap="tapTimeNode" data-item="{{2}}">
+              <image style="height:45rpx;width:45rpx;" src="{{imgUrl}}lunch.png" mode="aspectFit"></image>
+              <view style="padding-left:10rpx">晚餐</view>
+            </view>
+            <view class="{{selectTimeNode==3 ? 'click takeout-all' : 'takeout-all'}}" bindtap="tapTimeNode" data-item="{{3}}">
+              <view class="takeout">
+                <image style="height:45rpx;width:45rpx;" src="{{imgUrl}}take_out.png" mode="aspectFit"></image>
+                <view style="padding-left:10rpx">外卖预告</view>
+              </view>
+              <view class="sale-time">
+                <view>售卖时间</view>
+                <view>{{filter.getTakeoutTime(menuOrigin)}}</view>
+                <!-- <view>节日前一天:15:30</view> -->
+              </view>
+            </view>
+          </view>
+          <!-- taps-title结尾 -->
+        </view>
+        <!-- 左侧时间结尾 -->
+        <!-- 菜品 -->
+        <view class="food-all">
+          <!-- 早餐 -->
+          <view class="food-type" wx:if="{{selectTimeNode==0}}">
+            <!-- 菜品分类 -->
+            <view wx:for="{{menuCanteen.breakfastCanteen}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="food-width">
+              <view class="food-title">{{item.type}}</view>
+              <view class="food-type">
+                <!-- 1 -->
+                <view wx:for="{{item.list}}" wx:for-item="subItem" wx:for-index="subIndex" wx:key="subIndex" class="food-item">
+                  <image src="{{baseUrl + '/' + subItem.imgurl}}" alt="" class="image"></image>
+                  <view class="cont">
+                    <p>{{subItem.dishesName}}</p>
+                    <view class="comment">
+                      <view bindtap="openItem" data-item="{{subItem}}" id="comentBtn">
+                        <image src="{{imgUrl}}discuss.png" alt=""></image>
+                        <view class="comment-word">评论</view>
+                      </view>
+                      <view id="fabulousBtn" bindtap="clickLike" data-parent="{{index}}" data-index="{{subIndex}}" data-item="{{subItem}}">
+                        <image src="{{subItem.liked==1?imgUrl+'thumb2.png':imgUrl+'thumb.png'}}" alt=""></image>
+                        <view class="comment-word">点赞</view>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+                <!-- 1 -->
+              </view>
+            </view>
+            <!-- 菜品分类结尾 -->
+          </view>
+          <!-- 早餐结尾 -->
+          <!-- 中餐 -->
+          <view class="food-type" wx:if="{{selectTimeNode==1}}">
+            <!-- 菜品分类 -->
+            <view wx:for="{{menuCanteen.lunchCanteen}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="food-width">
+              <view class="food-title">{{item.type}}</view>
+              <view class="food-type">
+                <!-- 1 -->
+                <view wx:for="{{item.list}}" wx:for-item="subItem" wx:for-index="subIndex" wx:key="subIndex" class="food-item">
+                  <image src="{{baseUrl + '/' + subItem.imgurl}}" alt="" class="image"></image>
+                  <view class="cont">
+                    <p>{{subItem.dishesName}}</p>
+                    <view class="comment">
+                      <view id="comentBtn">
+                        <image src="{{imgUrl}}discuss.png" alt=""></image>
+                        <view bindtap="openItem" data-item="{{subItem}}" class="comment-word">评论</view>
+                      </view>
+                      <view id="fabulousBtn">
+                        <image src="{{subItem.liked==1?imgUrl+'thumb2.png':imgUrl+'thumb.png'}}" alt=""></image>
+                        <view bindtap="clickLike" data-parent="{{index}}" data-index="{{subIndex}}" data-item="{{subItem}}" class="comment-word">点赞</view>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+                <!-- 1 -->
+              </view>
+            </view>
+            <!-- 菜品分类结尾 -->
+          </view>
+          <!-- 中餐结尾 -->
+          <!-- 晚餐 -->
+          <view class="food-type" wx:if="{{selectTimeNode==2}}">
+            <!-- 菜品分类 -->
+            <view wx:for="{{menuCanteen.dinnerCanteen}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="food-width">
+              <view class="food-title">{{item.type}}</view>
+              <view class="food-type">
+                <!-- 1 -->
+                <view wx:for="{{item.list}}" wx:for-item="subItem" wx:for-index="subIndex" wx:key="subIndex" class="food-item">
+                  <image src="{{baseUrl + '/' + subItem.imgurl}}" alt="" class="image"></image>
+                  <view class="cont">
+                    <p>{{subItem.dishesName}}</p>
+                    <view class="comment">
+                      <view id="comentBtn">
+                        <image src="{{imgUrl}}discuss.png" alt=""></image>
+                        <view bindtap="openItem" data-item="{{subItem}}" class="comment-word">评论</view>
+                      </view>
+                      <view id="fabulousBtn">
+                        <image src="{{subItem.liked==1?imgUrl+'thumb2.png':imgUrl+'thumb.png'}}" alt=""></image>
+                        <view bindtap="clickLike" data-parent="{{index}}" data-index="{{subIndex}}" data-item="{{subItem}}" class="comment-word">点赞</view>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+                <!-- 1 -->
+              </view>
+            </view>
+            <!-- 菜品分类结尾 -->
+          </view>
+          <!-- 晚餐结尾 -->
+          <!-- 外卖 -->
+          <view class="food-type" wx:if="{{selectTimeNode==3}}">
+            <!-- 菜品分类 -->
+            <view wx:for="{{menuCanteen.takeoutCanteen}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="food-width">
+              <view class="food-title">{{item.type}}</view>
+              <view class="food-type">
+                <!-- 1 -->
+                <view wx:for="{{item.list}}" wx:for-item="subItem" wx:for-index="subIndex" wx:key="subIndex" class="food-item">
+                  <image src="{{baseUrl + '/' + subItem.imgurl}}" alt="" class="image"></image>
+                  <view class="cont">
+                    <p>{{subItem.dishesName}}</p>
+                    <view class="comment">
+                      <view id="comentBtn">
+                        <image src="{{imgUrl}}discuss.png" alt=""></image>
+                        <view bindtap="openItem" data-item="{{subItem}}" class="comment-word">评论</view>
+                      </view>
+                      <view id="fabulousBtn">
+                        <image src="{{subItem.liked==1?imgUrl+'thumb2.png':imgUrl+'thumb.png'}}" alt=""></image>
+                        <view bindtap="clickLike" data-parent="{{index}}" data-index="{{subIndex}}" data-item="{{subItem}}" class="comment-word">点赞</view>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+                <!-- 1 -->
+              </view>
+            </view>
+            <!-- 菜品分类结尾 -->
+          </view>
+          <!-- 外卖结尾 -->
+        </view>
+        <!-- 菜品结尾 -->
+      </view>
+      <!-- 菜单结尾 -->
+    </view>
+    <!-- content结尾 -->
+  </view>
 
 
 
-	</view>
-	<!-- content结尾 -->
-
-
 </view>

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/menu/menu.wxss

@@ -11,10 +11,12 @@
 /* content */
 .content {
 	background: #fff;
-	border-radius: 0.9375rem 0.9375rem 0 0;
+	border-radius: 20rpx 20rpx 0 0;
 }
 
 .content .title {
+  margin-top: 35rpx;
+  margin-bottom: 15rpx;
 	display: flex;
 	justify-content: space-between;
 	padding: 5rpx 2.5%;
@@ -98,7 +100,7 @@
 
 .evaluate {
 	width: 580rpx;
-	height: 820rpx;
+	height: 920rpx;
 	position: fixed;
 	z-index: 9999;
 	margin: -50rpx 85rpx;
@@ -140,6 +142,7 @@
 }
 
 .conment-release .title .contl {
+  font-weight: 600;
 	width: 70%;
 	display: flex;
 	flex-direction: column;
@@ -158,6 +161,7 @@
 }
 
 .conment-release .message {
+  margin-top: 20rpx;
 	display: flex;
 	height: 190rpx;
 }
@@ -180,12 +184,14 @@
 }
 
 .conment-release .upload {
+  align-items: center;
+  justify-content: center;
 	margin-top: 10rpx;
 	display: flex;
 }
 
 .conment-release .upload view {
-	width: 140rpx;
+	width: 250rpx;
 	height: 90rpx;
 	display: flex;
 	flex-direction: column;
@@ -221,15 +227,16 @@
 .conment-release .release {
 	display: flex;
 	justify-content: center;
-	margin-top: 30rpx;
+	margin-top: 40rpx;
 }
 
 .conment-release .release view {
-	text-align: center;
-	height: 45rpx;
-	line-height: 45rpx;
-	width: 150rpx;
-	font-size: 25rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+	height: 80rpx;
+	width: 180rpx;
+	font-size: 27rpx;
 	color: #fff;
 	text-align: center;
 	letter-spacing: 5rpx;

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ourCanteen/notice.wxml

@@ -1,4 +1,4 @@
-<view style="width:97%;height: 1000rpx; padding:0;background-image: url({{imgUrl}}nontice_bg.png);background-size: 100% 100%;">
+<view style="width:97%;height: 950rpx; padding:0;background-image: url({{imgUrl}}nontice_bg.png);background-size: 100% 100%;">
   <view class="notice-content">
     <view class="text">
       <view>1.粮食就是生命，知识拯救灵魂。</view>

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ourCanteen/ourCanteen.wxml

@@ -7,24 +7,24 @@
 </view>
 <view class="tab">
       <view class="tab-item {{tab==0?'active':''}}" bindtap="changeItem" data-item="0">
-            <view style="height:90rpx;width:40rpx;display: flex;justify-content:center;align-items:center;">
+            <view style="height:80rpx;width:40rpx;display: flex;justify-content:center;align-items:center;">
                   <image style="width:40rpx;height:40rpx;" src="/pages/images/icon_st.png"></image>
             </view>
-            <view style="height:90rpx;padding-left:10rpx">我们的食堂</view>
+            <view style="height:80rpx;padding-left:10rpx">我们的食堂</view>
       </view>
       <view style="width: 20rpx;"></view>
       <view class="tab-item {{tab==1?'active':''}}" bindtap="changeItem" data-item="1">
-            <view style="height:90rpx;width:40rpx;display: flex;justify-content:center;align-items:center;">
+            <view style="height:80rpx;width:40rpx;display: flex;justify-content:center;align-items:center;">
                   <image style="width:40rpx;height:40rpx;" src="/pages/images/icon_bd.png"></image>
             </view>
-            <view style="height:90rpx;padding-left:10rpx">菜品榜单</view>
+            <view style="height:80rpx;padding-left:10rpx">菜品榜单</view>
       </view>
       <view style="width: 20rpx;"></view>
       <view class="tab-item {{tab==2?'active':''}}" bindtap="changeItem" data-item="2">
-            <view style="height:90rpx;width:40rpx;display: flex;justify-content:center;align-items:center;">
+            <view style="height:80rpx;width:40rpx;display: flex;justify-content:center;align-items:center;">
                   <image style="width:40rpx;height:40rpx;" src="/pages/images/icon_ts.png"></image>
             </view>
-            <view style="height:90rpx;padding-left:10rpx">提示公告</view>
+            <view style="height:80rpx;padding-left:10rpx">提示公告</view>
       </view>
 </view>
 

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ourCanteen/ourCanteen.wxss

@@ -1,4 +1,11 @@
 /* index */
+scroll-view ::-webkit-scrollbar {
+	display:none;
+	width:0;
+	height:0;
+	color:transparent;
+}
+
 page{
   height: 100%;
   background: #F5F5F5;
@@ -6,7 +13,7 @@ page{
 
 .head-bg{
   width: 100%;
-  height:29vh;
+  height:375rpx;
   background-size: 100% 100%;
 }
 
@@ -33,9 +40,10 @@ page{
   }
 
 .tab{
+  margin-top: 12rpx;
   padding-left: 20rpx;
   padding-right: 20rpx;
-  height: 8vh;
+  height: 100rpx;
   display: flex;
   justify-content: space-between;
 }
@@ -43,8 +51,8 @@ page{
 .tab-item{
   font-size: 35rpx;
   text-align: center;
-  line-height: 90rpx;
-  height: 90rpx;
+  line-height: 80rpx;
+  height: 80rpx;
   border-bottom: 6rpx solid #F5F5F5 ;
   display: flex;
   justify-content: center;
@@ -73,14 +81,14 @@ page{
 .content .cont-width {
   width: 90%;
   margin: 20rpx auto;
-  margin-top: 30rpx;
-  height: 500rpx;
+  margin-bottom: 50rpx;
+  height: 480rpx;
   background: #fff;
   border-radius: 20px 20px 10px 10px;
 }
 
 .cont-width .cont-bg {
-  height: 65%;
+  height: 62%;
   width: 100%;
   border-radius: 20px 20px 0 0;
 }
@@ -133,7 +141,7 @@ page{
 
 /* notice */
 .notice-content {
-  height: 1000rpx;
+  height: 950rpx;
   background-size: 100% 100%;
   /* padding-top: 3.75rem; */
   padding-bottom: 1.875rem;
@@ -142,9 +150,9 @@ page{
 }
 
 .notice-content .text {
-  padding-top: 175rpx;
+  padding-top: 155rpx;
   padding-bottom: 30rpx;
-  padding-left: 90rpx;
+  padding-left: 75rpx;
   margin: 10rpx auto;
   line-height: 50rpx;
   width: 80%;