Merge branch 'dev_7.2.0' into feature-zyw-7.2.0

src/component/announcement/announcement.wxss

@@ -8,6 +8,7 @@
 	display: flex;
   align-items: center;
   justify-content: center;
+  border-radius: 10rpx;
 }
 .text {
 	overflow: hidden;

src/palette/guiderCard.js

+export default class GuiderCard {
+  palette(qrcodeUrl,uLogo,uName) {
+    return ({
+      width: '750rpx',
+      height: '850rpx',
+      background: '#ffffff',
+      views: [
+        {
+          type: 'image',
+          url: qrcodeUrl,
+          css: {
+            width: '350rpx',
+            height: '350rpx',
+            left : '200rpx',
+            top : '100rpx',
+            borderRadius: '10rpx',
+          }
+        },
+        {
+          type: 'image',
+          url: uLogo,
+          css: {
+            width: '180rpx',
+            height: '180rpx',
+            left: '285rpx',
+            top: '460rpx',
+            borderRadius : '90rpx',
+          }
+        },
+        {
+          type: 'text',
+          text: uName,
+          css: {
+            fontSize: '30rpx',
+            left: '320rpx',
+            top: '660rpx',
+            color : '#333333',
+            fontWeight : 'bold',
+          },
+        },
+        {
+          type: 'text',
+          text: '我是导购，享用更多福利请使用微信扫码加我哦~',
+          css: {
+            fontSize: '24rpx',
+            left: '120rpx',
+            bottom: '50rpx',
+            color: '#999999',
+          },
+        },
+      ],
+    });
+  }
+}

src/palette/image-example.js

@@ -23,15 +23,15 @@ export default class ImageExample {
             bottom: '43rpx',
           }
         },
-        // {
-        //   type: 'text',
-        //   text: '设置height为auto',
-        //   css: {
-        //     left: '210rpx',
-        //     top: '780rpx',
-        //     fontSize: '30rpx',
-        //   },
-        // },
+        {
+          type: 'text',
+          text: '设置height为auto',
+          css: {
+            left: '210rpx',
+            top: '780rpx',
+            fontSize: '30rpx',
+          },
+        },
       ],
     });
   }

src/project.config.json

