Commit 623dc73b by 谢中龙

修改bug

parent d717d299
...@@ -22,6 +22,7 @@ const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门 ...@@ -22,6 +22,7 @@ const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门
//2016 阿吉豆 //2016 阿吉豆
//2017 ACTREE wx2aae34874e88cdf5 //2017 ACTREE wx2aae34874e88cdf5
//2992 山东盛联微商城 wx53dedc202ae0d0c2 //2992 山东盛联微商城 wx53dedc202ae0d0c2
//2002 巴黎贝甜 wx21968cb3a486d4ab
const BRANCH_ID = 1002 const BRANCH_ID = 1002
const isMall = true const isMall = true
...@@ -64,11 +65,13 @@ const prod_brand_config = { ...@@ -64,11 +65,13 @@ const prod_brand_config = {
contactUsIsOpen: true,//是否开启联系我 contactUsIsOpen: true,//是否开启联系我
contactUsPluginId: '766c50920993bf9c41c6c3d2761a2df5',//联系我们插件PluginID contactUsPluginId: '766c50920993bf9c41c6c3d2761a2df5',//联系我们插件PluginID
hasTrial: false, // 是否有体验账号 hasTrial: false, // 是否有体验账号
hasLiveVideo: true,//是否有直播功能
isMall: isMall,// 商城或门户 true 商城 false 门户 isMall: isMall,// 商城或门户 true 商城 false 门户
orderingMustOpenCard : false, //下单是否必须卡开 orderingMustOpenCard : false, //下单是否必须卡开
canUseWechatAddress : true,//是否使用获取微信地址 canUseWechatAddress : true,//是否使用获取微信地址
isOpenSelfMention : true, // 是否开启门店自提 isOpenSelfMention : true, // 是否开启门店自提
isNeedGetLocation : true,//是否开启小程序获取位置(提交订单时获取门店信息) isNeedGetLocation : true,//是否开启小程序获取位置(提交订单时获取门店信息)
guiderCanScanQrcode : true,//导购是否有扫一扫功能
shareTitle: '【舞象星品荟-社交商城】', shareTitle: '【舞象星品荟-社交商城】',
logo: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png', logo: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png',
}, },
...@@ -84,8 +87,10 @@ const prod_brand_config = { ...@@ -84,8 +87,10 @@ const prod_brand_config = {
contactUsPluginId: 'a6ea55b56eb09ced8f9aeeaa14383b52', contactUsPluginId: 'a6ea55b56eb09ced8f9aeeaa14383b52',
hasTrial: false, hasTrial: false,
isMall: isMall, isMall: isMall,
hasLiveVideo: true,//是否有直播功能
orderingMustOpenCard: true, orderingMustOpenCard: true,
isOpenSelfMention: true, // 是否开启门店自提 isOpenSelfMention: true, // 是否开启门店自提
guiderCanScanQrcode: true,//导购是否有扫一扫功能
isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息) isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle: '【泰华微商城】', shareTitle: '【泰华微商城】',
logo: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/taihua_logo.png', logo: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/taihua_logo.png',
...@@ -101,8 +106,10 @@ const prod_brand_config = { ...@@ -101,8 +106,10 @@ const prod_brand_config = {
contactUsPluginId: '78353bb39251a60b473f3d4ae81b1c39', contactUsPluginId: '78353bb39251a60b473f3d4ae81b1c39',
hasTrial: false, hasTrial: false,
isMall: isMall, isMall: isMall,
hasLiveVideo: false,//是否有直播功能
orderingMustOpenCard: true, orderingMustOpenCard: true,
isOpenSelfMention: false, // 是否开启门店自提 isOpenSelfMention: false, // 是否开启门店自提
guiderCanScanQrcode: true,//导购是否有扫一扫功能
isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息) isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle: '【多多一上】', shareTitle: '【多多一上】',
logo: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/duoduoyishang_logo.png', logo: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/duoduoyishang_logo.png',
...@@ -118,7 +125,9 @@ const prod_brand_config = { ...@@ -118,7 +125,9 @@ const prod_brand_config = {
contactUsPluginId: '', contactUsPluginId: '',
hasTrial: false, hasTrial: false,
isMall: isMall, isMall: isMall,
hasLiveVideo: false,//是否有直播功能
orderingMustOpenCard: false, orderingMustOpenCard: false,
guiderCanScanQrcode: true,//导购是否有扫一扫功能
isOpenSelfMention: false, // 是否开启门店自提 isOpenSelfMention: false, // 是否开启门店自提
isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息) isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle: '【雪岛书屋】', shareTitle: '【雪岛书屋】',
...@@ -134,8 +143,10 @@ const prod_brand_config = { ...@@ -134,8 +143,10 @@ const prod_brand_config = {
contactUsPluginId: '', contactUsPluginId: '',
canUseWechatAddress: true,//是否使用获取微信地址 canUseWechatAddress: true,//是否使用获取微信地址
hasTrial: false, hasTrial: false,
hasLiveVideo: false,//是否有直播功能
isMall: isMall, isMall: isMall,
orderingMustOpenCard: false, orderingMustOpenCard: false,
guiderCanScanQrcode: true,//导购是否有扫一扫功能
isOpenSelfMention: false, // 是否开启门店自提 isOpenSelfMention: false, // 是否开启门店自提
isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息) isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle: '【苏州邻里】', shareTitle: '【苏州邻里】',
...@@ -150,10 +161,12 @@ const prod_brand_config = { ...@@ -150,10 +161,12 @@ const prod_brand_config = {
contactUsIsOpen: false,//是否开启联系我 contactUsIsOpen: false,//是否开启联系我
contactUsPluginId: '',//联系我们插件PluginID contactUsPluginId: '',//联系我们插件PluginID
hasTrial: false,// 是否有体验账号 hasTrial: false,// 是否有体验账号
hasLiveVideo: false,//是否有直播功能
canUseWechatAddress: true,//是否使用获取微信地址 canUseWechatAddress: true,//是否使用获取微信地址
isMall: isMall,// 商城或门户 true 商城 false 门户 isMall: isMall,// 商城或门户 true 商城 false 门户
orderingMustOpenCard: false,//下单是否必须卡开 orderingMustOpenCard: false,//下单是否必须卡开
isOpenSelfMention: false, // 是否开启门店自提 isOpenSelfMention: false, // 是否开启门店自提
guiderCanScanQrcode: true,//导购是否有扫一扫功能
isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息) isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle: '【LA RUTA DE VIA】',//分享海报上显示的小程序title shareTitle: '【LA RUTA DE VIA】',//分享海报上显示的小程序title
logo: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/laru.jpg',//商户logo logo: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/laru.jpg',//商户logo
...@@ -168,8 +181,10 @@ const prod_brand_config = { ...@@ -168,8 +181,10 @@ const prod_brand_config = {
contactUsPluginId: 'f86b306023ec790b70c0b45fcf308b04', contactUsPluginId: 'f86b306023ec790b70c0b45fcf308b04',
hasTrial: false, hasTrial: false,
isMall: isMall, isMall: isMall,
hasLiveVideo: false,//是否有直播功能
canUseWechatAddress: false,//是否使用获取微信地址 canUseWechatAddress: false,//是否使用获取微信地址
orderingMustOpenCard: false, orderingMustOpenCard: false,
guiderCanScanQrcode: false,//导购是否有扫一扫功能
isOpenSelfMention: false, // 是否开启门店自提 isOpenSelfMention: false, // 是否开启门店自提
isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息) isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle: '【hotwind热风微商城】', shareTitle: '【hotwind热风微商城】',
...@@ -185,8 +200,10 @@ const prod_brand_config = { ...@@ -185,8 +200,10 @@ const prod_brand_config = {
canUseWechatAddress: true,//是否使用获取微信地址 canUseWechatAddress: true,//是否使用获取微信地址
contactUsPluginId: 'e61babc802dd4d0d1e819130f7aa4bc5', contactUsPluginId: 'e61babc802dd4d0d1e819130f7aa4bc5',
hasTrial: false, hasTrial: false,
hasLiveVideo: true,//是否有直播功能
isMall: isMall, isMall: isMall,
orderingMustOpenCard: true, orderingMustOpenCard: true,
guiderCanScanQrcode: true,//导购是否有扫一扫功能
isOpenSelfMention: true, // 是否开启门店自提 isOpenSelfMention: true, // 是否开启门店自提
isNeedGetLocation: true,//是否开启小程序获取位置(提交订单时获取门店信息) isNeedGetLocation: true,//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle: '【悦芙媞微商城】', shareTitle: '【悦芙媞微商城】',
...@@ -201,10 +218,12 @@ const prod_brand_config = { ...@@ -201,10 +218,12 @@ const prod_brand_config = {
contactUsIsOpen: true, contactUsIsOpen: true,
contactUsPluginId: '', contactUsPluginId: '',
hasTrial: false, hasTrial: false,
hasLiveVideo: false,//是否有直播功能
isMall: isMall, isMall: isMall,
canUseWechatAddress: true,//是否使用获取微信地址 canUseWechatAddress: true,//是否使用获取微信地址
orderingMustOpenCard: false, orderingMustOpenCard: false,
isOpenSelfMention: false, // 是否开启门店自提 isOpenSelfMention: false, // 是否开启门店自提
guiderCanScanQrcode: true,//导购是否有扫一扫功能
isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息) isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle: '【阿特里里微商城】', shareTitle: '【阿特里里微商城】',
logo: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png', logo: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png',
...@@ -217,10 +236,12 @@ const prod_brand_config = { ...@@ -217,10 +236,12 @@ const prod_brand_config = {
plusIsOpen: false, plusIsOpen: false,
contactUsIsOpen: true, contactUsIsOpen: true,
contactUsPluginId: '', contactUsPluginId: '',
hasLiveVideo: false,//是否有直播功能
hasTrial: false, hasTrial: false,
canUseWechatAddress: true,//是否使用获取微信地址 canUseWechatAddress: true,//是否使用获取微信地址
isMall: isMall, isMall: isMall,
orderingMustOpenCard: false, orderingMustOpenCard: false,
guiderCanScanQrcode: true,//导购是否有扫一扫功能
isOpenSelfMention: false, // 是否开启门店自提 isOpenSelfMention: false, // 是否开启门店自提
isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息) isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle: '【包鞋微商城】', shareTitle: '【包鞋微商城】',
...@@ -236,9 +257,11 @@ const prod_brand_config = { ...@@ -236,9 +257,11 @@ const prod_brand_config = {
contactUsPluginId: '', contactUsPluginId: '',
hasTrial: false, hasTrial: false,
isMall: isMall, isMall: isMall,
hasLiveVideo: false,//是否有直播功能
canUseWechatAddress: true,//是否使用获取微信地址 canUseWechatAddress: true,//是否使用获取微信地址
orderingMustOpenCard: false, orderingMustOpenCard: false,
isOpenSelfMention: false, // 是否开启门店自提 isOpenSelfMention: false, // 是否开启门店自提
guiderCanScanQrcode: true,//导购是否有扫一扫功能
isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息) isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle: '【花在花园微商城】', shareTitle: '【花在花园微商城】',
logo: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png', logo: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png',
...@@ -253,9 +276,11 @@ const prod_brand_config = { ...@@ -253,9 +276,11 @@ const prod_brand_config = {
contactUsPluginId: '', contactUsPluginId: '',
hasTrial: false, hasTrial: false,
isMall: isMall, isMall: isMall,
hasLiveVideo: false,//是否有直播功能
canUseWechatAddress: true,//是否使用获取微信地址 canUseWechatAddress: true,//是否使用获取微信地址
orderingMustOpenCard: false, orderingMustOpenCard: false,
isOpenSelfMention: false, // 是否开启门店自提 isOpenSelfMention: false, // 是否开启门店自提
guiderCanScanQrcode: true,//导购是否有扫一扫功能
isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息) isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle: '【阿吉豆微商城】', shareTitle: '【阿吉豆微商城】',
logo: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png', logo: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png',
...@@ -268,10 +293,12 @@ const prod_brand_config = { ...@@ -268,10 +293,12 @@ const prod_brand_config = {
plusIsOpen: false, plusIsOpen: false,
contactUsIsOpen: false, contactUsIsOpen: false,
contactUsPluginId: '', contactUsPluginId: '',
hasLiveVideo: false,//是否有直播功能
hasTrial: false, hasTrial: false,
canUseWechatAddress: true,//是否使用获取微信地址 canUseWechatAddress: true,//是否使用获取微信地址
isMall: isMall, isMall: isMall,
orderingMustOpenCard: true, orderingMustOpenCard: true,
guiderCanScanQrcode: true,//导购是否有扫一扫功能
isOpenSelfMention: false, // 是否开启门店自提 isOpenSelfMention: false, // 是否开启门店自提
isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息) isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle: '【ACTREE】', shareTitle: '【ACTREE】',
...@@ -290,9 +317,30 @@ const prod_brand_config = { ...@@ -290,9 +317,30 @@ const prod_brand_config = {
canUseWechatAddress: true,//是否使用获取微信地址 canUseWechatAddress: true,//是否使用获取微信地址
orderingMustOpenCard: true, orderingMustOpenCard: true,
isOpenSelfMention: true, // 是否开启门店自提 isOpenSelfMention: true, // 是否开启门店自提
hasLiveVideo: false,//是否有直播功能
guiderCanScanQrcode: true,//导购是否有扫一扫功能
isNeedGetLocation: true,//是否开启小程序获取位置(提交订单时获取门店信息) isNeedGetLocation: true,//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle: '【山东盛联微商城】', shareTitle: '【山东盛联微商城】',
logo: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/shandongshenglian_logo.jpg', logo: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/shandongshenglian_logo.jpg',
},
//2002 巴黎贝甜
2002 : {
appId: 'wx21968cb3a486d4ab',
tunnelToken: '2c626cb97cd05b635ae85ace7acb5608',
brandId: 2002,
plusIsOpen: false,
contactUsIsOpen: false,
contactUsPluginId: '',
hasTrial: true,
isMall: isMall,
canUseWechatAddress: true,//是否使用获取微信地址
orderingMustOpenCard: false,
isOpenSelfMention: true, // 是否开启门店自提
hasLiveVideo : false,//是否有直播功能
guiderCanScanQrcode: true,//导购是否有扫一扫功能
isNeedGetLocation: true,//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle: '【有一种甜叫巴黎贝甜~】',
logo: 'https://img3.bigaka.com/prd/3001/202003/20200318/3001c0647584-3656-45e9-ae60-c898d435113e.png',
} }
} }
...@@ -386,6 +434,8 @@ let shareTitle = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].shareTitle ...@@ -386,6 +434,8 @@ let shareTitle = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].shareTitle
let shareLogo = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].logo : defaultShareLogo; let shareLogo = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].logo : defaultShareLogo;
let isNeedGetLocation = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].isNeedGetLocation : true; let isNeedGetLocation = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].isNeedGetLocation : true;
let canUseWechatAddress = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].canUseWechatAddress : true; let canUseWechatAddress = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].canUseWechatAddress : true;
let hasLiveVideo = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].hasLiveVideo : false;
let guiderCanScanQrcode = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].guiderCanScanQrcode : true;
//配置信息导出 //配置信息导出
const envInfo = (() => { const envInfo = (() => {
return { return {
...@@ -407,6 +457,8 @@ const envInfo = (() => { ...@@ -407,6 +457,8 @@ const envInfo = (() => {
shareLogo: shareLogo, shareLogo: shareLogo,
speadProductsBanner: speadProductsBanner, speadProductsBanner: speadProductsBanner,
canUseWechatAddress: canUseWechatAddress, canUseWechatAddress: canUseWechatAddress,
hasLiveVideo: hasLiveVideo,
guiderCanScanQrcode: guiderCanScanQrcode,
} }
})() })()
......
...@@ -76,6 +76,13 @@ wxService.page({ ...@@ -76,6 +76,13 @@ wxService.page({
}, },
//打开摄像头 扫码 //打开摄像头 扫码
onTapScanQrcode(){ onTapScanQrcode(){
if (!this.data.guiderCanScanQrcode){
wx.showToast({
title: '对不起,您无该权限!',
icon : 'none'
});
return ;
}
wx.scanCode({ wx.scanCode({
success : res => { success : res => {
let result = res.result; let result = res.result;
......
...@@ -655,6 +655,7 @@ class WXService extends Http { ...@@ -655,6 +655,7 @@ class WXService extends Http {
config.data.shareTitle = envInfo.shareTitle; config.data.shareTitle = envInfo.shareTitle;
config.data.speadProductsBanner = envInfo.speadProductsBanner; config.data.speadProductsBanner = envInfo.speadProductsBanner;
config.data.canUseWechatAddress = envInfo.canUseWechatAddress; config.data.canUseWechatAddress = envInfo.canUseWechatAddress;
config.data.guiderCanScanQrcode = envInfo.guiderCanScanQrcode;
//默认 //默认
config.data.loading = true; config.data.loading = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment