xiaoe_mp_npm 0.2.2-beta1 → 0.2.2-beta2

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

@@ -0,0 +1,100 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: zongxinliu
+ * @Date: 2021-11-13 15:05:34
+ * @LastEditors: zongxinliu
+ * @LastEditTime: 2021-12-13 14:47:44
+ */
+// src/ConfirmOrder/components/Shipper/index.js
+import {
+  getPickerList
+} from "../../../common/api/confirmOrder"
+
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    pickerUserInfo: {
+      type: Object,
+      value: () => {}
+    },
+    shipperType: {
+      type: Number,
+      value: 1,
+    },
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    pickerList: [],
+    pickerId: 0,
+  },
+  lifetimes: {
+    attached: async function () {
+      this.initPickerIList()
+    },
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    // 获取提货人列表
+    initPickerIList() {
+      wx.showLoading({
+        mask: true,
+        title: '加载中'
+      })
+      getPickerList().then(res => {
+          if (res.data.code === 0) {
+            this.setData({
+              pickerList: res.data.data.list
+            })
+          }
+        }).catch((err) => console.log(err))
+        .finally(() => {
+          wx.hideLoading()
+        })
+    },
+    // 新建提货人
+    createShipper() {
+      // 一定要分开写，不然有问题
+      this.triggerEvent("updataData", {
+        isShowSelectShipper: false,
+        shipperType: 1,
+        backPage: 1,
+      })
+      this.triggerEvent("updataData", {
+        isShowCreateShipper: true,
+      })
+    },
+    // 编辑提货人
+    editShipper(e) {
+      // 一定要分开写，不然有问题
+      let item = e.currentTarget.dataset.item
+      this.triggerEvent("updataData", {
+        shipperType: 2,
+        updateShipperInfo: item,
+        isShowSelectShipper: false,
+        backPage: 1,
+      })
+      this.triggerEvent("updataData", {
+        isShowCreateShipper: true,
+      })
+    },
+    //选择一个提货人，信息回传到页面
+    chooseOnePicker(e) {
+      let item = e.currentTarget.dataset.item
+      this.setData({
+        pickerId: item.id
+      })
+      this.triggerEvent("updataData", {
+        pickerUserInfo: item,
+        isShowSelectShipper: false,
+      })
+    },
+  }
+})

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

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-checkbox": "@vant/weapp/checkbox/index"
+  }
+}

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

