Selaa lähdekoodia

案例添加时,设置图片非必填

udream-cxs 4 vuotta sitten
vanhempi
commit
9952f9ab3f

+ 2 - 0
src/apps/mobile/views/card-bank/history/index.vue

@@ -54,6 +54,8 @@
                             <span>{{scope.row.usedFlag | couponUsedFlagPipe}}</span>
                         </template>
                     </el-table-column>
+                    <el-table-column prop="createTime" label="发放时间"></el-table-column>
+                    <el-table-column prop="updateTime" label="使用时间"></el-table-column>
                     <!-- <el-table-column prop="scenario" label="使用范围">
                         <template slot-scope="scope">
                             <span>{{scope.row.scenario | couponUsePipe}}</span>

+ 5 - 16
src/apps/mobile/views/operation-bank/user/components/redEnvelopes.vue

@@ -1,20 +1,9 @@
 <template>
-    <el-dialog
-        :title="title"
-        :close-on-click-modal="false"
-        :visible.sync="dialogVisible"
-        :before-close="close"
-        width="500px"
-    >
+    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="dialogVisible" :before-close="close" width="500px">
         <el-form :model="ruleForm" ref="ruleForm" :rules="rules" label-width="100px">
             <el-form-item :label="labelText" prop="redElvelopId">
                 <el-select v-model="ruleForm.redElvelopId" placeholder="请选择">
-                    <el-option
-                        v-for="item in options"
-                        :key="item.name"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
+                    <el-option v-for="item in options" :key="item.name" :label="item.name" :value="item.id"></el-option>
                 </el-select>
             </el-form-item>
         </el-form>
