xiaoe_mp_npm 0.1.13 → 0.1.14

package/miniprogram_dist/ConfirmOrder/components/ShipperEdit/index.js

@@ -1,218 +1,218 @@
-// src/ConfirmOrder/components/ShipperEdit/index.js
-import {
-  addPicker,
-  updatePicker,
-  deletePicker
-} from "../../../common/api/confirmOrder"
-const computedBehavior = require('miniprogram-computed').behavior
-
-Component({
-  behaviors: [computedBehavior],
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-    pickerUserInfo: {
-      type: Object,
-      value: () => {},
-    },
-    updateShipperInfo: {
-      type: Object,
-      value: () => {},
-    },
-    shipperType: {
-      type: Number,
-      value: 1,
-    },
-    isShowCreateShipper: {
-      type: Boolean,
-      value: false,
-    },
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-    //提货人信息
-    pickupInfo: {
-      name: "",
-      contact: "",
-    },
-    isdefault: 0,
-  },
-  lifetimes: {
-    attached: function () {
-      // 编辑
-      if (this.data.shipperType === 2) {
-        this.setData({
-          pickupInfo: {
-            name: this.data.updateShipperInfo.picker,
-            contact: this.data.updateShipperInfo.picker_contact
-          },
-          isdefault: Boolean(this.data.updateShipperInfo.is_default)
-        })
-      }
-    },
-  },
-  computed: {
-    // 用于正则校验每个输入框的数组
-    dataArray(data) {
-      let arr = [];
-      for (const item in data.pickupInfo) {
-        arr.push({
-          key: item,
-          value: data.pickupInfo[item],
-        });
-      }
-      return arr;
-    },
-  },
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-    // 删除
-    delPickerInfo() {
-      let params = {
-        picker_id: this.data.updateShipperInfo.id,
-      };
-      wx.showLoading({
-        mask: true,
-        title: '加载中'
-      })
-      deletePicker(params).then(res => {
-          if (res.data.code === 0) {
-            wx.showToast({
-              title: "删除成功",
-              icon: 'none',
-              duration: 2000
-            })
-            setTimeout(() => {
-              this.triggerEvent("initPickerInfo", {})
-              this.triggerEvent("updataData", {
-                isShowCreateShipper: false
-              })
-            }, 1000);
-          }
-        }).catch((err) => console.log(err))
-        .finally(() => {
-          wx.hideLoading()
-        })
-    },
-    // 保存、新增提货人信息
-    addPickerInfo() {
-      let flag = this.checkValue(this.data.dataArray)
-      if (flag !== true) {
-        wx.showToast({
-          title: flag,
-          icon: 'none',
-          duration: 2000
-        })
-        return
-      }
-      let params = {};
-      wx.showLoading({
-        mask: true,
-        title: '加载中'
-      })
-      if (this.data.shipperType === 1) {
-        // 新增
-        params = {
-          picker: this.data.pickupInfo.name,
-          picker_contact: this.data.pickupInfo.contact,
-          is_default: this.data.isdefault === true ? 1 : 0,
-        };
-        addPicker(params).then(res => {
-            if (res.data.code === 0) {
-              wx.showToast({
-                title: '保存成功',
-                icon: 'none',
-                duration: 2000
-              })
-              this.triggerEvent("updataData", {
-                pickerUserInfo: res.data.data
-              })
-              setTimeout(() => {
-                this.triggerEvent("updataData", {
-                  isShowCreateShipper: false
-                })
-              }, 1000);
-            }
-          }).catch((err) => console.log(err))
-          .finally(() => {
-            wx.hideLoading()
-          })
-      } else {
-        // 编辑
-        params = {
-          picker: this.data.pickupInfo.name,
-          picker_contact: this.data.pickupInfo.contact,
-          is_default: this.data.isdefault === true ? 1 : 0,
-          picker_id: this.data.updateShipperInfo.id,
-        };
-        updatePicker(params).then(res => {
-            if (res.data.code === 0) {
-              wx.showToast({
-                title: '修改成功',
-                icon: 'none',
-                duration: 2000
-              })
-              this.triggerEvent("updataData", {
-                pickerUserInfo: res.data.data
-              })
-              setTimeout(() => {
-                this.triggerEvent("updataData", {
-                  isShowCreateShipper: false
-                })
-              }, 1000);
-            }
-          }).catch((err) => console.log(err))
-          .finally(() => {
-            wx.hideLoading()
-          })
-      }
-    },
-    //所有输入框的校验
-    checkValue(val) {
-      let flag = true;
-      for (let item of val) {
-        switch (item.key) {
-          case "name":
-            if (item.value || item.value.length > 0) {
-              continue;
-            } else {
-              flag = "请填写收货人姓名";
-              return flag;
-            }
-            case "contact":
-              if (item.value || item.value.length > 0) {
-                if (/^[1]([3-9])[0-9]{9}$/.test(item.value)) {
-                  continue;
-                } else {
-                  flag = "手机号格式错误";
-                  return flag;
-                }
-              } else {
-                flag = "请填写手机号码";
-                return flag;
-              }
-              default:
-                break;
-        }
-      }
-      return true;
-    },
-    changeMsg(event) {
-      let newData = `pickupInfo.${event.currentTarget.dataset.type}`
-      this.setData({
-        [newData]: event.detail
-      })
-    },
-    changeSwitch(e) {
-      this.setData({
-        isdefault: e.detail
-      })
-    },
-  }
+// src/ConfirmOrder/components/ShipperEdit/index.js
+import {
+  addPicker,
+  updatePicker,
+  deletePicker
+} from "../../../common/api/confirmOrder"
+const computedBehavior = require('miniprogram-computed').behavior
+
+Component({
+  behaviors: [computedBehavior],
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    pickerUserInfo: {
+      type: Object,
+      value: () => {},
+    },
+    updateShipperInfo: {
+      type: Object,
+      value: () => {},
+    },
+    shipperType: {
+      type: Number,
+      value: 1,
+    },
+    isShowCreateShipper: {
+      type: Boolean,
+      value: false,
+    },
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    //提货人信息
+    pickupInfo: {
+      name: "",
+      contact: "",
+    },
+    isdefault: 0,
+  },
+  lifetimes: {
+    attached: function () {
+      // 编辑
+      if (this.data.shipperType === 2) {
+        this.setData({
+          pickupInfo: {
+            name: this.data.updateShipperInfo.picker,
+            contact: this.data.updateShipperInfo.picker_contact
+          },
+          isdefault: Boolean(this.data.updateShipperInfo.is_default)
+        })
+      }
+    },
+  },
+  computed: {
+    // 用于正则校验每个输入框的数组
+    dataArray(data) {
+      let arr = [];
+      for (const item in data.pickupInfo) {
+        arr.push({
+          key: item,
+          value: data.pickupInfo[item],
+        });
+      }
+      return arr;
+    },
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    // 删除
+    delPickerInfo() {
+      let params = {
+        picker_id: this.data.updateShipperInfo.id,
+      };
+      wx.showLoading({
+        mask: true,
+        title: '加载中'
+      })
+      deletePicker(params).then(res => {
+          if (res.data.code === 0) {
+            wx.showToast({
+              title: "删除成功",
+              icon: 'none',
+              duration: 2000
+            })
+            setTimeout(() => {
+              this.triggerEvent("initPickerInfo", {})
+              this.triggerEvent("updataData", {
+                isShowCreateShipper: false
+              })
+            }, 1000);
+          }
+        }).catch((err) => console.log(err))
+        .finally(() => {
+          wx.hideLoading()
+        })
+    },
+    // 保存、新增提货人信息
+    addPickerInfo() {
+      let flag = this.checkValue(this.data.dataArray)
+      if (flag !== true) {
+        wx.showToast({
+          title: flag,
+          icon: 'none',
+          duration: 2000
+        })
+        return
+      }
+      let params = {};
+      wx.showLoading({
+        mask: true,
+        title: '加载中'
+      })
+      if (this.data.shipperType === 1) {
+        // 新增
+        params = {
+          picker: this.data.pickupInfo.name,
+          picker_contact: this.data.pickupInfo.contact,
+          is_default: this.data.isdefault === true ? 1 : 0,
+        };
+        addPicker(params).then(res => {
+            if (res.data.code === 0) {
+              wx.showToast({
+                title: '保存成功',
+                icon: 'none',
+                duration: 2000
+              })
+              this.triggerEvent("updataData", {
+                pickerUserInfo: res.data.data
+              })
+              setTimeout(() => {
+                this.triggerEvent("updataData", {
+                  isShowCreateShipper: false
+                })
+              }, 1000);
+            }
+          }).catch((err) => console.log(err))
+          .finally(() => {
+            wx.hideLoading()
+          })
+      } else {
+        // 编辑
+        params = {
+          picker: this.data.pickupInfo.name,
+          picker_contact: this.data.pickupInfo.contact,
+          is_default: this.data.isdefault === true ? 1 : 0,
+          picker_id: this.data.updateShipperInfo.id,
+        };
+        updatePicker(params).then(res => {
+            if (res.data.code === 0) {
+              wx.showToast({
+                title: '修改成功',
+                icon: 'none',
+                duration: 2000
+              })
+              this.triggerEvent("updataData", {
+                pickerUserInfo: res.data.data
+              })
+              setTimeout(() => {
+                this.triggerEvent("updataData", {
+                  isShowCreateShipper: false
+                })
+              }, 1000);
+            }
+          }).catch((err) => console.log(err))
+          .finally(() => {
+            wx.hideLoading()
+          })
+      }
+    },
+    //所有输入框的校验
+    checkValue(val) {
+      let flag = true;
+      for (let item of val) {
+        switch (item.key) {
+          case "name":
+            if (item.value || item.value.length > 0) {
+              continue;
+            } else {
+              flag = "请填写收货人姓名";
+              return flag;
+            }
+            case "contact":
+              if (item.value || item.value.length > 0) {
+                if (/^[1]([3-9])[0-9]{9}$/.test(item.value)) {
+                  continue;
+                } else {
+                  flag = "手机号格式错误";
+                  return flag;
+                }
+              } else {
+                flag = "请填写手机号码";
+                return flag;
+              }
+              default:
+                break;
+        }
+      }
+      return true;
+    },
+    changeMsg(event) {
+      let newData = `pickupInfo.${event.currentTarget.dataset.type}`
+      this.setData({
+        [newData]: event.detail
+      })
+    },
+    changeSwitch(e) {
+      this.setData({
+        isdefault: e.detail
+      })
+    },
+  }
 })

