From 6a653198c313790f9612c7f1752f2032d4394375 Mon Sep 17 00:00:00 2001
From: Yer <17633066053@163.com>
Date: Wed, 19 Jul 2023 14:08:32 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=AB=AF=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=B8=8A=E4=BC=A0=E8=A7=86=E9=A2=91=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/article/index.vue             |   2 +-
 manager/vue.config.js                         |   3 -
 seller/package.json                           |   2 +-
 .../views/goods/goods-seller/draftGoods.vue   |   3 +-
 .../goods/goods-seller/goodsOperationSec.vue  | 719 ++++++------------
 5 files changed, 242 insertions(+), 487 deletions(-)

diff --git a/buyer/src/pages/article/index.vue b/buyer/src/pages/article/index.vue
index ed59795c..2215dce0 100644
--- a/buyer/src/pages/article/index.vue
+++ b/buyer/src/pages/article/index.vue
@@ -2,7 +2,7 @@
   <div>
     <BaseHeader></BaseHeader>
     <Search></Search>
-    <cateNav></cateNav>
+
     <div class="title-bg"><p>文章帮助中心</p></div>
     <div class="container width_1200">
       <Layout class="layoutAll">
diff --git a/manager/vue.config.js b/manager/vue.config.js
index cb688fee..7b4da29a 100644
--- a/manager/vue.config.js
+++ b/manager/vue.config.js
@@ -24,7 +24,6 @@ let externals = {
   "js-cookie": "Cookies",
   "sockjs-client": "SockJS",
   "@antv/g2": "G2",
-  dplayer: "DPlayer"
 };
 
 // 使用CDN的内容
@@ -39,8 +38,6 @@ let cdn = {
     "https://cdn.pickmall.cn/cdn/iview.min.js",
     "https://cdn.pickmall.cn/cdn/vue-lazyload.min.js",
     "https://cdn.pickmall.cn/cdn/js.cookie.min.js",
-    "https://cdn.pickmall.cn/cdn/DPlayer.min.js",
-
     "https://cdn.pickmall.cn/cdn/sockjs.min.js",
     "https://gw.alipayobjects.com/os/lib/antv/g2/4.1.24/dist/g2.min.js"
   ]
diff --git a/seller/package.json b/seller/package.json
index 1931b8a3..0ccadd37 100644
--- a/seller/package.json
+++ b/seller/package.json
@@ -15,7 +15,7 @@
     "@antv/g2": "^4.1.14",
     "@tinymce/tinymce-vue": "^3.2.0",
     "axios": "^0.21.1",
-    "dplayer": "^1.27.0",
+    "dplayer": "^1.27.1",
     "js-cookie": "^2.2.1",
     "node-sass": "^4.14.1",
     "price-color": "^1.0.2",
