diff --git a/public/appmini/old/wechat/app.json b/public/appmini/old/wechat/app.json index f22cf359e..7d378e65c 100755 --- a/public/appmini/old/wechat/app.json +++ b/public/appmini/old/wechat/app.json @@ -1,9 +1,9 @@ { - "pages": [ + "pages": ["pages/user/user", "pages/index/index", "pages/goods-category/goods-category", "pages/cart/cart", - "pages/user/user", + "pages/web-view/web-view", "pages/login/login", "pages/paytips/paytips", diff --git a/public/appmini/old/wechat/components/badge/badge.js b/public/appmini/old/wechat/components/badge/badge.js new file mode 100644 index 000000000..21b6bb322 --- /dev/null +++ b/public/appmini/old/wechat/components/badge/badge.js @@ -0,0 +1,23 @@ +// components/badge.js +Component({ + /** + * 组件的属性列表 + */ + properties: { + propNumber: Number, + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) \ No newline at end of file diff --git a/public/appmini/old/wechat/components/badge/badge.json b/public/appmini/old/wechat/components/badge/badge.json new file mode 100644 index 000000000..e8cfaaf80 --- /dev/null +++ b/public/appmini/old/wechat/components/badge/badge.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/public/appmini/old/wechat/components/badge/badge.wxml b/public/appmini/old/wechat/components/badge/badge.wxml new file mode 100644 index 000000000..a832d20c5 --- /dev/null +++ b/public/appmini/old/wechat/components/badge/badge.wxml @@ -0,0 +1,5 @@ + + + {{(propNumber > 99) ? '99+' : propNumber}} + + \ No newline at end of file diff --git a/public/appmini/old/wechat/components/badge/badge.wxss b/public/appmini/old/wechat/components/badge/badge.wxss new file mode 100644 index 000000000..ce1d3d2ac --- /dev/null +++ b/public/appmini/old/wechat/components/badge/badge.wxss @@ -0,0 +1,26 @@ +.am-badge { + display: inline-block; + position: relative; + vertical-align: middle; +} + +.am-badge-text { + display: inline-block; + position: absolute; + right: 0; + transform: translate(50%, -50%); + top: 0px; + min-width: 16px; + padding: 0; + height: 16px; + line-height: 16px; + text-align: center; + background-color: #FF3B30; + border-radius: 16px; + color: #fff; + font-size: 10px; + padding: 2px 2px; +} +.am-badge-text-max { + padding:2px 3px; +} \ No newline at end of file diff --git a/public/appmini/old/wechat/pages/user-order/user-order.js b/public/appmini/old/wechat/pages/user-order/user-order.js index ba65cfec2..1f51566c3 100755 --- a/public/appmini/old/wechat/pages/user-order/user-order.js +++ b/public/appmini/old/wechat/pages/user-order/user-order.js @@ -231,7 +231,7 @@ Page({ temp_data_list[index]['status_name'] = '待发货'; this.setData({ data_list: temp_data_list }); - app.showToast({'支付成功'); + app.showToast('支付成功'); } else { wx.tradePay({ tradeNO: res.data.data.data, diff --git a/public/appmini/old/wechat/pages/user/user.json b/public/appmini/old/wechat/pages/user/user.json index 75a025c11..1e8b450ba 100755 --- a/public/appmini/old/wechat/pages/user/user.json +++ b/public/appmini/old/wechat/pages/user/user.json @@ -1,6 +1,6 @@ { "enablePullDownRefresh": true, "usingComponents": { - "badge": "mini-antui/es/badge/index" + "component-badge": "/components/badge/badge" } } \ No newline at end of file diff --git a/public/appmini/old/wechat/pages/user/user.wxml b/public/appmini/old/wechat/pages/user/user.wxml index f7ff088fe..8d1c7020b 100755 --- a/public/appmini/old/wechat/pages/user/user.wxml +++ b/public/appmini/old/wechat/pages/user/user.wxml @@ -40,7 +40,9 @@ - + + + {{items.name}} diff --git a/public/appmini/old/wechat/pages/user/user.wxss b/public/appmini/old/wechat/pages/user/user.wxss index 152f108bf..d811c34a1 100755 --- a/public/appmini/old/wechat/pages/user/user.wxss +++ b/public/appmini/old/wechat/pages/user/user.wxss @@ -78,7 +78,7 @@ height: 60rpx; margin-bottom: 6rpx; } -.items-list .items .am-badge { +.items-list .items .badge-icon { position: absolute; top: 0; left: calc(50% + 30rpx);