优化bug，plus前端开启设置

src/config/index.js

@@ -5,14 +5,69 @@
 // 组件plus 中数据请求 token 修改
 // app.js 中brandId 修改为对应
 
-const PROJECT_ENV = 'dev' // 生产 prod, 开发 dev, 测试 test, 预生产 pre
+const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test, 预生产 pre
 const needMock = '' //
+// 舞象联系我 ：766c50920993bf9c41c6c3d2761a2df5
+//泰华 联系我 ：6e4314d558e55fbc64fe2e757e24d61f
 
-// appid_dev_wx   wxc3b64b09b1d3dfc2
+//配置信息 
+/** ***********************************开发环境************************************ */
+//舞象开发环境
+/**
+ * appId = wxc3b64b09b1d3dfc2
+ * tunnel-token = brand1001
+ * brandId = 1001
+ */
+/** ***********************************测试环境************************************ */
+/**
+ * 舞象测试环境1
+ * appId = wx857ea77f4f7f4f34
+ * tunnel-token = aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD
+ * brandId = 1002
+ */
+
+/**
+ * 舞象测试环境2 常用
+ * appId = wxac09792264c49b5c
+ * tunnel-token = aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD
+ * 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 = 6e4314d558e55fbc64fe2e757e24d61f 联系我插件id
+ */
+
+
+// appid_dev_wx   wxc3b64b09b1d3dfc2 
 // appid_test_wx  wx857ea77f4f7f4f34//  wxac09792264c49b5c // 1002商城
-// appid_pre_711  wx358b56af62edbde1
-// appid_prod_711  wx700028bf32a3be66
-// appid_prod_3001 wx313ec36b710125d4
+// appid_pre_711  wx358b56af62edbde1 tunnel-token: d6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8
+// appid_prod_711  wx700028bf32a3be66 tunnel-token: d6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8
+
+// appid_prod_3001 wx313ec36b710125d4 
+// 3001测试商城 tunnel-token: d6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8 brandId : 3001
+
+//泰华 appid : wx40fec8944623c8b3 brandId : 2006 tunnel-token : 8724303981a00b56869f3d26f7a6c643
+
 
 // 1 2 3 4步!!!!!!!!!!!!!!!!!!!!!!  prod appid brandId tunnel-token
 
@@ -40,7 +95,7 @@ const appId = {
   dev: 'wxc3b64b09b1d3dfc2',//appid_dev_wx
   test: 'wxac09792264c49b5c',//appid_test_wx 1002商城
   pre: 'wxac09792264c49b5c',//appid_test_wx 1002商城
-  prod: 'wx313ec36b710125d4',//appid_prod_3001 3001商城
+  prod: 'wx313ec36b710125d4',//appid_prod_
 }
 
 const imgConfig = {
@@ -64,7 +119,8 @@ const envInfo = (() => {
     imgCtx: imgConfig[PROJECT_ENV],
     tunnelToken: token[PROJECT_ENV],
     appId: appId[PROJECT_ENV],
-    brandId: '1001',// 1001 1002 3001 3002 //2711 711生产brandId
+    brandId: 1002,// 1001 1002 3001 3002 //2711 711生产brandId,
+    plusIsOpen : true, //是否开启plus
   }
 })()
 

src/pages/confirmOrder/confirmOrder.wxml

@@ -86,7 +86,7 @@
 
 		<!-- 商品合计 -->
 		<view class="pro-sum">
-			<view class="vip-info" wx:if="{{!isVip}}">
+			<view class="vip-info" wx:if="{{!isVip && plusIsOpen}}">
 				<view class="vip-left">
 					<view class="left-top">
 						<image class="top-image" src="/assets/imgs/7_1_0/plus-icon-3x.png" />

src/pages/my/my.js

