xiaoe_mp_npm 1.0.3 → 1.0.5-alpha.1

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

@@ -1,23 +1,24 @@
-{
-  "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",
+    "SvipSelect": "../SvipSelect/SvipSelect",
+    "InfoCollect": "../InfoCollect/index"
+  }
 }

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

@@ -1,184 +1,189 @@
-<!--src/ConfirmOrder/components/ConfirmOrderContent/index.wxml-->
-<view class="confirm-order-content" style="{{popsition == 'right' ? 'height:100vmin' : ''}}">
-  <!-- 主页面 -->
-  <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"
-      isFullScreen="{{ popPosition == 'right' }}"
-    ></GoodsInfo>
-    <!-- 【营销】限时折扣 -->
-    <LimitDiscount
-      marketingData="{{ marketingData }}"
-      bind:dataChange="payInfoChange"
-    ></LimitDiscount>
-    <view class="coupon-integral-wrapper">
-      <!-- 选择优惠券优惠码 -->
-      <CouponSelect 
-        prePayInfo="{{prePayInfo}}"
-        checkCodeParams="{{prePayParams}}"
-        bind:dataChange="payInfoChange"
-        isFullScreen="{{isFullScreen }}"
-      >
-      </CouponSelect>
-      <!-- 积分组件 -->
-      <IntegralSelect
-        prePayInfo="{{ prePayInfo }}"
-        baseInfo="{{ baseInfoQuery }}"
-        bind:dataChange="payInfoChange"
-        zIndex="{{invoiceSelectZIndex}}"
-        isFullScreen="{{ isFullScreen }}"
-      ></IntegralSelect>
-    </view>
-    <!-- 信息采集 -->
-    <InfoCollect
-      wx:if="{{ !isCart }}"
-      baseInfo="{{ baseInfoQuery }}"
-      goodsInfo="{{ goodsInfo }}"
-      bind:dataChange="payInfoChange"
-      isFullScreen="{{ isFullScreen }}"
-    ></InfoCollect>
-    <!-- 发票展示 -->
-    <Invoice
-      showClose="{{showClose}}"
-      popPosition="{{ popPosition }}"
-      round="{{ round }}" 
-      payPrams="{{ payParams }}"
-      shopConf="{{ shopConf }}"
-      bind:dataChange="payInfoChange"
-      invoiceSelectZIndex="{{invoiceSelectZIndex}}"
-      invoiceTipZIndex="{{invoiceTipZIndex}}"
-    ></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"
-      isFullScreen="{{ popPosition == 'right' }}"
-      zIndex="{{zIndex}}"
-    ></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" style="{{popsition == 'right' ? 'height:100vmin' : ''}}">
+  <!-- 主页面 -->
+  <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"
+      isFullScreen="{{ popPosition == 'right' }}"
+    ></GoodsInfo>
+    <!-- 【营销】限时折扣 -->
+    <LimitDiscount
+      marketingData="{{ marketingData }}"
+      bind:dataChange="payInfoChange"
+    ></LimitDiscount>
+    <view class="coupon-integral-wrapper">
+      <!-- 选择优惠券优惠码 -->
+      <CouponSelect 
+        prePayInfo="{{prePayInfo}}"
+        checkCodeParams="{{prePayParams}}"
+        bind:dataChange="payInfoChange"
+        isFullScreen="{{isFullScreen }}"
+      >
+      </CouponSelect>
+      <!-- 积分组件 -->
+      <IntegralSelect
+        prePayInfo="{{ prePayInfo }}"
+        baseInfo="{{ baseInfoQuery }}"
+        bind:dataChange="payInfoChange"
+        zIndex="{{invoiceSelectZIndex}}"
+        isFullScreen="{{ isFullScreen }}"
+      ></IntegralSelect>
+      <!-- SVIP组件 -->
+      <SvipSelect
+        prePayInfo="{{ prePayInfo }}"
+        bind:dataChange="payInfoChange"
+      ></SvipSelect>
+    </view>
+    <!-- 信息采集 -->
+    <InfoCollect
+      wx:if="{{ !isCart }}"
+      baseInfo="{{ baseInfoQuery }}"
+      goodsInfo="{{ goodsInfo }}"
+      bind:dataChange="payInfoChange"
+      isFullScreen="{{ isFullScreen }}"
+    ></InfoCollect>
+    <!-- 发票展示 -->
+    <Invoice
+      showClose="{{showClose}}"
+      popPosition="{{ popPosition }}"
+      round="{{ round }}" 
+      payPrams="{{ payParams }}"
+      shopConf="{{ shopConf }}"
+      bind:dataChange="payInfoChange"
+      invoiceSelectZIndex="{{invoiceSelectZIndex}}"
+      invoiceTipZIndex="{{invoiceTipZIndex}}"
+    ></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"
+      isFullScreen="{{ popPosition == 'right' }}"
+      zIndex="{{zIndex}}"
+    ></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/PickupSelect/index.js