@@ -51,7 +40,7 @@ export default {
     },
     methods: {
         submit() {
-            this.$refs['ruleForm'].validate(async valid => {
+            this.$refs['ruleForm'].validate(async (valid) => {
                 if (valid) {
                     this.submitBtndisabled = true;
                     const data = {
@@ -59,7 +48,7 @@ export default {
                         userList: this.ids,
                     };
                     batchSendRedEnvelopes(data)
-                        .then(res => {
+                        .then((res) => {
                             let message = '发放成功';
                             this.completeOperation(message);
                         })
@@ -105,7 +94,7 @@ export default {
                 ...this.page,
             };
             queryCouponsList(obj)
-                .then(res => {
+                .then((res) => {
                     this.options = res.data.records || [];
                 })
                 .catch();

+ 26 - 100
src/apps/mobile/views/operation-bank/user/index.vue

@@ -23,12 +23,7 @@
                         <el-col :span="4">
                             <el-form-item>
                                 <el-select v-model="searchForm.userLevel" placeholder="app用户类型">
-                                    <el-option
-                                        v-for="item in customerTypeList"
-                                        :key="item.id"
-                                        :label="item.name"
-                                        :value="item.id"
-                                    ></el-option>
+                                    <el-option v-for="item in customerTypeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                                 </el-select>
                             </el-form-item>
                         </el-col>
@@ -46,18 +41,8 @@
                                     icon="el-icon-plus"
                                     @click="showAddEditDialog(null)"
                                 >新建</el-button>-->
-                                <el-button
-                                    type="primary"
-                                    plain
-                                    round
-                                    @click="sendRedEnvelopes(1)"
-                                >卡券发放</el-button>
-                                <el-button
-                                    type="primary"
-                                    plain
-                                    round
-                                    @click="sendRedEnvelopes(2)"
-                                >红包发放</el-button>
+                                <el-button type="primary" plain round @click="sendRedEnvelopes(1)">卡券发放</el-button>
+                                <el-button type="primary" plain round @click="sendRedEnvelopes(2)">红包发放</el-button>
                                 <!-- <el-button
                                     type="primary"
                                     plain
@@ -76,37 +61,18 @@
             </div>
 
             <div class="MaintenanceTable">
-                <el-table
-                    ref="multipleTable"
-                    :data="tableData"
-                    style="width: 100%"
-                    tooltip-effect="dark"
-                    @selection-change="selectionChange"
-                    class="OutTable"
-                    border
-                    v-loading="listLoading"
-                >
+                <el-table ref="multipleTable" :data="tableData" style="width: 100%" tooltip-effect="dark" @selection-change="selectionChange" class="OutTable" border v-loading="listLoading">
                     <el-table-column type="selection"></el-table-column>
                     <el-table-column prop="mobile" label="手机号" :show-overflow-tooltip="true"></el-table-column>
                     <el-table-column prop="name" label="昵称" :show-overflow-tooltip="true"></el-table-column>
                     <el-table-column prop="realName" label="真实名" :show-overflow-tooltip="true"></el-table-column>
                     <el-table-column prop="companyName" label="公司" :show-overflow-tooltip="true">
-                        <template
-                            slot-scope="scope"
-                        >{{ scope.row.companyName ? scope.row.companyName : '- 无 -' }}</template>
+                        <template slot-scope="scope">{{ scope.row.companyName ? scope.row.companyName : '- 无 -' }}</template>
                     </el-table-column>
                     <el-table-column prop="roleName" label="app用户类型"></el-table-column>
                     <el-table-column prop="deleteFlag" label="冻结开关" min-width="110px;">
                         <template slot-scope="scope">
-                            <el-switch
-                                v-model="scope.row.deleteFlag"
-                                active-text="开"
-                                inactive-text="关"
-                                :active-value="1"
-                                :inactive-value="0"
-                                :disabled="scope.row.userLevel === 6"
-                                @change="switchChange(scope.row)"
-                            ></el-switch>
+                            <el-switch v-model="scope.row.deleteFlag" active-text="开" inactive-text="关" :active-value="1" :inactive-value="0" :disabled="scope.row.userLevel === 6" @change="switchChange(scope.row)"></el-switch>
                         </template>
                     </el-table-column>
                     <el-table-column prop="vipEndTime" label="会员结束时间" :show-overflow-tooltip="true">
@@ -122,57 +88,17 @@
                                 @click="deleteData(scope.row.userId)"
                             >删除</el-button>-->
                             <!-- 非会员及VIP个人会员可以升级角色(vip个人会员可以升级为vip企业会员) vipFlag:1 非会员,2 会员 -->
-                            <el-button
-                                size="mini"
-                                type="primary"
-                                plain
-                                round
-                                v-if="scope.row.vipFlag === 1"
-                                :disabled="scope.row.userLevel === 6"
-                                @click="editRoleShow(scope.row.userId)"
-                            >升级角色</el-button>
+                            <el-button size="mini" type="primary" plain round v-if="scope.row.vipFlag === 1" :disabled="scope.row.userLevel === 6" @click="editRoleShow(scope.row.userId)">升级角色</el-button>
                             <!-- 个人与企业会员都可以取消会员 -->
-                            <el-button
-                                size="mini"
-                                type="primary"
-                                plain
-                                round
-                                v-if="scope.row.vipFlag === 2"
-                                @click="cancelVip(scope.row)"
-                            >取消会员</el-button>
-                            <el-button
-                                size="mini"
-                                type="primary"
-                                plain
-                                round
-                                :disabled="scope.row.expertFlag ===1 || scope.row.userLevel === 6"
-                                @click="invite(scope.row)"
-                            >邀请成为专家</el-button>
-                            <el-button
-                                size="mini"
-                                type="primary"
-                                plain
-                                round
-                                :disabled="scope.row.userLevel === 6"
-                                @click="viewRebates(scope.row)"
-                            >查看分销返利</el-button>
-                            <el-button
-                                size="mini"
-                                type="primary"
-                                plain
-                                round
-                                @click="showDetailsDialog(scope.row)"
-                            >详情</el-button>
+                            <el-button size="mini" type="primary" plain round v-if="scope.row.vipFlag === 2" @click="cancelVip(scope.row)">取消会员</el-button>
+                            <el-button size="mini" type="primary" plain round :disabled="scope.row.expertFlag ===1 || scope.row.userLevel === 6" @click="invite(scope.row)">邀请成为专家</el-button>
+                            <el-button size="mini" type="primary" plain round :disabled="scope.row.userLevel === 6" @click="viewRebates(scope.row)">查看分销返利</el-button>
+                            <el-button size="mini" type="primary" plain round @click="showDetailsDialog(scope.row)">详情</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
                 <div class="pagenation">
-                    <PageComponent
-                        :total="total"
-                        @pagination="handlePagination"
-                        :pageSize.sync="page.pageSize"
-                        :pageNum.sync="page.pageNum"
-                    ></PageComponent>
+                    <PageComponent :total="total" @pagination="handlePagination" :pageSize.sync="page.pageSize" :pageNum.sync="page.pageNum"></PageComponent>
                 </div>
             </div>
         </div>
@@ -234,7 +160,7 @@ export default {
     },
     methods: {
         selectionChange(data) {
-            this.ids = data.map(item => {
+            this.ids = data.map((item) => {
                 return item.userId;
             });
         },
@@ -254,9 +180,9 @@ export default {
                 },
             };
             queryPageUser(obj)
-                .then(res => {
-                    if(res.statusCode == "10"){
-                        this.$router.replace("/login");
+                .then((res) => {
+                    if (res.statusCode == '10') {
+                        this.$router.replace('/login');
                     }
                     this.tableData = res.data.records;
                     this.total = res.data.total;
@@ -268,7 +194,7 @@ export default {
         },
         getCustomerType() {
             queryCustomerType({})
-                .then(res => {
+                .then((res) => {
                     this.customerTypeList = res.data.records || [];
                 })
                 .catch();
@@ -279,13 +205,13 @@ export default {
                 if (this.ids.length === 0) return this.$message.warning('请至少选中一项 !');
                 // console.log(this.ids, "ids");
                 obj = {
-                    ids: this.ids
-                }
+                    ids: this.ids,
+                };
                 this.delete(obj);
             } else {
                 obj = {
-                    ids: [id]
-                }
+                    ids: [id],
+                };
                 this.delete(obj);
             }
         },
@@ -344,7 +270,7 @@ export default {
                         maintenanceCompanyId: data.maintenanceCompanyId,
                     };
                     cancelVip(obj)
-                        .then(res => {
+                        .then((res) => {
                             console.log(res);
                             if (res.statusCode == '1') {
                                 this.$message.success(res.message);
@@ -372,10 +298,10 @@ export default {
         // 冻结解冻
         switchChange(data) {
             console.log(data.userId);
-            let ids = {ids:[data.userId]};
+            let ids = { ids: [data.userId] };
             if (data.deleteFlag) {
                 freezeUser(ids)
-                    .then(res => {
+                    .then((res) => {
                         console.log(res);
                         this.queryListData();
                         this.$message.success('操作成功!');
@@ -383,7 +309,7 @@ export default {
                     .catch();
             } else {
                 unfreezeUser(ids)
-                    .then(res => {
+                    .then((res) => {
                         console.log(res);
                         this.queryListData();
                         this.$message.success('操作成功!');
@@ -394,7 +320,7 @@ export default {
         // 邀请成为专家
         invite(data) {
             inviteToBeAnExpert(data.userId)
-                .then(res => {
+                .then((res) => {
                     console.log(res);
                     if (res.statusCode == '1') {
                         this.$message.success('邀请成功!');

+ 24 - 52
src/apps/mobile/views/question-bank/components/addEditDialog.vue

@@ -1,12 +1,6 @@
 <template>
     <div class="add-edit-dialog-container">
-        <el-dialog
-            :title="title"
-            :visible.sync="visible"
-            width="600px"
-            :before-close="close"
-            :close-on-click-modal="false"
-        >
+        <el-dialog :title="title" :visible.sync="visible" width="600px" :before-close="close" :close-on-click-modal="false">
             <el-form :model="formData" ref="formData" :rules="rules" label-width="90px">
                 <el-form-item label="标题:" prop="title">
                     <el-input placeholder="请输入" v-model="formData.title"></el-input>
@@ -17,12 +11,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="品牌:" prop="brandId" class="classify-input">
-                    <BrandList
-                        @brandChange="brandChange"
-                        @brandEmpty="brandEmpty"
-                        :brandName="brandName"
-                        ref="brand"
-                    ></BrandList>
+                    <BrandList @brandChange="brandChange" @brandEmpty="brandEmpty" :brandName="brandName" ref="brand"></BrandList>
                 </el-form-item>
                 <el-form-item label="问题现象:" prop="expression">
                     <el-input placeholder="请输入" v-model="formData.expression" type="textarea"></el-input>
@@ -31,24 +20,10 @@
                     <el-input placeholder="请输入" v-model="formData.solution" type="textarea"></el-input>
                 </el-form-item>
                 <el-form-item label="图片:" prop="file" class="plate-icon">
-                    <Upload
-                        :fileList="fileList"
-                        @changeUploadFile="changeUploadFile"
-                        @validateUpload="validateUpload"
-                        :limitUpload="limitUpload"
-                        :maximumSize="maximumSize"
-                        :uploadType="1"
-                        ref="upload"
-                    ></Upload>
+                    <Upload :fileList="fileList" @changeUploadFile="changeUploadFile" @validateUpload="validateUpload" :limitUpload="limitUpload" :maximumSize="maximumSize" :uploadType="1" ref="upload"></Upload>
                 </el-form-item>
                 <el-form-item prop="lockFlag" label="是否打赏:">
-                    <el-switch
-                        v-model="formData.lockFlag"
-                        active-text="是"
-                        inactive-text="否"
-                        :active-value="1"
-                        :inactive-value="0"
-                    ></el-switch>
+                    <el-switch v-model="formData.lockFlag" active-text="是" inactive-text="否" :active-value="1" :inactive-value="0"></el-switch>
                 </el-form-item>
                 <!-- 后台新增默认是不启用状态 -->
                 <!-- <el-form-item label="启用状态:">
@@ -63,11 +38,7 @@
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button @click="close()">取 消</el-button>
-                <el-button
-                    type="primary"
-                    @click="submitForm('formData')"
-                    :disabled="submitBtndisabled"
-                >确 定</el-button>
+                <el-button type="primary" @click="submitForm('formData')" :disabled="submitBtndisabled">确 定</el-button>
             </div>
         </el-dialog>
     </div>
@@ -119,20 +90,21 @@ export default {
                     },
                     { max: 500, message: '长度最大500个字符', trigger: 'blur' },
                 ],
-                file: [
-                    {
-                        required: true,
-                        message: '请上传图片',
-                        trigger: 'blur',
-                    },
-                ],
+                //图片非必填
+                // file: [
+                //     {
+                //         required: true,
+                //         message: '请上传图片',
+                //         trigger: 'blur',
+                //     },
+                // ],
                 brandId: [
                     {
                         required: true,
                         message: '请从列表中选择品牌,直接输入无效',
                         trigger: ['blur', 'change'],
                     },
-                ]
+                ],
             },
             fileList: [], // 图片列表
             maximumSize: 3, //图片大小  不超过3MB
@@ -154,7 +126,7 @@ export default {
                 this.brandName = data.brandName;
                 this.formData = { ...data, file: true };
                 if (this.formData.imgs)
-                    this.fileList = this.formData.imgs.map(item => {
+                    this.fileList = this.formData.imgs.map((item) => {
                         let url = staticPath(item);
                         return {
                             name: '',
@@ -182,14 +154,14 @@ export default {
             this.$refs['formData'].resetFields();
         },
         submitForm(formName) {
-            this.$refs[formName].validate(valid => {
+            this.$refs[formName].validate((valid) => {
                 if (valid) {
                     this.submitBtndisabled = true;
                     let message = '';
                     let imgs = [];
                     if (this.fileList.length > 0) {
                         console.log(this.fileList, 'this.fileList');
-                        imgs = this.fileList.map(item => {
+                        imgs = this.fileList.map((item) => {
                             return item.response.data.pathUrl;
                         });
                     }
@@ -202,14 +174,14 @@ export default {
                         message = '新增成功';
                         delete obj.file;
                         addData(obj)
-                            .then(res => {
+                            .then((res) => {
                                 if (res.statusCode === '1') {
                                     this.completeOperation(res.message);
                                 } else {
                                     this.$message.warning(res.message);
                                 }
                             })
-                            .catch(err => err);
+                            .catch((err) => err);
                     }
                     if (this.type === 'edit') {
                         message = '修改成功';
@@ -226,14 +198,14 @@ export default {
                         };
                         console.log(editObj, 'editObj');
                         editData(editObj)
-                            .then(res => {
+                            .then((res) => {
                                 if (res.statusCode === '1') {
                                     this.completeOperation(res.message);
                                 } else {
                                     this.$message.warning(res.message);
                                 }
                             })
-                            .catch(err => err);
+                            .catch((err) => err);
                     }
                 }
             });
@@ -267,15 +239,15 @@ export default {
         },
         queryExpert() {
             queryAllExpert()
-                .then(res => {
+                .then((res) => {
                     console.log(res, '专家列表');
                     this.exportList = res.data;
-                    this.exportList.forEach(item => {
+                    this.exportList.forEach((item) => {
                         // 需转字符串才能回显
                         item.userId = Number(item.userId);
                     });
                 })
-                .catch(err => err);
+                .catch((err) => err);
         },
         brandChange(data) {
             if (data.id) {