From 1fa03ca47875f77f927344e809fa17726c930ad3 Mon Sep 17 00:00:00 2001
From: szdot <szdot@qq.com>
Date: Sun, 26 May 2024 01:16:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=20apchae=20=E6=94=B9=E6=88=90nignx=20=20php=20?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B08.0=20=20=E5=AF=BC=E8=87=B4=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E7=9A=84=E6=8E=A5=E5=8F=A3=E7=9A=84=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E7=B3=BB=E5=88=97=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/skuTransfer.vue                       | 9 +++++++--
 src/store/index.js                                   | 1 +
 src/views/layout/components/main/category/index.vue  | 2 +-
 src/views/layout/components/main/product/sku/add.vue | 2 +-
 src/views/layout/components/main/product/spu/add.vue | 8 ++++----
 src/views/layout/components/main/shop/add.vue        | 6 ++++--
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/components/skuTransfer.vue b/src/components/skuTransfer.vue
index 4a9bf3c..31e858a 100644
--- a/src/components/skuTransfer.vue
+++ b/src/components/skuTransfer.vue
@@ -8,7 +8,8 @@ export default {
   name: 'skuTransfer',
   props: {
     tit: String,
-    val: Array
+    val: Array,
+    shop_id: String
   },
   data () {
     return {
@@ -18,7 +19,7 @@ export default {
   computed: {
     // 获取商品sku列表
     skuList () {
-      return this.$store.state.skuList
+      return this.$store.state.skuList.filter(item => item.shop_id === this.shop_id)
     },
     // 格式化sku列表
     skuListArr () {
@@ -37,6 +38,10 @@ export default {
   watch: {
     value (val) {
       this.updateValue(val)
+    },
+    // 监听父级 "所属商铺"控件  更新时清除sku穿梭框已选值
+    shop_id () {
+      this.value = []
     }
   },
   created () {
diff --git a/src/store/index.js b/src/store/index.js
index 77f5f84..74b571d 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -363,6 +363,7 @@ const store = new Vuex.Store({
         }).then(() => {
           const params = new URLSearchParams()
           params.append('idArr', idArr)
+          console.log(params)
           api.post('deleteAir', params).then(res => {
             if (res.data.status === 1) {
               Message.success(res.data.msg)
diff --git a/src/views/layout/components/main/category/index.vue b/src/views/layout/components/main/category/index.vue
index 2c8ebd7..b0bbefc 100644
--- a/src/views/layout/components/main/category/index.vue
+++ b/src/views/layout/components/main/category/index.vue
@@ -26,7 +26,7 @@
                 <span :class="data.show == 0 ? 'hideColor' : ''">{{ data.name }}</span>
                 <span>
                   <el-button type="text" @click.stop=""
-                    @click="openWin(`${data.name} : 添加子分类`, { id: data.id, path: data.path, photo: '' })">
+                    @click="openWin(`${data.name} : 添加子分类`, { id: data.id, path: data.path, photo: '' })" disabled>
                     添加子分类
                   </el-button>
                   <el-button type="text" class="textEditBut" @click.stop="" @click="openWin(`${data.name} : 编辑`, data)">
diff --git a/src/views/layout/components/main/product/sku/add.vue b/src/views/layout/components/main/product/sku/add.vue
index a6eeac6..30af299 100644
--- a/src/views/layout/components/main/product/sku/add.vue
+++ b/src/views/layout/components/main/product/sku/add.vue
@@ -12,7 +12,7 @@
           </el-header>
           <el-main class="border p-20">
             <el-form ref="form" :model="form" label-width="120px">
-              <el-form-item label="所属商铺">
+              <el-form-item v-if="pageState === 'add'" label="所属商铺">
                 <SelectionShopId v-model="form.shop_id" />
               </el-form-item>
               <el-form-item label="单品名称">
diff --git a/src/views/layout/components/main/product/spu/add.vue b/src/views/layout/components/main/product/spu/add.vue
index e8b498e..38fb9b1 100644
--- a/src/views/layout/components/main/product/spu/add.vue
+++ b/src/views/layout/components/main/product/spu/add.vue
@@ -12,7 +12,7 @@
           </el-header>
           <el-main class="border p-20">
             <el-form ref="form" :model="form" label-width="120px">
-              <el-form-item label="所属商铺">
+              <el-form-item v-if="pageState === 'add'" label="所属商铺">
                 <SelectionShopId v-model="form.shop_id" />
               </el-form-item>
               <el-form-item label="所属分类">
@@ -27,8 +27,8 @@
               <el-form-item label="排序">
                 <el-input v-model="form.sort" placeholder="数值大排在前面,缺省值为0" />
               </el-form-item>
-              <el-form-item label="热销指数">
-                <el-input v-model="form.hot" placeholder="用与前台显示虚假销量，虚假销量=热销指数+真实销量" />
+              <el-form-item label="热销底数">
+                <el-input v-model="form.hot" placeholder="用与前台显示虚假销量，虚假销量=热销底数+真实销量" />
               </el-form-item>
               <el-form-item :label="form.recommend === true ? '前台首页推荐' : '前台首页推荐'">
                 <el-switch v-model="form.recommend" />
@@ -73,7 +73,7 @@
                 </span>
                 <el-button v-else @click="showSkuInput" icon="el-icon-plus">添加规格</el-button>
                 <div class="m-t-10 relative-container" v-for="(t, index) in form.bind_sku" :key="index">
-                  <SkuTransfer :tit="t.tit" :val="t.value" @input="handleTransferInput(index, $event)" />
+                  <SkuTransfer :tit="t.tit" :val="t.value" :shop_id="shop_id" @input="handleTransferInput(index, $event)" />
                   <el-button type="danger" icon="el-icon-delete" class="absolute-center-button" @click="delBind_skuArr" />
                 </div>
               </el-form-item>
diff --git a/src/views/layout/components/main/shop/add.vue b/src/views/layout/components/main/shop/add.vue
index a1d19cc..fa9284d 100644
--- a/src/views/layout/components/main/shop/add.vue
+++ b/src/views/layout/components/main/shop/add.vue
@@ -56,7 +56,7 @@
                     :src="form.oldFile[0]" class="avatar" />
                   <template v-else>
                     <i class="el-icon-plus f-s-30 m-t-70 seatFontColor"></i>
-                    <div class="el-upload__text"><em>建议200*200像素 <br> jpg png gif </em></div>
+                    <div class="el-upload__text"><em>建议200*200像素 <br> jpg png gif svg</em></div>
                   </template>
                 </el-upload>
               </el-form-item>
@@ -124,6 +124,7 @@ export default {
   methods: {
     /* 文件上传表单 */
     handleUpSuccess (res) {
+      console.log(res)
       if (res.status === 0) {
         this.$message.error(res.msg)
       } else {
@@ -139,7 +140,8 @@ export default {
       return isJPG
     },
     handleUpErr () {
-      this.$message.error('接口访问失败')
+      // this.$message.error('接口访问失败')
+      this.$message.error(this.action)
     },
     // 将时间字符串转换为Date对象
     parseTimeString (timeString) {

From 503c4f47a990e11197ec0236650c9663f487225a Mon Sep 17 00:00:00 2001
From: szdot <szdot@live.com>
Date: Thu, 30 May 2024 17:50:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E7=B1=BB=09=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Adocs=20=E3=80=90=E4=B8=BB=09=E9=A2=98=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=90=AF=E5=8A=A8=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=20=E3=80=90=E6=8F=8F=09=E8=BF=B0=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=20=09[=E5=8E=9F=E5=9B=A0]=EF=BC=9A=20=09[=E8=BF=87?=
 =?UTF-8?q?=E7=A8=8B]=EF=BC=9A=20=09[=E5=BD=B1=E5=93=8D]=EF=BC=9A=20?=
 =?UTF-8?q?=E3=80=90=E7=BB=93=09=E6=9D=9F=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 类型 包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9a7af7a..1fa5dc4 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ npm install
 
 ### Compiles and hot-reloads for development
 ```
-npm run serve
+npm start
 ```
 
 ### Compiles and minifies for production