xiaoe_mp_npm 0.2.2-beta1 → 0.2.2-beta2

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

@@ -0,0 +1,68 @@
+// src/ConfirmOrder/components/PayDetail/index.js
+import { ENTITY_GOODS } from "../../../common/utils/constants";
+const computedBehavior = require('miniprogram-computed').behavior
+
+Component({
+  behaviors: [computedBehavior],
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    prePayInfo: {
+      type: Object,
+      value: () => {}
+    },
+    activeMode: {
+      type: Number,
+      value: 1,
+    },
+    baseInfo: {
+      type: Object,
+      value: () => {},
+    },
+    isCart: {
+      type: Number,
+      value: 0,
+    },
+    cartGoodsList: {
+      type: Array,
+      value: () => [],
+    },
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+  computed: {
+    showFreight(data) {
+      if (data.activeMode === 1) {
+        return false;
+      } else {
+        return (
+          data.baseInfo?.spu_type === ENTITY_GOODS ||
+          (data.isCart &&
+            data.cartGoodsList.length && data.cartGoodsList.some((goodsInfo) => {
+              return goodsInfo.spu_type === ENTITY_GOODS;
+            }))
+        );
+      }
+    },
+    goodsCount(data) {
+      return data.cartGoodsList.length && data.cartGoodsList.reduce((count, goodsInfo) => {
+        return count + goodsInfo.count;
+      }, 0);
+    },
+    allPriceText(data) {
+      return data.isCart ? `小计（共${data.goodsCount}件）` : "商品金额";
+    },
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})

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

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

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

@@ -0,0 +1,16 @@
+.price-wrapper {
+  padding: 0 30rpx;
+  background: #fff;
+  font-size: 28rpx;
+
+  .price-item {
+    padding: 28rpx 0;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  .price-item:not(:last-child) {
+    border-bottom: 1rpx solid rgba(240, 240, 240, 0.6);
+  }
+}

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

@@ -0,0 +1,18 @@
+<!--src/ConfirmOrder/components/PayDetail/index.wxml-->
+<wxs src="./filter.wxs" module="tools" />
+<view class="price-wrapper">
+  <view class="price-item">
+    <view class="item-left">{{ allPriceText }}</view>
+    <view class="item-right">{{  tools.centToYuan(prePayInfo.goods_price, 1) }}</view>
+  </view>
+  <view class="price-item" wx:if="{{ showFreight }}">
+    <view class="item-left">运费</view>
+    <view class="item-right">{{ tools.centToYuan(prePayInfo.freight, 1) }}</view>
+  </view>
+  <view class="price-item" wx:if="{{ prePayInfo.discount_price }}">
+    <view class="item-left">优惠合计</view>
+    <view class="item-right">
+    {{ tools.symbolFilter(tools.centToYuan(prePayInfo.discount_price, 1)) }}
+    </view>
+  </view>
+</view>

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

@@ -0,0 +1,14 @@
+.price-wrapper {
+  padding: 0 30rpx;
+  background: #fff;
+  font-size: 28rpx;
+}
+.price-wrapper .price-item {
+  padding: 28rpx 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.price-wrapper .price-item:not(:last-child) {
+  border-bottom: 1rpx solid rgba(240, 240, 240, 0.6);
+}

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

@@ -0,0 +1,23 @@
+// src/ConfirmOrder/components/PayGifts/index.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})

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

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

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

@@ -0,0 +1,2 @@
+<!--src/ConfirmOrder/components/PayGifts/index.wxml-->
+<text>src/ConfirmOrder/components/PayGifts/index.wxml</text>

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

@@ -0,0 +1 @@
+/* src/ConfirmOrder/components/PayGifts/index.wxss */

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

@@ -0,0 +1,80 @@
+// src/ConfirmOrder/components/PickupSelect/index.js
+const computedBehavior = require('miniprogram-computed').behavior
+
+Component({
+  behaviors: [computedBehavior],
+  options: {
+    styleIsolation: 'shared',
+  },
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    picksiteInfo: {
+      type: Object,
+      value: () => {},
+    },
+    express_type: {
+      type: Number,
+      value: 1,
+    },
+    isShowPoint: {
+      type: Boolean,
+      value: false,
+    },
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+  lifetimes: {
+    attached: async function () {
+      // 在组件实例进入页面节点树时执行
+      if (this.data.express_type === 2 && !this.data.picksiteInfo?.place_name) {
+        this.triggerEvent('dataChange', {
+          name: 'address',
+          errMsg: '请选择自提点',
+        });
+      }
+    },
+  },
+  computed: {
+    setPlace_name(data) {
+      if (!data.picksiteInfo?.place_name) {
+        return '选择提货地址';
+      } else {
+        return data.picksiteInfo?.place_name;
+      }
+    },
+    setPlace_area(data) {
+      if (!data.picksiteInfo?.province) {
+        return '';
+      } else {
+        return (
+          data.picksiteInfo?.province +
+          data.picksiteInfo?.city +
+          data.picksiteInfo?.county +
+          data.picksiteInfo?.detail
+        );
+      }
+    },
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    // 显示提货点选择组件
+    clickCell() {
+      this.triggerEvent('dataChange', {
+        name: 'address',
+        errMsg: '',
+      });
+      this.triggerEvent("updataData", {
+        isShowPoint: true
+      })
+    }
+  }
+})

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

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

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

@@ -0,0 +1,24 @@
+.pickup-select-content {
+  .van-cell__value {
+    flex: 3;
+  }
+  .right {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+    .custom-title {
+      max-width: 450rpx;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      margin-left: 16rpx;
+    }
+    .custom-site {
+      max-width: 450rpx;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      margin-left: 16rpx;
+    }
+  }
+}

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

@@ -0,0 +1,14 @@
+<!--src/ConfirmOrder/components/PickupSelect/index.wxml-->
+<view class="pickup-select-content">
+  <van-cell-group border="{{ false }}">
+    <van-cell is-link bindtap="clickCell">
+      <view slot="title">
+        <van-tag color="#EBF1FF" text-color="#105CFB">自提</van-tag>
+      </view>
+      <view class="right">
+        <view class="custom-title">{{ setPlace_name }}</view>
+        <view class="custom-site">{{ setPlace_area }}</view>
+      </view>
+    </van-cell>
+  </van-cell-group>
+</view>

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

@@ -0,0 +1,22 @@
+.pickup-select-content .van-cell__value {
+  flex: 3;
+}
+.pickup-select-content .right {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+}
+.pickup-select-content .right .custom-title {
+  max-width: 450rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  margin-left: 16rpx;
+}
+.pickup-select-content .right .custom-site {
+  max-width: 450rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  margin-left: 16rpx;
+}

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

@@ -0,0 +1,147 @@
+// src/ConfirmOrder/components/SelectSite/index.js
+import {
+  getSelfServiceList
+} from "../../../common/api/confirmOrder"
+
+Component({
+  options: {
+    styleIsolation: 'shared',
+  },
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    picksiteInfo: {
+      type: Object,
+      value: () => {},
+    },
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    refreshing: false,
+    finishedTxt: '加载中',
+    finished: false,
+    searchValue: "",
+    pickupSiteList: [],
+    page_size: 10,
+    page_index: 1,
+  },
+  lifetimes: {
+    attached: function () {
+      this.initData();
+    },
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    // 下拉刷新
+    onLoad() {
+      if (this.data.refreshing) {
+        return
+      }
+      console.log('下拉刷新');
+      this.setData({
+        page_index: 1,
+        finished: false,
+        finishedTxt: "加载中"
+      })
+      this.initData();
+    },
+    // 上拉加载
+    onScrolltolower() {
+      console.log('上拉加载');
+      this.setData({
+        finishedTxt: this.data.finished ? "没有更多了" : "加载中"
+      })
+      if (this.data.finished) {
+        return
+      }
+      this.setData({
+        page_index: this.data.page_index + 1,
+      })
+      this.initData();
+    },
+    onChangeSelect(e) {
+      let item = e.currentTarget.dataset.item
+      this.triggerEvent("updataData", {
+        picksiteInfo: item,
+        isShowPoint: false
+      })
+    },
+    onChange(e) {
+      this.setData({
+        searchValue: e.detail,
+      });
+    },
+    onSearch() {
+      this.initData()
+    },
+    initData() {
+      wx.showLoading({
+        mask: true,
+        title: '加载中'
+      })
+      let params = {
+        keyword: this.data.searchValue,
+        page_size: this.data.page_size,
+        page_index: this.data.page_index,
+      }
+      getSelfServiceList(params).then(res => {
+          if (res.data.code === 0) {
+            this.getWeekAndTime(res.data.data.list)
+            if (res.data.data.list.length === 0 || res.data.data.list.length < this.data.page_size) {
+              this.setData({
+                finished: true,
+                finishedTxt: '没有更多了'
+              })
+            } else {
+              this.setData({
+                finished: true,
+                finishedTxt: '加载完成'
+              })
+            }
+            if (this.data.page_index > 1) {
+              let data = [];
+              res.data.data.list.length ? data = this.data.pickupSiteList.push(res.data.data.list) : data = this.data.pickupSiteList
+              console.log(data);
+              this.setData({
+                pickupSiteList: data
+              })
+            } else {
+              this.setData({
+                pickupSiteList: res.data.data.list
+              })
+            }
+          }
+        }).catch((err) => console.log(err))
+        .finally(() => {
+          this.setData({
+            refreshing: false
+          })
+          wx.hideLoading()
+        })
+    },
+    getWeekAndTime(data) {
+      data.forEach((item) => {
+        // 营业时间---星期几处理
+        let operating_cycle = [];
+        item.operating_cycle.forEach((el) => {
+          if (el.select_state === "1") {
+            operating_cycle.push(el.title);
+          }
+        });
+        item.week = operating_cycle.join("、");
+        // 营业时间---时间段处理
+        item.time = item.business_hours
+          .map(
+            (item) => `${item.start_business_hours}~${item.end_business_hours}`
+          )
+          .join("、");
+      });
+    },
+  }
+})

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

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

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

@@ -0,0 +1,96 @@
+.select-site-content {
+  height: 100%;
+
+  .no-dates {
+    height: calc(100% - 204rpx);
+    position: relative;
+
+    .search-bg {
+      position: absolute;
+      top: 0;
+      right: 0;
+      bottom: 0;
+      left: 0;
+      margin: auto;
+      width: 144rpx;
+      height: 144rpx;
+    }
+
+    .bg-titles {
+      position: absolute;
+      top: 60%;
+      left: 38%;
+      color: #9e9e9e;
+    }
+  }
+
+  .site-list {
+    margin-top: 16rpx;
+    background-color: #ffffff;
+    height: 100%;
+
+    .cell-info {
+      padding: 32rpx 0;
+      width: calc(100% - 64rpx);
+      margin-left: 32rpx;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+
+      .cell-msg {
+        margin-left: 32rpx;
+        flex: 1;
+
+        .cell-name {
+          font-size: 28rpx;
+          font-weight: 500;
+          margin-bottom: 16rpx;
+          display: -webkit-box;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          word-break: break-all;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 1;
+        }
+
+        .cell-pu {
+          color: rgba(153, 153, 153, 1);
+          font-size: 24rpx;
+
+          .cell-left {
+            width: 120rpx;
+            font-weight: 500;
+            text-align: left;
+          }
+
+          .cell-right {
+            flex: 1;
+          }
+        }
+
+        .cell-time {
+          display: flex;
+          flex-direction: row;
+          margin-bottom: 16rpx;
+        }
+
+        .cell-area {
+          display: flex;
+          flex-direction: row;
+        }
+      }
+    }
+
+    .cell-info:not(:last-child) {
+      border-bottom: 2rpx solid #ece4e452;
+    }
+
+    .finished-text {
+      display: flex;
+      justify-content: center;
+      color: #999;
+      font-size: 28rpx;
+      padding: 20rpx 0;
+    }
+  }
+}

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

@@ -0,0 +1,46 @@
+<!--src/ConfirmOrder/components/SelectSite/index.wxml-->
+<view class="select-site-content">
+  <!-- 搜索 -->
+  <van-search 
+    value="{{ searchValue }}" 
+    placeholder="搜索提货点"
+    shape="round"
+    clearable="{{ false }}"
+    bind:change="onChange"
+    bind:search="onSearch"
+  />
+  <view wx:if="{{ pickupSiteList.length === 0 }}" class="no-dates">
+    <image src="../../../common/assets/images/search-bg.png" class="search-bg"></image>
+    <view class="bg-titles">暂无搜索结果</view>
+  </view>
+  <scroll-view
+    wx:if="{{ pickupSiteList.length > 0 }}" 
+    class="site-list"
+    scroll-y="true"
+    refresher-enabled="{{ true }}"
+    refresher-triggered="{{ refreshing }}"
+    bindscrolltolower="onScrolltolower"
+    bindrefresherrefresh="onLoad"
+  >
+  <view class="cell-info" wx:for="{{ pickupSiteList }}" wx:for-item="item" wx:key="index" bindtap="onChangeSelect" data-item="{{ item }}">
+    <van-checkbox />
+    <view class="cell-msg">
+      <view class="cell-name">{{ item.place_name }}</view>
+      <view class="cell-time cell-pu">
+        <view class="cell-left">营业时间：</view>
+        <view class="cell-right">
+          <view>{{ item.week }}</view>
+          <view>{{ item.time }}</view>
+        </view>
+      </view>
+      <view class="cell-area cell-pu">
+        <view class="cell-left">自提地点：</view>
+        <view class="cell-right">
+          {{ item.province + item.city + item.county + item.detail }}
+        </view>
+      </view>
+    </view>
+  </view>
+  <view class="finished-text">{{ finishedTxt }}</view>
+  </scroll-view>
+</view>

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

@@ -0,0 +1,82 @@
+.select-site-content {
+  height: 100%;
+}
+.select-site-content .no-dates {
+  height: calc(100% - 204rpx);
+  position: relative;
+}
+.select-site-content .no-dates .search-bg {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  margin: auto;
+  width: 144rpx;
+  height: 144rpx;
+}
+.select-site-content .no-dates .bg-titles {
+  position: absolute;
+  top: 60%;
+  left: 38%;
+  color: #9e9e9e;
+}
+.select-site-content .site-list {
+  margin-top: 16rpx;
+  background-color: #ffffff;
+  height: 100%;
+}
+.select-site-content .site-list .cell-info {
+  padding: 32rpx 0;
+  width: calc(100% - 64rpx);
+  margin-left: 32rpx;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+.select-site-content .site-list .cell-info .cell-msg {
+  margin-left: 32rpx;
+  flex: 1;
+}
+.select-site-content .site-list .cell-info .cell-msg .cell-name {
+  font-size: 28rpx;
+  font-weight: 500;
+  margin-bottom: 16rpx;
+  display: -webkit-box;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  word-break: break-all;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+}
+.select-site-content .site-list .cell-info .cell-msg .cell-pu {
+  color: #999999;
+  font-size: 24rpx;
+}
+.select-site-content .site-list .cell-info .cell-msg .cell-pu .cell-left {
+  width: 120rpx;
+  font-weight: 500;
+  text-align: left;
+}
+.select-site-content .site-list .cell-info .cell-msg .cell-pu .cell-right {
+  flex: 1;
+}
+.select-site-content .site-list .cell-info .cell-msg .cell-time {
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 16rpx;
+}
+.select-site-content .site-list .cell-info .cell-msg .cell-area {
+  display: flex;
+  flex-direction: row;
+}
+.select-site-content .site-list .cell-info:not(:last-child) {
+  border-bottom: 2rpx solid #ece4e452;
+}
+.select-site-content .site-list .finished-text {
+  display: flex;
+  justify-content: center;
+  color: #999;
+  font-size: 28rpx;
+  padding: 20rpx 0;
+}