sunny 1 year ago
parent
commit
9e45ed251d
4 changed files with 96 additions and 77 deletions
  1. 15 15
      src/api/allApi.js
  2. 1 1
      src/utils/request.js
  3. 76 57
      src/views/HomeView/GoodsDetail.vue
  4. 4 4
      src/views/HomeView/MyCenter.vue

+ 15 - 15
src/api/allApi.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 商品兑换列表
 export function integralList(query) {
   return request({
-    url: '/admin/mall-sku/integral/user/list',
+    url: '/mall-sku/integral/user/list',
     method: 'get',
     data:query
   })
@@ -12,7 +12,7 @@ export function integralList(query) {
 // 商品详情
 export function integralInfo(query) {
   return request({
-    url: '/admin/mall-sku/integral/info',
+    url: '/mall-sku/integral/info',
     method: 'get',
     params: query
   })
@@ -21,7 +21,7 @@ export function integralInfo(query) {
 // 节日礼品兑换列表
 export function festivalList(query) {
   return request({
-    url: '/admin/mall-sku/festival/user/list',
+    url: '/mall-sku/festival/user/list',
     method: 'post',
     params: query
   })
@@ -30,7 +30,7 @@ export function festivalList(query) {
 // 节日礼品详情
 export function festivalInfo(query) {
   return request({
-    url: '/admin/mall-sku/festival/user/info',
+    url: '/mall-sku/festival/user/info',
     method: 'get',
     params: query
   })
@@ -38,7 +38,7 @@ export function festivalInfo(query) {
 // 兑换须知   商品兑换须知 goodsNotice 礼品兑换须知giftNotice
 export function notice(query) {
   return request({
-    url: '/admin/news/mall/getNotice',
+    url: '/news/mall/getNotice',
     method: 'get',
     params: query
   })
@@ -47,7 +47,7 @@ export function notice(query) {
 //积分兑换
 export function start(query) {
   return request({
-    url: '/admin/mall-order/start',
+    url: '/mall-order/start',
     method: 'post',
     data:query
   })
@@ -55,7 +55,7 @@ export function start(query) {
 //福利券兑换
 export function kill(query) {
   return request({
-    url: '/admin/mall-order/kill',
+    url: '/mall-order/kill',
     method: 'post',
     data:query
   })
@@ -65,7 +65,7 @@ export function kill(query) {
 //福利分类
 export function welfareType(data) {
   return request({
-    url: '/admin/mall-sku/user/getWelfare',
+    url: '/mall-sku/user/getWelfare',
     method: 'post',
     data
   })
@@ -75,7 +75,7 @@ export function welfareType(data) {
 //用户福利、兑换券列表
 export function welfareList(query) {
   return request({
-    url: '/admin/mall-welfare/welfare/user/list',
+    url: '/mall-welfare/welfare/user/list',
     method: 'get',
     params:query
   })
@@ -83,7 +83,7 @@ export function welfareList(query) {
 //用户福利领取
 export function receiveWelfare(query) {
   return request({
-    url: '/admin/mall-welfare/receive',
+    url: '/mall-welfare/receive',
     method: 'post',
     params:query
   })
@@ -93,7 +93,7 @@ export function receiveWelfare(query) {
 //用户兑换列表
 export function orderList(query) {
   return request({
-    url: '/admin/mall-order/user/list',
+    url: '/mall-order/user/list',
     method: 'post',
     params:query
   })
@@ -102,7 +102,7 @@ export function orderList(query) {
 //订单详情
 export function orderInfo(query) {
   return request({
-    url: '/admin/mall-order/info',
+    url: '/mall-order/info',
     method: 'post',
     params:query
   })
@@ -110,11 +110,11 @@ export function orderInfo(query) {
 
 
 //员工确认
-export function orderConfirm(data) {
+export function orderConfirm(query) {
   return request({
-    url: '/admin/mall-order/user/confirm',
+    url: '/mall-order/user/confirm',
     method: 'post',
-    data
+    params:query
   })
 }
 

+ 1 - 1
src/utils/request.js

@@ -4,7 +4,7 @@ import { getToken } from '@/utils/auth'
 
 // create an axios instance
 const service = axios.create({
-  baseURL: 'http://192.168.100.208:9083/', // api的base_url
+  baseURL: 'http://192.168.100.208:9083/admin', // api的base_url
   timeout: 10000 // request timeout
 })
 

File diff suppressed because it is too large
+ 76 - 57
src/views/HomeView/GoodsDetail.vue


+ 4 - 4
src/views/HomeView/MyCenter.vue

@@ -156,11 +156,11 @@ export default {
                     name: '待确认',
                 },
                 {
-                    value: '2',
+                    value: '3',
                     name: '已确认',
                 },
                 {
-                    value: '3',
+                    value: '2',
                     name: '作废',
                 },
             ],
@@ -199,12 +199,12 @@ export default {
 
         },
         getSecondList(val){
-            orderList({orderTypes:val}).then(response=>{
+            orderList({orderType:val}).then(response=>{
                 this.secondList = response.data.data;
             })
         },
         getThirdList(){
-            welfareList({status:'1,2'}).then(response=>{
+            welfareList({status:'1'}).then(response=>{
                 const dataList = response.data.data;
                 dataList.forEach(element => {
                     element.imgUrl = element.relationWelfareVo.imgUrl;