Compare commits

..

No commits in common. "67f1aa8715dc9e7099e54d6fa17215b9acf4d3d9" and "7408339b73b0035267c9a0c5b322449b42eb9f3a" have entirely different histories.

View File

@ -37,9 +37,9 @@
<text>{{ formatTimestamp(item.createTime) }}</text> <text>{{ formatTimestamp(item.createTime) }}</text>
</view> </view>
<view class="line3"> <view class="line3">
<view v-if="item.orderStatus == '0'" @click="goPay(item)" class="showOrder">支付</view> <view @click="goPay(item)" class="showOrder">支付</view>
<view v-if="item.goodsType == '2'" @click="gotoDetail(item)" class="showOrder">查看订单</view> <view @click="gotoDetail(item)" class="showOrder">查看订单</view>
<view @click="gotoEvaluate(item)" class="evaluate" v-if="item.goodsType == '2' && item.orderStatus === '1' && !item.commentDesc">评价订单</view> <view @click="gotoEvaluate(item)" class="evaluate" v-if="item.orderStatus === '1' && !item.commentDesc">评价订单</view>
</view> </view>
</view> </view>
@ -176,7 +176,7 @@ export default {
async goPay(data) { async goPay(data) {
let that = this let that = this
await request({ await request({
url: '/userClient/pay/toPay', url: '/pay/toPay',
method: 'get', method: 'get',
params: {orderId: data.id} params: {orderId: data.id}
}).then((res) => { }).then((res) => {