diff --git a/buyer/index.html b/buyer/index.html index 13a70c4d..3b299f1a 100644 --- a/buyer/index.html +++ b/buyer/index.html @@ -4,7 +4,7 @@ - + LILI diff --git a/buyer/src/api/member.js b/buyer/src/api/member.js index 063ccd17..efa6255a 100644 --- a/buyer/src/api/member.js +++ b/buyer/src/api/member.js @@ -441,3 +441,39 @@ export function memberPointHistory (params) { params }); } +/** + * 分页获取会员站内信 + * @param {Object} params 请求参数，包括pageNumber、pageSize、status + */ +export function memberMsgList (params) { + return request({ + url: `/buyer/member/message`, + method: Method.GET, + needToken: true, + params + }); +} +/** + * 设置消息为已读 + * @param {String} messageId 消息id + */ + export function readMemberMsg (params) { + return request({ + url: `/buyer/member/message`, + method: Method.PUT, + needToken: true, + params + }); +} +/** + * 删除会员消息 + * @param {String} messageId 消息id + */ + export function delMemberMsg (params) { + return request({ + url: `/buyer/member/message`, + method: Method.DELETE, + needToken: true, + params + }); +} diff --git a/buyer/src/components/addressManage/index.vue b/buyer/src/components/addressManage/index.vue index a7b2669a..ee0dc4e0 100644 --- a/buyer/src/components/addressManage/index.vue +++ b/buyer/src/components/addressManage/index.vue @@ -57,7 +57,7 @@ import { export default { name: 'addressManage', props: { - id: { + id: { // 传入的地址id defalut: '', type: String } @@ -89,7 +89,7 @@ export default { }; }, methods: { - save () { + save () { // 保存地址 this.$refs.form.validate((valid) => { if (valid) { const params = JSON.parse(JSON.stringify(this.formData)); @@ -138,15 +138,15 @@ export default { this.formData.lat = item.position.lat; this.formData.lon = item.position.lng; }, - show () { + show () { // 地址模态框显示 this.showAddr = true; }, - hide () { + hide () { // 地址模态框隐藏 this.showAddr = false; } }, watch: { - id: { + id: { // 传入的地址id handler: function (v) { if (v) { this.getAddrById(v); diff --git a/buyer/src/components/card/index.vue b/buyer/src/components/card/index.vue index 397eb531..9dfbc055 100644 --- a/buyer/src/components/card/index.vue +++ b/buyer/src/components/card/index.vue @@ -59,7 +59,6 @@ export default { isActive: 0 // 已激活tab栏下标 }; }, - mounted () {}, methods: { // 点击右侧的回调 callBack () { diff --git a/buyer/src/components/coupon/Coupon.vue b/buyer/src/components/coupon/Coupon.vue index bad97edc..30055ed6 100644 --- a/buyer/src/components/coupon/Coupon.vue +++ b/buyer/src/components/coupon/Coupon.vue @@ -44,7 +44,7 @@ export default { }; }, methods: { - getList () { + getList () { // 获取优惠券列表 this.loading = true memberCouponList(this.params).then(res => { this.loading = false @@ -67,18 +67,18 @@ export default { } }, - changePageNum (val) { + changePageNum (val) { // 分页改变页码 this.params.pageNumber = val; this.getList() }, - changePageSize (val) { + changePageSize (val) { // 分页改变页数 this.pageNumber = 1; this.params.pageSize = val; this.getList() }, - useScope (type, storeName) { + useScope (type, storeName) { // 根据字段返回 优惠券适用范围 let shop = '平台'; let goods = '全部商品' if (storeName !== 'platform') shop = storeName @@ -104,7 +104,7 @@ export default { diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue index 26cbbab2..cd79acca 100644 --- a/buyer/src/components/goodsDetail/ShowGoods.vue +++ b/buyer/src/components/goodsDetail/ShowGoods.vue @@ -20,7 +20,6 @@
{{isCollected?'已收藏':'收藏'}} -
@@ -60,7 +59,7 @@ :key="index" @click="receiveCoupon(item.id)" > - 满{{ item.consumeThreshold }}减{{item.price | unitPrice}} + 满{{ item.consumeThreshold }}减{{item.price}} 满{{ item.consumeThreshold }}打{{item.couponDiscount}}折

@@ -126,32 +125,6 @@ - - diff --git a/buyer/src/components/header/Header.vue b/buyer/src/components/header/Header.vue index 0c621781..8293b17a 100644 --- a/buyer/src/components/header/Header.vue +++ b/buyer/src/components/header/Header.vue @@ -51,16 +51,16 @@ -
  • 我的订单
    • -
  • 我的足迹
    • -
  • +
  • 我的订单
    • +
  • 我的足迹
    • +
  • 我的消息
    • +
  • {{cartNum < 100 ? cartNum : '99'}} 购物车 @@ -260,12 +260,12 @@ export default { float: left; font-size: 14px; line-height: 35px; - margin-right: 15px; + margin-right: 10px; font-weight: bold; } .nav a,.nav-item { text-decoration: none; - padding-left: 15px; + padding-left: 10px; border-left: 1px solid #ccc; color: #999; cursor: pointer; @@ -406,9 +406,7 @@ export default { .sign-out p { font-size: 12px; } -.cart-icon{ - padding: 0 6px; -} + .goods-title:hover { color: $theme_color; } diff --git a/buyer/src/components/header/ShopHeader.vue b/buyer/src/components/header/ShopHeader.vue index 3d7ec3e6..0b2bda67 100644 --- a/buyer/src/components/header/ShopHeader.vue +++ b/buyer/src/components/header/ShopHeader.vue @@ -1,10 +1,10 @@ @@ -86,12 +84,12 @@ export default { } }, computed: { - navList () { + navList () { // 导航列表 return JSON.parse(storage.getItem('navList')) || [] } }, methods: { - getCate () { + getCate () { // 获取分类数据 getCategory(0).then(res => { if (res.success) { this.cateList = res.result; @@ -99,7 +97,7 @@ export default { } }); }, - showDetail (index) { + showDetail (index) { // 展示全部分类 this.panel = true this.panelData = this.cateList[index].children }, @@ -245,9 +243,6 @@ export default { .nav-detail-item span:hover { background-color: $theme_color; } -.detail-item-panel ul { - list-style: none; -} .detail-item-panel li { line-height: 30px; // margin-left: 40px; diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js index a2cfb5f5..6fe90b0b 100644 --- a/buyer/src/config/index.js +++ b/buyer/src/config/index.js @@ -17,10 +17,10 @@ export default { * @description api请求基础路径 */ api_dev: { - // common: 'http://192.168.0.103:8890', - // buyer: 'http://192.168.0.103:8888', - // seller: 'http://192.168.0.103:8889', - // manager: 'http://192.168.0.103:8887' + // common: 'http://192.168.0.109:8890', + // buyer: 'http://192.168.0.109:8888', + // seller: 'http://192.168.0.109:8889', + // manager: 'http://192.168.0.109:8887' common: 'https://common-api.pickmall.cn', buyer: 'https://buyer-api.pickmall.cn', diff --git a/buyer/src/main.js b/buyer/src/main.js index c2274aa3..001edee4 100644 --- a/buyer/src/main.js +++ b/buyer/src/main.js @@ -37,6 +37,11 @@ Vue.prototype.linkTo = function (url) { window.open(url, '_blank') } } +// 联系客服 +Vue.prototype.connectCs = function (sign = '37ef9b97807d03c6741298ed4eb5b536d2d238e08a3c00fb01fe48f03a569974c99ad767e72c04b3165ef29aca2c488b505fe4ca') { + const url = 'https://yzf.qq.com/xv/web/static/chat/index.html?sign=' + sign + window.open(url, '_blank') +} Vue.prototype.Cookies = storage /* eslint-disable no-new */ new Vue({ diff --git a/buyer/src/pages/GoodsDetail.vue b/buyer/src/pages/GoodsDetail.vue index 663bd301..f065d152 100644 --- a/buyer/src/pages/GoodsDetail.vue +++ b/buyer/src/pages/GoodsDetail.vue @@ -3,7 +3,7 @@ - +
    @@ -11,8 +11,9 @@ {{item.name}}
    - {{goodsMsg.data.storeName}} + {{goodsMsg.data.storeName}} {{storeCollected?'已收藏店铺':'收藏店铺'}} + 联系客服
    @@ -40,6 +41,7 @@ import ShowGoodsDetail from '@/components/goodsDetail/ShowGoodsDetail'; import ShowLikeGoods from '@/components/like'; import { goodsSkuDetail } from '@/api/goods'; import { cancelCollect, collectGoods, isCollection } from '@/api/member'; +import {getDetailById} from '@/api/shopentry' export default { name: 'GoodsDetail', beforeRouteEnter (to, from, next) { @@ -48,20 +50,15 @@ export default { }, created () { this.getGoodsDetail(); - if (this.Cookies.getItem('userInfo')) { - isCollection('STORE', this.goodsMsg.data.storeId).then(res => { - if (res.success && res.result) { - this.storeCollected = true; - } - }) - } + }, data () { return { goodsMsg: {}, // 商品信息 isLoading: false, // 加载状态 categoryBar: [], // 分类 - storeCollected: false // 商品收藏 + storeCollected: false, // 商品收藏 + storeMsg: {} // 店铺信息 }; }, methods: { @@ -83,6 +80,20 @@ export default { }); this.categoryBar = cateArr; this.goodsMsg = res.result; + // 判断是否收藏 + if (this.Cookies.getItem('userInfo')) { + isCollection('STORE', this.goodsMsg.data.storeId).then(res => { + if (res.success && res.result) { + this.storeCollected = true; + } + }) + } + // 获取店铺信息 + getDetailById(this.goodsMsg.data.storeId).then(res => { + if (res.success) { + this.storeMsg = res.result + } + }) } else { this.$Message.error(res.message) this.$router.push('/') @@ -91,7 +102,7 @@ export default { this.$router.push('/') }); }, - goGoodsList (currIndex) { + goGoodsList (currIndex) { // 跳转商品列表 const arr = [] this.categoryBar.forEach((e, index) => { if (index <= currIndex) { @@ -132,7 +143,6 @@ export default { } }; - diff --git a/buyer/src/pages/PointMall.vue b/buyer/src/pages/PointMall.vue index 23d3df3e..7cf5ae32 100644 --- a/buyer/src/pages/PointMall.vue +++ b/buyer/src/pages/PointMall.vue @@ -4,7 +4,7 @@
      -
    • {{cate.name}}
      • +
    • {{cate.name}}

    积分商品

    @@ -39,6 +39,13 @@ +
    + + +
    @@ -79,11 +86,27 @@ export default { } }) }, - selectCate (id) { + selectCate (id) { // 选择商品分类 this.params.pointsGoodsCategoryId = id this.getList() this.$router.push({query: {categoryId: id}}) - } + }, + goGoodsDetail (skuId, goodsId) { // 跳转商品详情 + let routerUrl = this.$router.resolve({ + path: '/goodsDetail', + query: {skuId, goodsId} + }) + window.open(routerUrl.href, '_blank') + }, + changePageNum (val) { // 修改页码 + this.params.pageNumber = val; + this.getList() + }, + changePageSize (val) { // 修改页数 + this.pageNumber = 1; + this.params.pageSize = val; + this.getList() + }, } } @@ -104,8 +127,19 @@ export default { margin: 0 10px; &:hover{ cursor: pointer; + color: $theme_color; } } + .selected-cate{ + color: $theme_color; + } + +} +.page-size { + width: 1200px; + margin: 10px auto; + display: flex; + justify-content: flex-end; } .promotion-decorate::before,.promotion-decorate::after{ background-image: url('../../static/sprite@2x.png'); diff --git a/buyer/src/pages/ShoppingCart.vue b/buyer/src/pages/ShoppingCart.vue index cf38d0e5..843fc981 100644 --- a/buyer/src/pages/ShoppingCart.vue +++ b/buyer/src/pages/ShoppingCart.vue @@ -34,33 +34,6 @@ - diff --git a/buyer/src/pages/home/memberCenter/CommentList.vue b/buyer/src/pages/home/memberCenter/CommentList.vue index 661669fe..ad3839c1 100644 --- a/buyer/src/pages/home/memberCenter/CommentList.vue +++ b/buyer/src/pages/home/memberCenter/CommentList.vue @@ -112,6 +112,10 @@ export default { \ No newline at end of file diff --git a/buyer/src/pages/home/memberCenter/memberMsg/MsgList.vue b/buyer/src/pages/home/memberCenter/memberMsg/MsgList.vue new file mode 100644 index 00000000..d36c6927 --- /dev/null +++ b/buyer/src/pages/home/memberCenter/memberMsg/MsgList.vue @@ -0,0 +1,41 @@ + + + \ No newline at end of file diff --git a/buyer/src/pages/user/menu.js b/buyer/src/pages/user/menu.js index 78c3c093..7a9cf9ab 100644 --- a/buyer/src/pages/user/menu.js +++ b/buyer/src/pages/user/menu.js @@ -41,6 +41,11 @@ const member = [{ title: '账户安全', path: 'AccountSafe' }, + { + icon: '', + title: '我的消息', + path: 'MsgList' + }, { icon: '', title: '我的足迹', diff --git a/buyer/src/router/index.js b/buyer/src/router/index.js index 5eb51b0d..e8272c84 100644 --- a/buyer/src/router/index.js +++ b/buyer/src/router/index.js @@ -47,6 +47,8 @@ const ComplainList = resolve => require(['@/pages/home/memberCenter/ComplainList const ComplainDetail = resolve => require(['@/pages/home/memberCenter/ComplainDetail'], resolve); const Invoice = resolve => require(['@/pages/home/memberCenter/Invoice'], resolve); const Point = resolve => require(['@/pages/home/memberCenter/Point'], resolve); +const MsgList = resolve => require(['@/pages/home/memberCenter/memberMsg/MsgList'], resolve); +const MsgDetail = resolve => require(['@/pages/home/memberCenter/memberMsg/MsgDetail'], resolve); /* * 会员中心 @@ -316,6 +318,18 @@ export default new Router({ name: 'AddAddress', component: AddAddress }, + { + path: 'MsgList', + name: 'MsgList', + component: MsgList, + meta: {title: '我的消息'} + }, + { + path: 'MsgDetail', + name: 'MsgDetail', + component: MsgDetail, + meta: {title: '我的消息'} + }, { path: 'MyOrder', name: 'MyOrder', diff --git a/manager/src/api/member.js b/manager/src/api/member.js index 8f07de09..fbce5ce1 100644 --- a/manager/src/api/member.js +++ b/manager/src/api/member.js @@ -98,11 +98,16 @@ export const getMemberStatistics = params => { }; - // 获取会员注册统计列表 export const getStatisticsList = params => { return getRequest("/statistics/view/list", params); }; + +// 获取会员历史流量 +export const historyMemberChartList = () => { + return getRequest("/statistics/view/online/history"); +} + //查询会员数量 export const getMemberNum = params => { return getRequest("/member/num", params); @@ -121,15 +126,15 @@ export const removeMemberAddress = (id) => { } //添加会员收货地址 export const addMemberAddress = (params) => { - return postRequest(`/member/address`,params) + return postRequest(`/member/address`, params) } //修改会员收货地址 export const editMemberAddress = (params) => { - return putRequest(`/member/address`,params) + return putRequest(`/member/address`, params) } //查询会员预存款 export const getMemberWallet = (params) => { - return getRequest(`/members/wallet`,params) + return getRequest(`/members/wallet`, params) } diff --git a/manager/src/config/index.js b/manager/src/config/index.js index 8b6b162f..9f868153 100644 --- a/manager/src/config/index.js +++ b/manager/src/config/index.js @@ -17,14 +17,10 @@ export default { * @description api请求基础路径 */ api_dev: { - // common: "https://common-api.pickmall.cn", - // buyer: "https://buyer-api.pickmall.cn", - // seller: "https://store-api.pickmall.cn", - // manager: "https://admin-api.pickmall.cn" - common: 'http://192.168.0.109:8890', - buyer: 'http://192.168.0.109:8888', - seller: 'http://192.168.0.109:8889', - manager: 'http://192.168.0.109:8887' + common: "https://common-api.pickmall.cn", + buyer: "https://buyer-api.pickmall.cn", + seller: "https://store-api.pickmall.cn", + manager: "https://admin-api.pickmall.cn" }, api_prod: { common: "https://common-api.pickmall.cn", diff --git a/manager/src/views/Main.vue b/manager/src/views/Main.vue index 491b10d4..d073cfa6 100644 --- a/manager/src/views/Main.vue +++ b/manager/src/views/Main.vue @@ -12,7 +12,7 @@ -
    +
    diff --git a/manager/src/views/distribution/distribution.vue b/manager/src/views/distribution/distribution.vue index 294f26d4..e76799ab 100644 --- a/manager/src/views/distribution/distribution.vue +++ b/manager/src/views/distribution/distribution.vue @@ -1,263 +1,329 @@ diff --git a/manager/src/views/distribution/distributionApply.vue b/manager/src/views/distribution/distributionApply.vue index d8465ccf..d3f7bba7 100644 --- a/manager/src/views/distribution/distributionApply.vue +++ b/manager/src/views/distribution/distributionApply.vue @@ -1,217 +1,240 @@ diff --git a/manager/src/views/distribution/distributionCash.vue b/manager/src/views/distribution/distributionCash.vue index e2d07a12..b450376b 100644 --- a/manager/src/views/distribution/distributionCash.vue +++ b/manager/src/views/distribution/distributionCash.vue @@ -1,35 +1,29 @@ @@ -65,9 +33,6 @@ export default { data() { return { loading: true, // 表单加载状态 - modalType: 0, // 添加或编辑标识 - modalVisible: false, // 添加或编辑显示 - modalTitle: "", // 添加或编辑标题 searchForm: { // 搜索框初始化对象 pageNumber: 1, // 当前页数 @@ -78,17 +43,6 @@ export default { endDate: "", // 终止时间 }, selectDate: null, // 选择一个事件段 - form: { - // 添加或编辑表单对象初始化数据 - sn: "", - sellerName: "", - startTime: "", - endTime: "", - billPrice: "", - }, - // 表单验证规则 - formValidate: {}, - submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 columns: [ @@ -227,8 +181,6 @@ export default { getDataList() { this.loading = true; - // this.searchForm - this.searchForm.startTime && (this.searchForm.startTime = this.$options.filters.unixToDate( this.searchForm.startTime / 1000 @@ -248,35 +200,6 @@ export default { this.total = this.data.length; this.loading = false; }, - handleSubmit() { - this.$refs.form.validate((valid) => { - if (valid) { - this.submitLoading = true; - if (this.modalType === 0) { - // 添加 避免编辑后传入id等数据 记得删除 - delete this.form.id; - this.postRequest("/bill/insertOrUpdate", this.form).then((res) => { - this.submitLoading = false; - if (res.success) { - this.$Message.success("操作成功"); - this.getDataList(); - this.modalVisible = false; - } - }); - } else { - // 编辑 - this.postRequest("/bill/insertOrUpdate", this.form).then((res) => { - this.submitLoading = false; - if (res.success) { - this.$Message.success("操作成功"); - this.getDataList(); - this.modalVisible = false; - } - }); - } - } - }); - }, detail(v) { let id = v.id; this.$router.push({ diff --git a/manager/src/views/seller/bill/bill-detail.vue b/manager/src/views/seller/bill/bill-detail.vue index f5bbad04..00c86956 100644 --- a/manager/src/views/seller/bill/bill-detail.vue +++ b/manager/src/views/seller/bill/bill-detail.vue @@ -48,15 +48,13 @@ - -
    -     +
    - -
    -     +
    - - - - -
    - - - - - - - - - - - -
    -     - - - - - - -
    -     - - - -     - -     - -
    - - - - - - - - - - - - - - - - - -
    -
    - - -
    -     + + +
    + + + + + + + + + + + +
    +     + + + + +
    + + + +
    @@ -76,9 +43,6 @@ export default { data() { return { loading: true, // 表单加载状态 - modalType: 0, // 添加或编辑标识 - modalVisible: false, // 添加或编辑显示 - modalTitle: "", // 添加或编辑标题 searchForm: { // 搜索框初始化对象 pageNumber: 1, // 当前页数 @@ -90,17 +54,6 @@ export default { billStatus:"" //状态 }, selectDate: null, // 选择一个时间段 - form: { - // 添加或编辑表单对象初始化数据 - sn: "", - sellerName: "", - startTime: "", - endTime: "", - billPrice: "", - }, - // 表单验证规则 - formValidate: {}, - submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 columns: [ @@ -201,28 +154,20 @@ export default { init() { this.getDataList(); }, - changePage(v) { + changePage(v) { // 改变页码 this.searchForm.pageNumber = v; this.getDataList(); }, - changePageSize(v) { + changePageSize(v) { // 改变页数 this.searchForm.pageSize = v; this.getDataList(); }, - handleSearch() { + handleSearch() { // 搜索 this.searchForm.pageNumber = 1; this.searchForm.pageSize = 10; this.getDataList(); }, - changeSort(e) { - this.searchForm.sort = e.key; - this.searchForm.order = e.order; - if (e.order === "normal") { - this.searchForm.order = ""; - } - this.getDataList(); - }, - changeSelect(e) { + changeSelect(e) { // 表格选中 this.selectList = e; this.selectCount = e.length; }, @@ -235,8 +180,6 @@ export default { getDataList() { this.loading = true; - // this.searchForm - this.searchForm.startTime && (this.searchForm.startTime = this.$options.filters.unixToDate( this.searchForm.startTime / 1000 @@ -256,43 +199,7 @@ export default { this.total = this.data.length; this.loading = false; }, - handleSubmit() { - this.$refs.form.validate((valid) => { - if (valid) { - this.submitLoading = true; - if (this.modalType === 0) { - // 添加 避免编辑后传入id等数据 记得删除 - delete this.form.id; - this.postRequest("/bill/insertOrUpdate", this.form).then((res) => { - this.submitLoading = false; - if (res.success) { - this.$Message.success("操作成功"); - this.getDataList(); - this.modalVisible = false; - } - }); - } else { - // 编辑 - this.postRequest("/bill/insertOrUpdate", this.form).then((res) => { - this.submitLoading = false; - if (res.success) { - this.$Message.success("操作成功"); - this.getDataList(); - this.modalVisible = false; - } - }); - } - } - }); - }, - add() { - this.modalType = 0; - this.modalTitle = "添加"; - this.$refs.form.resetFields(); - delete this.form.id; - this.modalVisible = true; - }, - detail(v) { + detail(v) { // 账单详情 let id = v.id; this.$router.push({ name: "bill-detail", @@ -314,14 +221,10 @@ export default { this.getDataList(); } }); - // 模拟请求成功 - //this.$Message.success("操作成功"); - //this.$Modal.remove(); - //this.getDataList(); }, }); }, - delAll() { + delAll() { // 多选删除数据 if (this.selectCount <= 0) { this.$Message.warning("您还未选择要删除的数据"); return; diff --git a/manager/src/views/seller/shop/shopAuditList.vue b/manager/src/views/seller/shop/shopAuditList.vue index 701f5f30..2101d6c7 100644 --- a/manager/src/views/seller/shop/shopAuditList.vue +++ b/manager/src/views/seller/shop/shopAuditList.vue @@ -1,44 +1,38 @@ diff --git a/manager/src/views/seller/shop/shopDetail.vue b/manager/src/views/seller/shop/shopDetail.vue index 3737568d..cb765c69 100644 --- a/manager/src/views/seller/shop/shopDetail.vue +++ b/manager/src/views/seller/shop/shopDetail.vue @@ -246,22 +246,20 @@
    - - - - -
    -     + + + +
    - - - - - - -
    -     + + + + + +
    - - - - - - -
    -     + + + + + + { + if (params.row.clientType == "H5") { + return h("div",{},"移动端"); + }else if(params.row.clientType == "PC") { + return h("div",{},"PC端"); + }else if(params.row.clientType == "WECHAT_MP") { + return h("div",{},"小程序端"); + }else if(params.row.clientType == "APP") { + return h("div",{},"移动应用端"); + } + else{ + return h("div",{},params.row.clientType); + } + }, }, { title: "订单状态", diff --git a/manager/src/views/seller/shop/shopList.vue b/manager/src/views/seller/shop/shopList.vue index 05961284..1f02d887 100644 --- a/manager/src/views/seller/shop/shopList.vue +++ b/manager/src/views/seller/shop/shopList.vue @@ -1,56 +1,50 @@ diff --git a/manager/src/views/seller/shop/shopOperation.vue b/manager/src/views/seller/shop/shopOperation.vue index e3db7ae4..05295e05 100644 --- a/manager/src/views/seller/shop/shopOperation.vue +++ b/manager/src/views/seller/shop/shopOperation.vue @@ -65,9 +65,17 @@ +
    +
    只读不可修改
    diff --git a/manager/src/views/sensitiveWords/index.vue b/manager/src/views/sensitiveWords/index.vue index dba70f7f..beb50ee4 100644 --- a/manager/src/views/sensitiveWords/index.vue +++ b/manager/src/views/sensitiveWords/index.vue @@ -1,41 +1,35 @@