lilei 4 months ago
parent
commit
a63f416b57
3 changed files with 9 additions and 9 deletions
  1. 2 2
      App.vue
  2. 5 5
      pagesB/procureOrder/creatOrder.vue
  3. 2 2
      pagesB/shopiing/productDetail.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.10: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() {

+ 5 - 5
pagesB/procureOrder/creatOrder.vue

@@ -345,15 +345,15 @@
 				}).then(res => {
 				}).then(res => {
 					this.loading = false
 					this.loading = false
 					uni.hideLoading()
 					uni.hideLoading()
-					if(res.status == 200){
-						// 删除已提交产品
+					if(res.status == 200){	
+						// 删除已提交产品		
 						uni.$emit('removeCatGood',cartSn,true,false)
 						uni.$emit('removeCatGood',cartSn,true,false)
 						res.data.detailList = []
 						res.data.detailList = []
 						this.$store.state.vuex_tempOrderData = res.data
 						this.$store.state.vuex_tempOrderData = res.data
-						// 这里判断是否开通支付,如果开通打开确认付款弹框
-						if(this.hasPay){
+						// 这里判断是否开通支付或充值余额支付,如果开通打开确认付款弹框
+						if(this.hasPay||this.payType==0){
 							purchasePay({
 							purchasePay({
-								bizSn:res.data.purchaseSn,
+								bizSn:res.data.purchaseSn,	
 								bizNo:res.data.purchaseNo,
 								bizNo:res.data.purchaseNo,
 								bizType:'SETTLE_BILL',
 								bizType:'SETTLE_BILL',
 								payUserOpenId: this.$store.state.vuex_openid || uni.getStorageSync('openid'),
 								payUserOpenId: this.$store.state.vuex_openid || uni.getStorageSync('openid'),

+ 2 - 2
pagesB/shopiing/productDetail.vue

@@ -704,8 +704,8 @@
 					if(res.status == 200){
 					if(res.status == 200){
 						res.data.detailList = []
 						res.data.detailList = []
 						this.$store.state.vuex_tempOrderData = res.data
 						this.$store.state.vuex_tempOrderData = res.data
-						// 这里判断是否开通支付,如果开通打开确认付款弹框
-						if(this.hasPay){
+						// 这里判断是否开通支付或是充值余额付款,如果开通打开确认付款弹框
+						if(this.hasPay||this.payType==0){
 							// 计算待付款剩余倒计时
 							// 计算待付款剩余倒计时
 							if(this.payType==1){
 							if(this.payType==1){
 								res.data.timestamp = (new Date(res.data.createDate.replace(/-/g,'/')).getTime() + 1800000 - new Date().getTime())/1000
 								res.data.timestamp = (new Date(res.data.createDate.replace(/-/g,'/')).getTime() + 1800000 - new Date().getTime())/1000