Merge branch 'master' into master-pro

pages/finance/withdrawal.vue

@@ -423,7 +423,7 @@ export default {
 
 ::v-deep {
   .u-delete-icon {
-    background-color: rgb(0, 0, 0, 0.6) !important;
+    background-color: rgba(0, 0, 0, 0.6) !important;
   }
 }
 </style>

pages/product/index.vue

@@ -130,7 +130,7 @@
 				<view class="center">
 					<view class="error" v-if="canBeDelete">
 						是否将所选商品删除？<br />
-						<span style="font-size: 28rpx;color: #666666;margin-top: 16rpx;">删除后需要重新添加品牌标品</span>
+						<span style="font-size: 28rpx;color: #666666;margin-top: 16rpx;">删除后需要重新添加自有商品</span>
 
 					</view>
 					<view class="error" v-else>
@@ -363,7 +363,7 @@ export default {
 						this.productHandleList = []
 						this.isManage = false
 						this.isAll = false
-						
+
 					} else {
 						this.isDelete = false
 						this.productHandleList = []
@@ -1116,4 +1116,4 @@ export default {
 		background-size: contain;
 	}
 }
-</style>
+</style>