Merge branch 'hotfix-phoenix'

resources/views/orderdetail.php

@@ -28,7 +28,7 @@
 
         </tr>
         <tr>
-            <td class="text-nowrap" scope="col" v-if="total_refund_note">拒绝退款原因：{{total_refund_note}}</td>
+            <td class="text-nowrap" scope="col" v-if="total_refund_note">退款原因：{{total_refund_note}}</td>
         </tr>
         </tbody>
     </table>
@@ -49,7 +49,7 @@
 
                 </div>
                 <p class="mb-0" style="color: red;font-size: 1.4rem;">￥{{goods.price}}</p>
-                <el-button type="info" plain style="float: right;" @click="refundNote(goods.name,goods.id,item.id)" v-if="state==4&&show_refund[goods.id].show_refund_2">{{refund_2}}</el-button>
+                <el-button type="info" plain style="float: right;" @click="refundNote(goods.name,goods.id,item.id)" v-if="(state==4||state==10)&&(goods.status!=3)&&(show_refund[goods.id].show_refund_2)">{{refund_2}}</el-button>
                 <p style="float: right; color: red" v-if="goods.status==3">{{refund_3}}</p>
                 <p style="float: right; color: red" v-if="show_refund[goods.id].show_refund_3">{{refund_3}}</p>
             </div>