diff --git a/.env.development b/.env.development index d86fc3e..2a5e48a 100644 --- a/.env.development +++ b/.env.development @@ -3,9 +3,9 @@ ENV = 'development' # base api # VUE_APP_BASE_API = '/dev-api' -# VUE_APP_BASE_API = 'http://117.50.215.20:20400' -# VUE_APP_BASE_API = 'https://yruibao.com' -VUE_APP_BASE_API = 'http://106.75.49.247:20400' +# VUE_APP_BASE_API = 'http://106.75.49.247:20400' +VUE_APP_BASE_API = 'https://yruibao.com/admin' +# VUE_APP_BASE_API = 'http://192.168.2.26:20401' # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, diff --git a/.env.production b/.env.production index e27871a..7119b75 100644 --- a/.env.production +++ b/.env.production @@ -3,6 +3,6 @@ ENV = 'production' # base api # VUE_APP_BASE_API = '/prod-api' -# VUE_APP_BASE_API = 'http://117.50.215.20:20400' -# VUE_APP_BASE_API = 'https://yruibao.com' -VUE_APP_BASE_API = 'http://106.75.49.247:20400' +# VUE_APP_BASE_API = 'http://106.75.49.247:20400' +VUE_APP_BASE_API = 'https://yruibao.com/admin' +# VUE_APP_BASE_API = 'http://192.168.2.26:20401' diff --git a/README.md b/README.md index aa82f24..52535f5 100644 --- a/README.md +++ b/README.md @@ -128,7 +128,7 @@ utils 自定义工具js 独立命名，一般不用新建文件夹 │ │ └──Sidebar # 侧边导航 │ │ └──TagsView # tab标签页导航 │ │ └──Navbar # 头部导航 -│ │ └──AppMain # 导航路由 +│ │ └──AppMain # 导航路由 │ │ └──index.js # 组件引用 │ │ └──mixins # 自适应大小 │ ├── libs # 公共js方法 diff --git a/src/api/channel.js b/src/api/channel.js index dcaab21..bc7c9c8 100644 --- a/src/api/channel.js +++ b/src/api/channel.js @@ -118,6 +118,7 @@ export function UpdateChannel(pram) { price: pram.price, status: pram.status, remark: pram.remark, + storeHide:pram.storeHide, }; return request({ url: '/admin/channel/update', diff --git a/src/views/channel/creatChannel.vue b/src/views/channel/creatChannel.vue index 1ff0ab3..a3b40fc 100644 --- a/src/views/channel/creatChannel.vue +++ b/src/views/channel/creatChannel.vue @@ -32,6 +32,15 @@ :inactive-value="false" /> + + + @@ -58,6 +67,8 @@ const obj = { status: true, remark: '', id: null, + storeHide:true, + }; export default { name: 'CreatChannel', @@ -111,13 +122,16 @@ export default { // this.channelInfo.downPaymentPercent = (this.channelInfo.downPaymentPercentStr)/100; console.log("----------- "+JSON.stringify(this.channelInfo)); let data = { + storeHide: this.channelInfo.storeHide, name: this.channelInfo.name, url: this.channelInfo.url, price: this.channelInfo.price, status: this.channelInfo.status, remark: this.channelInfo.remark, - id: this.channelInfo.id + id: this.channelInfo.id, + }; + console.log(data,' storeHide: this.channelInfo.storeHide,'); this.channelInfo.id ? UpdateChannel(data) .then((res) => { @@ -137,6 +151,7 @@ export default { this.handleClose(); this.formValidate = Object.assign({}, obj); this.$parent.getList(); + clog }) .catch(() => { this.loading = false; diff --git a/src/views/channel/index.vue b/src/views/channel/index.vue index 32515c5..346021a 100644 --- a/src/views/channel/index.vue +++ b/src/views/channel/index.vue @@ -28,13 +28,13 @@ - + @@ -45,12 +45,12 @@ - + @@ -272,6 +272,11 @@ export default { navigator.clipboard.writeText(url) .then(() => { console.log('URL已成功复制到剪贴板'); + this.$message({ + message: '复制成功', + type: 'success', + center:true + }); }) .catch(err => { console.error('无法复制URL到剪贴板:', err); diff --git a/src/views/dashboard/components/gridMenu.vue b/src/views/dashboard/components/gridMenu.vue index 9d87d2c..dc99ab6 100644 --- a/src/views/dashboard/components/gridMenu.vue +++ b/src/views/dashboard/components/gridMenu.vue @@ -143,6 +143,7 @@ export default { } }); return arr; + }, }, mounted() { diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index cc65efc..e5dbd78 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -39,7 +39,7 @@ export default { this.authStatus = Cache.local.has('auth-information') ? Cache.local.getJSON('auth-information') : null; this.notInformation = Cache.local.has('not-information') ? Cache.local.getJSON('not-information') : null; if (!this.authStatus) { - this.getUniq(); + // this.getUniq(); } } }, diff --git a/src/views/marketing/bargain/bargainGoods/creatBargain.vue b/src/views/marketing/bargain/bargainGoods/creatBargain.vue index 15861bf..cbdc7b4 100644 --- a/src/views/marketing/bargain/bargainGoods/creatBargain.vue +++ b/src/views/marketing/bargain/bargainGoods/creatBargain.vue @@ -564,6 +564,7 @@ export default { productId: res.id, giveIntegral: res.giveIntegral, ficti: res.ficti, + isHide:res.isHide, startTime: res.startTime || '', stopTime: res.stopTime || '', timeVal: [], @@ -572,6 +573,7 @@ export default { bargainNum: 2, peopleNum: 1, }; + console.log( this.formValidate,' this.formValidate this.formValidate'); if (res.specType) { res.attrValue.forEach((row) => { row.quota = row.stock; @@ -617,6 +619,7 @@ export default { productId: res.productId, giveIntegral: res.giveIntegral, ficti: res.ficti, + isHide:res.isHide, startTime: res.startTime || '', stopTime: res.stopTime || '', timeVal: diff --git a/src/views/order/orderSend.vue b/src/views/order/orderSend.vue index 9292bab..7c16f09 100644 --- a/src/views/order/orderSend.vue +++ b/src/views/order/orderSend.vue @@ -310,7 +310,7 @@ export default { }, mounted() { this.express = this.expressListNormal; - this.getShipmentExpress(); + // this.getShipmentExpress(); }, methods: { checkPermi, diff --git a/src/views/store/creatStore/index.vue b/src/views/store/creatStore/index.vue index f1d82ef..47a13fe 100644 --- a/src/views/store/creatStore/index.vue +++ b/src/views/store/creatStore/index.vue @@ -168,6 +168,16 @@ 默认设置 + + + 隐藏 + 不隐藏 + + @@ -642,6 +652,7 @@ const defaultObj = { // installmentConfigs:[], isHot: false, isBest: false, + isHide:false, tempId: '', attrValue: [ { @@ -1247,6 +1258,7 @@ export default { attrValue: info.attrValue, selectRule: info.selectRule, isSub: info.isSub, + isHide:info.isHide, content: this.$selfUtil.replaceImgSrcHttps(info.content), // installmentConfigs: info.storeProductInstallmentsList ==null?[]:info.storeProductInstallmentsList, // orderType: info.orderType,