clunt
/
dingdong-mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整请求后台的地址；增加加价标识

This commit is contained in:
donqi 2022-10-25 00:36:49 +08:00
parent 4787c3e75e
commit 04986cb28a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/js/request.js
View File

@ -11,7 +11,7 @@ export default {
title: '加载中' title: '加载中'
}) })
// request 触发前拼接 url // request 触发前拼接 url
args.url = 'https://www.opsoul.com' + args.url; args.url = 'https://www.opsoul.com:8881' + args.url;
// args.url = 'http://192.168.2.42:80' + args.url; // args.url = 'http://192.168.2.42:80' + args.url;
// args.url = 'http://127.0.0.1:80' + args.url; // args.url = 'http://127.0.0.1:80' + args.url;
if (args.data && Object.prototype && Object.prototype.toString.call(args.data) === '[object Object]') { if (args.data && Object.prototype && Object.prototype.toString.call(args.data) === '[object Object]') {

5
pages/my/my-order.vue
View File

@ -34,7 +34,7 @@
<view class="margin-top-sm" @click="showServDetail(shopOrder)"> <view class="margin-top-sm" @click="showServDetail(shopOrder)">
<product-picked :product="shopOrder" :pickedList="shopOrder.standardList"></product-picked> <product-picked :product="shopOrder" :pickedList="shopOrder.standardList"></product-picked>
</view> </view>
<view class="flex justify-end align-end padding-bottom-sm" @click="showServDetail(shopOrder)"> <view class="flex justify-end align-end padding-bottom-xs" @click="showServDetail(shopOrder)">
<view class="margin-right-sm"><text>总价</text><text class="text-price text-red">{{shopOrder.totalMoney}}</text> <view class="margin-right-sm"><text>总价</text><text class="text-price text-red">{{shopOrder.totalMoney}}</text>
</view> </view>
<view class="margin-right-sm"><text>优惠</text><text class="text-price text-red">{{shopOrder.discountMoney}}</text> <view class="margin-right-sm"><text>优惠</text><text class="text-price text-red">{{shopOrder.discountMoney}}</text>
@ -47,7 +47,8 @@
class="text-price text-red text-lg text-bold">{{shopOrder.payMoney}}</text></view> class="text-price text-red text-lg text-bold">{{shopOrder.payMoney}}</text></view>
<view class="text-lg" v-else-if="shopOrder.payStatus == 0"><text>需付款</text><text <view class="text-lg" v-else-if="shopOrder.payStatus == 0"><text>需付款</text><text
class="text-price text-red text-lg text-bold">{{shopOrder.payMoney + shopOrder.changeMoney}}</text></view> class="text-price text-red text-lg text-bold">{{shopOrder.payMoney + shopOrder.changeMoney}}</text></view>
</view> </view>
<view class="padding-bottom-sm flex justify-end align-end text-red text-lg" v-if="shopOrder.payStatus == 1 && shopOrder.changeMoney">您有报价/加价申请待付款中......</view>
<view v-if="orderType === 0" class="padding-tb-sm"> <view v-if="orderType === 0" class="padding-tb-sm">
<view class="flex justify-end"> <view class="flex justify-end">
<button v-if="[0,1].indexOf(shopOrder.orderStatus) >= 0" class="cu-btn bg-gray margin-right-sm shadow-blur" @click="showModalByRef('confirmModal', shopOrder)">取消订单</button> <button v-if="[0,1].indexOf(shopOrder.orderStatus) >= 0" class="cu-btn bg-gray margin-right-sm shadow-blur" @click="showModalByRef('confirmModal', shopOrder)">取消订单</button>