优化热风地址特殊处理不适用微信授权地址

src/app.json

@@ -130,10 +130,6 @@
     "contactPlugin": {
       "version": "1.3.0",
       "provider": "wx104a1a20c3f81ec2"
-    },
-    "live-player-plugin": {
-      "version": "1.0.2",
-      "provider": "wx2b03c6e691cd7370"
     }
   },
   "permission": {

src/config/index.js

@@ -23,7 +23,7 @@ const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门
 //2017 ACTREE wx2aae34874e88cdf5
 //2992 山东盛联微商城 wx53dedc202ae0d0c2
 
-const BRANCH_ID = 3001
+const BRANCH_ID = 2010
 const isMall = true
 
 // const needMock = '' //
@@ -53,62 +53,7 @@ const isMall = true
  * brandId = 1002
  */
 
-/** ***********************************生产环境************************************ */
-/**
- * 舞象测试 3001商户
- * appId = wx313ec36b710125d4
- * tunnel-token = d6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8
- * brandId=3001
- * contactUspluginId = 766c50920993bf9c41c6c3d2761a2df5 联系我插件id
- */
-
-/**
- * 711 生产环境配置
- * appId = wx700028bf32a3be66
- * tunnel-token = d6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8
- * brandId= 2711
- */
-
-/**
- * 泰华 商城生产环境配置
- * appId = wx40fec8944623c8b3
- * tunnel-token = 8724303981a00b56869f3d26f7a6c643
- * brandId= 2006
- * contactUspluginId = a6ea55b56eb09ced8f9aeeaa14383b52 联系我插件id
- * 
- * 泰华 门户生产环境配置
- * appId = wx833d5ece112fc3fd
- * tunnel-token = 8724303981a00b56869f3d26f7a6c643
- * brandId= 2006
- * contactUspluginId = a6ea55b56eb09ced8f9aeeaa14383b52 联系我插件id
- */
-
-/**
- * 多多一上 生产环境配置
- * appId = wxf7bc302c51166dc0  //小程序 appId
- * tunnel-token = 1ea3f0c0dd0c91ee54e546a99beafbfb //token 杨辰提供
- * brandId= 2007 //商户Id
- * contactUspluginId = e61babc802dd4d0d1e819130f7aa4bc5 联系我插件id
- */
-
-/** 
- * 雪岛书屋 生产环境配置
- * appId = wx207f8a95bbc9d3ab  //小程序 appId
- * tunnel-token = d93a5def7511da3d0f2d171d9c344e91 //token 杨辰提供
- * brandId= 2008 //商户Id
- * contactUspluginId =  联系我插件id
- * 
-*/
-/** 
- * 苏州邻里 生产环境配置
- * appId = wxe7770946f9d93d38  //小程序 appId
- * tunnel-token = fde4fde168dd5aabe962643843c19290 //token 杨辰提供
- * brandId= 2003 //商户Id
- * contactUspluginId =  联系我插件id
- * 
-*/
-
-// 生产环境配置信息
+/** ***********************************生产环境配置信息************************************ */
 const prod_brand_config = {
   //3001舞象
   3001 : {
@@ -121,6 +66,7 @@ const prod_brand_config = {
     hasTrial: false, // 是否有体验账号
     isMall: isMall,// 商城或门户 true 商城 false 门户
     orderingMustOpenCard : false, //下单是否必须卡开
+    canUseWechatAddress : true,//是否使用获取微信地址
     isOpenSelfMention : true, // 是否开启门店自提
     isNeedGetLocation : true,//是否开启小程序获取位置（提交订单时获取门店信息）
     shareTitle: '【舞象星品荟-社交商城】',
@@ -134,6 +80,7 @@ const prod_brand_config = {
     brandId: 2006,
     plusIsOpen: false,
     contactUsIsOpen: isMall ? true : false,
+    canUseWechatAddress: true,//是否使用获取微信地址
     contactUsPluginId: 'a6ea55b56eb09ced8f9aeeaa14383b52',
     hasTrial: false,
     isMall: isMall,
@@ -150,6 +97,7 @@ const prod_brand_config = {
     brandId: 2007,
     plusIsOpen: false,
     contactUsIsOpen: true,
+    canUseWechatAddress: true,//是否使用获取微信地址
     contactUsPluginId: '78353bb39251a60b473f3d4ae81b1c39',
     hasTrial: false,
     isMall: isMall,
@@ -166,6 +114,7 @@ const prod_brand_config = {
     brandId: 2008,
     plusIsOpen: false,
     contactUsIsOpen: false,
+    canUseWechatAddress: true,//是否使用获取微信地址
     contactUsPluginId: '',
     hasTrial: false,
     isMall: isMall,
@@ -183,6 +132,7 @@ const prod_brand_config = {
     plusIsOpen: false,
     contactUsIsOpen: false,
     contactUsPluginId: '',
+    canUseWechatAddress: true,//是否使用获取微信地址
     hasTrial: false,
     isMall: isMall,
     orderingMustOpenCard: false,
@@ -200,6 +150,7 @@ const prod_brand_config = {
     contactUsIsOpen: false,//是否开启联系我
     contactUsPluginId: '',//联系我们插件PluginID
     hasTrial: false,// 是否有体验账号
+    canUseWechatAddress: true,//是否使用获取微信地址
     isMall: isMall,// 商城或门户 true 商城 false 门户
     orderingMustOpenCard: false,//下单是否必须卡开
     isOpenSelfMention: false, // 是否开启门店自提
@@ -217,6 +168,7 @@ const prod_brand_config = {
     contactUsPluginId: 'f86b306023ec790b70c0b45fcf308b04',
     hasTrial: false,
     isMall: isMall,
+    canUseWechatAddress: false,//是否使用获取微信地址
     orderingMustOpenCard: false,
     isOpenSelfMention: false, // 是否开启门店自提
     isNeedGetLocation: false,//是否开启小程序获取位置（提交订单时获取门店信息）
@@ -230,6 +182,7 @@ const prod_brand_config = {
     brandId: 2012,
     plusIsOpen: false,
     contactUsIsOpen: true,
+    canUseWechatAddress: true,//是否使用获取微信地址
     contactUsPluginId: 'e61babc802dd4d0d1e819130f7aa4bc5',
     hasTrial: false,
     isMall: isMall,
@@ -249,6 +202,7 @@ const prod_brand_config = {
     contactUsPluginId: '',
     hasTrial: false,
     isMall: isMall,
+    canUseWechatAddress: true,//是否使用获取微信地址
     orderingMustOpenCard: false,
     isOpenSelfMention: false, // 是否开启门店自提
     isNeedGetLocation: false,//是否开启小程序获取位置（提交订单时获取门店信息）
@@ -264,6 +218,7 @@ const prod_brand_config = {
     contactUsIsOpen: true,
     contactUsPluginId: '',
     hasTrial: false,
+    canUseWechatAddress: true,//是否使用获取微信地址
     isMall: isMall,
     orderingMustOpenCard: false,
     isOpenSelfMention: false, // 是否开启门店自提
@@ -281,6 +236,7 @@ const prod_brand_config = {
     contactUsPluginId: '',
     hasTrial: false,
     isMall: isMall,
+    canUseWechatAddress: true,//是否使用获取微信地址
     orderingMustOpenCard: false,
     isOpenSelfMention: false, // 是否开启门店自提
     isNeedGetLocation: false,//是否开启小程序获取位置（提交订单时获取门店信息）
@@ -297,6 +253,7 @@ const prod_brand_config = {
     contactUsPluginId: '',
     hasTrial: false,
     isMall: isMall,
+    canUseWechatAddress: true,//是否使用获取微信地址
     orderingMustOpenCard: false,
     isOpenSelfMention: false, // 是否开启门店自提
     isNeedGetLocation: false,//是否开启小程序获取位置（提交订单时获取门店信息）
@@ -312,6 +269,7 @@ const prod_brand_config = {
     contactUsIsOpen: false,
     contactUsPluginId: '',
     hasTrial: false,
+    canUseWechatAddress: true,//是否使用获取微信地址
     isMall: isMall,
     orderingMustOpenCard: true,
     isOpenSelfMention: false, // 是否开启门店自提
@@ -329,6 +287,7 @@ const prod_brand_config = {
     contactUsPluginId: '50934d036dc2051758f4d934d7100b78',
     hasTrial: false,
     isMall: isMall,
+    canUseWechatAddress: true,//是否使用获取微信地址
     orderingMustOpenCard: true,
     isOpenSelfMention: true, // 是否开启门店自提
     isNeedGetLocation: true,//是否开启小程序获取位置（提交订单时获取门店信息）
@@ -351,7 +310,7 @@ const speadProductsBanner = 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/tui
 
 //需要直播功能时 配置 app.json plugin中增加代码
 // "live-player-plugin": {
-//   "version": "1.0.0",
+//   "version": "1.0.2",
 //     "provider": "wx2b03c6e691cd7370"
 // }
 
@@ -426,7 +385,7 @@ let isOpenSelfMention = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].isO
 let shareTitle = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].shareTitle : '舞象商城';
 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 canUseWechatAddress = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].canUseWechatAddress : true;
 //配置信息导出
 const envInfo = (() => {
   return {
@@ -446,7 +405,8 @@ const envInfo = (() => {
     shareTitle: shareTitle,
     isNeedGetLocation: isNeedGetLocation,
     shareLogo: shareLogo,
-    speadProductsBanner: speadProductsBanner
+    speadProductsBanner: speadProductsBanner,
+    canUseWechatAddress: canUseWechatAddress,
   }
 })()
 

src/pages/confirmOrder/confirmOrder.js

@@ -54,6 +54,7 @@ wxService.page({
   onLoad: function (options) {
     wx.hideShareMenu();
     this.getMyLocationInfo();
+    console.log(this.data)
   },
   ////获取位置信息并获取附近门店信息
   getMyLocationInfo(cb) {

src/pages/confirmOrder/confirmOrder.wxml

@@ -64,7 +64,7 @@
 					</view>
 				</view>
 			</block>
-			<view class="wx-address" bindtap="chooseWxAddress">
+			<view class="wx-address" bindtap="chooseWxAddress" wx:if="{{canUseWechatAddress}}">
 				+ 使用微信地址
 			</view>
 		</view>

src/pages/myAddress/myAddress.wxml

 <!--pages/myAddress/myAddress.wxml-->
 <view class="page-my-address">
-	<view class="wx-address" bindtap="chooseWxAddress">
+	<view class="wx-address" bindtap="chooseWxAddress" wx:if="{{canUseWechatAddress}}">
 		<image class="wx-icon" src="/assets/imgs/7_1_0/wx-icon.png" mode="widthFix" />
 		<text class="wx-text">使用微信地址</text>
 		<image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png" mode="widthFix" />

src/project.config.json

@@ -13,7 +13,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",
-	"appid": "wx313ec36b710125d4",
+	"appid": "wxe6d270a3e399ade9",
 	"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
 	"debugOptions": {
 		"hidedInDevtools": []

src/utils/wxService.js

@@ -654,6 +654,7 @@ class WXService extends Http {
     config.data.shareLogo = envInfo.shareLogo;
     config.data.shareTitle = envInfo.shareTitle;
     config.data.speadProductsBanner = envInfo.speadProductsBanner;
+    config.data.canUseWechatAddress = envInfo.canUseWechatAddress;
     //默认
     config.data.loading = true;