diff --git a/BagStation/pages/makeOrder/orderPaying.vue b/BagStation/pages/makeOrder/orderPaying.vue index 3700c17..5431ca4 100644 --- a/BagStation/pages/makeOrder/orderPaying.vue +++ b/BagStation/pages/makeOrder/orderPaying.vue @@ -138,7 +138,7 @@ - 加油金额:{{order.xoilAmountGun |moneyFormat}} + 加油金额:{{moneyIntercept(order.xoilAmountGun) }} @@ -156,7 +156,7 @@ 合计: - ¥{{order.realAmount>0? order.realAmount:'xxx.x' | moneyFormat}} + ¥{{order.realAmount>0? moneyIntercept(order.realAmount) :'xxx.x' }} diff --git a/main.js b/main.js index a306002..56e81ff 100644 --- a/main.js +++ b/main.js @@ -26,7 +26,13 @@ Vue.component('cu-custom',cuCustom) Vue.component('my-empty',Empty) - +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,1)}${ Number(String(value).split('.')[1].substring(1,2)) + 1}`) :Number(value).toFixed(2); + } else { + return Number(value).toFixed(2) + } +} let qqmapsdk = new QQMapWX({ // key: 'IUKBZ-5MKL3-HXB3P-3OS7U-6MHX3-MYBI3' key:'NYEBZ-YURY3-XTU3N-YBR54-PKW6E-ROB2F' diff --git a/pages.json b/pages.json index e4b3fcc..0a32715 100644 --- a/pages.json +++ b/pages.json @@ -58,7 +58,16 @@ } } - ], + ,{ + "path" : "pages/tabbar/home/link", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + } + ], "subPackages": [{ "root": "BagAuth", "pages": [{ diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue index 9aa50e5..f464223 100644 --- a/pages/tabbar/home/home.vue +++ b/pages/tabbar/home/home.vue @@ -133,8 +133,13 @@ --> - - + + + + + + + @@ -174,6 +179,16 @@ }, data() { return { + swiperArray:[ + // { + // src:this.global.starUrl+'banner.png', + // link:'' + // }, + { + src: 'https://xoil-public.oss-cn-beijing.aliyuncs.com/WMP-IMG/banner-2dwk.png', + link: 'https://tengxun.hkzj168.com/?ChannelId=20220831152210221048473' + }, + ], siteInfo: { }, @@ -333,6 +348,19 @@ }, methods: { + swiperClick(item,index) { + if(!item?.link) return + switch (Number(index)) { + // case 0: + // this.goCall() + // break; + default: + console.log('item.link') + uni.navigateTo({ + url: '/pages/tabbar/home/link?url=' + encodeURIComponent(JSON.stringify(item.link)) + }) + } + }, goToPage(url) { if (!url) return; uni.navigateTo({ diff --git a/pages/tabbar/home/link.vue b/pages/tabbar/home/link.vue new file mode 100644 index 0000000..cef1285 --- /dev/null +++ b/pages/tabbar/home/link.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/static/swiper/etc.png b/static/swiper/etc.png new file mode 100644 index 0000000..1d837b7 Binary files /dev/null and b/static/swiper/etc.png differ diff --git a/utils/request.js b/utils/request.js index 9ca6c80..cfd7047 100644 --- a/utils/request.js +++ b/utils/request.js @@ -2,8 +2,8 @@ import axios from 'axios' import utils from '@/utils/encode' // const env = process.env.NODE_ENV -// const env = 'production'/* */ -const env = 'test' +const env = 'production'/* */ +// const env = 'test' const testUrl = 'http://192.168.0.65:38080' // const productUrl = 'http://121.196.213.68/adminapi' //预生产