Merge branch 'dev-hotbtn-20201103' into 'release'

针对退款订单，pc端列表页操作按钮仅保留查看详情按钮。

codereviewer:ping.zhang

See merge request !229

src/views/goods/order-manage.vue

@@ -86,8 +86,8 @@
             <div>
               <!--<el-button @click="closeTrade(scope.row)" type="text" size="small">关闭交易</el-button>-->
               <!--<el-button @click="changePrice(scope.row)" type="text" size="small">修改价格</el-button>-->
-              <el-button v-if="scope.row.storeType == 1 && scope.row.showStatus == 3" @click="sendGoods(scope.row)" type="text" size="small">发货</el-button>
-              <el-button v-if="scope.row.storeType == 2 && scope.row.showStatus == 3" @click="distribute(scope.row)" type="text" size="small">配送</el-button>
+              <el-button v-if="scope.row.storeType == 1 && scope.row.showStatus == 3 && scope.row.refundStatus == 0" @click="sendGoods(scope.row)" type="text" size="small">发货</el-button>
+              <el-button v-if="scope.row.storeType == 2 && scope.row.showStatus == 3 && scope.row.refundStatus == 0" @click="distribute(scope.row)" type="text" size="small">配送</el-button>
               <el-button v-if="scope.row.storeType == 1 && (scope.row.showStatus == 1 || scope.row.showStatus == 2)" @click="viewLogistics(scope.row)" type="text" size="small">查看物流</el-button>
               <el-button v-if="scope.row.storeType == 2 && scope.row.showStatus == 2" @click="distributeComplete(scope.row)" type="text" size="small">配送完成</el-button>
               <el-button @click="goDetail(scope.row)" type="text" size="small">查看详情</el-button>