Merge branch 'StableVersion' into develop

src/tool/https.js

@@ -137,7 +137,8 @@ export const Https = {
         productList:`/api/product/list`, //获取商品列表
         payAlipay:`/api/ali-pay/trade/page/pay`, //支付宝确认支付
         payPaypal:`/api/paypal/trade`, //paypal确认支付
-
+        getCredits:`/api/credits/getCredits`, //查询用户积分
+		
         orderInfoList:`/api/order-info/list`, //查询订单列表
         tradeRefundAlipay:`/api/ali-pay/trade/refund`, //支付宝退款
         tradeRefundPaypal:`/api/paypal/trade/refund`, //paypal退款
@@ -203,6 +204,11 @@ export const Https = {
 		trialOrderApproval:`/api/account/trialOrderApproval`,//通过审批
 		trialOrderRefuse:`/api/account/trialOrderRefuse`,//拒绝审批
 		
+		//查询所有试用用户
+		inquiryGetTrial:`/api/inquiry/getTrial`,//拒绝审批
+		//查询某个时间内design点击次数
+		getDesignStatistic:`/api/inquiry/getDesignStatistic`,//拒绝审批
+
     },
 
     axiosGet(url,config) {