xiaoe_mp_npm 1.1.21 → 1.1.22-test02

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

@@ -1,161 +1,161 @@
-// src/ConfirmOrder/components/AddressSelect/index.js
-const computedBehavior = require('miniprogram-computed').behavior
-import {
-  ENTITY_GOODS,COP_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.baseInfoQuery.spu_type === COP_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 = {
-          isShowAddressManage: true,
-          addressQuery: {}
-        }
-      }
-      this.triggerEvent("updataData", obj)
-      this.setData(obj)
-    }
-  }
+// src/ConfirmOrder/components/AddressSelect/index.js
+const computedBehavior = require('miniprogram-computed').behavior
+import {
+  ENTITY_GOODS,COP_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.baseInfoQuery.spu_type === COP_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 = {
+          isShowAddressManage: true,
+          addressQuery: {}
+        }
+      }
+      this.triggerEvent("updataData", obj)
+      this.setData(obj)
+    }
+  }
 })

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

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

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

@@ -1,80 +1,80 @@
-.address-select-content {
-  position: relative;
-  margin-bottom: 2.13vmin;
-  background-color: #fff;
-
-  .address-container {
-    padding: 3.47vmin 4.27vmin 2.67vmin 4.27vmin;
-
-    .address-bar {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-
-      .add-address {
-        display: flex;
-        align-items: center;
-
-        .address-iocn {
-          width: 4.27vmin;
-          height: 4.27vmin;
-          margin-right: 1.07vmin;
-        }
-
-        .ET2 {
-          font-size: 4.27vmin;
-        }
-      }
-
-      .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: 6.4vmin;
-            max-width: 40vmin;
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-          }
-        }
-
-        .address {
-          overflow: hidden;
-          white-space: nowrap;
-          text-overflow: ellipsis;
-          margin-top: 2.13vmin;
-          max-width: 81.87vmin;
-          color: #666;
-        }
-
-        .ET1 {
-          font-size: 3.73vmin;
-        }
-      }
-
-      .icon-tiaozhuan {
-        width: 4.27vmin;
-        height: 4.27vmin;
-      }
-    }
-
-    .address-warning {
-      margin-top: 2.13vmin;
-      color: #ff4c51;
-    }
-  }
-
-  .line-img {
-    height: 1.2vmin;
-    width: 100%;
-    position: absolute;
-    bottom: 0vmin;
-  }
+.address-select-content {
+  position: relative;
+  margin-bottom: 2.13vmin;
+  background-color: #fff;
+
+  .address-container {
+    padding: 3.47vmin 4.27vmin 2.67vmin 4.27vmin;
+
+    .address-bar {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      .add-address {
+        display: flex;
+        align-items: center;
+
+        .address-iocn {
+          width: 4.27vmin;
+          height: 4.27vmin;
+          margin-right: 1.07vmin;
+        }
+
+        .ET2 {
+          font-size: 4.27vmin;
+        }
+      }
+
+      .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: 6.4vmin;
+            max-width: 40vmin;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+          }
+        }
+
+        .address {
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          margin-top: 2.13vmin;
+          max-width: 81.87vmin;
+          color: #666;
+        }
+
+        .ET1 {
+          font-size: 3.73vmin;
+        }
+      }
+
+      .icon-tiaozhuan {
+        width: 4.27vmin;
+        height: 4.27vmin;
+      }
+    }
+
+    .address-warning {
+      margin-top: 2.13vmin;
+      color: #ff4c51;
+    }
+  }
+
+  .line-img {
+    height: 1.2vmin;
+    width: 100%;
+    position: absolute;
+    bottom: 0vmin;
+  }
 }

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

@@ -1,34 +1,34 @@
-<!--src/ConfirmOrder/components/AddressSelect/index.wxml-->
-<view class="address-select-content">
-  <view class="address-container" wx:if="{{ showAddressSelect }}">
-    <view class="address-bar" bindtap="changeAddress">
-      <!-- 无默认地址 -->
-      <view class="add-address" wx:if="{{ !haveAddress }}">
-        <image src="../../../common/assets/images/address.png" class="address-iocn"></image>
-        <view class="ET2">请先添加收货地址</view>
-      </view>
-      <!-- 选择了地址/有默认地址 -->
-      <view class="address-wrapper">
-        <view class="address-info ET2">
-          <text>{{ addressInfo.receiver || '' }}</text>
-          <text>{{ addressInfo.phone || '' }}</text>
-        </view>
-        <view class="address ET1">
-          {{
-          (addressInfo.province +
-          addressInfo.city +
-          addressInfo.county +
-          addressInfo.detail) || ''
-          }}
-        </view>
-      </view>
-      <image src="../../../common/assets/images/zhixiang.png" class="icon-tiaozhuan"></image>
-    </view>
-    <view class="address-warning ET0" wx:if="{{ invalidAddress }}">
-      {{ addressInfo.calculate_freight_text }}
-    </view>
-  </view>
-  <!-- 地址栏底部彩线 -->
-  <image class="line-img" src="../../../common/assets/images/img_adrr.png"></image>
-  <!-- <view class="line-img" style="background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAADCAYAAADyQg1sAAAABmJLR0QA/wD/AP+gvaeTAAAAQUlEQVQYlWNkgIKnLg4NjP8Z6hnwAMb/DA2S+w40YpPTKnvbwEBAP8N/hoZrPcIo+hkH0nIGBgYGxoG0nIGBgQEAuGkqBGhhw1kAAAAASUVORK5CYIIlNgAAgLN8AB6tKgTVqN14AAAAAElFTkSuQmCC');"></view> -->
+<!--src/ConfirmOrder/components/AddressSelect/index.wxml-->
+<view class="address-select-content">
+  <view class="address-container" wx:if="{{ showAddressSelect }}">
+    <view class="address-bar" bindtap="changeAddress">
+      <!-- 无默认地址 -->
+      <view class="add-address" wx:if="{{ !haveAddress }}">
+        <image src="../../../common/assets/images/address.png" class="address-iocn"></image>
+        <view class="ET2">请先添加收货地址</view>
+      </view>
+      <!-- 选择了地址/有默认地址 -->
+      <view class="address-wrapper">
+        <view class="address-info ET2">
+          <text>{{ addressInfo.receiver || '' }}</text>
+          <text>{{ addressInfo.phone || '' }}</text>
+        </view>
+        <view class="address ET1">
+          {{
+          (addressInfo.province +
+          addressInfo.city +
+          addressInfo.county +
+          addressInfo.detail) || ''
+          }}
+        </view>
+      </view>
+      <image src="../../../common/assets/images/zhixiang.png" class="icon-tiaozhuan"></image>
+    </view>
+    <view class="address-warning ET0" wx:if="{{ invalidAddress }}">
+      {{ addressInfo.calculate_freight_text }}
+    </view>
+  </view>
+  <!-- 地址栏底部彩线 -->
+  <image class="line-img" src="../../../common/assets/images/img_adrr.png"></image>
+  <!-- <view class="line-img" style="background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAADCAYAAADyQg1sAAAABmJLR0QA/wD/AP+gvaeTAAAAQUlEQVQYlWNkgIKnLg4NjP8Z6hnwAMb/DA2S+w40YpPTKnvbwEBAP8N/hoZrPcIo+hkH0nIGBgYGxoG0nIGBgQEAuGkqBGhhw1kAAAAASUVORK5CYIIlNgAAgLN8AB6tKgTVqN14AAAAAElFTkSuQmCC');"></view> -->
 </view>