xiaoe_mp_npm 0.1.13 → 0.1.14

package/src/PayModule/button/index.less

@@ -1,16 +1,16 @@
-@import "../../common/css/theme.wxss";
-
-.pay-btn{
-    .btn-default{
-        width: 240rpx;
-        height: 80rpx;
-        line-height: 80rpx;
-        font-size: 32rpx;
-        border-radius: 40rpx;
-        background-color: #105cfb;
-        color: #ffffff;
-    }
-    .invalidBtn{
-        opacity: 0.2;
-    }
-}
+@import "../../common/css/theme.wxss";
+
+.pay-btn{
+    .btn-default{
+        width: 240rpx;
+        height: 80rpx;
+        line-height: 80rpx;
+        font-size: 32rpx;
+        border-radius: 40rpx;
+        background-color: #105cfb;
+        color: #ffffff;
+    }
+    .invalidBtn{
+        opacity: 0.2;
+    }
+}

package/src/PayModule/button/index.wxml

@@ -1,8 +1,8 @@
-<!--src/payModule/index.wxml-->
-<view class="pay-btn">
-    <button
-        class="theme-customize-bg  btn-default {{invalidBtn ? 'invalidBtn' :''}}"
-        style="{{Styles}}"
-        bindtap="goPay"
-        >{{ btnTxt }}</button>
+<!--src/payModule/index.wxml-->
+<view class="pay-btn">
+    <button
+        class="theme-customize-bg  btn-default {{invalidBtn ? 'invalidBtn' :''}}"
+        style="{{Styles}}"
+        bindtap="goPay"
+        >{{ btnTxt }}</button>
 </view>

package/src/PayModule/button/index.wxss

@@ -1,28 +1,28 @@
-/* 主题色 */
-.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;
-}
-.pay-btn .btn-default {
-  width: 240rpx;
-  height: 80rpx;
-  line-height: 80rpx;
-  font-size: 32rpx;
-  border-radius: 40rpx;
-  background-color: #105cfb;
-  color: #ffffff;
-}
-.pay-btn .invalidBtn {
-  opacity: 0.2;
-}
+/* 主题色 */
+.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;
+}
+.pay-btn .btn-default {
+  width: 240rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+  font-size: 32rpx;
+  border-radius: 40rpx;
+  background-color: #105cfb;
+  color: #ffffff;
+}
+.pay-btn .invalidBtn {
+  opacity: 0.2;
+}

package/src/PayModule/index/index.js

