lilei 4 months ago
parent
commit
557bab9321
2 changed files with 3 additions and 3 deletions
  1. 2 2
      App.vue
  2. 1 1
      pagesB/procureOrder/orderList.vue

+ 2 - 2
App.vue

@@ -1,8 +1,8 @@
 <script>
 <script>
 	export default {
 	export default {
 		globalData: {
 		globalData: {
-			// baseUrl: 'http://192.168.2.10:9110/saas/clz/', // 本地
-			baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
+			baseUrl: 'http://192.168.2.100:9110/saas/clz/', // 本地
+			// baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
 			// baseUrl: 'https://car.zyucgj.com/saas/clz/' // 生产
 			// baseUrl: 'https://car.zyucgj.com/saas/clz/' // 生产
 		},
 		},
 		onLaunch: function() {
 		onLaunch: function() {

+ 1 - 1
pagesB/procureOrder/orderList.vue

@@ -72,7 +72,7 @@
 										 <u-button style="margin-left: 10px;" v-if="item.billStatus == 'WAIT_PAY'&&item.payOnlineType=='PAY_WECHAT_ONLINE'" size="mini" shape="round" type="error" plain @click="payOrder(item)">立即支付</u-button>
 										 <u-button style="margin-left: 10px;" v-if="item.billStatus == 'WAIT_PAY'&&item.payOnlineType=='PAY_WECHAT_ONLINE'" size="mini" shape="round" type="error" plain @click="payOrder(item)">立即支付</u-button>
 										 <!-- <u-button style="margin-left: 10px;" v-if="item.billStatus == 'CANCEL'" size="mini" shape="round" type="error" plain @click="buyAgain(item)">再次购买</u-button> -->
 										 <!-- <u-button style="margin-left: 10px;" v-if="item.billStatus == 'CANCEL'" size="mini" shape="round" type="error" plain @click="buyAgain(item)">再次购买</u-button> -->
 										 <u-button style="margin-left: 10px;" v-if="item.billStatus == 'WAIT_RECEIVE'" size="mini" shape="round" type="error" plain @click="receiveOrder(item)">确认收货</u-button>
 										 <u-button style="margin-left: 10px;" v-if="item.billStatus == 'WAIT_RECEIVE'" size="mini" shape="round" type="error" plain @click="receiveOrder(item)">确认收货</u-button>
-										 <view v-if="(item.billStatus == 'CANCEL'||item.billStatus == 'AUDIT_REJECT')&&item.payInfo">
+										 <view v-if="(item.billStatus == 'CANCEL'||item.billStatus == 'AUDIT_REJECT')&&item.payInfo&&item.payInfo.refundState">
 											<u-tag type="success" size="mini" v-if="item.payInfo.refundState=='FINISH'" mode="plain" text="已退款" shape="square"/>
 											<u-tag type="success" size="mini" v-if="item.payInfo.refundState=='FINISH'" mode="plain" text="已退款" shape="square"/>
 											<u-tag type="primary" size="mini" v-else-if="item.payInfo.refundState=='WAIT'" text="退款中" shape="square" mode="plain"/>
 											<u-tag type="primary" size="mini" v-else-if="item.payInfo.refundState=='WAIT'" text="退款中" shape="square" mode="plain"/>
 											<u-tag type="error" size="mini" v-else text="退款失败" shape="square" mode="plain"/>
 											<u-tag type="error" size="mini" v-else text="退款失败" shape="square" mode="plain"/>