xiaoe_mp_npm 0.1.13 → 0.1.14

package/src/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/src/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>

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

@@ -1,78 +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;
-}
+/* 主题色 */
+.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;
+}

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

@@ -1,78 +1,78 @@
-// src/ConfirmOrder/components/WechatAddress/index.js
-const computedBehavior = require('miniprogram-computed').behavior
-
-Component({
-  behaviors: [computedBehavior],
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-    pageType: {
-      type: String,
-      value: "list",
-    },
-    addressList: {
-      type: Array,
-      value: () => [],
-    },
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-
-  },
-
-  computed: {
-
-  },
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-    // 获取微信收货地址
-    getWechat() {
-      wx.chooseAddress({
-        success: res => {
-          // 微信地址与地址列表匹配，不重复添加
-          res['noCheck'] = true
-          let compareRes = this.compareWechat(res)
-          if (compareRes === "") {
-            this.triggerEvent("createAddress", res)
-          } else {
-            if (this.data.pageType === "list") {
-              this.triggerEvent("chooseAddress", compareRes)
-            } else {
-              wx.showToast({
-                title: '已有相同收货地址',
-                icon: 'none',
-                duration: 2000
-              })
-            }
-          }
-        },
-        fail: err => {
-          console.log(err);
-        }
-      })
-    },
-    // 微信地址与地址列表匹配，不重复添加
-    compareWechat(wechatAddress) {
-      let address = "";
-      this.data.addressList.forEach((ele) => {
-        if (
-          ele.receiver == wechatAddress.userName &&
-          ele.phone == wechatAddress.telNumber &&
-          ele.province == wechatAddress.provinceName &&
-          ele.city == wechatAddress.cityName &&
-          ele.county == wechatAddress.countyName &&
-          ele.detail == wechatAddress.detailInfo
-        ) {
-          address = ele;
-        }
-      });
-      return address;
-    },
-  }
+// src/ConfirmOrder/components/WechatAddress/index.js
+const computedBehavior = require('miniprogram-computed').behavior
+
+Component({
+  behaviors: [computedBehavior],
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    pageType: {
+      type: String,
+      value: "list",
+    },
+    addressList: {
+      type: Array,
+      value: () => [],
+    },
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  computed: {
+
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    // 获取微信收货地址
+    getWechat() {
+      wx.chooseAddress({
+        success: res => {
+          // 微信地址与地址列表匹配，不重复添加
+          res['noCheck'] = true
+          let compareRes = this.compareWechat(res)
+          if (compareRes === "") {
+            this.triggerEvent("createAddress", res)
+          } else {
+            if (this.data.pageType === "list") {
+              this.triggerEvent("chooseAddress", compareRes)
+            } else {
+              wx.showToast({
+                title: '已有相同收货地址',
+                icon: 'none',
+                duration: 2000
+              })
+            }
+          }
+        },
+        fail: err => {
+          console.log(err);
+        }
+      })
+    },
+    // 微信地址与地址列表匹配，不重复添加
+    compareWechat(wechatAddress) {
+      let address = "";
+      this.data.addressList.forEach((ele) => {
+        if (
+          ele.receiver == wechatAddress.userName &&
+          ele.phone == wechatAddress.telNumber &&
+          ele.province == wechatAddress.provinceName &&
+          ele.city == wechatAddress.cityName &&
+          ele.county == wechatAddress.countyName &&
+          ele.detail == wechatAddress.detailInfo
+        ) {
+          address = ele;
+        }
+      });
+      return address;
+    },
+  }
 })

package/src/ConfirmOrder/components/WechatAddress/index.json

@@ -1,4 +1,4 @@
-{
-  "component": true,
-  "usingComponents": {}
+{
+  "component": true,
+  "usingComponents": {}
 }

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

@@ -1,25 +1,25 @@
-.wechat {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  background: white;
-  padding: 32rpx;
-  margin-bottom: 16rpx;
-  box-sizing: border-box;
-
-  .left-title {
-    display: flex;
-    align-items: center;
-
-    .icon-wechat {
-      color: #46bb36;
-      width: 30rpx;
-      height: 30rpx;
-      margin-right: 32rpx;
-    }
-
-    .ET2 {
-      font-size: 32rpx;
-    }
-  }
+.wechat {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background: white;
+  padding: 32rpx;
+  margin-bottom: 16rpx;
+  box-sizing: border-box;
+
+  .left-title {
+    display: flex;
+    align-items: center;
+
+    .icon-wechat {
+      color: #46bb36;
+      width: 30rpx;
+      height: 30rpx;
+      margin-right: 32rpx;
+    }
+
+    .ET2 {
+      font-size: 32rpx;
+    }
+  }
 }

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

@@ -1,9 +1,9 @@
-<!--src/ConfirmOrder/components/WechatAddress/index.wxml-->
-<view class="wechat">
-  <view class="left-title" bindtap="getWechat">
-    <image src="../../../common/assets/images/wx.png" class="icon-wechat"></image>
-    <view class="ET2">获取微信地址</view>
-  </view>
-  <!-- <i class="iconfont icon-zhixiang"></i> -->
-  <!-- <image src="../../../common/assets/images/icon-zhixiang.png" class="img"></image> -->
+<!--src/ConfirmOrder/components/WechatAddress/index.wxml-->
+<view class="wechat">
+  <view class="left-title" bindtap="getWechat">
+    <image src="../../../common/assets/images/wx.png" class="icon-wechat"></image>
+    <view class="ET2">获取微信地址</view>
+  </view>
+  <!-- <i class="iconfont icon-zhixiang"></i> -->
+  <!-- <image src="../../../common/assets/images/icon-zhixiang.png" class="img"></image> -->
 </view>

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

@@ -1,22 +1,22 @@
-.wechat {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  background: white;
-  padding: 32rpx;
-  margin-bottom: 16rpx;
-  box-sizing: border-box;
-}
-.wechat .left-title {
-  display: flex;
-  align-items: center;
-}
-.wechat .left-title .icon-wechat {
-  color: #46bb36;
-  width: 30rpx;
-  height: 30rpx;
-  margin-right: 32rpx;
-}
-.wechat .left-title .ET2 {
-  font-size: 32rpx;
-}
+.wechat {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background: white;
+  padding: 32rpx;
+  margin-bottom: 16rpx;
+  box-sizing: border-box;
+}
+.wechat .left-title {
+  display: flex;
+  align-items: center;
+}
+.wechat .left-title .icon-wechat {
+  color: #46bb36;
+  width: 30rpx;
+  height: 30rpx;
+  margin-right: 32rpx;
+}
+.wechat .left-title .ET2 {
+  font-size: 32rpx;
+}