From 88f5ab43298b758175a01a780de3b15837ce8c0b Mon Sep 17 00:00:00 2001
From: chenjiajun <chenjiajun@hxiaolian.com>
Date: Fri, 25 Jun 2021 16:43:25 +0800
Subject: [PATCH] update

---
 src/api/yxStoreCombination.js           |  8 ++++++++
 src/components/material/index.vue       |  2 +-
 src/layout/components/Navbar.vue        |  4 ----
 src/layout/components/Sidebar/Logo.vue  |  2 +-
 src/settings.js                         |  6 +++---
 src/views/activity/bargain/form.vue     | 20 ++++++++++++++------
 src/views/activity/combination/form.vue | 24 ++++++++++++++++++------
 src/views/activity/seckill/form.vue     | 19 ++++++++++++++-----
 src/views/login.vue                     | 17 ++---------------
 src/views/system/menu/index.vue         |  4 ++--
 src/views/wechat/live/index.vue         |  7 ++++++-
 11 files changed, 69 insertions(+), 44 deletions(-)

diff --git a/src/api/yxStoreCombination.js b/src/api/yxStoreCombination.js
index 671a90a..c89e617 100644
--- a/src/api/yxStoreCombination.js
+++ b/src/api/yxStoreCombination.js
@@ -8,6 +8,14 @@ export function add(data) {
   })
 }
 
