xiaoe_mp_npm 0.2.2-beta1 → 0.2.2-beta2

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

@@ -0,0 +1,78 @@
+// src/ConfirmOrder/components/WechatAddress/index.js
+const computedBehavior = require('miniprogram-computed').behavior
+
+Component({
+  behaviors: [computedBehavior],
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    pageType: {
+      type: String,
+      value: "list",
+    },
+    addressList: {
+      type: Array,
+      value: () => [],
+    },
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  computed: {
+
+  },
+  /**
+   * 组件的方法列表
+   */
+  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) {
+      let address = "";
+      this.data.addressList.forEach((ele) => {
+        if (
+          ele.receiver == wechatAddress.userName &&
+          ele.phone == wechatAddress.telNumber &&
+          ele.province == wechatAddress.provinceName &&
+          ele.city == wechatAddress.cityName &&
+          ele.county == wechatAddress.countyName &&
+          ele.detail == wechatAddress.detailInfo
+        ) {
+          address = ele;
+        }
+      });
+      return address;
+    },
+  }
+})

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

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

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

@@ -0,0 +1,25 @@
+.wechat {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background: white;
+  padding: 32rpx;
+  margin-bottom: 16rpx;
+  box-sizing: border-box;
+
+  .left-title {
+    display: flex;
+    align-items: center;
+
+    .icon-wechat {
+      color: #46bb36;
+      width: 30rpx;
+      height: 30rpx;
+      margin-right: 32rpx;
+    }
+
+    .ET2 {
+      font-size: 32rpx;
+    }
+  }
+}

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

@@ -0,0 +1,9 @@
+<!--src/ConfirmOrder/components/WechatAddress/index.wxml-->
+<view class="wechat">
+  <view class="left-title" bindtap="getWechat">
+    <image src="../../../common/assets/images/wx.png" class="icon-wechat"></image>
+    <view class="ET2">获取微信地址</view>
+  </view>
+  <!-- <i class="iconfont icon-zhixiang"></i> -->
+  <!-- <image src="../../../common/assets/images/icon-zhixiang.png" class="img"></image> -->
+</view>

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

@@ -0,0 +1,22 @@
+.wechat {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background: white;
+  padding: 32rpx;
+  margin-bottom: 16rpx;
+  box-sizing: border-box;
+}
+.wechat .left-title {
+  display: flex;
+  align-items: center;
+}
+.wechat .left-title .icon-wechat {
+  color: #46bb36;
+  width: 30rpx;
+  height: 30rpx;
+  margin-right: 32rpx;
+}
+.wechat .left-title .ET2 {
+  font-size: 32rpx;
+}

package/miniprogram_dist/ConfirmOrder/index.js

@@ -0,0 +1,72 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: zongxinliu
+ * @Date: 2021-11-24 14:56:56
+ * @LastEditors: zongxinliu
+ * @LastEditTime: 2021-11-26 12:12:30
+ */
+Component({
+  properties: {
+    baseInfoQuery: {
+      type: Object,
+      value: {
+        id: "SPU_ENT_6400554425369g9r3SKsE78",
+        spu_id: "SPU_ENT_6400554425369g9r3SKsE78",
+        resource_type: 21, 
+        resource_id: "g_61c1429282dea_E8YwehuM38",
+        spu_type: "ENT",
+        sku: "SKU_ENT_6400554425369Zs60S48",
+        isCollectCoupons: true,
+        count: 7,
+        isAlive: 1,
+      }
+    },
+    showPopup: {
+      type: Boolean,
+      value: false
+    },
+    aliveInfo:{
+      type: Object,
+      value:{}
+    },
+    sensorReportParams:{
+      type: Object,
+      value:{}
+    }
+
+  },
+  data: {},
+  methods: {
+    openPopup() {
+      this.setData({
+        showPopup: true
+      });
+    },
+    onClose() {
+      this.setData({
+        showPopup: false
+      });
+      this.triggerEvent("closePop")
+    },
+    changeSheetInfo(val) {
+      this.selectComponent("#header").changeSheetInfo(val.detail)
+    },
+    // 返回箭头点击事件
+    backClick() {
+      this.selectComponent("#confirm").backClick();
+    },
+    // 支付成功
+    successCallback(payResult) {
+      console.log("支付成功1");
+      this.onClose()
+      this.triggerEvent("showPayComplete", payResult.detail);
+    },
+    // 支付失败
+    failCallback() {
+      console.log("支付失败1");
+      this.onClose()
+      this.triggerEvent("failCallback")
+    },
+  }
+})

package/miniprogram_dist/ConfirmOrder/index.json

@@ -0,0 +1,9 @@
+{
+  "component": true,
+  "usingComponents": {
+    "Header": "./components/Header/index",
+    "ConfirmOrderContent": "./components/ConfirmOrderContent/index",
+    "van-popup": "@vant/weapp/popup/index",
+    "CustomPopup": "../CustomPopup"
+  }
+}

