xiaoe_mp_npm 0.2.2-beta1 → 0.2.2-beta2

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

@@ -0,0 +1,276 @@
+.styleType1_wrapper {
+  width: 476rpx;
+  margin: 0 auto;
+  margin-bottom: 32rpx;
+}
+.styleType1_wrapper .coupon_style1 {
+  display: flex;
+  position: relative;
+  width: 100%;
+  height: 184rpx;
+}
+.styleType1_wrapper .coupon_style1 .couponValue {
+  width: 198rpx;
+  height: 100%;
+  background: #ff781f;
+  color: #fff;
+  padding: 16rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+  align-items: center;
+  box-sizing: border-box;
+  border-radius: 16rpx 0 0 16rpx;
+}
+.styleType1_wrapper .coupon_style1 .couponValue .couponPriceWrap {
+  position: relative;
+  display: flex;
+  flex-direction: row;
+  align-items: baseline;
+  font-weight: 700;
+}
+.styleType1_wrapper .coupon_style1 .couponValue .couponPriceWrap .coupon-symbol {
+  margin-right: 4rpx;
+  font-size: 32rpx;
+}
+.styleType1_wrapper .coupon_style1 .couponValue .couponPriceWrap .coupon-price {
+  display: flex;
+  font-size: 80rpx;
+}
+.styleType1_wrapper .coupon_style1 .couponValue .couponPriceWrap .discountFont {
+  font-size: 32rpx;
+  font-weight: 500;
+}
+.styleType1_wrapper .coupon_style1 .couponValue .couponUseCondition {
+  height: 32rpx;
+  color: #ffffff;
+  font-size: 24rpx;
+  font-weight: 500;
+  font-family: "PingFang SC";
+  text-align: center;
+  line-height: 32rpx;
+}
+.styleType1_wrapper .coupon_style1 .couponInfo {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  width: 278rpx;
+  height: 100%;
+  box-sizing: border-box;
+  background: #ffffff;
+  padding: 16rpx 0 16rpx 16rpx;
+  color: #999999;
+  font-size: 20rpx;
+  line-height: 24rpx;
+  font-weight: 400;
+  text-align: left;
+  border-radius: 0 16rpx 16rpx 0;
+}
+.styleType1_wrapper .coupon_style1 .couponInfo .couponName {
+  color: #333333;
+  font-size: 24rpx;
+  line-height: 32rpx;
+  height: 32rpx;
+  width: 246rpx;
+  font-weight: 700;
+  margin-bottom: 8rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.styleType1_wrapper .coupon_style1 .couponInfo .couponUseHint {
+  margin-bottom: 4rpx;
+}
+.styleType1_wrapper .coupon_style1 .couponInfo .couponUseTime {
+  margin-bottom: 36rpx;
+}
+.styleType1_wrapper .coupon_style1 .couponInfo .moreInfo {
+  display: flex;
+  cursor: pointer;
+  align-items: center;
+}
+.styleType1_wrapper .coupon_style1 .couponInfo .moreInfo .operateBtn {
+  width: 24rpx;
+  height: 24rpx;
+  margin-left: 6rpx;
+  background-size: 100% 100%;
+}
+.styleType1_wrapper .coupon_style1 .couponState {
+  position: absolute;
+  right: 16rpx;
+  bottom: 16rpx;
+  width: 112rpx;
+  height: 48rpx;
+  line-height: 48rpx;
+  border-radius: 28rpx;
+  border: 0;
+  background: #ff781f;
+}
+.styleType1_wrapper .coupon_style1 .couponState .couponBtn {
+  color: #ffffff;
+  font-size: 24rpx;
+  font-weight: 700;
+  text-align: center;
+  font-family: "PingFang SC";
+}
+.styleType1_wrapper .coupon_style1 .hasReceivedStatus {
+  position: absolute;
+  top: 0rpx;
+  right: 0rpx;
+  width: 98rpx;
+  height: 114rpx;
+}
+.styleType1_wrapper .detailInfo {
+  width: 100%;
+  display: flex;
+  background-color: #fff6f0;
+  box-sizing: border-box;
+  border-radius: 0 0 4px 4px;
+  padding: 16rpx;
+  color: #666666;
+  font-size: 20rpx;
+  text-align: left;
+}
+.styleType1_wrapper .detailInfo .disabledHint {
+  width: 28rpx;
+  margin-right: 10rpx;
+}
+.styleType1_wrapper .detailInfo .instructions {
+  word-break: break-all;
+}
+.styleType1_wrapper .detailInfo .instructions .remark {
+  color: #333333;
+  margin-bottom: 8rpx;
+}
+.disabledState {
+  background-color: #eeeeee !important;
+}
+.disabledState .couponValue {
+  background: #cdcdcd !important;
+}
+.whiteBg {
+  background-color: #fff !important;
+}
+.disabledHint {
+  width: 28rpx;
+  margin-right: 10rpx;
+}
+.unselectState {
+  background: #cdcdcd !important;
+}
+.styleType2_wrapper {
+  margin-bottom: 24rpx;
+  margin-right: 16rpx;
+}
+.styleType2_wrapper .coupon_style2 {
+  display: flex;
+  flex-direction: row;
+  color: #ff781f;
+  position: relative;
+  overflow: hidden;
+  width: 336rpx;
+  height: 160rpx;
+  flex-shrink: 0;
+}
+.styleType2_wrapper .coupon_style2 .coupons-styles2-bg {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  width: 100%;
+  height: 100%;
+}
+.styleType2_wrapper .coupon_style2 .couponInfo {
+  display: inline-flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  padding-left: 16rpx;
+  width: 272rpx;
+  height: 100%;
+  font-family: "PingFang SC";
+  font-size: 20rpx;
+  line-height: 24rpx;
+}
+.styleType2_wrapper .coupon_style2 .couponInfo .couponInfoTop {
+  padding-top: 16rpx;
+  display: flex;
+  flex-direction: row;
+  align-items: flex-end;
+  height: 48rpx;
+}
+.styleType2_wrapper .coupon_style2 .couponInfo .couponInfoTop .couponPriceWrap {
+  position: relative;
+  display: flex;
+  flex-direction: row;
+  align-items: baseline;
+  font-weight: 700;
+  height: 48rpx;
+  line-height: 48rpx;
+}
+.styleType2_wrapper .coupon_style2 .couponInfo .couponInfoTop .couponPriceWrap .coupon-symbol {
+  margin-right: 4rpx;
+  font-size: 24rpx;
+}
+.styleType2_wrapper .coupon_style2 .couponInfo .couponInfoTop .couponPriceWrap .coupon-price {
+  display: flex;
+  font-size: 48rpx;
+}
+.styleType2_wrapper .coupon_style2 .couponInfo .couponInfoTop .couponPriceWrap .discountFont {
+  font-size: 24rpx;
+  font-weight: 500;
+  margin-left: 4rpx;
+}
+.styleType2_wrapper .coupon_style2 .couponInfo .couponInfoBottom {
+  font-weight: 400;
+  line-height: 24rpx;
+  position: relative;
+  margin-top: 6rpx;
+}
+.styleType2_wrapper .coupon_style2 .couponInfo .couponInfoBottom .priceLimit {
+  margin-bottom: 4rpx;
+}
+.styleType2_wrapper .coupon_style2 .couponInfo .couponInfoBottom .priceLimit .couponUseCondition {
+  font-size: 20rpx;
+  font-weight: 400;
+}
+.styleType2_wrapper .coupon_style2 .couponInfo .couponInfoBottom .couponUseHint {
+  margin-bottom: 4rpx;
+}
+.styleType2_wrapper .coupon_style2 .couponStatewrapper {
+  width: 62rpx;
+  height: 100%;
+  /* -webkit-align-self: center; */
+  -ms-flex-item-align: center;
+  align-self: center;
+  position: relative;
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  text-align: center;
+}
+.styleType2_wrapper .coupon_style2 .couponStatewrapper .couponBtn {
+  writing-mode: vertical-lr;
+  letter-spacing: 10rpx;
+  font-size: 24rpx;
+  font-weight: 700;
+  font-family: "PingFang SC";
+}
+.styleType2_wrapper .coupon_style2 .couponStatewrapper:before {
+  content: " ";
+  display: block;
+  width: 100%;
+  height: 114rpx;
+  border-left: 2rpx dashed #ff781f;
+  -webkit-transform: scale(1.3);
+  transform: scale(0.7, 1.1);
+  position: absolute;
+  left: -10rpx;
+  top: 23rpx;
+}
+.styleType2_wrapper .coupon_style2 .hasReceivedStatus {
+  position: absolute;
+  top: 0rpx;
+  right: 0rpx;
+  width: 98rpx;
+  height: 114rpx;
+}

package/miniprogram_dist/CouponList/couponColumn/index.js

@@ -0,0 +1,65 @@
+/*eslint-disable*/
+import {getCouponList} from '../../common/api/couponlist'
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+      aliveInfo: { // 直播间基本信息
+        type: Object
+      },
+      sensorReportParams: { // 直播配置数据
+        type: Object
+      }
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+      coupon_type: 1,
+      styleType:2,
+      couponsList: []
+    },
+
+    lifetimes: {
+      attached: function() {
+        // console.log("sensorReportParams++++", this.data.sensorReportParams);
+        // 在组件实例进入页面节点树时执行
+        this.initCouponList()
+        console.log("sssssss");
+      },
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+      initCouponList() {
+        console.log('couponColumncouponColumncouponColumncouponColumncouponColumncouponColumncouponColumncouponColumncouponColumncouponColumncouponColumn')
+        const params = {
+          alive_id: this.data.aliveInfo.alive_id,
+          type: 2,
+        }
+        getCouponList(params).then(({data:result}) => {
+          console.log(222, result);
+          if (result && result.code === 0) {
+            this.setData({
+              couponsList: result.data
+            })
+        } else {
+            wx.showToast({
+              title:"加载失败",
+              icon:'none'
+            });
+        }
+        })
+      },
+      showPopup() {
+        this.triggerEvent('showPopup')
+      },
+      receivedSuccess() {
+        this.triggerEvent('receivedSuccess')
+      }
+    }
+})

