shish 5 سال پیش
والد
کامیت
6cca29f984

+ 2 - 2
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
 					},

+ 1 - 1
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":"花掌柜"

+ 1 - 1
ghsApp/src/pages.json

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

+ 1 - 1
glhs/src/pages.json

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

+ 4 - 4
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"
             },

+ 6 - 6
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
           },

+ 1 - 1
hdApp/src/pages.json

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

+ 1 - 1
mallApp/src/pages.json

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

+ 0 - 1
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

+ 1 - 1
mallApp/src/pages/home/user.vue

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

+ 1 - 1
pt/src/mock/userInfo.js

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