Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghsApp/src/pages.json

@@ -102,7 +102,7 @@
 				{
 					"path": "official/index",
 					"style": {
-						"navigationBarTitleText": "花卉宝"
+						"navigationBarTitleText": "销花宝"
 					}
 				},
 				{

ghsApp/src/pagesClient/official/index.vue

@@ -121,7 +121,7 @@ export default {
 	},
   onLoad() {
     this.jweixinFn({
-      title: "更懂您的花卉宝",
+      title: "更懂您的销花宝",
       pagePath: "pagesClient/official/index",
       imageUrl: ""
     });

hdApp/src/pages.json

@@ -115,7 +115,7 @@
 				{
 					"path": "official/index",
 					"style": {
-						"navigationBarTitleText": "花卉宝"
+						"navigationBarTitleText": "花惠宝"
 					}
 				},
 				{

hdApp/src/pagesClient/official/index.vue

@@ -143,7 +143,7 @@ export default {
     console.log("pagesClient/official/index?ghsShopAdminId="+this.option.ghsShopAdminId+"&hdShopAdminId="+this.getLoginInfo.shopAdminId)
 
     return {
-      title: "更懂您的花卉宝",
+      title: "更懂您的花惠宝",
       desc: "",
       imgUrl: "",
       path: "pagesClient/official/index?ghsShopAdminId="+this.option.ghsShopAdminId+"&hdShopAdminId="+this.getLoginInfo.shopAdminId,