package/miniprogram_dist/CouponList/couponColumn/index.json

@@ -0,0 +1,6 @@
+{
+    "component": true,
+    "usingComponents": {
+        "CouponItem": "../components/CouponItem"
+    }
+}

package/miniprogram_dist/CouponList/couponColumn/index.less

@@ -0,0 +1,32 @@
+.coupon-list {
+  background: #fff;
+  padding-top: 8rpx;
+  .coupon-title {
+    margin-left: 32rpx;
+    color: #333333;
+    font-size: 28rpx;
+    margin-bottom: 16rpx;
+    .coupon {
+      font-weight: 700;
+      margin-right: 16rpx;
+    }
+    .coupon-num {
+      font-weight: 400;
+    }
+  }
+  .goods-coupon-wrapper {
+    display: flex;
+    flex-direction: row;
+    overflow-y: scroll;
+    .coupon-item:first-child {
+      margin-left: 32rpx;
+    }
+    .coupon-item:last-child {
+      padding-right: 16rpx !important;
+    }
+  }
+  .goods-coupon-wrapper::-webkit-scrollbar {
+    display: none;
+  }
+  
+}

package/miniprogram_dist/CouponList/couponColumn/index.wxml

@@ -0,0 +1,23 @@
+<!-- styleType="2"为一行的优惠券列表形式 -->
+<view class="coupon-list" wx:if="{{couponsList.length}}" >
+  <!-- 还需满足!aliveInfo.user_type && couponList && couponList.length !== 0" -->
+  <view class="coupon-title">
+    <text class="coupon">优惠券</text>
+    <text class="coupon-num">{{couponsList.length}}</text>
+  </view>
+  <view class="goods-coupon-wrapper">
+    <!-- ok -->
+    <CouponItem
+        wx:for="{{couponsList}}"
+        wx:key="index"
+        item="{{item}}"
+        couponType="{{coupon_type}}"
+        styleType="2"
+        class="coupon-item"
+        aliveInfo="{{aliveInfo}}"
+        catch:showPopup="showPopup"
+        sensorReportParams="{{sensorReportParams}}"
+				bindreceivedSuccess="receivedSuccess" 
+    />
+  </view>
+</view >

