diff --git a/pages/home/active.vue b/pages/home/active.vue
index 689fce5..a4c6474 100644
--- a/pages/home/active.vue
+++ b/pages/home/active.vue
@@ -3,21 +3,21 @@
-
- {{ item.remark }}
-
-
-
-
-
-
-
-
-
-
-
+
+ {{ item.remark }}
+
+
+
+
+
+
+
+
+
+
+
@@ -126,7 +126,7 @@ export default {
for(var i = 0; i < this.activeList.length; i++) {
if(this.activeList[i].type=="kkyl"){
this.kkylActId = this.activeList[i].id
- request({
+ request({
url: "/userClient/customer/getActive",
method: "get",
params:{id:this.activeList[i].id}
@@ -189,37 +189,37 @@ export default {
console.log(res);
//拿到开卡有礼订单 TODO 对接支付
this.orderInfo = res.data
- this.goPay(this.orderInfo)
-
+ this.goPay(this.orderInfo)
+
+ })
+ },
+ async goPay(data) {
+ let that = this
+ await request({
+ url: '/userClient/pay/toPay',
+ method: 'get',
+ params: {orderId: data.id}
+ }).then((ress) => {
+ wx.requestPayment({
+ timeStamp: ress.data.timeStamp, // 时间戳,从1970年1月1日00:00:00至今的秒数,即当前的时间
+ nonceStr: ress.data.nonceStr, // 随机字符串,长度为32个字符以下。
+ package: ress.data.package, // 统一下单接口返回的 prepay_id 参数值,格式如“prepay_id=*”
+ signType: ress.data.signType, // 签名算法类型,默认为 MD5,支持RSA等其他加密算法
+ paySign: ress.data.paySign, // 签名,详见签名生成算法
+ success: function (res) {
+ console.log('成功',res);
+ if( res.errMsg = 'requestPayment:ok'){
+ uni.showToast({
+ title:'支付成功'
+ })
+ this.getUserInfos()
+ }
+ // 支付成功后的回调函数, res.errMsg = 'requestPayment:ok'
+ },
+
+ })
})
},
- async goPay(data) {
- let that = this
- await request({
- url: '/userClient/pay/toPay',
- method: 'get',
- params: {orderId: data.id}
- }).then((ress) => {
- wx.requestPayment({
- timeStamp: ress.data.timeStamp, // 时间戳,从1970年1月1日00:00:00至今的秒数,即当前的时间
- nonceStr: ress.data.nonceStr, // 随机字符串,长度为32个字符以下。
- package: ress.data.package, // 统一下单接口返回的 prepay_id 参数值,格式如“prepay_id=*”
- signType: ress.data.signType, // 签名算法类型,默认为 MD5,支持RSA等其他加密算法
- paySign: ress.data.paySign, // 签名,详见签名生成算法
- success: function (res) {
- console.log('成功',res);
- if( res.errMsg = 'requestPayment:ok'){
- uni.showToast({
- title:'支付成功'
- })
- this.getUserInfos()
- }
- // 支付成功后的回调函数, res.errMsg = 'requestPayment:ok'
- },
-
- })
- })
- },
/**
* 充值有礼前置方法
* @returns {Promise}
@@ -265,26 +265,16 @@ export default {
height: 0;
box-sizing: border-box;
padding: 30rpx 0;
+ margin: 0 32rpx;
display: flex;
flex-direction: column;
row-gap: 20rpx;
overflow: auto;
-
- .card {
- background-color: #fff;
- margin: 0 32rpx;
- padding: 30rpx;
- border-radius: 12rpx;
-
- display: flex;
- flex-direction: column;
- row-gap: 10rpx;
-
- }
}
}
+
diff --git a/uni_modules/uni-card/changelog.md b/uni_modules/uni-card/changelog.md
new file mode 100644
index 0000000..c3cd8c4
--- /dev/null
+++ b/uni_modules/uni-card/changelog.md
@@ -0,0 +1,26 @@
+## 1.3.1(2021-12-20)
+- 修复 在vue页面下略缩图显示不正常的bug
+## 1.3.0(2021-11-19)
+- 重构插槽的用法 ,header 替换为 title
+- 新增 actions 插槽
+- 新增 cover 封面图属性和插槽
+- 新增 padding 内容默认内边距离
+- 新增 margin 卡片默认外边距离
+- 新增 spacing 卡片默认内边距
+- 新增 shadow 卡片阴影属性
+- 取消 mode 属性,可使用组合插槽代替
+- 取消 note 属性 ,使用actions插槽代替
+- 优化 组件UI,并提供设计资源,详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移,详见:[https://uniapp.dcloud.io/component/uniui/uni-card](https://uniapp.dcloud.io/component/uniui/uni-card)
+## 1.2.1(2021-07-30)
+- 优化 vue3下事件警告的问题
+## 1.2.0(2021-07-13)
+- 组件兼容 vue3,如何创建vue3项目详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.8(2021-07-01)
+- 优化 图文卡片无图片加载时,提供占位图标
+- 新增 header 插槽,自定义卡片头部( 图文卡片 mode="style" 时,不支持)
+- 修复 thumbnail 不存在仍然占位的 bug
+## 1.1.7(2021-05-12)
+- 新增 组件示例地址
+## 1.1.6(2021-02-04)
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-card/components/uni-card/uni-card.vue b/uni_modules/uni-card/components/uni-card/uni-card.vue
new file mode 100644
index 0000000..38cf594
--- /dev/null
+++ b/uni_modules/uni-card/components/uni-card/uni-card.vue
@@ -0,0 +1,270 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/uni_modules/uni-card/package.json b/uni_modules/uni-card/package.json
new file mode 100644
index 0000000..f16224d
--- /dev/null
+++ b/uni_modules/uni-card/package.json
@@ -0,0 +1,90 @@
+{
+ "id": "uni-card",
+ "displayName": "uni-card 卡片",
+ "version": "1.3.1",
+ "description": "Card 组件,提供常见的卡片样式。",
+ "keywords": [
+ "uni-ui",
+ "uniui",
+ "card",
+ "",
+ "卡片"
+],
+ "repository": "https://github.com/dcloudio/uni-ui",
+ "engines": {
+ "HBuilderX": ""
+ },
+ "directories": {
+ "example": "../../temps/example_temps"
+ },
+ "dcloudext": {
+ "category": [
+ "前端组件",
+ "通用组件"
+ ],
+ "sale": {
+ "regular": {
+ "price": "0.00"
+ },
+ "sourcecode": {
+ "price": "0.00"
+ }
+ },
+ "contact": {
+ "qq": ""
+ },
+ "declaration": {
+ "ads": "无",
+ "data": "无",
+ "permissions": "无"
+ },
+ "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+ },
+ "uni_modules": {
+ "dependencies": [
+ "uni-icons",
+ "uni-scss"
+ ],
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "y",
+ "aliyun": "y"
+ },
+ "client": {
+ "App": {
+ "app-vue": "y",
+ "app-nvue": "y"
+ },
+ "H5-mobile": {
+ "Safari": "y",
+ "Android Browser": "y",
+ "微信浏览器(Android)": "y",
+ "QQ浏览器(Android)": "y"
+ },
+ "H5-pc": {
+ "Chrome": "y",
+ "IE": "y",
+ "Edge": "y",
+ "Firefox": "y",
+ "Safari": "y"
+ },
+ "小程序": {
+ "微信": "y",
+ "阿里": "y",
+ "百度": "y",
+ "字节跳动": "y",
+ "QQ": "y"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ },
+ "Vue": {
+ "vue2": "y",
+ "vue3": "y"
+ }
+ }
+ }
+ }
+}
diff --git a/uni_modules/uni-card/readme.md b/uni_modules/uni-card/readme.md
new file mode 100644
index 0000000..7434e71
--- /dev/null
+++ b/uni_modules/uni-card/readme.md
@@ -0,0 +1,12 @@
+
+
+## Card 卡片
+> **组件名:uni-card**
+> 代码块: `uCard`
+
+卡片视图组件。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-card)
+#### 如使用过程中有任何问题,或者您对uni-ui有一些好的建议,欢迎加入 uni-ui 交流群:871950839
+
+