Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test

http/yskApi/Instead.js

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

http/yskApi/http.js

@@ -17,10 +17,10 @@ import infoBox from "@/commons/utils/infoBox.js"
 import go from '@/commons/utils/go.js';
 import { reject } from 'lodash';
 // 测试服
-let baseUrl = 'https://admintestpapi.sxczgkj.cn'
+// let baseUrl = 'https://admintestpapi.sxczgkj.cn'
 
 //预发布
-// let baseUrl = 'https://pre-cashieradmin.sxczgkj.cn'
+let baseUrl = 'https://pre-cashieradmin.sxczgkj.cn'
 
 //正式
 // let baseUrl = 'https://cashieradmin.sxczgkj.cn'