Merge branch 'devlop' of http://git.qniao.cn/dengxiongfei/paper-shopkeeper-app into devlop

pages/message/index.vue

@@ -12,14 +12,14 @@
 				<view :class="subIndex === 0 ? 'message-bottom meeage-change' : 'message-noChange'" @click="checkMessage(0)">
 					<uni-badge size="small" :custom-style="subIndex === 0 ? customStyle:customStylet" :text="systemBadge" absolute="rightTop" type="error">系统消息</uni-badge>
 				</view>
-				<view :class="subIndex === 1 ? 'message-bottom meeage-change' : 'message-noChange'" @click="checkMessage(1)">
+				<!-- <view :class="subIndex === 1 ? 'message-bottom meeage-change' : 'message-noChange'" @click="checkMessage(1)">
 					<uni-badge size="small" :custom-style="subIndex === 1 ? customStyle:customStylet" :text="5" absolute="rightTop" type="error">平台公告</uni-badge>
-				</view>
+				</view> -->
 			</view>
 		</view>
 		<view class="">
 			<systemMessage ref="systemRef" v-if="subIndex === 0" @systemCount="systemCount"></systemMessage>
-			<platformMessage v-if="subIndex === 1" ></platformMessage>
+			<!-- <platformMessage v-if="subIndex === 1" ></platformMessage> -->
 		</view>
 	</view>
 </template>

pages/submit-quotation/index.vue

@@ -754,6 +754,7 @@ export default {
   .submit-btn {
     width: 686rpx;
     height: 96rpx;
+	line-height: 96rpx;
     background: #007aff;
     border-radius: 10rpx;
     .text {