Merge branch 'Xfy' of http://8.137.125.67:4000/SwtTt29/Mini-Program into Xfy

pages/goods-update/goods-update.wxml

@@ -192,13 +192,7 @@
       class="bottom-button"
       bindtap="prepareUnpublishSupply"
       disabled="{{goodsDetail.status == 'sold_out'}}"
-      style="
-        background-color: {{goodsDetail.status == 'sold_out' ? '#d9d9d9' : '#52c41a'}};
-        color: {{goodsDetail.status == 'sold_out' ? '#999999' : '#ffffff'}};
-        border: 2px solid {{goodsDetail.status == 'sold_out' ? '#d9d9d9' : '#52c41a'}};
-        box-shadow: {{goodsDetail.status == 'sold_out' ? 'none' : '0 2px 8px rgba(82, 196, 26, 0.2)'}};
-        opacity: {{goodsDetail.status == 'sold_out' ? '0.8' : '1'}};
-      "
+      style="background-color: {{goodsDetail.status == 'sold_out' ? '#d9d9d9' : '#52c41a'}}; color: {{goodsDetail.status == 'sold_out' ? '#999999' : '#ffffff'}}; border: 2px solid {{goodsDetail.status == 'sold_out' ? '#d9d9d9' : '#52c41a'}}; box-shadow: {{goodsDetail.status == 'sold_out' ? 'none' : '0 2px 8px rgba(82, 196, 26, 0.2)'}}; opacity: {{goodsDetail.status == 'sold_out' ? '0.8' : '1'}};"
     >
       {{goodsDetail.status == 'sold_out' ? '已下架' : '下架'}}
     </button>