xiaoe_mp_npm 1.1.21 → 1.1.22-test02

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

@@ -1,28 +1,28 @@
-{
-  "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",
-    "van-action-sheet": "@vant/weapp/action-sheet/index",
-    "van-icon": "@vant/weapp/icon/index",
-    "van-button": "@vant/weapp/button/index",
-    "van-dialog": "@vant/weapp/dialog/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",
+    "van-action-sheet": "@vant/weapp/action-sheet/index",
+    "van-icon": "@vant/weapp/icon/index",
+    "van-button": "@vant/weapp/button/index",
+    "van-dialog": "@vant/weapp/dialog/index"
+  }
 }

package/src/ConfirmOrder/components/ConfirmOrderContent/index.scss

@@ -1,45 +1,45 @@
-$deviceWidth: 750;
-@function vmin($rpx) {
-  @return #{$rpx * 100 / $deviceWidth}vmin;
-}
-
-@mixin confirm-order-content {
-    height: 100%;
-  
-    .confirm-main {
-      padding-bottom: vmin(150);
-      background: #f5f5f5;
-  
-      .coupon-integral-wrapper {
-        margin-bottom: vmin(16);
-      }
-    }
-}
-
-.confirm-order-content {
-    @include confirm-order-content;
-}
-// 竖屏pad
-@media screen and (min-width: 768px) and (orientation: portrait) {
-    $deviceWidth: 1536 !global;
-
-    .confirm-order-content {
-        @include confirm-order-content;
-    }
-}
-// PC 放大适配
-@media screen and (min-height: 630px) and (orientation: landscape) {
-  $deviceWidth: 1260 !global;
-
-  .confirm-order-content {
-    @include confirm-order-content;
-  }
-}
-// 横屏pad
-@media screen and (min-height: 768px) and (orientation: landscape) {
-    $deviceWidth: 1536 !global;
-
-    .confirm-order-content {
-        @include confirm-order-content;
-    }
+$deviceWidth: 750;
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin confirm-order-content {
+    height: 100%;
+  
+    .confirm-main {
+      padding-bottom: vmin(150);
+      background: #f5f5f5;
+  
+      .coupon-integral-wrapper {
+        margin-bottom: vmin(16);
+      }
+    }
+}
+
+.confirm-order-content {
+    @include confirm-order-content;
+}
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+    $deviceWidth: 1536 !global;
+
+    .confirm-order-content {
+        @include confirm-order-content;
+    }
+}
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  $deviceWidth: 1260 !global;
+
+  .confirm-order-content {
+    @include confirm-order-content;
+  }
+}
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+    $deviceWidth: 1536 !global;
+
+    .confirm-order-content {
+        @include confirm-order-content;
+    }
 }

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

