xiaoe_mp_npm 0.2.2-beta1 → 0.2.2-beta2

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

@@ -0,0 +1,67 @@
+.address-select-content {
+  position: relative;
+  margin-bottom: 16rpx;
+  background-color: #fff;
+}
+.address-select-content .address-container {
+  padding: 26rpx 32rpx 20rpx 32rpx;
+}
+.address-select-content .address-container .address-bar {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.address-select-content .address-container .address-bar .add-address {
+  display: flex;
+  align-items: center;
+}
+.address-select-content .address-container .address-bar .add-address .address-iocn {
+  width: 32rpx;
+  height: 32rpx;
+  margin-right: 8rpx;
+}
+.address-select-content .address-container .address-bar .add-address .ET2 {
+  font-size: 32rpx;
+}
+.address-select-content .address-container .address-bar .address-wrapper {
+  display: flex column;
+  align-items: flex-start;
+}
+.address-select-content .address-container .address-bar .address-wrapper .address-info {
+  display: flex;
+  align-items: center;
+  font-weight: 600;
+}
+.address-select-content .address-container .address-bar .address-wrapper .address-info text:first-child {
+  display: inline-block;
+  margin-right: 48rpx;
+  max-width: 300rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.address-select-content .address-container .address-bar .address-wrapper .address {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  margin-top: 16rpx;
+  max-width: 614rpx;
+  color: #666;
+}
+.address-select-content .address-container .address-bar .address-wrapper .ET1 {
+  font-size: 28rpx;
+}
+.address-select-content .address-container .address-bar .icon-tiaozhuan {
+  width: 32rpx;
+  height: 32rpx;
+}
+.address-select-content .address-container .address-warning {
+  margin-top: 16rpx;
+  color: #ff4c51;
+}
+.address-select-content .line-img {
+  height: 9rpx;
+  width: 100%;
+  position: absolute;
+  bottom: 0rpx;
+}

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

@@ -0,0 +1,110 @@
+// src/ConfirmOrder/components/ChoosePicker/index.js
+const computedBehavior = require('miniprogram-computed').behavior
+
+Component({
+  behaviors: [computedBehavior],
+  options: {
+    styleIsolation: 'shared',
+  },
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    pickerUserInfo: {
+      type: Object || String,
+      value: () => {},
+      observer(newVal, oldVal) {
+        if (Object.keys(newVal).length > 0) {
+          this.setData({
+            hasData: true
+          })
+        } else {
+          this.setData({
+            hasData: false
+          })
+        }
+        if (this.data.express_type === 2 && !newVal?.picker) {
+          this.triggerEvent('dataChange', {
+            name: 'pickerUserInfo',
+            errMsg: '请填写提货人',
+          });
+        } else {
+          this.triggerEvent('dataChange', {
+            name: 'pickerUserInfo',
+            errMsg: '',
+          });
+        }
+      }
+    },
+    express_type: {
+      type: Number,
+      value: 1,
+    },
+    pickerList: {
+      type: Array,
+      value: () => [],
+    },
+    isShowSelectShipper: {
+      type: Boolean,
+      value: false,
+    },
+    isShowCreateShipper: {
+      type: Boolean,
+      value: false,
+    },
+    backPage: {
+      type: Number,
+      value: 1,
+    },
+    shipperType: {
+      type: Number,
+      value: 1,
+    },
+    express_type: {
+      type: Number,
+      value: 1,
+    },
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    hasData: false,
+  },
+  lifetimes: {
+    attached: function () {
+      if (this.data.express_type === 2 && !this.data.pickerUserInfo?.picker) {
+        console.log(111);
+        this.triggerEvent('dataChange', {
+          name: 'pickerUserInfo',
+          errMsg: '请填写提货人',
+        });
+      }
+    },
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    // 选择提货人
+    selectShipper() {
+      this.triggerEvent('dataChange', {
+        name: 'pickerUserInfo',
+        errMsg: '',
+      });
+      this.triggerEvent("updataData", {
+        isShowSelectShipper: true
+      })
+    },
+    // 新建提货人
+    createShipper() {
+      this.triggerEvent("updataData", {
+        isShowCreateShipper: true,
+        shipperType: 1,
+        backPage: 1,
+        backType: 1
+      })
+    }
+  }
+})

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

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

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

@@ -0,0 +1,21 @@
+.choose-picker-content {
+  margin-bottom: 16rpx;
+
+  .van-cell__value {
+    flex: 3;
+  }
+
+  .right {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+
+    .picker-name {
+      margin-right: 10rpx;
+      max-width: 260rpx;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+  }
+}

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

@@ -0,0 +1,10 @@
+<!--src/ConfirmOrder/components/ChoosePicker/index.wxml-->
+<view class="choose-picker-content">
+  <van-cell title="提货人" is-link>
+    <view class="right" wx:if="{{ hasData }}" bindtap="selectShipper">
+      <view class="picker-name">{{ pickerUserInfo.picker }}</view>
+      <view class="picker-contact">{{ pickerUserInfo.picker_contact }}</view>
+    </view>
+    <view class="right" wx:else bindtap="createShipper">去创建提货人信息</view>
+  </van-cell>
+</view>

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

@@ -0,0 +1,18 @@
+.choose-picker-content {
+  margin-bottom: 16rpx;
+}
+.choose-picker-content .van-cell__value {
+  flex: 3;
+}
+.choose-picker-content .right {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
+}
+.choose-picker-content .right .picker-name {
+  margin-right: 10rpx;
+  max-width: 260rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}