xiaoe_mp_npm 1.1.21 → 1.1.22-test02

package/miniprogram_dist/CollectionAddress/index.wxml

@@ -1,93 +1,93 @@
-<!--src/CollectionAddress/index.wxml-->
-<view class="address-content">
-  <view class="address-main" wx:if="{{ isShowMain }}">
-    <!-- 配送模式选择 -->
-    <view style="margin-bottom: 16rpx;">
-      <ModeSelect
-        wx:if="{{ showModeSelect }}"
-        activeMode="{{ activeMode }}"
-        customDeliveryType="{{ customDeliveryType }}"
-        bind:changeMode="changeMode"
-      ></ModeSelect>
-    </view>
-    <!-- 地址选择（非自提） -->
-    <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"
-    ></AddressSelect>
-    <!-- 自提点信息 -->
-    <PickupSelect
-      wx:if="{{ showPickSelf }}"
-      isShowPoint="{{ isShowPoint }}"
-      picksiteInfo="{{ picksiteInfo }}"
-      express_type="{{ express_type }}"
-      bind:updataData="updataData"
-    ></PickupSelect>
-    <!-- 提货人信息 -->
-    <ChoosePicker
-      wx:if="{{ showPickSelf }}"
-      pickerUserInfo="{{ pickerUserInfo }}"
-      express_type="{{ express_type }}"
-      isShowSelectShipper="{{ isShowSelectShipper }}"
-      isShowCreateShipper="{{ isShowCreateShipper }}"
-      backPage="{{ backPage }}"
-      shipperType="{{ shipperType }}"
-      showPickSelf="{{ showPickSelf }}"
-      bind:updataData="updataData"
-    ></ChoosePicker>
-  </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"
-    isLotery="{{true}}"
-  ></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/CollectionAddress/index.wxml-->
+<view class="address-content">
+  <view class="address-main" wx:if="{{ isShowMain }}">
+    <!-- 配送模式选择 -->
+    <view style="margin-bottom: 16rpx;">
+      <ModeSelect
+        wx:if="{{ showModeSelect }}"
+        activeMode="{{ activeMode }}"
+        customDeliveryType="{{ customDeliveryType }}"
+        bind:changeMode="changeMode"
+      ></ModeSelect>
+    </view>
+    <!-- 地址选择（非自提） -->
+    <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"
+    ></AddressSelect>
+    <!-- 自提点信息 -->
+    <PickupSelect
+      wx:if="{{ showPickSelf }}"
+      isShowPoint="{{ isShowPoint }}"
+      picksiteInfo="{{ picksiteInfo }}"
+      express_type="{{ express_type }}"
+      bind:updataData="updataData"
+    ></PickupSelect>
+    <!-- 提货人信息 -->
+    <ChoosePicker
+      wx:if="{{ showPickSelf }}"
+      pickerUserInfo="{{ pickerUserInfo }}"
+      express_type="{{ express_type }}"
+      isShowSelectShipper="{{ isShowSelectShipper }}"
+      isShowCreateShipper="{{ isShowCreateShipper }}"
+      backPage="{{ backPage }}"
+      shipperType="{{ shipperType }}"
+      showPickSelf="{{ showPickSelf }}"
+      bind:updataData="updataData"
+    ></ChoosePicker>
+  </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"
+    isLotery="{{true}}"
+  ></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/AddressEdit/index.json

@@ -1,11 +1,11 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-field": "@vant/weapp/field/index",
-    "van-switch": "@vant/weapp/switch/index",
-    "van-popup": "@vant/weapp/popup/index",
-    "van-area": "@vant/weapp/area/index",
-    "van-dialog": "@vant/weapp/dialog/index",
-    "WechatAddress": "../WechatAddress/index"
-  }
+{
+  "component": true,
+  "usingComponents": {
+    "van-field": "@vant/weapp/field/index",
+    "van-switch": "@vant/weapp/switch/index",
+    "van-popup": "@vant/weapp/popup/index",
+    "van-area": "@vant/weapp/area/index",
+    "van-dialog": "@vant/weapp/dialog/index",
+    "WechatAddress": "../WechatAddress/index"
+  }
 }

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

