Merge remote-tracking branch 'origin/master'

components/applyPurchase/BatchPublish.vue

@@ -99,7 +99,7 @@
                   <tr v-for="(spotGoods, index) in spotGoodsData">
                     <td width="214" v-text="spotGoods.storeName"></td>
                     <td width="83" class="red-text" v-text="spotGoods.b2cMinDelivery + '-' + spotGoods.b2cMaxDelivery">4-6</td>
-                    <td width="104" class="red-text" v-text="spotGoods.currencyName == 'RMB' ? '¥' + spotGoods.prices[0].rMBPrice: '&' + spotGoods.prices[0].uSDPrice"></td>
+                    <td width="104" class="red-text" v-text="spotGoods.currencyName == 'RMB' ? '¥' + spotGoods.prices[0].rMBPrice: '$' + spotGoods.prices[0].uSDPrice"></td>
                     <td width="137" v-text="spotGoods.produceDate"></td>
                     <td width="111" v-text="spotGoods.reserve">21412</td>
                     <td width="142" class="input-number">