+export function edit(data) {
+  return request({
+    url: 'api/yxStoreCombination',
+    method: 'put',
+    data
+  })
+}
+
 export function del(id) {
   return request({
     url: 'api/yxStoreCombination/' + id,
diff --git a/src/components/material/index.vue b/src/components/material/index.vue
index 18fc73f..bb872d8 100644
--- a/src/components/material/index.vue
+++ b/src/components/material/index.vue
@@ -105,7 +105,7 @@
                         :src="item.url"
                         fit="contain"
                         :preview-src-list="[item.url]"
-                        :z-index="999"
+                        :z-index="9999"
                       />
                       <div>
                         <el-checkbox class="material-name" :label="item.url">
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 9100591..eccc7d2 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -8,10 +8,6 @@
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
 
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <Github class="right-menu-item hover-effect" />
-        </el-tooltip>
-
         <el-tooltip content="全屏缩放" effect="dark" placement="bottom">
           <screenfull id="screenfull" class="right-menu-item hover-effect" />
         </el-tooltip>
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index f38c126..7a68286 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -25,7 +25,7 @@ export default {
   },
   data() {
     return {
-      title: 'YSHOP-后台管理',
+      title: '乐享美酒-后台管理',
       logo: Logo
     }
   }
diff --git a/src/settings.js b/src/settings.js
index 8f5570b..d43aad9 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -2,7 +2,7 @@ module.exports = {
   /**
    * @description 网站标题
    */
-  title: 'YSHOP-3.2',
+  title: '乐享美酒',
   /**
    * @description 是否显示 tagsView
    */
@@ -42,9 +42,9 @@ module.exports = {
   /**
    * 底部文字，支持html语法
    */
-  footerTxt: '© 2019-2021 YSHOP <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">All Rights Reserved</a>',
+  footerTxt: '',
   /**
    * 备案号
    */
-  caseNumber: '豫ICP备17049587-2号'
+  caseNumber: ''
 }
diff --git a/src/views/activity/bargain/form.vue b/src/views/activity/bargain/form.vue
index 5601330..09dacef 100644
--- a/src/views/activity/bargain/form.vue
+++ b/src/views/activity/bargain/form.vue
@@ -118,6 +118,11 @@ export default {
       templateList: [],
       form1: {
         good:{
+          productId: null,
+          storeName: null,
+          image: null,
+          otPrice: null,
+          price: null,
         }
       },
       form: {
@@ -168,10 +173,10 @@ export default {
     }
   },
   watch: {
-    'form.imageArr': function(val) {
-      if (val && Array.isArray(val)) {
-        this.form.image = val.join(',')
-      }
+    'form.image': function(val) {
+      this.form1.good.image = this.form.image
+      this.form1.good.productId = this.form.productId
+     
     },
     'form.sliderImageArr': function(val) {
       console.log("aaa:"+val)
@@ -179,13 +184,16 @@ export default {
         this.form.images = val.join(',')
       }
     },
-    'form1.good': {
+    'form1.good.productId': {
       handler(val,oldVal){
-        this.getInfoChooseGood (val.cform.id)
+        if(val){
+          this.getInfoChooseGood (val)
+        }
       },
       deep:true//对象内部的属性监听，也叫深度监听
     },
   },
+ 
   methods: {
     // 详情选择商品生成规格用
     getInfoChooseGood (id) {
diff --git a/src/views/activity/combination/form.vue b/src/views/activity/combination/form.vue
index af7daca..8936356 100644
--- a/src/views/activity/combination/form.vue
+++ b/src/views/activity/combination/form.vue
@@ -248,7 +248,12 @@ export default {
       },
       form1: {
         good:{
-
+         productId: null,
+         storeName: null,
+         image: null,
+         otPrice: null,
+         price: null,
+        
         }
       },
       formValidate: {
@@ -389,10 +394,13 @@ export default {
         this.formValidate.images = val.join(',')
       }
     },
-    'form1.good': {
+    'form1.good.productId': {
       handler(val,oldVal){
-        console.log(val)
-        this.getInfoChooseGood (val.productId)
+        console.info("val:"+val)
+        console.info("oldval:"+oldVal)
+        if(val){
+          this.getInfoChooseGood (val)
+        }
       },
     },
   },
@@ -515,6 +523,8 @@ export default {
     // 详情选择商品生成规格用
     getInfoChooseGood (id) {
       let that = this;
+      let cid = that.$route.params.id || 0;
+      
       getInfo(id==null?0:id).then(async res => {
         let data = res.productInfo;
         if(data){
@@ -523,7 +533,8 @@ export default {
           Object.keys(that.formValidate).forEach(key=>{
                 if(data[key]) that.formValidate[key] = data[key];
           })
-          that.formValidate.id = 0;
+          that.formValidate.id = cid;
+          //that.formValidate.id = 0;
           that.formValidate.productId = id
           that.formValidate.title = data.store_name
           that.formValidate.info = data.store_info
@@ -572,6 +583,7 @@ export default {
     getInfo () {
       let that = this;
       let id = that.$route.params.id || 0;
+      that.formValidate.id = id;
       getCombinationInfo(id).then(async res => {
         let data = res.productInfo;
         if(data){
@@ -634,7 +646,7 @@ export default {
           if(this.formValidate.spec_type === 1 && this.manyFormValidate.length===0){
             return this.$message.warning('请点击生成规格！');
           }
-          add(this.formValidate).then(async res => {
+          edit(this.formValidate).then(async res => {
             this.$message({
               message:'操作成功',
               type: 'success'
diff --git a/src/views/activity/seckill/form.vue b/src/views/activity/seckill/form.vue
index 898b6d4..31008d4 100644
--- a/src/views/activity/seckill/form.vue
+++ b/src/views/activity/seckill/form.vue
@@ -254,7 +254,12 @@ export default {
       },
       form1: {
         good:{
-
+          productId: null,
+          storeName: null,
+          image: null,
+          otPrice: null,
+          price: null,
+          cform: null
         }
       },
       formValidate: {
@@ -391,9 +396,12 @@ export default {
         this.formValidate.images = val.join(',')
       }
     },
-    'form1.good': {
+    'form1.good.productId': {
       handler(val,oldVal){
-        this.getInfoChooseGood (val.cform.id)
+        if(val){
+          this.getInfoChooseGood (val)
+        }
+      
       },
     },
   },
@@ -519,6 +527,7 @@ export default {
     // 详情选择商品生成规格用
     getInfoChooseGood (id) {
       let that = this;
+      let cid = that.$route.params.id || 0;
       getInfo(id).then(async res => {
         let data = res.productInfo;
         console.log('data:'+data)
@@ -529,7 +538,7 @@ export default {
           Object.keys(that.formValidate).forEach(key=>{
                 if(data[key]) that.formValidate[key] = data[key];
           })
-          that.formValidate.id = 0;
+          that.formValidate.id = cid;
           that.formValidate.productId = id
           that.formValidate.cate_id = cate_id;
           that.oneFormValidate = [data.attr];
@@ -644,7 +653,7 @@ export default {
           if(this.formValidate.spec_type === 1 && this.manyFormValidate.length===0){
             return this.$message.warning('请点击生成规格！');
           }
-          add(this.formValidate).then(async res => {
+          edit(this.formValidate).then(async res => {
             this.$message({
               message:'操作成功',
               type: 'success'
diff --git a/src/views/login.vue b/src/views/login.vue
index 95473d7..e2cdbe3 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -2,24 +2,11 @@
   <div class="login">
     <div style="display:flex;justify-content:space-between;align-items: center;">
       <div style="padding: 0 60px 0 0">
-        <h3 style="color: #ffffff;font-size: 24px;padding: 0;margin-bottom: 10px">
-          YSHOP单商户B2C电商系统
-        </h3>
-        <ul style="margin: 0;color: #ffffff;font-size: 15px;line-height: 25px;padding-left: 20px">
-          <li>Springboot2</li>
-          <li>MybatisPlus</li>
-          <li>SpringSecurity</li>
-          <li>Jwt</li>
-          <li>Redis</li>
-          <li>Vue</li>
-        </ul>
-        <h3 style="color: #ffffff;">
-          官网:https://www.yixiang.co
-        </h3>
+
       </div>
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
       <h3 class="title">
-        YSHOP后台管理系统-3.2
+       乐享美酒管理后台
       </h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 3e2afe2..1e49755 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -46,8 +46,8 @@
         </el-form-item>
         <el-form-item v-show="form.type.toString() !== '2'" label="外链菜单" prop="iframe">
           <el-radio-group v-model="form.iframe" size="mini">
-            <el-radio-button label="true">是</el-radio-button>
-            <el-radio-button label="false">否</el-radio-button>
+            <el-radio-button :label="true">是</el-radio-button>
+            <el-radio-button :label="false">否</el-radio-button>
           </el-radio-group>
         </el-form-item>
         <el-form-item v-show="form.type.toString() === '1'" label="菜单缓存" prop="cache">
diff --git a/src/views/wechat/live/index.vue b/src/views/wechat/live/index.vue
index 327ffd1..323610c 100644
--- a/src/views/wechat/live/index.vue
+++ b/src/views/wechat/live/index.vue
@@ -28,6 +28,10 @@
           <el-form-item label="直播间分享图片" prop="shareImg" >
             <MaterialList v-model="form.shareImgArr" style="width: 370px" type="image" :num="1" :width="150" :height="150":disabled="isDisabled" />
           </el-form-item>
+          <el-form-item label="封面图" prop="feedsImg" >
+            <MaterialList v-model="form.feedsImgArr" style="width: 370px" type="image" :num="1" :width="150" :height="150":disabled="isDisabled" />
+            <p style="color: #cf0f0f">购物直播封面图 ，建议尺寸800*800</p>
+          </el-form-item>
           <el-form-item label="计划直播开始时间" prop="startDate" >
             <el-date-picker v-model="form.startDate" type="datetime" style="width: 370px;" :disabled="isDisabled"/>
             <p style="color: #cf0f0f">开播时间需要在当前时间的10分钟后,并且开始时间不能在6个月后</p>
@@ -221,7 +225,7 @@ const defaultCrud = CRUD({ optShow: {
     del: false,
     download: true
   },title: '直播房间', url: 'api/yxWechatLive', sort: 'room_id,desc', crudMethod: { ...crudYxWechatLive }})
-const defaultForm = { product: [],roomId: null,productId: null, name: null, coverImge: null, startDate: null, endDate : null,shareImge: null, liveStatus: null,  coverImgArr: [],shareImgArr: [],anchorImgArr: [],startTime: null, endTime: null, anchorName: null, anchorWechat: null, anchorImge: null, type: 0, screenType: 0, closeLike: 0,closeGoods: 0, closeComment: 0,closeReplay: 0,closeShare:0,closeKf:0 }
+const defaultForm = { product: [],roomId: null,productId: null,feedsImg: null, name: null, coverImge: null, startDate: null, endDate : null,shareImge: null, liveStatus: null,  coverImgArr: [],shareImgArr: [],anchorImgArr: [],feedsImgArr:[],startTime: null, endTime: null, anchorName: null, anchorWechat: null, anchorImge: null, type: 0, screenType: 0, closeLike: 0,closeGoods: 0, closeComment: 0,closeReplay: 0,closeShare:0,closeKf:0 }
 export default {
   name: 'YxWechatLive',
   components: { pagination, crudOperation, rrOperation ,MaterialList,udOperation,LiveGoods},
@@ -341,6 +345,7 @@ export default {
       this.form.coverImge = this.form.coverImgArr.join(',')
       this.form.shareImge = this.form.shareImgArr.join(',')
       this.form.anchorImge = this.form.anchorImgArr.join(',')
+      this.form.feedsImg = this.form.feedsImgArr.join(',')
     },
     // 新增与编辑前做的操作
     [CRUD.HOOK.beforeToAdd](crud, form) {