xiaoe_mp_npm 0.2.2-beta1 → 0.2.2-beta2

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

@@ -0,0 +1,23 @@
+{
+  "component": true,
+  "usingComponents": {
+    "ModeSelect": "../ModeSelect/index",
+    "AddressSelect": "../AddressSelect/index",
+    "AddressManage": "../AddressManage/index",
+    "AddressEdit": "../AddressEdit/index",
+    "PickupSelect": "../PickupSelect/index",
+    "SelectSite": "../SelectSite/index",
+    "Shipper": "../Shipper/index",
+    "ChoosePicker": "../ChoosePicker/index",
+    "ShipperEdit": "../ShipperEdit/index",
+    "GoodsInfo": "../GoodsInfo/index",
+    "LeaveWord": "../LeaveWord/index",
+    "PayDetail": "../PayDetail/index",
+    "PayBar": "../PayBar/index",
+    "LimitDiscount": "../LimitDiscount/index",
+    "Invoice": "../Invoice/index",
+    "CouponSelect": "../../../coupon/index",
+    "IntegralSelect": "../IntegralSelect/index",
+    "InfoCollect": "../InfoCollect/index"
+  }
+}

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

@@ -0,0 +1,12 @@
+.confirm-order-content {
+  height: calc(100% - 96rpx);
+
+  .confirm-main {
+    padding-bottom: 150rpx;
+    background: #f5f5f5;
+
+    .coupon-integral-wrapper {
+      margin-bottom: 16rpx;
+    }
+  }
+}

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