package/miniprogram_dist/ConfirmOrder/index.less

@@ -0,0 +1,5 @@
+.popUp {
+  height: 80%;
+  border-radius: 16rpx;
+  background: rgba(245,245,245,1);
+}

package/miniprogram_dist/ConfirmOrder/index.wxml

@@ -0,0 +1,25 @@
+<!--src/ConfirmOrder/index.wxml-->
+<view class="confirm-order">
+  <!-- <button bindtap="openPopup">显示确认订单</button> -->
+  <CustomPopup
+    showPopup="{{ showPopup }}"
+    customStyle="height: 80%;background: rgba(245,245,245,1)"
+    bind:onClose="onClose"
+  >
+    <view slot="header" wx:if="{{ showPopup }}" >
+      <Header id="header" bindonClose="onClose" bind:backClick="backClick" wx:if="{{ showPopup }}"></Header>
+    </view>
+    <view slot="content" wx:if="{{ showPopup }}" style="height: calc(100% - 60rpx);" >
+      <ConfirmOrderContent 
+        id="confirm" 
+        baseInfoQuery="{{ baseInfoQuery }}"
+        aliveInfo="{{ aliveInfo }}"
+        sensorReportParams="{{ sensorReportParams }}"
+        bind:changeSheetInfo="changeSheetInfo" 
+        bind:successCallback="successCallback" 
+        bind:failCallback="failCallback"
+      >
+      </ConfirmOrderContent>
+    </view>
+  </CustomPopup>
+</view>

package/miniprogram_dist/ConfirmOrder/index.wxss

@@ -0,0 +1,5 @@
+.popUp {
+  height: 80%;
+  border-radius: 16rpx;
+  background: #f5f5f5;
+}

package/miniprogram_dist/CouponList/README.md

@@ -0,0 +1,6 @@
+## 开发者：Gwenniezhou
+## 该组件的业务功能： 直播营销模块中的优惠券列表
+## 主要问题
+### 1、关于优惠券的领取操作，先判断是否需要信息采集，如果需要，则向上抛出showPopup事件，等到信息采集完成后，那边会自动帮我们这边调取领取操作，（具体代码实现可问企微的kazi），如果不需要，则直接调取领取操作
+
+### 2、关于后台返回接口问题，本来专属优惠券应该返回一个特定码值，但由于此领取接口涉及范围广，影响范围大，因此没让后台改，还是跟原先一样，具体可参照领取代码。

package/miniprogram_dist/CouponList/components/CouponItem/index.js