diff --git a/seller/src/views/goods/goods-seller/draftGoods.vue b/seller/src/views/goods/goods-seller/draftGoods.vue
index 54cceefe..470847e9 100644
--- a/seller/src/views/goods/goods-seller/draftGoods.vue
+++ b/seller/src/views/goods/goods-seller/draftGoods.vue
@@ -84,8 +84,9 @@ export default {
         {
           title: "商品价格",
           key: "price",
+          width: 120,
           render: (h, params) => {
-            return h("priceColorScheme", {props:{value:params.row.price,color:this.$mainColor}} );
+            return h("priceColorScheme", {props:{value:params.row.price || 0,color:this.$mainColor}} );
           },
         },
         {
diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
index 3c2a9767..fdb26aaf 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@@ -4,12 +4,7 @@
       <img :src="previewImage" v-if="visible" style="width: 100%">
     </Modal>
     <div class="content-goods-publish">
-      <Form
-        ref="baseInfoForm"
-        :label-width="120"
-        :model="baseInfoForm"
-        :rules="baseInfoFormRule"
-      >
+      <Form ref="baseInfoForm" :label-width="120" :model="baseInfoForm" :rules="baseInfoFormRule">
         <div class="base-info-item">
           <h4>基本信息</h4>
           <div class="form-item-view">
@@ -21,325 +16,186 @@
               <span> &gt; {{ this.baseInfoForm.categoryName[2] }}</span>
             </FormItem>
             <FormItem label="商品名称" prop="goodsName">
-              <Input
-                v-model="baseInfoForm.goodsName"
-                clearable
-                placeholder="商品名称"
-                style="width: 260px"
-                type="text"
-              />
+              <Input v-model="baseInfoForm.goodsName" clearable placeholder="商品名称" style="width: 260px" type="text" />
             </FormItem>
 
             <FormItem label="商品价格" prop="price">
-              <Input
-                v-model="baseInfoForm.price"
-                clearable
-                placeholder="商品价格"
-                style="width: 260px"
-                type="text"
-              />
+              <Input v-model="baseInfoForm.price" clearable placeholder="商品价格" style="width: 260px" type="text" />
             </FormItem>
             <FormItem label="商品卖点" prop="sellingPoint">
-              <Input
-                v-model="baseInfoForm.sellingPoint"
-                :rows="4"
-                style="width: 260px"
-                type="textarea"
-              />
+              <Input v-model="baseInfoForm.sellingPoint" :rows="4" style="width: 260px" type="textarea" />
             </FormItem>
             <FormItem label="商品品牌" prop="brandId">
-              <Select
-                v-model="baseInfoForm.brandId"
-                filterable
-                style="width: 200px"
-              >
-                <Option
-                  v-for="item in brandList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                ></Option>
+              <Select v-model="baseInfoForm.brandId" filterable style="width: 200px">
+                <Option v-for="item in brandList" :key="item.id" :label="item.name" :value="item.id"></Option>
               </Select>
             </FormItem>
           </div>
           <h4>商品交易信息</h4>
           <div class="form-item-view">
-            <FormItem
-              class="form-item-view-el"
-              label="计量单位"
-              prop="goodsUnit"
-            >
+            <FormItem class="form-item-view-el" label="计量单位" prop="goodsUnit">
               <Select v-model="baseInfoForm.goodsUnit" style="width: 100px">
-                <Option
-                  v-for="(item, index) in goodsUnitList"
-                  :key="index"
-                  :value="item"
-                  >{{ item }}
+                <Option v-for="(item, index) in goodsUnitList" :key="index" :value="item">{{ item }}
                 </Option>
               </Select>
             </FormItem>
-            <FormItem
-              class="form-item-view-el"
-              label="销售模式"
-              prop="salesModel"
-            >
-              <RadioGroup
-                v-if="baseInfoForm.goodsType != 'VIRTUAL_GOODS'"
-                v-model="baseInfoForm.salesModel"
-                button-style="solid"
-                type="button"
-                @on-change="renderTableData(skuTableData)"
-              >
+            <FormItem class="form-item-view-el" label="销售模式" prop="salesModel">
+              <RadioGroup v-if="baseInfoForm.goodsType != 'VIRTUAL_GOODS'" v-model="baseInfoForm.salesModel"
+                button-style="solid" type="button" @on-change="renderTableData(skuTableData)">
                 <Radio label="RETAIL" title="零售型">零售型</Radio>
                 <Radio label="WHOLESALE" title="批发型">批发型</Radio>
               </RadioGroup>
-              <RadioGroup
-                v-else
-                v-model="baseInfoForm.salesModel"
-                button-style="solid"
-                type="button"
-              >
+              <RadioGroup v-else v-model="baseInfoForm.salesModel" button-style="solid" type="button">
                 <Radio label="RETAIL" title="零售型">
                   <span>虚拟型</span>
                 </Radio>
               </RadioGroup>
             </FormItem>
-            <FormItem
-              v-if="baseInfoForm.salesModel == 'WHOLESALE'"
-              class="form-item-view-el"
-              label="销售规则"
-              prop="wholesaleRule"
-            >
+            <FormItem v-if="baseInfoForm.salesModel == 'WHOLESALE'" class="form-item-view-el" label="销售规则"
+              prop="wholesaleRule">
               <div class="form-item-view-wholesale">
                 <div>
-                  <Table
-                    :columns="wholesaleColumns"
-                    :data="wholesaleData"
-                    border
-                  >
+                  <Table :columns="wholesaleColumns" :data="wholesaleData" border>
                     <template slot="wholesaleNum" slot-scope="{ row, index }">
                       <div>
-                        <Input
-                          v-model="wholesaleData[index].num"
-                          min="1"
-                          number
-                          type="number"
-                          @on-blur="checkWholesaleNum(index)"
-                        >
-                          <span slot="append">{{
-                            baseInfoForm.goodsUnit || ""
-                          }}</span>
+                        <Input v-model="wholesaleData[index].num" min="1" number type="number"
+                          @on-blur="checkWholesaleNum(index)">
+                        <span slot="append">{{
+                          baseInfoForm.goodsUnit || ""
+                        }}</span>
                         </Input>
                       </div>
                     </template>
                     <template slot="wholesalePrice" slot-scope="{ row, index }">
-                      <div
-                        style="
+                      <div style="
                           display: flex;
                           justify-content: space-between;
                           align-items: center;
-                        "
-                      >
-                        <Input
-                          v-model="wholesaleData[index].price"
-                          min="1"
-                          number
-                          style="width: 190px"
-                          type="number"
-                          @on-blur="checkWholesalePrice(index)"
-                        >
-                          <span slot="append">元</span>
+                        ">
+                        <Input v-model="wholesaleData[index].price" min="1" number style="width: 190px" type="number"
+                          @on-blur="checkWholesalePrice(index)">
+                        <span slot="append">元</span>
                         </Input>
-                        <Button
-                          v-if="index > 0"
-                          size="small"
-                          style="margin-left: 5px"
-                          type="error"
-                          @click="handleDeleteWholesaleData(index)"
-                          >删除
+                        <Button v-if="index > 0" size="small" style="margin-left: 5px" type="error"
+                          @click="handleDeleteWholesaleData(index)">删除
                         </Button>
                       </div>
                     </template>
                   </Table>
 
-                  <Button
-                    v-if="wholesaleData.length < 3"
-                    icon="md-add"
-                    style="margin-top: 10px"
-                    @click="handleAddWholesaleData()"
-                  >
+                  <Button v-if="wholesaleData.length < 3" icon="md-add" style="margin-top: 10px"
+                    @click="handleAddWholesaleData()">
                     添加价格区间
                   </Button>
                 </div>
                 <div class="form-item-view-wholesale-preview">
-                  <Table
-                    :columns="wholesalePreviewColumns"
-                    :data="wholesaleData"
-                    border
-                  ></Table>
+                  <Table :columns="wholesalePreviewColumns" :data="wholesaleData" border></Table>
                 </div>
               </div>
             </FormItem>
           </div>
           <h4>商品规格及图片</h4>
           <div class="form-item-view">
-            <FormItem
-              class="form-item-view-el required"
-              label="商品图片"
-              prop="goodsGalleryFiles"
-            >
+            <FormItem class="form-item-view-el required" label="商品图片" prop="goodsGalleryFiles">
               <div style="display: flex; flex-wrap: flex-start">
-                <vuedraggable
-                  :animation="200"
-                  :list="baseInfoForm.goodsGalleryFiles"
-                >
-                  <div
-                    v-for="(item, __index) in baseInfoForm.goodsGalleryFiles"
-                    :key="__index"
-                    class="demo-upload-list"
-                  >
+                <vuedraggable :animation="200" :list="baseInfoForm.goodsGalleryFiles">
+                  <div v-for="(item, __index) in baseInfoForm.goodsGalleryFiles" :key="__index" class="demo-upload-list">
                     <template>
                       <img :src="item.url" />
                       <div class="demo-upload-list-cover">
                         <div>
-                          <Icon
-                            size="30"
-                            type="md-search"
-                            @click.native="handleViewGoodsPicture(item.url)"
-                          ></Icon>
-                          <Icon
-                            size="30"
-                            type="md-trash"
-                            @click.native="handleRemoveGoodsPicture(item)"
-                          ></Icon>
+                          <Icon size="30" type="md-search" @click.native="handleViewGoodsPicture(item.url)"></Icon>
+                          <Icon size="30" type="md-trash" @click.native="handleRemoveGoodsPicture(item)"></Icon>
                         </div>
                       </div>
                     </template>
                   </div>
                 </vuedraggable>
 
-                <Upload
-                  ref="upload"
-                  :action="uploadFileUrl"
-                  :before-upload="handleBeforeUploadGoodsPicture"
-                  :format="['jpg', 'jpeg', 'png']"
-                  :headers="{ ...accessToken }"
-                  :max-size="1024"
-                  :on-exceeded-size="handleMaxSize"
-                  :on-format-error="handleFormatError"
-                  :on-success="handleSuccessGoodsPicture"
-                  :show-upload-list="false"
-                  multiple
-                  style="margin-left: 10px"
-                  type="drag"
-                >
+                <Upload ref="upload" :action="uploadFileUrl" :before-upload="handleBeforeUploadGoodsPicture"
+                  :format="['jpg', 'jpeg', 'png']" :headers="{ ...accessToken }" :max-size="2048"
+                  :on-exceeded-size="handleMaxSize" :on-format-error="handleFormatError"
+                  :on-success="handleSuccessGoodsPicture" :show-upload-list="false" multiple type="drag">
                   <div style="width: 148px; height: 148px; line-height: 148px">
                     <Icon size="20" type="md-add"></Icon>
                   </div>
                 </Upload>
               </div>
               <Modal v-model="goodsPictureVisible" title="View Image">
-                <img
-                  v-if="goodsPictureVisible"
-                  :src="previewGoodsPicture"
-                  style="width: 100%"
-                />
+                <img v-if="goodsPictureVisible" :src="previewGoodsPicture" style="width: 100%" />
               </Modal>
             </FormItem>
+            <div class="flex mb-10">
+              <div class="goods-video-label">
+                上传视频
+              </div>
+              <div class="flex goods-video" >
+                <div>
+                  <Upload ref="upload" :action="uploadFileUrl" v-if="!baseInfoForm.goodsVideo" style="width: 150px; height: 150px;"
+                    :format="['mp4', 'avi',]" :headers="{ ...accessToken }" :max-size="10240"
+                    :on-exceeded-size="handleMaxSize" :on-format-error="handleFormatError"
+                    :on-success="handleSuccessGoodsVideo" :show-upload-list="false" type="drag">
+                    <div style="width: 148px; height: 148px; line-height: 148px">
+                      <Icon size="20" type="md-add"></Icon>
+                    </div>
+                  </Upload>
+                  <span class="theme_color" v-if="baseInfoForm.goodsVideo">已成功上传视频</span>
+                </div>
+
+                <Button class="view-video" v-if="baseInfoForm.goodsVideo" @click="showGoodsVideo = true">查看视频</Button>
+                <Button type="primary" v-if="baseInfoForm.goodsVideo" @click="baseInfoForm.goodsVideo = ''">删除视频</Button>
+              </div>
+            </div>
+
             <div class="layout" style="width: 100%">
               <Collapse v-model="open_panel">
                 <Panel name="1">
                   自定义规格项
                   <div slot="content">
                     <Form>
-                      <div
-                        v-for="(item, $index) in skuInfo"
-                        :key="$index"
-                        class="sku-item-content"
-                      >
+                      <div v-for="(item, $index) in skuInfo" :key="$index" class="sku-item-content">
                         <Card :bordered="true" class="ivu-card-body">
-                          <Button
-                            slot="extra"
-                            type="primary"
-                            @click="handleCloseSkuItem($index, item)"
-                          >
+                          <Button slot="extra" type="primary" @click="handleCloseSkuItem($index, item)">
                             删除规格
                           </Button>
                           <div>
-                            <FormItem
-                              class="sku-item-content-val flex"
-                              label="规格名"
-                            >
-                              <AutoComplete
-                                v-model="item.name"
-                                :data="skuData"
-                                :filter-method="filterMethod"
-                                :maxlength="30"
-                                placeholder="请输入规格名称"
-                                style="width: 150px"
-                                @on-focus="changeSkuItem(item.name)"
-                                @on-change="
+                            <FormItem class="sku-item-content-val flex" label="规格名">
+                              <AutoComplete v-model="item.name" :data="skuData" :filter-method="filterMethod"
+                                :maxlength="30" placeholder="请输入规格名称" style="width: 150px"
+                                @on-focus="changeSkuItem(item.name)" @on-change="
                                   editSkuItem(item.name, $index, item)
-                                "
-                              >
+                                  ">
                               </AutoComplete>
                             </FormItem>
                           </div>
                           <div class="flex sku-val">
                             <Form :model="item" class="flex">
                               <!--规格值文本列表-->
-                              <FormItem
-                                v-for="(val, index) in item.spec_values"
-                                :key="index"
-                                class="sku-item-content-val flex"
-                                label="规格项"
-                              >
-                                <AutoComplete
-                                  ref="input"
-                                  v-model="val.value"
-                                  :data="skuVal"
-                                  :filter-method="filterMethod"
-                                  :maxlength="30"
-                                  placeholder="请输入规格项"
-                                  style="width: 150px"
-                                  @on-focus="changeSkuVals(val, item.name)"
-                                  @on-blur="checkSkuVal(val, index)"
-                                  @on-change="skuValueChange(val, index, item)"
-                                >
+                              <FormItem v-for="(val, index) in item.spec_values" :key="index"
+                                class="sku-item-content-val flex" label="规格项">
+                                <AutoComplete ref="input" v-model="val.value" :data="skuVal" :filter-method="filterMethod"
+                                  :maxlength="30" placeholder="请输入规格项" style="width: 150px"
+                                  @on-focus="changeSkuVals(val, item.name)" @on-blur="checkSkuVal(val, index)"
+                                  @on-change="skuValueChange(val, index, item)">
                                 </AutoComplete>
-                                <Button
-                                  size="small"
-                                  style="margin-left: 10px"
-                                  type="primary"
-                                  @click="handleCloseSkuValue(val, index, item)"
-                                >
+                                <Button size="small" style="margin-left: 10px" type="primary"
+                                  @click="handleCloseSkuValue(val, index, item)">
                                   删除
                                 </Button>
                               </FormItem>
                             </Form>
                           </div>
                           <div>
-                            <Button @click="addSpec($index, item)"
-                              >添加规格值
+                            <Button @click="addSpec($index, item)">添加规格值
                             </Button>
                           </div>
                         </Card>
                       </div>
                     </Form>
-                    <Button
-                      class="add-sku-btn"
-                      size="small"
-                      type="primary"
-                      @click="addSkuItem"
-                      >添加规格项
+                    <Button class="add-sku-btn" size="small" type="primary" @click="addSkuItem">添加规格项
                     </Button>
                     &nbsp;
-                    <Button
-                      class="add-sku-btn"
-                      size="small"
-                      type="warning"
-                      @click="handleClearSku"
-                      >清空规格项
+                    <Button class="add-sku-btn" size="small" type="warning" @click="handleClearSku">清空规格项
                     </Button>
                   </div>
                 </Panel>
@@ -347,159 +203,81 @@
                   规格详细
                   <div slot="content">
                     <div slot="content">
-                      <Table
-                        :columns="skuTableColumn"
-                        :data="skuTableData"
-                        class="mt_10"
-                        style="
+                      <Table :columns="skuTableColumn" :data="skuTableData" class="mt_10" style="
                           width: 100%;
                           .ivu-table-overflowX {
                             overflow-x: hidden;
                           }
-                        "
-                      >
+                        ">
                         <template slot="sn" slot-scope="{ row }">
-                          <Input
-                            v-model="row.sn"
-                            clearable
-                            placeholder="请输入货号"
-                            @on-change="updateSkuTable(row, 'sn')"
-                          />
+                          <Input v-model="row.sn" clearable placeholder="请输入货号" @on-change="updateSkuTable(row, 'sn')" />
                         </template>
-                        <div
-                          v-if="baseInfoForm.goodsType !== 'VIRTUAL_GOODS'"
-                          slot="weight"
-                          slot-scope="{ row }"
-                        >
-                          <Input
-                            v-model="row.weight"
-                            clearable
-                            placeholder="请输入重量"
-                            @on-change="updateSkuTable(row, 'weight')"
-                          >
-                            <span slot="append">kg</span>
+                        <div v-if="baseInfoForm.goodsType !== 'VIRTUAL_GOODS'" slot="weight" slot-scope="{ row }">
+                          <Input v-model="row.weight" clearable placeholder="请输入重量"
+                            @on-change="updateSkuTable(row, 'weight')">
+                          <span slot="append">kg</span>
                           </Input>
                         </div>
                         <template slot="quantity" slot-scope="{ row }">
-                          <Input
-                            v-model="row.quantity"
-                            clearable
-                            placeholder="请输入库存"
-                            @on-change="updateSkuTable(row, 'quantity')"
-                          >
-                            <span slot="append">{{
-                              baseInfoForm.goodsUnit || ""
-                            }}</span>
+                          <Input v-model="row.quantity" clearable placeholder="请输入库存"
+                            @on-change="updateSkuTable(row, 'quantity')">
+                          <span slot="append">{{
+                            baseInfoForm.goodsUnit || ""
+                          }}</span>
                           </Input>
                         </template>
                         <template slot="cost" slot-scope="{ row }">
-                          <Input
-                            v-model="row.cost"
-                            clearable
-                            placeholder="请输入成本价"
-                            @on-change="updateSkuTable(row, 'cost')"
-                          >
-                            <span slot="append">元</span>
+                          <Input v-model="row.cost" clearable placeholder="请输入成本价"
+                            @on-change="updateSkuTable(row, 'cost')">
+                          <span slot="append">元</span>
                           </Input>
                         </template>
                         <template slot="price" slot-scope="{ row }">
-                          <Input
-                            v-model="row.price"
-                            clearable
-                            placeholder="请输入价格"
-                            @on-change="updateSkuTable(row, 'price')"
-                          >
-                            <span slot="append">元</span>
+                          <Input v-model="row.price" clearable placeholder="请输入价格"
+                            @on-change="updateSkuTable(row, 'price')">
+                          <span slot="append">元</span>
                           </Input>
                         </template>
                         <template slot="wholePrice0" slot-scope="{ row }">
-                          <Input
-                            v-if="wholesaleData[0]"
-                            v-model="wholesaleData[0].price"
-                            clearable
-                            disabled
-                          >
-                            <span slot="append">元</span>
+                          <Input v-if="wholesaleData[0]" v-model="wholesaleData[0].price" clearable disabled>
+                          <span slot="append">元</span>
                           </Input>
                         </template>
                         <template slot="wholePrice1" slot-scope="{ row }">
-                          <Input
-                            v-if="wholesaleData[1]"
-                            v-model="wholesaleData[1].price"
-                            clearable
-                            disabled
-                          >
-                            <span slot="append">元</span>
+                          <Input v-if="wholesaleData[1]" v-model="wholesaleData[1].price" clearable disabled>
+                          <span slot="append">元</span>
                           </Input>
                         </template>
                         <template slot="wholePrice2" slot-scope="{ row }">
-                          <Input
-                            v-if="wholesaleData[2]"
-                            v-model="wholesaleData[2].price"
-                            clearable
-                            disabled
-                          >
-                            <span slot="append">元</span>
+                          <Input v-if="wholesaleData[2]" v-model="wholesaleData[2].price" clearable disabled>
+                          <span slot="append">元</span>
                           </Input>
                         </template>
                         <template slot="images" slot-scope="{ row }">
-                          <div @mouseover="mouseOver(row)" @mouseleave="mouseLeave"><Button @click="editSkuPicture(row)" type="error" >编辑图片 ！</Button></div>
-                          <Modal
-                            v-model="showSkuPicture"
-                            :styles="{ top: '30px' }"
-                            cancel-text="取消"
-                            class-name="sku-preview-modal"
-                            ok-text="结束编辑"
-                            title="编辑图片"
-                            @on-ok="updateSkuPicture()"
-                          >
+                          <div @mouseover="mouseOver(row)" @mouseleave="mouseLeave"><Button @click="editSkuPicture(row)"
+                              type="error">编辑图片 ！</Button></div>
+                          <Modal v-model="showSkuPicture" :styles="{ top: '30px' }" cancel-text="取消"
+                            class-name="sku-preview-modal" ok-text="结束编辑" title="编辑图片" @on-ok="updateSkuPicture()">
                             <div class="preview-picture">
-                              <img
-                                v-if="previewPicture !== ''"
-                                :src="previewPicture"
-                              />
+                              <img v-if="previewPicture !== ''" :src="previewPicture" />
                             </div>
                             <Divider />
-                            <vuedraggable
-                              :animation="200"
-                              :list="selectedSku.images"
-                              style="display: inline-block"
-                            >
-                              <div
-                                v-for="(img, __index) in selectedSku.images"
-                                :key="__index"
-                                class="sku-upload-list"
-                              >
+                            <vuedraggable :animation="200" :list="selectedSku.images" style="display: inline-block">
+                              <div v-for="(img, __index) in selectedSku.images" :key="__index" class="sku-upload-list">
                                 <template>
                                   <img :src="img.url" />
                                   <div class="sku-upload-list-cover">
-                                    <Icon
-                                      type="md-search"
-                                      @click="handleView(img.url)"
-                                    ></Icon>
-                                    <Icon
-                                      type="md-trash"
-                                      @click="handleRemove(img, __index)"
-                                    ></Icon>
+                                    <Icon type="md-search" @click="handleView(img.url)"></Icon>
+                                    <Icon type="md-trash" @click="handleRemove(img, __index)"></Icon>
                                   </div>
                                 </template>
                               </div>
                             </vuedraggable>
-                            <Upload
-                              ref="uploadSku"
-                              :action="uploadFileUrl"
-                              :before-upload="handleBeforeUpload"
-                              :format="['jpg', 'jpeg', 'png']"
-                              :headers="{ ...accessToken }"
-                              :max-size="1024"
-                              :on-exceeded-size="handleMaxSize"
-                              :on-format-error="handleFormatError"
-                              :on-success="handleSuccess"
-                              :show-upload-list="false"
-                              multiple
-                              style="display: inline-block; width: 58px"
-                              type="drag"
-                            >
+                            <Upload ref="uploadSku" :action="uploadFileUrl" :before-upload="handleBeforeUpload"
+                              :format="['jpg', 'jpeg', 'png']" :headers="{ ...accessToken }" :max-size="2048"
+                              :on-exceeded-size="handleMaxSize" :on-format-error="handleFormatError"
+                              :on-success="handleSuccess" :show-upload-list="false" multiple
+                              style="display: inline-block; width: 58px" type="drag">
                               <div>
                                 <Icon size="55" type="ios-camera"></Icon>
                               </div>
@@ -515,114 +293,58 @@
           </div>
           <h4 v-if="showContent">规格描述内容</h4>
           <div v-if="showContent" class="form-item-view">
-              <div >
-                <FormItem
-                  class="form-item-view-el"
-                  :label="contentImage"
-                >
-                  <!-- {{item.url}} -->
-                  <div style="width:100%;display:flex;" v-for="(item,index) in listImages.images" :key="index">
-                    <img style="width:100px;flex:1;margin-top:10px;cursor:pointer;" :src="item.url" @click="getImages(item.url)"/>
-                  </div>
-                </FormItem>
-              </div>
+            <div>
+              <FormItem class="form-item-view-el" :label="contentImage">
+                <!-- {{item.url}} -->
+                <div style="width:100%;display:flex;" v-for="(item, index) in listImages.images" :key="index">
+                  <img style="width:100px;flex:1;margin-top:10px;cursor:pointer;" :src="item.url"
+                    @click="getImages(item.url)" />
+                </div>
+              </FormItem>
             </div>
+          </div>
           <h4>商品详情描述</h4>
           <div class="form-item-view">
             <div class="tree-bar">
-              <FormItem
-                class="form-item-view-el"
-                label="店内分类"
-                prop="shopCategory"
-              >
-                <Tree
-                  ref="tree"
-                  :check-strictly="false"
-                  :data="shopCategory"
-                  show-checkbox
-                  style="text-align: left"
-                  @on-select-change="selectTree"
-                  @on-check-change="changeSelect"
-                ></Tree>
+              <FormItem class="form-item-view-el" label="店内分类" prop="shopCategory">
+                <Tree ref="tree" :check-strictly="false" :data="shopCategory" show-checkbox style="text-align: left"
+                  @on-select-change="selectTree" @on-check-change="changeSelect"></Tree>
               </FormItem>
             </div>
-            <FormItem
-              class="form-item-view-el"
-              label="PC商品描述"
-              prop="intro"
-              style="width: 100%"
-            >
-             <Alert class='editor-alert' type="warning">将文件夹下的图片进行拖拽到文本框内，即可完成单/多图片上传。</Alert>
-              <editor
-                ref="editor"
-                v-model="baseInfoForm.intro"
-                :init="{ ...initEditor, height: '800px' }"
-                openXss
-              ></editor>
+            <FormItem class="form-item-view-el" label="PC商品描述" prop="intro" style="width: 100%">
+              <Alert class='editor-alert' type="warning">将文件夹下的图片进行拖拽到文本框内，即可完成单/多图片上传。</Alert>
+              <editor ref="editor" v-model="baseInfoForm.intro" :init="{ ...initEditor, height: '800px' }" openXss>
+              </editor>
               <div class="promise-intro-btn">
-                <Button type="primary" @click="promiseIntroEditor"
-                  >将PC商品描述同步到移动端描述
+                <Button type="primary" @click="promiseIntroEditor">将PC商品描述同步到移动端描述
                 </Button>
               </div>
             </FormItem>
 
-            <FormItem
-              class="form-item-view-el"
-              label="移动端描述"
-              prop="skuList"
-              style="width: 100%"
-            >
-              <editor
-                ref="editor"
-                v-model="baseInfoForm.mobileIntro"
-                :init="{ ...initEditor, height: '800px' }"
-                openXss
-              ></editor>
+            <FormItem class="form-item-view-el" label="移动端描述" prop="skuList" style="width: 100%">
+              <editor ref="editor" v-model="baseInfoForm.mobileIntro" :init="{ ...initEditor, height: '800px' }" openXss>
+              </editor>
             </FormItem>
           </div>
           <div v-if="baseInfoForm.goodsType != 'VIRTUAL_GOODS'">
             <h4>商品物流信息</h4>
             <div class="form-item-view">
-              <FormItem
-                class="form-item-view-el"
-                label="物流模板"
-                prop="templateId"
-              >
+              <FormItem class="form-item-view-el" label="物流模板" prop="templateId">
                 <Select v-model="baseInfoForm.templateId" style="width: 200px">
-                  <Option
-                    v-for="item in logisticsTemplate"
-                    :key="item.id"
-                    :value="item.id"
-                    >{{ item.name }}
+                  <Option v-for="item in logisticsTemplate" :key="item.id" :value="item.id">{{ item.name }}
                   </Option>
                 </Select>
               </FormItem>
-              <FormItem
-                v-if="baseInfoForm.salesModel == 'WHOLESALE'"
-                class="form-item-view-el"
-                label="商品重量"
-                prop="weight"
-              >
-                <Input
-                  v-model="baseInfoForm.weight"
-                  placeholder="请输入商品重量"
-                >
-                  <span slot="append">kg</span></Input
-                >
+              <FormItem v-if="baseInfoForm.salesModel == 'WHOLESALE'" class="form-item-view-el" label="商品重量"
+                prop="weight">
+                <Input v-model="baseInfoForm.weight" placeholder="请输入商品重量">
+                <span slot="append">kg</span></Input>
               </FormItem>
             </div>
             <h4>其他信息</h4>
             <div class="form-item-view">
-              <FormItem
-                class="form-item-view-el"
-                label="商品发布"
-                prop="release"
-              >
-                <RadioGroup
-                  v-model="baseInfoForm.release"
-                  button-style="solid"
-                  type="button"
-                >
+              <FormItem class="form-item-view-el" label="商品发布" prop="release">
+                <RadioGroup v-model="baseInfoForm.release" button-style="solid" type="button">
                   <Radio :label="1" title="立即发布">
                     <span>立即发布</span>
                   </Radio>
@@ -631,16 +353,8 @@
                   </Radio>
                 </RadioGroup>
               </FormItem>
-              <FormItem
-                class="form-item-view-el"
-                label="商品推荐"
-                prop="skuList"
-              >
-                <RadioGroup
-                  v-model="baseInfoForm.recommend"
-                  button-style="solid"
-                  type="button"
-                >
+              <FormItem class="form-item-view-el" label="商品推荐" prop="skuList">
+                <RadioGroup v-model="baseInfoForm.recommend" button-style="solid" type="button">
                   <Radio :label="1" title="推荐">
                     <span>推荐</span>
                   </Radio>
@@ -651,43 +365,24 @@
               </FormItem>
             </div>
             <div class="form-item-view-bottom">
-              <Collapse
-                v-for="(paramsGroup, groupIndex) in goodsParams"
-                :key="paramsGroup.groupName"
-                v-model="params_panel"
-                :title="paramsGroup.groupName"
-                class="mb_10"
-                style="text-align: left"
-              >
+              <Collapse v-for="(paramsGroup, groupIndex) in goodsParams" :key="paramsGroup.groupName"
+                v-model="params_panel" :title="paramsGroup.groupName" class="mb_10" style="text-align: left">
                 <Panel :name="paramsGroup.groupName">
                   {{ paramsGroup.groupName }}
                   <p slot="content">
-                    <FormItem
-                      v-for="(params, paramsIndex) in paramsGroup.params"
-                      :key="paramsIndex"
-                      :label="`${params.paramName}：`"
-                    >
-                      <Select
-                        v-model="params.paramValue"
-                        clearable
-                        placeholder="请选择"
-                        style="width: 200px"
-                        @on-change="
-                          selectParams(
-                            paramsGroup,
-                            groupIndex,
-                            params,
-                            paramsIndex,
-                            params.paramValue
-                          )
-                        "
-                      >
-                        <Option
-                          v-for="option in params.options.split(',')"
-                          :key="option"
-                          :label="option"
-                          :value="option"
-                        ></Option>
+                    <FormItem v-for="(params, paramsIndex) in paramsGroup.params" :key="paramsIndex"
+                      :label="`${params.paramName}：`">
+                      <Select v-model="params.paramValue" clearable placeholder="请选择" style="width: 200px" @on-change="
+                        selectParams(
+                          paramsGroup,
+                          groupIndex,
+                          params,
+                          paramsIndex,
+                          params.paramValue
+                        )
+                        ">
+                        <Option v-for="option in params.options.split(',')" :key="option" :label="option" :value="option">
+                        </Option>
                       </Select>
                     </FormItem>
                   </p>
@@ -708,6 +403,12 @@
         <Button type="primary" @click="saveToDraft">保存为模版</Button>
       </ButtonGroup>
     </div>
+
+    <Modal v-model="showGoodsVideo" title="查看视频">
+      <div id="dplayer">
+
+      </div>
+    </Modal>
   </div>
 </template>
 <script>
@@ -719,6 +420,7 @@ import Editor from "@tinymce/tinymce-vue";
 import { initEditor } from "@/views/lili-components/editor/config";
 import { uploadFile } from "@/libs/axios";
 import { regular } from "@/utils";
+import DPlayer from 'dplayer';
 
 export default {
   name: "goodsOperationSec",
@@ -752,9 +454,10 @@ export default {
       regular,
       initEditor,
       total: 0,
-      showContent:false,
-      listImages:[],
-      contentImage:"",
+      goodsVideo: "",
+      showContent: false,
+      listImages: [],
+      contentImage: "",
       visible: false, // 图片预览
       previewImage: '', // 预览图片地址
       global: 0,
@@ -847,6 +550,7 @@ export default {
         goodsParamsDTOList: [],
         /** 商品分类中文名 */
         categoryName: [],
+        goodsVideo: "",
       },
       /** 表格头 */
       skuTableColumn: [],
@@ -893,6 +597,8 @@ export default {
       shopCategory: [],
       /** 商品单位列表 */
       goodsUnitList: [],
+      // 展示商品视频
+      showGoodsVideo: false,
       ignoreColumn: [
         // 添加规格时需要忽略的参数
         "_index",
@@ -907,23 +613,31 @@ export default {
       ],
     };
   },
+  watch: {
+    // 如果点击了展示商品视频，则初始化商品视频
+    showGoodsVideo(val) {
+      if (val) {
+        this.initVideo();
+      }
+    }
+  },
   methods: {
-    getImages(v){
+    getImages(v) {
       this.previewImage = v;
       this.visible = true;
     },
-    mouseOver(v){
+    mouseOver(v) {
       this.showContent = true
       this.listImages = v
-      if(this.listImages.images.length <= 0){
+      if (this.listImages.images.length <= 0) {
         this.contentImage = '规格专属图片暂无'
-      }else{
+      } else {
         this.contentImage = '当前规格专属图片'
       }
     },
-    mouseLeave(){
+    mouseLeave() {
       // this.showContent = false
-    },  
+    },
     /**
      * 选择参数
      * @paramsGroup 参数分组
@@ -982,6 +696,19 @@ export default {
       this.selectedSku = row;
       this.showSkuPicture = true;
     },
+    // 初始化视频操作
+    initVideo() {
+      if (this.baseInfoForm.goodsVideo) {
+        this.goodsVideo = new DPlayer({
+          container: document.getElementById('dplayer'),
+          video: {
+            url: this.baseInfoForm.goodsVideo,
+            pic: ''
+          },
+        });
+      }
+      console.log('初始化操作')
+    },
     pre() {
       // 上一步
       this.$parent.activestep--;
@@ -1107,11 +834,17 @@ export default {
         desc: "文件 " + file.name + " 的格式不正确",
       });
     },
+    handleSuccessGoodsVideo(res, file) {
+      if (file.response) {
+        file.url = file.response.result;
+        this.baseInfoForm.goodsVideo = file.url;
+      }
+    },
     // 图片大小不正确
-    handleMaxSize(file) {
+    handleMaxSize(size = 2) {
       this.$Notice.warning({
         title: "超过文件大小限制",
-        desc: "图片大小不能超过1MB",
+        desc: `图片大小不能超过${size}MB`,
       });
     },
     // 图片上传前钩子
@@ -1530,7 +1263,7 @@ export default {
               find.weight && (find.weight = "");
 
               this.skuTableData.splice(this.skuTableData.length, 0, find);
-              index ++;
+              index++;
             }
           } else {
             for (let i = 0; i < totalLength; i++) {
@@ -1975,6 +1708,8 @@ export default {
         this.categoryId = cateId[2];
         this.baseInfoForm.categoryPath = cateId.toString();
         this.baseInfoForm.goodsType = this.firstData.goodsType;
+
+
         /** 获取该商城分类下 商品参数信息 */
         this.GET_GoodsParams();
         /** 查询品牌列表 */
@@ -1998,10 +1733,32 @@ export default {
 .ivu-select .ivu-select-dropdown {
   overflow: hidden !important;
 }
-.editor-alert{
+
+.editor-alert {
   text-align: left;
 }
+
+#dplayer {
+
+}
+
 /* .tox-notifications-container{
   display: none !important;
 } */
+.goods-video-label {
+  width: 120px;
+  text-align: right;
+  padding: 10px 12px 10px 0;
+}
+
+.goods-video {
+  align-items: center;
+}
+
+.mb-10 {
+  margin-bottom: 10px;
+}
+.view-video{
+  margin: 0 10px;
+}
 </style>

From 9fce33ca18dc5c6b09a686a56c69c0fd0aad05f0 Mon Sep 17 00:00:00 2001
From: Yer <17633066053@163.com>
Date: Thu, 20 Jul 2023 16:50:43 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=B9=B0=E5=AE=B6=E7=AB=AF=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/package.json                            |  1 +
 buyer/src/assets/iconfont/play.svg            |  1 +
 .../src/components/goodsDetail/ShowGoods.vue  | 84 +++++++++++++++----
 buyer/src/components/nav/GoodsClassNav.vue    |  4 +-
 buyer/src/pages/GoodsList.vue                 |  1 +
 5 files changed, 75 insertions(+), 16 deletions(-)
 create mode 100644 buyer/src/assets/iconfont/play.svg

diff --git a/buyer/package.json b/buyer/package.json
index 1c90bc93..b53d6d46 100644
--- a/buyer/package.json
+++ b/buyer/package.json
@@ -10,6 +10,7 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "0.0.7",
     "axios": "^0.19.2",
+    "dplayer": "^1.27.1",
     "js-cookie": "^2.2.1",
     "less": "^2.7.0",
     "less-loader": "^5.0.0",
diff --git a/buyer/src/assets/iconfont/play.svg b/buyer/src/assets/iconfont/play.svg
new file mode 100644
index 00000000..31f09a4f
--- /dev/null
+++ b/buyer/src/assets/iconfont/play.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg width="24" height="24" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M24 44C35.0457 44 44 35.0457 44 24C44 12.9543 35.0457 4 24 4C12.9543 4 4 12.9543 4 24C4 35.0457 12.9543 44 24 44Z" fill="none" stroke="#333" stroke-width="4" stroke-linejoin="round"/><path d="M20 24V17.0718L26 20.5359L32 24L26 27.4641L20 30.9282V24Z" fill="none" stroke="#333" stroke-width="4" stroke-linejoin="round"/></svg>
diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue
index ec42c3b7..ea7621da 100644
--- a/buyer/src/components/goodsDetail/ShowGoods.vue
+++ b/buyer/src/components/goodsDetail/ShowGoods.vue
@@ -4,22 +4,15 @@
       <!-- 详情左侧展示数据、图片，收藏、举报 -->
       <div class="item-detail-left">
         <!-- 大图、放大镜 -->
+        <!-- <div  id="dplayer"></div> -->
         <div class="item-detail-big-img">
-          <pic-zoom :url="imgList[imgIndex].url" :scale="2"></pic-zoom>
-        </div>
-        <div
-          v-if="skuDetail.goodsType !== 'VIRTUAL_GOODS'"
-          style="margin-top:10px;rgb(153, 149, 149);"
-        >
-          实物商品
-        </div>
-        <div
-          v-else-if="skuDetail.goodsType == 'VIRTUAL_GOODS'"
-          style="margin-top:10px;rgb(153, 149, 149);"
-        >
-          虚拟商品
+
+          <pic-zoom  :url="imgList[imgIndex].url" :scale="2"></pic-zoom>
         </div>
+
+        <!-- <div  id="dplayer"></div> -->
         <div class="item-detail-img-row">
+
           <div
             class="item-detail-img-small"
             @mouseover="imgIndex = index"
@@ -44,6 +37,18 @@
         <div class="item-detail-title">
           <p>
             {{ skuDetail.goodsName }}
+            <Tag
+              v-if="skuDetail.goodsType !== 'VIRTUAL_GOODS'"
+              style="margin-top:10px;rgb(153, 149, 149);"
+            >
+              实物商品
+            </Tag>
+            <Tag
+              v-else-if="skuDetail.goodsType == 'VIRTUAL_GOODS'"
+              style="margin-top:10px;rgb(153, 149, 149);"
+            >
+              虚拟商品
+            </Tag>
           </p>
         </div>
         <div class="sell-point">
@@ -272,7 +277,8 @@
             class="add-buy-car"
             v-if="$route.query.way !== 'POINT' && skuDetail.authFlag === 'PASS'"
           >
-            <Button
+
+           <Button
               type="error"
               v-if="skuDetail.goodsType !== 'VIRTUAL_GOODS'"
               :loading="loading"
@@ -287,9 +293,15 @@
               @click="buyNow"
               >立即购买</Button
             >
+            <Tooltip content="观看视频">
+              <img class="view-video" @click="showGoodsVideo = true" :src="require('@/assets/iconfont/play.svg')" alt="">
+            </Tooltip>
           </div>
         </div>
       </div>
+      <Modal title="浏览视频" v-model="showGoodsVideo">
+        <div id="dplayer"></div>
+      </Modal>
     </div>
   </div>
 </template>
@@ -297,6 +309,7 @@
 <script>
 import Promotion from "./Promotion.vue";
 import PicZoom from "vue-piczoom"; // 图片放大
+import DPlayer from "dplayer";
 import {
   collectGoods,
   isCollection,
@@ -304,6 +317,7 @@ import {
   cancelCollect,
 } from "@/api/member.js";
 import { addCartGoods } from "@/api/cart.js";
+
 export default {
   name: "ShowGoods",
   props: {
@@ -321,14 +335,22 @@ export default {
         if (this.wholesaleList && this.wholesaleList.length > 0) {
           this.count = this.wholesaleList[0].num;
         }
+
         this.swiperGoodsImg();
       },
       deep: true,
       immediate: true,
     },
+    showGoodsVideo(val){
+      if(val){
+        this.initVideo();
+      }
+    }
   },
   data() {
     return {
+      showGoodsVideo:false,
+      goodsVideo:"",
       wholesaleList: [],
       count: 1, // 商品数量
       imgIndex: 0, // 展示图片下标
@@ -368,6 +390,24 @@ export default {
     },
   },
   methods: {
+    // 初始化video
+    initVideo(){
+      if(!this.goodsVideo ){
+        setTimeout(()=>{
+        this.goodsVideo = new DPlayer({
+          container: document.getElementById('dplayer'),
+          video: {
+              url:this.skuDetail.goodsVideo,
+          },
+      });
+      },100)
+      }
+
+
+
+    },
+
+
     changeCount(val) {
       if (this.wholesaleList && this.wholesaleList.length > 0) {
         if (this.count <= this.wholesaleList[0].num) {
@@ -544,6 +584,7 @@ export default {
           this.imgList = e.specImage;
         }
       });
+
     },
   },
   mounted() {
@@ -599,6 +640,7 @@ export default {
 
 .item-detail-left {
   width: 350px;
+
   margin-right: 30px;
 }
 
@@ -607,8 +649,14 @@ export default {
   height: 350px;
   box-shadow: 0px 0px 8px $border_color;
   cursor: pointer;
-}
 
+
+
+}
+#dplayer{
+    width: 100%;
+    height: 100%;
+  }
 .item-detail-big-img img {
   width: 100%;
 }
@@ -842,11 +890,14 @@ export default {
 
 .add-buy-car-box {
   width: 100%;
+
   margin-top: 15px;
   border-top: 1px dotted $border_color;
 }
 
 .add-buy-car {
+  display: flex;
+  align-items: center;
   margin-top: 15px;
   > * {
     margin: 0 4px;
@@ -869,5 +920,8 @@ export default {
   color: red;
   margin-bottom: 5px;
 }
+.view-video{
+  cursor: pointer;
+}
 /******************商品图片及购买详情结束******************/
 </style>
diff --git a/buyer/src/components/nav/GoodsClassNav.vue b/buyer/src/components/nav/GoodsClassNav.vue
index 2b852d44..eaefdfe1 100644
--- a/buyer/src/components/nav/GoodsClassNav.vue
+++ b/buyer/src/components/nav/GoodsClassNav.vue
@@ -153,7 +153,9 @@
           </div>
         </div>
       </template>
-      <div @click="moreOptions" v-if="tagsContent.length>4" class="more-options">{{showTagCount===5?'更多筛选项':'收起筛选项'}}<Icon :type="showTagCount===5?'ios-arrow-down':'ios-arrow-up'" /></div>
+      <div @click="moreOptions" v-if="tagsContent.length>4" class="more-options">
+      {{showTagCount===5?'更多筛选项':'收起筛选项'}}
+      </div>
     </div>
   </div>
 </template>
diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue
index 746a8760..c49b6a5e 100644
--- a/buyer/src/pages/GoodsList.vue
+++ b/buyer/src/pages/GoodsList.vue
@@ -178,6 +178,7 @@ export default {
     // 搜索
     handleSearch(key) {
       this.params.keyword = key;
+      this.$route.query.keyword = key
       this.params.pageNumber = 0;
       this.getGoodsList();
     },

From b6c16e704807fc09d90df93995456546e2e2957e Mon Sep 17 00:00:00 2001
From: Yer <17633066053@163.com>
Date: Thu, 20 Jul 2023 18:10:16 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/components/lili-dialog/template/special.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manager/src/components/lili-dialog/template/special.vue b/manager/src/components/lili-dialog/template/special.vue
index daecf3f5..2f692353 100644
--- a/manager/src/components/lili-dialog/template/special.vue
+++ b/manager/src/components/lili-dialog/template/special.vue
@@ -70,7 +70,7 @@ export default {
                 "Button",
                 {
                   props: {
-                    type: this.index == params.index ? "primary" : "",
+                    type: this.index == params.index ? "primary" : "default",
                     size: "small",
                   },
                   on: {

From 841d48e2a752937ce060e3ff2fbab96247ac55f7 Mon Sep 17 00:00:00 2001
From: Yer <17633066053@163.com>
Date: Fri, 21 Jul 2023 11:17:40 +0800
Subject: [PATCH 4/5] =?UTF-8?q?style:=20:bug:=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=87=A0=E4=B8=AAconsole=E8=AD=A6=E5=91=8A=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/src/views/shop/ship/logistics.vue | 122 +++++++++--------------
 seller/src/views/shop/shopSetting.vue    |   7 +-
 2 files changed, 48 insertions(+), 81 deletions(-)

diff --git a/seller/src/views/shop/ship/logistics.vue b/seller/src/views/shop/ship/logistics.vue
index 386777ee..4737cd4e 100644
--- a/seller/src/views/shop/ship/logistics.vue
+++ b/seller/src/views/shop/ship/logistics.vue
@@ -1,81 +1,45 @@
 <template>
   <div class="logistics">
     <Card>
-      <Table
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-      ></Table>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table"></Table>
     </Card>
     <Modal v-model="openModal" :title="openModalTitle" @on-ok="submit" @on-cancel="cancelModal">
       <h3 style="color: #ff3c2a; margin-bottom: 10px">是否需要电子面单</h3>
-      <RadioGroup
-        v-model="faceSheetForm.faceSheetFlag"
-        style="margin-bottom: 20px"
-        @on-change="getfaceSheetFlag($event)"
-      >
-        <Radio :label="true">
-          <span>需要</span>
-        </Radio>
-        <Radio :label="false">
-          <span>不需要</span>
-        </Radio>
-      </RadioGroup>
-      <Card v-if="onpenText" class="modalStyle">
+
+      <ButtonGroup style="margin-bottom: 10px;">
+        <Button :type="faceSheetForm.faceSheetFlag ? 'primary' : 'default'"
+          @click="faceSheetForm.faceSheetFlag = true">需要</Button>
+        <Button :type="!faceSheetForm.faceSheetFlag ? 'primary' : 'default'"
+          @click="faceSheetForm.faceSheetFlag = false">不需要</Button>
+      </ButtonGroup>
+      <Card v-if="openText" class="modalStyle">
         <h3 style="color: #ff3c2a; margin-bottom: 10px">请输入详细信息</h3>
         <Form ref="formValidate" :label-width="150" label-position="right" :model="faceSheetForm" :rules="ruleValidate">
           <FormItem label="customerName" prop="customerName">
-            <Input
-              v-model="faceSheetForm.customerName"
-              type="text"
-              class="faceSheetInput"
-            ></Input
-            ></FormItem>
+            <Input v-model="faceSheetForm.customerName" type="text" class="faceSheetInput"></Input>
+          </FormItem>
           <FormItem label="customerPwd" prop="customerPwd">
-            <Input
-              v-model="faceSheetForm.customerPwd"
-              type="text"
-              class="faceSheetInput"
-            ></Input>
+            <Input v-model="faceSheetForm.customerPwd" type="text" class="faceSheetInput"></Input>
           </FormItem>
           <FormItem label="monthCode" prop="monthCode">
-            <Input
-              v-model="faceSheetForm.monthCode"
-              type="text"
-              class="faceSheetInput"
-            ></Input
-            ></FormItem>
+            <Input v-model="faceSheetForm.monthCode" type="text" class="faceSheetInput"></Input>
+          </FormItem>
           <FormItem label="sendSite" prop="sendSite">
-            <Input
-              v-model="faceSheetForm.sendSite"
-              type="text"
-              class="faceSheetInput"
-            ></Input
-            ></FormItem>
+            <Input v-model="faceSheetForm.sendSite" type="text" class="faceSheetInput"></Input>
+          </FormItem>
           <FormItem label="sendStaff" prop="sendStaff">
-            <Input
-              v-model="faceSheetForm.sendStaff"
-              type="text"
-              class="faceSheetInput"
-            ></Input
-            ></FormItem>
+            <Input v-model="faceSheetForm.sendStaff" type="text" class="faceSheetInput"></Input>
+          </FormItem>
           <FormItem label="支付方式" prop="payType">
-            <Select
-              v-model="faceSheetForm.payType"
-              class="faceSheetInput">
+            <Select v-model="faceSheetForm.payType" class="faceSheetInput">
               <Option value="1">现付</Option>
               <Option value="2">到付</Option>
               <Option value="3">月结</Option>
               <Option value="4">第三方支付(仅SF支持)</Option>
-            </Select
-            ></FormItem>
+            </Select>
+          </FormItem>
           <FormItem label="快递类型" prop="expType">
-            <Input
-              v-model="faceSheetForm.expType"
-              type="text"
-              class="faceSheetInput"/>
+            <Input v-model="faceSheetForm.expType" type="text" class="faceSheetInput" />
           </FormItem>
           <div style="width:100%;text-align:center;">
             <a style="padding-right: 20px" @click="frontDownload('use')">使用说明</a>
@@ -83,7 +47,7 @@
           </div>
         </Form>
       </Card>
-      <br/>
+      <br />
     </Modal>
   </div>
 </template>
@@ -140,9 +104,9 @@ export default {
           sortable: true,
           render: (h, params) => {
             if (!params.row.selected) {
-              return h("div", [h("tag", {props: {color: "volcano"}}, "关闭")]);
+              return h("div", [h("tag", { props: { color: "volcano" } }, "关闭")]);
             } else {
-              return h("div", [h("tag", {props: {color: "green"}}, "开启")]);
+              return h("div", [h("tag", { props: { color: "green" } }, "开启")]);
             }
           }
         },
@@ -215,19 +179,25 @@ export default {
         },
       ],
       data: [], // 表单数据
-      onpenText: false,
+      openText: false,
     };
   },
+  watch: {
+    'faceSheetForm.faceSheetFlag'(val) {
+      this.openText = val ? true : false
+      console.log(this.openText )
+    }
+  },
   methods: {
     //获取状态
     getfaceSheetFlag(e) {
-
+      console.log(e);
       if (e === true) {
-
-        this.onpenText = true;
+        console.log("打开");
+        this.openText = true;
       } else {
-
-        this.onpenText = false;
+        console.log("关闭");
+        this.openText = false;
       }
     },
     // 初始化数据
@@ -245,7 +215,7 @@ export default {
       });
       this.loading = false;
     },
-    cancelModal(){
+    cancelModal() {
       this.faceSheetFlag = false;
       this.faceSheetForm.faceSheetFlag = false;
     },
@@ -255,9 +225,9 @@ export default {
       this.openModal = true;
       this.searchForm.faceSheetFlag = "false"; //开弹框 等于v
       if (this.searchForm.faceSheetFlag == "true") {
-        this.onpenText = true;
+        this.openText = true;
       } else {
-        this.onpenText = false;
+        this.openText = false;
       }
     },
     //修改
@@ -270,10 +240,10 @@ export default {
           // this.searchForm = res.result.recordes;
           this.faceSheetForm.faceSheetFlag = res.result.faceSheetFlag; //开弹框 等于v
           if (this.faceSheetForm.faceSheetFlag === true) {
-            this.onpenText = true;
+            this.openText = true;
           } else {
             this.faceSheetForm.faceSheetFlag = false
-            this.onpenText = false;
+            this.openText = false;
           }
           this.faceSheetForm.customerName = res.result.customerName;
           this.faceSheetForm.customerPwd = res.result.customerPwd;
@@ -303,7 +273,7 @@ export default {
     },
 
     submit() {
-      if ( !this.row.selected) {
+      if (!this.row.selected) {
         API_Shop.logisticsChecked(
           this.row.logisticsId,
           this.faceSheetForm
@@ -349,7 +319,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .faceSheetInput{
-    width: 300px;
-  }
+.faceSheetInput {
+  width: 300px;
+}
 </style>
diff --git a/seller/src/views/shop/shopSetting.vue b/seller/src/views/shop/shopSetting.vue
index 85aa5d25..2f0ccc1a 100644
--- a/seller/src/views/shop/shopSetting.vue
+++ b/seller/src/views/shop/shopSetting.vue
@@ -272,8 +272,6 @@ import liliMap from "@/views/my-components/map/index";
 import regionMap from "@/views/lili-components/region";
 import * as RegExp from "@/libs/RegExp.js";
 import Cookies from "js-cookie";
-import {editDeliverAddress, getDeliverAddress} from "../../api/shops";
-
 export default {
   name: "shopSetting",
   components: {
@@ -298,7 +296,7 @@ export default {
       },
       //库存预警form
       stockWarningForm: {
-        stockWarning: "", // 库存预警数量
+        stockWarning: 0, // 库存预警数量
       },
       //im form
       udeskForm: {
@@ -458,7 +456,7 @@ export default {
           Cookies.set("userInfoSeller", JSON.stringify(res.result));
           //库存预警数赋值
           this.$nextTick(() => {
-            this.stockWarningForm.stockWarning = res.result.stockWarning + "";
+            this.stockWarningForm.stockWarning = res.result.stockWarning;
           });
           if (res.result.merchantEuid) {
             //赋予坐席id
@@ -479,7 +477,6 @@ export default {
       API_Shop.getDeliverAddress().then(res=>{
         if(res.success){
           if(res.result!= '' && res.result != null){
-            console.log(89898999998)
             this.addressGoods = res.result;
             this.regionGoods = res.result.salesConsignorAddressPath;
             this.regionIdS = res.result.salesConsignorAddressId;

From 43899114367b53b4db062e1dfc86b2464efacb6f Mon Sep 17 00:00:00 2001
From: Yer <17633066053@163.com>
Date: Mon, 24 Jul 2023 14:26:07 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=B9=B0=E5=AE=B6=E7=AB=AF=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E8=A7=86=E9=A2=91=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/components/goodsDetail/ShowGoods.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue
index ea7621da..089266aa 100644
--- a/buyer/src/components/goodsDetail/ShowGoods.vue
+++ b/buyer/src/components/goodsDetail/ShowGoods.vue
@@ -293,7 +293,7 @@
               @click="buyNow"
               >立即购买</Button
             >
-            <Tooltip content="观看视频">
+            <Tooltip content="观看视频" v-if="skuDetail.goodsVideo">
               <img class="view-video" @click="showGoodsVideo = true" :src="require('@/assets/iconfont/play.svg')" alt="">
             </Tooltip>
           </div>