@@ -0,0 +1,172 @@
+<!--src/ConfirmOrder/components/ConfirmOrderContent/index.wxml-->
+<view class="confirm-order-content">
+  <!-- 主页面 -->
+  <view class="confirm-main" wx:if="{{ isShowMain }}">
+    <!-- 配送模式选择 -->
+    <ModeSelect 
+      activeMode="{{ activeMode }}" 
+      bind:changeMode="changeMode" 
+      wx:if="{{ showModeSelect }}"
+    ></ModeSelect>
+    <!-- 地址选择（非自提） -->
+    <AddressSelect 
+      wx:if="{{ showAddressSelect }}" 
+      addressInfo="{{ addressInfo }}"
+      isCart="{{ isCart }}"
+      baseInfoQuery="{{ baseInfoQuery }}"
+      hasEntityGoods="{{ hasEntityGoods }}"
+      goodsInfo="{{ goodsInfo }}"
+      isShowAddressManage="{{ isShowAddressManage }}"
+      isShowEditAddress="{{ isShowEditAddress }}"
+      addressQuery="{{ addressQuery }}"
+      cartInfoLoaded="{{ cartInfoLoaded }}"
+      addressInfoLoaded="{{ addressInfoLoaded }}"
+      activeMode="{{ activeMode }}"
+      bind:updataData="updataData"
+      bind:dataChange="payInfoChange"
+    ></AddressSelect>
+    <!-- 自提点信息 -->
+    <PickupSelect
+      wx:if="{{ showPickSelf }}"
+      isShowPoint="{{ isShowPoint }}"
+      picksiteInfo="{{ picksiteInfo }}"
+      express_type="{{ express_type }}"
+      bind:updataData="updataData"
+      bind:dataChange="payInfoChange"
+    ></PickupSelect>
+    <!-- 提货人信息 -->
+    <ChoosePicker
+      wx:if="{{ showPickSelf }}"
+      pickerUserInfo="{{ pickerUserInfo }}"
+      express_type="{{ express_type }}"
+      isShowSelectShipper="{{ isShowSelectShipper }}"
+      isShowCreateShipper="{{ isShowCreateShipper }}"
+      backPage="{{ backPage }}"
+      shipperType="{{ shipperType }}"
+      showPickSelf="{{ showPickSelf }}"
+      bind:updataData="updataData"
+      bind:dataChange="payInfoChange"
+    ></ChoosePicker>
+    <!-- 商品信息 -->
+    <GoodsInfo
+      marketingData="{{ marketingData.marketing_info }}"
+      goodsInfo="{{ goodsInfo }}"
+      confirmOrderInfo="{{ confirmOrderInfo }}"
+      baseInfo="{{ baseInfoQuery }}"
+      isCart="{{ isCart }}"
+      svipInfo="{{ superVipInfo }}"
+      businessConf="{{ businessConf }}"
+      cartInfoLoaded="{{ cartInfoLoaded }}"
+      bind:updataData="updataData"
+      bind:dataChange="payInfoChange"
+    ></GoodsInfo>
+    <!-- 【营销】限时折扣 -->
+    <LimitDiscount
+      marketingData="{{ marketingData }}"
+      bind:dataChange="payInfoChange"
+    ></LimitDiscount>
+    <view class="coupon-integral-wrapper">
+      <!-- 选择优惠券优惠码 -->
+      <CouponSelect 
+        prePayInfo="{{prePayInfo}}"
+        checkCodeParams="{{prePayParams}}"
+        bind:dataChange="payInfoChange"
+      >
+      </CouponSelect>
+      <!-- 积分组件 -->
+      <IntegralSelect
+        prePayInfo="{{ prePayInfo }}"
+        baseInfo="{{ baseInfoQuery }}"
+        bind:dataChange="payInfoChange"
+      ></IntegralSelect>
+    </view>
+    <!-- 信息采集 -->
+    <InfoCollect
+      wx:if="{{ !isCart }}"
+      baseInfo="{{ baseInfoQuery }}"
+      goodsInfo="{{ goodsInfo }}"
+      bind:dataChange="payInfoChange"
+    ></InfoCollect>
+    <!-- 发票展示 -->
+    <Invoice
+      payPrams="{{ payParams }}"
+      shopConf="{{ shopConf }}"
+      bind:dataChange="payInfoChange"
+    ></Invoice>
+    <!-- 留言 -->
+    <LeaveWord 
+      payParams="{{ payParams }}" 
+      bind:dataChange="payInfoChange"
+    ></LeaveWord>
+    <!-- 支付金额明细 -->
+    <PayDetail
+      prePayInfo="{{ prePayInfo }}"
+      baseInfo="{{ baseInfoQuery }}"
+      activeMode="{{ activeMode }}"
+      bind:dataChange="payInfoChange"
+    ></PayDetail>
+    <!-- 底部支付栏 -->
+    <PayBar
+      activeMode="{{ activeMode }}"
+      baseInfo="{{ baseInfoQuery }}"
+      prePayInfo="{{ prePayInfo }}"
+      payParams="{{ payParams }}"
+      beforePay="{{ beforePay }}"
+      afterPayCallback="{{ afterPayCallback }}"
+      afterPay="{{ afterPay }}"
+      checkList="{{ checkList }}"
+      prePayParamsAsPayParams="{{ prePayParams }}"
+      express_type="{{ express_type }}"
+      pickerUserInfo="{{ pickerUserInfo }}"
+      addressInfo="{{ addressInfo }}"
+      picksiteInfo="{{ picksiteInfo }}"
+      aliveInfo="{{ aliveInfo }}"
+      sensorReportParams="{{ sensorReportParams }}"
+      bind:successCallback="successCallback"
+      bind:failCallback="failCallback"
+      bind:updataData="updataData"
+    ></PayBar>
+  </view>
+
+  <!-- 地址管理（非自提） -->
+  <AddressManage
+    wx:if="{{ isShowAddressManage }}"
+    isShowAddressManage="{{ isShowAddressManage }}"
+    addressInfo="{{ addressInfo }}"
+    addressQuery="{{ addressQuery }}"
+    isShowEditAddress="{{ isShowEditAddress }}"
+    bind:updataData="updataData"
+  ></AddressManage>
+  <!-- 编辑、编辑地址 -->
+  <AddressEdit
+    wx:if="{{ isShowEditAddress }}"
+    addressInfo="{{ addressInfo }}"
+    addressList="{{ addressList }}"
+    addressQuery="{{ addressQuery }}"
+    isShowEditAddress="{{ isShowEditAddress }}"
+    bind:updataData="updataData"
+    bind:initConfirmOrderInfo="handleInfo"
+  ></AddressEdit>
+  <!-- 选择自提点 -->
+  <SelectSite
+    wx:if="{{ isShowPoint }}"
+    picksiteInfo="{{ picksiteInfo }}"
+    bind:updataData="updataData"
+  ></SelectSite>
+  <!-- 选择提货人 -->
+  <Shipper
+    wx:if="{{ isShowSelectShipper }}"
+    pickerUserInfo="{{ pickerUserInfo }}"
+    bind:updataData="updataData"
+  ></Shipper>
+  <!-- 新建、编辑提货人 -->
+  <ShipperEdit
+    wx:if="{{ isShowCreateShipper }}"
+    pickerUserInfo="{{ pickerUserInfo }}"
+    updateShipperInfo="{{ updateShipperInfo }}"
+    shipperType="{{ shipperType }}"
+    isShowCreateShipper="{{ isShowCreateShipper }}"
+    bind:updataData="updataData"
+    bind:initPickerInfo="initPickerInfo"
+  ></ShipperEdit>
+</view>

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

