引流码页面布局修改等

linkwe-ui/src/components/Upload.vue

@@ -124,26 +124,28 @@ export default {
       :on-success="onSuccess"
       :before-upload="handleBeforeUpload"
     >
-      <template v-if="fileUrl">
-        <img v-if="type === '0'" :src="fileUrl" class="upload-img" />
-        <div v-else-if="type === '2'">
-          <video
-            id="myVideo"
-            class="video-js vjs-default-skin
+      <slot>
+        <template v-if="fileUrl">
+          <img v-if="type === '0'" :src="fileUrl" class="upload-img" />
+          <div v-else-if="type === '2'">
+            <video
+              id="myVideo"
+              class="video-js vjs-default-skin
             vjs-big-play-centered"
-            width="100%"
-            controls
-            webkit-playsinline="true"
-            playsinline="true"
-            :autoplay="false"
-            preload="auto"
-          >
-            <source :src="fileUrl" type="video/mp4" />
-          </video>
-        </div>
-        <div v-else>{{ fileName }}</div>
-      </template>
-      <i v-else class="el-icon-plus uploader-icon"></i>
+              width="100%"
+              controls
+              webkit-playsinline="true"
+              playsinline="true"
+              :autoplay="false"
+              preload="auto"
+            >
+              <source :src="fileUrl" type="video/mp4" />
+            </video>
+          </div>
+          <div v-else>{{ fileName }}</div>
+        </template>
+        <i v-else class="el-icon-plus uploader-icon"></i>
+      </slot>
     </el-upload>
     <div class="tip">
       <slot name="tip"></slot>

linkwe-ui/src/views/drainageCode/staff/list.vue

@@ -21,100 +21,98 @@
 </style>
 <template>
   <div class="app-container">
-    <el-card shadow="never" :body-style="{padding: '20px 0 0'}">
-      <el-form
-        :model="queryParams"
-        ref="queryForm"
-        :inline="true"
-        v-show="showSearch"
-        label-width="100px"
-      >
-        <el-form-item label="使用员工" prop="title">
-          <el-input
-            v-model="queryParams.title"
-            placeholder="请输入"
-            clearable
-            style="width: 240px;"
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="姓名" prop="operName">
-          <el-input
-            v-model="queryParams.operName"
-            placeholder="请输入"
-            clearable
-            style="width: 240px;"
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="手机号" prop="operName">
-          <el-input
-            v-model="queryParams.operName"
-            placeholder="请输入"
-            clearable
-            style="width: 240px;"
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="活动场景" prop="operName">
-          <el-input
-            v-model="queryParams.operName"
-            placeholder="请输入"
-            clearable
-            style="width: 240px;"
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="创建人" prop="operName">
-          <el-input
-            v-model="queryParams.operName"
-            placeholder="请输入"
-            clearable
-            style="width: 240px;"
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="创建日期">
-          <el-date-picker
-            v-model="dateRange"
-            size="small"
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label=" ">
-          <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">导出</el-button>
-        </el-form-item>
-      </el-form>
-    </el-card>
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
+      <el-form-item label="使用员工" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入"
+          clearable
+          style="width: 240px;"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="姓名" prop="operName">
+        <el-input
+          v-model="queryParams.operName"
+          placeholder="请输入"
+          clearable
+          style="width: 240px;"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手机号" prop="operName">
+        <el-input
+          v-model="queryParams.operName"
+          placeholder="请输入"
+          clearable
+          style="width: 240px;"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="活动场景" prop="operName">
+        <el-input
+          v-model="queryParams.operName"
+          placeholder="请输入"
+          clearable
+          style="width: 240px;"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建人" prop="operName">
+        <el-input
+          v-model="queryParams.operName"
+          placeholder="请输入"
+          clearable
+          style="width: 240px;"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建日期">
+        <el-date-picker
+          v-model="dateRange"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label=" ">
+        <el-button type="cyan" @click="handleQuery">查询</el-button>
+        <el-button @click="resetQuery">重置</el-button>
+        <el-button @click="resetQuery">导出</el-button>
+      </el-form-item>
+    </el-form>
 
     <div class="mid-action">
       <div class="total">
         己选
-        <span class="num">{{total}}</span> 条，当前已经配置
-          <span class="num">{{total}}</span> 个 最多配置
-          <span class="num">{{total}}</span> 个
+        <span class="num">{{ total }}</span> 条，当前已经配置
+        <span class="num">{{ total }}</span> 个 最多配置
+        <span class="num">{{ total }}</span> 个
       </div>
       <div>
-        <el-button type="primary" size="mini" icon="el-icon-plus">新建员工活码</el-button>
-        <el-button type="primary" size="mini" @click="dialogVisible = true">批量新建</el-button>
+        <el-button type="primary" size="mini">新建员工活码</el-button>
+        <el-button type="primary" size="mini" @click="dialogVisible = true"
+          >批量新建</el-button
+        >
         <el-button type="primary" size="mini">删除</el-button>
         <el-button type="primary" size="mini">下载</el-button>
       </div>
     </div>
 
-    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="list"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="样式" align="center" prop="operId" />
       <el-table-column label="使用员工" align="center" prop="title" />
@@ -122,60 +120,74 @@
       <el-table-column label="手机号" align="center" prop="businessType" />
       <el-table-column label="活动场景" align="center" prop="businessType" />
       <el-table-column label="创建人" align="center" prop="businessType" />
-      <el-table-column label="创建时间" align="center" prop="operTime" width="180">
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="operTime"
+        width="180"
+      >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.operTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-view"
-            @click="handleView(scope.row,scope.index)"
+            @click="handleView(scope.row, scope.index)"
             v-hasPermi="['monitor:operlog:query']"
-          >下载</el-button>
+            >下载</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-view"
-            @click="handleView(scope.row,scope.index)"
+            @click="handleView(scope.row, scope.index)"
             v-hasPermi="['monitor:operlog:query']"
-          >复制链接</el-button>
+            >复制链接</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-view"
-            @click="handleView(scope.row,scope.index)"
+            @click="handleView(scope.row, scope.index)"
             v-hasPermi="['monitor:operlog:query']"
-          >查看详情</el-button>
+            >查看详情</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-view"
-            @click="handleView(scope.row,scope.index)"
+            @click="handleView(scope.row, scope.index)"
             v-hasPermi="['monitor:operlog:query']"
-          >编辑</el-button>
+            >编辑</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-view"
-            @click="handleView(scope.row,scope.index)"
+            @click="handleView(scope.row, scope.index)"
             v-hasPermi="['monitor:operlog:query']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-    
+
     <!-- 批量新建弹窗 -->
     <el-dialog
       title="组织架构"
@@ -188,7 +200,12 @@
           <el-input placeholder="请输入关键字" v-model="input3" class>
             <el-button slot="append">查询</el-button>
           </el-input>
-          <el-tree :data="treeData" :props="defaultProps" accordion @node-click="handleNodeClick"></el-tree>
+          <el-tree
+            :data="treeData"
+            :props="defaultProps"
+            accordion
+            @node-click="handleNodeClick"
+          ></el-tree>
         </el-col>
         <el-col :span="12">
           <div class="grid-content bg-purple"></div>
@@ -196,7 +213,9 @@
       </el-row>
       <div slot="footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+        <el-button type="primary" @click="dialogVisible = false"
+          >确 定</el-button
+        >
       </div>
     </el-dialog>
   </div>
@@ -204,60 +223,60 @@
 
 <script>
 export default {
-  name: "Operlog",
+  name: 'Operlog',
   data() {
     return {
       treeData: [
         {
-          label: "一级 1",
+          label: '一级 1',
           children: [
             {
-              label: "二级 1-1",
+              label: '二级 1-1',
               children: [
                 {
-                  label: "三级 1-1-1",
+                  label: '三级 1-1-1',
                 },
               ],
             },
           ],
         },
         {
-          label: "一级 2",
+          label: '一级 2',
           children: [
             {
-              label: "二级 2-1",
+              label: '二级 2-1',
               children: [
                 {
-                  label: "三级 2-1-1",
+                  label: '三级 2-1-1',
                 },
               ],
             },
             {
-              label: "二级 2-2",
+              label: '二级 2-2',
               children: [
                 {
-                  label: "三级 2-2-1",
+                  label: '三级 2-2-1',
                 },
               ],
             },
           ],
         },
         {
-          label: "一级 3",
+          label: '一级 3',
           children: [
             {
-              label: "二级 3-1",
+              label: '二级 3-1',
               children: [
                 {
-                  label: "三级 3-1-1",
+                  label: '三级 3-1-1',
                 },
               ],
             },
             {
-              label: "二级 3-2",
+              label: '二级 3-2',
               children: [
                 {
-                  label: "三级 3-2-1",
+                  label: '三级 3-2-1',
                 },
               ],
             },
@@ -265,8 +284,8 @@ export default {
         },
       ],
       defaultProps: {
-        children: "children",
-        label: "label",
+        children: 'children',
+        label: 'label',
       },
       dialogVisible: false,
       // 遮罩层
@@ -300,111 +319,111 @@ export default {
         businessType: undefined,
         status: undefined,
       },
-    };
+    }
   },
   created() {
-    this.getList();
-    this.getDicts("sys_oper_type").then((response) => {
-      this.typeOptions = response.data;
-    });
-    this.getDicts("sys_common_status").then((response) => {
-      this.statusOptions = response.data;
-    });
+    this.getList()
+    this.getDicts('sys_oper_type').then((response) => {
+      this.typeOptions = response.data
+    })
+    this.getDicts('sys_common_status').then((response) => {
+      this.statusOptions = response.data
+    })
   },
   methods: {
     /** 查询登录日志 */
     getList() {
-      this.loading = false;
+      this.loading = false
       list(this.addDateRange(this.queryParams, this.dateRange)).then(
         (response) => {
-          this.list = response.rows;
-          this.total = response.total;
-          this.loading = false;
+          this.list = response.rows
+          this.total = response.total
+          this.loading = false
         }
-      );
+      )
     },
     // 操作日志状态字典翻译
     statusFormat(row, column) {
-      return this.selectDictLabel(this.statusOptions, row.status);
+      return this.selectDictLabel(this.statusOptions, row.status)
     },
     // 操作日志类型字典翻译
     typeFormat(row, column) {
-      return this.selectDictLabel(this.typeOptions, row.businessType);
+      return this.selectDictLabel(this.typeOptions, row.businessType)
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.pageNum = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
+      this.dateRange = []
+      this.resetForm('queryForm')
+      this.handleQuery()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.operId);
-      this.multiple = !selection.length;
+      this.ids = selection.map((item) => item.operId)
+      this.multiple = !selection.length
     },
     /** 详细按钮操作 */
     handleView(row) {
-      this.open = true;
-      this.form = row;
+      this.open = true
+      this.form = row
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const operIds = row.operId || this.ids;
+      const operIds = row.operId || this.ids
       this.$confirm(
         '是否确认删除日志编号为"' + operIds + '"的数据项?',
-        "警告",
+        '警告',
         {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
         }
       )
-        .then(function () {
-          return delOperlog(operIds);
+        .then(function() {
+          return delOperlog(operIds)
         })
         .then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
+          this.getList()
+          this.msgSuccess('删除成功')
         })
-        .catch(function () {});
+        .catch(function() {})
     },
     /** 清空按钮操作 */
     handleClean() {
-      this.$confirm("是否确认清空所有操作日志数据项?", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm('是否确认清空所有操作日志数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
-        .then(function () {
-          return cleanOperlog();
+        .then(function() {
+          return cleanOperlog()
         })
         .then(() => {
-          this.getList();
-          this.msgSuccess("清空成功");
+          this.getList()
+          this.msgSuccess('清空成功')
         })
-        .catch(function () {});
+        .catch(function() {})
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm("是否确认导出所有操作日志数据项?", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      const queryParams = this.queryParams
+      this.$confirm('是否确认导出所有操作日志数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
-        .then(function () {
-          return exportOperlog(queryParams);
+        .then(function() {
+          return exportOperlog(queryParams)
         })
         .then((response) => {
-          this.download(response.msg);
+          this.download(response.msg)
         })
-        .catch(function () {});
+        .catch(function() {})
     },
   },
-};
-</script>
\ No newline at end of file
+}
+</script>

linkwe-ui/src/views/drainageCode/welcome/add.vue

@@ -59,8 +59,8 @@ export default {
               :rows="5"
               maxlength="100"
               show-word-limit
+              placeholder="请输入欢迎语"
               v-model="form.welcomeMsg"
-              placeholder
             ></el-input>
           </div>
           <div class="bfc-o">
@@ -77,48 +77,38 @@ export default {
           <img v-if="imageUrl" :src="imageUrl" />
 
           <el-popover placement="top-start" trigger="hover">
-            <div class="flex">
-              <el-upload
-                class="mr10"
-                action
-                :show-file-list="false"
-                :on-success="uploadSuccess"
-                :before-upload="beforeUpload"
-              >
-                <el-button>
+            <div class="ac">
+              <Upload
+                ><el-button>
                   <i class="el-icon-picture-outline"></i>
                   <p>图片</p>
-                </el-button>
-              </el-upload>
+                </el-button></Upload
+              >
 
-              <el-button @click="dialogVisible = true">
+              <!-- <el-button @click="dialogVisible = true">
                 <i class="el-icon-link"></i>
                 <p>网页</p>
               </el-button>
-              <!-- <el-button @click="dialogVisible1 = true">
+              <el-button @click="dialogVisible1 = true">
                 <i class="el-icon-link"></i>
                 <p>小程序</p>
-              </el-button>-->
+              </el-button> -->
             </div>
             <el-button slot="reference" icon="el-icon-plus" size="mini"
-              >添加图片/网页</el-button
+              >添加图片</el-button
             >
           </el-popover>
         </el-card>
       </el-form-item>
       <el-form-item label=" ">
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="submit"
-          >保存</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="$router.back()"
-          >取消</el-button
-        >
+        <el-button type="primary" @click="submit">保存</el-button>
+        <el-button @click="$router.back()">取消</el-button>
       </el-form-item>
     </el-form>
 
-    <PhoneDialog :message="form.welcomeMsg"></PhoneDialog>
+    <PhoneDialog :message="form.welcomeMsg || '请输入欢迎语'"></PhoneDialog>
 
-    <el-dialog title="添加网页消息" :visible.sync="dialogVisible" width="width">
+    <!-- <el-dialog title="添加网页消息" :visible.sync="dialogVisible" width="width">
       <el-form :model="form" inline>
         <el-form-item label="添加网页消息" label-width="200">
           <el-input
@@ -134,7 +124,7 @@ export default {
           >确 定</el-button
         >
       </div>
-    </el-dialog>
+    </el-dialog> -->
 
     <!-- <el-dialog
       title="添加小程序消息"