xiaoe_mp_npm 0.2.2-beta1 → 0.2.2-beta2

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

@@ -0,0 +1,61 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: zongxinliu
+ * @Date: 2021-11-16 10:01:18
+ * @LastEditors: zongxinliu
+ * @LastEditTime: 2021-12-08 15:02:35
+ */
+// src/ConfirmOrder/components/LeaveWord/index.js
+Component({
+  options: {
+    styleIsolation: 'shared',
+  },
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    payParams: {
+      type: Object,
+      value: () => {},
+      observer(newData) {
+        this.setData({
+          showValue: newData.remark || ""
+        })
+      }
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    showValue: "", //处理后的留言
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    changeData(event) {
+      if (event.detail.length === 50) {
+        wx.showToast({
+          title: '字数已达上限',
+          icon: "none",
+          duration: 2000
+        })
+      }
+      this.setData({
+        showValue: event.detail
+      })
+      this.triggerEvent("dataChange", {
+        name: "remark",
+        payParams: {
+          remark: this.data.showValue,
+          extend_attr: {
+            leave_message: this.data.showValue
+          }
+        },
+      })
+    },
+  }
+})

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

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

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

@@ -0,0 +1,6 @@
+.leave-word {
+	margin-bottom: 16rpx;
+	.van-cell {
+		line-height:40rpx;
+	}
+}

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

@@ -0,0 +1,11 @@
+<!--src/ConfirmOrder/components/LeaveWord/index.wxml-->
+<view class="MB2 leave-word">
+  <van-field
+    value="{{ showValue }}"
+    maxlength="50"
+    label="留言"
+    placeholder="留言前建议先协商，最多50个字"
+    input-align="right"
+    bind:change="changeData"
+  />
+</view>

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

@@ -0,0 +1,6 @@
+.leave-word {
+  margin-bottom: 16rpx;
+}
+.leave-word .van-cell {
+  line-height: 40rpx;
+}

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

@@ -0,0 +1,50 @@
+// src/ConfirmOrder/components/LimitDiscount/index.js
+import {
+  isEmptyObject
+} from "../../../common/utils/index"
+
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    marketingData: {
+      type: Object,
+      default: () => {},
+      observer(val) {
+        let marketingData = val.marketing_info;
+        if (!isEmptyObject(marketingData)) {
+          if (marketingData?.activity_type === 8 && marketingData.event_has_stock === 0) {
+            return
+          }
+          this.triggerEvent("dataChange", {
+            name: "LimitDiscount",
+            // 秒杀、限时折扣、拼团才传活动id，其余营销活动不传
+            prePayParams: {
+              activity_id: [3, 6, 8].includes(marketingData?.activity_type) ? marketingData.activity_id : '',
+              activity_type: marketingData?.activity_type,
+            },
+            payParams: {
+              activity_id: [3, 6, 8].includes(marketingData?.activity_type) ? marketingData.activity_id : '',
+              activity_type: marketingData?.activity_type,
+            },
+          })
+        }
+      }
+    },
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})

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

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

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

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

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

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

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

@@ -0,0 +1,42 @@
+// src/ConfirmOrder/components/ModeSelect/index.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    activeMode: {
+      type: Number,
+      value: 0,
+      observer(newVal, oldVal) {
+        this.setData({
+          isActive: newVal
+        })
+      }
+    },
+  },
+  options: {
+    styleIsolation: 'shared',
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    isActive: 0
+  },
+  lifetimes: {
+    attached: function () {
+      // 在组件实例进入页面节点树时执行
+    },
+  },
+  created() {
+    
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    onChange(event) {
+      this.triggerEvent("changeMode", event.detail.index, {})
+    }
+  }
+})

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

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

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

