xiaoe_mp_npm 0.1.1 → 0.1.2

package/src/ConfirmOrder/components/AddressManage/index.wxss

@@ -1,98 +1,98 @@
-/* 主题色 */
-.theme-customize-bg {
-  background-color: #1472FF !important;
-}
-.theme-customize-border {
-  border-color: #1472FF !important;
-}
-.theme-customize-font {
-  color: #1472FF !important;
-}
-.theme-customize-light-new {
-  background-color: #9db8f1 !important;
-}
-.theme-customize-bg-light {
-  background-color: #9db8f1 !important;
-}
-.address-manage-content {
-  padding-bottom: 188rpx;
-}
-.address-manage-content .address-bar {
-  background: white;
-  padding: 32rpx;
-  margin-bottom: 16rpx;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  position: relative;
-}
-.address-manage-content .address-bar .left-info {
-  display: flex;
-  align-items: center;
-  flex: 1;
-}
-.address-manage-content .address-bar .left-info .info-text {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-}
-.address-manage-content .address-bar .left-info .info-text .top-text {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  margin-bottom: 16rpx;
-}
-.address-manage-content .address-bar .left-info .info-text .top-text .ET2 {
-  font-size: 32rpx;
-}
-.address-manage-content .address-bar .left-info .info-text .top-text .name {
-  margin-right: 32rpx;
-  max-width: 262rpx;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  word-break: break-all;
-}
-.address-manage-content .address-bar .left-info .info-text .top-text .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-manage-content .address-bar .left-info .info-text .address-text {
-  padding-right: 72rpx;
-}
-.address-manage-content .address-bar .update-icon {
-  position: absolute;
-  right: 32rpx;
-  top: 50%;
-  transform: translateY(-50%);
-  color: #c8c8c8;
-  width: 40rpx;
-  height: 40rpx;
-}
-.address-manage-content .finish-btn {
-  position: fixed;
-  margin: auto;
-  left: 0;
-  right: 0;
-  background: #fff;
-  bottom: 0;
-  box-sizing: border-box;
-  border-top: 2rpx solid #eee;
-}
-.address-manage-content .finish-btn .finish-btn-wrapper {
-  padding: 16rpx 28rpx;
-}
-.address-manage-content .finish-btn .finish {
-  padding: 20rpx 0;
-  border-radius: 40rpx;
-  text-align: center;
-  background: #09bb07;
-  color: white;
-}
+/* 主题色 */
+.theme-customize-bg {
+  background-color: #1472FF !important;
+}
+.theme-customize-border {
+  border-color: #1472FF !important;
+}
+.theme-customize-font {
+  color: #1472FF !important;
+}
+.theme-customize-light-new {
+  background-color: #9db8f1 !important;
+}
+.theme-customize-bg-light {
+  background-color: #9db8f1 !important;
+}
+.address-manage-content {
+  padding-bottom: 188rpx;
+}
+.address-manage-content .address-bar {
+  background: white;
+  padding: 32rpx;
+  margin-bottom: 16rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  position: relative;
+}
+.address-manage-content .address-bar .left-info {
+  display: flex;
+  align-items: center;
+  flex: 1;
+}
+.address-manage-content .address-bar .left-info .info-text {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+}
+.address-manage-content .address-bar .left-info .info-text .top-text {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  margin-bottom: 16rpx;
+}
+.address-manage-content .address-bar .left-info .info-text .top-text .ET2 {
+  font-size: 32rpx;
+}
+.address-manage-content .address-bar .left-info .info-text .top-text .name {
+  margin-right: 32rpx;
+  max-width: 262rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  word-break: break-all;
+}
+.address-manage-content .address-bar .left-info .info-text .top-text .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-manage-content .address-bar .left-info .info-text .address-text {
+  padding-right: 72rpx;
+}
+.address-manage-content .address-bar .update-icon {
+  position: absolute;
+  right: 32rpx;
+  top: 50%;
+  transform: translateY(-50%);
+  color: #c8c8c8;
+  width: 40rpx;
+  height: 40rpx;
+}
+.address-manage-content .finish-btn {
+  position: fixed;
+  margin: auto;
+  left: 0;
+  right: 0;
+  background: #fff;
+  bottom: 0;
+  box-sizing: border-box;
+  border-top: 2rpx solid #eee;
+}
+.address-manage-content .finish-btn .finish-btn-wrapper {
+  padding: 16rpx 28rpx;
+}
+.address-manage-content .finish-btn .finish {
+  padding: 20rpx 0;
+  border-radius: 40rpx;
+  text-align: center;
+  background: #09bb07;
+  color: white;
+}

package/src/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/src/ConfirmOrder/components/AddressSelect/index.json

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

package/src/ConfirmOrder/components/AddressSelect/index.less

@@ -1,80 +1,80 @@
-.address-select-content {
-  position: relative;
-  margin-bottom: 16rpx;
-  background-color: #fff;
-
-  .address-container {
-    padding: 26rpx 32rpx 20rpx 32rpx;
-
-    .address-bar {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-
-      .add-address {
-        display: flex;
-        align-items: center;
-
-        .address-iocn {
-          width: 32rpx;
-          height: 32rpx;
-          margin-right: 8rpx;
-        }
-
-        .ET2 {
-          font-size: 32rpx;
-        }
-      }
-
-      .address-wrapper {
-        display: flex column;
-        align-items: flex-start;
-
-        .address-info {
-          display: flex;
-          align-items: center;
-          font-weight: 600;
-
-          text:first-child {
-            display: inline-block;
-            margin-right: 48rpx;
-            max-width: 300rpx;
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-          }
-        }
-
-        .address {
-          overflow: hidden;
-          white-space: nowrap;
-          text-overflow: ellipsis;
-          margin-top: 16rpx;
-          max-width: 614rpx;
-          color: #666;
-        }
-
-        .ET1 {
-          font-size: 28rpx;
-        }
-      }
-
-      .icon-tiaozhuan {
-        width: 32rpx;
-        height: 32rpx;
-      }
-    }
-
-    .address-warning {
-      margin-top: 16rpx;
-      color: #ff4c51;
-    }
-  }
-
-  .line-img {
-    height: 9rpx;
-    width: 100%;
-    position: absolute;
-    bottom: 0rpx;
-  }
+.address-select-content {
+  position: relative;
+  margin-bottom: 16rpx;
+  background-color: #fff;
+
+  .address-container {
+    padding: 26rpx 32rpx 20rpx 32rpx;
+
+    .address-bar {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      .add-address {
+        display: flex;
+        align-items: center;
+
+        .address-iocn {
+          width: 32rpx;
+          height: 32rpx;
+          margin-right: 8rpx;
+        }
+
+        .ET2 {
+          font-size: 32rpx;
+        }
+      }
+
+      .address-wrapper {
+        display: flex column;
+        align-items: flex-start;
+
+        .address-info {
+          display: flex;
+          align-items: center;
+          font-weight: 600;
+
+          text:first-child {
+            display: inline-block;
+            margin-right: 48rpx;
+            max-width: 300rpx;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+          }
+        }
+
+        .address {
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          margin-top: 16rpx;
+          max-width: 614rpx;
+          color: #666;
+        }
+
+        .ET1 {
+          font-size: 28rpx;
+        }
+      }
+
+      .icon-tiaozhuan {
+        width: 32rpx;
+        height: 32rpx;
+      }
+    }
+
+    .address-warning {
+      margin-top: 16rpx;
+      color: #ff4c51;
+    }
+  }
+
+  .line-img {
+    height: 9rpx;
+    width: 100%;
+    position: absolute;
+    bottom: 0rpx;
+  }
 }