Merge branch 'mall_dev_7.11.0' into 'mall_dev_7.12.0'

Mall dev 7.11.0

See merge request !197

src/pages/refund/refund.wxml

@@ -54,15 +54,13 @@
 				</picker>
 			</view>
 		</view>
-
 		<!-- 温馨提示 -->
-		<view class="warn-tips" wx:if="{{openRefundTips && curType.name != '请选择'}}">
+		<view class="warn-tips" wx:if="{{openRefundTips}}">
 			<view class="header">退货须知</view>
 			<view class="tips-content">
 				{{refundTips}}
 			</view>
 		</view>
-
 		<view class="form">
 			<view class="form-label">退款金额</view>
 			<view class="form-picker">

src/pages/refund/refund.wxss

@@ -178,7 +178,6 @@ page{
   background: #ffffff;
   padding: 20rpx; }
 
-
   .warn-tips{
     background-color: #eeeeee;
     margin-top: 15rpx;
@@ -198,4 +197,4 @@ page{
     padding-top: 20rpx;
     letter-spacing: 2rpx;
     line-height: 30rpx;
-  }
\ No newline at end of file
+  }

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

@@ -151,11 +151,11 @@ wxService.page({
   },
   //获取经验值流水
   getMemberExpHistory(memberId){
-    wxService.post(`/member/exp/queryExpDetail?pageNum=1&pageSize=10000`,{
+    wxService.get(`/member/memberExp/findPage?pageNum=1&pageSize=10000&status=null`,{
       memberId: memberId,
     }).then(res => {
       if(!res) return ;
-      let list = res.data.data.content ? res.data.data.content : [];
+      let list = res.data.data ? res.data.data : [];
       this.setData({
         expHistory : list
       });
@@ -163,14 +163,14 @@ wxService.page({
   },
   //获取会员经验值
   getMemberExp(memberId){
-    wxService.post(`/member/exp/byMemberIdQueryExp?memberId=${memberId}`).then(res => {
-      if(!res) return ;
-      let obj = res.data.data;
-      this.data.total.totalExp = obj.exp ? obj.exp : 0;
-      this.setData({
-        total: this.data.total
-      })
-    })
+    // wxService.post(`/member/exp/byMemberIdQueryExp?memberId=${memberId}`).then(res => {
+    //   if(!res) return ;
+    //   let obj = res.data.data;
+    //   this.data.total.totalExp = obj.exp ? obj.exp : 0;
+    //   this.setData({
+    //     total: this.data.total
+    //   })
+    // })
   },
   //获取会员详情
   getMemberFind(memberId) {
@@ -185,10 +185,13 @@ wxService.page({
       const { result, data } = res && res.data || res && res.result
       if (result == 0) {
         wx.hideLoading()
+        this.data.memberInfo = data.member;
         data.member.age = data.member.birthday ? utils.getAge(data.member.birthday) : 0;
         data.member.sex = data.member.sex ? data.member.sex : '保密';
+        this.data.total.totalExp = data.member.exp ? data.member.exp : 0;
         this.setData({
-          memberInfo: data.member
+          memberInfo: data.member,
+          total : this.data.total,
         })
       }
     })
@@ -368,14 +371,13 @@ wxService.page({
     })
   },
   //立即回访
-  onTapReCall(){
+  onTapConactExternalUser(){
     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: '该会员还不是您的好友，请先加好友！',

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' bindtap='onTapReCall'>立即回访</view>
+        <view class='u-item-rg' bindtap="onTapConactExternalUser">立即回访</view>
       </view>
       <view class='u-items'>
         <view class='u-item-lf'>
@@ -226,7 +226,7 @@
         <view class='title'>{{item.sourceName}}</view>
         <view>{{item.createTime}}</view>
       </view>
-      <view class='time'>{{item.type == 0 ? "-" : "+"}}{{item.exp}}</view>
+      <view class='time'>{{item.type == 0 ? "-" : "+"}}{{item.changeValue}}</view>
     </view>
     <!-- 空 -->
     <view class='empty' wx:if="{{expHistory.length == 0}}">暂无数据~</view>