diff --git a/package.json b/package.json index 8f8e904..e024353 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "scripts": { - "serve": "vue-cli-service serve --mode development", + "dev": "vue-cli-service serve --mode development", "build:test": "vue-cli-service build --mode test", "build": "vue-cli-service build --mode production", "lint": "vue-cli-service lint" diff --git a/public/thanks.jpeg b/public/thanks.jpeg new file mode 100644 index 0000000..e15ebc1 Binary files /dev/null and b/public/thanks.jpeg differ diff --git a/public/touxiang.png b/public/touxiang.png index 16c3360..7598af6 100644 Binary files a/public/touxiang.png and b/public/touxiang.png differ diff --git a/public/touxiang2.png b/public/touxiang2.png new file mode 100644 index 0000000..16c3360 Binary files /dev/null and b/public/touxiang2.png differ diff --git a/src/api/admin.js b/src/api/admin.js new file mode 100644 index 0000000..8e143b1 --- /dev/null +++ b/src/api/admin.js @@ -0,0 +1,10 @@ +import service from "./service"; + +// 订单列表 +export const getOrderList = (params) => service.get("/api/admin/orders", { data: params }); + +// 订单详情 +export const getOrderDetail = (id) => service.get(`/api/admin/order/${id}`); + +// 反馈 +export const postFeedback = (id, data) => service.post(`/api/admin/order-done/${id}`, data); diff --git a/src/api/index.js b/src/api/index.js index 80cd8d9..6231d56 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -179,8 +179,15 @@ const getMeritTypes = () => service.get("/api/order/get-merit-types"); // 支付广告 const getPayAdv = () => service.get("/api/ad/ad-pay"); +// 保存手机号 +const saveMobileNumber = (mobile) => service.put("/api/mobile", { mobile }); + +// 检查是否有手机号 +const checkUserMobile = () => service.get("/api/mobile-check"); + export { getPayAdv, + saveMobileNumber, getMeritTypes, getDynamicDataByGoodsId, hasLogin, @@ -229,4 +236,5 @@ export { getCertList, getStationTemplate, getPlatformHome, + checkUserMobile, }; diff --git a/src/api/service.js b/src/api/service.js index 520ed68..5c686e4 100644 --- a/src/api/service.js +++ b/src/api/service.js @@ -28,6 +28,10 @@ instance.interceptors.request.use((request) => { request.data = qs.stringify(request.data); return request; } + if (request.method == "get") { + request.url += `?${qs.stringify(request.data)}`; + return request; + } return request; }); diff --git a/src/components/detail-content-expand/index.vue b/src/components/detail-content-expand/index.vue index 91563fc..1d31177 100644 --- a/src/components/detail-content-expand/index.vue +++ b/src/components/detail-content-expand/index.vue @@ -57,7 +57,7 @@ export default { this.defaultContentHeight = 100; return; } - this.defaultContentHeight = selector.offsetHeight / (4 / 1); + this.defaultContentHeight = selector.offsetHeight / (2 / 1); }, }, }; diff --git a/src/components/user-merit/index.vue b/src/components/user-merit/index.vue index 0d9569c..d83ee3a 100644 --- a/src/components/user-merit/index.vue +++ b/src/components/user-merit/index.vue @@ -11,7 +11,7 @@
{{ data.order_amount || data.sum_money }}元
+已参与
{{ data.paid_at }}
+