Merge branch 'master' of http://121.196.213.68:3000/caoliancun/MP_XOIL_company_new into lixuan

BagMoney/pages/oilCards/oilCards.vue

@@ -106,6 +106,7 @@
 		},
 		data() {
 			return {
+				hideCard:[],
 				loadStatus: 'load',
 				userTotal: {},
 				historyList: [],
@@ -234,11 +235,17 @@
 					}
 				})
 			},
-			getCards() {
+			async getCards() {
-				accountApi.getUserAccount().then(res => {
+				await	accountApi.getSyncDeductions().then(res => {
+						if (res.code == 20000) {
+							this.hideCard = res.data.companyIds
+						}
+					})
+				await	accountApi.getUserAccount().then(res => {
 					if (res.code == 20000) {
 						if (res.data.length > 0) {
 							this.cardList = res.data
+							this.cardList = this.cardList.filter(item=>!this.hideCard.includes(item.companyId))
 							this.cardList.forEach(item => {
 								this.$set(item,'currentPage',1)
 								this.$set(item,'loadStatus','more')

BagStation/pages/components/price-tab.vue

@@ -115,8 +115,7 @@
 					// console.log(String(value).split('.')[1].substring(2,4),String(value).split('.')[1].length,'*-*-*-*-');
 					// console.log( Number(`${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0,2)}`)+0.01,'************');
 					// return String(value).split('.')[1]&&String(value).split('.')[1].length>2? Number(`${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0,2)}`)+0.01 :Number(value).toFixed(2);
-					return String(value).split('.')[1]&&String(value).split('.')[1].length>2? 
+					return String(value).split('.')[1]&&String(value).split('.')[1].length>2?Number(`${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0,2)}${Number(String(value).split('.')[1].substr(2))==0?'':9}`).toFixed(2) :Number(value).toFixed(2);
-					 Number(`${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0,2)}${Number(String(value).split('.')[1].substr(2))==0?'':9}`).toFixed(2) :Number(value).toFixed(2);
 				} else {
 					return Number(value).toFixed(2)
 				} 

main.js

@@ -88,7 +88,7 @@ Vue.prototype.olitype = function(value){
 }
 Vue.prototype.moneyIntercept = function(value){
 		if (value != 'xxx.x') {
-								return String(value).split('.')[1]&&String(value).split('.')[1].length>2?Number(`${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0,2)}${Number(String(value).split('.')[1].substr(2))==0?'':9}`).toFixed(2) :Number(value).toFixed(2);
+		return String(value).split('.')[1]&&String(value).split('.')[1].length>2?Number(`${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0,2)}${Number(String(value).split('.')[1].substr(2))==0?'':9}`).toFixed(2) :Number(value).toFixed(2);
 		} else {
 			return Number(value).toFixed(2)
 		}

pages/tabbar/order/orderList/orderList.vue

@@ -145,9 +145,9 @@
 			}else{
 				this.getOrder(this.ative)
 			}
-			setTimeout(function() {
+			// setTimeout(function() {
-				uni.stopPullDownRefresh()
+			// 	uni.stopPullDownRefresh()
-			}, 1000);
+			// }, 1000);
 		},
 		onReachBottom() {
 			console.log('这里是onReachBottom')
@@ -227,6 +227,8 @@
 							this.status.loadOrderStatus = 'load'
 						}
 					}
+				}).finally(()=>{
+						uni.stopPullDownRefresh()
 				})
 			},
 			
@@ -268,6 +270,8 @@
 							this.status.loadOrderStatus = 'load'
 						}
 					}
+				}).finally(()=>{
+						uni.stopPullDownRefresh()
 				})
 			},
 			changeHaed(code){

pages/tabbar/user/user.vue

@@ -57,7 +57,7 @@
 					<view class="text-center">
 						<text class="text-sm">您一共有
 							<text
-								class="oil-main-color padding-left-xs padding-right-xs">{{userTotal.oilCardNumber}}</text>
+								class="oil-main-color padding-left-xs padding-right-xs">{{cardSum.length}}</text>
 							张油卡</text>
 					</view>
 				</view>
@@ -139,6 +139,9 @@
 		},
 		data() {
 			return {
+				showCard:[],
+				hideCard:[],
+				cardSum:[],
 				yellowURL: this.global.yellowURL,
 				imgURL: this.global.imgURL,
 				starUrl: this.global.starUrl,
@@ -198,12 +201,27 @@
 					url: '/BagMoney/pages/oilCards/oilCards' 
 				})
 			},
-			getAmount() {
+		 async	getAmount() {
-				accountApi.getTotalOilCardInfo().then(res => {
+			 
+			await	accountApi.getTotalOilCardInfo().then(res => {
+				console.log(1)
 					if (res.code == 20000) {
 						this.userTotal = res.data
 					}
 				})
+			await	accountApi.getUserAccount().then(res => {
+				console.log(2)
+					this.showCard = []
+					res.data.forEach(item=>{
+						this.showCard.push(item.companyId)
+					})
+				})
+			await	accountApi.getSyncDeductions().then(res => {
+				console.log(3)
+					if (res.code == 20000) {
+						this.cardSum = this.showCard.filter(item=>!res.data.companyIds.includes(item))
+					}
+				})
 			},
 			copy() {
 				uni.setClipboardData({

utils/request.js

@@ -5,7 +5,7 @@ import utils from '@/utils/encode'
 // const env = 'test'
 const env = 'production'
  // 45
-const testUrl = 'http://192.168.0.54:38080'
+const testUrl = 'http://192.168.0.45:38080'
 // const productUrl = 'https://www.xingoil.com/adminapi'
 
 const productUrl = 'http://uat.xingoil.com/adminapi'