Merge branch 'test' of git.echepei.com:sailun/sailun-tbr-web into test

pages/home/monthly-policy/monthly-policy.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<!-- 月度政策 -->
-		<view class="aa" ref="monthlyPolicy" v-html="contentDetail"></view>
+		<view class="picture" v-html="contentDetail"></view>
 	</view>
 </template>
 
@@ -32,21 +32,11 @@
 						"displayType": "1" //门店1
 					}
 				}).then(res => {
+					console.log(res)
 					if(res.data.code==0){
 						_this.contentDetail = res.data.data.contentDetail;
-					}else{
-						uni.showToast({
-							title: res.data.msg,
-							icon: "none",
-							duration: _this.$store.state.showToastDuration
-						});
-					};
+					}
 				}).catch(err => {
-					uni.showToast({
-						title:  _this.$store.state.showServerErrorMsg,
-						icon: "none",
-						duration: _this.$store.state.showToastDuration
-					});
 				}).finally(() => {
 					setTimeout(() => {
 						uni.hideLoading();
@@ -58,6 +48,12 @@
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+	.picture{
+		img{
+			width: 100vw;
+			margin-bottom: -40rpx;
+		}
+	}
 
 </style>

pages/me/Write-off-management/index.vue

@@ -225,7 +225,7 @@
 		top: -35rpx;
 		border-top-left-radius: 50rpx;
 		border-bottom-left-radius: 50rpx;
-		font-size: 12rpx;
+		font-size: 24rpx;
 		color: #fff;
 		text-align: center;
 	}
@@ -416,7 +416,7 @@
 	}
 
 	.order-one-text {
-		font-size: 24rpx;
+		font-size: 28rpx;
 		font-weight: bold;
 		color: #000;
 	}

pages/me/management.vue

@@ -14,7 +14,8 @@
 							<h3>{{item.brand}}</h3>
 							<view :class="
       item.status==='已拒绝'? 'state1':
-      item.status==='审核通过'? 'state2':'state'"
+      item.status==='审核通过'? 'state2':
+	  item.status==='已删除'? 'state3':'state'"
         >
 								<view>{{item.status}}</view>
 								<view class="triangle"></view>
@@ -207,6 +208,30 @@
 			border-color: #0F519C #0F519C transparent transparent;
 		}
 	}
+	.state3{
+		width: 200rpx;
+		height: 60rpx;
+		background-color: #d2d2d2;
+		float: right;
+		margin-top: -60rpx;
+		margin-right: -47rpx;
+		border-top-left-radius: 60rpx;
+		border-bottom-left-radius: 60rpx;
+		text-align: center;
+		line-height:60rpx;
+		color: #FFFFFF;
+		
+		.triangle {
+			width: 0px;
+			height: 0px;
+			margin-top: 0rpx;
+			margin-right: 0rpx;
+			border: 10rpx solid;
+			transform: rotate(270deg);
+			float: right;
+			border-color: #848484 #848484 transparent transparent;
+		}
+	}
 	.content {
 		width: 667rpx;
 		height: auto;