Merge branch 'master' of http://1.14.104.71:10880/liujiaxin/baiyuchengpin

pages_shopping/live/refundOrderProduct.vue

@@ -31,7 +31,7 @@
 				<view class="left"></view>
 				<view class="right">
 					<view class="btn cancel" v-if="order.status==1 || order.status==2" @click="submit(0)">仅退款</view>
-					<view class="btn cancel" v-if="order.status==3" @click="submit(1)">退款退货</view>
+					<view class="btn cancel" v-if="order.status==3 || order.status==4" @click="submit(1)">退款退货</view>
 				</view>
 			</view>
 		</view>