This commit is contained in:
zmj 2024-07-06 16:20:28 +08:00
parent 77d4938aee
commit 801d2cb413
4 changed files with 855 additions and 853 deletions

View File

@ -1,27 +1,33 @@
<template> <template>
<view class="m-card m-good" v-for="(item, index) in lists" :key="index"> <block v-if="lists.length">
<view class="shop-check" @click="item.check=!item.check"> <view class="m-card m-good" v-for="(item, index) in lists" :key="index">
<image v-if="!item.check" src="@/static/icon/n-check.png"></image> <view class="shop-check" @click="item.check=!item.check">
<image v-else src="@/static/icon/check.png"></image> <image v-if="!item.check" src="@/static/icon/n-check.png"></image>
<image v-else src="@/static/icon/check.png"></image>
</view>
<view class="image">
<up-image width="160rpx" height="160rpx" :src="item.image"></up-image>
</view>
<view class="body-content">
<view>
<view class="title">
<view> <text>{{item.store_name }}</text> x<text>{{item.nums }}</text> </view>
<view>¥{{item.price}}</view>
</view>
</view>
<view class="time">
<view style="float: right;">
<up-number-box :min="1" :max="item.nums" v-model="item.num"></up-number-box>
</view>
</view>
</view>
</view> </view>
<view class="image"> </block>
<up-image width="160rpx" height="160rpx" :src="item.image"></up-image>
</view> <up-empty v-else mode="history" style="margin-top: 20vh;" text='没有更多内容了'>
<view class="body-content"> </up-empty>
<view>
<view class="title">
<view> <text>{{item.store_name }}</text> x<text>{{item.nums }}</text> </view>
<view>¥{{item.price}}</view>
</view>
</view>
<view class="time">
<view style="float: right;">
<up-number-box :min="1" :max="item.nums" v-model="item.num"></up-number-box>
</view>
</view>
</view>
</view>
<view style="height: 200rpx;" /> <view style="height: 200rpx;" />
<view class="bottom"> <view class="bottom">

File diff suppressed because it is too large Load Diff

View File

@ -116,8 +116,8 @@
<view class="card"> <view class="card">
<up-cell-group> <up-cell-group>
<!-- <up-cell v-if="userInfo.user_ship==1" title="赠品区" :isLink="true" url="/pageQuota/Gifts/index"></up-cell> <!-- <up-cell v-if="userInfo.user_ship==1" title="赠品区" :isLink="true" url="/pageQuota/Gifts/index"></up-cell> -->
<up-cell title="我的资产" :isLink="true" url="/pageQuota/asset/index"></up-cell> --> <up-cell title="我的资产" :isLink="true" url="/pageQuota/asset/index"></up-cell>
<up-cell title="我的地址" :isLink="true" url="/pagesOrder/addressList/addressList"></up-cell> <up-cell title="我的地址" :isLink="true" url="/pagesOrder/addressList/addressList"></up-cell>
<up-cell title="支付密码" :isLink="true" url="/pagesOrder/setPayPassword/index"></up-cell> <up-cell title="支付密码" :isLink="true" url="/pagesOrder/setPayPassword/index"></up-cell>
</up-cell-group> </up-cell-group>

View File

@ -98,7 +98,7 @@
<view class="row" v-if="[4,5,6].includes(userInfo.user_ship)" style="color: red;"> <view class="row" v-if="[4,5,6].includes(userInfo.user_ship)" style="color: red;">
<view>优惠减免</view> <view>优惠减免</view>
<view> <view>
<text>-¥</text>{{ c_price(orderInfo.activity_price, 0) }}<text>.{{ c_price(orderInfo.activity_price, 1) }}</text> <text>-¥</text>{{ c_price(orderInfo.frozen_money, 0) }}<text>.{{ c_price(orderInfo.frozen_money, 1) }}</text>
</view> </view>
</view> </view>
<view class="row" v-if="userInfo.user_ship==1 "> <view class="row" v-if="userInfo.user_ship==1 ">
@ -110,13 +110,13 @@
</view> </view>
<view class="m-card order-remark"> <view class="m-card order-remark">
<!-- <view style="display: flex;align-items: center;"> <view style="display: flex;align-items: center;">
<text style="margin-right: 20rpx;">是否存货</text> <text style="margin-right: 20rpx;">是否存货</text>
<up-radio-group v-model="is_storage" placement="row"> <up-radio-group v-model="is_storage" placement="row">
<up-radio activeColor="#20b128" label="立即提货" :name="0" style="margin-right: 10rpx;"></up-radio> <up-radio activeColor="#20b128" label="立即提货" :name="0" style="margin-right: 10rpx;"></up-radio>
<up-radio activeColor="#20b128" label="全部存货" :name="1"></up-radio> <up-radio activeColor="#20b128" label="全部存货" :name="1"></up-radio>
</up-radio-group> </up-radio-group>
</view> --> </view>
<view class="head-title" style="margin-top: 20rpx;"> <view class="head-title" style="margin-top: 20rpx;">
<text>订单备注</text> <text>订单备注</text>
<text>{{formData.remark.length}}/140</text> <text>{{formData.remark.length}}/140</text>