中秋更行

pull/1/head
caolc 2 years ago
parent a10b2b7dcc
commit ced82c19bc
  1. 4
      BagStation/pages/makeOrder/orderPaying.vue
  2. 8
      main.js
  3. 9
      pages.json
  4. 32
      pages/tabbar/home/home.vue
  5. 28
      pages/tabbar/home/link.vue
  6. BIN
      static/swiper/etc.png
  7. 4
      utils/request.js

@ -138,7 +138,7 @@
</view>
<view class="dashed-top margin-top-xs padding-top-sm">
<view class="padding-tb-xs text-left">
加油金额<text class="fr">{{order.xoilAmountGun |moneyFormat}}</text>
加油金额<text class="fr">{{moneyIntercept(order.xoilAmountGun) }}</text>
<!-- <text
class="fr">{{order.oilDiscountAmount>0?order.realAmount+order.oilDiscountAmount:order.realAmount|moneyFormat}}</text> -->
</view>
@ -156,7 +156,7 @@
<view class="padding-tb-xs text-left">
合计
<text class="text-red text-bold text-lg fr">
{{order.realAmount>0? order.realAmount:'xxx.x' | moneyFormat}}</text>
{{order.realAmount>0? moneyIntercept(order.realAmount) :'xxx.x' }}</text>
</view>
</view>
</view>

@ -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'

@ -57,6 +57,15 @@
"enablePullDownRefresh": false
}
}
,{
"path" : "pages/tabbar/home/link",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
}
],
"subPackages": [{

@ -133,8 +133,13 @@
</view> -->
<!-- 广告图片开始 -->
<view class="my-bg padding">
<view class="" @tap="goCall">
<image :src="starUrl+'banner.png'" style="width: 100%;" mode="widthFix"></image>
<view class="" >
<swiper autoplay interval='5000' style="width: 100%;height: 204rpx;" class="swiper" circular >
<swiper-item @click="swiperClick(item,index)" v-for="(item,index) in swiperArray">
<image :src="item.src" style="width: 100%;" mode="widthFix"></image>
</swiper-item>
</swiper>
<!-- <image :src="starUrl+'banner.png'" style="width: 100%;" mode="widthFix"></image> -->
</view>
</view>
<!-- 筛选开始 -->
@ -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({

@ -0,0 +1,28 @@
<template>
<view>
<web-view :src="url"></web-view>
</view>
</template>
<script>
export default {
data() {
return {
url: ''
}
},
methods: {
},
onReady() {
},
onLoad(e) {
this.url = JSON.parse(decodeURIComponent(e.url ));
},
}
</script>
<style>
</style>

Binary file not shown.

After

Width:  |  Height:  |  Size: 198 KiB

@ -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' //预生产

Loading…
Cancel
Save