Merge branch 'dev_v3' of http://git.dgtis.com/armg/wxapp_shuibei into dev_v3

pages/goods/goods_details/index.vue

@@ -33,7 +33,7 @@
 								<view style="width:100%;">
 									<view class="share acea-row row-between row-bottom">
 										<view class="money font-color">
-											<text class="num">￥{{ attr.productSelect.storePrice }}</text>
+											<text class="num">￥{{ calcNumPrice }}</text>
 										</view>
 										<!--                    <view @click="listenerActionSheet" class="share share-top">-->
 										<!--                      <uni-icons size="24" type="redo"></uni-icons>-->
@@ -1334,19 +1334,18 @@
 			current: item[0],
 		});
 	};
-	const calcNumPrice = (productSelect) => {
-		const {
-			price,
-			cart_num,
-			additionalAmount,
-			weight
-		} = productSelect;
-		``;
-		// 计算总价并保留两位小数
-		const total =
-			Number(price) * Number(weight) * Number(cart_num) + additionalAmount;
-		return total.toFixed(2);
-	};
+  const calcNumPrice = computed(() => {
+    if (!attr.value?.productSelect) {
+      return "0.00";
+    }
+    const { price, cart_num, additionalAmount, weight } = attr.value.productSelect;
+
+    // 计算总价：工费 * 重量 * 数量 + 附加费
+    const total =
+        (Number(price) * Number(weight) + Number(additionalAmount || 0)) *
+        Number(cart_num);
+    return total.toFixed(2);
+  });
 	const selectValue = () => {
 		let val = '',
 			name = '';

pages/merchantCenters/productCate/productCate.vue

@@ -56,7 +56,7 @@
 				</view>
 				<view class="pop-ipt">
 					<textarea class="item-textarea" @confirm="ensureAttrHandle" maxlength="100" :focus="iptFocus"
-						v-model="cipt" cursorSpacing="100" :placeholder="ciptPlaceholder" />
+						v-model="cipt" cursorSpacing="200" :placeholder="ciptPlaceholder" :show-confirm-bar="false" />
 				</view>
 				<view class="action-btn" @click="ensureAttrHandle"> 确定 </view>
 			</view>

pages/merchantCenters/releaseProduct.vue

@@ -266,7 +266,7 @@
 		</view>
 
 		<!-- 发布按钮 -->
-		<view class="btn-view">
+		<view class="btn-view" :style="btnViewStyle">
 			<button class="submit" @click="submitForm">立即发布</button>
 		</view>
 
@@ -515,8 +515,23 @@
 		}
 	});
 
+  // 键盘高度监听
+  const keyboardHeight = ref(0);
+
+  // 计算按钮容器的样式
+  const btnViewStyle = computed(() => {
+    return {
+      position: keyboardHeight.value > 0 ? `relative` : 'fixted',
+    };
+  });
+
 	// 页面生命周期
-	onShow(() => {})
+	onShow(() => {
+    uni.onKeyboardHeightChange((res) => {
+      console.log('键盘高度变化:', res.height);
+      keyboardHeight.value = res.height;
+    });
+  })
 
 	onLoad(async (options) => {
 		appStore.SET_CPATTR([])

pages/order_details/index.vue

@@ -78,23 +78,26 @@
 						    orderInfo.mallType !== 1 &&
 						    type === 'normal'
 						  ">
-          <view hover-class="none" @click="changeProduct"
-						   class="cancel" style="margin-right: 10rpx;"  v-if="orderInfo.exchangeStatus === 0 && orderInfo.refundStatus === 0 && isGoodsReturn == false">
-            申请换货
-          </view>
-          <navigator hover-class="none" :url="
+          <view v-if="orderInfo.status == 3">
+            <view hover-class="none" @click="changeProduct"
+                  class="cancel" style="margin-right: 10rpx;"  v-if="orderInfo.exchangeStatus === 0 && orderInfo.refundStatus === 0 && isGoodsReturn == false">
+              申请换货
+            </view>
+            <navigator hover-class="none" :url="
 						    '/pages/users/goods_change/index?orderId=' + orderInfo.orderId"
-                class="cancel" style="margin-right: 10rpx;"  v-if="orderInfo.exchangeStatus === 2 && orderInfo.refundStatus === 0 && isGoodsReturn == false">
-            退货信息填写
-          </navigator>
-          <view hover-class="none"
-                class="cancel" style="margin-right: 10rpx;"  v-if="orderInfo.exchangeStatus === 4 && orderInfo.refundStatus === 0 && isGoodsReturn == false">
-            换货中
-          </view>
-          <view hover-class="none"
-                class="cancel" style="margin-right: 10rpx;"  v-if="orderInfo.exchangeStatus === 1 && orderInfo.refundStatus === 0 && isGoodsReturn == false">
-            换货申请中
+                       class="cancel" style="margin-right: 10rpx;"  v-if="orderInfo.exchangeStatus === 2 && orderInfo.refundStatus === 0 && isGoodsReturn == false">
+              退货信息填写
+            </navigator>
+            <view hover-class="none"
+                  class="cancel" style="margin-right: 10rpx;"  v-if="orderInfo.exchangeStatus === 4 && orderInfo.refundStatus === 0 && isGoodsReturn == false">
+              换货中
+            </view>
+            <view hover-class="none"
+                  class="cancel" style="margin-right: 10rpx;"  v-if="orderInfo.exchangeStatus === 1 && orderInfo.refundStatus === 0 && isGoodsReturn == false">
+              换货申请中
+            </view>
           </view>
+
 					<navigator hover-class="none" :url="
 						    '/pages/users/goods_return/index?orderId=' + orderInfo.orderId
 						  " class="cancel" v-if="orderInfo.refundStatus === 0 && isGoodsReturn == false && orderInfo.exchangeStatus === 0">
@@ -261,7 +264,7 @@
 					</navigator>
 					<view class="wuliu align-center buy" v-if="orderInfo.status == 3 && orderInfo.type !== 1" @click="goOrderConfirm">再次购买
 					</view>
-					<view class="align-center shouhuo" v-if="orderInfo.status == 1" @tap="confirmOrder">确认收货</view>
+					<view class="align-center shouhuo" v-if="orderInfo.status == 1" @tap="confirmOrder" style="width: 100%;">确认收货</view>
 					
 					
 				</view>