shish пре 3 година
родитељ
комит
964b85c709
1 измењених фајлова са 11 додато и 9 уклоњено
  1. 11 9
      hdApp/src/admin/home/workbench.vue

+ 11 - 9
hdApp/src/admin/home/workbench.vue

@@ -212,6 +212,7 @@ import autoUpdateMixins from "@/mixins/autoUpdate";
 import emptyComponent from "@/components/empty";
 import emptyComponent from "@/components/empty";
 import { ghsList } from "@/api/purchase";
 import { ghsList } from "@/api/purchase";
 import { changeDelStatus } from "@/api/ghs";
 import { changeDelStatus } from "@/api/ghs";
+import {currentShop} from "@/api/shop";
 export default {
 export default {
   name: "workbench",
   name: "workbench",
   components: { NotLogin,emptyComponent },
   components: { NotLogin,emptyComponent },
@@ -305,6 +306,16 @@ export default {
 
 
   },
   },
   methods: {
   methods: {
+		showShopName(){
+			currentShop().then(res => {
+				if(res.code == 1){
+					let sjName = res.data.merchantName ? res.data.merchantName : ''
+					let shopName = res.data.shopName ? res.data.shopName : ''
+					let title = shopName == '首店' ? sjName : sjName+' '+shopName
+					 uni.setNavigationBarTitle({ title: title })
+				}
+			})
+		},
     goMore(){
     goMore(){
       let that = this
       let that = this
       uni.showActionSheet({
       uni.showActionSheet({
@@ -322,15 +333,6 @@ export default {
         }
         }
       });
       });
     },
     },
-    showShopName(){
-      getShopInfo().then(res => {
-        if(res.name){
-          uni.setNavigationBarTitle({ title: res.name })
-        }else{
-          uni.setNavigationBarTitle({ title: '店铺' })
-        }
-      })
-    },
     suggest(){
     suggest(){
       let that = this
       let that = this
       that.$util.confirmModal({content:'请添加技术人员微信反馈',okText:'复制微信'},() => {
       that.$util.confirmModal({content:'请添加技术人员微信反馈',okText:'复制微信'},() => {