diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
new file mode 100644
index 0000000..501e01c
--- /dev/null
+++ b/.hbuilderx/launch.json
@@ -0,0 +1,11 @@
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+ // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+ "version": "0.0",
+ "configurations": [{
+ "type": "uniCloud",
+ "default": {
+ "launchtype": "remote"
+ }
+ }
+ ]
+}
diff --git a/api/cloud-site.js b/api/cloud-site.js
index ee17e71..006e6d7 100644
--- a/api/cloud-site.js
+++ b/api/cloud-site.js
@@ -2,7 +2,30 @@ import request from '@/utils/request'
const service_name = "cloud-site-service"
const group_name = "cloudSite"
export default {
-
+ // 小程序码下单
+ saveXoilOrder(data) {
+ return request({
+ url: `/${service_name}/${group_name}/saveXoilOrder`,
+ method: 'post',
+ data: data
+ })
+ },
+ // 小程序加油订单详情
+ getNewItemSiteOrderInfo(data) {
+ return request({
+ url: `/${service_name}/${group_name}/getNewItemSiteOrderInfo`,
+ method: 'post',
+ data: data
+ })
+ },
+ // 小程序加油订单列表
+ getNewItemSiteOrder(data) {
+ return request({
+ url: `/${service_name}/${group_name}/getNewItemSiteOrder`,
+ method: 'post',
+ data: data
+ })
+ },
// 换手机号提交
updatePhone(data) {
return request({
@@ -113,6 +136,14 @@ export default {
data: data
})
},
+ // 扫则一码
+ VerifyZeYiQrCode(data) {
+ return request({
+ url: `/${service_name}/${group_name}/VerifyZeYiQrCode`,
+ method: 'post',
+ data: data
+ })
+ },
// 下单
saveOrder(data) {
return request({
@@ -121,6 +152,14 @@ export default {
data: data
})
},
+ // 下则一单
+ saveZeyiOrder(data) {
+ return request({
+ url: `/${service_name}/${group_name}/saveZeyiOrder`,
+ method: 'post',
+ data: data
+ })
+ },
// 经营分析 日
getAnyDay(date) {
return request({
diff --git a/new_file.json b/new_file.json
new file mode 100644
index 0000000..542b672
--- /dev/null
+++ b/new_file.json
@@ -0,0 +1,40 @@
+{
+ "code": 20000,
+ "msg": "操作成功！",
+ "data": {
+ "refuelingVolume": null,
+ "customerOrderId": "JYDH19053100000019",
+ "siteName": "中国石油潍坊豪杰站",
+ "siteAddress": "山东省潍坊市潍城区潍城经济开发区中国石油加油站",
+ "customerName": "陈*",
+ "customerPhone": "185****0172",
+ "companyId": "1391693418146357248",
+ "refuelingAmount": 7566,
+ "customerId": "1393053728561012736",
+ "siteId": "758380077",
+ "oilSitePriceDetailsVos": [{
+ "sitePrice": 6.22000,
+ "oilSitePrice": 5.77000,
+ "oilsBar": null,
+ "oilProductCode": "0#",
+ "priceId": "1222978481300"
+ }, {
+ "sitePrice": 6.57000,
+ "oilSitePrice": 0.00000,
+ "oilsBar": null,
+ "oilProductCode": "92#",
+ "priceId": "9823486833669"
+ }, {
+ "sitePrice": 6.91000,
+ "oilSitePrice": 6.69000,
+ "oilsBar": null,
+ "oilProductCode": "-10#",
+ "priceId": "8298484400193"
+ }],
+ "userBalance": 0,
+ "vehicleLicenseNum": ""
+ },
+ "encrypt": 0,
+ "error": false,
+ "ok": true
+}
diff --git a/packageOrders/components/order-item.vue b/packageOrders/components/order-item.vue
index 20d48f3..190ba84 100644
--- a/packageOrders/components/order-item.vue
+++ b/packageOrders/components/order-item.vue
@@ -3,9 +3,12 @@
-
-
-
+
+
+
@@ -23,7 +26,8 @@
- {{item.vol|numberFilter}}升
+
+ {{item.vol|numberFilter}}升
{{item.oilName}}
@@ -49,29 +53,30 @@
- {{item.createDatetime.substring(0,19)}}
+ {{item.createDatetime.substring(0,19)}}
+
￥{{item.realamount|numberFilter}}
-
- {{item.istate|formatStr}}
+
+ {{istate|formatStr}}
-
- {{item.istate|formatStr}}
+
+ {{istate|formatStr}}
-
- {{item.istate|formatStr}}
+
+ {{istate|formatStr}}
-
- {{item.istate|formatStr}}
+
+ {{istate|formatStr}}
@@ -88,16 +93,39 @@
+
+
diff --git a/utils/request.js b/utils/request.js
index dce5e3a..b8de69c 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,22 +1,21 @@
import axios from 'axios'
import utils from '@/utils/encode'
const service = axios.create({
- // baseURL: 'http://192.168.0.10:48080', // 小杰
- baseURL: 'https://www.51xingka.net/oilApp',//生产
+ // baseURL: 'http://192.168.0.33:48080', //
+ baseURL: 'https://www.51xingka.net/oilApp', //生产
timeout: 5000
})
var url = ''
+// const env = process.env.NODE_ENV
+const env = 'production' // 测试中的生茶、
service.interceptors.request.use(
config => {
- const env = process.env.NODE_ENV
-
// 拦截请求
uni.showLoading({
title: '加载中...'
})
const token = uni.getStorageSync('Authorization')
const openid = uni.getStorageSync('device')
- console.log('取出来缓存', token, openid)
config.headers['Authorization'] = token
config.headers['device'] = openid
@@ -34,9 +33,9 @@ service.interceptors.request.use(
const data = { // 用于存储加密
params: '' // 加密后的密文
}
+ console.log('请求路径', config.url, '参数加密前', config.data)
// 要加密
data.params = utils.encrypt(JSON.stringify(config.data))
- console.log(data.params)
config.data = data
// }
} else {
@@ -59,7 +58,8 @@ service.interceptors.request.use(
service.interceptors.response.use(
response => {
const res = response.data
- const env = process.env.NODE_ENV
+ // const env = process.env.NODE_ENV
+ // const env = 'production' // 测试中的生茶
if (env === 'production') {
// 生产环境，进行加密解密，不输出日志
@@ -67,6 +67,7 @@ service.interceptors.response.use(
// 加密的数据，需要解密
const dataParam = JSON.parse(utils.decrypt(res.data))
res.data = JSON.stringify(dataParam) === '{}' ? null : dataParam
+ console.log('生产环境 请求路径', response.config.url, '解密为', res.data)
}
} else {
console.log('请求路径', response.config.url, '返回结果未加密', res)