@@ -31,6 +31,7 @@ wxService.page({
     currHomePageId: '',
     skuVOList: [],
     isQiye: false,
+    contactUsModal: false
   },
   /**
    * 生命周期函数--监听页面加载
@@ -80,8 +81,25 @@ wxService.page({
     // console.log('startmessage', e)
   },
   completemessage(e) {
-    console.log('联系我插件信息completemessage----', e)
-    // console.log('completemessage', e)
+    let ret = e.detail;
+    console.log('联系我插件信息completemessage----', ret)
+    if (ret.errcode == -3002 || ret.errcode == -3004 || ret.errcode == -3005) {
+      wx.showToast({
+        title: '联系失败，请联系管理员',
+        icon: 'none'
+      });
+    }
+    else if (ret.errcode == -3008) {
+      wx.showToast({
+        title: '暂无客服人员',
+        icon: 'none'
+      });
+    }
+    else {
+      this.setData({
+        contactUsModal: true,
+      });
+    }
   },
   /**
    * 生命周期函数--监听页面显示

src/pages/my/my.json

@@ -14,6 +14,7 @@
     "bottom-tabs": "/component/bottomTabs/bottomTabs",
     "authorization-modal": "/component/authorization-modal/authorization-modal",
     "plus": "/component/plus/plus",
-    "cell": "plugin://contactPlugin/cell"
+    "cell": "plugin://contactPlugin/cell",
+    "contact-us-modal": "/component/contactUsModal/contactUsModal"
   }
 }
\ No newline at end of file

src/pages/my/my.wxml

@@ -37,14 +37,17 @@
 <share-benefit-modal show="{{shareBenefitModalShow}}" benefit-data="{{benefitData}}"/>
 <!-- 联系我 -->
 <view class="cell-me" wx:if="{{!isQiye}}">
-		<cell 
-    bind:startmessage='startmessage' 
-    isMask="0" 
-    styleType="2" 
-    blockStyle="bubble" 
-    buttonStyle="light"
-    buttonText="0" 
-    bubbleColor="cb3c3c"
-    bind:completemessage="completemessage" 
-    plugid='766c50920993bf9c41c6c3d2761a2df5'  />
-	</view>
+  <cell 
+  bind:startmessage='startmessage' 
+  isMask="0" 
+  styleType="2" 
+  blockStyle="bubble" 
+  buttonStyle="light"
+  buttonText="0" 
+  bubbleColor="cb3c3c"
+  bind:completemessage="completemessage" 
+  plugid='766c50920993bf9c41c6c3d2761a2df5'  />
+</view>
+
+<!-- 联系我点击成功之后的回调 -->
+<contact-us-modal contactShow="{{contactUsModal}}"/>

src/pages/userCenter/userCenter.wxml

@@ -58,6 +58,8 @@
   bubbleColor="cb3c3c"
   bind:completemessage="completemessage" 
   plugid='766c50920993bf9c41c6c3d2761a2df5'  />
+  <!-- 766c50920993bf9c41c6c3d2761a2df5 -->
+  <!-- 泰华 6e4314d558e55fbc64fe2e757e24d61f -->
 </view>
 <!-- 联系我点击成功之后的回调 -->
 <contact-us-modal contactShow="{{contactUsModal}}"/>
\ No newline at end of file

src/project.config.json

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

src/shoppingGuid/page/pages/home/home.js

@@ -428,6 +428,19 @@ wxService.page({
   },
 
   /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function (res) {
+    if (res.from == 'button') {
+      return {
+        title: this.data.shareModel.title,
+        path: this.data.shareModel.path,
+        imageUrl: this.data.shareModel.imageUrl
+      }
+    }
+  },
+
+  /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {

src/shoppingGuid/page/pages/myMemberList/myMemberList.js

@@ -39,6 +39,7 @@ wxService.page({
           let list = data ? data : [];
           
           list.forEach(item => {
+            item.name = item.name ? item.name : '暂无名称';
             item.disabled = item.qiyeExternalUserid ? false : true;
             item.logo = item.member ? (item.member.memberWeixin ? (
               item.member.memberWeixin.headimgurl ? item.member.memberWeixin.headimgurl : defaultImg) : defaultImg

src/shoppingGuid/page/pages/qrcode/qrcode.js

@@ -16,12 +16,12 @@ wxService.page({
     cardImg : '',
     companyName: '',
     bottomTypeArr : [
-      { 
-        name: "关注公众号", 
-        url: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/7_3_0/icon_focus_wx_no_bg.png',
-        active: false,
-        type:1
-      },
+      // { 
+      //   name: "关注公众号", 
+      //   url: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/7_3_0/icon_focus_wx_no_bg.png',
+      //   active: false,
+      //   type:1
+      // },
       { 
         name: "企业微信", 
         url: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/7_3_0/icon_qiye_wx_no_bg.png', 

src/shoppingGuid/page/pages/welfare/welfare.js

@@ -9,7 +9,6 @@ const diyongBg = 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/7_3_0/icon_diy
 const defaultGoodsImg = 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/product_defalut.jpg';
 
 wxService.page({
-
   /**
    * 页面的初始数据
    */

src/subPackage/page/pages/paymentStatus/paymentStatus.wxml

@@ -23,7 +23,7 @@
 		<official-account style="width:100%;height:168rpx;"></official-account>
 	</view>
 
-	<view class="status-vip df" wx:if="{{!isVip}}">
+	<view class="status-vip df" wx:if="{{!isVip && plusIsOpen}}">
 		<view class="vip-tips">
 			<view class="tips-desc">
 				<image

src/utils/currentLinkRouter.js

@@ -84,7 +84,6 @@ function currentLinkRouter(event, _this) {
     }
     else if (rowObj.type == 9) { 
       // 分类
-      console.log('aaaacurrentClickType',currentClickType)
       wxService.router(`/subPackage/page/pages/categoryPro/categoryPro?id=${currentClickRow}`)
     }
   }

src/utils/wxService.js

@@ -15,6 +15,7 @@ import {
 import Http from './Http'
 const Promise = require('../lib/bluebird')
 const config = require('../config/index').envInfo
+const envInfo = require('../config/index').envInfo
 import utils from './util'
 const citysData = require('./city.js')
 import { Integer } from './integerDigitalConvertion'
@@ -574,7 +575,7 @@ class WXService extends Http {
     config.data.isVip = ''
     // 集点体验者
     config.data.experAccessible;
-
+    config.data.plusIsOpen = envInfo.plusIsOpen;
 
     const CONFIG_PAPGE = {
       onLoad: function (...args) {