From 855559efe43f2d715ccf4239f5dabf658ab6617e Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Wed, 20 Mar 2024 11:48:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/navBars/breadcrumb/user.vue | 4 +- src/store/modules/user.js | 4 + src/views/dashboard/admin/index.vue | 24 ++--- src/views/product/addProduct/index.vue | 93 +++++++++++++------ .../systemForm/setSystem/modifyStoreInfo.vue | 26 +++--- 5 files changed, 96 insertions(+), 55 deletions(-) diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue index efa08cd..acad61b 100644 --- a/src/layout/navBars/breadcrumb/user.vue +++ b/src/layout/navBars/breadcrumb/user.vue @@ -60,7 +60,7 @@
暂无系统通知
- + @@ -345,7 +345,7 @@ export default { .el-icon-bell{ font-size: 15px; color: var(--prev-bg-topBarColor); - + } } & ::v-deep .el-dropdown { diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 25806e2..15518fa 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -22,6 +22,7 @@ const state = { introduction: "", marginStatus: 0, marginDays: "", + wholesale: 0, roles: [], menuList: JSON.parse(localStorage.getItem("MerMenuList")), sidebarWidth: window.localStorage.getItem("sidebarWidth"), @@ -44,6 +45,9 @@ const mutations = { SET_NAME: (state, name) => { state.name = name; }, + SET_WHOLESALE: (state, wholesale) => { + state.wholesale = wholesale; + }, SET_AVATAR: (state, avatar) => { state.avatar = avatar; }, diff --git a/src/views/dashboard/admin/index.vue b/src/views/dashboard/admin/index.vue index 1d9bd8f..04d1477 100644 --- a/src/views/dashboard/admin/index.vue +++ b/src/views/dashboard/admin/index.vue @@ -21,7 +21,7 @@ 成交用户 - + {{ item.label }} @@ -54,10 +54,10 @@
- {{ orderCustomer.orderUser }}下单人数 + {{ orderCustomer.orderUser }}下单人数 - {{ orderCustomer.orderPrice }}下单金额 + {{ orderCustomer.orderPrice }}下单金额 @@ -72,10 +72,10 @@ 支付人数 - {{ orderCustomer.payOrderPrice }}支付金额 + {{ orderCustomer.payOrderPrice }}支付金额 - {{ orderCustomer.userRate }}客单价 + {{ orderCustomer.userRate }}客单价 @@ -124,7 +124,7 @@ 商品支付排行 - + {{ item.label }} @@ -163,7 +163,7 @@ 商品访客排行 - + {{ item.label }} @@ -202,7 +202,7 @@ 商品加购排行 - + {{ item.label }} @@ -423,7 +423,7 @@ export default { getUserMessage() { getBaseInfo().then(res => { const resData = res.data - console.log(resData) + this.$store.commit('user/SET_WHOLESALE', resData.wholesale) if ( !resData.mer_avatar || !resData.mer_banner || @@ -456,7 +456,7 @@ export default { name: 'ModifyStoreInfo' }) }).catch(() => { - window.localStorage.setItem('marginRemain', 1); + window.localStorage.setItem('marginRemain', 1); }); } } @@ -552,7 +552,7 @@ $textColor: #8d8d8d; background-color: #6394F9; border-color: #6394F9; -webkit-box-shadow: -1px 0 0 0 #6394F9; - box-shadow: -1px 0 0 0 #6394F9; + box-shadow: -1px 0 0 0 #6394F9; } .grid-title-count { background: #fff; @@ -643,7 +643,7 @@ $textColor: #8d8d8d; .pieChart-switch { font-size: 0; position: absolute; - top: 80px; + top: 80px; } .pieChart-switch .el-button { display: inline-block; diff --git a/src/views/product/addProduct/index.vue b/src/views/product/addProduct/index.vue index c7453cc..bbaf10e 100644 --- a/src/views/product/addProduct/index.vue +++ b/src/views/product/addProduct/index.vue @@ -961,7 +961,7 @@ - + + + + +
+
+ +
+
+ +
+
+
- + - - + +
@@ -1190,7 +1211,7 @@ - + - +
@@ -1415,7 +1436,7 @@ >上一步 下一步 { this.setSort() }) @@ -1907,6 +1928,9 @@ export default { } }, mounted() { + if(this.$store.state.user.wholesale==0){ + delete this.attrVal.wholesale_price + } this.getCategorySelect() this.getCategoryList() this.getBrandListApi() @@ -1943,19 +1967,19 @@ export default { methods: { setSort() { // ref一定跟table上面的ref一致 - const el = this.$refs.tableParameter.$el.querySelectorAll( - '.el-table__body-wrapper > table > tbody' - )[0] - this.sortable = Sortable.create(el, { - ghostClass: 'sortable-ghost', - setData: function(dataTransfer) { - dataTransfer.setData('Text', '') - }, - // 监听拖拽事件结束时触发 - onEnd: evt => { - this.elChangeExForArray(evt.oldIndex, evt.newIndex, this.formValidate.params) - } - }) + // const el = this.$refs.tableParameter.$el.querySelectorAll( + // '.el-table__body-wrapper > table > tbody' + // )[0] + // this.sortable = Sortable.create(el, { + // ghostClass: 'sortable-ghost', + // setData: function(dataTransfer) { + // dataTransfer.setData('Text', '') + // }, + // // 监听拖拽事件结束时触发 + // onEnd: evt => { + // this.elChangeExForArray(evt.oldIndex, evt.newIndex, this.formValidate.params) + // } + // }) }, elChangeExForArray(index1, index2, array) { const temp = array[index1] @@ -2958,8 +2982,21 @@ export default { if (tit === "1" && num === "pi") { _this.oneFormBatch[0].image = img[0]; } + if (tit === "3") { + // console.log('选择的', _this.formValidate?.content, img) + let image = _this.formValidate.content.image ? _this.formValidate.content.image : []; + _this.formValidate.content = { + image: [...image, ...img], + title: _this.formValidate.content.title + } + console.log('选择好的', _this.formValidate.content) + } }, tit); }, + // 删除详情图片 + deleteContentImg(index) { + this.formValidate.content.image.splice(index, 1) + }, handleSubmitUp() { this.currentTab = (Number(this.currentTab) - 1).toString(); }, diff --git a/src/views/systemForm/setSystem/modifyStoreInfo.vue b/src/views/systemForm/setSystem/modifyStoreInfo.vue index ab562d3..9e5fe57 100644 --- a/src/views/systemForm/setSystem/modifyStoreInfo.vue +++ b/src/views/systemForm/setSystem/modifyStoreInfo.vue @@ -149,7 +149,7 @@
说明: 申请退回保证金则视为关闭店铺,请谨慎操作!
线上支付的保证金 {{online}}元会原路返回
- +
线下支付的保证金{{offline}}元,会通过下方账号信息返回,请务必确认下方您的收款信息真实有效,以确保资金可顺利退回,感谢配合!
@@ -210,8 +210,8 @@
-
建议尺寸:710*134px或710*460px(请根据平台要求选择尺寸,此图如未上传默认展示店铺背景图)
-
+
建议尺寸:710*134px或710*460px(请根据平台要求选择尺寸,此图如未上传默认展示店铺背景图)
+
@@ -490,7 +490,7 @@ export default { // } // },100) // } - + // var checkPhone = (rule, value, callback) => { // if (value === '') { // callback(new Error('请输入电话号码')) @@ -628,7 +628,7 @@ export default { }, created() { this.getMapInfo() - + }, mounted: function() { @@ -707,7 +707,7 @@ export default { }) } else { that.uploadedQualifications = [] - } + } if(that.merData.is_margin == 1)(this.getCode()) }) }, @@ -780,7 +780,7 @@ export default { this.submitLoading = false this.$message.error(rej.data.message) }) - } + } }, // 获取支付二维码 getCode() { @@ -817,7 +817,7 @@ export default { getRecordList(){ let that = this that.loading = true; - marginRecordLst(that.tableFrom).then(async (res) => { + marginRecordLst(that.tableFrom).then(async (res) => { that.tableData.data = res.data.list; that.tableData.total = res.data.count; that.loading = false; @@ -845,7 +845,7 @@ export default { marginRefund() .then((res) => { that.bankValidate = res.data.info - that.offline = res.data.offline + that.offline = res.data.offline that.online = res.data.online if(Number(res.data.offline) <= 0){ marginRefundApply(this.bankValidate) @@ -1023,7 +1023,7 @@ export default { margin-top: 10px; color: #282828; font-size: 13px; - line-height: 26px; + line-height: 26px; } .red{ color:rgb(237, 64, 20);; @@ -1133,7 +1133,7 @@ export default { border-radius: 8px; padding: 10px; box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3); - + img{ width: 160px; height: 160px; @@ -1143,7 +1143,7 @@ export default { font-size: 16px; color: #303133; font-weight: normal; - + } .pay_price{ font-size: 18px; @@ -1158,7 +1158,7 @@ export default { .pay_time{ font-size: 12px; color: #6D7278; - + } }