diff --git a/app.js b/app.js index f8ab957..4e29f73 100644 --- a/app.js +++ b/app.js @@ -1,4 +1,4 @@ -const baseUrl = "http://49.233.248.140:8082" +const baseUrl = "http://localhost:8082" App({ diff --git a/app.json b/app.json index de214b4..82dcecb 100644 --- a/app.json +++ b/app.json @@ -13,7 +13,8 @@ "page/component/refund/refund", "page/component/invoice/invoice", "page/component/myOrders2/myOrder2", - "page/component/login/login" + "page/component/login/login", + "page/component/aboutUs/aboutUs" ], "window": { "navigationBarTextStyle": "white", diff --git a/page/component/aboutUs/aboutUs.js b/page/component/aboutUs/aboutUs.js new file mode 100644 index 0000000..ec600c0 --- /dev/null +++ b/page/component/aboutUs/aboutUs.js @@ -0,0 +1,9 @@ +const app = getApp() +const baseUrl = app.globalData.baseUrl +// page/component/new-pages/user/address/address.js +Page({ + data: { + + }, + +}) \ No newline at end of file diff --git a/page/component/aboutUs/aboutUs.json b/page/component/aboutUs/aboutUs.json new file mode 100644 index 0000000..f34e2e5 --- /dev/null +++ b/page/component/aboutUs/aboutUs.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "关于我们", + "enablePullDownRefresh": false +} \ No newline at end of file diff --git a/page/component/aboutUs/aboutUs.wxml b/page/component/aboutUs/aboutUs.wxml new file mode 100644 index 0000000..032059b --- /dev/null +++ b/page/component/aboutUs/aboutUs.wxml @@ -0,0 +1,8 @@ + + + + 一家师大学生经营的店铺 + + .大雄出品. + + \ No newline at end of file diff --git a/page/component/aboutUs/aboutUs.wxss b/page/component/aboutUs/aboutUs.wxss new file mode 100644 index 0000000..fa2cd95 --- /dev/null +++ b/page/component/aboutUs/aboutUs.wxss @@ -0,0 +1,37 @@ +@import '../../common/common.wxss'; + + +.orders-no-refund { + position: relative; + height: 90rpx; + line-height: 90rpx; + font-size: 16px; + border-bottom: 20rpx solid #ededed; + text-align: center; +} + + +.orders-box { + padding-top: 250px; + display: flex; + flex-direction: column; + align-items: center; +} + + +.orders-thumb { + /* position: absolute; */ + width: 300px; + height: 300px; +} + +.order-number { + display: block; + font-size: 16px; + font-weight: bold; +} +.order-number2 { + padding-left: 30px; + font-size: 16px; + font-weight: bold; +} \ No newline at end of file diff --git a/page/component/orders/orders.js b/page/component/orders/orders.js index a795ea5..7eb98ce 100644 --- a/page/component/orders/orders.js +++ b/page/component/orders/orders.js @@ -24,7 +24,8 @@ Page({ config: { appid: "wx865aefa5a7115ae0", key: "d5a58d44588b42cbbe01daa5cfa4e792" - } + }, + notes: "" // {id:1,title:'新鲜芹菜 半斤',image:'/image/s5.png',num:4,price:0.01}, // {id:2,title:'素米 500g',image:'/image/s6.png',num:1,price:0.03} }, @@ -46,6 +47,11 @@ Page({ }) }, + handleInput(e) { + this.setData({ + notes: e.detail.value + }); + }, /** * 计算总价 */ @@ -84,6 +90,7 @@ Page({ // 假设用户ID暂时写死 orderData.openId = wx.getStorageSync('openid'); orderData.status = 1; + orderData.notes = self.data.notes; console.log("orderData", orderData) // 生成订单并请求支付 wx.request({ diff --git a/page/component/orders/orders.wxml b/page/component/orders/orders.wxml index b431b38..b018c19 100644 --- a/page/component/orders/orders.wxml +++ b/page/component/orders/orders.wxml @@ -25,12 +25,12 @@ - + 订单备注 - + diff --git a/page/component/user/user.wxml b/page/component/user/user.wxml index 42fa528..630ed08 100644 --- a/page/component/user/user.wxml +++ b/page/component/user/user.wxml @@ -3,7 +3,7 @@ {{nickname}} - 关于我们 + 关于我们 请登录