From dfc9667c902fdeb46332d816ee940959759c305b Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Thu, 22 Aug 2024 16:39:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BB=E5=8A=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=BC=96=E8=BE=91-=E6=98=AF=E5=90=A6=E8=B5=A0?=
 =?UTF-8?q?=E9=80=81=E5=95=86=E5=93=81=E5=BC=80=E5=85=B3=E5=85=A5=E5=8F=82?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/application/advertisement.vue       | 28 +++++++++++++------
 src/views/shop/components/extend.vue          |  6 +++-
 .../user_manage/components/addActive.vue      |  2 +-
 src/views/user_manage/user_list.vue           |  2 +-
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/views/application/advertisement.vue b/src/views/application/advertisement.vue
index 57938bd..08e9740 100644
--- a/src/views/application/advertisement.vue
+++ b/src/views/application/advertisement.vue
@@ -15,7 +15,7 @@
             </el-form-item>
             <el-form-item>
                 <el-button type="primary" @click="getList">查询</el-button>
-                <el-button type="primary" @click="dialogVisible = true;title='新增'">新增</el-button>
+                <el-button type="primary" @click="dialogVisible = true; title = '新增'">新增</el-button>
             </el-form-item>
         </el-form>
         <!--表格渲染-->
@@ -60,14 +60,22 @@
         <el-dialog :title="title + '广告'" :visible.sync="dialogVisible" width="60%">
             <el-form ref="form" :model="form" label-width="120px">
                 <el-form-item label="上传弹窗广告">
-                    <el-upload class="upload-demo" :action="qiNiuUploadApi" :headers="headers" :limit="1"
-                        :on-remove="removeEvent" :on-success="successEvent" :file-list="fileList">
-                        <el-button size="small" type="primary">点击上传</el-button>
-                        <div slot="tip" class="el-upload__tip">建议尺寸：520px*680px</div>
+                    <!-- <el-upload
+
+  :on-preview="handlePictureCardPreview"
+  :on-remove="handleRemove">
+  <i class="el-icon-plus"></i>
+</el-upload> -->
+
+
+                    <el-upload class="upload-demo" :action="qiNiuUploadApi" list-type="picture-card" :headers="headers"
+                        :limit="1" :on-remove="removeEvent" :on-success="successEvent" :file-list="fileList">
+                        <i class="el-icon-plus"></i>
                     </el-upload>
+                    <div slot="tip" class="el-upload__tip">建议尺寸：520px*680px</div>
                 </el-form-item>
                 <el-form-item label="圆角设置">
-                    <el-slider v-model="form.borderRadius"></el-slider>
+                    <el-slider v-model="form.borderRadius" :max="20"></el-slider>
                 </el-form-item>
                 <el-form-item label="弹窗位置">
                     <el-radio-group v-model="form.showPosition">
@@ -86,7 +94,7 @@
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="跳转页面">
-                    <el-select v-model="form.linkPath" placeholder="请选择">
+                    <el-select clearable v-model="form.linkPath" placeholder="请选择">
                         <el-option v-for="item in tourl" :key="item.id" :label="item.name" :value="item.path">
                         </el-option>
                     </el-select>
@@ -120,7 +128,6 @@ export default {
             form: {
                 sort: "",
                 path: "",
-                status: 1,
                 shopId: localStorage.getItem("shopId"),
                 showPosition: 'home',
                 frequency: "only_one"
@@ -173,7 +180,9 @@ export default {
             this.fileList.splice(index, 1);
         },
         async showChange(a, d) {
-            this.form.imgUrl = this.fileList
+            if (!d.imgUrl) {
+                this.form.imgUrl = this.fileList
+            }
             await adput({
                 ...d,
                 ...this.form
@@ -182,6 +191,7 @@ export default {
                 message: '成功',
                 type: 'success'
             })
+            this.getList()
         },
         async getto() {
             let res = await miniAppPagesget()
diff --git a/src/views/shop/components/extend.vue b/src/views/shop/components/extend.vue
index b740da2..6e353bf 100644
--- a/src/views/shop/components/extend.vue
+++ b/src/views/shop/components/extend.vue
@@ -7,6 +7,7 @@
                     {{ row.row.type == 'text' ? '文本' : '图片' }}
                 </template>
             </el-table-column>
+            <el-table-column label="描述" prop="name"> </el-table-column>
             <el-table-column label="key" prop="autokey"> </el-table-column>
             <el-table-column label="value" prop="value">
                 <template v-slot="row">
@@ -34,7 +35,10 @@
                     <el-radio v-model="form.type" label="text">文本</el-radio>
                     <el-radio v-model="form.type" label="img">图片</el-radio>
                 </el-form-item>
-                <el-form-item label="自定义key">
+                
+                <el-form-item label="描述">
+                    <el-input v-model="form.name" placeholder="请输入内容"></el-input>
+                </el-form-item>   <el-form-item label="自定义key">
                     <el-input v-model="form.autokey" placeholder="请输入内容"></el-input>
                 </el-form-item>
                 <el-form-item label="上传图片" v-if="form.type == 'img'">
diff --git a/src/views/user_manage/components/addActive.vue b/src/views/user_manage/components/addActive.vue
index c3f0231..9439019 100644
--- a/src/views/user_manage/components/addActive.vue
+++ b/src/views/user_manage/components/addActive.vue
@@ -21,7 +21,7 @@
                     <el-switch v-model="form.isDel" active-value="0" inactive-value="1"></el-switch>
                 </el-form-item>
                 <el-form-item label="是否赠送商品">
-                    <el-switch v-model="form.isGiftPro" active-value="1" inactive-value="0"></el-switch>
+                    <el-switch v-model="form.isGiftPro" :active-value="1" :inactive-value="0"></el-switch>
                 </el-form-item>
                 <el-form-item label="赠送商品">
                     <div>
diff --git a/src/views/user_manage/user_list.vue b/src/views/user_manage/user_list.vue
index e209a4e..3f13f30 100644
--- a/src/views/user_manage/user_list.vue
+++ b/src/views/user_manage/user_list.vue
@@ -92,7 +92,7 @@
           <template v-slot="scope">
             <el-button type="text" @click="edituser(scope.row)">编辑</el-button>
             <el-dropdown size="mini" @command="editPop(scope.row)">
-              <span class="el-dropdown-link" style="font-size: 12px;"> 更多 </span>
+              <span class="el-dropdown-link" style="font-size: 12px;margin-left: 10px;"> 更多 </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item>增减余额</el-dropdown-item>
               </el-dropdown-menu>