进店开单

hdApp/src/api/ghs-product/index.js

@@ -1,8 +0,0 @@
-import https from '@/plugins/luch-request_0.0.7/request'
-
-/** *
- * 供货商花材列表（进店开单） 【采购开单】 姜枫 2021.04.11
- */
-export const getGhsProductList = data => {
-	return https.get('/ghs-product/index', data)
-}

hdApp/src/api/product/index.js

@@ -45,3 +45,10 @@ export const getPxClassDataApi = data => {
 export const getGoodsDataApi = data => {
 	return https.get("/goods/index", data);
 };
+
+/** *
+ * 供货商花材列表（进店开单） 【采购开单】 姜枫 2021.04.11
+ */
+ export const getGhsProductList = data => {
+	return https.get('/product/ghs-item', data)
+}

hdApp/src/mixins/product.js

@@ -1,5 +1,5 @@
 import { getGoodsDataApi,getProductDataApi,getPxClassDataApi } from "@/api/product/index";
-import { getGhsProductList } from "@/api/ghs-product/index";
+import { getGhsProductList } from "@/api/product/index";
 import { mapGetters, mapActions } from "vuex";
 import { copyObject } from "@/utils/util";
 export default {
@@ -22,13 +22,13 @@ export default {
 	},
 	onLoad(options) {
 		this.options = options;
-		const { pageType,shopId,sjId } = options;
+		const { pageType,id } = options;
 		if (pageType) {
 			this.pageType = pageType;
 		}
 		if (this.autoLoad) {
 			if(this.isGhsProduct){
-				this.initGhsData(shopId,sjId);//采购-进店下单
+				this.initGhsData(id);//采购-进店下单
 			}else{
 				this.initGoodsData();//成品
 				this.initData();//组合
@@ -204,13 +204,12 @@ export default {
 		/**
 		 * 请求商品数据
 		 */
-		async initGhsData(shopId,sjId) {
+		async initGhsData(id) {
 			//extendInfo调用时的扩展参数  如  shopId
 			try {
 				let params = {
 					py: this.py,
-					sjId: sjId,
-					shopId: shopId,
+					id:id
 				};
 				const { data } = await getGhsProductList(params);
 				data.forEach(element => {

hdApp/src/pagesPurchase/order.vue

@@ -110,7 +110,7 @@ export default {
   methods: {
     enter (item) {
     	const {id,ghsShopId,ghsSjId} = item
-      uni.navigateTo({url: `/pagesPurchase/ghsProduct?shopId=${ghsShopId}&sjId=${ghsSjId}&id=${id}`})
+      uni.navigateTo({url: `/pagesPurchase/ghsProduct?id=${id}`})
     },
     getGHSList () {
       ghsList().then(res => {