xiaoe_mp_npm 1.1.21 → 1.1.22-test02

package/miniprogram_dist/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/miniprogram_dist/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"
+  }
 }

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

@@ -1,96 +1,96 @@
-@import "../../../common/css/theme.wxss";
-
-.address-manage-content {
-  padding-bottom: 25.07vmin;
-
-  .address-bar {
-    background: white;
-    padding: 4.27vmin;
-    margin-bottom: 2.13vmin;
-    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: 2.13vmin;
-
-          .ET2 {
-            font-size: 4.27vmin
-          }
-
-          .name {
-            margin-right: 4.27vmin;
-            max-width: 34.93vmin;
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-            word-break: break-all;
-          }
-
-          .tag {
-            width: 8.53vmin;
-            height: 4.27vmin;
-            text-align: center;
-            line-height: 4.27vmin;
-            background: #dde8fc;
-            border-radius: 1.07vmin;
-            margin-left: 4.27vmin;
-            font-size: 2.67vmin;
-            text-size-adjust: none;
-          }
-        }
-
-        .address-text {
-          padding-right: 9.6vmin;
-        }
-      }
-    }
-
-    .update-icon {
-      position: absolute;
-      right: 4.27vmin;
-      top: 50%;
-      transform: translateY(-50%);
-      color: #c8c8c8;
-      width: 5.33vmin;
-      height: 5.33vmin;
-    }
-  }
-
-  .finish-btn {
-    position: fixed;
-    margin: auto;
-    left: 0;
-    right: 0;
-    background: #fff;
-    bottom: 0;
-    box-sizing: border-box;
-    border-top: 0.27vmin solid #eee;
-
-    .finish-btn-wrapper {
-      padding: 2.13vmin 3.73vmin;
-    }
-
-    .finish {
-      padding: 2.67vmin 0;
-      border-radius: 5.33vmin;
-      text-align: center;
-      background: #09bb07;
-      color: white;
-    }
-  }
+@import "../../../common/css/theme.wxss";
+
+.address-manage-content {
+  padding-bottom: 25.07vmin;
+
+  .address-bar {
+    background: white;
+    padding: 4.27vmin;
+    margin-bottom: 2.13vmin;
+    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: 2.13vmin;
+
+          .ET2 {
+            font-size: 4.27vmin
+          }
+
+          .name {
+            margin-right: 4.27vmin;
+            max-width: 34.93vmin;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            word-break: break-all;
+          }
+
+          .tag {
+            width: 8.53vmin;
+            height: 4.27vmin;
+            text-align: center;
+            line-height: 4.27vmin;
+            background: #dde8fc;
+            border-radius: 1.07vmin;
+            margin-left: 4.27vmin;
+            font-size: 2.67vmin;
+            text-size-adjust: none;
+          }
+        }
+
+        .address-text {
+          padding-right: 9.6vmin;
+        }
+      }
+    }
+
+    .update-icon {
+      position: absolute;
+      right: 4.27vmin;
+      top: 50%;
+      transform: translateY(-50%);
+      color: #c8c8c8;
+      width: 5.33vmin;
+      height: 5.33vmin;
+    }
+  }
+
+  .finish-btn {
+    position: fixed;
+    margin: auto;
+    left: 0;
+    right: 0;
+    background: #fff;
+    bottom: 0;
+    box-sizing: border-box;
+    border-top: 0.27vmin solid #eee;
+
+    .finish-btn-wrapper {
+      padding: 2.13vmin 3.73vmin;
+    }
+
+    .finish {
+      padding: 2.67vmin 0;
+      border-radius: 5.33vmin;
+      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:wechatChooseAddress="wechatChooseAddress"
-  ></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:wechatChooseAddress="wechatChooseAddress"
+  ></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>