diff --git a/public/appmini/old/wechat/app.json b/public/appmini/old/wechat/app.json index f22cf359e2415c0a037e9180c77e02e570cfb2bf..7d378e65cb00c4b672c3780ed0ee11b16ab55655 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 0000000000000000000000000000000000000000..21b6bb322e8d375af23a64538f64662b6a886dca --- /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 0000000000000000000000000000000000000000..e8cfaaf80c404eb97d3cf8b6277ec15f37e6905e --- /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 0000000000000000000000000000000000000000..a832d20c5ef826bd7a23b17bc4b793f89e260bdc --- /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 0000000000000000000000000000000000000000..ce1d3d2ac298ff146657e3e07fd4175a4085592a --- /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 ba65cfec2bb9d333b8c63d8490cf5096b71226eb..1f51566c35e2616f376c261c98459eb3ad445ed8 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 75a025c1160a07b22f657c98463c92066c16ad1d..1e8b450ba5f16abdec108440b5bbd7493fdb3218 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 f7ff088fe2d5de8e3e1d640aa4b16b8e916405f5..8d1c7020b25d2ebbb9bd9cc7e0ad2ed79720eb93 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 152f108bfddaa87346d2525fd8df20a6568bb94f..d811c34a1c3be36b9c5540aa801dcd577709a39d 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);