xiaoe_mp_npm 0.1.13 → 0.1.14

package/miniprogram_dist/CurrentPayModule/index.js

@@ -1,256 +1,256 @@
-// src/CurrentPayModule/index.js
-
-import {debounce} from"../common/utils/index"
-import {  getUserPermission, snapCheck } from "../common/api/liveGoodsList"
-import Dialog from '@vant/weapp/dialog/dialog';
-
-const SPU_TYPE = {
-  1:"ITX",
-  2:"ADO",
-  3:"VDO",
-  4:"LVE",
-  5:"MMB",
-  6:"SPC",
-  8:"BSC",
-  20:"EBK",
-  25:"TCP",
-  29:"OLC",
-  21:"ENT",
-  35:"BTK",
-  41:"VCP",
-  42:"OLP",
-  45:"ALC"
-}
-
-Component({
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-    aliveInfo: {
-      type: Object,
-      value: {
-        alive_id: 'l_61820b4960b2c37884d5148f',
-        alive_state: 2
-      },
-    },
-    custom: {
-      type: Boolean,
-      value: false
-    },
-    goodsItem: {
-      type: Object,
-      value: {}
-    }
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-    showConfirmOrder: false,
-    showSku: false,
-    baseInfoQuery: {},
-    spuId: ""
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-      snapUpCheck: debounce(function (){
-        this.triggerEvent('sendNewMsg')
-        // sensorReport("click_butt", {
-        //     alive_state: this.data.aliveInfo.alive_state,
-        //     type: 4,
-        //     page_name: "直播间_商品列表页",
-        //     page_button: "去抢购"
-        // });
-        // 直播商品4/分销商品12 22/线下课29/拼团 --判断权益
-        if([4, 12, 22, 29].indexOf(this.data.goodsItem.resource_type) > -1 || this.data.goodsItem.activity_type === 6){
-          this.judgePermission()
-          return
-        }
-        this.data.preferential ? this.showToast('您已享有最佳优惠，下单更优惠~') : this.showToast('努力加载中')
-        let params = {
-            id: this.data.goodsItem.id,
-            resource_id: this.data.goodsItem.resource_id,
-            resource_type: this.data.goodsItem.resource_type,
-            price: this.data.goodsItem.price,
-            type: 4,
-            coupon_id: this.data.goodsItem.coupon_id,
-            alive_id: this.data.aliveInfo.alive_id
-        }
-        snapCheck(params).then(res => {
-          this.hideToast()
-          let { code, data } = res.data
-          if (code === 0) {
-              if(data.err_msg){
-                this.showToast(data.err_msg)
-              }
-              if(data.is_sec_kill_toast){
-                this.showToast("秒杀活动开始，您未预约，需以原价购买！")
-              }
-              if(data.is_goods_detail === 1){
-                this.judgePermission(data.is_has_permission)
-              } else if (data.is_more_sku === 1){
-                  this.showSku()
-              } else {
-                  this.showConfirmOrder(data.sku)
-              }
-          }else{
-            this.showToast("网络繁忙，请稍后再试")
-          }
-        })
-    }, 1000, true),
-    getUserPermission(){
-      return new Promise((resolve, reject) => {
-        let params = {
-          id: this.data.goodsItem.id
-        }
-        getUserPermission(params).then((res) => {
-          let { code, data } = res.data
-          if (code === 0) {
-            resolve(!!data.auth_state)
-          }
-        })
-      })},
-      // 判断权益
-  judgePermission: debounce(async function (permission){
-    // 实物21 可多次购买,去详情页; 
-    if(this.data.goodsItem.resource_type === 21){
-      if(this.data.custom){
-        this.triggerEvent("toDetails")
-      }else {
-        this.toDetails()
-      }
-      return
-    }
-    if(permission !== 0 && permission !== 1){
-      permission = await this.getUserPermission()
-    }
-    console.log("permission", permission)
-    if(permission){
-      //  直播商品4/电子书20/班课35 鹅学习不支持，无权益的情况下,内嵌h5, 有权益TOAST提示
-      if([4, 20, 35].indexOf(this.data.goodsItem.resource_type) > -1){
-          this.showToast('您已拥有该课程，小程序内暂不支持学习此课程')
-        } else {
-          // 父组件
-          if(this.data.custom){
-            this.triggerEvent('toEXueXi')
-          }else {
-            this.showDialog()
-          }
-      }
-    } else {
-      if(this.data.custom){
-        this.triggerEvent("toDetails")
-      }else {
-        this.toDetails()
-      }
-    }
-}, 1000, true),
-showDialog(){
-  Dialog.confirm({
-    message: '您已拥有该课程，即将前往“鹅学习小程序”学习',
-    confirmButtonText: "前往",
-    context: this
-  })
-    .then(() => {
-      Dialog.close()
-      this.toEXueXi()
-    })
-    .catch(() => {
-      Dialog.close()
-      return false
-    });
-},
-  showConfirmOrder(sku){
-    //带货列表返回的 resource_id就是业务侧的spu_id
-    // 返回的id,就是业务侧的resource_id
-    let params = {
-          id: this.data.goodsItem.resource_id,
-          spu_id: this.data.goodsItem.resource_id,
-          resource_type: this.data.goodsItem.resource_type,
-          resource_id: this.data.goodsItem.id,
-          spu_type: SPU_TYPE[this.data.goodsItem.resource_type],
-          sku,
-          count: 1,
-          isAlive:1,
-          aliveId: this.data.aliveInfo.alive_id
-    }
-    this.setData({
-      showConfirmOrder: true,
-      baseInfoQuery: params
-    })
-  },
-  showSku(){
-    this.setData({
-      showSku: true,
-      spuId: this.data.goodsItem.resource_id
-    })
-  },
-  formatUrl(){
-    //跳转链接 带上参数
-    let url = this.data.goodsItem.target_url
-    let jumpUrl = this.data.goodsItem.target_url, //跳转链接
-        queryIndex = url.indexOf("?"); //查询索引位置
-    if (queryIndex === -1) {
-        jumpUrl += "?"; //问号不存在，则拼接问号
-    } else {
-        url.length - 1 !== queryIndex ? (jumpUrl += "&") : ""; //问号是否不在末尾位置? 进行&拼接 ：不处理
-    }
-    jumpUrl = `${jumpUrl}live_room=1&success=1&aliveId=${this.data.aliveInfo.alive_id}`;
-    if (![0, 2, 3].includes(this.data.aliveInfo.alive_state)) {
-        jumpUrl += `&is_living=1`;
-    }
-    let searchUrl = `?h5_url=${jumpUrl}`
-    return searchUrl
-  },
-  toDetails(){
-      let url = this.formatUrl()
-      if(this.data.goodsItem.resource_type === 4){
-        // 鹅直播内直播详情是原生的，其他的内嵌
-        wx && wx.navigateTo({
-          url: `subpkg/live-room-horizon/pages/index?app_id=${app.globalData.liveRoomInfo.appId}&id=${this.data.aliveInfo.alive_id}&tab=detail`,
-        })
-      } else {
-        wx && wx.navigateTo({
-          url: '/page/share/share' + url,
-        })
-      }
-  },
-  toEXueXi(){
-    let h5_url = this.formatUrl()
-    var path
-    if(this.data.goodsItem.resource_type === 2){
-      // 音频
-      path = `/pages/content/audio/index?resource_id=${item.resource_id}`
-    }else if(this.data.goodsItem.resource_type === 3){
-      // 视频
-      path = `/pages/content/video/index?resource_id=${item.resource_id}`
-    } else {
-      // 其他
-      path = `/page/webview/index?h5Url=${h5_url}`
-    }
-    console.log("path", path)
-    let params = {
-      appId: "wxa3589f1193170aa3",
-      path,
-    }
-    wx.navigateToMiniProgram(params)
-  },
-
-  showToast(title = ''){
-    wx.showToast({
-      title,
-      icon: "none",
-      duration: 1000
-    })
-  },
-  hideToast(){
-    wx.hideToast()
-  },
-
-  }
-})
+// src/CurrentPayModule/index.js
+
+import {debounce} from"../common/utils/index"
+import {  getUserPermission, snapCheck } from "../common/api/liveGoodsList"
+import Dialog from '@vant/weapp/dialog/dialog';
+
+const SPU_TYPE = {
+  1:"ITX",
+  2:"ADO",
+  3:"VDO",
+  4:"LVE",
+  5:"MMB",
+  6:"SPC",
+  8:"BSC",
+  20:"EBK",
+  25:"TCP",
+  29:"OLC",
+  21:"ENT",
+  35:"BTK",
+  41:"VCP",
+  42:"OLP",
+  45:"ALC"
+}
+
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    aliveInfo: {
+      type: Object,
+      value: {
+        alive_id: 'l_61820b4960b2c37884d5148f',
+        alive_state: 2
+      },
+    },
+    custom: {
+      type: Boolean,
+      value: false
+    },
+    goodsItem: {
+      type: Object,
+      value: {}
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    showConfirmOrder: false,
+    showSku: false,
+    baseInfoQuery: {},
+    spuId: ""
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+      snapUpCheck: debounce(function (){
+        this.triggerEvent('sendNewMsg')
+        // sensorReport("click_butt", {
+        //     alive_state: this.data.aliveInfo.alive_state,
+        //     type: 4,
+        //     page_name: "直播间_商品列表页",
+        //     page_button: "去抢购"
+        // });
+        // 直播商品4/分销商品12 22/线下课29/拼团 --判断权益
+        if([4, 12, 22, 29].indexOf(this.data.goodsItem.resource_type) > -1 || this.data.goodsItem.activity_type === 6){
+          this.judgePermission()
+          return
+        }
+        this.data.preferential ? this.showToast('您已享有最佳优惠，下单更优惠~') : this.showToast('努力加载中')
+        let params = {
+            id: this.data.goodsItem.id,
+            resource_id: this.data.goodsItem.resource_id,
+            resource_type: this.data.goodsItem.resource_type,
+            price: this.data.goodsItem.price,
+            type: 4,
+            coupon_id: this.data.goodsItem.coupon_id,
+            alive_id: this.data.aliveInfo.alive_id
+        }
+        snapCheck(params).then(res => {
+          this.hideToast()
+          let { code, data } = res.data
+          if (code === 0) {
+              if(data.err_msg){
+                this.showToast(data.err_msg)
+              }
+              if(data.is_sec_kill_toast){
+                this.showToast("秒杀活动开始，您未预约，需以原价购买！")
+              }
+              if(data.is_goods_detail === 1){
+                this.judgePermission(data.is_has_permission)
+              } else if (data.is_more_sku === 1){
+                  this.showSku()
+              } else {
+                  this.showConfirmOrder(data.sku)
+              }
+          }else{
+            this.showToast("网络繁忙，请稍后再试")
+          }
+        })
+    }, 1000, true),
+    getUserPermission(){
+      return new Promise((resolve, reject) => {
+        let params = {
+          id: this.data.goodsItem.id
+        }
+        getUserPermission(params).then((res) => {
+          let { code, data } = res.data
+          if (code === 0) {
+            resolve(!!data.auth_state)
+          }
+        })
+      })},
+      // 判断权益
+  judgePermission: debounce(async function (permission){
+    // 实物21 可多次购买,去详情页; 
+    if(this.data.goodsItem.resource_type === 21){
+      if(this.data.custom){
+        this.triggerEvent("toDetails")
+      }else {
+        this.toDetails()
+      }
+      return
+    }
+    if(permission !== 0 && permission !== 1){
+      permission = await this.getUserPermission()
+    }
+    console.log("permission", permission)
+    if(permission){
+      //  直播商品4/电子书20/班课35 鹅学习不支持，无权益的情况下,内嵌h5, 有权益TOAST提示
+      if([4, 20, 35].indexOf(this.data.goodsItem.resource_type) > -1){
+          this.showToast('您已拥有该课程，小程序内暂不支持学习此课程')
+        } else {
+          // 父组件
+          if(this.data.custom){
+            this.triggerEvent('toEXueXi')
+          }else {
+            this.showDialog()
+          }
+      }
+    } else {
+      if(this.data.custom){
+        this.triggerEvent("toDetails")
+      }else {
+        this.toDetails()
+      }
+    }
+}, 1000, true),
+showDialog(){
+  Dialog.confirm({
+    message: '您已拥有该课程，即将前往“鹅学习小程序”学习',
+    confirmButtonText: "前往",
+    context: this
+  })
+    .then(() => {
+      Dialog.close()
+      this.toEXueXi()
+    })
+    .catch(() => {
+      Dialog.close()
+      return false
+    });
+},
+  showConfirmOrder(sku){
+    //带货列表返回的 resource_id就是业务侧的spu_id
+    // 返回的id,就是业务侧的resource_id
+    let params = {
+          id: this.data.goodsItem.resource_id,
+          spu_id: this.data.goodsItem.resource_id,
+          resource_type: this.data.goodsItem.resource_type,
+          resource_id: this.data.goodsItem.id,
+          spu_type: SPU_TYPE[this.data.goodsItem.resource_type],
+          sku,
+          count: 1,
+          isAlive:1,
+          aliveId: this.data.aliveInfo.alive_id
+    }
+    this.setData({
+      showConfirmOrder: true,
+      baseInfoQuery: params
+    })
+  },
+  showSku(){
+    this.setData({
+      showSku: true,
+      spuId: this.data.goodsItem.resource_id
+    })
+  },
+  formatUrl(){
+    //跳转链接 带上参数
+    let url = this.data.goodsItem.target_url
+    let jumpUrl = this.data.goodsItem.target_url, //跳转链接
+        queryIndex = url.indexOf("?"); //查询索引位置
+    if (queryIndex === -1) {
+        jumpUrl += "?"; //问号不存在，则拼接问号
+    } else {
+        url.length - 1 !== queryIndex ? (jumpUrl += "&") : ""; //问号是否不在末尾位置? 进行&拼接 ：不处理
+    }
+    jumpUrl = `${jumpUrl}live_room=1&success=1&aliveId=${this.data.aliveInfo.alive_id}`;
+    if (![0, 2, 3].includes(this.data.aliveInfo.alive_state)) {
+        jumpUrl += `&is_living=1`;
+    }
+    let searchUrl = `?h5_url=${jumpUrl}`
+    return searchUrl
+  },
+  toDetails(){
+      let url = this.formatUrl()
+      if(this.data.goodsItem.resource_type === 4){
+        // 鹅直播内直播详情是原生的，其他的内嵌
+        wx && wx.navigateTo({
+          url: `subpkg/live-room-horizon/pages/index?app_id=${app.globalData.liveRoomInfo.appId}&id=${this.data.aliveInfo.alive_id}&tab=detail`,
+        })
+      } else {
+        wx && wx.navigateTo({
+          url: '/page/share/share' + url,
+        })
+      }
+  },
+  toEXueXi(){
+    let h5_url = this.formatUrl()
+    var path
+    if(this.data.goodsItem.resource_type === 2){
+      // 音频
+      path = `/pages/content/audio/index?resource_id=${item.resource_id}`
+    }else if(this.data.goodsItem.resource_type === 3){
+      // 视频
+      path = `/pages/content/video/index?resource_id=${item.resource_id}`
+    } else {
+      // 其他
+      path = `/page/webview/index?h5Url=${h5_url}`
+    }
+    console.log("path", path)
+    let params = {
+      appId: "wxa3589f1193170aa3",
+      path,
+    }
+    wx.navigateToMiniProgram(params)
+  },
+
+  showToast(title = ''){
+    wx.showToast({
+      title,
+      icon: "none",
+      duration: 1000
+    })
+  },
+  hideToast(){
+    wx.hideToast()
+  },
+
+  }
+})