package/miniprogram_dist/CouponList/couponColumn/index.wxss

@@ -0,0 +1,31 @@
+.coupon-list {
+  background: #fff;
+  padding-top: 8rpx;
+}
+.coupon-list .coupon-title {
+  margin-left: 32rpx;
+  color: #333333;
+  font-size: 28rpx;
+  margin-bottom: 16rpx;
+}
+.coupon-list .coupon-title .coupon {
+  font-weight: 700;
+  margin-right: 16rpx;
+}
+.coupon-list .coupon-title .coupon-num {
+  font-weight: 400;
+}
+.coupon-list .goods-coupon-wrapper {
+  display: flex;
+  flex-direction: row;
+  overflow-y: scroll;
+}
+.coupon-list .goods-coupon-wrapper .coupon-item:first-child {
+  margin-left: 32rpx;
+}
+.coupon-list .goods-coupon-wrapper .coupon-item:last-child {
+  padding-right: 16rpx !important;
+}
+.coupon-list .goods-coupon-wrapper::-webkit-scrollbar {
+  display: none;
+}

package/miniprogram_dist/CouponList/couponMsg/index.js

@@ -0,0 +1,27 @@
+// pages/hh/CouponInfo.js
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+      msg: {
+        type: Object
+      }
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+      coupon_type: 1,
+      styleType:1,
+      
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+
+    }
+})

