xiaoe_mp_npm 0.1.13 → 0.1.14

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

@@ -1,96 +1,96 @@
-@import "../../../common/css/theme.wxss";
-
-.address-manage-content {
-  padding-bottom: 188rpx;
-
-  .address-bar {
-    background: white;
-    padding: 32rpx;
-    margin-bottom: 16rpx;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    position: relative;
-
-    .left-info {
-      display: flex;
-      align-items: center;
-      flex: 1;
-
-      .info-text {
-        display: flex;
-        flex-direction: column;
-        align-items: flex-start;
-
-        .top-text {
-          display: flex;
-          flex-direction: row;
-          align-items: center;
-          margin-bottom: 16rpx;
-
-          .ET2 {
-            font-size: 32rpx
-          }
-
-          .name {
-            margin-right: 32rpx;
-            max-width: 262rpx;
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-            word-break: break-all;
-          }
-
-          .tag {
-            width: 64rpx;
-            height: 32rpx;
-            text-align: center;
-            line-height: 32rpx;
-            background: #dde8fc;
-            border-radius: 8rpx;
-            margin-left: 32rpx;
-            font-size: 20rpx;
-            text-size-adjust: none;
-          }
-        }
-
-        .address-text {
-          padding-right: 72rpx;
-        }
-      }
-    }
-
-    .update-icon {
-      position: absolute;
-      right: 32rpx;
-      top: 50%;
-      transform: translateY(-50%);
-      color: #c8c8c8;
-      width: 40rpx;
-      height: 40rpx;
-    }
-  }
-
-  .finish-btn {
-    position: fixed;
-    margin: auto;
-    left: 0;
-    right: 0;
-    background: #fff;
-    bottom: 0;
-    box-sizing: border-box;
-    border-top: 2rpx solid #eee;
-
-    .finish-btn-wrapper {
-      padding: 16rpx 28rpx;
-    }
-
-    .finish {
-      padding: 20rpx 0;
-      border-radius: 40rpx;
-      text-align: center;
-      background: #09bb07;
-      color: white;
-    }
-  }
+@import "../../../common/css/theme.wxss";
+
+.address-manage-content {
+  padding-bottom: 188rpx;
+
+  .address-bar {
+    background: white;
+    padding: 32rpx;
+    margin-bottom: 16rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    position: relative;
+
+    .left-info {
+      display: flex;
+      align-items: center;
+      flex: 1;
+
+      .info-text {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
+
+        .top-text {
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          margin-bottom: 16rpx;
+
+          .ET2 {
+            font-size: 32rpx
+          }
+
+          .name {
+            margin-right: 32rpx;
+            max-width: 262rpx;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            word-break: break-all;
+          }
+
+          .tag {
+            width: 64rpx;
+            height: 32rpx;
+            text-align: center;
+            line-height: 32rpx;
+            background: #dde8fc;
+            border-radius: 8rpx;
+            margin-left: 32rpx;
+            font-size: 20rpx;
+            text-size-adjust: none;
+          }
+        }
+
+        .address-text {
+          padding-right: 72rpx;
+        }
+      }
+    }
+
+    .update-icon {
+      position: absolute;
+      right: 32rpx;
+      top: 50%;
+      transform: translateY(-50%);
+      color: #c8c8c8;
+      width: 40rpx;
+      height: 40rpx;
+    }
+  }
+
+  .finish-btn {
+    position: fixed;
+    margin: auto;
+    left: 0;
+    right: 0;
+    background: #fff;
+    bottom: 0;
+    box-sizing: border-box;
+    border-top: 2rpx solid #eee;
+
+    .finish-btn-wrapper {
+      padding: 16rpx 28rpx;
+    }
+
+    .finish {
+      padding: 20rpx 0;
+      border-radius: 40rpx;
+      text-align: center;
+      background: #09bb07;
+      color: white;
+    }
+  }
 }

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

@@ -1,37 +1,37 @@
-<!--src/ConfirmOrder/components/AddressManage/index.wxml-->
-<view class="address-manage-content">
-  <!-- 获取微信收货地址 -->
-  <WechatAddress 
-    addressList="{{ addressList }}"
-    bind:createAddress="createAddress"
-    bind:chooseAddress="chooseAddress"
-  ></WechatAddress>
-
-  <view class="address-bar" wx:for="{{ addressList }}" wx:key="key">
-    <view class="left-info" bindtap="chooseAddress" data-item="{{ item }}">
-      <van-radio-group value="{{ (pageFlag && publicAddressId == item.id) ? '1' : 2 }}">
-        <van-radio name="1" label-class="info-text">
-          <view class="top-text">
-            <view class="name ET2">{{ item.receiver }}</view>
-            <view class="phone ET2">{{ item.phone }}</view>
-            <view class="tag theme-customize-border theme-customize-font theme-customize-font-black theme-customize-light-new" wx:if="{{ item.is_default }}">
-              默认
-            </view>
-          </view>
-          <view class="address-text">
-            {{ item.province + item.city + item.county + item.detail }}
-          </view>
-        </van-radio>
-      </van-radio-group>
-    </view>
-    <image src="../../../common/assets/images/update.png" class="update-icon" bindtap="newAddress" data-id="{{ item.id }}"></image>
-  </view>
-  <!-- 底部操作按钮 -->
-  <view class="finish-btn">
-    <view class="finish-btn-wrapper">
-      <view class="finish theme-customize-bg" bindtap="newAddress">
-        新增地址
-      </view>
-    </view>
-  </view>
+<!--src/ConfirmOrder/components/AddressManage/index.wxml-->
+<view class="address-manage-content">
+  <!-- 获取微信收货地址 -->
+  <WechatAddress 
+    addressList="{{ addressList }}"
+    bind:createAddress="createAddress"
+    bind:chooseAddress="chooseAddress"
+  ></WechatAddress>
+
+  <view class="address-bar" wx:for="{{ addressList }}" wx:key="key">
+    <view class="left-info" bindtap="chooseAddress" data-item="{{ item }}">
+      <van-radio-group value="{{ (pageFlag && publicAddressId == item.id) ? '1' : 2 }}">
+        <van-radio name="1" label-class="info-text">
+          <view class="top-text">
+            <view class="name ET2">{{ item.receiver }}</view>
+            <view class="phone ET2">{{ item.phone }}</view>
+            <view class="tag theme-customize-border theme-customize-font theme-customize-font-black theme-customize-light-new" wx:if="{{ item.is_default }}">
+              默认
+            </view>
+          </view>
+          <view class="address-text">
+            {{ item.province + item.city + item.county + item.detail }}
+          </view>
+        </van-radio>
+      </van-radio-group>
+    </view>
+    <image src="../../../common/assets/images/update.png" class="update-icon" bindtap="newAddress" data-id="{{ item.id }}"></image>
+  </view>
+  <!-- 底部操作按钮 -->
+  <view class="finish-btn">
+    <view class="finish-btn-wrapper">
+      <view class="finish theme-customize-bg" bindtap="newAddress">
+        新增地址
+      </view>
+    </view>
+  </view>
 </view>

package/miniprogram_dist/ConfirmOrder/components/AddressSelect/index.js

@@ -1,160 +1,160 @@
-// src/ConfirmOrder/components/AddressSelect/index.js
-const computedBehavior = require('miniprogram-computed').behavior
-import {
-  ENTITY_GOODS
-} from '../../../common/utils/constants';
-import {
-  isEmptyObject
-} from "../../../common/utils/index"
-
-Component({
-  behaviors: [computedBehavior],
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-    addressInfo: {
-      type: Object,
-      value: () => {},
-      observer(address) {
-        this.triggerEvent("dataChange", {
-          name: 'address',
-          prePayParams: {
-            address_id: address && address.id,
-          },
-          errMsg: this.data.showAddressSelect && !this.data.haveAddress && '请添加收货地址',
-          triggerPrePay: !!(!this.data.isCart && address && address.id),
-        })
-        if (this.data.isCart) {
-          this.triggerEvent("updataData", {
-            cartInfoLoaded: false
-          })
-        }
-        if (!this.data.addressInfoLoaded) {
-          this.triggerEvent("updataData", {
-            addressInfoLoaded: true
-          })
-        }
-      }
-    },
-    isCart: {
-      type: Number,
-      value: 0,
-    },
-    activeMode: {
-      type: Number,
-      value: 0,
-    },
-    baseInfoQuery: {
-      type: Object,
-      value: () => {},
-    },
-    hasEntityGoods: {
-      type: Boolean,
-      value: false,
-    },
-    cartGoodsList: {
-      type: Array,
-      value: () => [],
-    },
-    goodsInfo: {
-      type: Object,
-      value: () => {},
-    },
-    isShowAddressManage: {
-      type: Boolean,
-      value: false,
-    },
-    addressQuery: {
-      type: Object,
-      value: () => {},
-    },
-    cartInfoLoaded: {
-      type: Boolean,
-      value: false,
-    },
-    addressInfoLoaded: {
-      type: Boolean,
-      value: false,
-    }
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-
-  },
-
-  lifetimes: {
-    attached: async function () {
-      this.triggerEvent("dataChange", {
-        name: 'address',
-        errMsg: this.data.showAddressSelect &&
-          !this.data.haveAddress &&
-          this.data.activeMode === 0 &&
-          '请添加收货地址',
-      })
-    },
-  },
-  computed: {
-    showAddressSelect(data) {
-      return (
-        data.baseInfoQuery.spu_type === ENTITY_GOODS ||
-        (data.goodsInfo.is_goods_package && data.hasEntityGoods) ||
-        (data.isCart &&
-          data.cartGoodsList.some((goodsInfo) => {
-            return (
-              goodsInfo.spu_type === ENTITY_GOODS ||
-              goodsInfo.entity_goods_num > 0
-            );
-          }))
-      );
-    },
-    haveAddress(data) {
-      return data.addressInfo && !isEmptyObject(data.addressInfo);
-    },
-    invalidAddress(data) {
-      return data.addressInfo && !data.addressInfo.calculate_freight;
-    },
-    needAddress(data) {
-      return !data.haveAddress && data.showAddressSelect;
-    },
-  },
-  observers: {
-    needAddress(val) {
-      if (val) {
-        this.triggerEvent("dataChange", {
-          name: 'address',
-          errMsg: '请添加收货地址'
-        })
-      }
-    }
-  },
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-    // 修改地址
-    changeAddress() {
-      let obj = {}
-      if (this.data.haveAddress) {
-        obj = {
-          isShowAddressManage: true,
-          addressQuery: {
-            selectable: true,
-            id: this.data.addressInfo.id,
-            orderdata: this.data.baseInfoQuery,
-          }
-        }
-      } else {
-        obj = {
-          isShowEditAddress: true,
-          addressQuery: {}
-        }
-      }
-      this.triggerEvent("updataData", obj)
-      this.setData(obj)
-    }
-  }
+// src/ConfirmOrder/components/AddressSelect/index.js
+const computedBehavior = require('miniprogram-computed').behavior
+import {
+  ENTITY_GOODS
+} from '../../../common/utils/constants';
+import {
+  isEmptyObject
+} from "../../../common/utils/index"
+
+Component({
+  behaviors: [computedBehavior],
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    addressInfo: {
+      type: Object,
+      value: () => {},
+      observer(address) {
+        this.triggerEvent("dataChange", {
+          name: 'address',
+          prePayParams: {
+            address_id: address && address.id,
+          },
+          errMsg: this.data.showAddressSelect && !this.data.haveAddress && '请添加收货地址',
+          triggerPrePay: !!(!this.data.isCart && address && address.id),
+        })
+        if (this.data.isCart) {
+          this.triggerEvent("updataData", {
+            cartInfoLoaded: false
+          })
+        }
+        if (!this.data.addressInfoLoaded) {
+          this.triggerEvent("updataData", {
+            addressInfoLoaded: true
+          })
+        }
+      }
+    },
+    isCart: {
+      type: Number,
+      value: 0,
+    },
+    activeMode: {
+      type: Number,
+      value: 0,
+    },
+    baseInfoQuery: {
+      type: Object,
+      value: () => {},
+    },
+    hasEntityGoods: {
+      type: Boolean,
+      value: false,
+    },
+    cartGoodsList: {
+      type: Array,
+      value: () => [],
+    },
+    goodsInfo: {
+      type: Object,
+      value: () => {},
+    },
+    isShowAddressManage: {
+      type: Boolean,
+      value: false,
+    },
+    addressQuery: {
+      type: Object,
+      value: () => {},
+    },
+    cartInfoLoaded: {
+      type: Boolean,
+      value: false,
+    },
+    addressInfoLoaded: {
+      type: Boolean,
+      value: false,
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  lifetimes: {
+    attached: async function () {
+      this.triggerEvent("dataChange", {
+        name: 'address',
+        errMsg: this.data.showAddressSelect &&
+          !this.data.haveAddress &&
+          this.data.activeMode === 0 &&
+          '请添加收货地址',
+      })
+    },
+  },
+  computed: {
+    showAddressSelect(data) {
+      return (
+        data.baseInfoQuery.spu_type === ENTITY_GOODS ||
+        (data.goodsInfo.is_goods_package && data.hasEntityGoods) ||
+        (data.isCart &&
+          data.cartGoodsList.some((goodsInfo) => {
+            return (
+              goodsInfo.spu_type === ENTITY_GOODS ||
+              goodsInfo.entity_goods_num > 0
+            );
+          }))
+      );
+    },
+    haveAddress(data) {
+      return data.addressInfo && !isEmptyObject(data.addressInfo);
+    },
+    invalidAddress(data) {
+      return data.addressInfo && !data.addressInfo.calculate_freight;
+    },
+    needAddress(data) {
+      return !data.haveAddress && data.showAddressSelect;
+    },
+  },
+  observers: {
+    needAddress(val) {
+      if (val) {
+        this.triggerEvent("dataChange", {
+          name: 'address',
+          errMsg: '请添加收货地址'
+        })
+      }
+    }
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    // 修改地址
+    changeAddress() {
+      let obj = {}
+      if (this.data.haveAddress) {
+        obj = {
+          isShowAddressManage: true,
+          addressQuery: {
+            selectable: true,
+            id: this.data.addressInfo.id,
+            orderdata: this.data.baseInfoQuery,
+          }
+        }
+      } else {
+        obj = {
+          isShowEditAddress: true,
+          addressQuery: {}
+        }
+      }
+      this.triggerEvent("updataData", obj)
+      this.setData(obj)
+    }
+  }
 })

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

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