package/miniprogram_dist/ConfirmOrder/components/ShipperEdit/index.json

@@ -1,8 +1,8 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-cell": "@vant/weapp/cell/index",
-    "van-switch": "@vant/weapp/switch/index",
-    "van-field": "@vant/weapp/field/index"
-  }
+{
+  "component": true,
+  "usingComponents": {
+    "van-cell": "@vant/weapp/cell/index",
+    "van-switch": "@vant/weapp/switch/index",
+    "van-field": "@vant/weapp/field/index"
+  }
 }

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

@@ -1,77 +1,77 @@
-@import "../../../common/css/theme.wxss";
-
-.shipper-edit-content {
-  .edit-pick {
-    .default-wrapper {
-      margin-top: 16rpx;
-      height: 112rpx;
-      padding: 0 32rpx;
-      box-sizing: border-box;
-      background: white;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-
-      .ET2 {
-        font-size: 32rpx;
-      }
-
-      .van-switch {
-        .van-switch__node {
-          box-shadow: none;
-        }
-      }
-    }
-  }
-
-  .footerbar {
-    width: 100%;
-    background: #fff;
-    position: fixed;
-    bottom: 0;
-
-    .footerBtn {
-      width: 90%;
-      height: 80rpx;
-      background-color: #105cfb;
-      border-radius: 40rpx;
-      color: #fff;
-      line-height: 80rpx;
-      text-align: center;
-      margin: 16rpx auto;
-    }
-  }
-
-  .footerbar1 {
-    width: 100%;
-    background: #fff;
-    position: fixed;
-    bottom: 0;
-    display: flex;
-    justify-content: left;
-    padding: 16rpx;
-
-    .save-btn {
-      width: 60%;
-      height: 80rpx;
-      background-color: #105cfb;
-      border-radius: 40rpx;
-      color: #fff;
-      line-height: 80rpx;
-      text-align: center;
-      margin-left: 30rpx;
-    }
-
-    .delete-btn {
-      width: 30%;
-      height: 80rpx;
-      background: #fff;
-      border: 2rpx solid #b7b7b7;
-      border-radius: 40rpx;
-      color: #fff;
-      line-height: 80rpx;
-      text-align: center;
-      color: #333;
-    }
-  }
+@import "../../../common/css/theme.wxss";
+
+.shipper-edit-content {
+  .edit-pick {
+    .default-wrapper {
+      margin-top: 16rpx;
+      height: 112rpx;
+      padding: 0 32rpx;
+      box-sizing: border-box;
+      background: white;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+
+      .ET2 {
+        font-size: 32rpx;
+      }
+
+      .van-switch {
+        .van-switch__node {
+          box-shadow: none;
+        }
+      }
+    }
+  }
+
+  .footerbar {
+    width: 100%;
+    background: #fff;
+    position: fixed;
+    bottom: 0;
+
+    .footerBtn {
+      width: 90%;
+      height: 80rpx;
+      background-color: #105cfb;
+      border-radius: 40rpx;
+      color: #fff;
+      line-height: 80rpx;
+      text-align: center;
+      margin: 16rpx auto;
+    }
+  }
+
+  .footerbar1 {
+    width: 100%;
+    background: #fff;
+    position: fixed;
+    bottom: 0;
+    display: flex;
+    justify-content: left;
+    padding: 16rpx;
+
+    .save-btn {
+      width: 60%;
+      height: 80rpx;
+      background-color: #105cfb;
+      border-radius: 40rpx;
+      color: #fff;
+      line-height: 80rpx;
+      text-align: center;
+      margin-left: 30rpx;
+    }
+
+    .delete-btn {
+      width: 30%;
+      height: 80rpx;
+      background: #fff;
+      border: 2rpx solid #b7b7b7;
+      border-radius: 40rpx;
+      color: #fff;
+      line-height: 80rpx;
+      text-align: center;
+      color: #333;
+    }
+  }
 }

package/miniprogram_dist/ConfirmOrder/components/ShipperEdit/index.wxml

@@ -1,20 +1,20 @@
-<!--src/ConfirmOrder/components/ShipperEdit/index.wxml-->
-<view class="shipper-edit-content">
-  <view class="edit-pick">
-    <van-field value="{{ pickupInfo.name }}" label="姓名" placeholder="请填写联系人姓名" maxlength="30" bind:change="changeMsg" data-type="name" input-align="right" />
-    <van-field value="{{ pickupInfo.contact }}" label="手机号" placeholder="请填写联系人手机号" maxlength="11" bind:change="changeMsg" data-type="contact" input-align="right" />
-
-    <!-- 默认收货地址开关组件 -->
-    <view class="default-wrapper">
-      <view class="ET2">设为默认收货地址</view>
-      <van-switch checked="{{ isdefault }}" node-class="{ 'theme-customize-bg': isdefault }" size="24px" bind:change="changeSwitch" />
-    </view>
-  </view>
-  <view class="footerbar" wx:if="{{ shipperType === 1 }}">
-    <view class="footerBtn" bindtap="addPickerInfo">保存并使用</view>
-  </view>
-  <view class="footerbar1" wx:else>
-    <view class="delete-btn" bindtap="delPickerInfo">删除</view>
-    <view class="save-btn" bindtap="addPickerInfo">保存并使用</view>
-  </view>
+<!--src/ConfirmOrder/components/ShipperEdit/index.wxml-->
+<view class="shipper-edit-content">
+  <view class="edit-pick">
+    <van-field value="{{ pickupInfo.name }}" label="姓名" placeholder="请填写联系人姓名" maxlength="30" bind:change="changeMsg" data-type="name" input-align="right" />
+    <van-field value="{{ pickupInfo.contact }}" label="手机号" placeholder="请填写联系人手机号" maxlength="11" bind:change="changeMsg" data-type="contact" input-align="right" />
+
+    <!-- 默认收货地址开关组件 -->
+    <view class="default-wrapper">
+      <view class="ET2">设为默认收货地址</view>
+      <van-switch checked="{{ isdefault }}" node-class="{ 'theme-customize-bg': isdefault }" size="24px" bind:change="changeSwitch" />
+    </view>
+  </view>
+  <view class="footerbar" wx:if="{{ shipperType === 1 }}">
+    <view class="footerBtn" bindtap="addPickerInfo">保存并使用</view>
+  </view>
+  <view class="footerbar1" wx:else>
+    <view class="delete-btn" bindtap="delPickerInfo">删除</view>
+    <view class="save-btn" bindtap="addPickerInfo">保存并使用</view>
+  </view>
 </view>