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

src/views/mall/components/details/order/addressSelection.vue

@@ -22,14 +22,9 @@
           <div class="addressCon" v-else>
             <div class="setaddress">设置收货地址</div>
           </div>
-          <div class="iconfont">
-            <div class="ss-rest-button">
-              <div class="_icon-forward" />
-            </div>
-          </div>
         </div>
         <div class="mx-1">
-          <v-btn color="primary" variant="text" @click="onSelectAddress">切换</v-btn>
+          <v-btn color="primary" variant="text" @click="onSelectAddress">{{ state.addressInfo?.name ? '切换' : '去添加'}}</v-btn>
         </div>
       </div>
     </v-card>

src/views/mall/components/details/order/confirm.vue

@@ -309,8 +309,9 @@
     margin-bottom: 20px;
   }
   .goodsListBox {
-    background: linear-gradient(to bottom, #e93323 0%, #e93323 100%);
-    // background: linear-gradient(to bottom, var(--v-primary-base) 0%, var(--v-primary-base) 100%);
+    // background: linear-gradient(to bottom, #e93323 0%, #e93323 100%);
+    background: linear-gradient(to bottom, var(--v-primary-base) 0%, var(--v-primary-base) 100%);
+    border-radius: 1px;
   }
   .order-item {
     color: #7a7a7a;

src/views/mall/components/s-goods-item/index.vue

@@ -102,6 +102,7 @@
   background-color: var(--default-bgc);
   border-radius: 8px;
   padding: 12px;
+  // border: 1px dashed #000000;
 }
 .buyNum {
   color: #777;