@@ -1,253 +1,253 @@
-// src/payModule/index/index.js
-import {debounce,isFunction} from "../../common/utils/index"
-import api from "../../common/api/pay"
-import { sensorLog } from "live-mp-tools";
-Component({
-    /**
-     * 组件的属性列表
-     */
-    properties: {
-        //按钮默认文案
-         btnTxt:{
-            type:String,
-            value:'确认支付'
-        },
-        //业务侧样式
-        Styles:{
-            type:String,
-            value:""
-        },
-        //是否禁止支付
-        invalidBtn:{
-            type:Boolean,
-            value:false
-        },
-         //支付前支付参数
-         prePayInfo:{
-            type:Object,
-            value:{}
-        },
-        //异步操作校验
-        checkState:{
-            type:Boolean,
-            value:true
-        },
-        // //业务侧校验结果
-        checkBefore:{
-            type:Boolean,
-            value:true
-        },
-        // //支付后处理各个业务侧的回调
-
-        //支付参数
-        payParams:{
-            type:Object,
-            value:{}
-        },
-        //支付后的参数
-        afterPay: {
-            type: Object,
-            value: () => {
-                return {
-                    callBack: null,
-                };
-            },
-        },
-        //埋点数据
-        aliveInfo:{
-            type: Object,
-            value:{}
-        },
-        sensorReportParams:{
-            type: Object,
-            value:{}
-        }
-    },
-
-    /**
-     * 组件的初始数据
-     */
-    data: {
-        showWechatLoading:false,
-        payResult:{} //支付信息
-    },
-
-    /**
-     * 组件的方法列表
-     */
-    methods: {
-        goPay:debounce(function ()  {
-          
-            // 业务侧支付前参数检查 checkBeforePay  
-            this.triggerEvent('checkBeforePay')
-            if(!this.data.checkBefore){
-                return false
-            }
-            //异步批价校验
-            this.triggerEvent('checkBeforePayAsync')
-            if (this.data.checkState) {
-                this.submit();
-            }
-        }, 3000,true),
-        sensorLogPay:function(result){
-            let { aliveInfo, sensorReportParams, payParams } = this.properties
-            sensorLog.sensors.track('click_butt',{
-                page_id:'e_alive#mini#first#alive_room',
-                page_name:'直播间页面',
-                l_program: '鹅直播',
-                page_path: '鹅直播#小程序#首页#直播间页面',
-                page_button: "提交订单",
-                client: "小程序",
-                order_id:result.order_id ? result.order_id :'',
-                goods_id: payParams.resource_id ? payParams.resource_id :'',
-                app_id: aliveInfo.app_id,
-                c_user_id: aliveInfo.user_id,
-                union_id: wx.getStorageSync('userInfo').universal_union_id,
-                current_role: sensorReportParams.current_role ? sensorReportParams.current_role :'',
-                resource_id: aliveInfo.alive_id,
-                type: sensorReportParams.type ? sensorReportParams.type :'',
-                cmm1: sensorReportParams.alive_type ? sensorReportParams.alive_type :'',
-                cmm2: sensorReportParams.version_type ? sensorReportParams.version_type : '',
-                comm2: sensorReportParams.pay_type ? sensorReportParams.pay_type :''
-              })
-        },
-        submit:function(){
-            // 0元购专属loading
-            if (this.data.prePayInfo?.rate_price === 0) {
-                console.log('0元支付')
-                this.setData({
-                    showWechatLoading:true
-                })
-            } else {
-                console.log('非0元支付')
-                wx.showLoading({
-                    title: '加载中',
-                })
-            }
-          
-            this.pay({
-                ...this.data.payParams
-            }).then((res) => {
-                wx.hideLoading()
-                //埋点
-                this.sensorLogPay(res.data.data)
-                if (res.data && res.data.code === 0) {
-                     //支付后处理各个业务侧的回调
-                     this.setData({
-                        payResult : res.data.data
-                     })
-                    this.triggerEvent('checkBeforePayAsync',res.data.data)
-                    //处理支付
-                    this.handlePayResult(res.data.data);
-                }else{
-                    wx.showToast({
-                        title: res.data.msg,
-                        icon: 'none',
-                        duration: 2000
-                    })
-                }
-            })
-        },
-        //调支付接口
-        pay(params){
-            console.log('params',params)
-            return api.pay(params).then(res => {
-                this.setData({
-                    showWechatLoading:false
-                })
-                if (res.data.code !== 0) {
-                    wx.showToast({
-                        title: res.data.msg,
-                        icon: 'none',
-                        duration: 2000
-                      })
-                }
-                return res;
-            }).catch(err => {
-                this.setData({
-                    showWechatLoading:false
-                })
-            });
-        },
-        //处理支付结果
-        handlePayResult(result){
-            if (result.pay_state === "SUCCESS") {
-                this.payComplete(result);
-                return;
-            }else{
-                this.miniProPay(result);
-            }
-        },
-        miniProPay(payConfig){
-            let that =this
-            wx.requestPayment({
-                timeStamp: payConfig.timeStamp,
-                nonceStr: payConfig.nonceStr,
-                package: payConfig.package,
-                signType: payConfig.signType,
-                paySign: payConfig.paySign,
-                success (res) {
-                    // if (res.errMsg == "requestPayment:ok"){
-                    //     that.payComplete()
-                    // }
-                },
-                fail (res) {
-                    // that.payFail()
-                },
-                complete(res){
-                    that.queryOrderState({
-                        order_id: that.data.payResult.order_id,
-                        // front_callback: JSON.stringify(res || {}),
-                        front_callback: '{}', 
-                    }).then((data) => {
-                        that.resolvePayResult(data.data);
-                    });
-                }
-
-              })
-        },
-        // 支付后，查询订单状态
-        queryOrderState(payload) {
-            let params = {
-                ...payload
-            };
-            return api.query_call_back(params).then(data => {
-                return data;
-            }).catch(err => {
-                console.log(err)
-            });
-        },
-        // // 处理支付最终结果
-        resolvePayResult(res) {
-            if (res.code === 0) {
-                // 1、支付成功 3、取消支付 4、已关闭（微信方过期） 7，支付失败 -1其余都是处理中
-                const payOrderState = res.data.pay_order_state;
-                if (payOrderState === 1) {
-                    this.payComplete(res.data);
-                } else {
-                    wx.showToast({
-                        title: '您的订单未完成支付，请重新支付',
-                        icon: 'none',
-                        duration: 2000
-                    })
-                    this.payFail(payOrderState);
-                }
-            } else {
-                wx.showToast({
-                    title: '您的订单未完成支付，请重新支付',
-                    icon: 'none',
-                    duration: 2000
-                })
-                this.payFail();
-            }
-        },
-        //支付成功
-        payComplete(result){
-            this.triggerEvent('successCallback',result)
-        },
-         // 支付失败
-         payFail(result) {
-            this.triggerEvent('failCallback',result)
-        },
-    }
-})
+// src/payModule/index/index.js
+import {debounce,isFunction} from "../../common/utils/index"
+import api from "../../common/api/pay"
+import { sensorLog } from "live-mp-tools";
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        //按钮默认文案
+         btnTxt:{
+            type:String,
+            value:'确认支付'
+        },
+        //业务侧样式
+        Styles:{
+            type:String,
+            value:""
+        },
+        //是否禁止支付
+        invalidBtn:{
+            type:Boolean,
+            value:false
+        },
+         //支付前支付参数
+         prePayInfo:{
+            type:Object,
+            value:{}
+        },
+        //异步操作校验
+        checkState:{
+            type:Boolean,
+            value:true
+        },
+        // //业务侧校验结果
+        checkBefore:{
+            type:Boolean,
+            value:true
+        },
+        // //支付后处理各个业务侧的回调
+
+        //支付参数
+        payParams:{
+            type:Object,
+            value:{}
+        },
+        //支付后的参数
+        afterPay: {
+            type: Object,
+            value: () => {
+                return {
+                    callBack: null,
+                };
+            },
+        },
+        //埋点数据
+        aliveInfo:{
+            type: Object,
+            value:{}
+        },
+        sensorReportParams:{
+            type: Object,
+            value:{}
+        }
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+        showWechatLoading:false,
+        payResult:{} //支付信息
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        goPay:debounce(function ()  {
+          
+            // 业务侧支付前参数检查 checkBeforePay  
+            this.triggerEvent('checkBeforePay')
+            if(!this.data.checkBefore){
+                return false
+            }
+            //异步批价校验
+            this.triggerEvent('checkBeforePayAsync')
+            if (this.data.checkState) {
+                this.submit();
+            }
+        }, 3000,true),
+        sensorLogPay:function(result){
+            let { aliveInfo, sensorReportParams, payParams } = this.properties
+            sensorLog.sensors.track('click_butt',{
+                page_id:'e_alive#mini#first#alive_room',
+                page_name:'直播间页面',
+                l_program: '鹅直播',
+                page_path: '鹅直播#小程序#首页#直播间页面',
+                page_button: "提交订单",
+                client: "小程序",
+                order_id:result.order_id ? result.order_id :'',
+                goods_id: payParams.resource_id ? payParams.resource_id :'',
+                app_id: aliveInfo.app_id,
+                c_user_id: aliveInfo.user_id,
+                union_id: wx.getStorageSync('userInfo').universal_union_id,
+                current_role: sensorReportParams.current_role ? sensorReportParams.current_role :'',
+                resource_id: aliveInfo.alive_id,
+                type: sensorReportParams.type ? sensorReportParams.type :'',
+                cmm1: sensorReportParams.alive_type ? sensorReportParams.alive_type :'',
+                cmm2: sensorReportParams.version_type ? sensorReportParams.version_type : '',
+                comm2: sensorReportParams.pay_type ? sensorReportParams.pay_type :''
+              })
+        },
+        submit:function(){
+            // 0元购专属loading
+            if (this.data.prePayInfo?.rate_price === 0) {
+                console.log('0元支付')
+                this.setData({
+                    showWechatLoading:true
+                })
+            } else {
+                console.log('非0元支付')
+                wx.showLoading({
+                    title: '加载中',
+                })
+            }
+          
+            this.pay({
+                ...this.data.payParams
+            }).then((res) => {
+                wx.hideLoading()
+                //埋点
+                this.sensorLogPay(res.data.data)
+                if (res.data && res.data.code === 0) {
+                     //支付后处理各个业务侧的回调
+                     this.setData({
+                        payResult : res.data.data
+                     })
+                    this.triggerEvent('checkBeforePayAsync',res.data.data)
+                    //处理支付
+                    this.handlePayResult(res.data.data);
+                }else{
+                    wx.showToast({
+                        title: res.data.msg,
+                        icon: 'none',
+                        duration: 2000
+                    })
+                }
+            })
+        },
+        //调支付接口
+        pay(params){
+            console.log('params',params)
+            return api.pay(params).then(res => {
+                this.setData({
+                    showWechatLoading:false
+                })
+                if (res.data.code !== 0) {
+                    wx.showToast({
+                        title: res.data.msg,
+                        icon: 'none',
+                        duration: 2000
+                      })
+                }
+                return res;
+            }).catch(err => {
+                this.setData({
+                    showWechatLoading:false
+                })
+            });
+        },
+        //处理支付结果
+        handlePayResult(result){
+            if (result.pay_state === "SUCCESS") {
+                this.payComplete(result);
+                return;
+            }else{
+                this.miniProPay(result);
+            }
+        },
+        miniProPay(payConfig){
+            let that =this
+            wx.requestPayment({
+                timeStamp: payConfig.timeStamp,
+                nonceStr: payConfig.nonceStr,
+                package: payConfig.package,
+                signType: payConfig.signType,
+                paySign: payConfig.paySign,
+                success (res) {
+                    // if (res.errMsg == "requestPayment:ok"){
+                    //     that.payComplete()
+                    // }
+                },
+                fail (res) {
+                    // that.payFail()
+                },
+                complete(res){
+                    that.queryOrderState({
+                        order_id: that.data.payResult.order_id,
+                        // front_callback: JSON.stringify(res || {}),
+                        front_callback: '{}', 
+                    }).then((data) => {
+                        that.resolvePayResult(data.data);
+                    });
+                }
+
+              })
+        },
+        // 支付后，查询订单状态
+        queryOrderState(payload) {
+            let params = {
+                ...payload
+            };
+            return api.query_call_back(params).then(data => {
+                return data;
+            }).catch(err => {
+                console.log(err)
+            });
+        },
+        // // 处理支付最终结果
+        resolvePayResult(res) {
+            if (res.code === 0) {
+                // 1、支付成功 3、取消支付 4、已关闭（微信方过期） 7，支付失败 -1其余都是处理中
+                const payOrderState = res.data.pay_order_state;
+                if (payOrderState === 1) {
+                    this.payComplete(res.data);
+                } else {
+                    wx.showToast({
+                        title: '您的订单未完成支付，请重新支付',
+                        icon: 'none',
+                        duration: 2000
+                    })
+                    this.payFail(payOrderState);
+                }
+            } else {
+                wx.showToast({
+                    title: '您的订单未完成支付，请重新支付',
+                    icon: 'none',
+                    duration: 2000
+                })
+                this.payFail();
+            }
+        },
+        //支付成功
+        payComplete(result){
+            this.triggerEvent('successCallback',result)
+        },
+         // 支付失败
+         payFail(result) {
+            this.triggerEvent('failCallback',result)
+        },
+    }
+})

