api

assets/http/api.js

@@ -14,7 +14,10 @@ const uploadFile =(p)=> http.upload('blade-resource/oss/endpoint/put-file', {nam
 
 //活动管理
 const activity = {
-	list:p => http.get('yyzs/cyzh-activity/activity/selectPageWithTag', {params:p,custom: {yyzs: true}}),
+	//音乐之声活动
+	yyzs_list:p => http.get('yyzs/cyzh-activity/activity/selectPageWithTag', {params:p,custom: {yyzs: true}}),
+	//商户活动
+	list:p => http.get('cyzh-ldt/activity/list', {params:p}),
 }
 
 //用户管理
@@ -22,11 +25,17 @@ const loginUser={
 	detail:p => http.get('cyzh-ldt/loginuser/detail', {params:p}),
 	submit:p => http.post('cyzh-ldt/loginuser/submit', p),
 	login:p => http.post('cyzh-ldt/loginuser/login', p),
+	payBefore:p => http.post('cyzh-ldt/loginuser/payBefore', p),
+	payBeforeForNormal:p => http.post('cyzh-ldt/loginuser/payBeforeForNormal', p),
+	getBillrecordFromRedis:p => http.get('cyzh-ldt/loginuser/getBillrecordFromRedis', {params:p}),
+	clearBillRecordCache:p => http.get('cyzh-ldt/loginuser/clearBillRecordCache', {params:p}),
+	
 }
 
 //商户管理
 const shop={
 	list:p => http.get('cyzh-ldt/shop/list', {params:p}),
+	detail:p => http.get('cyzh-ldt/shop/detail', {params:p}),
 }
 
 //商场管理
@@ -58,11 +67,15 @@ const userBank={
 
 //支付
 const pay={
-	payOrder:p => http.get('payment/payOrder/YEE_PAY/SCAN_CODE',{params:p}),
+	//wx支付
+	payOrder:p => http.get('payment/payOrder/YEE_PAY/MINI_PROGRAM',{params:p}),
+	//扫码支付
+	payOrderOfscanCode:p => http.get('payment/payOrder/YEE_PAY/SCAN_CODE',{params:p}),
 }
 
 const billRecord={
 	submit:p => http.post('cyzh-ldt/billrecord/submit', p),
+	detail:p => http.get('cyzh-ldt/billrecord/detail', {params:p}),
 }
 
 const setting = {
@@ -71,7 +84,7 @@ const setting = {
 
 const account = {
 	pointList:p => http.get('cyzh-ldt/loginuser/channeluserpoint/list',{params:p}),
-	remainList:p => http.get('cyzh-ldt/loginuse/remaining/list',{params:p}),
+	remainList:p => http.get('cyzh-ldt/loginuser/remaining/list',{params:p}),
 }
 
 export const api={

pages/consume/detail/comps/shop-activity.vue

@@ -62,9 +62,10 @@
 			fetchList(){
 				let params={
 					sponsorId:this.shopId,
-					sponsorType:2
+					sponsorType:2,
+					auditStatus:1
 				}
-				this.$api.activity.shop_list(params).then(res=>{
+				this.$api.activity.list(params).then(res=>{
 					this.list=res.data.records
 				})
 			},