Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/views/mall/components/details.vue

@@ -6,7 +6,7 @@
     <v-card class="carousel border-radius-8 white-bgc pa-5" style="width: 100%;">
       <div class=" d-flex">
         <!-- 图片展示-轮播 -->
-        <div style="width: 500px; height: 500px;">
+        <div style="width: 400px; height: 400px;">
           <div v-if="selectedSkuPicUrl" class="selectedSkuImgBox" @mouseover="showSelectedSkuImg = true" @mouseleave="showSelectedSkuImg = false">
             <v-img :src="selectedSkuPicUrl" :aspect-ratio="1" style="border-radius: 8px;"></v-img>
             <v-btn
@@ -34,7 +34,7 @@
               <div class="price mr-5"><span>￥</span>{{ selectedSkuPrice}}</div>
               <div class="marketPrice" v-if="selectedSkuMarketPrice && selectedSkuMarketPrice !== selectedSkuPrice">优惠前￥{{ selectedSkuMarketPrice}}</div>
             </div>
-            <div v-if="showActivePrices" class="right">下单送房卷</div>
+            <div v-if="showActivePrices" class="right">下单即可参与房券抽奖活动，百分百中奖，快来下单参与抽奖吧~</div>
           </div>
           <!-- 销量 -->
           <div class="salesCount mb-5 parameterColor"><span class="l-s-10">已售</span>：{{ state.goodsInfo?.salesCount || 0 }}</div>
@@ -71,7 +71,7 @@
   <loginPage v-if="showLogin" @loginSuccess="loginSuccess" @close="loginClose"></loginPage>
 
   <!-- 结算 -->
-  <CtDialog :visible="showSettlement" titleClass="text-h6" :widthType="3" title="订单信息" @submit="handleSubmit" @close="handleClose">
+  <CtDialog :visible="showSettlement" titleClass="text-h6" :widthType="3" title="订单提交" submitText="提交支付" @submit="handleSubmit" @close="handleClose">
     <confirm ref="confirmRef" :data="skuInfo" @orderCreated="orderCreated"></confirm>
   </CtDialog>
   
@@ -112,7 +112,7 @@ const carouselHover = ref(false)
 const showSelectedSkuImg = ref(false)
 
 const showPrize = ref(false)
-const showActivePrices = ref(false) // 下单送房卷
+const showActivePrices = ref(false) // 下单送房券
 const lotteryId = ref('')
 // 获取商品详情
 const getData = async () => {
@@ -255,8 +255,8 @@ const loginClose = () => {
   color: #7a7a7a;
 }
 .prices {
-  display: flex;
-  justify-content: space-between;
+  // display: flex;
+  // justify-content: space-between;
   font-size: 28px;
   border-radius: 8px;
   width: 80%;

src/views/mall/components/details/s-select-sku.vue

@@ -43,8 +43,8 @@
     </div>
     <!-- 操作区 -->
     <div>
-      <v-btn class="buttons" color="primary" @click="onBuy">立即购买</v-btn>
-      <v-btn class="ml-3 px-8" color="warning" @click="onAddCart">加入购物车</v-btn>
+      <v-btn color="primary" width="200" @click="onBuy">立即购买</v-btn>
+      <v-btn class="ml-3" color="warning" width="200" @click="onAddCart">加入购物车</v-btn>
     </div>
   </div>
 </template>