Ver código fonte

修改bug

修改bug
dangyunlong 1 semana atrás
pai
commit
d9b2c42ae9
1 arquivos alterados com 0 adições e 11 exclusões
  1. 0 11
      src/views/news/addGood.vue

+ 0 - 11
src/views/news/addGood.vue

@@ -106,17 +106,10 @@
               </el-upload>
             </div>
           </el-form-item>
-<<<<<<< Updated upstream
-          <div class="imgBox" style="margin-left: 125px ;margin-bottom: 20px; padding-top: -20px;">
-            最多可上传5张,每张图片大小不能超过 500 K,推荐上传图片尺寸 宽1000像素 高1000像素。(首张显示为商品头图)
-          </div>
-          <el-form-item label="商品关键词:" prop="keyword" class="custom-align-right">
-=======
           <div class="imgBox" style="margin-left: 100px ;margin-bottom: 20px; padding-top: -20px;">
             最多可上传5张,每张图片大小不能超过500K,推荐上传图片尺寸
             宽1000像素 高1000像素。(首张显示为商品头图)</div>
           <!-- <el-form-item label="商品关键词:" prop="keyword" class="custom-align-right">
->>>>>>> Stashed changes
             <el-input v-model="form.keyword" autocomplete="off" placeholder="请输入商品关键词"></el-input>
           </el-form-item> -->
 
@@ -236,12 +229,8 @@ export default {
       searchCascaderKey: 0, //列表缓存key
       // imgurl: ['http://192.168.1.127:9501/image/20250227/1740674706184955.jpg', 'http://192.168.1.127:9501/image/20250227/1740674706184955.jpg'],//图片路径
       website_id: 2,
-<<<<<<< Updated upstream
-      creatNews_user_type: 0,//判断用户类型',
-=======
       tags: [],//标签数组
 
->>>>>>> Stashed changes
       //提交表单
       form: {
         //1.1使用了外链