xiaoxin 9 месяцев назад
Родитель
Сommit
1111f643b3
3 измененных файлов с 17 добавлено и 14 удалено
  1. 12 12
      common/config.js
  2. 1 0
      pages/index/index.vue
  3. 4 2
      pages/my/index.vue

+ 12 - 12
common/config.js

@@ -1,17 +1,17 @@
-// const ROOTPATHA = "https://mxys.chuanghai-tech.com/sqx_fast";
-// const ROOTPATHASSS = "https://mxys.chuanghai-tech.com";
-// const ROOTPATH = "https://mxys.chuanghai-tech.com/sqx_fast";
-// const ROOTPATH1 = "https://mxys.chuanghai-tech.com/sqx_fast";
-// const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss/websocket/"; //联系客服
-// const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss/ordersChat/"; //聊天
+const ROOTPATHA = "https://mxys.chuanghai-tech.com/sqx_fast";
+const ROOTPATHASSS = "https://mxys.chuanghai-tech.com";
+const ROOTPATH = "https://mxys.chuanghai-tech.com/sqx_fast";
+const ROOTPATH1 = "https://mxys.chuanghai-tech.com/sqx_fast";
+const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss/websocket/"; //联系客服
+const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss/ordersChat/"; //聊天
 
 
-const ROOTPATHA = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
-const ROOTPATHASSS = "https://mxys.chuanghai-tech.com/wm-test/wm-api";
-const ROOTPATH = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
-const ROOTPATH1 = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
-const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss-test/websocket/"; //联系客服
-const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss-test/ordersChat/"; //聊天
+// const ROOTPATHA = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
+// const ROOTPATHASSS = "https://mxys.chuanghai-tech.com/wm-test/wm-api";
+// const ROOTPATH = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
+// const ROOTPATH1 = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
+// const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss-test/websocket/"; //联系客服
+// const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss-test/ordersChat/"; //聊天
 
 // const ROOTPATHA = "http://192.168.161.190:8171/sqx_fast";
 // const ROOTPATHASSS = "https://mxys.chuanghai-tech.com/wm-test/wm-api";

+ 1 - 0
pages/index/index.vue

@@ -656,6 +656,7 @@ export default {
 					this.avatar = res.user.shopList[0].shopCover ? res.user.shopList[0].shopCover : '../../static/logo.png'
 					this.$queue.setData('userId', res.user.userId)
 					this.$queue.setData('shopId', res.user.shopList[0].shopId)
+					this.$queue.setData('shopTypeId', res.user.shopList[0].shopTypeId)
 					this.$queue.setData('mobile', res.user.mobile)
 					if (res.user.userEntity) {
 						this.$queue.setData('shopUserName', res.user.userEntity.userName)

+ 4 - 2
pages/my/index.vue

@@ -524,7 +524,8 @@ export default {
 			this.show = true
 
 			let shopid = urlSafeBase64Encode(encrypt(uni.getStorageSync('shopId').toString()))
-			this.shopQrImg = configurl.APIHOSTsss + '/sqx_fast/invite/shopQr?shopId=' + shopid
+			let shopTypeId = urlSafeBase64Encode(encrypt(uni.getStorageSync('shopTypeId').toString()))
+			this.shopQrImg = configurl.APIHOSTsss + '/sqx_fast/invite/shopQr?shopId=' + shopid + '&shopTypeId' + shopTypeId
 			console.log(this.shopQrImg, 'oooo')
 		},
 		//生成私域二维码
@@ -532,7 +533,8 @@ export default {
 			this.showSphere = true
 
 			let shopid = urlSafeBase64Encode(encrypt(uni.getStorageSync('shopId').toString()))
-			this.shopQrImgSphere = configurl.APIHOSTsss + '/sqx_fast/invite/shopQr2?shopId=' + shopid
+			let shopTypeId = urlSafeBase64Encode(encrypt(uni.getStorageSync('shopTypeId').toString()))
+			this.shopQrImgSphere = configurl.APIHOSTsss + '/sqx_fast/invite/shopQr2?shopId=' + shopid + '&shopTypeId' + shopTypeId
 			console.log(this.shopQrImgSphere, 'oooo——Sphere')
 		},
 		//跳转用户端