Merge branch 'dev' of http://git.izouma.com/xiongzhu/raex_front into dev

.env.development

@@ -1,4 +1,4 @@
-VUE_APP_BASE_URL=https://www.raex.vip/
+VUE_APP_BASE_URL=https://test.raex.vip/
 NODE_ENV=development
 VUE_APP_PUBLIC_PATH=/
 ASSETS_PATH=raex

src/views/user/ShoppingCart.vue

@@ -59,7 +59,13 @@
             >
                 <div class="box-list_con" v-for="(item, index) in collectionList" :key="index" @click="settle(index)">
                     <img :src="item.check ? select : unchecked" alt="" class="box-list_con_check" />
-                    <van-image width="80" height="80" :src="item.pic" fit="contain" radius="8" />
+                    <van-image
+                        width="80"
+                        height="80"
+                        :src="getImg(changeImgs(item.picFile))"
+                        fit="contain"
+                        radius="8"
+                    />
                     <div v-if="item.type == 'DOMAIN'" class="box-list_con_right">
                         <div class="box-list_con_right_top">
                             <img :src="require('@assets/png-da-zi@3x.png')" alt="" class="box-list_con_right_top_img" />
@@ -155,7 +161,9 @@
 <script>
 import { Dialog } from 'vant';
 import { mapState } from 'vuex';
+import product from '../../mixins/product';
 export default {
+    mixins: [product],
     data() {
         return {
             active: 'ALL',

src/views/user/ShoppingCartSubmit.vue

@@ -8,7 +8,7 @@
                     <div class="collection_information_right">
                         <div class="collection_information_right_name">{{ item.name }}</div>
                         <div class="collection_information_right_no" v-if="item.type == 'DOMAIN'">
-                            剩余时长：{{ item.endTime }}
+                            <!-- 剩余时长：{{ item.endTime }} -->
                         </div>
                         <div class="collection_information_right_no" v-else>{{ item.number }}</div>
                         <div class="collection_information_right_price_one">¥{{ item.price }}</div>
@@ -370,7 +370,8 @@ export default {
                     font-weight: 400;
                     color: #939599;
                     line-height: 24px;
-                    margin-bottom: 6px;
+                    // margin-bottom: 6px;
+                    margin-bottom: 30px;
                 }
 
                 .collection_information_right_price_one {