@@ -39,7 +39,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 16,
+			"current": 54,
 			"list": [
 				{
 					"id": -1,
@@ -404,7 +404,7 @@
 					"id": 54,
 					"name": "会员详情",
 					"pathName": "shoppingGuid/page/pages/userInfo/userInfo",
-					"query": "id=700000000013480"
+					"query": "id=700000000013481"
 				},
 				{
 					"id": -1,

src/shoppingGuid/page/pages/couponQrcode/couponQrcode.js

@@ -46,8 +46,6 @@ wxService.page({
     // subPackage / page / pages / scanCoupon / scanCoupon
     let currentUserInfo = wx.getStorageSync('guidBaseInfo');
     let memberId = currentUserInfo.memberId;
-    console.log(this.data.couponInfo)
-
     let content = {
       title: this.data.couponInfo.couponName,
       id: this.data.couponInfo.couponId,

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

@@ -102,9 +102,9 @@ wxService.page({
   },
   //跳转到会员
   onTapToMember(){
-    wx.redirectTo({
+    wx.navigateTo({
       url: '/shoppingGuid/page/pages/selectUsers/selectUsers',
-    })
+    });
   },
 
   /**

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

 // shoppingGuid/page/pages/qrcode/qrcode.js
 const wxService = require('../../../../utils/wxService')
+import GuiderCard from '../../../../palette/guiderCard';
 const app = getApp();
 wxService.page({
-
   /**
    * 页面的初始数据
    */
+  // https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/demo_qrcode.png
+  // https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/biaka_default_u_logo.png
   data: {
-    codeImg : '',
-    avator: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/biaka_default_u_logo.png',
-    name :''
+    codeImg: '',
+    avator: '',
+    name :'',
+    template : {},
+    cardImg : ''
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    console.log('uinfo----', wx.getStorageSync('guidBaseInfo'))
+    console.log('guidInfo----', wx.getStorageSync('guidInfo'))
+
     const currentEnv = wx.getStorageSync('_qyWeChat');
     if (currentEnv) {
       this.getEnterpriseQrcode();
@@ -86,12 +93,64 @@ wxService.page({
     });
   },
 
+  //保存名片按钮
+  onTapSaveCardToColumn(){
+    if (!this.data.codeImg){
+      wx.showToast({
+        title: '导购二维码不存在',
+        icon : 'none'
+      });
+      return ;
+    }
+
+    let avatar = this.data.avator ? this.data.avator : 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/biaka_default_u_logo.png';
+    
+    wx.showLoading({
+      title: '图片生成中...',
+    });
+    this.setData({
+      template: new GuiderCard().palette(this.data.codeImg, avatar,this.data.name)
+    });
+  },
+
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
 
   },
+
+  //生成二维码后
+  onImgOK(e) {
+    console.log('生成成功!',e);
+    let imgUrl = e.detail.path;
+    wx.saveImageToPhotosAlbum({
+      filePath: imgUrl,
+      success(res) {
+        wx.hideLoading();
+        setTimeout(() => {
+          wx.showToast({
+            title: '保存成功,请前往相册查看~',
+            icon: 'none'
+          }, 2000)
+        })
+      },
+      fail(err) {
+        console.log(err)
+        let txt = '保存失敗';
+        if (err.errMsg == 'saveImageToPhotosAlbum:fail auth deny') {
+          txt = '获取相册授权失败'
+        }
+        wx.hideLoading();
+        setTimeout(() => {
+          wx.showToast({
+            title: txt,
+            icon: 'none'
+          }, 2000)
+        })
+      }
+    });
+  },
   
 
 

src/shoppingGuid/page/pages/qrcode/qrcode.json

 {
   "navigationBarTitleText": "对外名片",
-  "usingComponents": {}
+  "usingComponents": {
+    "painter": "/component/painter/painter"
+  }
 }
\ No newline at end of file

src/shoppingGuid/page/pages/qrcode/qrcode.wxml

@@ -6,3 +6,14 @@
     <text class='name'>{{name}}</text>
   </view>
 </view>
+<!-- 底部操作按钮 -->
+<view class='bottom-operator' bindtap='onTapSaveCardToColumn'>
+  <icon type='download' size='16' color="rgb(0, 145, 255)"></icon>保存名片到相册
+</view>
+
+<!-- 预览 -->
+<view class='preview'>
+    <painter palette="{{template}}" bind:imgOK="onImgOK" /> 
+</view>
+
+

src/shoppingGuid/page/pages/qrcode/qrcode.wxss

@@ -3,6 +3,8 @@ page{
   background: #f2f2f2;
   box-sizing: border-box;
   -webkit-box-sizing: border-box;
+  overflow: hidden;
+  position: relative;
 }
 
 view{
@@ -18,21 +20,22 @@ view{
 .qrcode .card{
   width: 100%;
   height: auto;
-  padding: 30rpx;
+  padding: 100rpx 30rpx;
   background: #ffffff;
   border-radius: 10rpx;
-  border: 12rpx solid rgba(0, 145, 255, 0.46);
+  /* border: 12rpx solid rgba(0, 145, 255, 0.46); */
+  box-shadow: 0 0 20rpx 8rpx rgba(0, 145, 255, 0.46);
   display: flex;
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  padding-bottom: 100rpx;
 }
 
 .qrcode .card .g-qrcode{
   width: 320rpx;
   height: 320rpx;
   margin-bottom: 40rpx;
+  border-radius: 10rpx;
 }
 
 .qrcode .card .g-logo{
@@ -47,3 +50,34 @@ view{
   color: #333333;
   font-weight: bold;
 }
+
+/* 底部操作按钮 */
+.bottom-operator{
+  position: fixed;
+  bottom: 20rpx;
+  left: 0;
+  width: 100%;
+  height: 80rpx;
+  display: flex;
+  align-items: center;
+  padding: 0 30rpx;
+  justify-content: center;
+  color: #666666;
+  font-size: 28rpx;
+}
+
+.bottom-operator icon{
+  margin-right: 10rpx;
+}
+
+.bottom-operator:active{
+  opacity: 0.7;
+}
+
+.preview{
+  width: 100%;
+  height: 100vh;
+  background: #ffffff;
+  position: absolute;
+  transform: translateX(-100%);
+}
\ No newline at end of file

src/shoppingGuid/page/pages/userInfo/userInfo.js

@@ -43,12 +43,15 @@ wxService.page({
     let memberId = options.id ;
     this.data.memberId = memberId;
     this.getMemberFind(memberId);
-    let currentUserInfo = wx.getStorageSync('_baseUserInfo');
-    let userInfo = wx.getStorageSync('_userInfo');
+    let currentUserInfo = wx.getStorageSync('guidBaseInfo');
+    let userInfo = wx.getStorageSync('guidInfo');
     if (currentUserInfo.member){
-      if (!currentUserInfo.member.name){
+      if (!currentUserInfo.member.qiyeInfo.name){
         currentUserInfo.member.name = userInfo.nickName;
       }
+      else{
+        currentUserInfo.member.name = currentUserInfo.member.qiyeInfo.name;
+      }
     }
 
     if (currentUserInfo){
@@ -82,7 +85,12 @@ wxService.page({
   onShow: function () {},
   //获取用户总消费额
   getMemberTotalConsumeAmount(memberId){
-
+    wxService.get(`/sale/trade/tradeMemberCalcByMemberId?memberId=${memberId}`).then(res => {
+      this.data.total.totalConsume = res.data.data.totalConsume ? res.data.data.totalConsume : 0;
+      this.setData({
+        total : this.data.total
+      });
+    })
   },
   //获取优惠券信息
   getMemberCoupon(memberId){
@@ -344,6 +352,45 @@ wxService.page({
 
     })
   },
+  //立即回访
+  onTapReCall(){
+    const currentEnv = wx.getStorageSync('_qyWeChat');
+    if (currentEnv) {
+      let qiyeExternalUserid = this.data.memberInfo.qiyeExternalUserid ? this.data.memberInfo.qiyeExternalUserid : 
+        (this.data.memberInfo.qiyeInfo ? this.data.memberInfo.qiyeInfo.qiyeExternalUserid : '');
+      let guidInfo = wx.getStorageSync('guidBaseInfo'),
+        guidQiyeUserId = guidInfo.member.qiyeInfo.userid;
+
+      if (!qiyeExternalUserid) {
+        wx.showToast({
+          title: '该会员还不是您的好友，请先加好友！',
+          icon: 'none'
+        });
+        return;
+      }
+
+      wx.qy.openEnterpriseChat({
+        userIds: guidQiyeUserId,    //参与会话的企业成员列表，格式为userid1;userid2;...，用分号隔开。
+        externalUserIds: qiyeExternalUserid, // 参与会话的外部联系人列表，格式为userId1;userId2;…，用分号隔开。
+        groupName: '',  // 必填，会话名称。单聊时该参数传入空字符串""即可。
+        success: function (res) {
+        },
+        fail: function (res) {
+          // 失败处理
+          wx.showToast({
+            title: '创建会话失败，请稍后再试！',
+            icon: 'none'
+          });
+        }
+      });
+    }
+    else{
+      wx.showToast({
+        title: '请在企业微信中使用',
+        icon: 'none'
+      });
+    }
+  },
   //打电话
   handelPhoneCall(e) {
     const {phone} = e.currentTarget.dataset;

src/shoppingGuid/page/pages/userInfo/userInfo.wxml

@@ -12,7 +12,7 @@
           data-phone="{{memberInfo.mobile}}" 
           bindtap="handelPhoneCall" mode='widthFix'></image>
         </view>
-        <view class='u-item-rg' data-phone="{{memberInfo.mobile}}" bindtap="handelPhoneCall">立即联系</view>
+        <view class='u-item-rg' bindtap='onTapReCall'>立即回访</view>
       </view>
       <view class='u-items'>
         <view class='u-item-lf'>

src/shoppingGuid/page/pages/userList/userList.js

@@ -65,9 +65,43 @@ wxService.page({
   },
   //回访
   onTapRecall(e){
-    let item = e.currentTarget.dataset.item;
-    console.log(item)
+    const currentEnv = wx.getStorageSync('_qyWeChat');
+    // wmfen5DwAA5WDE7CBEa_qgIva_cUlAyw 杨辰的外部联系人userid
+
+    if(currentEnv){
+      let guidInfo = wx.getStorageSync('guidBaseInfo'),
+        guidQiyeUserId = guidInfo.member.qiyeInfo.userid;
+
+      let qiyeExternalUserid = e.currentTarget.dataset.item.qiyeExternalUserid;
+      if (!qiyeExternalUserid) {
+        wx.showToast({
+          title: '该会员还不是您的好友，请先加好友！',
+          icon: 'none'
+        });
+        return;
+      }
 
+      wx.qy.openEnterpriseChat({
+        userIds: guidQiyeUserId,    //参与会话的企业成员列表，格式为userid1;userid2;...，用分号隔开。
+        externalUserIds: qiyeExternalUserid, // 参与会话的外部联系人列表，格式为userId1;userId2;…，用分号隔开。
+        groupName: '',  // 必填，会话名称。单聊时该参数传入空字符串""即可。
+        success: function (res) {
+        },
+        fail: function (res) {
+          // 失败处理
+          wx.showToast({
+            title: '创建会话失败，请稍后再试！',
+            icon: 'none'
+          });
+        }
+      });
+
+    }else{
+      wx.showToast({
+        title: '请在企业微信中使用',
+        icon : 'none'
+      });
+    }
   },
 
   /**

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

@@ -20,8 +20,8 @@ wxService.page({
       title: '检查登录状态..',
     });
 
-    this.qyLogin();
-    return ;
+    // this.qyLogin();
+    // return ;
 
     //先判断是是不是已经登录了
     let currentUserInfo = wx.getStorageSync('guidBaseInfo');
@@ -34,6 +34,7 @@ wxService.page({
           });
         },
         fail : res => { //失效了
+          console.log('check session fail , starting login ----')
           this.qyLogin();
         }
       });
@@ -52,6 +53,8 @@ wxService.page({
             code: res.code
           });
 
+          console.log('企业登录ok,code -------', res.code);
+
           this.jscode2session(res.code);
         },
         fail: res => {

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

@@ -158,6 +158,8 @@ wxService.page({
         let inner_id = Integer.digit(item.productId, 10, 64);
         let inner_tentacleId = Integer.digit(tentacleId, 10, 64);
         var path = 'pages/productDetail/productDetail' + '?i=' + inner_id + '&t=' + inner_tentacleId;
+        // let path = 'pages/productDetail/productDetail';
+        console.log('推荐商品path-----', path)
         //打开企业微信通讯录选择会员
         wx.qy.shareToExternalContact({
           appid: app.globalData.appId,//小程序的appid