xiaoe_mp_npm 0.1.13 → 0.1.14

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

@@ -1,23 +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"
-  }
+{
+  "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

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

@@ -1,172 +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>
+<!--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/GoodsInfo/components/GoodsCommerce/components/entityGiftList/index.js

@@ -1,72 +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
-          })
-        }
-      })
-    }
-  }
+// 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

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

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

@@ -1,45 +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;
+.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;
 }