Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq

This commit is contained in:
gyq
2024-09-05 09:42:25 +08:00
37 changed files with 10898 additions and 697 deletions

View File

@@ -1,31 +1,27 @@
<template>
<div>
<el-button type="primary" @click="resetting">添加</el-button>
<!-- <el-button type="primary" @click="resetting">添加</el-button> -->
<el-table :data="tableData">
<el-table-column label="类型" prop="type">
<!-- <el-table-column label="类型" prop="type">
<template v-slot="row">
{{ row.row.type == 'text' ? '文本' : '图片' }}
</template>
</el-table-column>
</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">
<el-table-column label="图片" prop="value">
<template v-slot="row">
<img v-if="row.row.type == 'img'" :src="row.row.value" style="width: 40px;height: 40px;">
<span v-else>{{ row.row.value }}</span>
</template>
</el-table-column>
<el-table-column label="更新时间" prop="updateTime"> </el-table-column>
<el-table-column label="创建时间" prop="createTime"> </el-table-column>
<el-table-column label="操作" width="250">
<template v-slot="scope">
<el-button type="text" size="mini" round icon="el-icon-edit"
@click="edit(scope.row.id)">编辑</el-button>
<el-popconfirm title="确定删除吗?" @confirm="delHandle([scope.row.id])">
<el-button type="text" size="mini" round icon="el-icon-delete" slot="reference">
<el-button type="text" size="mini" round icon="el-icon-edit" @click="edit(scope.row)">编辑</el-button>
<!-- <el-popconfirm title="确定删除吗?" @confirm="delHandle([scope.row.id])">
<el-button type="text" :disabled="!scope.row.id" size="mini" round icon="el-icon-delete" slot="reference">
删除
</el-button>
</el-popconfirm>
</el-popconfirm> -->
</template>
</el-table-column>
</el-table>
@@ -35,18 +31,20 @@
<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="描述">
<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="自定义key">
<el-input v-model="form.autokey" placeholder="请输入内容"></el-input>
</el-form-item> -->
<el-form-item label="上传图片" v-if="form.type == 'img'">
<el-upload :headers="headers" class="avatar-uploader" :action="qiNiuUploadApi"
:show-file-list="false" :on-success="handleSuccess">
<img v-if="imageUrl" :src="imageUrl" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
<span>{{ form.detail }}</span>
</el-form-item>
<el-form-item label="文本" v-else>
<el-input v-model="form.value" placeholder="请输入内容"></el-input>
@@ -98,13 +96,11 @@ export default {
handleBeforeRemove(file, fileList) {
},
async edit(id) {
async edit(item) {
this.title = '编辑'
let res = await querytbShopExtend(id)
this.form.id = id
this.showLocation = true
this.form = res
this.imageUrl = res.value
this.form = item
this.imageUrl = item.value
},
// 删除
async delHandle(proId) {

View File

@@ -1,6 +1,7 @@
<template>
<div>
<el-form ref="form" :model="form" label-width="120px" label-position="left">
<el-form-item label="操作密码">
<el-input v-model="form.password" type="number" @input="jiantingshuru" :disabled="disabled"
:placeholder="disabled ? '******' : '请输入操作密码'" style="width: 200px;"></el-input>
@@ -17,17 +18,29 @@
<el-button type="primary" @click="submitHandle">保存 </el-button>
</el-form-item>
</el-form>
<hr />
<el-form ref="form" :model="form" label-width="120px" label-position="left">
<el-form-item label="校验安全密码">
<el-checkbox v-model="form.isReturn">退款</el-checkbox>
<el-checkbox v-model="form.isMemberIn">会员充值</el-checkbox>
<el-checkbox v-model="form.isMemberReturn">会员退款</el-checkbox>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitHandles">保存 </el-button>
</el-form-item>
</el-form>
</div>
</template>
<script>
import md5 from 'js-md5';
import { tbShopInfo } from "@/api/user";
import { sendMsg, modfiyUserInfo } from "@/api/securitySetting"
import { sendMsg, modfiyUserInfo, tbShopInfoPUT } from "@/api/securitySetting"
export default {
data() {
return {
disabled: true,
form: {}
form: {
},
}
},
mounted() {
@@ -42,20 +55,31 @@ export default {
const shopId = localStorage.getItem("shopId");
const res = await tbShopInfo(shopId);
this.form = res
// this.form.password = '******'
this.form.isReturn = this.form.isReturn == 1 ? true : false
this.form.isMemberIn = this.form.isMemberIn == 1 ? true : false
this.form.isMemberReturn = this.form.isMemberReturn == 1 ? true : false
},
async submitHandle() {
let data = {
code: this.form.prepareAmount,
pwd: md5(this.form.password),
}
if (!this.form.prepareAmount) {
this.$message({
message: "请输入验证码或密码"
message: "请输入验证码"
})
return
}
const res = await modfiyUserInfo(data);
if (!this.form.password) {
this.$message({
message: "请输入密码"
})
return
}
const res = await modfiyUserInfo({
code: this.form.prepareAmount,
pwd: md5(this.form.password),
});
console.log(222)
this.form.prepareAmount = ''
this.form.password = "******"
this.disabled = true
@@ -64,6 +88,21 @@ export default {
type: 'success'
})
},
async submitHandles() {
const res = await tbShopInfoPUT({
// code: this.form.prepareAmount,
// id: this.form.id,
// status:this.form.status,
...this.form,
isReturn: this.form.isReturn == true ? 1 : 0,
isMemberIn: this.form.isMemberIn == true ? 1 : 0,
isMemberReturn: this.form.isMemberReturn == true ? 1 : 0,
});
this.$message({
message: '修改成功',
type: 'success'
})
},
resetting() {
this.form.password = ''
this.disabled = false

View File

@@ -35,13 +35,13 @@
</template>
</el-table-column>
<el-table-column label="昵称" prop="nickname"> </el-table-column>
<el-table-column label="商品库存" prop="createdAt">
<el-table-column label="商品库存预警" prop="createdAt">
<template v-slot="scope">
<el-switch v-model="scope.row.proState" :active-value="1" :inactive-value="0"
@change="changeHot(scope.row.proState, 0, scope.row.openId)"></el-switch>
</template>
</el-table-column>
<el-table-column label="耗材" prop="createdAt">
<el-table-column label="耗材库存预警" prop="createdAt">
<template v-slot="scope">
<el-switch v-model="scope.row.conState" :active-value="1" :inactive-value="0"
@change="changeHot(scope.row.conState, 1, scope.row.openId)"></el-switch>

View File

@@ -5,8 +5,9 @@
<el-tab-pane label="基础配置" name="2"></el-tab-pane>
<!-- <el-tab-pane label="通知配置" name="3"></el-tab-pane> -->
<el-tab-pane label="安全设置" name="4"></el-tab-pane>
<el-tab-pane label="扩展参数" name="5"></el-tab-pane>
<el-tab-pane label="跳转小程序" name="6"></el-tab-pane>
<el-tab-pane label="店铺装修" name="5"></el-tab-pane>
<el-tab-pane label="跳转小程序" name="6" v-if="shopId==1"></el-tab-pane>
<el-tab-pane label="通知中心" name="7"></el-tab-pane>
</el-tabs>
<shopInfo v-if="activeName == 1" />
@@ -15,6 +16,7 @@
<securitySetting v-if="activeName == 4" />
<extend v-if="activeName == 5" />
<goxcx v-if="activeName == 6" />
<notifications v-if="activeName == 7" />
</div>
</template>
@@ -26,15 +28,17 @@ import notice from './components/notice'
import securitySetting from './components/securitySetting'
import extend from './components/extend'
import goxcx from './components/goxcx'
import notifications from './notifications/index.vue'
export default {
components: {
shopInfo,
shopSetting,
notice,securitySetting,extend,goxcx
notice,securitySetting,extend,goxcx,notifications
},
data() {
return {
activeName: '1',
shopId:localStorage.getItem('shopId')
}
}
}