Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/cashier/cashier_app into gaohao

http/yskApi/Instead.js

@@ -348,7 +348,7 @@ export function $activateByOrderId(data) {
 //会员积分列表
 export function $returnMemberPointsList(data) {
   return request({
-    url: '/api/points/member-points/page',
+    url: '/api/points/memberPoints/page',
     method: "get",
     params:{
       shopId: uni.getStorageSync("shopId"),
@@ -360,7 +360,7 @@ export function $returnMemberPointsList(data) {
 // 会员积分账户信息
 export function $returnMemberPoints(memberId) {
   return request({
-    url: '/api/points/member-points/'+memberId,
+    url: '/api/points/memberPoints/'+memberId,
     method: "get",
     params:{
       shopId: uni.getStorageSync("shopId"),
@@ -371,7 +371,7 @@ export function $returnMemberPoints(memberId) {
 //002-获取订单可用积分及抵扣金额（支付页面使用）
 export function $calcUsablePoints(data) {
   return request({
-    url: '/api/points/member-points/calc-usable-points',
+    url: '/api/points/memberPoints/calcUsablePoints',
     method: "get",
     params:{
       shopId: uni.getStorageSync("shopId"),
@@ -382,7 +382,7 @@ export function $calcUsablePoints(data) {
 // 003-根据积分计算可抵扣金额
 export function $calcDeDuctionPoints(data) {
   return request({
-    url: '/api/points/member-points/calc-deduction-amount',
+    url: '/api/points/memberPoints/calcDeductionAmount',
     method: "get",
     params:{
       shopId: uni.getStorageSync("shopId"),