no message

src/main.js

@@ -35,7 +35,7 @@ Vue.prototype.selectDictLabel = selectDictLabel
 Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
 Vue.prototype.apiUrl = process.env.VUE_APP_BASE_API
-
+Vue.prototype.deepClone = deepClone
 Vue.prototype.msgSuccess = function (msg) {
   this.$message({ showClose: true, message: msg, type: "success" });
 }

src/views/entry/newyuncang.vue

@@ -181,18 +181,6 @@
         <div class="brand-carousel">
           <el-carousel ref="cardShow" @change="brandCarChange()" :autoplay="false" arrow="never" indicator-position="none" type="card" class="card-show" height="400px" style="margin: 20px auto;">
             <el-carousel-item name="1" class="pre-el-carousel-item">
-<<<<<<< HEAD
-              <img src="../../assets/image/website/fs.png" alt="">
-            </el-carousel-item>
-            <el-carousel-item name="2" class="pre-el-carousel-item">
-              <img src="../../assets/image/website/dq.png" alt="">
-            </el-carousel-item>
-            <el-carousel-item name="3" class="pre-el-carousel-item">
-              <img src="../../assets/image/website/sp.png" alt="">
-            </el-carousel-item>
-            <el-carousel-item name="4" class="pre-el-carousel-item">
-              <img src="../../assets/image/website/my.png" alt="">
-=======
               <img src="../../assets/image/website/clothesImgs.png" alt="">
             </el-carousel-item>
             <el-carousel-item name="2" class="pre-el-carousel-item">
@@ -203,7 +191,6 @@
             </el-carousel-item>
             <el-carousel-item name="4" class="pre-el-carousel-item">
               <img src="../../assets/image/website/maternalImgs.png" alt="">
->>>>>>> dev_hxz
             </el-carousel-item>
           </el-carousel>
         </div>