合并代码

http/yskApi/Instead.js

@@ -38,14 +38,15 @@ export function getCart(params) {
  * 已上架商品列表
  * @returns
  */
-export function getGoodsLists(params) {
+export function getGoodsLists(params,showLoading=true) {
   return request({
     url: `/api/place/activate`,
     method: "get",
     params:{
       shopId: uni.getStorageSync("shopId"),
       ...params
-    }
+    },
+	showLoading
   });
 }
 

http/yskApi/http.js

@@ -16,10 +16,10 @@ import {
 import infoBox from "@/commons/utils/infoBox.js"
 import go from '@/commons/utils/go.js';
 // 测试服
-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 = '/ww'