@@ -77,7 +77,7 @@ Component({
   methods: {
     // 显示提货点选择组件
     clickCell() {
-      if (this.data.picksiteInfo.place_type === 1) return;
+      if (this.data.picksiteInfo && this.data.picksiteInfo.place_type === 1) return;
       this.triggerEvent('dataChange', {
         name: 'address',
         errMsg: '',

package/miniprogram_dist/ConfirmOrder/components/SvipSelect/SvipSelect.js

@@ -0,0 +1,100 @@
+Component({
+    properties: {
+        prePayInfo: {
+            type: Object,
+            value: () => {
+            },
+            observer(val) {
+                if (val && val.svip_discount_info) {
+                    this.setData({
+                        svipSelectInfo: val && val['svip_discount_info'] || '',
+                        cutPrice: (val.svip_discount_info.svip_discount / 100).toFixed(2) || 0
+                    })
+                    this.computedTxt()
+                    this.triggerEvent("dataChange", {
+                        name: 'svipInfo',
+                        payParams: {
+                            select_svip: val.svip_discount_info.select_svip
+                        }
+                    })
+                }
+            }
+        },
+        isFullScreen: {
+            type: Boolean,
+            value: false
+        }
+    },
+    data: {
+        svipSelectInfo: {},
+        invalidText: '',
+        showList: false,
+        isFullScreen: false,
+        cutPrice: 0,
+        listSelect: [
+            {
+                label: '【超级会员价】折扣',
+                text: '-',
+                value: 'svip_use'
+            },
+            {
+                label: '不使用',
+                text: '',
+                value: 'svip_no_use'
+            }
+        ],
+        curIndex: 0
+    },
+    methods: {
+        openSvipList() {
+            if (this.data.svipSelectInfo.select_svip !== 'svip_unavailable') {
+                this.setData({
+                    showList: !this.data.showList
+                })
+            }
+        },
+        computedTxt() {
+            console.log('this.prePayInfo.select_svip==>', this.data.svipSelectInfo.select_svip);
+            switch (this.data.svipSelectInfo.select_svip) {
+                case 'svip_unavailable':
+                    this.setData({
+                        invalidText: this.data.svipSelectInfo.invalid_text
+                    })
+                    break;
+                case 'svip_use':
+                    this.setData({
+                        invalidText: `- ¥${(this.data.svipSelectInfo.svip_discount / 100).toFixed(2)}`
+                    })
+                    break;
+                case 'svip_no_use':
+                default:
+                    this.setData({
+                        invalidText: `请选择`
+                    })
+            }
+        },
+        changeChose(e) {
+            // console.log(item);
+            this.setData({
+                showList: false,
+                curIndex: e.currentTarget.dataset['index']
+            })
+            this.triggerEvent("dataChange", {
+                name: 'svipInfo',
+                prePayParams: {
+                    select_svip: e.currentTarget.dataset['value']
+                },
+                payParams: {
+                    select_svip: e.currentTarget.dataset['value']
+                },
+                "triggerPrePay": true
+            })
+        },
+        // 关闭弹框
+        onClose() {
+            this.setData({
+                showList: false
+            })
+        }
+    }
+});

package/miniprogram_dist/ConfirmOrder/components/SvipSelect/SvipSelect.json

@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-popup": "@vant/weapp/popup/index",
+    "van-icon": "@vant/weapp/icon/index"
+  }
+}