This commit is contained in:
mkm 2024-06-09 20:32:49 +08:00
parent b8cba26b5a
commit 83d9ff4dd3
30 changed files with 28 additions and 25 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 520 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 760 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

View File

@ -19,12 +19,12 @@
<text class="green" v-if="item.is_send == 1">可配送</text>
</view>
<view class="multiple-card-item-left-info">
<u-image src="../../multipleShop/images/location_small.webp" width="24rpx"
<u-image src="../../multipleShop/images/location_small.jpg" width="24rpx"
height="24rpx" />
<text>{{item.detailed_address || '-'}}</text>
</view>
<view class="multiple-card-item-left-info">
<u-image src="../../multipleShop/images/time.webp" width="24rpx" height="24rpx" />
<u-image src="../../multipleShop/images/time.jpg" width="24rpx" height="24rpx" />
<text
v-if="item.day_start && item.day_end">{{item.day_start + '-' + item.day_end}}</text>
<text v-else>9:00-18:00</text>
@ -35,11 +35,11 @@
</view>
<view class="multiple-card-item-right-icon">
<view style="margin-right: 30rpx;" @click.stop="onPhoneCall(item.phone)">
<u-image src="../../multipleShop/images/phone.webp" width="48rpx"
<u-image src="../../multipleShop/images/phone.jpg" width="48rpx"
height="48rpx" />
</view>
<view @click.stop="onNavgation(item)">
<u-image src="../../multipleShop/images/location.webp" width="48rpx"
<u-image src="../../multipleShop/images/location.jpg" width="48rpx"
height="48rpx" />
</view>
</view>

View File

@ -38,7 +38,7 @@
<view class="order-list-item-order_num">订单编号:{{item.order_id}}</view>
<view class="order-list-item-trans">
<view class="order-list-item-trans-left" @click.stop="onClickToWrite(item)">
<u-image width="76rpx" height="76rpx" src="../images/write_done.webp" />
<u-image width="76rpx" height="76rpx" src="../images/write_done.jpg" />
</view>
<view class="order-list-item-trans-right">

View File

@ -43,8 +43,10 @@
<view class="detail-li-r">
<view class="top" style="margin-bottom: 14rpx;">
<text>供销经营礼包</text>
<text style='font-size: 32rpx;font-weight: bold;'>+{{item.amount}}</text>
<text>{{item.title}}</text>
<text style='font-size: 32rpx;font-weight: bold;' v-if="item.type=='in'">+{{item.amount}}</text>
<text style='font-size: 32rpx;font-weight: bold;' v-else>-{{item.amount}}</text>
</view>
<view class="top">
<text style='font-size: 24rpx;'>{{item.create_time}}</text>

View File

@ -40,9 +40,9 @@
<block v-for="(item,indx) in chargeRecordList" :key="indx">
<view class="detail-card-item">
<view class="detail-card-item-left">
<u-image width="60rpx" height="60rpx" src="../../static/icon/order.webp"
<u-image width="60rpx" height="60rpx" src="../../static/icon/order.jpg"
v-if="item.category=='user_order_pay'" />
<u-image width="60rpx" height="60rpx" src="../../static/icon/diamond.webp" v-else />
<u-image width="60rpx" height="60rpx" src="../../static/icon/diamond.jpg" v-else />
</view>
<view class="detail-card-item-right">
<view class="detail-card-item-right-money">

View File

@ -131,6 +131,7 @@
<view class="btn">
<u--icon name="plus-circle-fill" size="20" color="#20b128"></u--icon>
</view>
</view>
</view>
</view>
@ -256,13 +257,13 @@
getGoodList();
}
const addCart = (id, cart_num) => { //
const addCart = (product_id, cart_num) => { //
cartCreateApi({
cart_num: cart_num,
is_new: 0, // 01
// goods_id: id,
store_id: where.value.store_id,
product_id: id
product_id: product_id
}).then(res => {
getCartList();
}).catch(err => {
@ -461,7 +462,7 @@
}
});
addCart(data.id, data.cart_num);
addCart(data.product_id, data.cart_num);
}
//
const settleAccounts = () => {

View File

@ -80,21 +80,21 @@
</view>
<view class="list-item" @click="navTo(2)">
<image src="/static/icon/wait.webp">
<image src="/static/icon/wait.jpg">
</image>
<view class="">待核销</view>
<view class="badge" v-if="orderCount.waiting">{{orderCount.waiting}}</view>
</view>
<view class="list-item" @click="navTo(3)">
<image src="/static/icon/done.webp">
<image src="/static/icon/done.jpg">
</image>
<view class="">已核销</view>
<view class="badge" v-if="orderCount.receiving">{{orderCount.receiving}}</view>
</view>
<view class="list-item" @click="navTo(4)">
<image src="/static/icon/back.webp">
<image src="/static/icon/back.jpg">
</image>
<view class="">售后/退款</view>
<view class="badge" v-if="orderCount.applyRefund">{{orderCount.applyRefund}}</view>

View File

@ -27,7 +27,7 @@
</view>
<view class="" style="display: flex;margin-top: 20rpx;position: relative;">
<view style="translateX:-100rpx;">
{{item.unit}}
{{item.unit_name}}
</view>
<view style="position: absolute;right: -440rpx;font-size: 32rpx;">
x{{item.cart_num}}

View File

@ -34,12 +34,12 @@
color="#f6f6f6" :customStyle="{color:'#666666'}">修改</up-button></view>
</view>
</view> -->
<view v-if="!addressInfo.address_id" class="m-card row">
<!-- <view v-if="!addressInfo.address_id" class="m-card row">
<up-cell-group>
<up-cell title="我的地址" :isLink="true" :border="false" @click="openAddress()"></up-cell>
</up-cell-group>
</view>
<view v-else class="m-card m-address">
</view> -->
<view class="m-card m-address">
<view class="address-info" @click="showAddress = true" >
<view class="top">
<up-icon name="account"></up-icon>
@ -56,7 +56,7 @@
@click='orderInfo.shipping_type=2' v-if='orderInfo.default_delivery==1'>
自提
</view>
<view class="ship-type-item" v-if='true' @click='orderInfo.shipping_type=1'
<view class="ship-type-item" @click='orderInfo.shipping_type=1'
:class='{actShipItem:orderInfo.shipping_type==1 }'>
配送
</view>
@ -95,10 +95,10 @@
<view>运费</view>
<view><text>¥</text>0<text>.00</text></view>
</view>
<view class="row">
<view>活动折扣 <text>9</text></view>
<view class="row" v-if="orderInfo.activities==1" style="color: red;">
<view>活动折扣 <text>{{orderInfo.activity}}</text></view>
<view>
<text>-¥</text>{{c_price(orderInfo.vip_price, 0)}}<text>.{{c_price(orderInfo.vip_price, 1)}}</text>
-¥<text>{{orderInfo.activity_price}}</text>
</view>
</view>
</view>

BIN
static/icon/back.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 883 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
static/icon/diamond.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
static/icon/done.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
static/icon/order.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
static/icon/silver.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
static/icon/wait.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 558 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 860 B