xiaoe_mp_npm 1.1.21 → 1.1.22-test02

package/miniprogram_dist/CollectionAddress/index.js

@@ -1,289 +1,289 @@
-// src/CollectionAddress/index.js
-import {
-  getConfirmOrderDetail,
-  getExpressSwitch,
-  getPickerInfo,
-  getGoodsPackage,
-  getSuperVipInfo,
-  getBusinessFeature,
-  getMarketingInfo,
-  getShopConf
-} from "../common/api/confirmOrder"
-import {
-  isEmptyObject
-} from "../common/utils/index"
-import {
-  DELIVERY_METHOD_TEXT
-} from "../common/utils/constants.js"
-const computedBehavior = require('miniprogram-computed').behavior
-
-Component({
-  behaviors: [computedBehavior],
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-    baseInfoQuery: {
-      type: Object,
-      required: true,
-      value: () => {},
-    },
-    isCart: {
-      type: Number,
-      value: 0,
-    },
-    title: {
-      type: String,
-      value: "",
-    },
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-    isShowPoint: false, // 是否显示选择提货点组件
-    isShowSelectShipper: false, // 是否显示选择提货人组件
-    isShowCreateShipper: false, // 是否显示新增、编辑提货人组件
-    isShowAddressManage: false, // 是否显示地址管理组件（非自提）
-    isShowEditAddress: false, // 是否显示新建、编辑组件（非自提）
-    activeMode: 0, // 0：快递配送，1：自提
-    express_type: 1, // 接口下发配送信息 1-快递配送 2-商品自提
-    userCanPick: 1, // 商家是否支持自提 1支持 0不支持
-    sInfo: {}, // 地址信息（非自提）
-    addressInfo: {}, // 地址信息（非自提）
-    pickerUserInfo: {}, // 自提人信息
-    distributionMode: 0, // 配送方式 -1全部 1快递配送 2商品自提 （目前只支持实物商品，非实物商品返回0）
-    confirmOrderInfo: {
-      // 订单页详细信息(通过查询接口拿到)
-      app_info: {},
-      goods_info: {},
-    },
-    shipperType: 1, // 1：新建自提人；2：编辑自提人
-    customDeliveryType: [DELIVERY_METHOD_TEXT.EXPRESSAGE, DELIVERY_METHOD_TEXT.PICK],//自定义配送方式顺序-由b端交易设置修改
-  },
-  lifetimes: {
-    attached() {
-      this.initConfirmOrderInfo()
-      this.initDeliveryState()
-      this.initGoodsPackage()
-    }
-  },
-  computed: {
-    isShowMain(data) {
-      return (
-        !data.isShowPoint &&
-        !data.isShowSelectShipper &&
-        !data.isShowCreateShipper &&
-        !data.isShowAddressManage &&
-        !data.isShowEditAddress
-      )
-    },
-    //通过商家是否开启自提和自提选择 决定自提组件的显示和隐藏
-    showPickSelf(data) {
-      return (
-        data.userCanPick === 1 &&
-        (data.activeMode === 1 || data.distributionMode === 2)
-      );
-    },
-    // 判断模式选择tab栏的显示和隐藏
-    showModeSelect(data) {
-      return data.distributionMode === -1 && data.userCanPick === 1;
-    },
-    // 显示地址栏的情况 商品有两种配送方式,商家关闭自提/购物车
-    showAddressSelect(data) {
-      return (
-        data.activeMode === 0 &&
-        (data.distributionMode === -1 || data.distributionMode === 1)
-      );
-    },
-    // 商品信息
-    goodsInfo(data) {
-      if (isEmptyObject(data.confirmOrderInfo.goods_info)) {
-        return data.baseInfoQuery;
-      }
-      return data.confirmOrderInfo.goods_info;
-    },
-  },
-  observers: {
-    express_type(val) {
-      this.outData();
-    },
-    activeMode(val) {
-      val === 1 ? this.triggerEvent("changeTitle", "选择提货地址") : this.triggerEvent("changeTitle", "选择收货地址");
-    },
-    distributionMode(val) {
-      if (val === 2) {
-        this.setData({
-          express_type: 2
-        })
-        this.triggerEvent("changeTitle", "选择提货地址");
-      } else {
-        this.setData({
-          express_type: 1
-        })
-        this.triggerEvent("changeTitle", "选择收货地址");
-      }
-    },
-    isShowMain(val) {
-      this.triggerEvent("changeState", val)
-      if (val) {
-        if (this.data.distributionMode === -1 || this.data.distributionMode === 1 && this.data.activeMode === 0) {
-          this.triggerEvent("changeTitle", "选择收货地址");
-        } else {
-          this.triggerEvent("changeTitle", "选择提货地址");
-        }
-      }
-      this.outData();
-    },
-    isShowPoint(val) {
-      if (val) {
-        this.triggerEvent("changeTitle", "选择自提点");
-      }
-    },
-    isShowSelectShipper(val) {
-      if (val) {
-        this.triggerEvent("changeTitle", "选择提货人");
-      }
-    },
-    isShowCreateShipper(val) {
-      if (val) {
-        this.data.shipperType === 1
-          ? this.triggerEvent("changeTitle", "新建提货人")
-          : this.triggerEvent("changeTitle", "编辑提货人");
-      }
-    },
-    isShowAddressManage(val) {
-      if (val) {
-        this.triggerEvent("changeTitle", "选择地址");
-      } else if (this.data.express_type != 2) {
-        this.initConfirmOrderInfo();
-      }
-    },
-    isShowEditAddress(val) {
-      if (val) {
-        this.triggerEvent("changeTitle", "地址编辑");
-      }
-    },
-  },
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-    // 供子组件修改父组件值
-    updataData(e) {
-      this.setData({
-        ...e.detail
-      })
-    },
-    // 商品的套餐信息
-    initGoodsPackage() {
-      let params = {
-        spu_id: this.data.baseInfoQuery.spu_id,
-      }
-      getGoodsPackage(params).then(res => {
-          let {
-            code,
-            data: goodsPackage
-          } = res.data
-          if (code === 0) {
-            this.setData({
-              hasEntityGoods: goodsPackage.entity_goods_num > 0 ? true : false
-            })
-            if (this.data.baseInfoQuery.spu_type != "ENT" && goodsPackage.has_package) {
-              this.setData({
-                distributionMode: goodsPackage.package_delivery
-              })
-            }
-          }
-        }).catch((err) => console.log(err))
-        .finally(() => {})
-    },
-    // 获取商家自提状态
-    initDeliveryState() {
-      getExpressSwitch().then(res => {
-          if (res.data.code === 0) {
-            this.setData({
-              userCanPick: res.data.data.self_service_switch
-            })
-          }
-        })
-        .catch((err) => console.log(err))
-        .finally(() => {})
-    },
-    // 初始化订单页基本信息
-    initConfirmOrderInfo() {
-      let {
-        id,
-        resource_type,
-        spu_type,
-        sku
-      } = this.data.baseInfoQuery
-      let params = {
-        spu_id: id,
-        resource_type,
-        spu_type,
-        address_id: this.data.addressInfo.id || "",
-        sku_id: sku || "",
-      }
-      wx.showLoading({
-        mask: true
-      })
-      getConfirmOrderDetail(params).then(res => {
-        if (res.data.code === 0) {
-          if (this.data.baseInfoQuery.spu_type == "ENT") {
-            this.setData({
-              distributionMode: res.data.data.goods_info.distribution_pattern
-            })
-          }
-          this.setData({
-            confirmOrderInfo: res.data.data,
-            pickerUserInfo: res.data.data.picker_info || {}
-          })
-          if (!this.data.isCart) {
-            let addressInfo = res.data.data.address_info;
-            this.setData({
-              addressInfo: Array.isArray(addressInfo) || !addressInfo ? {} : addressInfo
-            })
-          }
-        }
-      }).catch(err => {
-        console.log(err);
-      }).finally(() => {
-        this.outData()
-        wx.hideLoading()
-      })
-    },
-    // 切换配送模式
-    changeMode(e) {
-      let val = e.detail;
-      let num = 0;
-      val ? num = 2 : num = 1;
-      this.setData({
-        activeMode: val,
-        express_type: num
-      })
-    },
-    // 往外层抛出选择好的地址/自提数据
-    outData() {
-      let dataObj = {
-        express_type: this.data.express_type,
-        addressInfo: this.data.addressInfo,
-        picksiteInfo: this.data.picksiteInfo,
-        pickerUserInfo: this.data.pickerUserInfo,
-      };
-      this.triggerEvent("outData", dataObj);
-    },
-    // 供父组件调用此方法来显示最初的页面（比如：父组件有个返回箭头）
-    changeMain() {
-      this.setData({
-        isShowPoint: false,
-        isShowSelectShipper: false,
-        isShowCreateShipper: false,
-        isShowAddressManage: false,
-        isShowEditAddress: false,
-      })
-
-    },
-  }
+// src/CollectionAddress/index.js
+import {
+  getConfirmOrderDetail,
+  getExpressSwitch,
+  getPickerInfo,
+  getGoodsPackage,
+  getSuperVipInfo,
+  getBusinessFeature,
+  getMarketingInfo,
+  getShopConf
+} from "../common/api/confirmOrder"
+import {
+  isEmptyObject
+} from "../common/utils/index"
+import {
+  DELIVERY_METHOD_TEXT
+} from "../common/utils/constants.js"
+const computedBehavior = require('miniprogram-computed').behavior
+
+Component({
+  behaviors: [computedBehavior],
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    baseInfoQuery: {
+      type: Object,
+      required: true,
+      value: () => {},
+    },
+    isCart: {
+      type: Number,
+      value: 0,
+    },
+    title: {
+      type: String,
+      value: "",
+    },
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    isShowPoint: false, // 是否显示选择提货点组件
+    isShowSelectShipper: false, // 是否显示选择提货人组件
+    isShowCreateShipper: false, // 是否显示新增、编辑提货人组件
+    isShowAddressManage: false, // 是否显示地址管理组件（非自提）
+    isShowEditAddress: false, // 是否显示新建、编辑组件（非自提）
+    activeMode: 0, // 0：快递配送，1：自提
+    express_type: 1, // 接口下发配送信息 1-快递配送 2-商品自提
+    userCanPick: 1, // 商家是否支持自提 1支持 0不支持
+    sInfo: {}, // 地址信息（非自提）
+    addressInfo: {}, // 地址信息（非自提）
+    pickerUserInfo: {}, // 自提人信息
+    distributionMode: 0, // 配送方式 -1全部 1快递配送 2商品自提 （目前只支持实物商品，非实物商品返回0）
+    confirmOrderInfo: {
+      // 订单页详细信息(通过查询接口拿到)
+      app_info: {},
+      goods_info: {},
+    },
+    shipperType: 1, // 1：新建自提人；2：编辑自提人
+    customDeliveryType: [DELIVERY_METHOD_TEXT.EXPRESSAGE, DELIVERY_METHOD_TEXT.PICK],//自定义配送方式顺序-由b端交易设置修改
+  },
+  lifetimes: {
+    attached() {
+      this.initConfirmOrderInfo()
+      this.initDeliveryState()
+      this.initGoodsPackage()
+    }
+  },
+  computed: {
+    isShowMain(data) {
+      return (
+        !data.isShowPoint &&
+        !data.isShowSelectShipper &&
+        !data.isShowCreateShipper &&
+        !data.isShowAddressManage &&
+        !data.isShowEditAddress
+      )
+    },
+    //通过商家是否开启自提和自提选择 决定自提组件的显示和隐藏
+    showPickSelf(data) {
+      return (
+        data.userCanPick === 1 &&
+        (data.activeMode === 1 || data.distributionMode === 2)
+      );
+    },
+    // 判断模式选择tab栏的显示和隐藏
+    showModeSelect(data) {
+      return data.distributionMode === -1 && data.userCanPick === 1;
+    },
+    // 显示地址栏的情况 商品有两种配送方式,商家关闭自提/购物车
+    showAddressSelect(data) {
+      return (
+        data.activeMode === 0 &&
+        (data.distributionMode === -1 || data.distributionMode === 1)
+      );
+    },
+    // 商品信息
+    goodsInfo(data) {
+      if (isEmptyObject(data.confirmOrderInfo.goods_info)) {
+        return data.baseInfoQuery;
+      }
+      return data.confirmOrderInfo.goods_info;
+    },
+  },
+  observers: {
+    express_type(val) {
+      this.outData();
+    },
+    activeMode(val) {
+      val === 1 ? this.triggerEvent("changeTitle", "选择提货地址") : this.triggerEvent("changeTitle", "选择收货地址");
+    },
+    distributionMode(val) {
+      if (val === 2) {
+        this.setData({
+          express_type: 2
+        })
+        this.triggerEvent("changeTitle", "选择提货地址");
+      } else {
+        this.setData({
+          express_type: 1
+        })
+        this.triggerEvent("changeTitle", "选择收货地址");
+      }
+    },
+    isShowMain(val) {
+      this.triggerEvent("changeState", val)
+      if (val) {
+        if (this.data.distributionMode === -1 || this.data.distributionMode === 1 && this.data.activeMode === 0) {
+          this.triggerEvent("changeTitle", "选择收货地址");
+        } else {
+          this.triggerEvent("changeTitle", "选择提货地址");
+        }
+      }
+      this.outData();
+    },
+    isShowPoint(val) {
+      if (val) {
+        this.triggerEvent("changeTitle", "选择自提点");
+      }
+    },
+    isShowSelectShipper(val) {
+      if (val) {
+        this.triggerEvent("changeTitle", "选择提货人");
+      }
+    },
+    isShowCreateShipper(val) {
+      if (val) {
+        this.data.shipperType === 1
+          ? this.triggerEvent("changeTitle", "新建提货人")
+          : this.triggerEvent("changeTitle", "编辑提货人");
+      }
+    },
+    isShowAddressManage(val) {
+      if (val) {
+        this.triggerEvent("changeTitle", "选择地址");
+      } else if (this.data.express_type != 2) {
+        this.initConfirmOrderInfo();
+      }
+    },
+    isShowEditAddress(val) {
+      if (val) {
+        this.triggerEvent("changeTitle", "地址编辑");
+      }
+    },
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    // 供子组件修改父组件值
+    updataData(e) {
+      this.setData({
+        ...e.detail
+      })
+    },
+    // 商品的套餐信息
+    initGoodsPackage() {
+      let params = {
+        spu_id: this.data.baseInfoQuery.spu_id,
+      }
+      getGoodsPackage(params).then(res => {
+          let {
+            code,
+            data: goodsPackage
+          } = res.data
+          if (code === 0) {
+            this.setData({
+              hasEntityGoods: goodsPackage.entity_goods_num > 0 ? true : false
+            })
+            if (this.data.baseInfoQuery.spu_type != "ENT" && goodsPackage.has_package) {
+              this.setData({
+                distributionMode: goodsPackage.package_delivery
+              })
+            }
+          }
+        }).catch((err) => console.log(err))
+        .finally(() => {})
+    },
+    // 获取商家自提状态
+    initDeliveryState() {
+      getExpressSwitch().then(res => {
+          if (res.data.code === 0) {
+            this.setData({
+              userCanPick: res.data.data.self_service_switch
+            })
+          }
+        })
+        .catch((err) => console.log(err))
+        .finally(() => {})
+    },
+    // 初始化订单页基本信息
+    initConfirmOrderInfo() {
+      let {
+        id,
+        resource_type,
+        spu_type,
+        sku
+      } = this.data.baseInfoQuery
+      let params = {
+        spu_id: id,
+        resource_type,
+        spu_type,
+        address_id: this.data.addressInfo.id || "",
+        sku_id: sku || "",
+      }
+      wx.showLoading({
+        mask: true
+      })
+      getConfirmOrderDetail(params).then(res => {
+        if (res.data.code === 0) {
+          if (this.data.baseInfoQuery.spu_type == "ENT") {
+            this.setData({
+              distributionMode: res.data.data.goods_info.distribution_pattern
+            })
+          }
+          this.setData({
+            confirmOrderInfo: res.data.data,
+            pickerUserInfo: res.data.data.picker_info || {}
+          })
+          if (!this.data.isCart) {
+            let addressInfo = res.data.data.address_info;
+            this.setData({
+              addressInfo: Array.isArray(addressInfo) || !addressInfo ? {} : addressInfo
+            })
+          }
+        }
+      }).catch(err => {
+        console.log(err);
+      }).finally(() => {
+        this.outData()
+        wx.hideLoading()
+      })
+    },
+    // 切换配送模式
+    changeMode(e) {
+      let val = e.detail;
+      let num = 0;
+      val ? num = 2 : num = 1;
+      this.setData({
+        activeMode: val,
+        express_type: num
+      })
+    },
+    // 往外层抛出选择好的地址/自提数据
+    outData() {
+      let dataObj = {
+        express_type: this.data.express_type,
+        addressInfo: this.data.addressInfo,
+        picksiteInfo: this.data.picksiteInfo,
+        pickerUserInfo: this.data.pickerUserInfo,
+      };
+      this.triggerEvent("outData", dataObj);
+    },
+    // 供父组件调用此方法来显示最初的页面（比如：父组件有个返回箭头）
+    changeMain() {
+      this.setData({
+        isShowPoint: false,
+        isShowSelectShipper: false,
+        isShowCreateShipper: false,
+        isShowAddressManage: false,
+        isShowEditAddress: false,
+      })
+
+    },
+  }
 })

