xiaoe_mp_npm 0.1.13 → 0.1.14

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

@@ -1,233 +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,
-              }
-            })
-          }
-        }
-      });
-    },
-  }
-})
+// 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/src/ConfirmOrder/components/PayBar/index.json

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

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

@@ -1,32 +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;
-      }
-    }
-  }
+.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/src/ConfirmOrder/components/PayBar/index.wxml

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

@@ -1,27 +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;
-}
+.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/src/ConfirmOrder/components/PayDetail/filter.wxs

@@ -1,16 +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
+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
 }