@@ -0,0 +1,70 @@
+@import "../../../common/css/theme.wxss";
+
+.shipper-content {
+  background: #ffffff;
+  padding: 0 32rpx;
+
+  .picker-List {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    padding: 28rpx 0;
+    border-bottom: 2rpx solid #ece4e452;
+    position: relative;
+
+    .picker-name {
+      width: 240rpx;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+
+    .picker-phone {
+      margin-left: 10rpx;
+    }
+
+    .picker-default {
+      height: 32rpx;
+      line-height: 32rpx;
+      background: #ffebeb;
+      border-radius: 4rpx;
+      font-size: 20rpx;
+      color: #1472FF;
+      margin-left: 32rpx;
+      padding: 0 16rpx
+    }
+
+    .edite {
+      width: 32rpx;
+      height: 32rpx;
+      position: absolute;
+      right: 0;
+      top: 33rpx;
+    }
+  }
+
+  .footer-bar {
+    width: 100%;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background-color: #fff;
+
+    .onknow {
+      width: 90%;
+      height: 80rpx;
+      line-height: 80rpx;
+      text-align: center;
+      color: #fff;
+      background: #105cfb;
+      border-radius: 40rpx;
+      margin: 20rpx auto;
+    }
+  }
+}
+
+.hen {
+  height: 160rpx;
+  width: 100%;
+}

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

@@ -0,0 +1,16 @@
+<!--src/ConfirmOrder/components/Shipper/index.wxml-->
+<view class="shipper-content">
+  <view class="picker-List" wx:for="{{ pickerList }}" wx:key="key" bindtap="chooseOnePicker" data-item="{{ item }}">
+    <van-checkbox value="{{ pickerId === item.id || pickerUserInfo.id === item.id }}" />
+    <view class="picker-name">{{ item.picker }}</view>
+    <view class="picker-phone">{{ item.picker_contact }}</view>
+    <view class="picker-default" wx:if="{{ item.is_default === 1 }}">默认</view>
+    <image src="../../../common/assets/images/update.png" class="edite" catchtap="editShipper" data-item="{{ item }}"></image>
+  </view>
+  <view class="footer-bar">
+    <view class="onknow theme-customize-bg" bindtap="createShipper">
+      新增提货人
+    </view>
+  </view>
+</view>
+<view class="hen"></view>

package/miniprogram_dist/ConfirmOrder/components/Shipper/index.wxss

@@ -0,0 +1,76 @@
+/* 主题色 */
+.theme-customize-bg {
+  background-color: #1472FF !important;
+}
+.theme-customize-border {
+  border-color: #1472FF !important;
+}
+.theme-customize-font {
+  color: #1472FF !important;
+}
+.theme-customize-light-new {
+  background-color: #9db8f1 !important;
+}
+.theme-customize-bg-light {
+  background-color: #9db8f1 !important;
+}
+.shipper-content {
+  background: #ffffff;
+  padding: 0 32rpx;
+}
+.shipper-content .picker-List {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  padding: 28rpx 0;
+  border-bottom: 2rpx solid #ece4e452;
+  position: relative;
+}
+.shipper-content .picker-List .picker-name {
+  width: 240rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.shipper-content .picker-List .picker-phone {
+  margin-left: 10rpx;
+}
+.shipper-content .picker-List .picker-default {
+  height: 32rpx;
+  line-height: 32rpx;
+  background: #ffebeb;
+  border-radius: 4rpx;
+  font-size: 20rpx;
+  color: #1472FF;
+  margin-left: 32rpx;
+  padding: 0 16rpx;
+}
+.shipper-content .picker-List .edite {
+  width: 32rpx;
+  height: 32rpx;
+  position: absolute;
+  right: 0;
+  top: 33rpx;
+}
+.shipper-content .footer-bar {
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background-color: #fff;
+}
+.shipper-content .footer-bar .onknow {
+  width: 90%;
+  height: 80rpx;
+  line-height: 80rpx;
+  text-align: center;
+  color: #fff;
+  background: #105cfb;
+  border-radius: 40rpx;
+  margin: 20rpx auto;
+}
+.hen {
+  height: 160rpx;
+  width: 100%;
+}

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

@@ -0,0 +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
+      })
+    },
+  }
+})

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

@@ -0,0 +1,8 @@
+{
+  "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

@@ -0,0 +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;
+    }
+  }
+}

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

@@ -0,0 +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>
+</view>

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

@@ -0,0 +1,78 @@
+/* 主题色 */
+.theme-customize-bg {
+  background-color: #1472FF !important;
+}
+.theme-customize-border {
+  border-color: #1472FF !important;
+}
+.theme-customize-font {
+  color: #1472FF !important;
+}
+.theme-customize-light-new {
+  background-color: #9db8f1 !important;
+}
+.theme-customize-bg-light {
+  background-color: #9db8f1 !important;
+}
+.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;
+}
+.shipper-edit-content .edit-pick .default-wrapper .ET2 {
+  font-size: 32rpx;
+}
+.shipper-edit-content .edit-pick .default-wrapper .van-switch .van-switch__node {
+  box-shadow: none;
+}
+.shipper-edit-content .footerbar {
+  width: 100%;
+  background: #fff;
+  position: fixed;
+  bottom: 0;
+}
+.shipper-edit-content .footerbar .footerBtn {
+  width: 90%;
+  height: 80rpx;
+  background-color: #105cfb;
+  border-radius: 40rpx;
+  color: #fff;
+  line-height: 80rpx;
+  text-align: center;
+  margin: 16rpx auto;
+}
+.shipper-edit-content .footerbar1 {
+  width: 100%;
+  background: #fff;
+  position: fixed;
+  bottom: 0;
+  display: flex;
+  justify-content: left;
+  padding: 16rpx;
+}
+.shipper-edit-content .footerbar1 .save-btn {
+  width: 60%;
+  height: 80rpx;
+  background-color: #105cfb;
+  border-radius: 40rpx;
+  color: #fff;
+  line-height: 80rpx;
+  text-align: center;
+  margin-left: 30rpx;
+}
+.shipper-edit-content .footerbar1 .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;
+}