ソースを参照

feat: 更新支付图标路径并修复多个页面问题

更新支付相关图标路径至统一目录
修复订单详情页退款按钮显示逻辑
调整输入框类型为数字输入
优化滚动事件处理
添加空状态插槽支持
统一环境配置API地址
ylong 1 週間 前
コミット
d5ff862bcb

+ 1 - 1
.env.dev.js

@@ -1,5 +1,5 @@
 export default {
     "NODE_ENV": 'development',
-    "apiUrl":"https://bk.shuhi.com",
+    "apiUrl":"https://bpi.shuhi.com",
     "apiUrlPrefix":"/api",
 };

+ 2 - 2
pages-car/components/cart-item.vue

@@ -66,8 +66,8 @@
 
                 <!-- 数量加减 -->
                 <view @click.stop>
-                    <u-number-box v-model="item.quantity" :min="1" :max="item.availableStock || 99" :disabled="!isValid"
-                        @change="onNumChange" :size="24"></u-number-box>
+                    <u-number-box v-model="item.quantity" :min="1" :max="item.availableStock || 99"
+                        :disabled="!isValid" @change="onNumChange" :size="24"></u-number-box>
                 </view>
             </view>
         </view>

+ 1 - 1
pages-car/components/refund-step-two.vue

@@ -101,7 +101,7 @@
 				<view class="popup-content">
 					<view class="input-row">
 						<text>退款金额:</text>
-						<u-input v-model="tempMoney" type="number" placeholder="请输入退款金额" class="money-input" />
+						<u-input v-model="tempMoney" type="digit" placeholder="请输入退款金额" class="money-input" />
 					</view>
 					<view class="max-hint">最大可退金额: ¥{{ maxMoneyForCurrent }}</view>
 				</view>

+ 3 - 3
pages-car/pages/cashier-desk.vue

@@ -7,7 +7,7 @@
                 <!-- #ifdef MP-WEIXIN -->
                 <view class="payment-item">
                     <view class="left">
-                        <image src="/pages-mine/static/pay1.png" class="payment-icon"></image>
+                        <image src="/static/payment/pay1.png" class="payment-icon"></image>
                         <text>微信支付</text>
                     </view>
                     <u-radio active-color="#38C148" name="2" />
@@ -16,7 +16,7 @@
                 <!-- #ifdef MP-ALIPAY -->
                 <view class="payment-item">
                     <view class="left">
-                        <image src="/pages-mine/static/alipay.png" class="payment-icon"></image>
+                        <image src="/static/payment/alipay.png" class="payment-icon"></image>
                         <text>支付宝支付</text>
                     </view>
                     <u-radio active-color="#38C148" name="2" />
@@ -25,7 +25,7 @@
 
                 <view class="payment-item">
                     <view class="left">
-                        <image src="/pages-mine/static/pay2.png" class="payment-icon"></image>
+                        <image src="/static/payment/pay2.png" class="payment-icon"></image>
                         <text>余额支付(余额{{ orderInfo.accountMoney || 0 }})</text>
                         <view class="discount-tag">8折优惠</view>
                     </view>

+ 22 - 14
pages-car/pages/order-detail.vue

@@ -5,22 +5,26 @@
             <view class="status-text">{{ statusText }}</view>
             <view class="status-desc" v-if="orderInfo.status == '2'">
                 订单编号:{{ orderInfo.orderId }}
-                <image src="/pages-mine/static/copy.png" class="copy-icon" @click="copyOrderNo" mode="aspectFit"></image>
+                <image src="/pages-mine/static/copy.png" class="copy-icon" @click="copyOrderNo" mode="aspectFit">
+                </image>
             </view>
             <view class="status-desc" v-else-if="orderInfo.status == '3'">
                 订单编号:{{ orderInfo.orderId }}
-                <image src="/pages-mine/static/copy.png" class="copy-icon" @click="copyOrderNo" mode="aspectFit"></image>
+                <image src="/pages-mine/static/copy.png" class="copy-icon" @click="copyOrderNo" mode="aspectFit">
+                </image>
             </view>
             <view class="status-desc-block" v-else-if="orderInfo.status == '8'">
                 <view class="status-tip">还剩9天22时18分自动确认收货</view>
                 <view class="status-desc-row">
                     订单编号:{{ orderInfo.orderId }}
-                    <image src="/pages-mine/static/copy.png" class="copy-icon" @click="copyOrderNo" mode="aspectFit"></image>
+                    <image src="/pages-mine/static/copy.png" class="copy-icon" @click="copyOrderNo" mode="aspectFit">
+                    </image>
                 </view>
             </view>
             <view class="status-desc" v-else>
                 订单编号:{{ orderInfo.orderId }}
-                <image src="/pages-mine/static/copy.png" class="copy-icon" @click="copyOrderNo" mode="aspectFit"></image>
+                <image src="/pages-mine/static/copy.png" class="copy-icon" @click="copyOrderNo" mode="aspectFit">
+                </image>
             </view>
         </view>
 
@@ -40,15 +44,16 @@
         </view>
 
         <!-- 物流信息 -->
-        <view class="info-card express-card" 
-            v-if="['3', '4', '8', '12', '10'].includes(String(orderInfo.status)) && orderInfo.waybillCode" 
+        <view class="info-card express-card"
+            v-if="['3', '4', '8', '12', '10'].includes(String(orderInfo.status)) && orderInfo.waybillCode"
             @click.stop="viewLogistics">
             <view class="icon-box">
                 <u-icon name="car" color="#38C148" size="48"></u-icon>
             </view>
             <view class="express-content">
                 <view class="express-name">{{ orderInfo.expressName || '快递' }}({{ orderInfo.waybillCode }})</view>
