取消发票,添加关于我们
This commit is contained in:
parent
e2cf0a4711
commit
0f0a3185a3
2
app.js
2
app.js
|
@ -1,4 +1,4 @@
|
||||||
const baseUrl = "http://49.233.248.140:8082"
|
const baseUrl = "http://localhost:8082"
|
||||||
|
|
||||||
|
|
||||||
App({
|
App({
|
||||||
|
|
3
app.json
3
app.json
|
@ -13,7 +13,8 @@
|
||||||
"page/component/refund/refund",
|
"page/component/refund/refund",
|
||||||
"page/component/invoice/invoice",
|
"page/component/invoice/invoice",
|
||||||
"page/component/myOrders2/myOrder2",
|
"page/component/myOrders2/myOrder2",
|
||||||
"page/component/login/login"
|
"page/component/login/login",
|
||||||
|
"page/component/aboutUs/aboutUs"
|
||||||
],
|
],
|
||||||
"window": {
|
"window": {
|
||||||
"navigationBarTextStyle": "white",
|
"navigationBarTextStyle": "white",
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
const app = getApp()
|
||||||
|
const baseUrl = app.globalData.baseUrl
|
||||||
|
// page/component/new-pages/user/address/address.js
|
||||||
|
Page({
|
||||||
|
data: {
|
||||||
|
|
||||||
|
},
|
||||||
|
|
||||||
|
})
|
|
@ -0,0 +1,4 @@
|
||||||
|
{
|
||||||
|
"navigationBarTitleText": "关于我们",
|
||||||
|
"enablePullDownRefresh": false
|
||||||
|
}
|
|
@ -0,0 +1,8 @@
|
||||||
|
<view class="main">
|
||||||
|
<view class="orders-box">
|
||||||
|
<view class="order-number">
|
||||||
|
<view>一家师大学生经营的店铺</view>
|
||||||
|
</view>
|
||||||
|
<view class="order-number2"> .大雄出品.</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
|
@ -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;
|
||||||
|
}
|
|
@ -24,7 +24,8 @@ Page({
|
||||||
config: {
|
config: {
|
||||||
appid: "wx865aefa5a7115ae0",
|
appid: "wx865aefa5a7115ae0",
|
||||||
key: "d5a58d44588b42cbbe01daa5cfa4e792"
|
key: "d5a58d44588b42cbbe01daa5cfa4e792"
|
||||||
}
|
},
|
||||||
|
notes: ""
|
||||||
// {id:1,title:'新鲜芹菜 半斤',image:'/image/s5.png',num:4,price:0.01},
|
// {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}
|
// {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暂时写死
|
// 假设用户ID暂时写死
|
||||||
orderData.openId = wx.getStorageSync('openid');
|
orderData.openId = wx.getStorageSync('openid');
|
||||||
orderData.status = 1;
|
orderData.status = 1;
|
||||||
|
orderData.notes = self.data.notes;
|
||||||
console.log("orderData", orderData)
|
console.log("orderData", orderData)
|
||||||
// 生成订单并请求支付
|
// 生成订单并请求支付
|
||||||
wx.request({
|
wx.request({
|
||||||
|
|
|
@ -25,12 +25,12 @@
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view>
|
<view>
|
||||||
<navigator url="../invoice/invoice">
|
<!-- <navigator url="../invoice/invoice">
|
||||||
<view class="orders-no-address">发票</view>
|
<view class="orders-no-address">发票</view>
|
||||||
</navigator>
|
</navigator> -->
|
||||||
<view class="order-notes">
|
<view class="order-notes">
|
||||||
<view class="order-notes-label">订单备注</view>
|
<view class="order-notes-label">订单备注</view>
|
||||||
<input class="order-notes-input" name="notes" value="{{address.detail}}" placeholder="选填" />
|
<input class="order-notes-input" name="notes" value="{{notes}}" bindinput="handleInput" placeholder="选填" />
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<view wx:if="{{nickname}}">
|
<view wx:if="{{nickname}}">
|
||||||
<image src="{{thumb}}" class="thumb"></image>
|
<image src="{{thumb}}" class="thumb"></image>
|
||||||
<text class="nickname">{{nickname}}</text>
|
<text class="nickname">{{nickname}}</text>
|
||||||
<text class="about">关于我们</text>
|
<navigator url="/page/component/aboutUs/aboutUs" class="about">关于我们</navigator>
|
||||||
</view>
|
</view>
|
||||||
<view wx:else="">
|
<view wx:else="">
|
||||||
<navigator url="/page/component/login/login">请登录</navigator>
|
<navigator url="/page/component/login/login">请登录</navigator>
|
||||||
|
|
Loading…
Reference in New Issue