package/miniprogram_dist/CurrentPayModule/index.json

@@ -1,9 +1,9 @@
-{
-  "component": true,
-  "usingComponents": {
-    "sku": "../Sku/commSelect",
-    "comfirm-order": "../ConfirmOrder/index",
-    "pay-complete": "../PayComplete/index",
-    "van-dialog": "@vant/weapp/dialog/index"
-  }
+{
+  "component": true,
+  "usingComponents": {
+    "sku": "../Sku/commSelect",
+    "comfirm-order": "../ConfirmOrder/index",
+    "pay-complete": "../PayComplete/index",
+    "van-dialog": "@vant/weapp/dialog/index"
+  }
 }

package/miniprogram_dist/CurrentPayModule/index.less

@@ -1,13 +1,13 @@
-.buy-btn {
-  font-size: 28rpx;
-  border-radius: 40rpx;
-  width: 160rpx;
-  height: 56rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  color: white;
-  line-height: 56rpx;
-  font-weight: 500;
-  background-color: red;
+.buy-btn {
+  font-size: 28rpx;
+  border-radius: 40rpx;
+  width: 160rpx;
+  height: 56rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: white;
+  line-height: 56rpx;
+  font-weight: 500;
+  background-color: red;
 }

package/miniprogram_dist/CurrentPayModule/index.wxml

@@ -1,4 +1,4 @@
-<sku showSku="{{ showSku }}" aliveId="{{ aliveInfo.alive_id }}" spuId="{{ spuId }}"></sku>
-<comfirm-order baseInfoQuery="{{ baseInfoQuery }}" showPopup="{{showConfirmOrder}}"></comfirm-order>
-<pay-complete></pay-complete>
+<sku showSku="{{ showSku }}" aliveId="{{ aliveInfo.alive_id }}" spuId="{{ spuId }}"></sku>
+<comfirm-order baseInfoQuery="{{ baseInfoQuery }}" showPopup="{{showConfirmOrder}}"></comfirm-order>
+<pay-complete></pay-complete>
 <van-dialog id="van-dialog" confirm-button-color="#105cfb"/>

package/miniprogram_dist/CustomPopup/index.js

@@ -1,56 +1,56 @@
-// src/CustomPopup/index.js
-Component({
-  options: {
-    multipleSlots: true
-  },
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-    // 弹框显隐
-    showPopup: {
-      type: Boolean,
-      value: false
-    },
-    // 弹框style
-    customStyle: {
-      type: String,
-      value: "height: 80%;"
-    },
-    // 是否开启圆角
-    round: {
-      type: Boolean,
-      value: true
-    },
-    // 是否预留header
-    hasHeader: {
-      type: Boolean,
-      value: true
-    },
-    // 遮罩
-    overlay: {
-      type: Boolean,
-      value: true
-    }
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-    // 关闭弹框
-    onClose() {
-      this.setData({
-        showPopup: false
-      })
-      this.triggerEvent("onClose", false)
-    }
-  }
-})
+// src/CustomPopup/index.js
+Component({
+  options: {
+    multipleSlots: true
+  },
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    // 弹框显隐
+    showPopup: {
+      type: Boolean,
+      value: false
+    },
+    // 弹框style
+    customStyle: {
+      type: String,
+      value: "height: 80%;"
+    },
+    // 是否开启圆角
+    round: {
+      type: Boolean,
+      value: true
+    },
+    // 是否预留header
+    hasHeader: {
+      type: Boolean,
+      value: true
+    },
+    // 遮罩
+    overlay: {
+      type: Boolean,
+      value: true
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    // 关闭弹框
+    onClose() {
+      this.setData({
+        showPopup: false
+      })
+      this.triggerEvent("onClose", false)
+    }
+  }
+})