mkm/new_shop_mer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
weipengfei 2024-03-20 11:48:58 +08:00
parent 70d5e103d5
commit 855559efe4
5 changed files with 96 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/layout/navBars/breadcrumb/user.vue
View File

@ -60,7 +60,7 @@
<div class="empty-text">暂无系统通知</div> <div class="empty-text">暂无系统通知</div>
</div> </div>
</el-card> </el-card>
</el-tabs> </el-tabs>
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
@ -345,7 +345,7 @@ export default {
.el-icon-bell{ .el-icon-bell{
font-size: 15px; font-size: 15px;
color: var(--prev-bg-topBarColor); color: var(--prev-bg-topBarColor);
} }
} }
& ::v-deep .el-dropdown { & ::v-deep .el-dropdown {

4
src/store/modules/user.js
View File

@ -22,6 +22,7 @@ const state = {
introduction: "", introduction: "",
marginStatus: 0, marginStatus: 0,
marginDays: "", marginDays: "",
wholesale: 0,
roles: [], roles: [],
menuList: JSON.parse(localStorage.getItem("MerMenuList")), menuList: JSON.parse(localStorage.getItem("MerMenuList")),
sidebarWidth: window.localStorage.getItem("sidebarWidth"), sidebarWidth: window.localStorage.getItem("sidebarWidth"),
@ -44,6 +45,9 @@ const mutations = {
SET_NAME: (state, name) => { SET_NAME: (state, name) => {
state.name = name; state.name = name;
}, },
SET_WHOLESALE: (state, wholesale) => {
state.wholesale = wholesale;
},
SET_AVATAR: (state, avatar) => { SET_AVATAR: (state, avatar) => {
state.avatar = avatar; state.avatar = avatar;
}, },

24
src/views/dashboard/admin/index.vue
View File

@ -21,7 +21,7 @@
<el-col :span="12"> <el-col :span="12">
<span>成交用户</span> <span>成交用户</span>
</el-col> </el-col>
<el-col :span="12" class="align-right"> <el-col :span="12" class="align-right">
<el-radio-group v-model="time1" size="mini" @change="getCustomerData(time1)"> <el-radio-group v-model="time1" size="mini" @change="getCustomerData(time1)">
<el-radio-button v-for="item in timeList" :key="item.value" :label="item.value">{{ item.label }}</el-radio-button> <el-radio-button v-for="item in timeList" :key="item.value" :label="item.value">{{ item.label }}</el-radio-button>
</el-radio-group> </el-radio-group>
@ -54,10 +54,10 @@
<el-col :span="24"> <el-col :span="24">
<div class="grid-content"> <div class="grid-content">
<el-col :span="4" class="bg-color bg-green"> <el-col :span="4" class="bg-color bg-green">
<span class="grid-count">{{ orderCustomer.orderUser }}</span>下单人数 <span class="grid-count">{{ orderCustomer.orderUser }}</span>下单人数
</el-col> </el-col>
<el-col :span="4" class="bg-color bg-green"> <el-col :span="4" class="bg-color bg-green">
<span class="grid-count">{{ orderCustomer.orderPrice }}</span>下单金额 <span class="grid-count">{{ orderCustomer.orderPrice }}</span>下单金额
</el-col> </el-col>
<el-col :span="8" class="bg-color bg-green" style="height: 100px;" /> <el-col :span="8" class="bg-color bg-green" style="height: 100px;" />
<el-col :span="10" class="green-trapezoid bg-trapezoid"> <el-col :span="10" class="green-trapezoid bg-trapezoid">
@ -72,10 +72,10 @@
支付人数 支付人数
</el-col> </el-col>
<el-col :span="4" class="bg-color bg-gray-dark"> <el-col :span="4" class="bg-color bg-gray-dark">
<span class="grid-count">{{ orderCustomer.payOrderPrice }}</span>支付金额 <span class="grid-count">{{ orderCustomer.payOrderPrice }}</span>支付金额
</el-col> </el-col>
<el-col :span="4" class="bg-color bg-gray-dark"> <el-col :span="4" class="bg-color bg-gray-dark">
<span class="grid-count">{{ orderCustomer.userRate }}</span>客单价 <span class="grid-count">{{ orderCustomer.userRate }}</span>客单价
</el-col> </el-col>
<el-col :span="2" class="bg-color bg-gray-dark" style="height: 100px;" /> <el-col :span="2" class="bg-color bg-gray-dark" style="height: 100px;" />
<el-col :span="10" class="gray-dark-trapezoid bg-trapezoid"> <el-col :span="10" class="gray-dark-trapezoid bg-trapezoid">
@ -124,7 +124,7 @@
<el-col :span="8"> <el-col :span="8">
<span>商品支付排行</span> <span>商品支付排行</span>
</el-col> </el-col>
<el-col :span="16" class="align-right"> <el-col :span="16" class="align-right">
<el-radio-group v-model="rankingTime1" size="mini" @change="getRankingData(rankingTime1)"> <el-radio-group v-model="rankingTime1" size="mini" @change="getRankingData(rankingTime1)">
<el-radio-button v-for="item in timeList" :key="item.value" :label="item.value">{{ item.label }}</el-radio-button> <el-radio-button v-for="item in timeList" :key="item.value" :label="item.value">{{ item.label }}</el-radio-button>
</el-radio-group> </el-radio-group>
@ -163,7 +163,7 @@
<el-col :span="8"> <el-col :span="8">
<span>商品访客排行</span> <span>商品访客排行</span>
</el-col> </el-col>
<el-col :span="16" class="align-right"> <el-col :span="16" class="align-right">
<el-radio-group v-model="rankingTime2" size="mini" @change="getVisitorRankingData(rankingTime2)"> <el-radio-group v-model="rankingTime2" size="mini" @change="getVisitorRankingData(rankingTime2)">
<el-radio-button v-for="item in timeList" :key="item.value" :label="item.value">{{ item.label }}</el-radio-button> <el-radio-button v-for="item in timeList" :key="item.value" :label="item.value">{{ item.label }}</el-radio-button>
</el-radio-group> </el-radio-group>
@ -202,7 +202,7 @@
<el-col :span="8"> <el-col :span="8">
<span>商品加购排行</span> <span>商品加购排行</span>
</el-col> </el-col>
<el-col :span="16" class="align-right"> <el-col :span="16" class="align-right">
<el-radio-group v-model="rankingTime3" size="mini" @change="getProductPlusData(rankingTime3)"> <el-radio-group v-model="rankingTime3" size="mini" @change="getProductPlusData(rankingTime3)">
<el-radio-button v-for="item in timeList" :key="item.value" :label="item.value">{{ item.label }}</el-radio-button> <el-radio-button v-for="item in timeList" :key="item.value" :label="item.value">{{ item.label }}</el-radio-button>
</el-radio-group> </el-radio-group>
@ -423,7 +423,7 @@ export default {
getUserMessage() { getUserMessage() {
getBaseInfo().then(res => { getBaseInfo().then(res => {
const resData = res.data const resData = res.data
console.log(resData) this.$store.commit('user/SET_WHOLESALE', resData.wholesale)
if ( if (
!resData.mer_avatar || !resData.mer_avatar ||
!resData.mer_banner || !resData.mer_banner ||
@ -456,7 +456,7 @@ export default {
name: 'ModifyStoreInfo' name: 'ModifyStoreInfo'
}) })
}).catch(() => { }).catch(() => {
window.localStorage.setItem('marginRemain', 1); window.localStorage.setItem('marginRemain', 1);
}); });
} }
} }
@ -552,7 +552,7 @@ $textColor: #8d8d8d;
background-color: #6394F9; background-color: #6394F9;
border-color: #6394F9; border-color: #6394F9;
-webkit-box-shadow: -1px 0 0 0 #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 { .grid-title-count {
background: #fff; background: #fff;
@ -643,7 +643,7 @@ $textColor: #8d8d8d;
.pieChart-switch { .pieChart-switch {
font-size: 0; font-size: 0;
position: absolute; position: absolute;
top: 80px; top: 80px;
} }
.pieChart-switch .el-button { .pieChart-switch .el-button {
display: inline-block; display: inline-block;

93
src/views/product/addProduct/index.vue
View File

@ -961,7 +961,7 @@
</el-row> </el-row>
<!-- 商品详情--> <!-- 商品详情-->
<el-row v-if="currentTab == '3'"> <el-row v-if="currentTab == '3'">
<el-col :span="24"> <!-- <el-col :span="24">
<el-form-item label="商品详情："> <el-form-item label="商品详情：">
<vue-ueditor-wrap <vue-ueditor-wrap
v-model="formValidate.content" v-model="formValidate.content"
@ -969,10 +969,31 @@
@beforeInit="addCustomDialog" @beforeInit="addCustomDialog"
/> />
</el-form-item> </el-form-item>
</el-col> -->
<el-col :span="24">
<!-- <el-form-item label="商品详情：">
<el-input
v-model="formValidate.content.title"
placeholder="请输入商品详情"
class="selWidth"
type="textarea"
/>
</el-form-item> -->
<el-form-item label="商品图片：">
<div class="upLoadPicBox" title="750*750px" @click="modalPicTap('3')">
<div v-for="(item, index) in formValidate.content.image" class="pictrue details_pictrue"
@click.stop="deleteContentImg(index)" :key="index + item">
<img :src="item" :key="index" />
</div>
<div class="upLoad details_pictrue">
<i class="el-icon-camera cameraIconfont" />
</div>
</div>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- 营销设置--> <!-- 营销设置-->
<el-row v-if="currentTab == '4'"> <!-- <el-row v-if="currentTab == '4'">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="商品推荐："> <el-form-item label="商品推荐：">
<el-checkbox-group <el-checkbox-group
@ -1062,10 +1083,10 @@
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row> -->
<!-- 其它设置 --> <!-- 其它设置 -->
<el-row v-if="currentTab == '5'"> <el-row v-if="currentTab == '4'">
<el-col> <!-- <el-col>
<el-form-item label="支持退款："> <el-form-item label="支持退款：">
<el-switch <el-switch
v-model="formValidate.refund_switch" v-model="formValidate.refund_switch"
@ -1076,7 +1097,7 @@
inactive-text="关闭" inactive-text="关闭"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col v-if="deliveryList.length > 0" :span="24"> <el-col v-if="deliveryList.length > 0" :span="24">
<el-form-item label="送货方式：" prop="delivery_way"> <el-form-item label="送货方式：" prop="delivery_way">
<div class="acea-row"> <div class="acea-row">
@ -1190,7 +1211,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-col> </el-col>
<el-col :span="24"> <!-- <el-col :span="24">
<el-form-item label="平台保障服务："> <el-form-item label="平台保障服务：">
<div class="acea-row"> <div class="acea-row">
<el-select <el-select
@ -1302,7 +1323,7 @@
@click="addSpecs" @click="addSpecs"
>添加参数</el-button> >添加参数</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<!-- <el-col v-if="formValidate.type == 1" :span="24"> <!-- <el-col v-if="formValidate.type == 1" :span="24">
<el-form-item label="自定义留言："> <el-form-item label="自定义留言：">
<el-radio-group v-model="customBtn" @change="customMessBtn"> <el-radio-group v-model="customBtn" @change="customMessBtn">
@ -1359,7 +1380,7 @@
</div> </div>
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<el-col :span="24"> <!-- <el-col :span="24">
<el-form-item label="关联系统表单："> <el-form-item label="关联系统表单：">
<el-select <el-select
size="small" size="small"
@ -1378,7 +1399,7 @@
</el-select> </el-select>
<div class="explanation">注：添加系统表单后，商品不可加入购物车，添加系统表单，请前往：装修>系统表单</div> <div class="explanation">注：添加系统表单后，商品不可加入购物车，添加系统表单，请前往：装修>系统表单</div>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="16"> <el-col :span="16">
<el-form-item v-if="formValidate.mer_form_id"> <el-form-item v-if="formValidate.mer_form_id">
<div style="width: 350px;"> <div style="width: 350px;">
@ -1415,7 +1436,7 @@
>上一步 >上一步
</el-button> </el-button>
<el-button <el-button
v-show="currentTab < 5" v-show="currentTab < 4"
type="primary" type="primary"
class="submission" class="submission"
size="small" size="small"
@ -1423,7 +1444,7 @@
>下一步 >下一步
</el-button> </el-button>
<el-button <el-button
v-show="currentTab == '5' || $route.params.id" v-show="currentTab == '4' || $route.params.id"
:loading="loading" :loading="loading"
type="primary" type="primary"
class="submission" class="submission"
@ -1808,8 +1829,8 @@ export default {
{ title: '商品信息', name: '1' }, { title: '商品信息', name: '1' },
{ title: '规格设置', name: '2' }, { title: '规格设置', name: '2' },
{ title: '商品详情', name: '3' }, { title: '商品详情', name: '3' },
{ title: '营销设置', name: '4' }, // { title: '营销设置', name: '4' },
{ title: '其他设置', name: '5' } { title: '其他设置', name: '4' }
], ],
type: 0, type: 0,
modals: false, modals: false,
@ -1893,7 +1914,7 @@ export default {
deep: true deep: true
}, },
currentTab(newVal) { currentTab(newVal) {
if (newVal == 5) { if (newVal == 4) {
this.$nextTick(e=>{ this.$nextTick(e=>{
this.setSort() this.setSort()
}) })
@ -1907,6 +1928,9 @@ export default {
} }
}, },
mounted() { mounted() {
if(this.$store.state.user.wholesale==0){
delete this.attrVal.wholesale_price
}
this.getCategorySelect() this.getCategorySelect()
this.getCategoryList() this.getCategoryList()
this.getBrandListApi() this.getBrandListApi()
@ -1943,19 +1967,19 @@ export default {
methods: { methods: {
setSort() { setSort() {
// ref一定跟table上面的ref一致 // ref一定跟table上面的ref一致
const el = this.$refs.tableParameter.$el.querySelectorAll( // const el = this.$refs.tableParameter.$el.querySelectorAll(
'.el-table__body-wrapper > table > tbody' // '.el-table__body-wrapper > table > tbody'
)[0] // )[0]
this.sortable = Sortable.create(el, { // this.sortable = Sortable.create(el, {
ghostClass: 'sortable-ghost', // ghostClass: 'sortable-ghost',
setData: function(dataTransfer) { // setData: function(dataTransfer) {
dataTransfer.setData('Text', '') // dataTransfer.setData('Text', '')
}, // },
// 监听拖拽事件结束时触发 // // 监听拖拽事件结束时触发
onEnd: evt => { // onEnd: evt => {
this.elChangeExForArray(evt.oldIndex, evt.newIndex, this.formValidate.params) // this.elChangeExForArray(evt.oldIndex, evt.newIndex, this.formValidate.params)
} // }
}) // })
}, },
elChangeExForArray(index1, index2, array) { elChangeExForArray(index1, index2, array) {
const temp = array[index1] const temp = array[index1]
@ -2958,8 +2982,21 @@ export default {
if (tit === "1" && num === "pi") { if (tit === "1" && num === "pi") {
_this.oneFormBatch[0].image = img[0]; _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); }, tit);
}, },
// 删除详情图片
deleteContentImg(index) {
this.formValidate.content.image.splice(index, 1)
},
handleSubmitUp() { handleSubmitUp() {
this.currentTab = (Number(this.currentTab) - 1).toString(); this.currentTab = (Number(this.currentTab) - 1).toString();
}, },

26
src/views/systemForm/setSystem/modifyStoreInfo.vue
View File

@ -149,7 +149,7 @@
<div class="item">说明： <span class="red">申请退回保证金则视为关闭店铺，请谨慎操作！</span></div> <div class="item">说明： <span class="red">申请退回保证金则视为关闭店铺，请谨慎操作！</span></div>
<div class="item"> <div class="item">
<div v-if="online > 0">线上支付的保证金 <span class="red">{{online}}元</span>会原路返回</div> <div v-if="online > 0">线上支付的保证金 <span class="red">{{online}}元</span>会原路返回</div>
<div v-if="offline > 0"> <div v-if="offline > 0">
线下支付的保证金<span class="red">{{offline}}元，</span>会通过下方账号信息返回，请务必确认下方您的收款信息真实有效，以确保资金可顺利退回，感谢配合！ 线下支付的保证金<span class="red">{{offline}}元，</span>会通过下方账号信息返回，请务必确认下方您的收款信息真实有效，以确保资金可顺利退回，感谢配合！
</div> </div>
@ -210,8 +210,8 @@
<div v-else class="upLoad"> <div v-else class="upLoad">
<i class="el-icon-camera cameraIconfont" /> <i class="el-icon-camera cameraIconfont" />
</div> </div>
<div class="trip">建议尺寸：710*134px或710*460px(请根据平台要求选择尺寸，此图如未上传默认展示店铺背景图)</div> <div class="trip">建议尺寸：710*134px或710*460px(请根据平台要求选择尺寸，此图如未上传默认展示店铺背景图)</div>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item class="form-item" label="店铺资质：" :prop="merData.sys_bases_status == 1 ? 'uploadedqualifications' : ''"> <el-form-item class="form-item" label="店铺资质：" :prop="merData.sys_bases_status == 1 ? 'uploadedqualifications' : ''">
<div class="upLoadPicBox_qualification"> <div class="upLoadPicBox_qualification">
@ -490,7 +490,7 @@ export default {
// } // }
// },100) // },100)
// } // }
// var checkPhone = (rule, value, callback) => { // var checkPhone = (rule, value, callback) => {
// if (value === '') { // if (value === '') {
// callback(new Error('请输入电话号码')) // callback(new Error('请输入电话号码'))
@ -628,7 +628,7 @@ export default {
}, },
created() { created() {
this.getMapInfo() this.getMapInfo()
}, },
mounted: function() { mounted: function() {
@ -707,7 +707,7 @@ export default {
}) })
} else { } else {
that.uploadedQualifications = [] that.uploadedQualifications = []
} }
if(that.merData.is_margin == 1)(this.getCode()) if(that.merData.is_margin == 1)(this.getCode())
}) })
}, },
@ -780,7 +780,7 @@ export default {
this.submitLoading = false this.submitLoading = false
this.$message.error(rej.data.message) this.$message.error(rej.data.message)
}) })
} }
}, },
// 获取支付二维码 // 获取支付二维码
getCode() { getCode() {
@ -817,7 +817,7 @@ export default {
getRecordList(){ getRecordList(){
let that = this let that = this
that.loading = true; that.loading = true;
marginRecordLst(that.tableFrom).then(async (res) => { marginRecordLst(that.tableFrom).then(async (res) => {
that.tableData.data = res.data.list; that.tableData.data = res.data.list;
that.tableData.total = res.data.count; that.tableData.total = res.data.count;
that.loading = false; that.loading = false;
@ -845,7 +845,7 @@ export default {
marginRefund() marginRefund()
.then((res) => { .then((res) => {
that.bankValidate = res.data.info that.bankValidate = res.data.info
that.offline = res.data.offline that.offline = res.data.offline
that.online = res.data.online that.online = res.data.online
if(Number(res.data.offline) <= 0){ if(Number(res.data.offline) <= 0){
marginRefundApply(this.bankValidate) marginRefundApply(this.bankValidate)
@ -1023,7 +1023,7 @@ export default {
margin-top: 10px; margin-top: 10px;
color: #282828; color: #282828;
font-size: 13px; font-size: 13px;
line-height: 26px; line-height: 26px;
} }
.red{ .red{
color:rgb(237, 64, 20);; color:rgb(237, 64, 20);;
@ -1133,7 +1133,7 @@ export default {
border-radius: 8px; border-radius: 8px;
padding: 10px; padding: 10px;
box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3); box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
img{ img{
width: 160px; width: 160px;
height: 160px; height: 160px;
@ -1143,7 +1143,7 @@ export default {
font-size: 16px; font-size: 16px;
color: #303133; color: #303133;
font-weight: normal; font-weight: normal;
} }
.pay_price{ .pay_price{
font-size: 18px; font-size: 18px;
@ -1158,7 +1158,7 @@ export default {
.pay_time{ .pay_time{
font-size: 12px; font-size: 12px;
color: #6D7278; color: #6D7278;
} }
} }