diff --git a/App.vue b/App.vue index c04481a..3d42bb1 100644 --- a/App.vue +++ b/App.vue @@ -38,6 +38,8 @@ }) this.onShareAppMessage(option.query.scene); + + }, methods: { diff --git a/BagStation/orderDetail/orderDetail.vue b/BagStation/orderDetail/orderDetail.vue index 0fbea0d..9625806 100644 --- a/BagStation/orderDetail/orderDetail.vue +++ b/BagStation/orderDetail/orderDetail.vue @@ -60,7 +60,8 @@ 油品油枪 - {{order.oilsCode?order.oilsCode+' ':'' }}{{ order.gunName?order.gunName+'号枪': order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}} + {{order.oilsCode?order.oilsCode+' ':'' }}{{ order.gunName?order.gunName+'号枪': order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}} + {{order.oilProductType=='GAS'?'加气重量：':'加油升数：'}} @@ -74,7 +75,8 @@ 优惠价格 - 约{{moneyIntercept(order.realPrice) }}￥/{{order.oilProductType=='GAS'?'L':'L'}} + 约{{moneyIntercept(order.realPrice) }}￥/{{order.oilProductType=='GAS'?'L':'L'}} 加油员 @@ -144,12 +146,16 @@ - + + + + 联系客服 + @@ -194,12 +200,12 @@ tkiQrcode }, methods: { - // 拨打电话 - makeCall() { + arousePhone() { uni.makePhoneCall({ - phoneNumber: '4008-56-5355' //仅为示例 + phoneNumber: '4008-56-5355' }) }, + newQrString() { this.getOrderQrCode() }, @@ -395,7 +401,31 @@ } - diff --git a/BagStation/static/img/customer-service.png b/BagStation/static/img/customer-service.png new file mode 100644 index 0000000..50a69d3 Binary files /dev/null and b/BagStation/static/img/customer-service.png differ diff --git a/components/tabbar/index.vue b/components/tabbar/index.vue new file mode 100644 index 0000000..9e0b1e0 --- /dev/null +++ b/components/tabbar/index.vue @@ -0,0 +1,121 @@ + + + + + diff --git a/main.js b/main.js index 9086bcc..c122703 100644 --- a/main.js +++ b/main.js @@ -9,7 +9,7 @@ import encode from '@/utils/encode' import global from '@/api/global.js' import topBar from './components/topbar.vue' import tools from '@/utils/tools.js' - +// import tabbar from '@/components/tabbar/index.vue' @@ -17,6 +17,7 @@ import tools from '@/utils/tools.js' import Empty from '@/components/Empty.vue' +// Vue.component('tabbar', tabbar) Vue.component('my-icon', myIcon) Vue.component('cu-custom', cuCustom) Vue.component('my-empty', Empty) diff --git a/pages.json b/pages.json index 95c93ec..9402493 100644 --- a/pages.json +++ b/pages.json @@ -377,8 +377,8 @@ //#ifdef MP-WEIXIN { "pagePath": "pages/tabbar/qrCenter/qrCenter", - "iconPath": "static/img/tabbar/qr.png", - "selectedIconPath": "static/img/tabbar/qractive.png" + "iconPath": "static/img/tabbar/icon.png", + "selectedIconPath": "static/img/tabbar/icon.png" }, //#endif //#ifndef MP-WEIXIN diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue index b5d4ec0..15b15e9 100644 --- a/pages/tabbar/home/home.vue +++ b/pages/tabbar/home/home.vue @@ -142,7 +142,7 @@ - + @@ -160,6 +160,7 @@ + @@ -330,8 +331,10 @@ console.log(n, o, '=================') } }, - created() {}, + onReady() { + + let _that = this let IsOtherUser = _that.isOther if (IsOtherUser) { @@ -362,6 +365,8 @@ } }, onLoad(e) { + // uni.hideTabBar() + let _that = this let IsOtherUser = _that.isOther diff --git a/pages/tabbar/order/orderList/orderList.vue b/pages/tabbar/order/orderList/orderList.vue index e0e2335..472de80 100644 --- a/pages/tabbar/order/orderList/orderList.vue +++ b/pages/tabbar/order/orderList/orderList.vue @@ -63,6 +63,7 @@ + diff --git a/pages/tabbar/qrCenter/qrCenter.vue b/pages/tabbar/qrCenter/qrCenter.vue index 0426d9e..a981606 100644 --- a/pages/tabbar/qrCenter/qrCenter.vue +++ b/pages/tabbar/qrCenter/qrCenter.vue @@ -33,6 +33,7 @@ + diff --git a/pages/tabbar/station/stationList.vue b/pages/tabbar/station/stationList.vue index 4d1a2d5..1a4115e 100644 --- a/pages/tabbar/station/stationList.vue +++ b/pages/tabbar/station/stationList.vue @@ -52,6 +52,7 @@ + @@ -280,7 +281,8 @@ currentPage: this.currentPage, pageSize: 10, params: { //类型：Object 必有字段 备注：// 筛选对象 - siteNameOrId: this.siteName, //产品类型(加注方式)： + // siteNameOrId: this.siteName, //产品类型(加注方式)： + address:this.siteAddress, productType: this.productType ? this.productType : '', //1-加注机； 2-桶装 brandName: this.brandName ? this.brandName : '', // 桶装品牌名称 currentLongitude: location.longitude + '', // 当前经度 @@ -392,10 +394,10 @@ res.data.channelCodes.map(item => { - this.menuList[3].detailLists.push({ - title: item.name, - value: item.id - }) + // this.menuList[3].detailLists.push({ + // title: item.name, + // value: item.id + // }) }) res.data.productCodes.map(item => { this.menuList[2].detailList.push({ diff --git a/pages/tabbar/user/user.vue b/pages/tabbar/user/user.vue index 2e32550..6a81ace 100644 --- a/pages/tabbar/user/user.vue +++ b/pages/tabbar/user/user.vue @@ -134,6 +134,7 @@ + diff --git a/static/img/tabbar/icon.png b/static/img/tabbar/icon.png new file mode 100644 index 0000000..ca4bc90 Binary files /dev/null and b/static/img/tabbar/icon.png differ diff --git a/utils/request.js b/utils/request.js index b3f52f0..dd7714e 100644 --- a/utils/request.js +++ b/utils/request.js @@ -6,9 +6,9 @@ import utils from '@/utils/encode' const env = 'production' // 45 const testUrl = 'http://192.168.1.132: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' // const productUrl = 'http://192.168.0.191:38080' // const productUrl = 'http://121.196.213.68/adminapi' const service = axios.create({