@@ -0,0 +1,10 @@
+.confirm-order-content {
+  height: calc(100% - 96rpx);
+}
+.confirm-order-content .confirm-main {
+  padding-bottom: 150rpx;
+  background: #f5f5f5;
+}
+.confirm-order-content .confirm-main .coupon-integral-wrapper {
+  margin-bottom: 16rpx;
+}

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

@@ -0,0 +1,72 @@
+// src/ConfirmOrder/components/GoodsInfo/components/GoodsCommerce/components/entityGiftList/index.js
+import {
+  getGoodsInfo
+} from "../../../../../../../common/api/confirmOrder"
+const computedBehavior = require('miniprogram-computed').behavior
+
+Component({
+  behaviors: [computedBehavior],
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    // 知识商品数量
+    virtualNum: {
+      type: Number,
+      value: 0
+    },
+    spuId: {
+      type: String,
+      value: ''
+    },
+    resourceId: {
+      type: String,
+      value: ''
+    },
+    resourceType: {
+      type: String,
+      value: ''
+    },
+    resourceType: {
+      type: String,
+      value: ''
+    },
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    goodsList: [],
+  },
+  computed: {
+    total(data) {
+      return (data.goodsList.reduce((total, good) => {
+        return total + Number(good.sku_price);
+      }, 0) / 100).toFixed(2)
+    },
+  },
+  lifetimes: {
+    attached: function () {
+      this.initGoodsInfo()
+    },
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    initGoodsInfo() {
+      let params = {
+        resource_id: this.data.resourceId,
+        resource_type: this.data.resourceType
+      }
+      getGoodsInfo(params).then(res => {
+        if (res.data.code === 0) {
+          this.setData({
+            goodsList: res.data.data.goods_list
+          })
+        }
+      })
+    }
+  }
+})

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/components/GoodsCommerce/components/entityGiftList/index.json

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

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/components/GoodsCommerce/components/entityGiftList/index.less