-                <view class="express-trace">{{ latestTrace ? (latestTrace.context || latestTrace.status) : '点击查看物流详情' }}</view>
+                <view class="express-trace">{{ latestTrace ? (latestTrace.context || latestTrace.status) : '点击查看物流详情' }}
+                </view>
             </view>
             <u-icon name="arrow-right" color="#999" size="28"></u-icon>
         </view>
@@ -59,7 +64,8 @@
                 <image :src="goods.cover" mode="aspectFill" class="goods-cover"></image>
                 <view class="goods-info">
                     <view class="goods-title">{{ goods.bookName }}</view>
-                    <view class="goods-quality" v-if="goods.conditionType || goods.bookConditionType">品相:{{ (goods.conditionType || goods.bookConditionType) | conditionText }}</view>
+                    <view class="goods-quality" v-if="goods.conditionType || goods.bookConditionType">品相:{{
+                        (goods.conditionType || goods.bookConditionType) | conditionText }}</view>
                     <view class="price-box">
                         <text class="price">¥{{ goods.price }}</text>
                         <text class="num">x{{ goods.num }}</text>
@@ -70,7 +76,8 @@
                     <u-button v-if="goods.refundOrderId" size="mini" shape="circle" plain
                         @click="goToRefundDetail(goods.refundOrderId)"
                         custom-style="margin-left: 20rpx; height: 50rpx; line-height: 50rpx; color: #333; border-color: #ccc;">查看详情</u-button>
-                    <u-button v-show="!goods.refundOrderId" size="mini" shape="circle" plain @click="applyRefund(goods)"
+                    <u-button v-show="!goods.refundOrderId && orderInfo.status > 1" size="mini" shape="circle" plain
+                        @click="applyRefund(goods)"
                         custom-style="margin-left: 20rpx; height: 50rpx; line-height: 50rpx; color: #333; border-color: #ccc;">申请售后</u-button>
                 </view>
             </view>
@@ -83,7 +90,8 @@
                 </view>
                 <view class="row">
                     <text>商品金额</text>
-                    <text class="goods-total">¥{{ (orderInfo.totalMoney - (orderInfo.expressMoney || 0)).toFixed(2) }}</text>
+                    <text class="goods-total">¥{{ (orderInfo.totalMoney - (orderInfo.expressMoney || 0)).toFixed(2)
+                        }}</text>
                 </view>
                 <view class="row">
                     <text>优惠金额</text>
@@ -495,22 +503,22 @@ export default {
 
         &.express-card {
             align-items: center;
-            
+
             .icon-box {
                 margin-right: 20rpx;
             }
-            
+
             .express-content {
                 flex: 1;
                 margin-right: 20rpx;
-                
+
                 .express-name {
                     color: #38C148;
                     font-size: 28rpx;
                     margin-bottom: 10rpx;
                     font-weight: 500;
                 }
-                
+
                 .express-trace {
                     color: #333;
                     font-size: 26rpx;

+ 1 - 0
pages-car/pages/red-packet.vue

@@ -9,6 +9,7 @@
             url="/token/shop/order/myCouponList"
             method="POST"
             @updateList="updateList"
+            slotEmpty
         >
             <view class="list-container">
                 <red-packet-item v-for="(item, index) in list" :key="index" :info="item" @use="handleUse" />

+ 4 - 4
pages-mine/pages/cashier-desk.vue

@@ -7,7 +7,7 @@
                 <!-- #ifdef MP-WEIXIN -->
                 <view class="payment-item">
                     <view class="left">
-                        <image src="../static/pay1.png" class="payment-icon"></image>
+                        <image src="/static/payment/pay1.png" class="payment-icon"></image>
                         <text>微信支付</text>
                     </view>
                     <u-radio active-color="#38C148" name="1" />
@@ -16,7 +16,7 @@
                 <!-- #ifdef MP-ALIPAY -->
                 <view class="payment-item">
                     <view class="left">
-                        <image src="../static/alipay.png" class="payment-icon"></image>
+                        <image src="/static/payment/alipay.png" class="payment-icon"></image>
                         <text>支付宝支付</text>
                     </view>
                     <u-radio active-color="#38C148" name="1" />
@@ -25,7 +25,7 @@
 
                 <view class="payment-item">
                     <view class="left">
-                        <image src="../static/pay2.png" class="payment-icon"></image>
+                        <image src="/static/payment/pay2.png" class="payment-icon"></image>
                         <text>余额支付(余额{{ baseInfo.restMoney || 0 }})</text>
                     </view>
                     <u-radio active-color="#38C148" name="2" />
@@ -33,7 +33,7 @@
 
                 <view class="payment-item">
                     <view class="left">
-                        <image src="../static/pay2.png" class="payment-icon"></image>
+                        <image src="/static/payment/pay2.png" class="payment-icon"></image>
                         <text>组合支付</text>
                     </view>
                     <u-radio active-color="#38C148" name="3" />

+ 2 - 2
pages/sell/index.vue

@@ -28,8 +28,8 @@ export default {
 	},
 	onPageScroll(e) {
 		const comp = this.$refs.sellContainer;
-		if (!comp || !comp.onPageScroll) return;
-		comp.onPageScroll(e.scrollTop);
+		if (!comp) return;
+		comp.scrollTop = e.scrollTop;
 	},
 	methods: {
 		

BIN
static/adderss.png


BIN
static/address/adderss.png


BIN
static/copy.png


BIN
static/payment/alipay.png


BIN
static/payment/pay1.png


BIN
static/payment/pay2.png