Merge branch 'dev_7.2.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.2.0

src/shoppingGuid/page/pages/myMemberList/myMemberList.json

 {
-  "navigationBarTitleText": "我的招募",
+  "navigationBarTitleText": "全部会员",
   "usingComponents": {}
 }
\ No newline at end of file

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

@@ -20,9 +20,6 @@ wxService.page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    console.log('uinfo----', wx.getStorageSync('guidBaseInfo'))
-    console.log('guidInfo----', wx.getStorageSync('guidInfo'))
-
     const currentEnv = wx.getStorageSync('_qyWeChat');
     if (currentEnv) {
       this.getEnterpriseQrcode();
@@ -65,24 +62,31 @@ wxService.page({
   },
   //获取企业二维码
   getEnterpriseQrcode(){
-    wx.qy.getQrCode({
-      success: res => {
-        console.log('获取员工二维码---', res)
-        this.setData({
-          codeImg: res.qrCode
-        });
-      },
-      fail: res => {
-        console.log('获取员工二维码失败---', res)
-      }
-    });
+    let guideCodeImg = wx.getStorageSync('guideCodeImg');
+    if (!guideCodeImg){
+      wx.qy.getQrCode({
+        success: res => {
+          this.setData({
+            codeImg: res.qrCode
+          });
+          wx.setStorageSync('guideCodeImg', res.qrCode);
+        },
+        fail: res => {
+          console.log('获取员工二维码失败---', res)
+        }
+      });
+    }
+    else{
+      this.setData({
+        codeImg: guideCodeImg
+      });
+    }
   },
 
   //获取头像
   getAvator(){
     wx.qy.getAvatar({
       success: res => {
-        console.log('获取员工二头像---', res)
         this.setData({
           avator: res.avatar
         });

src/shoppingGuid/page/pages/selectUsers/selectUsers.js

@@ -35,6 +35,12 @@ wxService.page({
   onShow: function () {
 
   },
+  //跳转到我的全部会员
+  onTapToMyMemberList(){
+    wx.navigateTo({
+      url: '/shoppingGuid/page/pages/myMemberList/myMemberList',
+    });
+  },
 
   //点击事件
   onTapExpandOrInpand(e){

src/shoppingGuid/page/pages/selectUsers/selectUsers.wxml

@@ -16,6 +16,7 @@
       data-index="{{idx}}"
       data-item="{{item}}"
       wx:for-item="item">{{item.name}}</view>
+
     </view>
     <!-- 标签s -->
     <view class='tags'>
@@ -31,7 +32,7 @@
           wx:if="{{idx < 3}}"
           wx:for-item="item">{{item.name}}</view>
         </view>
-        <view class='rg' bindtap='onTapExpandOrInpand'>展开></view>
+        <view class='rg' bindtap='onTapExpandOrInpand'>{{isOpen ? "收起" : "展开"}}</view>
       </view>
     </view>
 </view>
@@ -80,5 +81,6 @@
 <view class='empty' wx:if="{{tags.length == 0}}">
   {{noTag ? "暂无数据~" : "数据加载中.."}}
 </view>
-
+<!-- 悬浮我的全部会员 -->
+<view class='all-members' bindtap='onTapToMyMemberList'>全部</view>
 

src/shoppingGuid/page/pages/selectUsers/selectUsers.wxss

@@ -228,4 +228,21 @@ view{
 .list .list-item  .rg-info  .info-desc{
   color: #999999;
   font-size: 24rpx;
+}
+
+/* w我的全部会员 */
+.all-members{
+  position: fixed;
+  width: 80rpx;
+  height: 80rpx;
+  background: rgba(0, 0, 0, 0.5);
+  border-radius: 50%;
+  bottom: 120rpx;
+  right: 30rpx;
+  z-index: 2;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #ffffff;
+  font-size: 24rpx;
 }
\ No newline at end of file

src/shoppingGuid/page/pages/welcomGuider/welcomGuider.js

@@ -67,6 +67,7 @@ wxService.page({
           this.setData({
             code: res.code
           });
+          wx.removeStorageSync('guideCodeImg');
           this.jscode2session(res.code);
         },
         fail: res => {