Merge remote-tracking branch 'origin/master' into dev

src/components/posmembers/posmemberDetail.vue

@@ -115,9 +115,9 @@
                 </el-table-column>
                 <el-table-column prop="orderStatus" label="订单类型">
                   <template  slot-scope="scope">
-                    <span v-if="scope.row.orderStatus === 1">销售</span>
-                    <span v-if="scope.row.orderStatus === 2">退货</span>
-                    <span v-if="scope.row.orderStatus === 3">退换货</span>
+                    <span v-if="scope.row.orderStatus == 1">销售</span>
+                    <span v-if="scope.row.orderStatus == 2">退货</span>
+                    <span v-if="scope.row.orderStatus == 4">退换货</span>
                   </template>
                 </el-table-column>
                 <el-table-column prop="paidAmount" label="成交金额"> </el-table-column>