@@ -0,0 +1,35 @@
+@import "../../../common/css/theme.wxss";
+
+.mode-select {
+  background: #FFFFFF;
+  padding: 16rpx 0 32rpx 0;
+
+  .van-tabs__wrap {
+    height: 80rpx !important;
+
+    .van-tabs__scroll--card {
+      border: none;
+      margin: 0;
+      width: 100%;
+      padding: 0 32rpx;
+
+      .mode-boxs {
+        width: 384rpx;
+        height: 80rpx;
+        border-radius: 40rpx;
+        background: rgba(245, 245, 245, 1);
+
+        .mode-btn {
+          line-height: 80rpx;
+          border: none;
+          color: #666666;
+          border-radius: 40rpx;
+        }
+
+        .mode-active {
+          color: #FFFFFF;
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,7 @@
+<!--src/ConfirmOrder/components/ModeSelect/index.wxml-->
+<view class="mode-select">
+  <van-tabs type="card" active="{{ isActive }}" bind:change="onChange" nav-class="mode-boxs" tab-class="mode-btn" tab-active-class="theme-customize-bg mode-active">
+    <van-tab title="快递配送"></van-tab>
+    <van-tab title="到店自提"></van-tab>
+  </van-tabs>
+</view>

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

@@ -0,0 +1,44 @@
+/* 主题色 */
+.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;
+}
+.mode-select {
+  background: #FFFFFF;
+  padding: 16rpx 0 32rpx 0;
+}
+.mode-select .van-tabs__wrap {
+  height: 80rpx !important;
+}
+.mode-select .van-tabs__wrap .van-tabs__scroll--card {
+  border: none;
+  margin: 0;
+  width: 100%;
+  padding: 0 32rpx;
+}
+.mode-select .van-tabs__wrap .van-tabs__scroll--card .mode-boxs {
+  width: 384rpx;
+  height: 80rpx;
+  border-radius: 40rpx;
+  background: #f5f5f5;
+}
+.mode-select .van-tabs__wrap .van-tabs__scroll--card .mode-boxs .mode-btn {
+  line-height: 80rpx;
+  border: none;
+  color: #666666;
+  border-radius: 40rpx;
+}
+.mode-select .van-tabs__wrap .van-tabs__scroll--card .mode-boxs .mode-active {
+  color: #FFFFFF;
+}

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

@@ -0,0 +1,233 @@
+// src/ConfirmOrder/components/PayBar/index.js
+import {
+  MEMBER,
+  SPECIAL_COLUMN,
+  BIG_SPECIAL_COLUMN,
+  TRAINING_CAMP,
+} from "../../../common/utils/constants";
+const computedBehavior = require('miniprogram-computed').behavior
+
+Component({
+  behaviors: [computedBehavior],
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    baseInfo: {
+      type: Object,
+      value: () => {},
+    },
+    prePayInfo: {
+      type: Object,
+      value: () => {},
+    },
+    payParams: {
+      type: Object,
+      value: () => {},
+    },
+    checkList: {
+      type: Object,
+      value: () => {},
+    },
+    beforePay: {
+      type: Object,
+      value: () => {},
+    },
+    afterPayCallback: {
+      type: Object,
+      value: () => {},
+    },
+    afterPay: {
+      type: Object,
+      value: () => {
+        return {
+          callBack: null,
+        };
+      },
+    },
+    prePayParamsAsPayParams: {
+      type: Object,
+      value: () => {},
+    },
+    express_type: {
+      type: Number,
+      value: 1,
+    },
+    pickerUserInfo: {
+      type: Object,
+      value: () => {},
+    },
+    addressInfo: {
+      type: Object,
+      value: () => {},
+    },
+    picksiteInfo: {
+      type: Object,
+      value: () => {},
+    },
+    activeMode: {
+      type: Number,
+      value: 0,
+    },
+    aliveInfo:{
+      type: Object,
+      value:{}
+    },
+    sensorReportParams:{
+      type: Object,
+      value:{}
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    afterPayCallbackJumpData: {}, // 支付后回调返回的跳转url
+    payResult: {},
+    checkBefore: true,
+    checkState:true
+  },
+  computed: {
+    allParams(data) {
+      return {
+        ...data.commonPayParams,
+        ...data.prePayParamsAsPayParams,
+        ...data.payParams,
+        pre_get_info: {
+          ...data.prePayParamsAsPayParams,
+        }
+      }
+    },
+    // 公共支付请求参数
+    commonPayParams(data) {
+      let channel_info = `alive_${data.baseInfo?.aliveId}`
+      let spuType = data.baseInfo?.spu_type;
+      let coursePackage = [
+        MEMBER,
+        SPECIAL_COLUMN,
+        BIG_SPECIAL_COLUMN,
+        TRAINING_CAMP,
+      ];
+      let paymentType = 2;
+      if (coursePackage.includes(spuType)) {
+        paymentType = 3;
+      }
+      console.log();
+      return {
+        ...data.pickerUserInfo,
+        express_type: data.express_type,
+        place_id: data.picksiteInfo?.place_id,
+        picker_id: data.pickerUserInfo.id,
+        ...data.addressInfo,
+        ...data.baseInfo,
+        pre_pay_type: data.baseInfo?.pre_pay_type || 1,
+        spu_id: data.baseInfo?.id,
+        // product_id: data.baseInfo?.id,
+        resource_id: data.baseInfo?.resource_id,
+        payment_type: paymentType,
+        sku_id: data.baseInfo?.sku,
+        channel_id: data.baseInfo?.channel_id || "",
+        channel_info: channel_info,
+      }
+    },
+    ratePrice(data) {
+      if (data.activeMode === 1) {
+        return (
+          (data.prePayInfo?.order_price >= 0 &&
+            ((data.prePayInfo?.order_price || 0) / 100).toFixed(2)) ||
+          "--.--"
+        );
+      } else {
+        return (
+          (data.prePayInfo?.rate_price >= 0 &&
+            ((data.prePayInfo?.rate_price || 0) / 100).toFixed(2)) ||
+          "--.--"
+        );
+      }
+    },
+    priceInt(data) {
+      return data.ratePrice.slice(0, -3);
+    },
+    priceFloat(data) {
+      return (data.ratePrice >= 0 && data.ratePrice.slice(-3)) || "";
+    }
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    // 支付成功
+    successCallback(payResult) {
+      this.triggerEvent("successCallback", payResult.detail)
+    },
+    // 支付失败
+    failCallback() {
+      this.triggerEvent("failCallback")
+    },
+    // 支付前参数检查
+    checkBeforePay() {
+      let flag = true;
+      // 提示信息检查
+      console.log("ooooo", this.data.checkList);
+      Object.keys(this.data.checkList).forEach((key) => {
+        if (this.data.checkList[key]) {
+          if (this.data.checkList[key] !== "disabled") {
+            wx.showToast({
+              title: this.data.checkList[key],
+              icon: "none",
+              duration: 20000
+            })
+          }
+          flag = false;
+          return false;
+        }
+      });
+      this.setData({
+        checkBefore: flag
+      })
+    },
+    // 异步支付前校验
+    checkBeforePayAsync() {
+      let callbackPromises = [];
+      const isPromise = (data) => data && data instanceof Promise;
+      // 支付前业务函数校验
+      Object.keys(this.data.beforePay).forEach((key) => {
+        let cbPromise = this.data.beforePay[key];
+        if (isPromise(cbPromise)) {
+          callbackPromises.push(cbPromise);
+        } else if (typeof cbPromise === "function") {
+          let result = cbPromise();
+          if (isPromise(result)) {
+            callbackPromises.push(result);
+          }
+        }
+      });
+      return Promise.all(callbackPromises).then((result = []) => {
+        // 是否所有支付前校验都校验成功
+        return result.every((isResolved) => isResolved);
+      }).then((res)=>{
+        this.setData({
+         checkState:res
+        })
+     });
+    },
+    afterPayCallbacks(payResult) {
+      Object.keys(this.data.afterPayCallback).forEach((key) => {
+        let callback = this.data.afterPayCallback[key];
+        if (callback && typeof callback === "function") {
+          // 执行支付后回调, 可返回支付后跳转url覆盖原先的支付后跳转url
+          let ret = callback(payResult);
+          if (ret && typeof ret === "object") {
+            this.setData({
+              afterPayCallbackJumpData: {
+                ...this.data.afterPayCallbackJumpData,
+                ...ret,
+              }
+            })
+          }
+        }
+      });
+    },
+  }
+})

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

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "PayModule": "../../../PayModule/index/index"
+  }
+}

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

@@ -0,0 +1,32 @@
+.paybar {
+  bottom: 0;
+  background: #fff;
+  box-shadow: 0 0 16rpx 0 rgba(0, 0, 0, 0.08);
+  position: fixed;
+  margin: auto;
+  left: 0;
+  right: 0;
+  z-index: 2;
+
+  .pay-wrapper {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    box-sizing: border-box;
+    padding: 0 40rpx;
+    height: 112rpx;
+
+    .pay-amount {
+      .pay-text {
+        font-weight: 500;
+      }
+
+      .pay-price-float,
+      .pay-price-int,
+      .pay-currency {
+        color: #ff5429;
+        font-weight: 500;
+      }
+    }
+  }
+}

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

@@ -0,0 +1,26 @@
+<!--src/ConfirmOrder/components/PayBar/index.wxml-->
+<view class="paybar">
+  <view class="pay-wrapper">
+    <view class="pay-amount">
+      <span class="pay-text">合计：</span>
+      <span class="pay-currency ET0">¥ </span>
+      <span class="pay-price-int ET3"> {{ priceInt }}</span>
+      <span class="pay-price-float ET0">{{ priceFloat }}</span>
+    </view>
+    <!-- 支付按钮组件 -->
+    <PayModule
+      prePayInfo="{{ prePayInfo }}"
+      payParams="{{ allParams }}"
+      afterPay="{{ afterPay }}"
+      checkBefore="{{ checkBefore }}"
+      checkState="{{checkState}}"
+      aliveInfo="{{ aliveInfo }}"
+      sensorReportParams="{{ sensorReportParams }}"
+      bind:checkBeforePayAsync="checkBeforePayAsync"
+      bind:checkBeforePay="checkBeforePay"
+      bind:afterPayCallbacks="afterPayCallbacks"
+      bind:successCallback="successCallback"
+      bind:failCallback="failCallback"
+    ></PayModule>
+  </view>
+</view>

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

@@ -0,0 +1,27 @@
+.paybar {
+  bottom: 0;
+  background: #fff;
+  box-shadow: 0 0 16rpx 0 rgba(0, 0, 0, 0.08);
+  position: fixed;
+  margin: auto;
+  left: 0;
+  right: 0;
+  z-index: 2;
+}
+.paybar .pay-wrapper {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  box-sizing: border-box;
+  padding: 0 40rpx;
+  height: 112rpx;
+}
+.paybar .pay-wrapper .pay-amount .pay-text {
+  font-weight: 500;
+}
+.paybar .pay-wrapper .pay-amount .pay-price-float,
+.paybar .pay-wrapper .pay-amount .pay-price-int,
+.paybar .pay-wrapper .pay-amount .pay-currency {
+  color: #ff5429;
+  font-weight: 500;
+}

package/miniprogram_dist/ConfirmOrder/components/PayDetail/filter.wxs

@@ -0,0 +1,16 @@
+var symbolFilter = function (value) {
+  return "- " + value
+}
+
+var centToYuan = function (num = 0, useCurrency = 0) {
+  var result = ''
+  useCurrency === 1 ? result = "¥" : ""
+  result += (num / 100).toFixed(2)
+  // let result = `${useCurrency === 1 ? "¥" : ""}${(num / 100).toFixed(2)}`
+  return result
+}
+
+module.exports = {
+  symbolFilter: symbolFilter,
+  centToYuan: centToYuan
+}