@@ -1,225 +1,225 @@
-<!--src/ConfirmOrder/components/ConfirmOrderContent/index.wxml-->
-
-<image src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lm7ggv7e0ovc.png" class="skeleton-order" wx:if="{{ isShowSkeleton }}"></image>
-<view class="confirm-order-content" style="{{popsition == 'right' ? 'height:100vmin' : ''}}" wx:if="{{ !isShowSkeleton }}">
-  <!-- 主页面 -->
-  <view class="confirm-main" wx:if="{{ isShowMain }}">
-    <!-- 配送模式选择 -->
-    <ModeSelect
-      activeMode="{{ activeMode }}"
-      customDeliveryType="{{ customDeliveryType }}"
-      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 && showPicker }}"
-      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 }}"
-      goodsPackage="{{ goodsPackage }}"
-      bind:updataData="updataData"
-      bind:dataChange="payInfoChange"
-      isFullScreen="{{ popPosition == 'right' }}"
-      zIndex="{{refundTipsZIndex}}"
-      bind:onCountChange="onCountChange"
-      formData="{{ formData }}"
-    ></GoodsInfo>
-    <!-- 【营销】限时折扣 -->
-    <LimitDiscount
-      marketingData="{{ marketingData }}"
-      bind:dataChange="payInfoChange"
-    ></LimitDiscount>
-    <view class="coupon-integral-wrapper">
-      <!-- 选择优惠券优惠码 -->
-      <CouponSelect
-        valuateData="{{valuateData}}"
-        formData="{{ formData }}"
-        baseInfoQuery="{{ baseInfoQuery }}"
-        marketingData="{{ marketInfo }}"
-        isFullScreen="{{isFullScreen }}"
-        bind:handleCouponChange="handleCouponChange"
-      >
-      </CouponSelect>
-      <!-- 积分组件 -->
-      <IntegralSelect
-        wx:if="{{ showIntegral }}"
-        integral="{{ integral }}"
-        baseInfo="{{ baseInfoQuery }}"
-        bind:handleIntegralSelectChange="handleIntegralSelectChange"
-        zIndex="{{invoiceSelectZIndex}}"
-        isFullScreen="{{ isFullScreen }}"
-      ></IntegralSelect>
-      <!-- SVIP组件（直播带货用不上，只有拼团叠加超级会员才会用此组件） -->
-      <!--
-      <SvipSelect
-        prePayInfo="{{ prePayInfo }}"
-        bind:handleSvipChange="handleSvipChange"
-      ></SvipSelect>
-      -->
-      <view wx-if="{{ is_show_freight_ins }}" class="freight-ins-wrapper">
-         <view class="freight-panel" bindtap="handleShowFreightIns">
-          <view class="freight-left">
-              <view class="freight-title">退货包运费</view>
-          </view>
-          <view class="freight-right">
-            <view style="color:#c8c8c8;">商家赠送</view>
-            <van-icon name="arrow" color="#c8c8c8" />
-          </view>
-        </view>
-        <van-action-sheet
-          cancel-text="我知道了"
-          bind:cancel="handleCloseFreightIns"
-          show="{{ showFreightIns }}"
-          title="退货包运费">
-          <view class="delivery-type">
-            <view class="infoitems">
-              商家为你购买的商品提供退货包运费服务，退货成功后可补贴运费，0元单和兑换订单不赠送运费险服务，实际赠送情况以订单详情页为主
-            </view>
-          </view>
-        </van-action-sheet>
-      </view>
-    </view>
-    <!-- 信息采集 -->
-    <InfoCollect
-      id="InfoCollect"
-      wx:if="{{ !isCart }}"
-      baseInfo="{{ baseInfoQuery }}"
-      goodsInfo="{{ goodsInfo }}"
-      bind:dataChange="handleInfoCollectionChange"
-      isFullScreen="{{ isFullScreen }}"
-    ></InfoCollect>
-    <!-- 发票展示 -->
-    <Invoice
-      showClose="{{showClose}}"
-      popPosition="{{ popPosition }}"
-      round="{{ round }}"
-      formData="{{ formData.invoiceInfo }}"
-      shopConf="{{ shopConf }}"
-      bind:dataChange="handleInvoiceChange"
-      invoiceSelectZIndex="{{invoiceSelectZIndex}}"
-      invoiceTipZIndex="{{invoiceTipZIndex}}"
-    ></Invoice>
-    <!-- 留言 -->
-    <LeaveWord
-      formData="{{ formData }}"
-      bind:dataChange="handleLeaveWordChange"
-    ></LeaveWord>
-    <!-- 支付金额明细 -->
-    <PayDetail
-      priceInfo="{{ priceInfo }}"
-      baseInfo="{{ baseInfoQuery }}"
-      activeMode="{{ activeMode }}"
-      bind:dataChange="payInfoChange"
-    ></PayDetail>
-    <!-- 底部支付栏 -->
-    <PayBar
-      activeMode="{{ activeMode }}"
-      baseInfo="{{ baseInfoQuery }}"
-      priceInfo="{{ priceInfo }}"
-      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}}"
-      bind:submitOrder="submitOrder"
-    ></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>
+<!--src/ConfirmOrder/components/ConfirmOrderContent/index.wxml-->
+
+<image src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lm7ggv7e0ovc.png" class="skeleton-order" wx:if="{{ isShowSkeleton }}"></image>
+<view class="confirm-order-content" style="{{popsition == 'right' ? 'height:100vmin' : ''}}" wx:if="{{ !isShowSkeleton }}">
+  <!-- 主页面 -->
+  <view class="confirm-main" wx:if="{{ isShowMain }}">
+    <!-- 配送模式选择 -->
+    <ModeSelect
+      activeMode="{{ activeMode }}"
+      customDeliveryType="{{ customDeliveryType }}"
+      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 && showPicker }}"
+      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 }}"
+      goodsPackage="{{ goodsPackage }}"
+      bind:updataData="updataData"
+      bind:dataChange="payInfoChange"
+      isFullScreen="{{ popPosition == 'right' }}"
+      zIndex="{{refundTipsZIndex}}"
+      bind:onCountChange="onCountChange"
+      formData="{{ formData }}"
+    ></GoodsInfo>
+    <!-- 【营销】限时折扣 -->
+    <LimitDiscount
+      marketingData="{{ marketingData }}"
+      bind:dataChange="payInfoChange"
+    ></LimitDiscount>
+    <view class="coupon-integral-wrapper">
+      <!-- 选择优惠券优惠码 -->
+      <CouponSelect
+        valuateData="{{valuateData}}"
+        formData="{{ formData }}"
+        baseInfoQuery="{{ baseInfoQuery }}"
+        marketingData="{{ marketInfo }}"
+        isFullScreen="{{isFullScreen }}"
+        bind:handleCouponChange="handleCouponChange"
+      >
+      </CouponSelect>
+      <!-- 积分组件 -->
+      <IntegralSelect
+        wx:if="{{ showIntegral }}"
+        integral="{{ integral }}"
+        baseInfo="{{ baseInfoQuery }}"
+        bind:handleIntegralSelectChange="handleIntegralSelectChange"
+        zIndex="{{invoiceSelectZIndex}}"
+        isFullScreen="{{ isFullScreen }}"
+      ></IntegralSelect>
+      <!-- SVIP组件（直播带货用不上，只有拼团叠加超级会员才会用此组件） -->
+      <!--
+      <SvipSelect
+        prePayInfo="{{ prePayInfo }}"
+        bind:handleSvipChange="handleSvipChange"
+      ></SvipSelect>
+      -->
+      <view wx-if="{{ is_show_freight_ins }}" class="freight-ins-wrapper">
+         <view class="freight-panel" bindtap="handleShowFreightIns">
+          <view class="freight-left">
+              <view class="freight-title">退货包运费</view>
+          </view>
+          <view class="freight-right">
+            <view style="color:#c8c8c8;">商家赠送</view>
+            <van-icon name="arrow" color="#c8c8c8" />
+          </view>
+        </view>
+        <van-action-sheet
+          cancel-text="我知道了"
+          bind:cancel="handleCloseFreightIns"
+          show="{{ showFreightIns }}"
+          title="退货包运费">
+          <view class="delivery-type">
+            <view class="infoitems">
+              商家为你购买的商品提供退货包运费服务，退货成功后可补贴运费，0元单和兑换订单不赠送运费险服务，实际赠送情况以订单详情页为主
+            </view>
+          </view>
+        </van-action-sheet>
+      </view>
+    </view>
+    <!-- 信息采集 -->
+    <InfoCollect
+      id="InfoCollect"
+      wx:if="{{ !isCart }}"
+      baseInfo="{{ baseInfoQuery }}"
+      goodsInfo="{{ goodsInfo }}"
+      bind:dataChange="handleInfoCollectionChange"
+      isFullScreen="{{ isFullScreen }}"
+    ></InfoCollect>
+    <!-- 发票展示 -->
+    <Invoice
+      showClose="{{showClose}}"
+      popPosition="{{ popPosition }}"
+      round="{{ round }}"
+      formData="{{ formData.invoiceInfo }}"
+      shopConf="{{ shopConf }}"
+      bind:dataChange="handleInvoiceChange"
+      invoiceSelectZIndex="{{invoiceSelectZIndex}}"
+      invoiceTipZIndex="{{invoiceTipZIndex}}"
+    ></Invoice>
+    <!-- 留言 -->
+    <LeaveWord
+      formData="{{ formData }}"
+      bind:dataChange="handleLeaveWordChange"
+    ></LeaveWord>
+    <!-- 支付金额明细 -->
+    <PayDetail
+      priceInfo="{{ priceInfo }}"
+      baseInfo="{{ baseInfoQuery }}"
+      activeMode="{{ activeMode }}"
+      bind:dataChange="payInfoChange"
+    ></PayDetail>
+    <!-- 底部支付栏 -->
+    <PayBar
+      activeMode="{{ activeMode }}"
+      baseInfo="{{ baseInfoQuery }}"
+      priceInfo="{{ priceInfo }}"
+      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}}"
+      bind:submitOrder="submitOrder"
+    ></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>