xiaoe_mp_npm 1.1.21 → 1.1.22-test02

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

@@ -1,120 +1,120 @@
-/* 主题色 */
-.theme-customize-bg {
-  background: linear-gradient(180.25deg, #fe6500 0%, #ff4102 100%) !important;
-}
-.theme-customize-font {
-  color: #1472FF !important;
-}
-.theme-customize-light-new {
-  background-color: #9db8f1 !important;
-}
-.theme-customize-bg-light {
-  background-color: #fff3eb !important;
-}
-.theme-customize-border {
-  border-color: #FF781F !important;
-}
-.address-edit-content {
-  padding-top: 2.13vmin;
-}
-.address-edit-content .input-wrapper {
-  background: white;
-}
-.address-edit-content .input-wrapper .van-field__label {
-  font-size: 3.73vmin;
-  color: #333333;
-}
-.address-edit-content .input-wrapper .area-picker {
-  display: flex;
-  align-items: center;
-  padding: 2.66vmin 4.27vmin;
-}
-.address-edit-content .input-wrapper .area-picker .area-title {
-  font-size: 3.73vmin;
-  color: #333333;
-  width: 23.1vmin;
-}
-.address-edit-content .input-wrapper .area-picker .area-tip {
-  font-size: 3.73vmin;
-  color: #c8c9cc;
-  padding-left: 3.46vmin;
-}
-.address-edit-content .input-wrapper .area-picker .area-cont {
-  font-size: 3.73vmin;
-  color: #323233;
-  padding-left: 3.46vmin;
-  flex: 1;
-}
-.address-edit-content .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;
-}
-.address-edit-content .default-wrapper .ET2 {
-  font-size: 3.73vmin;
-  color: #333333;
-}
-.address-edit-content .default-wrapper .van-switch {
-  border: 0 solid #010101;
-  background-color: #f5f5f5;
-}
-.address-edit-content .default-wrapper .van-switch .van-switch__node {
-  box-shadow: none;
-  border: 0.13vmin solid rgba(0, 0, 0, 0.08);
-  background: #ffffff;
-  width: 5.8vmin;
-  height: 5.8vmin;
-  top: 0.13vmin;
-  left: 0.13vmin;
-}
-.address-edit-content .default-wrapper .van-switch--on {
-  background-color: #1989fa;
-}
-.address-edit-content .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;
-}
-.address-edit-content .finish-btn .finish-btn-wrapper {
-  padding: 2.13vmin 3.73vmin;
-}
-.address-edit-content .finish-btn .finish {
-  padding: 2.67vmin 0;
-  border-radius: 5.33vmin;
-  text-align: center;
-  background-color: #1472FF;
-  color: white;
-}
-.address-edit-content .finish-btn .finish-double {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-.address-edit-content .finish-btn .finish-double .cancel-btn {
-  text-align: center;
-  width: 28.27vmin;
-  padding: 2.13vmin 0;
-  margin-right: 3.2vmin;
-  background: #ffffff;
-  border-radius: 5.33vmin;
-  border: 0.27vmin solid #b7b7b7;
-}
-.address-edit-content .finish-btn .finish-double .finish2 {
-  width: 60vmin;
-  padding: 2.67vmin 0;
-  border-radius: 5.33vmin;
-  text-align: center;
-  background: #09bb07;
-  color: #fff;
-}
+/* 主题色 */
+.theme-customize-bg {
+  background: linear-gradient(180.25deg, #fe6500 0%, #ff4102 100%) !important;
+}
+.theme-customize-font {
+  color: #1472FF !important;
+}
+.theme-customize-light-new {
+  background-color: #9db8f1 !important;
+}
+.theme-customize-bg-light {
+  background-color: #fff3eb !important;
+}
+.theme-customize-border {
+  border-color: #FF781F !important;
+}
+.address-edit-content {
+  padding-top: 2.13vmin;
+}
+.address-edit-content .input-wrapper {
+  background: white;
+}
+.address-edit-content .input-wrapper .van-field__label {
+  font-size: 3.73vmin;
+  color: #333333;
+}
+.address-edit-content .input-wrapper .area-picker {
+  display: flex;
+  align-items: center;
+  padding: 2.66vmin 4.27vmin;
+}
+.address-edit-content .input-wrapper .area-picker .area-title {
+  font-size: 3.73vmin;
+  color: #333333;
+  width: 23.1vmin;
+}
+.address-edit-content .input-wrapper .area-picker .area-tip {
+  font-size: 3.73vmin;
+  color: #c8c9cc;
+  padding-left: 3.46vmin;
+}
+.address-edit-content .input-wrapper .area-picker .area-cont {
+  font-size: 3.73vmin;
+  color: #323233;
+  padding-left: 3.46vmin;
+  flex: 1;
+}
+.address-edit-content .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;
+}
+.address-edit-content .default-wrapper .ET2 {
+  font-size: 3.73vmin;
+  color: #333333;
+}
+.address-edit-content .default-wrapper .van-switch {
+  border: 0 solid #010101;
+  background-color: #f5f5f5;
+}
+.address-edit-content .default-wrapper .van-switch .van-switch__node {
+  box-shadow: none;
+  border: 0.13vmin solid rgba(0, 0, 0, 0.08);
+  background: #ffffff;
+  width: 5.8vmin;
+  height: 5.8vmin;
+  top: 0.13vmin;
+  left: 0.13vmin;
+}
+.address-edit-content .default-wrapper .van-switch--on {
+  background-color: #1989fa;
+}
+.address-edit-content .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;
+}
+.address-edit-content .finish-btn .finish-btn-wrapper {
+  padding: 2.13vmin 3.73vmin;
+}
+.address-edit-content .finish-btn .finish {
+  padding: 2.67vmin 0;
+  border-radius: 5.33vmin;
+  text-align: center;
+  background-color: #1472FF;
+  color: white;
+}
+.address-edit-content .finish-btn .finish-double {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.address-edit-content .finish-btn .finish-double .cancel-btn {
+  text-align: center;
+  width: 28.27vmin;
+  padding: 2.13vmin 0;
+  margin-right: 3.2vmin;
+  background: #ffffff;
+  border-radius: 5.33vmin;
+  border: 0.27vmin solid #b7b7b7;
+}
+.address-edit-content .finish-btn .finish-double .finish2 {
+  width: 60vmin;
+  padding: 2.67vmin 0;
+  border-radius: 5.33vmin;
+  text-align: center;
+  background: #09bb07;
+  color: #fff;
+}

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

@@ -1,169 +1,169 @@
-// src/ConfirmOrder/components/AddressManage/index.js
-import {
-  getReceiveAddress,
-  createAddress
-} from "../../../common/api/confirmOrder"
-const computedBehavior = require('miniprogram-computed').behavior
-
-Component({
-  behaviors: [computedBehavior],
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-    addressInfo: {
-      type: Object,
-      value: () => {},
-    },
-    addressQuery: {
-      type: Object,
-      value: () => {},
-    },
-    isShowEditAddress: {
-      type: Boolean,
-      value: false,
-    },
-    isShowAddressManage: {
-      type: Boolean,
-      value: false,
-    }
-  },
-  options: {
-    styleIsolation: 'shared',
-  },
-  /**
-   * 组件的初始数据
-   */
-  data: {
-    addressList: [],
-    pageFlag: true,
-    radio: '1',
-  },
-  lifetimes: {
-    attached: async function () {
-      // 在组件实例进入页面节点树时执行
-      // 用于标示页面是来自订单(true)还是个人中心(false)
-      this.setData({
-        pageFlag: this.data.addressQuery.selectable || false
-      })
-      this.initReceiveAddress()
-    },
-  },
-  computed: {
-    publicAddressId(data) {
-      return (data.addressInfo && data.addressInfo.id) || data.addressQuery.id;
-    },
-  },
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-    // 新增地址
-    createAddress(e) {
-      let data = e.detail
-      let params = {
-        receiver: data.userName, // 收件人
-        phone: data.telNumber, // 手机号码
-        province: data.provinceName, // 省
-        city: data.cityName, // 市
-        county: data.countyName, //区/县
-        detail: data.detailInfo, // 详细地址
-        is_default: 0, // 是否设为默地址,
-        id: null,
-      }
-      wx.showLoading({
-        mask: true,
-        title: '加载中'
-      })
-      createAddress(params).then(res => {
-        if (res.data.code === 0) {
-          this.triggerEvent("updataData", {
-            addressInfo: {
-              ...params,
-              ...res.data.data,
-            },
-            isShowEditAddress: false
-          })
-          this.triggerEvent("initConfirmOrderInfo")
-        }
-      }).catch((err) => console.log(err))
-      .finally(() => {
-        wx.hideLoading()
-      })
-    },
-    // 获取收货地址列表
-    initReceiveAddress() {
-      wx.showLoading({
-        mask: true,
-        title: '加载中'
-      })
-      getReceiveAddress().then(res => {
-          if (res.data.code === 0) {
-            let addressList = [];
-            if (this.data.publicAddressId && res.data.data.length > 1) {
-              addressList = this.sortChoosen(res.data.data);
-            } else {
-              addressList = res.data.data;
-            }
-            this.setData({
-              addressList: addressList
-            })
-
-            console.log('addressList',addressList)
-          }
-        }).catch((err) => console.log(err))
-        .finally(() => {
-          wx.hideLoading()
-        })
-    },
-    chooseAddress(e) {
-      if (this.data.pageFlag) {
-        this.triggerEvent("updataData", {
-          addressInfo: e.currentTarget.dataset.item || e.detail,
-          isShowAddressManage: false
-        })
-      }
-    },
-    wechatChooseAddress(e) {
-      console.log('e',e)
-      this.triggerEvent("updataData", {
-        addressInfo: e.detail,
-        isShowAddressManage: false
-      })
-    },
-    newAddress(e) {
-      let data = e.currentTarget.dataset
-      let id = Object.keys(data).length ? data.id : null
-      this.setData({
-        isShowAddressManage: false,
-        isShowEditAddress: true
-      })
-      this.triggerEvent("updataData", {
-        addressQuery: {
-          orderdata: this.data.addressQuery.orderdata || null,
-          selectable: this.data.addressQuery.selectable || false,
-          id: id,
-        },
-        isShowAddressManage: false,
-        isShowEditAddress: true
-      })
-    },
-    // 选中的地址置于首位
-    sortChoosen(arr) {
-      let index,
-        element,
-        newArr = arr;
-      for (let i = 0; i < arr.length; i++) {
-        if (arr[i].id == this.data.publicAddressId) {
-          element = arr[i];
-          index = i;
-        }
-      }
-      if (index && index >= 0) {
-        newArr.splice(index, 1);
-        newArr.unshift(element);
-      }
-      return newArr;
-    },
-  }
+// src/ConfirmOrder/components/AddressManage/index.js
+import {
+  getReceiveAddress,
+  createAddress
+} from "../../../common/api/confirmOrder"
+const computedBehavior = require('miniprogram-computed').behavior
+
+Component({
+  behaviors: [computedBehavior],
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    addressInfo: {
+      type: Object,
+      value: () => {},
+    },
+    addressQuery: {
+      type: Object,
+      value: () => {},
+    },
+    isShowEditAddress: {
+      type: Boolean,
+      value: false,
+    },
+    isShowAddressManage: {
+      type: Boolean,
+      value: false,
+    }
+  },
+  options: {
+    styleIsolation: 'shared',
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    addressList: [],
+    pageFlag: true,
+    radio: '1',
+  },
+  lifetimes: {
+    attached: async function () {
+      // 在组件实例进入页面节点树时执行
+      // 用于标示页面是来自订单(true)还是个人中心(false)
+      this.setData({
+        pageFlag: this.data.addressQuery.selectable || false
+      })
+      this.initReceiveAddress()
+    },
+  },
+  computed: {
+    publicAddressId(data) {
+      return (data.addressInfo && data.addressInfo.id) || data.addressQuery.id;
+    },
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    // 新增地址
+    createAddress(e) {
+      let data = e.detail
+      let params = {
+        receiver: data.userName, // 收件人
+        phone: data.telNumber, // 手机号码
+        province: data.provinceName, // 省
+        city: data.cityName, // 市
+        county: data.countyName, //区/县
+        detail: data.detailInfo, // 详细地址
+        is_default: 0, // 是否设为默地址,
+        id: null,
+      }
+      wx.showLoading({
+        mask: true,
+        title: '加载中'
+      })
+      createAddress(params).then(res => {
+        if (res.data.code === 0) {
+          this.triggerEvent("updataData", {
+            addressInfo: {
+              ...params,
+              ...res.data.data,
+            },
+            isShowEditAddress: false
+          })
+          this.triggerEvent("initConfirmOrderInfo")
+        }
+      }).catch((err) => console.log(err))
+      .finally(() => {
+        wx.hideLoading()
+      })
+    },
+    // 获取收货地址列表
+    initReceiveAddress() {
+      wx.showLoading({
+        mask: true,
+        title: '加载中'
+      })
+      getReceiveAddress().then(res => {
+          if (res.data.code === 0) {
+            let addressList = [];
+            if (this.data.publicAddressId && res.data.data.length > 1) {
+              addressList = this.sortChoosen(res.data.data);
+            } else {
+              addressList = res.data.data;
+            }
+            this.setData({
+              addressList: addressList
+            })
+
+            console.log('addressList',addressList)
+          }
+        }).catch((err) => console.log(err))
+        .finally(() => {
+          wx.hideLoading()
+        })
+    },
+    chooseAddress(e) {
+      if (this.data.pageFlag) {
+        this.triggerEvent("updataData", {
+          addressInfo: e.currentTarget.dataset.item || e.detail,
+          isShowAddressManage: false
+        })
+      }
+    },
+    wechatChooseAddress(e) {
+      console.log('e',e)
+      this.triggerEvent("updataData", {
+        addressInfo: e.detail,
+        isShowAddressManage: false
+      })
+    },
+    newAddress(e) {
+      let data = e.currentTarget.dataset
+      let id = Object.keys(data).length ? data.id : null
+      this.setData({
+        isShowAddressManage: false,
+        isShowEditAddress: true
+      })
+      this.triggerEvent("updataData", {
+        addressQuery: {
+          orderdata: this.data.addressQuery.orderdata || null,
+          selectable: this.data.addressQuery.selectable || false,
+          id: id,
+        },
+        isShowAddressManage: false,
+        isShowEditAddress: true
+      })
+    },
+    // 选中的地址置于首位
+    sortChoosen(arr) {
+      let index,
+        element,
+        newArr = arr;
+      for (let i = 0; i < arr.length; i++) {
+        if (arr[i].id == this.data.publicAddressId) {
+          element = arr[i];
+          index = i;
+        }
+      }
+      if (index && index >= 0) {
+        newArr.splice(index, 1);
+        newArr.unshift(element);
+      }
+      return newArr;
+    },
+  }
 })

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

@@ -1,8 +1,8 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-radio": "@vant/weapp/radio/index",
-    "van-radio-group": "@vant/weapp/radio-group/index",
-    "WechatAddress": "../WechatAddress/index"
-  }
+{
+  "component": true,
+  "usingComponents": {
+    "van-radio": "@vant/weapp/radio/index",
+    "van-radio-group": "@vant/weapp/radio-group/index",
+    "WechatAddress": "../WechatAddress/index"
+  }
 }