merchantId to sjId

ghs/src/sass/shop/list.vue

@@ -318,7 +318,7 @@ export default {
 			switch (plamPayType) {
 				case 1: //微信
 					var data = {
-						merchantId: this.form.merchantId,
+						sjId: this.form.sjId,
 						wxPayMerchantId: this.form.wxPayMerchantId,
 						wxPayKey: this.form.wxPayKey
 					};
@@ -329,7 +329,7 @@ export default {
 					break;
 				case 2: //支付宝
 					var data = {
-						merchantId: this.form.merchantId,
+						sjId: this.form.sjId,
 						alipayPId: this.form.alipayPId,
 						alipayKey: this.form.alipayKey,
 						alipayPublicKey: this.form.alipayPublicKey

ghs/src/store/modules/user.js

@@ -57,7 +57,7 @@ export default {
 			return host().then(res => {
 				commit('SET_USERINFO', res);
 				if (ProjectName == 'business') {
-					localStorage.setItem('account', res.merchantId);
+					localStorage.setItem('account', res.sjId);
 				}
 				return res;
 			});

ghsApp/src/pagesShare/pay.vue

@@ -185,13 +185,13 @@ export default {
       //       title: "点我付款",
       //       desc: "享随机优惠，最高20元",
       //       imgUrl: `${this.$constant.imgUrl}/retail/pay/wxSharePay.jpg`,
-      //       pagePath: `${this.$constant.formal}/#/pages/pay/index?account=${res.merchantId}&store=0&sourceType=3&fromType=2`,
+      //       pagePath: `${this.$constant.formal}/#/pages/pay/index?account=${res.sjId}&store=0&sourceType=3&fromType=2`,
       //       // #endif
       //       // #ifndef H5
       //       title: "",
       //       desc: "享随机优惠，最高20元",
       //       imgUrl: `${this.$constant.imgUrl}/retail/pay/wxPay.png`,
-      //       pagePath: `/pages/pay/index?account=${res.merchantId}&store=0&sourceType=3&fromType=2`
+      //       pagePath: `/pages/pay/index?account=${res.sjId}&store=0&sourceType=3&fromType=2`
       //       // #endif
       //     };
       //     this.jweixinFn(shareParams);

hd/src/sass/shop/list.vue

@@ -317,7 +317,7 @@ export default {
 			switch (plamPayType) {
 				case 1: //微信
 					var data = {
-						merchantId: this.form.merchantId,
+						sjId: this.form.sjId,
 						wxPayMerchantId: this.form.wxPayMerchantId,
 						wxPayKey: this.form.wxPayKey
 					};
@@ -328,7 +328,7 @@ export default {
 					break;
 				case 2: //支付宝
 					var data = {
-						merchantId: this.form.merchantId,
+						sjId: this.form.sjId,
 						alipayPId: this.form.alipayPId,
 						alipayKey: this.form.alipayKey,
 						alipayPublicKey: this.form.alipayPublicKey

hd/src/store/modules/user.js

@@ -57,7 +57,7 @@ export default {
 			return host().then(res => {
 				commit('SET_USERINFO', res);
 				if (ProjectName == 'business') {
-					localStorage.setItem('account', res.merchantId);
+					localStorage.setItem('account', res.sjId);
 				}
 				return res;
 			});

hdApp/src/pagesShare/pay.vue

@@ -185,13 +185,13 @@ export default {
       //       title: "点我付款",
       //       desc: "享随机优惠，最高20元",
       //       imgUrl: `${this.$constant.imgUrl}/retail/pay/wxSharePay.jpg`,
-      //       pagePath: `${this.$constant.formal}/#/pages/pay/index?account=${res.merchantId}&store=0&sourceType=3&fromType=2`,
+      //       pagePath: `${this.$constant.formal}/#/pages/pay/index?account=${res.sjId}&store=0&sourceType=3&fromType=2`,
       //       // #endif
       //       // #ifndef H5
       //       title: "",
       //       desc: "享随机优惠，最高20元",
       //       imgUrl: `${this.$constant.imgUrl}/retail/pay/wxPay.png`,
-      //       pagePath: `/pages/pay/index?account=${res.merchantId}&store=0&sourceType=3&fromType=2`
+      //       pagePath: `/pages/pay/index?account=${res.sjId}&store=0&sourceType=3&fromType=2`
       //       // #endif
       //     };
       //     this.jweixinFn(shareParams);

mallApp/src/pages/home/shop.vue

@@ -126,10 +126,10 @@ export default {
           desc: "这家店不错推荐给你", // 分享内容
           imgUrl: "",
           // #ifdef H5
-          pagePath: `${window.location.protocol}//mall.${this.$constant.firstHost}.com/#/pages/home/shop?account=${res.merchantId}&introUserId=${res.id}`,
+          pagePath: `${window.location.protocol}//mall.${this.$constant.firstHost}.com/#/pages/home/shop?account=${res.sjId}&introUserId=${res.id}`,
           // #endif
           // #ifndef H5
-          pagePath: `/pages/home/shop?account=${res.merchantId}&introUserId=${res.id}`
+          pagePath: `/pages/home/shop?account=${res.sjId}&introUserId=${res.id}`
           // #endif
         };
         this.jweixinFn(shareParams);

mallApp/src/pages/interest/invite.vue

@@ -163,10 +163,10 @@ export default {
           desc: "这家店不错推荐给你", // 分享内容
           imgUrl: res.smallAvatarUrl,
           // #ifdef H5
-          pagePath: `${window.location.protocol}//mall.${this.$constant.firstHost}.com/#/pages/home/shop?account=${res.merchantId}&introUserId=${res.id}`,
+          pagePath: `${window.location.protocol}//mall.${this.$constant.firstHost}.com/#/pages/home/shop?account=${res.sjId}&introUserId=${res.id}`,
           // #endif
           // #ifndef H5
-          pagePath: `/pages/home/shop?account=${res.merchantId}&introUserId=${res.id}`
+          pagePath: `/pages/home/shop?account=${res.sjId}&introUserId=${res.id}`
           // #endif
         };
         this.jweixinFn(shareParams);

pt/src/saas/shop/list.vue

@@ -384,7 +384,7 @@ export default {
       switch (plamPayType) {
         case 1: //微信
           var data = {
-            merchantId: this.form.merchantId,
+            sjId: this.form.sjId,
             wxPayMerchantId: this.form.wxPayMerchantId,
             wxPayKey: this.form.wxPayKey
           };
@@ -395,7 +395,7 @@ export default {
           break;
         case 2: //支付宝
           var data = {
-            merchantId: this.form.merchantId,
+            sjId: this.form.sjId,
             alipayPId: this.form.alipayPId,
             alipayKey: this.form.alipayKey,
             alipayPublicKey: this.form.alipayPublicKey

pt/src/store/modules/user.js

@@ -57,7 +57,7 @@ export default {
 			return host().then(res => {
 				commit('SET_USERINFO', res);
 				if (ProjectName == 'business') {
-					localStorage.setItem('account', res.merchantId);
+					localStorage.setItem('account', res.sjId);
 				}
 				return res;
 			});