@@ -0,0 +1,239 @@
+/*eslint-disable*/
+import {behavior} from 'miniprogram-computed'
+import { receiveCoupon } from "../../../common/api/couponlist"
+import { debounce } from '../../../common/utils/tool.js'
+import {getInfoCollectionData} from "mp-plugins-info-collection"
+import { sensorLog }  from "live-mp-tools";
+
+Component({
+   
+    behaviors: [behavior],
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+      item: {
+          //单个优惠券数据
+          type: Object,
+          value: {}
+      },
+      couponType: {
+        //  优惠券 couponType: 1-领取 2-继续领 3-已领完 4-已过期(领取失败) 5-已结束 6-已达上限 7、已失效 
+        type: Number,
+        optionalTypes: [String],
+        value: 1
+      },
+      aliveInfo: { // 直播间信息
+        type: Object
+      },
+      sensorReportParams: { // 埋点参数
+        type: Object
+      },
+      styleType: {
+          //不同样式优惠卷
+          type: Number,
+          value: 1
+      },
+  },
+    /**
+     * 组件的初始数据
+     */
+    data: {
+      is_viewUsingInfo: false, //是否点击了详细信息
+      coupon_type: 1, //状态类型
+      has_received: false, //标记是否领取过
+    },
+    computed: {
+      
+      // 判断金额长度，不同金额区间端显示不同样式(一行优惠券样式)
+      isLongNumStyle2(data) {
+        if (data.item && data.item.price) {
+            let tempPrice = data.item.price / 100; 
+            if (tempPrice.toString().length >=6 ) {
+              return "32rpx"
+            } else if (tempPrice.toString().length >= 5) {
+              return "36rpx"
+            } else {
+              return "48rpx"
+            } 
+        } else {
+            return "48rpx";
+        }
+      },
+      // 判断金额长度，不同金额区间端显示不同样式(互动页优惠券样式)
+      isLongNumStyle1(data) {
+        if (data.item && data.item.price) {
+          let tempPrice = data.item.price / 100; 
+          if (tempPrice.toString().length >=6 ) {
+            return "32rpx"
+          } else if (tempPrice.toString().length >= 5) {
+            return "36rpx"
+          } else if (tempPrice.toString().length >= 4) {
+            return "48rpx"
+          } else {
+            return "56rpx"
+          } 
+        } else {
+            return "56rpx";
+        }
+      },
+    // 格式化使用说明
+    getDesInfo (data) {
+      if (!data.item.instructions) {
+        return '';
+      }
+      return data.item.instructions.replace(/\r\n/g, '<br/>');
+    },
+      
+  },
+
+  
+    lifetimes: {
+      attached: function() {
+        // 埋点
+        const { type, alive_type, current_role} = this.data.sensorReportParams
+        const {app_id, user_id} = this.data.aliveInfo
+        const { title, id} = this.data.item
+        const union_id = wx.getStorageSync('unionId')
+        let params = {
+          page_id: 'e_alive#mini#first#alive_room',
+          l_program: '鹅直播',
+          page_name: '直播间页面',
+          page_path: '鹅直播#小程序#首页#直播间页面',
+          app_id,
+          c_user_id: user_id,
+          current_role,
+          type,
+          cmm1: alive_type,
+          cmm4: title,
+          union_id,
+          cmm5: id,
+          cmm2: '知识店铺'
+        }
+        sensorLog.sensors.track('view_butt', params)
+      }
+    },
+    /**
+     * 组件的方法列表
+     */
+     methods: {
+      getCoupon() {
+        if(!(this.data.coupon_type == 1 || this.data.coupon_type == 2)) {
+          return
+        }
+        wx.showToast({
+          title: "加载中...",
+          icon:"loading"
+        })
+
+        // 信息采集 -> 优惠券领取
+        getInfoCollectionData(this.data.item.id,106, {content: this,next: this.getCouponStatus})
+        .then((res)=>{
+          console.log('是否需要信息采集',res)
+          const {isNeedInfoCollection} = res
+          if (isNeedInfoCollection) {
+            wx.hideToast()
+            this.triggerEvent('showPopup')
+          } else {
+            this.getCouponStatus()
+          }
+        })
+        .catch((err) => {
+          console.log("信息采集出错啦~", err);
+          this.getCouponStatus()
+        })
+      
+      },
+      // 执行优惠券的领取操作，并反馈结果
+      getCouponStatus: debounce(function() {
+        receiveCoupon({alive_id: this.data.aliveInfo.alive_id, coupon_id: this.data.item.id}).then(({data}) => {
+          console.log("领取单个优惠券信息", data);
+          const code = data.code
+          let dataInfo = data.data
+          if (code == 0) { //code为0包含普通优惠券和专属优惠券，通过dataInfo.is_limit区别
+            if (dataInfo.is_limit == 1) { // 专属优惠券
+              wx.showToast({
+                title: dataInfo.limit_tips,
+                icon: 'none'
+              })
+              return
+            } else { // 普通优惠券
+              this.setData({
+                coupon_type: 2,
+                has_received: true
+              })
+              // 达到领取上限，隐藏按钮
+              if (dataInfo.receive_rule && dataInfo.receive_rule === dataInfo.current_user_received_count) {
+                this.setData({
+                  coupon_type: 6
+                })
+              }
+              this.triggerEvent('receivedSuccess') //优惠券领取成功抛出方法用于直播间热度上报
+              wx.showToast({
+                title: '领取成功',
+                icon: 'none'
+              })
+              return
+            }
+          } else if(code == 101) { 
+              this.setData({
+                coupon_type: 3
+              })
+              wx.showToast({
+                title: '优惠券已经被领完啦',
+                icon: 'none'
+              })
+          } else if (code == 102) {
+            this.setData({
+              coupon_type: 6
+            })
+              wx.showToast({
+                title: '该优惠券领取次数已达上限',
+                icon: 'none'
+              })
+          } else if (code == 103) { //103;已手动结束--B端操作停止使优惠券失效
+            this.setData({
+              coupon_type: 5
+            })
+              wx.showToast({
+                title: '该优惠券已失效',
+                icon: 'none'
+              })
+          } else if (code == 104) { // 已过期
+            this.setData({
+              coupon_type: 4
+            })
+              wx.showToast({
+                title: '该优惠券已过期',
+                icon: 'none'
+              })
+          } else if (code == 105 || code == 6) { // 105：已失效，6：删除
+            this.setData({
+              coupon_type: 7
+            })
+              wx.showToast({
+                title: '该优惠券已失效',
+                icon: 'none'
+              })
+          } else {
+              wx.showToast({
+                title: data.msg,
+                icon: 'none'
+              })
+          }
+          })
+        // this.dataUpPush("alive_room_coupon_received");
+      }, 10),
+     
+      
+  //     // 控制查看信息按钮点击操作
+      handleLook() {
+          this.setData({
+            is_viewUsingInfo: !this.data.is_viewUsingInfo
+          })
+      },
+  
+  }
+    
+    
+})

package/miniprogram_dist/CouponList/components/CouponItem/index.json

@@ -0,0 +1,5 @@
+{
+  "component": true,
+  "usingComponents": {
+  }
+}