package/miniprogram_dist/CouponList/couponMsg/index.json

@@ -0,0 +1,6 @@
+{
+    "component": true,
+    "usingComponents": {
+        "CouponItem": "../components/CouponItem"
+    }
+}

package/miniprogram_dist/CouponList/couponMsg/index.less

@@ -0,0 +1,3 @@
+.coupon-msg-block {
+  box-shadow: 0rem 0.04rem 0.16rem 0rem rgba(195, 195, 195, 0.04);
+}

package/miniprogram_dist/CouponList/couponMsg/index.wxml

@@ -0,0 +1,10 @@
+<!-- styleType="1"为讲师推荐--优惠券卡片 -->
+<view class="coupon-msg-block">
+    <CouponItem
+      item="{{msg.more_info}}"
+      couponType="{{coupon_type}}"
+      styleType="{{styleType}}"
+      outWidth="468rpx"
+    >
+    </CouponItem>
+</view>

package/miniprogram_dist/CouponList/couponMsg/index.wxss

@@ -0,0 +1,3 @@
+.coupon-msg-block {
+  box-shadow: 0rem 0.04rem 0.16rem 0rem rgba(195, 195, 195, 0.04);
+}

package/miniprogram_dist/CurrentPay/index.js

@@ -0,0 +1,56 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: conlinchen
+ * @Date: 2021-11-17 11:38:59
+ * @LastEditors: conlinchen
+ * @LastEditTime: 2021-11-18 17:56:52
+ */
+// src/CurrentPay/index.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    aliveInfo: {
+      type: Object,
+      value: {}
+    },
+    show: {
+      type:Boolean,
+      value: false
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    spuId: '',
+    showSku: false,
+    baseInfoQuery: {},
+    showComfirmOrder: false
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    closePop(e){
+      this.triggerEvent('closePop')
+    },
+    showSku(params){
+      let { spu_id } = params.detail
+      this.setData({
+        spuId: spu_id,
+        showSku: true
+      })
+    },
+    showConfirmOrder(params){
+      this.setData({
+        baseInfoQuery: params.detail,
+        showComfirmOrder: true
+      })
+    }
+  }
+})

package/miniprogram_dist/CurrentPay/index.json

@@ -0,0 +1,9 @@
+{
+  "component": true,
+  "usingComponents": {
+    "goods-list": "../LiveGoodsList/index",
+    "sku": "../Sku/commSelect",
+    "comfirm-order": "../ConfirmOrder/index",
+    "pay-complete": "../PayComplete/index"
+  }
+}

package/miniprogram_dist/CurrentPay/index.wxml

@@ -0,0 +1,11 @@
+<view>
+  <goods-list aliveInfo="{{ aliveInfo }}" showList="{{ show }}" bind:closePop="closePop" bind:showSku="showSku"></goods-list>
+  <sku showSku="{{ showSku }}"
+       aliveId="{{ aliveInfo.alive_id }}" 
+       spuId="{{ spuId }}"
+       bind:openComfrimPage="showConfirmOrder"
+      ></sku>
+  <comfirm-order baseInfoQuery="{{ baseInfoQuery }}" showPopup="{{showComfirmOrder}}"></comfirm-order>
+  <pay-complete></pay-complete>
+</view>
+

package/miniprogram_dist/CurrentPay/index.wxss

@@ -0,0 +1 @@
+/* src/CurrentPay/index.wxss */