caoliancun/MP_XOIL_company_new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
lixuan
2022-11-24 15:09:40 +08:00
parent b4acb8c469 7130e6e200
commit 3ebb5ec952
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BagStation/pages/components/price-tab.vue
View File

@@ -115,8 +115,7 @@
// console.log(String(value).split('.')[1].substring(2,4),String(value).split('.')[1].length,'*-*-*-*-'); // 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,'************'); // 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? 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 { } else {
return Number(value).toFixed(2) return Number(value).toFixed(2)
} }

2
main.js
View File

@@ -88,7 +88,7 @@ Vue.prototype.olitype = function(value){
} }
Vue.prototype.moneyIntercept = function(value){ Vue.prototype.moneyIntercept = function(value){
if (value != 'xxx.x') { 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 { } else {
return Number(value).toFixed(2) return Number(value).toFixed(2)
} }

10
pages/tabbar/order/orderList/orderList.vue
View File

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

2
utils/request.js
View File

@@ -5,7 +5,7 @@ import utils from '@/utils/encode'
// const env = 'test' // const env = 'test'
const env = 'production' const env = 'production'
// 45 // 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 = 'https://www.xingoil.com/adminapi'
const productUrl = 'http://uat.xingoil.com/adminapi' const productUrl = 'http://uat.xingoil.com/adminapi'