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

ghsApp/src/pagesClient/member/detail.vue

@@ -53,7 +53,7 @@
             <tui-list-cell class="line-cell" :hover="false">
               <div class="tui-title">允许欠款</div>
               <div class="switch_bx">
-                <text>已关闭</text>
+                <text></text>
                 <switch :checked="form.debt == 0 ? false : true" @change="remindChangeFn" />
               </div>
             </tui-list-cell>

ghsApp/src/pagesClient/official/index.vue

@@ -127,6 +127,18 @@ export default {
     // 隐藏返回首页按钮。
     // uni.hideHomeButton()
   },
+  onShareAppMessage(res) {
+    
+    //查看分享的路径，不要删除 shish 20210517
+    console.log("pagesClient/official/index?ghsShopAdminId="+this.getLoginInfo.shopAdminId+"&hdShopAdminId="+this.option.hdShopAdminId)
+
+    return {
+      title: "更懂您的销花宝",
+      desc: "",
+      imgUrl: "",
+      path: "pagesClient/official/index?ghsShopAdminId="+this.getLoginInfo.shopAdminId+"&hdShopAdminId="+this.option.hdShopAdminId,
+    }
+	},
   methods: {
 			...mapActions(['setUserShopAll']),
 			register(){

ghsApp/src/pagesInvite/list.vue

@@ -119,38 +119,22 @@ export default {
 			uni.stopPullDownRefresh();
 		}
 	},
-	onShareAppMessage(res) {
-		return
-		if (res.target.id === "shareGhs") {
-			return {
-				title: "更懂您的花卉宝",
-				desc: "",
-				imgUrl: this.constant.imgUrl + "/retail/official/banner-1.png",
-				path: `/pagesClient/official/index?introMerchantId=${this.userInfo.id}&form=2&style=2&shopAdminId=${this.getLoginInfo.shopAdminId}`
-			};
-		} else if (res.target.id === "sharekh") {
-			return {
-				title: "更懂您的花卉宝",
-				desc: "",
-				imgUrl: this.constant.imgUrl + "/retail/official/banner-1.png",
-				path: `/pagesClient/official/apply?introMerchantId=${this.userInfo.id}&form=2&style=1`
-			};
-		} else {
-			return {};
-		}
-	},
 	mounted(){
 	},
 	methods: {
 		inviteHd(){
+			
+			//查看分享的路径，不要删除 shish 20210517
+			console.log('pagesClient/official/index','ghsShopAdminId='+ this.loginInfo.shopAdminId)
+
 			getWeixinId().then(res => {
 				uni.navigateToMiniProgram({
 					appId: res.data.hd.miniAppId,
-					path: 'pagesClient/official/index',
+					path: 'pagesClient/official/index?ghsShopAdminId='+this.loginInfo.shopAdminId,
 					//develop 开发板 trial 体验版 release 正式版
 					envVersion: process.env.NODE_ENV === 'development' ? 'develop' : 'release',
 					extraData: {
-						'ghsShopAdminId': this.loginInfo.shopAdminId
+						//'ghsShopAdminId': this.loginInfo.shopAdminId
 					},
 					success(res) {
 						// 打开成功

hdApp/src/mixins/globalMixins.js

@@ -17,7 +17,7 @@ export default {
       pageTo: pageTo,
       AUTHORITY_SHOW: false,
       shopAdminId: null,
-      MODEL_TITLE: '您还没有网店哦',
+      MODEL_TITLE: '您还没有开店哦',
       MODEL_BTN_TEXT: '免费申请'
 		}
 	},

hdApp/src/pagesClient/official/index.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="app-content">
-			<!-- <view class="experience" v-if="getLoginInfo.showDemo==1" @tap="experienceFun">体验</view> -->
     <div class="tab-wrap">
       <div class="logo-img">
         <img :src="`${constant.imgUrl}/retail/official/logo.png`" alt />
@@ -134,24 +133,33 @@ export default {
   computed: {
     ...mapGetters(["getLoginInfo"])
   },
-  onLoad() {
-    this.jweixinFn({
+  onShareAppMessage(res) {
+    
+    console.log('option',this.options)
+    console.log('option1',this.option)
+    console.log('option2',res)
+
+    //查看分享的路径，不要删除 shish 20210517
+    console.log("pagesClient/official/index?ghsShopAdminId="+this.option.ghsShopAdminId+"&hdShopAdminId="+this.getLoginInfo.shopAdminId)
+
+    return {
       title: "更懂您的花卉宝",
-      pagePath: "pagesClient/official/index",
-      imageUrl: ""
-    });
-  },
+      desc: "",
+      imgUrl: "",
+      path: "pagesClient/official/index?ghsShopAdminId="+this.option.ghsShopAdminId+"&hdShopAdminId="+this.getLoginInfo.shopAdminId,
+    }
+	},
   mounted() {
     // 隐藏返回首页按钮。
     // uni.hideHomeButton()
   },
   methods: {
 			...mapActions(['setUserShopAll']),
-    contactFn() {
-      uni.makePhoneCall({
-        phoneNumber: "05923272000"
-      });
-    },
+      contactFn() {
+        uni.makePhoneCall({
+          phoneNumber: "05923272000"
+        });
+      },
 			experienceFun(){
 				/**姜枫 2021.04.30  小程序审核体验账号**/
 				postWxCode().then(subRes => {

hdApp/src/pagesInvite/list.vue

@@ -119,29 +119,22 @@ export default {
 			uni.stopPullDownRefresh();
 		}
 	},
-	onShareAppMessage(res) {
-		return {
-			title: "",
-			desc: "",
-			imgUrl:'',
-			path: ''
-		}	
-	},
 	mounted(){
 	},
 	methods: {
 		inviteGhs(){
 
+			//查看分享的路径，不要删除 shish 20210517
 			console.log('pagesClient/official/index?hdShopAdminId='+this.loginInfo.shopAdminId)
 
 			getWeixinId().then(res => {
 				uni.navigateToMiniProgram({
 					appId: res.data.ghs.miniAppId,
-					path: 'pagesClient/official/index',
+					path: 'pagesClient/official/index?hdShopAdminId='+this.loginInfo.shopAdminId,
 					//develop 开发版 trial 体验版 release 正式版
 					envVersion: process.env.NODE_ENV === 'development' ? 'develop' : 'release',
 					extraData: {
-						'hdShopAdminId': this.loginInfo.shopAdminId
+						//'hdShopAdminId': this.loginInfo.shopAdminId
 					},
 					success(res) {
 						// 打开成功

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -147,7 +147,6 @@ export default {
 	data() {
 		return {
 			COMMODITY_TYPE,
-			// offVerifyRepertory:true,//关闭库存验证
 			isGhsProduct:true,//采购进店开单
 			isModel: false,
 			isSmallCount: false,
@@ -165,7 +164,8 @@ export default {
 				expendAmount:'0.00',
 				debtAmount:'0.00'
 			},
-			myClass: 'fadeIn'
+			myClass: 'fadeIn',
+			shopId:0
 		};
 	},
 	computed: {
@@ -189,13 +189,23 @@ export default {
 		this.resetSelectInfoByType(this.pageType)
 	},
 	onShareAppMessage(res) {
+
+		let ghsShopAdminId = this.option.ghsShopAdminId ? this.option.ghsShopAdminId : 0
+		
+		if(this.option.shopId){
+			this.shopId = this.option.shopId
+		}
+
+		//查看分享的路径，不要删除 shish 20210517
+		console.log('share',`pagesPurchase/ghsProduct?hdShopAdminId=${this.loginInfo.shopAdminId}&ghsShopAdminId=${ghsShopAdminId}&shopId=${this.shopId}&id=0`)
+
 		return {
 			title: this.pageInfo.shopName,
 			desc: "",
-			path: `pagesPurchase/gshProudct?hdShopAdminId=${this.loginInfo.shopAdminId}&ghsShopAdminId=${this.option.ghsShopAdminId}&shopId=${this.option.shopId}`
+			path: `pagesPurchase/ghsProduct?hdShopAdminId=${this.loginInfo.shopAdminId}&ghsShopAdminId=${ghsShopAdminId}&shopId=${this.shopId}&id=0`
 		}
-	},
 
+	},
 	methods: {
 		init(){
 			const { shopId,id} = this.options;
@@ -210,6 +220,7 @@ export default {
 			} else {
 				getGhsDataApi({id: this.option.id}).then(res => {
 					this.pageInfo = res.data
+					this.shopId = res.data.shopId
 					uni.setNavigationBarTitle({
 						title: this.pageInfo.name
 					})

mallApp/src/pages/pay/index.vue

@@ -286,8 +286,8 @@
 					type: 2,
 					query: {
 						pageStatus: 3,
-            orderSn:this.payCallData.orderSn,
-            totalPrice:this.payCallData.totalPrice,
+						orderSn:this.payCallData.orderSn,
+						totalPrice:this.payCallData.totalPrice,
 						id: this.payCallData.orderId,
 						...this.params
 					}