diff --git a/gasStation-uni/pages/refuel/refuel.vue b/gasStation-uni/pages/refuel/refuel.vue
index eddc1f854..381f0f5cb 100644
--- a/gasStation-uni/pages/refuel/refuel.vue
+++ b/gasStation-uni/pages/refuel/refuel.vue
@@ -10,8 +10,9 @@
-
- {{store.name}}{{store.description ? "("+store.description+")" : ""}}
+
+ {{store.name}}{{store.description ? "("+store.description+")" : ""}}
+
{{store.address}}
￥{{oilPrice}}/{{oilUnit}}
@@ -33,10 +34,8 @@
v-for="(item,index) in 4" :key="index">
92#
-->
-
+
{{item.oilNames}}
@@ -48,9 +47,8 @@
v-for="(item,index) in 8" :key="index">
{{index}}号枪
-->
-
+
{{item.gunName}}
@@ -76,7 +74,7 @@
-
+
@@ -89,9 +87,8 @@
v-for="(item,index) in 19" :key="index">
{{index}}员工
-->
-
+
{{item.realName}}员工
@@ -99,7 +96,7 @@
-
+
@@ -120,43 +117,43 @@
aindex: 0,
sindex: 0,
// 店铺信息
- store:{},
+ store: {},
// 店铺福利信息
- welfare:[],
+ welfare: [],
// 距离信息
distance: "",
// 当前店铺id
- storeId:"",
+ storeId: "",
// 油号列表信息
- oilNumberList:[],
+ oilNumberList: [],
// 油枪列表信息
- oilGunList:[],
+ oilGunList: [],
// 员工列表信息
staffList: [],
// 加油金额列表
- amountList:[100,200,300],
+ amountList: [100, 200, 300],
// url信息
baseUrl: this.$baseUrl,
// 油价
- oilPrice:0,
+ oilPrice: 0,
// 油品单位
- oilUnit:"",
+ oilUnit: "",
// 油品订单信息
- oilOrder:{
- storeId:"",
- userId:"",
- couponId:"",
- commissionAmount:0,
- staffId:"",
- terminal:"applet",
- oils:"",
- oilGunNum:"",
- oilNum:"",
- orderAmount:0,
- discountAmount:0,
- payAmount:0,
- payUser:"",
- payType:"WECHAT",
+ oilOrder: {
+ storeId: "",
+ userId: "",
+ couponId: "",
+ commissionAmount: 0,
+ staffId: "",
+ terminal: "applet",
+ oils: "",
+ oilGunNum: "",
+ oilNum: "",
+ orderAmount: 0,
+ discountAmount: 0,
+ payAmount: 0,
+ payUser: "",
+ payType: "WECHAT",
},
}
},
@@ -167,21 +164,23 @@
this.isExistStoreId();
},
methods: {
- isExistStoreId(){
- if (uni.getStorageSync("inviteStoreId") != ""){
+ isExistStoreId() {
+ if (uni.getStorageSync("inviteStoreId") != "") {
this.getStore(uni.getStorageSync("inviteStoreId"));
- }else{
+ } else {
this.getAddress();
}
},
// 获取门店信息
- getStore(id){
+ getStore(id) {
let _this = this;
request({
url: "business/storeInformation/store/queryStoreById",
method: 'post',
- data:{"storeId":id},
- }).then((res)=>{
+ data: {
+ "storeId": id
+ },
+ }).then((res) => {
_this.getOilNumber(id);
_this.getStaffList(id)
_this.store = res.data
@@ -196,11 +195,11 @@
})
},
// 获取当前位置
- getAddress(){
+ getAddress() {
let _this = this;
uni.getLocation({
// 谷歌使用wgs84 其他使用gcj02
- type: 'gcj02', // 使用国测局坐标系
+ type: 'gcj02', // 使用国测局坐标系
success: function(res) {
// console.log('经度: ' + res.longitude);
// console.log('纬度: ' + res.latitude);
@@ -211,19 +210,19 @@
"lon": res.longitude,
"lat": res.latitude
},
- }).then((response)=>{
+ }).then((response) => {
_this.distance = (response.data.distance).toFixed(1);
_this.store = response.data.store;
_this.storeId = response.data.store.id;
_this.getOilNumber(_this.storeId);
_this.getStaffList(_this.storeId)
let welfare = response.data.store.welfare;
- if (welfare != undefined && welfare!=null && welfare!=""){
- if (welfare.includes(",")){
- _this.welfare = response.data.store.welfare.split(",");
- }else {
- _this.welfare.push(response.data.store.welfare);
- }
+ if (welfare != undefined && welfare != null && welfare != "") {
+ if (welfare.includes(",")) {
+ _this.welfare = response.data.store.welfare.split(",");
+ } else {
+ _this.welfare.push(response.data.store.welfare);
+ }
}
})
},
@@ -233,12 +232,12 @@
});
},
// 获取当前店铺油号信息
- getOilNumber(storeId){
+ getOilNumber(storeId) {
let _this = this;
request({
url: "business/petrolStationManagement/oilNumber/getOilNumberName/" + storeId,
method: 'get',
- }).then((res)=>{
+ }).then((res) => {
_this.oilNumberList = res.data;
_this.getOilGun(res.data[0].numberId);
_this.oilPrice = res.data[0].gbPrice
@@ -246,43 +245,43 @@
})
},
// 获取当前店铺油号对应的油枪信息
- getOilGun(numberId){
+ getOilGun(numberId) {
let _this = this;
request({
url: "business/petrolStationManagement/oilGun/queryGunList/" + numberId,
method: 'get',
- }).then((res)=>{
+ }).then((res) => {
_this.oilGunList = res.data
})
},
- getStaffList(storeId){
+ getStaffList(storeId) {
let _this = this;
request({
url: "business/member/staff/queryStaffList/" + storeId,
method: 'get',
- }).then((res)=>{
+ }).then((res) => {
_this.staffList = res.data
})
},
getSIndex(index) {
this.sindex = index
// 添加油品订单信息
-
+
uni.navigateTo({
url: '/pagesRefuel/orderDetail/index'
})
},
- getAIndex(index,amount) {
- this.value = amount+""
+ getAIndex(index, amount) {
+ this.value = amount + ""
this.aindex = index
},
- getHIndex(index,data) {
+ getHIndex(index, data) {
this.hindex = index
this.getOilGun(data.numberId)
this.oilPrice = data.gbPrice
this.oilUnit = data.unit
},
- getQIndex(index,id) {
+ getQIndex(index, id) {
this.qindex = index
},
goRefuel() {
@@ -290,22 +289,22 @@
url: '/pagesRefuel/pagesRefuel/index'
})
},
- change(){
-
+ change() {
+
},
// 关闭弹窗
- closeStaff(){
+ closeStaff() {
this.$refs.popup.close()
},
// 数字键盘确定按钮
- submitAmount(){
- if (this.value!=""){
+ submitAmount() {
+ if (this.value != "") {
this.show = false
this.$refs.popup.open('bottom')
- }else{
+ } else {
uni.showToast({
- title:"请输入加油金额",
- icon:"error"
+ title: "请输入加油金额",
+ icon: "error"
})
}
},
@@ -398,6 +397,13 @@
font-size: 14px;
margin: 5px 0px;
color: #999999;
+ text-overflow: -o-ellipsis-lastline;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ line-clamp: 2;
+ -webkit-box-orient: vertical;
}
.top-hong {
@@ -431,6 +437,7 @@
display: flex;
flex-wrap: wrap;
}
+
.wrap-box1 {
width: 100%;
display: flex;
@@ -451,6 +458,7 @@
padding: 12px 0px;
border-radius: 6px;
}
+
.box-oil1 {
width: 29%;
display: flex;
@@ -463,6 +471,7 @@
padding: 12px 0px;
border-radius: 6px;
}
+
.box-oil2 {
width: 28%;
display: flex;