@@ -1,123 +1,123 @@
-@import '../../../common/css/theme.wxss';
-
-.address-edit-content {
-  padding-top: 2.13vmin;
-
-  .input-wrapper {
-    background: white;
-
-    .van-field__label {
-      font-size: 3.73vmin;
-      color: #333333;
-    }
-
-    .area-picker {
-      display: flex;
-      align-items: center;
-      padding: 2.66vmin 4.27vmin;
-
-      .area-title {
-        font-size: 3.73vmin;
-        color: #333333;
-        width: 23.1vmin;
-      }
-
-      .area-tip {
-        font-size: 3.73vmin;
-        color: #c8c9cc;
-        padding-left: 3.46vmin;
-      }
-
-      .area-cont {
-        font-size: 3.73vmin;
-        color: #323233;
-        padding-left: 3.46vmin;
-        flex: 1;
-      }
-    }
-  }
-
-  .default-wrapper {
-    margin-top: 2.13vmin;
-    height: 14.93vmin;
-    padding: 0 4.27vmin;
-    box-sizing: border-box;
-    background: white;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-
-    .ET2 {
-      font-size: 3.73vmin;
-      color: #333333;
-    }
-
-    .van-switch {
-      border: 0 solid rgba(0.5920000076293945, 0.5920000076293945, 0.5920000076293945, 1);
-      background-color: rgba(245, 245, 245, 1);
-
-      .van-switch__node {
-        box-shadow: none;
-        border: 0.13vmin solid rgba(0, 0, 0, 0.08);
-        background: rgba(255, 255, 255, 1);
-        width: 5.8vmin;
-        height: 5.8vmin;
-        top: 0.13vmin;
-        left: 0.13vmin;
-      }
-    }
-
-    .van-switch--on {
-      background-color: #1989fa;
-    }
-  }
-
-  .finish-btn {
-    box-sizing: border-box;
-    border-top: 0.02rem solid #eee;
-    position: fixed;
-    margin: auto;
-    left: 0;
-    right: 0;
-    background: #fff;
-    bottom: 0;
-    z-index: 2;
-
-    .finish-btn-wrapper {
-      padding: 2.13vmin 3.73vmin;
-    }
-
-    .finish {
-      padding: 2.67vmin 0;
-      border-radius: 5.33vmin;
-      text-align: center;
-      background-color: #1472FF;
-      color: white;
-    }
-
-    .finish-double {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-
-      .cancel-btn {
-        text-align: center;
-        width: 28.27vmin;
-        padding: 2.13vmin 0;
-        margin-right: 3.2vmin;
-        background: rgba(255, 255, 255, 1);
-        border-radius: 5.33vmin;
-        border: 0.27vmin solid rgba(183, 183, 183, 1);
-      }
-
-      .finish2 {
-        width: 60vmin;
-        padding: 2.67vmin 0;
-        border-radius: 5.33vmin;
-        text-align: center;
-        background: #09bb07;
-        color: #fff;
-      }
-    }
-  }
-}
+@import '../../../common/css/theme.wxss';
+
+.address-edit-content {
+  padding-top: 2.13vmin;
+
+  .input-wrapper {
+    background: white;
+
+    .van-field__label {
+      font-size: 3.73vmin;
+      color: #333333;
+    }
+
+    .area-picker {
+      display: flex;
+      align-items: center;
+      padding: 2.66vmin 4.27vmin;
+
+      .area-title {
+        font-size: 3.73vmin;
+        color: #333333;
+        width: 23.1vmin;
+      }
+
+      .area-tip {
+        font-size: 3.73vmin;
+        color: #c8c9cc;
+        padding-left: 3.46vmin;
+      }
+
+      .area-cont {
+        font-size: 3.73vmin;
+        color: #323233;
+        padding-left: 3.46vmin;
+        flex: 1;
+      }
+    }
+  }
+
+  .default-wrapper {
+    margin-top: 2.13vmin;
+    height: 14.93vmin;
+    padding: 0 4.27vmin;
+    box-sizing: border-box;
+    background: white;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    .ET2 {
+      font-size: 3.73vmin;
+      color: #333333;
+    }
+
+    .van-switch {
+      border: 0 solid rgba(0.5920000076293945, 0.5920000076293945, 0.5920000076293945, 1);
+      background-color: rgba(245, 245, 245, 1);
+
+      .van-switch__node {
+        box-shadow: none;
+        border: 0.13vmin solid rgba(0, 0, 0, 0.08);
+        background: rgba(255, 255, 255, 1);
+        width: 5.8vmin;
+        height: 5.8vmin;
+        top: 0.13vmin;
+        left: 0.13vmin;
+      }
+    }
+
+    .van-switch--on {
+      background-color: #1989fa;
+    }
+  }
+
+  .finish-btn {
+    box-sizing: border-box;
+    border-top: 0.02rem solid #eee;
+    position: fixed;
+    margin: auto;
+    left: 0;
+    right: 0;
+    background: #fff;
+    bottom: 0;
+    z-index: 2;
+
+    .finish-btn-wrapper {
+      padding: 2.13vmin 3.73vmin;
+    }
+
+    .finish {
+      padding: 2.67vmin 0;
+      border-radius: 5.33vmin;
+      text-align: center;
+      background-color: #1472FF;
+      color: white;
+    }
+
+    .finish-double {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      .cancel-btn {
+        text-align: center;
+        width: 28.27vmin;
+        padding: 2.13vmin 0;
+        margin-right: 3.2vmin;
+        background: rgba(255, 255, 255, 1);
+        border-radius: 5.33vmin;
+        border: 0.27vmin solid rgba(183, 183, 183, 1);
+      }
+
+      .finish2 {
+        width: 60vmin;
+        padding: 2.67vmin 0;
+        border-radius: 5.33vmin;
+        text-align: center;
+        background: #09bb07;
+        color: #fff;
+      }
+    }
+  }
+}

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

