code-image-backup-public/lilishop-ui
1
0
Fork 0
mirror of https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git synced 2025-12-19 09:25:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Bulbasaur

Browse Source
This commit is contained in:
pikachu1995@126.com
2023-03-22 08:43:05 +08:00
parent 8599708af3 bf58711c88
commit 64c61d5365
19 changed files with 168 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manager/src/views/distribution/distributionSetting.vue
View File

@@ -14,7 +14,7 @@
<InputNumber :min="1" :max="365" style="width:100px;" v-model="form.distributionDay"></InputNumber>
</FormItem>
<FormItem label="分销结算天数" prop="cashDay">
<InputNumber :min="1" :max="365" style="width:100px;" v-model="form.cashDay"></InputNumber>
<InputNumber :min="0" :max="365" style="width:100px;" v-model="form.cashDay"></InputNumber>
</FormItem>
<FormItem>
<Button type="primary" @click="submit">保存</Button>

5
manager/src/views/member/list/index.vue
View File

@@ -465,10 +465,11 @@ export default {
// 提交修改数据
handleSubmitModal() {
debugger
const { nickName, sex, username, face, newPassword,id } = this.form;
let time = new Date(this.form.birthday);
let birthday = time ?
time.getFullYear() + "-" + (time.getMonth() + 1) + "-" + time.getDate() : '';
let birthday = this.form.birthday=== undefined?'':
time.getFullYear() + "-" + (time.getMonth() + 1) + "-" + time.getDate();
let submit = {
regionId: this.form.regionId,
region: this.form.region,

3
manager/src/views/member/message-manage/weChatMessageManager.vue
View File

@@ -281,6 +281,9 @@ export default {
wechatFormDataEdit() {
this.$refs['wechatFormData'].validate((valid) => {
if (valid) {
if(!this.wechatFormData.updateTime){
this.wechatFormData.updateTime = ''
}
editWechatMessageTemplate(this.id, this.wechatFormData).then(res => {
if (res.message === 'success') {
this.$Message.success('微信模板修改成功');

2
manager/src/views/promotions/full-discount/full-discount.vue
View File

@@ -169,7 +169,7 @@ export default {
// 开启或关闭活动
openOrClose(row) {
let name = "开启";
if (row.promotionStatus === "START") {
if (row.promotionStatus === 'NEW' ||row.promotionStatus === "START") {
name = "关闭";
this.$Modal.confirm({
title: "提示",

12
manager/src/views/seller/shop/shopDetail.vue
View File

@@ -87,7 +87,17 @@
<p class="item">
<span class="label">店铺所在地：</span>
<span class="info">
{{storeInfo.storeAddressPath || storeInfo.storeAddressDetail?storeInfo.storeAddressPath +storeInfo.storeAddressDetail:"暂未完善"}}
<span>
{{
(storeInfo.storeAddressPath!==null && storeInfo.storeAddressPath!=='' && storeInfo.storeAddressPath!=="null" && storeInfo.storeAddressPath!==undefined )? storeInfo.storeAddressPath: ""
}}
</span>
<span>
{{
(storeInfo.storeAddressDetail!==null && storeInfo.storeAddressDetail!=='' && storeInfo.storeAddressDetail!=="null" && storeInfo.storeAddressDetail!==undefined )? storeInfo.storeAddressDetail:""
}}
</span>
{{(storeInfo.storeAddressPath!==null && storeInfo.storeAddressPath!=='' && storeInfo.storeAddressPath!=="null" && storeInfo.storeAddressPath!==undefined) || (storeInfo.storeAddressDetail!==null && storeInfo.storeAddressDetail!=='' && storeInfo.storeAddressDetail!=="null" && storeInfo.storeAddressDetail!==undefined )?"":"暂未完善"}}
</span>
</p>
<p class="item">

12
manager/src/views/sys/app-version/appVersion.vue
View File

@@ -342,11 +342,13 @@ export default {
this.$refs.form.validate((valid) => {
if (valid) {
this.submitLoading = true;
const versionUpdateDate = this.$options.filters.unixToDate(
this.form.versionUpdateDate / 1000
);
this.form.versionUpdateDate = versionUpdateDate;
this.form.updateTime = versionUpdateDate;
if(JSON.stringify(this.form.versionUpdateDate).includes('T')){
const versionUpdateDate = this.$options.filters.unixToDate(
this.form.versionUpdateDate / 1000
);
this.form.versionUpdateDate = versionUpdateDate;
this.form.updateTime = versionUpdateDate;
}
if (this.modalType == 0) {
// 添加 避免编辑后传入id等数据 记得删除
delete this.form.id;