xiaoe_mp_npm 0.3.5-t220118 → 0.3.5

package/.gitlab-ci.yml

@@ -3,7 +3,9 @@ build_test:
   stage: build
   only:
     - dev
-    - dev-gwenniezhou
+    - feature/live_marketing_iteration
+    - feature/remove-error-report
+    - fix/record-lottery
   tags:
     - fe-group-prod-runner-2
   script:
@@ -13,7 +15,6 @@ build_test:
     - export version=${version:2:$[${#version}-4]}
     - export message=$(git log --pretty=format:%s -1)
     - export author=$(git log --pretty=format:%an -1)
-    - if [ $CI_COMMIT_REF_NAME != "master" ] && [ $(echo $version | grep -E "r|t" ) != "" ]; then echo "正常发包"; else exit 0; fi
     - cnpm i
     - npm run build
     - cnpm publish

package/miniprogram_dist/AliveInvite/LiveRoomVertical/components/friends/friends.js

@@ -5,14 +5,6 @@ import {
 } from "../../../../common/api/eLiveInvite";
 Component({
     properties: {
-        // inviteParm: {
-        //     type: String,
-        //     value: ''
-        // },
-        // roomInfo: {
-        //     type: Object,
-        //     value: {}
-        // },
         switchToControlDialogVisible:{
             type: Boolean,
             value:false
@@ -38,32 +30,21 @@ Component({
         isShowFriends: false,
         count: 0, // 邀请的好友数
         inviteParm:'',
-        friendList: [
+        total: 0,
+        refreshing: false,
+        finishedTxt: '加载中',
+        finished: false,
+        componentsState: 1,
+        page_size: 25,
+        page_index: 0,
+        friendList:[],
+        friendListMockData: [
             // {
             //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
             //     wx_nickname: 'wendy'
             // }, {
             //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
             //     wx_nickname: 'moira1'
-            // }, {
-            //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
-            //     wx_nickname: 'moira2'
-            // }
-            // , {
-            //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
-            //     wx_nickname: 'moira333333'
-            // }
-            // , {
-            //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
-            //     wx_nickname: 'moira4'
-            // }
-            // , {
-            //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
-            //     wx_nickname: 'moira5'
-            // }
-            // , {
-            //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
-            //     wx_nickname: 'moira6'
             // }
 
         ] //邀请的好友列表
@@ -72,20 +53,43 @@ Component({
         switchToControlDialogVisible(val) {
             if(val){
                 this.showFriends()
+            }else{
+                this.closeFriends()
             }
-        //   this.setData({
-        //     isShowFriends:val
-        //   })
-        //   this.getFriendsList()
         },
       },
     ready() {
     },
     methods: {
+        onLoad(){
+            if (this._freshing) return
+            this._freshing = true
+            this.setData({
+              finished: false,
+              page_index: 0
+            })
+            this.getFriendsList()
+        },
+        onScrolltolower(){
+            console.log(this.data.finished, this._freshing )
+            if(this.scrolling){return}
+            this.scrolling = true
+            this.setData({
+              finishedTxt: this.data.finished ? "没有更多了" : "加载中"
+            })
+            if(this.data.finished || this._freshing){
+                return
+            }
+            let onScrolltolower  = true
+            this.getFriendsList(onScrolltolower)
+        },
         closeFriends() {
             this.setData({
                 isShowFriends: false
             })
+            this.setData({
+                componentsState: this.data.componentsState + 1
+            })
         },
         showFriends() {
             this.setData({
@@ -102,22 +106,14 @@ Component({
             }
             return base64.encode(JSON.stringify(params))
         },
-        getFriendsList() {
-            // let params = {
-            //     "bizData": {
-            //         "inviteParm": this.data.inviteParm,
-            //         "page": 0,
-            //         "count": 10,
-            //     },
-            //     "user_id": this.properties.userId,
-            //     "app_id": this.properties.appId
-            // };
+        getFriendsList(onScrolltolower = false) {
+            let state = this.data.componentsState 
             let inviteParams = this.generateBase64(2, 4, this.properties.aliveId, '')
             let params = {
                 "bizData": {
                     "inviteParm": inviteParams,
-                    "page": 0,
-                    "count": 10,
+                    "page": this.data.page_index,
+                    "count": this.data.page_size,
                 },
                 "user_id": this.properties.userId,
                 "app_id": this.properties.appId
@@ -125,9 +121,36 @@ Component({
             getInviteDetail(params).then(res => {
                 let DATA = res.data;
                 if (DATA.code === 0) {
-                    this.setData({
-                        friendList: DATA.data
-                    })
+                    // 关闭弹窗的时候返回的数据丢弃 // 上拉加载与下拉刷新一起触发时丢弃上拉加载数据
+                if(state !==this.data.componentsState || (this._freshing === true && onScrolltolower) ) {
+                    return
+                  }
+                  var total = DATA.inviteNum
+                  var finishedTxt = "加载中"
+                  var finished = false
+                  this.formatData(DATA.data,onScrolltolower)
+                  // 下拉加载，且数据返回空
+                  if(this._freshing && DATA.data.length === 0){
+                    finishedTxt = "no-data"
+                  }
+                  else if (this.data.friendList.length >= total || DATA.data.length === 0) {
+                      // 获取到所有数据
+                      finished = true// 没有更多了
+                      finishedTxt = "没有更多了"
+                      this.setData({finishedTxt})
+                  }
+                  else {
+                    finishedTxt = "加载中"
+                  }
+                  this.setData({
+                    refreshing: false,
+                    page_index: this.data.page_index + 1,
+                    finishedTxt,
+                    finished,
+                    total
+                  })
+                  this._freshing = false
+                  this.scrolling = false
                 } else {
                     wx.showToast({
                         title: DATA.msg,
@@ -136,10 +159,24 @@ Component({
                 }
             }).catch(err => {
                 wx.showToast({
-                    title: err.data.msg,
+                    title: err.msg,
                     icon: 'error'
                 })
             });
         },
+        formatData(data,onScrolltolower){
+            //onScrolltolower代表是上拉加载的标识，网卡的时候有上拉加载与下拉刷新同时请求，上拉加载的数据也push进去的情况。
+              let friendList = this.data.friendList
+              data.forEach((item,index) => {
+                  if (!this._freshing) {
+                    friendList.push(item)
+                  }
+                })
+                if (this._freshing && !onScrolltolower) {
+                  //下拉刷新的时候直接赋值
+                  friendList = JSON.parse(JSON.stringify(data))
+                }
+                this.setData({friendList})
+          },
     }
 })

package/miniprogram_dist/AliveInvite/LiveRoomVertical/components/friends/friends.wxml

@@ -5,8 +5,9 @@
         class="icon-left-back"
         src="../../../images/icon_arrow_up.png"
       />
-      <view class="count-style">邀请的好友{{'('+friendList.length+')'}}</view>
+      <view class="count-style">邀请的好友{{'('+total+')'}}</view>
     </view>
+    <scroll-view scroll-y="true" bindscrolltolower="onScrolltolower" refresher-triggered="{{refreshing}}" bindrefresherrefresh="onLoad" refresher-enabled="{{true}}" style="height:calc(100vh - 700rpx)">
     <view class="friend-list">
       <view
         class="friend-item"
@@ -19,5 +20,7 @@
         </view>
       </view>
     </view>
+    <view class="finished-text" wx:if="{{!refreshing && finishedTxt !== 'no-data'}}">{{finishedTxt}}</view>
+  </scroll-view>
   </van-popup>
 </view>

package/miniprogram_dist/AliveInvite/LiveRoomVertical/components/friends/friends.wxss

@@ -8,6 +8,13 @@
     opacity: 1;
   }
 }
+.finished-text {
+  display: flex;
+  justify-content: center;
+  color: #999;
+  font-size: 28rpx;
+  padding-bottom: 20rpx;
+}
 .container-friends {
   animation: popping ease 300ms;
   position: fixed;
@@ -53,7 +60,7 @@
   padding: 32rpx;
 }
 .friend-list {
-  height: calc(100vh - 700rpx);
+  height: calc(100vh - 748rpx);
   /* flex: 1; */
   overflow: scroll;
   /* display: flex; */

package/miniprogram_dist/AliveInvite/LiveRoomVertical/index.js

@@ -53,7 +53,8 @@ Component({
     timerTop3: null, // 邀请top3头像定时器
     topHeight: 0,
     rightPosition: 0,
-    hasPhoneChin:false
+    hasPhoneChin:false,
+    isAndroid: true // 判断是否安卓
   },
   ready() {
   },
@@ -120,6 +121,22 @@ Component({
     openRuleDetail() {
       this.triggerEvent('changePosterDisplay',"rulesDialog")
     },
+    checkIsAndroid(){
+      const that = this
+      wx.getSystemInfo({
+        success (res) {
+          if(res.system.includes('iOS')) {
+            that.setData({
+              isAndroid: false
+            })
+          } else if(res.system.includes('Android')){
+            that.setData({
+              isAndroid: true
+            })
+          }
+        }
+      })
+    },
     // 获取排名前三的用户
     getTop3Inviter() {
       if (!this.properties.roomInfo.app_id) {
@@ -167,7 +184,11 @@ Component({
         if (this.data.activityEndType === 1 && !this.data.isLiveOver) {
           flag = true
         } else if (this.data.activityEndType === 2) {
-          const endTime = new Date(this.data.activityEndTime)
+          this.checkIsAndroid()
+          let endTime = new Date(this.data.activityEndTime)
+          if(!this.data.isAndroid) {
+            endTime = new Date(this.data.activityEndTime.replaceAll('-', '/'))
+          }
           flag = Date.now() <= endTime.getTime()
         }
       }
@@ -185,7 +206,7 @@ Component({
       this.getTopInviter()
       const timer = setInterval(() => {
         this.getTopInviter()
-      }, 2000)
+      }, 30*1000)
       this.timer = timer;
     },
     // 获取邀请用户排名列表

package/miniprogram_dist/AliveInvite/LiveRoomVertical/index.less

@@ -1,6 +1,12 @@
+.invite-entrance-liveroom-page{
+    height:100%;
+    display:flex;
+    flex-direction: column;
+  }
 .invite-rank-page {
     animation: popping ease 300ms;
-    height: 1250rpx;
+    height: 100%;
+    flex:1;
     background-color: #fff !important;
     background: url("https://wechatapppro-1252524126.cos.ap-shanghai.myqcloud.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2l510aau.png?imageView2/2/w/200/q/60");
     background-size: contain;
@@ -8,28 +14,7 @@
     border-radius: 16px 16px 0 0;
 }
 .scrollViewHeight{
-    height:calc(100vh - 704rpx);
-}
-.scrollViewDefaultHeight{
-    height:calc(100vh - 596rpx);
-}
-.smallModelViewDefaultHeight{
-    height:calc(100vh - 576rpx);
-}
-.smallModelVeiwHeight{
-    height:calc(100vh - 698rpx);
-}
-.scrollViewPackUpDefaultHeight{
-    height:calc(100vh - 468rpx); 
-}
-.scrollViewPackUpHeight{
-    height:calc(100vh - 362rpx);
-}
-.smallModelViewPackUpDefaultHeight{
-    height:calc(100vh - 342rpx);
-}
-.smallModelVeiwPackUpHeight{
-    height:calc(100vh - 464rpx);
+    height:calc(100% - 120rpx);
 }
 .container-ranking {
     animation: popping ease 300ms;

package/miniprogram_dist/AliveInvite/LiveRoomVertical/index.wxml

@@ -3,7 +3,7 @@
     <view class="invite-rank-page" wx:if="{{isShowRank}}">
         <view class="mask-layer" bindtap="closeInvitingRank"></view>
         <scroll-view scroll-y="true" 
-        class="{{!isPackUp?hasPhoneChin ?topInviter.length == 0 && !isDefaultPage?'scrollViewDefaultHeight':'scrollViewHeight':topInviter.length == 0 && !isDefaultPage?'smallModelViewDefaultHeight':'smallModelVeiwHeight':hasPhoneChin ?topInviter.length == 0 && !isDefaultPage?'scrollViewPackUpDefaultHeight':'scrollViewPackUpHeight':topInviter.length == 0 && !isDefaultPage?'smallModelViewPackUpDefaultHeight':'smallModelVeiwPackUpHeight'}}">
+        class="scrollViewHeight">
             <view class="container-ranking">
                 <view class="img-background">
                     <image

package/miniprogram_dist/AliveInvite/LiveRoomVertical/index.wxss

@@ -1,6 +1,12 @@
+.invite-entrance-liveroom-page {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
 .invite-rank-page {
   animation: popping ease 300ms;
-  height: 1250rpx;
+  height: 100%;
+  flex: 1;
   background-color: #fff !important;
   background: url("https://wechatapppro-1252524126.cos.ap-shanghai.myqcloud.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2l510aau.png?imageView2/2/w/200/q/60");
   background-size: contain;
@@ -8,28 +14,7 @@
   border-radius: 16px 16px 0 0;
 }
 .scrollViewHeight {
-  height: calc(100vh - 704rpx);
-}
-.scrollViewDefaultHeight {
-  height: calc(100vh - 596rpx);
-}
-.smallModelViewDefaultHeight {
-  height: calc(100vh - 576rpx);
-}
-.smallModelVeiwHeight {
-  height: calc(100vh - 698rpx);
-}
-.scrollViewPackUpDefaultHeight {
-  height: calc(100vh - 468rpx);
-}
-.scrollViewPackUpHeight {
-  height: calc(100vh - 362rpx);
-}
-.smallModelViewPackUpDefaultHeight {
-  height: calc(100vh - 342rpx);
-}
-.smallModelVeiwPackUpHeight {
-  height: calc(100vh - 464rpx);
+  height: calc(100% - 120rpx);
 }
 .container-ranking {
   animation: popping ease 300ms;

package/miniprogram_dist/ConfirmOrder/components/AddressEdit/index.wxml

@@ -2,10 +2,10 @@
 <view class="address-edit-content">
   <van-dialog id="van-dialog" />
   <!-- 获取微信收货地址 -->
-  <WechatAddress 
+  <!-- <WechatAddress 
     addressList="{{ addressList }}"
     bind:createAddress="saveAddress"
-  ></WechatAddress>
+  ></WechatAddress> -->
   <view class="input-wrapper">
     <van-field value="{{ address.receiver }}" label="收货人" placeholder="收货人姓名" maxlength="15" bind:change="changeMsg" data-type="receiver" />
     <van-field value="{{ address.phone }}" label="手机号码" placeholder="收货人手机号" maxlength="11" type="number" bind:change="changeTel" />

package/miniprogram_dist/ConfirmOrder/components/AddressManage/index.wxml

@@ -1,11 +1,11 @@
 <!--src/ConfirmOrder/components/AddressManage/index.wxml-->
 <view class="address-manage-content">
   <!-- 获取微信收货地址 -->
-  <WechatAddress 
+  <!-- <WechatAddress 
     addressList="{{ addressList }}"
     bind:createAddress="createAddress"
     bind:chooseAddress="chooseAddress"
-  ></WechatAddress>
+  ></WechatAddress> -->
 
   <view class="address-bar" wx:for="{{ addressList }}" wx:key="key">
     <view class="left-info" bindtap="chooseAddress" data-item="{{ item }}">

package/miniprogram_dist/ConfirmOrder/components/ConfirmOrderContent/index.js

@@ -219,6 +219,17 @@ Component({
     },
   },
   observers: {
+    distributionMode(val) {
+      if (val === 1) {
+        this.setData({
+          express_type: val
+        })
+      } else if (val === 2) {
+        this.setData({
+          express_type: val
+        })
+      }
+    },
     marketingData(marketingData) {
       // 这里的逻辑应该是存在拼团的时候那么payment_type就要赋值为13，如果是限时折扣或者是单买的话，payment_type不做赋值默认为2
       if (

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/components/ImageData/index.js

@@ -1,5 +1,6 @@
 // src/ConfirmOrder/components/GoodsInfo/components/ImageData/index.js
 const computedBehavior = require('miniprogram-computed').behavior
+const {utils} = require("live-mp-tools");
 
 Component({
   behaviors: [computedBehavior],
@@ -51,28 +52,9 @@ Component({
   },
   computed: {
     realSrc(data) {
-      
       // 腾讯云图片才会支持去压缩裁剪
       if (data.src.indexOf("myqcloud") > 0 && data.showCompress) {
-        const formatSrc = data.src.replace(/^http:/, "https:");
-        const curSrc = `${formatSrc.replace("file", "picsh")}?imageView2`;
-        const compressType = data.compressType ? `/${data.compressType}` : "";
-        const compressWidth = data.compressWidth
-          ? `/w/${data.compressWidth}`
-          : "";
-        const compressHeight = data.compressHeight
-          ? `/h/${data.compressHeight}`
-          : "";
-        const compress = data.compress ? `/q/${data.compress}` : "";
-        const format = data.format ? `/format/${data.format}` : "";
-        return (
-          curSrc +
-          compressType +
-          compressWidth +
-          compressHeight +
-          compress +
-          format
-        );
+        return utils.replaceCDN(data.src, `?imageView2/2/w/${data.compressWidth || 400}/h/${data.compressHeight || 400}/q/${data.compress || 100}`)
       } else {
         return data.src;
       }

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/index.js

@@ -15,6 +15,7 @@ import {
   SPECIAL_COLUMN,
   E_BOOK,
   TRAINING_CAMP,
+  SERVICE_GOODS,
   SVIP_SPU_TYPE,
 } from "../../../common/utils/constants";
 import {
@@ -140,7 +141,7 @@ Component({
       }
     },
     showStepper(data) {
-      let spuTypes = [ENTITY_GOODS, VALUE_COUPON];
+      let spuTypes = [ENTITY_GOODS, VALUE_COUPON, SERVICE_GOODS];
       return (
         (spuTypes.includes(data.baseInfo?.spu_type) || data.sendFriend) &&
         !data.goodsInfo.is_goods_package

package/miniprogram_dist/ConfirmOrder/components/PickupSelect/index.less

@@ -1,9 +1,24 @@
 .pickup-select-content {
   .van-cell__value {
     flex: 3;
-    text-align: right;
   }
-  .custom-title {
-    margin-left: 16rpx;
+  .right {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+    .custom-title {
+      max-width: 450rpx;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      margin-left: 16rpx;
+    }
+    .custom-site {
+      max-width: 450rpx;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      margin-left: 16rpx;
+    }
   }
 }

package/miniprogram_dist/ConfirmOrder/components/PickupSelect/index.wxml

@@ -5,8 +5,10 @@
       <view slot="title">
         <van-tag color="#EBF1FF" text-color="#105CFB">自提</van-tag>
       </view>
-      <view class="custom-title">{{ setPlace_name }}</view>
-      <view class="custom-site">{{ setPlace_area }}</view>
+      <view class="right">
+        <view class="custom-title">{{ setPlace_name }}</view>
+        <view class="custom-site">{{ setPlace_area }}</view>
+      </view>
     </van-cell>
   </van-cell-group>
 </view>

package/miniprogram_dist/ConfirmOrder/components/PickupSelect/index.wxss

@@ -1,7 +1,22 @@
 .pickup-select-content .van-cell__value {
   flex: 3;
-  text-align: right;
 }
-.pickup-select-content .custom-title {
+.pickup-select-content .right {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+}
+.pickup-select-content .right .custom-title {
+  max-width: 450rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  margin-left: 16rpx;
+}
+.pickup-select-content .right .custom-site {
+  max-width: 450rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
   margin-left: 16rpx;
 }

package/miniprogram_dist/ConfirmOrder/components/WechatAddress/index.js

@@ -33,29 +33,7 @@ Component({
   methods: {
     // 获取微信收货地址
     getWechat() {
-      wx.chooseAddress({
-        success: res => {
-          // 微信地址与地址列表匹配，不重复添加
-          res['noCheck'] = true
-          let compareRes = this.compareWechat(res)
-          if (compareRes === "") {
-            this.triggerEvent("createAddress", res)
-          } else {
-            if (this.data.pageType === "list") {
-              this.triggerEvent("chooseAddress", compareRes)
-            } else {
-              wx.showToast({
-                title: '已有相同收货地址',
-                icon: 'none',
-                duration: 2000
-              })
-            }
-          }
-        },
-        fail: err => {
-          console.log(err);
-        }
-      })
+      
     },
     // 微信地址与地址列表匹配，不重复添加
     compareWechat(wechatAddress) {