@@ -1,52 +1,52 @@
-<!--src/ConfirmOrder/components/AddressEdit/index.wxml-->
-<view class="address-edit-content">
-  <van-dialog id="van-dialog" />
-  <!-- 获取微信收货地址 -->
-  <!-- <WechatAddress 
-    addressList="{{ addressList }}"
-    bind:createAddress="saveAddress"
-  ></WechatAddress> -->
-  <view class="input-wrapper">
-    <van-field value="{{ address.receiver }}" label="收货人" placeholder="收货人姓名" maxlength="15" bind:change="changeMsg" data-type="receiver" />
-    <van-field value="{{ address.phone }}" label="手机号码" placeholder="收货人手机号" maxlength="11" type="number" bind:change="changeTel" />
-    <!-- <van-field value="{{ address.area }}" label="所在地区" placeholder="选择省/市/区" readonly bindtap="showArea" /> -->
-    <picker mode="region" bindchange="bindRegionChange" value="{{region}}">
-      <view class="area-picker">
-        <view class="area-title">
-          所在地区
-        </view>
-        <view class="area-cont" wx:if="{{ address.area }}">
-          {{ address.area }}
-        </view>
-        <view class="area-tip" wx:else>
-          选择省/市/区
-        </view>
-      </view>
-    </picker>
-    <van-field value="{{ address.detail }}" label="详细地址" placeholder="街道、门牌号等" maxlength="50" bind:change="changeMsg" data-type="detail" />
-  </view>
-  <!-- 默认收货地址开关组件 -->
-  <view class="default-wrapper">
-    <view class="ET2">设为默认收货地址</view>
-    <van-switch checked="{{ isdefault }}" size="6.4vmin" bind:change="changeSwitch" />
-  </view>
-  <!-- 底部操作按钮 -->
-  <view class="finish-btn">
-    <view class="finish-btn-wrapper">
-      <view class="finish {{isLotery ? '' : 'theme-customize-bg'}}" wx:if="{{ isNew }}" bindtap="saveAddress">
-        {{ !haveAddress && pageFlag ? "保存并使用" : "保存" }}
-      </view>
-      <view class="finish-double" wx:else>
-        <view class="cancel-btn" bindtap="deleteAddress">删除</view>
-        <view class="finish2 theme-customize-bg" bindtap="saveAddress">
-          保存地址
-        </view>
-      </view>
-    </view>
-  </view>
-
-  <!-- 省市区 -->
-  <van-popup show="{{ showArea }}" position="bottom" bind:close="showArea" custom-style="height: auto">
-    <van-area area-list="{{ areaList }}" value="{{ selectCountyId }}" bind:confirm="confirmArea" bind:cancel="showArea" />
-  </van-popup>
+<!--src/ConfirmOrder/components/AddressEdit/index.wxml-->
+<view class="address-edit-content">
+  <van-dialog id="van-dialog" />
+  <!-- 获取微信收货地址 -->
+  <!-- <WechatAddress 
+    addressList="{{ addressList }}"
+    bind:createAddress="saveAddress"
+  ></WechatAddress> -->
+  <view class="input-wrapper">
+    <van-field value="{{ address.receiver }}" label="收货人" placeholder="收货人姓名" maxlength="15" bind:change="changeMsg" data-type="receiver" />
+    <van-field value="{{ address.phone }}" label="手机号码" placeholder="收货人手机号" maxlength="11" type="number" bind:change="changeTel" />
+    <!-- <van-field value="{{ address.area }}" label="所在地区" placeholder="选择省/市/区" readonly bindtap="showArea" /> -->
+    <picker mode="region" bindchange="bindRegionChange" value="{{region}}">
+      <view class="area-picker">
+        <view class="area-title">
+          所在地区
+        </view>
+        <view class="area-cont" wx:if="{{ address.area }}">
+          {{ address.area }}
+        </view>
+        <view class="area-tip" wx:else>
+          选择省/市/区
+        </view>
+      </view>
+    </picker>
+    <van-field value="{{ address.detail }}" label="详细地址" placeholder="街道、门牌号等" maxlength="50" bind:change="changeMsg" data-type="detail" />
+  </view>
+  <!-- 默认收货地址开关组件 -->
+  <view class="default-wrapper">
+    <view class="ET2">设为默认收货地址</view>
+    <van-switch checked="{{ isdefault }}" size="6.4vmin" bind:change="changeSwitch" />
+  </view>
+  <!-- 底部操作按钮 -->
+  <view class="finish-btn">
+    <view class="finish-btn-wrapper">
+      <view class="finish {{isLotery ? '' : 'theme-customize-bg'}}" wx:if="{{ isNew }}" bindtap="saveAddress">
+        {{ !haveAddress && pageFlag ? "保存并使用" : "保存" }}
+      </view>
+      <view class="finish-double" wx:else>
+        <view class="cancel-btn" bindtap="deleteAddress">删除</view>
+        <view class="finish2 theme-customize-bg" bindtap="saveAddress">
+          保存地址
+        </view>
+      </view>
+    </view>
+  </view>
+
+  <!-- 省市区 -->
+  <van-popup show="{{ showArea }}" position="bottom" bind:close="showArea" custom-style="height: auto">
+    <van-area area-list="{{ areaList }}" value="{{ selectCountyId }}" bind:confirm="confirmArea" bind:cancel="showArea" />
+  </van-popup>
 </view>