czg_team/management
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
YeMingfei666
2024-09-02 15:34:28 +08:00
parent 7db7f0c463 b9e41d220a
commit 234f070977
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/views/shop/components/extend.vue
View File

@@ -6,20 +6,17 @@
<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="图片" prop="value">
<template v-slot="row">
<template v-if="row.row.id">
<img v-if="row.row.type == 'img'" :src="row.row.value" style="width: 40px;height: 40px;">
</template>
<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="操作" width="250">
<template v-slot="scope">
<el-button type="text" size="mini" round icon="el-icon-edit"
@click="edit(scope.row)">编辑</el-button>
<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">
删除
@@ -37,8 +34,8 @@
<el-form-item label="描述">
<el-input v-model="form.name" placeholder="请输入内容"></el-input>
</el-form-item>
<!-- <el-form-item label="自定义key">
</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'">
@@ -47,7 +44,7 @@
<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>
<span>{{ form.detail }}</span>
</el-form-item>
<el-form-item label="文本" v-else>
<el-input v-model="form.value" placeholder="请输入内容"></el-input>

4
src/views/shop/notifications/index.vue
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>

7
src/views/shop/shop_configuration.vue
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="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,11 +28,12 @@ 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 {