Commit e712f302 authored by 罗超's avatar 罗超

1

parent 2ac85cb5
This diff is collapsed.
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<text>(含运费¥{{ data.FreightMoney.toFixed(2) }})</text> <text>(含运费¥{{ data.FreightMoney.toFixed(2) }})</text>
</view> </view>
<view class="btnBox"> <view class="btnBox">
<button class="btn" @click="modal = true">备注</button> <button class="btn" @click="showRemark">备注</button>
<button class="btn" v-if="data.OrderStatus === 1" @click="Offpayment"> <button class="btn" v-if="data.OrderStatus === 1" @click="Offpayment">
线下付款 线下付款
</button> </button>
...@@ -177,6 +177,9 @@ export default { ...@@ -177,6 +177,9 @@ export default {
.toString(); .toString();
return str; return str;
}, },
showRemark(){
this.modal = true;
},
// 修改备注 // 修改备注
setOrderInfo() { setOrderInfo() {
this.modal = false; this.modal = false;
......
...@@ -248,7 +248,7 @@ export default { ...@@ -248,7 +248,7 @@ export default {
let that = this; let that = this;
uni.showModal({ uni.showModal({
title: "提示", title: "提示",
content: "是否拒绝?", content: "确认拒绝?",
success: function (res) { success: function (res) {
if (res.confirm) { if (res.confirm) {
that.requestAdmin( that.requestAdmin(
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</view> </view>
</view> </view>
<view class="searchBox flex-between"> <view class="searchBox flex-between">
<view class="search flex-center"> <view class="search flex-center" @click="jumpSearch">
<u-icon name="search"></u-icon> <u-icon name="search"></u-icon>
<view>搜索</view> <view>搜索</view>
</view> </view>
...@@ -271,21 +271,6 @@ export default { ...@@ -271,21 +271,6 @@ export default {
day, day,
valueS: [9999, month - 1, day - 1], valueS: [9999, month - 1, day - 1],
valueE: [9999, month - 1, day - 1], valueE: [9999, month - 1, day - 1],
list: [
{
name: "全部",
},
{
name: "待收货",
},
{
name: "待付款",
},
{
name: "待评价",
count: 5,
},
],
currentTab: 0, currentTab: 0,
page_count: 1, page_count: 1,
msg: { msg: {
...@@ -339,6 +324,11 @@ export default { ...@@ -339,6 +324,11 @@ export default {
}; };
}, },
methods: { methods: {
jumpSearch(){
uni.navigateTo({
url: '/pages/MallMange/orderSearch'
});
},
goOrderSearch(){ goOrderSearch(){
uni.navigateTo({ uni.navigateTo({
url: '/pages/MallMange/orderSearch?orderType='+this.orderType url: '/pages/MallMange/orderSearch?orderType='+this.orderType
......
...@@ -219,9 +219,6 @@ ...@@ -219,9 +219,6 @@
</view> </view>
</view> </view>
</view> </view>
<view style="padding: 12px" v-if="recommend.length > 0">
<goodlist :list="recommend"></goodlist>
</view>
<view class="btn-box"> <view class="btn-box">
<view class="item"> <view class="item">
<u-button <u-button
...@@ -334,7 +331,6 @@ export default { ...@@ -334,7 +331,6 @@ export default {
padding: "0 30rpx", padding: "0 30rpx",
}, },
scrollTop: 0, scrollTop: 0,
recommend: [],
prevPage: "", prevPage: "",
themCustomStyle: { themCustomStyle: {
marginLeft: "20px", marginLeft: "20px",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment