Merge branch 'qs_local_order' into develop

app/Admin/Extensions/MyDetailPage.php

@@ -81,7 +81,6 @@ class MyDetailPage extends LazyRenderable
                             cancelButtonText: '取消',
                             type: 'warning'
                         }).then(() => {
-                            this.dialogFormVisible = false;
                             that = this;
                             $.ajax({
                                 url: "order_goods_refund",
@@ -104,6 +103,7 @@ class MyDetailPage extends LazyRenderable
                                        that.show_refund_2=false
                                        that.show_refund_3=true
                                     }
+                                    that.dialogFormVisible = false;
                                 },
                                 error: function (xhr, err) {
                                     console.log("错误", err)

resources/views/orderdetail.php

@@ -50,7 +50,7 @@
 
                 </div>
                 <p class="mb-0" style="color: red;font-size: 1.4rem;">￥{{goods.price}}</p>
-                <el-button type="danger" style="float: right;" @click="refundNote(goods.name,goods.id,item.id)" v-if="state==4&&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&&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_3">{{refund_3}}</p>
             </div>