@@ -0,0 +1,45 @@
+.entity-list-wrapper {
+  flex: 1;
+  padding: 32rpx 0;
+  margin: 0 auto;
+  max-width: 960rpx;
+  overflow: auto;
+  background: #ffffff;
+  border-radius: 32rpx 32rpx 0px 0px;
+
+  .entity-list-close {
+    position: absolute;
+    top: 10rpx;
+    right: 32rpx;
+    width: 24rpx;
+    height: 24rpx;
+    font-size: 0;
+
+    .img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  .entity-list-count {
+    padding: 40rpx 32rpx 32rpx;
+    display: flex;
+
+    .entity-list-count-item {
+      padding-right: 40rpx;
+    }
+  }
+
+  .entity-list-tips {
+    padding: 48rpx 0 140rpx;
+    line-height: 36rpx;
+    text-align: center;
+    font-size: 24rpx;
+    color: #999;
+  }
+}
+
+.entity-goods-list {
+  padding: 0 32rpx;
+  overflow: auto;
+}

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/components/GoodsCommerce/components/entityGiftList/index.wxml

@@ -0,0 +1,18 @@
+<!--src/ConfirmOrder/components/GoodsInfo/components/GoodsCommerce/components/entityGiftList/index.wxml-->
+<view class="entity-list-wrapper">
+  <view class="entity-list-count">
+    <view class="entity-list-count-item">总价：¥{{ total }}</view>
+    <view class="entity-list-count-item">实付：￥0</view>
+  </view>
+  <view class="entity-goods-list">
+    <entityItem
+      wx:for="{{ goodsList }}"
+      wx:key="key"
+      wx:for-item="goods"
+      goods="{{ goods }}"
+    ></entityItem>
+    <view class="entity-list-tips" wx:if="{{ virtualNum }}">
+      * 知识商品只能领取一次
+    </view>
+  </view>
+</view>

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/components/GoodsCommerce/components/entityGiftList/index.wxss

@@ -0,0 +1,39 @@
+.entity-list-wrapper {
+  flex: 1;
+  padding: 32rpx 0;
+  margin: 0 auto;
+  max-width: 960rpx;
+  overflow: auto;
+  background: #ffffff;
+  border-radius: 32rpx 32rpx 0px 0px;
+}
+.entity-list-wrapper .entity-list-close {
+  position: absolute;
+  top: 10rpx;
+  right: 32rpx;
+  width: 24rpx;
+  height: 24rpx;
+  font-size: 0;
+}
+.entity-list-wrapper .entity-list-close .img {
+  width: 100%;
+  height: 100%;
+}
+.entity-list-wrapper .entity-list-count {
+  padding: 40rpx 32rpx 32rpx;
+  display: flex;
+}
+.entity-list-wrapper .entity-list-count .entity-list-count-item {
+  padding-right: 40rpx;
+}
+.entity-list-wrapper .entity-list-tips {
+  padding: 48rpx 0 140rpx;
+  line-height: 36rpx;
+  text-align: center;
+  font-size: 24rpx;
+  color: #999;
+}
+.entity-goods-list {
+  padding: 0 32rpx;
+  overflow: auto;
+}

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/components/GoodsCommerce/components/entityItem/filter.wxs

@@ -0,0 +1,8 @@
+var priceFilter = function (value) {
+
+  return (value / 100).toFixed(2)
+}
+
+module.exports = {
+  priceFilter: priceFilter
+}

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

@@ -0,0 +1,92 @@
+// src/ConfirmOrder/components/GoodsInfo/components/GoodsCommerce/components/entityItem/index.js
+const computedBehavior = require('miniprogram-computed').behavior
+
+Component({
+  behaviors: [computedBehavior],
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    goods: {
+      type: Object,
+      value: () => {}
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+  computed: {
+    // 商品描述信息。不同商品类型有不同的描述
+    descInfo(data) {
+      const type = data.goods.goods_type;
+      const specs_info = data.goods.specs_info;
+      let desc = '';
+      if (type === 21) {
+        // 实物商品
+        desc = (specs_info && specs_info.reduce((specifications, good) => {
+          return !specifications ? good.attr_value : `${specifications};${good.attr_value}`;
+        }, '')) || '';
+      }
+      if (type === 23) {
+        // 超级会员
+        const sVipInfo = data.goods.goods_specification;
+        const standardMap = {
+          1: '7天',
+          2: '1个月',
+          3: '3个月',
+          4: '6个月',
+          5: '12个月',
+          6: sVipInfo.period + '天',
+          7: sVipInfo.period + '天',
+          8: '永久有效',
+        }
+        desc = standardMap[sVipInfo.type] || '';
+      }
+      return desc;
+    },
+    // 是否是实物商品
+    isEntityGoods(data) {
+      return data.goods.goods_type === 21;
+    },
+    // 是否展示商品标签，实物商品可以设置为 展示/不展示
+    showGoodsTag(data) {
+      return !data.isEntityGoods || data.goods.goods_tag_is_show === 1;
+    },
+    // 商品标签
+    goodsTag(data) {
+      const typeMap = {
+        0: '全部',
+        1: '图文',
+        2: '音频',
+        3: '视频',
+        4: '直播',
+        5: '会员',
+        6: '专栏',
+        7: '社群',
+        8: '大专栏',
+        9: '活动管理',
+        16: '打卡',
+        20: '电子书',
+        21: data.goods.goods_tag,
+        22: '分销商品',
+        23: '超级会员',
+        25: '训练营',
+        29: '面授课',
+        31: '小班课',
+        34: '练习',
+        35: '大班课',
+      }
+      return typeMap[data.goods.goods_type] || '';
+    },
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/components/GoodsCommerce/components/entityItem/index.json

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

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/components/GoodsCommerce/components/entityItem/index.less

@@ -0,0 +1,109 @@
+.entity-item {
+  display: flex;
+
+  &+.entity-item {
+    margin-top: 32rpx;
+  }
+
+  &__img-wrapper {
+    position: relative;
+    width: 240rpx;
+    min-width: 240rpx;
+    height: 180rpx;
+    border-radius: 8rpx;
+    overflow: hidden;
+    border: 2rpx solid #eee;
+  }
+
+  &__img-inner {
+    position: relative;
+    width: 100%;
+    height: 100%;
+
+    .goods-img {
+      width: 100% !important;
+      height: 100% !important;
+      border-radius: 8rpx;
+    }
+  }
+
+  &__img-inner.entity-goods {
+    margin: 0 auto;
+    width: 180rpx;
+  }
+
+  &__unavailable {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 2;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 8rpx;
+    background: rgba(0, 0, 0, 0.5);
+
+    .unavailable-img {
+      width: 128rpx;
+      height: 116rpx;
+    }
+  }
+
+  &__tag {
+    position: absolute;
+    right: 8rpx;
+    bottom: 8rpx;
+    padding: 2rpx 6rpx;
+    line-height: 24rpx;
+    font-size: 24rpx;
+    border-radius: 4rpx;
+    background: rgba(0, 0, 0, 0.5);
+    color: white;
+  }
+
+  &__content {
+    position: relative;
+    flex: 1;
+    margin-left: 24rpx;
+    overflow: hidden;
+  }
+
+  &__title {
+    display: -webkit-box;
+    margin: 4rpx 0 8rpx;
+    line-height: 40rpx;
+    font-weight: 500;
+    color: #333;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    word-break: break-all;
+  }
+
+  &__des {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    width: 95%;
+    line-height: 34rpx;
+    color: #999999;
+    font-size: 24rpx;
+  }
+
+  &__amount {
+    position: absolute;
+    bottom: 4rpx;
+    display: flex;
+    width: 100%;
+    justify-content: space-between;
+    color: #999999;
+  }
+
+  &__price {
+    font-size: 24rpx;
+    display: flex;
+  }
+}

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/components/GoodsCommerce/components/entityItem/index.wxml

@@ -0,0 +1,29 @@
+<!--src/ConfirmOrder/components/GoodsInfo/components/GoodsCommerce/components/entityItem/index.wxml-->
+<wxs src="./filter.wxs" module="tools" />
+<view class="entity-item">
+  <view class="entity-item__img-wrapper">
+    <view class="entity-item__unavailable" wx:if="{{ isEntityGoods && goods.sku_stock === 0 }}">
+      <image src="../../../../../../../common/assets/images/replenish.png" class="unavailable-view"></image>
+    </view>
+    <view class="entity-item__unavailable" wx:if="{{ goods.goods_type === 35 && goods.sku_stock === 0 }}">
+      <image src="http://wechatapppro-1252524126.file.myqcloud.com/appAKLWLitn7978/image/kgfyr6j60r0xphcnw1hq.png" class="unavailable-view" />
+    </view>
+
+    <view class="entity-item__img-inner {{ isEntityGoods ? 'entity-goods' : '' }}">
+      <image src="{{ goods.goods_img }}" class="goods-img" />
+    </view>
+    <view class="entity-item__tag" wx:if="{{ showGoodsTag }}">{{goodsTag}}</view>
+  </view>
+
+  <view class="entity-item__content">
+    <view class="entity-item__title">{{goods.goods_name}}</view>
+    <view class="entity-item__des">{{descInfo}}</view>
+    <view class="entity-item__amount">
+      <view class="entity-item__price">
+        <view class="entity-item__price-currency">¥</view>
+        {{ goods.sku_price && tools.priceFilter(goods.sku_price) }}
+      </view>
+      <view class="entity-item__count" wx:if="{{ isEntityGoods }}">x1</view>
+    </view>
+  </view>
+</view>