解决冲突

ghs/vue.config.js

@@ -2,6 +2,7 @@ const path = require('path');
 
 const isProduction = process.env.NODE_ENV === 'production';
 
+//http和https切换请修改这里，修改后需要重新运行npm run serve shish 2021.4.12
 const proxyTarget = 'http://api.shop.hzghd.com';
 
 function resolve(dir) {

ghsApp/src/App.vue

@@ -28,7 +28,6 @@ export default {
 			})
 		}
 		// #endif
-
 		// 删除缓存
 		if (process.env.NODE_ENV == 'production') {
 			uni.removeStorageSync('shopUser')
@@ -38,7 +37,6 @@ export default {
 		// uni.clearStorage()
 		const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}
 		uni.setStorageSync('account', extConfig.account)
-
 		// #endif
 		wxLoginFn(true)
 			.then(res => {
@@ -66,7 +64,6 @@ export default {
 				getUser(true)
 				//获取门店信息
 				this.setUserShopAll()
-
 			})
 	},
 	onLoad(){
@@ -86,7 +83,6 @@ export default {
 	}
 }
 </script>
-
 <style lang="scss">
 	//没有scss变量方法的，主要引入 这样打包的时候就不会所有的组件都打包进去
 	@import './static/iconfont/iconfont.css';

ghsApp/src/admin/home/workbench.vue

@@ -361,9 +361,9 @@ export default {
 			getWeixinId().then(res => {
 				uni.navigateToMiniProgram({
 					appId: res.data.hd.miniAppId,
-					path: 'admin/ghs/shop',
+					path: 'pagesPurchase/ghsProduct?account='+ this.loginInfo.shopId,
 					//develop 开发板 trial 体验版 release 正式版
-					envVersion: 'develop',
+					envVersion: process.env.NODE_ENV === 'development' ? 'develop' : 'release',
 					extraData: {
 						'shopAdminId': this.loginInfo.shopAdminId
 					},

ghsApp/src/ext.json

@@ -3,7 +3,7 @@
   "extAppid": "wx21b7c3ef12082099",
   "directCommit": false,
   "ext": {
-    "account": 0,
+    "account": 12362,
     "apiHost": "https://api.shop.hzghd.com",
     "imgHost": "https://img.hzghd.com",
     "name":"花掌柜"

ghsApp/src/pages.json

@@ -124,7 +124,7 @@
 				{
 					"path": "official/latest-shop",
 					"style": {
-						"navigationBarTitleText": "最近访问的店铺"
+						"navigationBarTitleText": "最近访问"
 					}
 				},
 				{

ghsApp/src/utils/auth.js

@@ -28,7 +28,7 @@ export async function getShopUser(update) {
 		userInfo = res.data
 		store.dispatch('setShopUser', userInfo)
 	}).catch(() => {
-		uni.removeStorageSync('token')
+		//uni.removeStorageSync('token')
 	})
 
 	return userInfo
@@ -47,7 +47,7 @@ export async function getUser(update) {
 		userInfo = res.data
 		store.dispatch('setUser', userInfo)
 	}).catch(() => {
-		uni.removeStorageSync('token')
+		//uni.removeStorageSync('token')
 	})
 
 	return userInfo

glhs/src/pages.json

@@ -101,7 +101,7 @@
 				{
 					"path": "latest-shop",
 					"style": {
-						"navigationBarTitleText": "最近访问的店铺"
+						"navigationBarTitleText": "最近访问"
 					}
 				}
 			]

hdApp/src/App.vue

@@ -4,7 +4,7 @@ import { mapMutations, mapActions, mapGetters } from 'vuex'
 import { setTimeout } from 'timers'
 import { getUser, wxLoginFn } from '@/utils/auth'
 import { getDictionaries } from '@/api/mini'
-import util from "./utils/util";
+import util from "./utils/util"
 export default {
   // 全端，数据共享，还可以解决页面初始化模板访问不到值得
   // 有坑 分包里的页面访问不到

hdApp/src/admin/home/apply.vue

@@ -43,17 +43,17 @@ export default { // 应用页面
           title: '门店仓库',
           list: [
             {
-              name: "商品管理",
+              name: "商品",
               img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,
               url: "/admin/goodsManage/list"
             },
             {
-              name: "花材管理",
+              name: "花材",
               img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,
               url: "/pagesStorehouse/flower/manage"
             },
             {
-              name: "门店管理",
+              name: "门店",
               img: `${this.$constant.imgUrl}/ghs/home/shop.png`,
               url: "/admin/shop/list"
             },
@@ -78,7 +78,7 @@ export default { // 应用页面
               url: "/pagesStorehouse/inventory/list"
             },
             {
-              name: "员工管理",
+              name: "员工",
               img: `${this.$constant.imgUrl}/ghs/home/yggl.png`,
               url: "/admin/staff/list"
             },

hdApp/src/admin/home/workbench.vue

@@ -211,27 +211,27 @@ export default {
       // tab按钮
       tabsData: [
         {
-          name: "库存预警",
+          name: "库存",
           img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`,
           url: "/pagesStorehouse/stockWarn/manage"
         },
         {
-          name: "改价",
+          name: "收款",
           img: `${this.$constant.imgUrl}/ghs/home/gj.png`,
           url: "/admin/billing/priceChange"
         },
         {
-          name: "花材管理",
+          name: "花材",
           img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,
           url: "/pagesStorehouse/flower/manage"
         },
         {
-          name: "员工管理",
+          name: "员工",
           img: `${this.$constant.imgUrl}/ghs/home/yggl.png`,
           url: "/admin/staff/list"
         },
         {
-          name: "门店管理",
+          name: "门店",
           img: `${this.$constant.imgUrl}/ghs/home/shop.png`,
           url: "/admin/shop/list"
         },
@@ -370,7 +370,7 @@ export default {
           appId: res.data.mall.miniAppId,
           path: 'pages/home/index?account=' + this.loginInfo.shopId,
           //develop 开发板 trial 体验版 release 正式版
-          envVersion: 'develop',
+          envVersion: process.env.NODE_ENV === 'development' ? 'develop' : 'release',
           extraData: {
             'shopAdminId': this.loginInfo.shopAdminId
           },

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

@@ -72,4 +72,10 @@ export const  pxClassAdd = data => {
 */
 export const  pxClassDel = data => {
   return https.get("/px-class/del", data);
-};
+};
+/** *
+ * 供货商花材列表（进店开单） 【采购开单】 
+ */
+ export const getGhsProductList = data => {
+	return https.get('/product/ghs-item', data)
+}

hdApp/src/mixins/ghsProduct.js

@@ -710,7 +710,7 @@ export default {
 			*/
 		async initPxClassData() {
 			try {
-				const { data } = await getPxClassDataApi();
+				const { data } = await getPxClassDataApi({pageSize:50});
 				this.pxClassInfo = data.list;
 			} catch (error) {
 			} finally {

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,shopId,id } = options;
 		if (pageType) {
 			this.pageType = pageType;
 		}
 		if (this.autoLoad) {
 			if(this.isGhsProduct){
-				this.initGhsData(shopId,sjId);//采购-进店下单
+				this.initGhsData(id,shopId);//采购-进店下单
 			}else{
 				this.initGoodsData();//成品
 				this.initData();//组合
@@ -204,13 +204,13 @@ export default {
 		/**
 		 * 请求商品数据
 		 */
-		async initGhsData(shopId,sjId) {
+		async initGhsData(id,shopId) {
 			//extendInfo调用时的扩展参数  如  shopId
 			try {
 				let params = {
 					py: this.py,
-					sjId: sjId,
-					shopId: shopId,
+					id:id,
+					shopId:shopId
 				};
 				const { data } = await getGhsProductList(params);
 				data.forEach(element => {
@@ -740,7 +740,7 @@ export default {
 			*/
 		async initPxClassData() {
 			try {
-				const { data } = await getPxClassDataApi();
+				const { data } = await getPxClassDataApi({pageSize:50});
 				this.pxClassInfo = data.list;
 			} catch (error) {
 			} finally {

hdApp/src/pages.json

@@ -131,7 +131,7 @@
 				{
 					"path": "official/latest-shop",
 					"style": {
-						"navigationBarTitleText": "最近访问的店铺"
+						"navigationBarTitleText": "最近访问"
 					}
 				},
 				{

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?shopId=${ghsShopId}&id=${id}`})
     },
     getGHSList () {
       ghsList().then(res => {

hdApp/src/static/css/reset.scss

@@ -143,6 +143,6 @@ uni-button::after {
 .flex{display: flex;align-items: center};
 .flex-center{display: flex;align-items: center;justify-content: center};
 .flex-space{display: flex;align-items: center;justify-content: space-between};
-.flex-end{display: flex;align-items: center;justify-content: end};
+.flex-end{display: flex;align-items: center;justify-content: flex-end};
 .ov-1x{overflow:hidden;	white-space:nowrap;	text-overflow:ellipsis;}
-.ov-2x{text-overflow: -o-ellipsis-lastline;	overflow: hidden;	text-overflow: ellipsis;	display: -webkit-box;	-webkit-line-clamp: 2;	-webkit-box-orient: vertical;}
+.ov-2x{text-overflow: -o-ellipsis-lastline;	overflow: hidden;	text-overflow: ellipsis;	display: -webkit-box;	-webkit-line-clamp: 2;	-webkit-box-orient: vertical;}

mallApp/src/pages.json

@@ -3,7 +3,7 @@
 		{
 			"path": "pages/home/recent",
 			"style": {
-				"navigationBarTitleText": "最近访问的店铺"
+				"navigationBarTitleText": "最近访问"
 			}
 		},
 		{

mallApp/src/pages/home/recent.vue

@@ -44,7 +44,6 @@ export default {
   },
   methods: {
     async init(){
-         console.log(111111111111)
         try {
           const { data } = await recentShop({})
           this.list = data

mallApp/src/pages/home/user.vue

@@ -72,7 +72,7 @@
 						pageStatus: 'payment'
 					}
 				})"
-          >快速付款</button>
+          >付款</button>
         </div>
       </div>
     </template>

pt/dist/web/index.html

@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.412a0750.js" rel="preload" as="script"><link href="/js/chunk-libs.afac7b8c.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="/cdn/vue/2.6.10/vue.min.js"></script><script src="/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="/cdn/vuex/3.1.1/vuex.min.js"></script><script src="/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="/cdn/element-ui/2.13.0/index.js"></script><script src="/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.afac7b8c.js"></script><script src="/js/app.412a0750.js"></script></body></html>
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.b70758f9.js" rel="preload" as="script"><link href="/js/chunk-libs.afac7b8c.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="/cdn/vue/2.6.10/vue.min.js"></script><script src="/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="/cdn/vuex/3.1.1/vuex.min.js"></script><script src="/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="/cdn/element-ui/2.13.0/index.js"></script><script src="/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.afac7b8c.js"></script><script src="/js/app.b70758f9.js"></script></body></html>

pt/src/mock/userInfo.js

@@ -208,7 +208,7 @@ let menu = {
 		{
 			id: '12',
 			parentId: '1',
-			name: '开店申请',
+			name: '申请记录',
 			type: 1,
 			icon: 'icongongzuotai',
 			orderNum: 1,

pt/vue.config.js

@@ -2,7 +2,8 @@ const path = require('path');
 
 const isProduction = process.env.NODE_ENV === 'production';
 
-const proxyTarget = process.env.NODE_ENV === 'local' ? 'http://api.pt.huaml.com' : 'http://api.pt.huaml.com';
+//http和https切换请修改这里，修改后需要重新运行npm run serve shish 2021.4.12
+const proxyTarget = process.env.NODE_ENV === 'local' ? 'https://api.pt.huaml.com' : 'https://api.pt.huaml.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);