package/miniprogram_dist/CollectionAddress/index.json

@@ -1,14 +1,14 @@
-{
-  "component": true,
-  "usingComponents": {
-    "ModeSelect": "../ConfirmOrder/components/ModeSelect/index",
-    "AddressSelect": "../ConfirmOrder/components/AddressSelect/index",
-    "AddressManage": "../ConfirmOrder/components/AddressManage/index",
-    "AddressEdit": "../ConfirmOrder/components/AddressEdit/index",
-    "PickupSelect": "../ConfirmOrder/components/PickupSelect/index",
-    "SelectSite": "../ConfirmOrder/components/SelectSite/index",
-    "Shipper": "../ConfirmOrder/components/Shipper/index",
-    "ChoosePicker": "../ConfirmOrder/components/ChoosePicker/index",
-    "ShipperEdit": "../ConfirmOrder/components/ShipperEdit/index"
-  }
+{
+  "component": true,
+  "usingComponents": {
+    "ModeSelect": "../ConfirmOrder/components/ModeSelect/index",
+    "AddressSelect": "../ConfirmOrder/components/AddressSelect/index",
+    "AddressManage": "../ConfirmOrder/components/AddressManage/index",
+    "AddressEdit": "../ConfirmOrder/components/AddressEdit/index",
+    "PickupSelect": "../ConfirmOrder/components/PickupSelect/index",
+    "SelectSite": "../ConfirmOrder/components/SelectSite/index",
+    "Shipper": "../ConfirmOrder/components/Shipper/index",
+    "ChoosePicker": "../ConfirmOrder/components/ChoosePicker/index",
+    "ShipperEdit": "../ConfirmOrder/components/ShipperEdit/index"
+  }
 }

package/miniprogram_dist/CollectionAddress/index.less

@@ -1,5 +1,5 @@
-.address-content {
-  font-size: 4.27vmin;
-  margin-bottom: 21.6vmin;
-  height: calc(100% - 12.8vmin);
+.address-content {
+  font-size: 4.27vmin;
+  margin-bottom: 21.6vmin;
+  height: calc(100% - 12.8vmin);
 }