xiaoe_mp_npm 1.1.21 → 1.1.22-test02

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

@@ -1,67 +1,67 @@
-.address-select-content {
-  position: relative;
-  margin-bottom: 2.13vmin;
-  background-color: #fff;
-}
-.address-select-content .address-container {
-  padding: 3.47vmin 4.27vmin 2.67vmin 4.27vmin;
-}
-.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: 4.27vmin;
-  height: 4.27vmin;
-  margin-right: 1.07vmin;
-}
-.address-select-content .address-container .address-bar .add-address .ET2 {
-  font-size: 4.27vmin;
-}
-.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: 6.4vmin;
-  max-width: 40vmin;
-  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: 2.13vmin;
-  max-width: 81.87vmin;
-  color: #666;
-}
-.address-select-content .address-container .address-bar .address-wrapper .ET1 {
-  font-size: 3.73vmin;
-}
-.address-select-content .address-container .address-bar .icon-tiaozhuan {
-  width: 4.27vmin;
-  height: 4.27vmin;
-}
-.address-select-content .address-container .address-warning {
-  margin-top: 2.13vmin;
-  color: #ff4c51;
-}
-.address-select-content .line-img {
-  height: 1.2vmin;
-  width: 100%;
-  position: absolute;
-  bottom: 0vmin;
-}
+.address-select-content {
+  position: relative;
+  margin-bottom: 2.13vmin;
+  background-color: #fff;
+}
+.address-select-content .address-container {
+  padding: 3.47vmin 4.27vmin 2.67vmin 4.27vmin;
+}
+.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: 4.27vmin;
+  height: 4.27vmin;
+  margin-right: 1.07vmin;
+}
+.address-select-content .address-container .address-bar .add-address .ET2 {
+  font-size: 4.27vmin;
+}
+.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: 6.4vmin;
+  max-width: 40vmin;
+  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: 2.13vmin;
+  max-width: 81.87vmin;
+  color: #666;
+}
+.address-select-content .address-container .address-bar .address-wrapper .ET1 {
+  font-size: 3.73vmin;
+}
+.address-select-content .address-container .address-bar .icon-tiaozhuan {
+  width: 4.27vmin;
+  height: 4.27vmin;
+}
+.address-select-content .address-container .address-warning {
+  margin-top: 2.13vmin;
+  color: #ff4c51;
+}
+.address-select-content .line-img {
+  height: 1.2vmin;
+  width: 100%;
+  position: absolute;
+  bottom: 0vmin;
+}

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

@@ -1,116 +1,116 @@
-// 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) {
-          if (newVal.picker && newVal.picker_contact){
-            this.setData({
-              hasData: true
-            })
-          } else {
-            this.setData({
-              hasData: false
-            })
-          }
-        } 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
-      })
-    }
-  }
+// 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) {
+          if (newVal.picker && newVal.picker_contact){
+            this.setData({
+              hasData: true
+            })
+          } else {
+            this.setData({
+              hasData: false
+            })
+          }
+        } 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/src/ConfirmOrder/components/ChoosePicker/index.json

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

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

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

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

@@ -1,10 +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>
+<!--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/src/ConfirmOrder/components/ChoosePicker/index.wxss

@@ -1,18 +1,18 @@
-.choose-picker-content {
-  margin-bottom: 2.13vmin;
-}
-.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: 1.33vmin;
-  max-width: 34.67vmin;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
+.choose-picker-content {
+  margin-bottom: 2.13vmin;
+}
+.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: 1.33vmin;
+  max-width: 34.67vmin;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}