package/src/PayModule/index/index.json

@@ -1,7 +1,7 @@
-{
-    "component": true,
-    "usingComponents": {
-      "payButton": "../button/index",
-      "wechatLoading": "../wechatLoading/index"
-    }
-  }
+{
+    "component": true,
+    "usingComponents": {
+      "payButton": "../button/index",
+      "wechatLoading": "../wechatLoading/index"
+    }
+  }

package/src/PayModule/index/index.wxml

@@ -1,12 +1,12 @@
-<!--src/payModule/index/index.wxml-->
-<view>
-    <!-- 0元微信支付loading态 -->
-    <wechatLoading wx:if="{{showWechatLoading}}"></wechatLoading>
-    <!-- 支付按钮 -->
-    <payButton
-        btnTxt="确认支付"
-        Styles="{{Styles}}"
-        invalidBtn="{{invalidBtn}}"
-        bind:goPay="goPay"
-    ></payButton>
-</view>
+<!--src/payModule/index/index.wxml-->
+<view>
+    <!-- 0元微信支付loading态 -->
+    <wechatLoading wx:if="{{showWechatLoading}}"></wechatLoading>
+    <!-- 支付按钮 -->
+    <payButton
+        btnTxt="确认支付"
+        Styles="{{Styles}}"
+        invalidBtn="{{invalidBtn}}"
+        bind:goPay="goPay"
+    ></payButton>
+</view>