From 978db4e6248c2cacb0a7eeb072c5a24e0784ff96 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Tue, 25 May 2021 18:37:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E6=A8=A1=E6=9D=BF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/seller/shop/shopOperation.vue   |  8 +++++
 seller/src/views/goods/goods-seller/goods.vue |  2 +-
 .../goods/goods-seller/goodsOperation.vue     | 32 ++++++++---------
 seller/src/views/shop/ship/shipTemplate.vue   | 35 ++++++++-----------
 4 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/manager/src/views/seller/shop/shopOperation.vue b/manager/src/views/seller/shop/shopOperation.vue
index e3db7ae4..61206931 100644
--- a/manager/src/views/seller/shop/shopOperation.vue
+++ b/manager/src/views/seller/shop/shopOperation.vue
@@ -65,9 +65,17 @@
               <FormItem label="详细地址" prop="salesConsigneeDetail">
                 <Input v-model="shopForm.salesConsigneeDetail" clearable style="width: 350px" />
               </FormItem>
+              <Divider orientation="left">腾讯云智服</Divider>
+              <FormItem label="唯一标识" prop="salesConsigneeDetail">
+                <Input v-model="shopForm.yzfSign" clearable style="width: 350px" />
+              </FormItem>
+              <FormItem label="小程序唯一标识" prop="salesConsigneeDetail">
+                <Input v-model="shopForm.yzfMpSign" clearable style="width: 350px" />
+              </FormItem>
               <Spin fix v-if="loading"></Spin>
             </div>
           </TabPane>
+          <!-- 入驻信息 -->
           <TabPane label="入驻信息" class="tab" name="sms">
             <!-- 遮罩层  -->
             <div v-if="isRead" class="mask">只读不可修改</div>
diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue
index 165f9944..69362191 100644
--- a/seller/src/views/goods/goods-seller/goods.vue
+++ b/seller/src/views/goods/goods-seller/goods.vue
@@ -31,7 +31,7 @@
             <DropdownItem name="uppers">批量上架</DropdownItem>
             <DropdownItem name="lowers">批量下架</DropdownItem>
             <DropdownItem name="deleteAll">批量删除</DropdownItem>
-            <DropdownItem name="batchShipTemplate">批量设置运费模板</DropdownItem>
+            <!-- <DropdownItem name="batchShipTemplate">批量设置运费模板</DropdownItem> -->
           </DropdownMenu>
         </Dropdown>
       </Row>
diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index 24b6be3f..58204d99 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -522,7 +522,7 @@
                 <span slot="append">kg</span>
               </Input>
             </FormItem>
-            <FormItem class="form-item-view-el" label="运费" prop="skuList">
+            <!-- <FormItem class="form-item-view-el" label="运费" prop="skuList">
               <RadioGroup type="button" button-style="solid"
                 @on-change="logisticsTemplateChange"
                 v-model="baseInfoForm.freightPayer"
@@ -534,7 +534,7 @@
                   <span>使用物流规则</span>
                 </Radio>
               </RadioGroup>
-            </FormItem>
+            </FormItem> -->
             <FormItem
               class="form-item-view-el"
               label="物流模板"
@@ -699,7 +699,7 @@ export default {
         this.baseInfoForm = {
           salesModel: "RETAIL",
           goodsParamsList: [],
-          freightPayer: "STORE",
+          // freightPayer: "STORE",
           weight: "",
           goodsGalleryFiles: [],
           release: "true",
@@ -844,7 +844,7 @@ export default {
         /** 商品参数列表 */
         goodsParamsList: [],
         /** 运费承担者 */
-        freightPayer: "STORE",
+        // freightPayer: "STORE",
         /** 商品重量 */
         weight: "",
         /** 商品相册列表 */
@@ -1007,7 +1007,7 @@ export default {
       this.baseInfoForm = {
         salesModel: "RETAIL",
         goodsParamsList: [],
-        freightPayer: "STORE",
+        // freightPayer: "STORE",
         weight: "",
         goodsGalleryFiles: [],
         release: "true",
@@ -1235,14 +1235,14 @@ export default {
         ...response.result,
       };
       console.warn(this.baseInfoForm);
-      if (this.baseInfoForm.freightPayer === "BUYER") {
-        API_Shop.getShipTemplate().then((res) => {
-          if (res.success) {
-            this.logisticsTemplate = res.result;
-          }
-        });
-        this.logisticsTemplateShow = true;
-      }
+      // if (this.baseInfoForm.freightPayer === "BUYER") {
+      //   API_Shop.getShipTemplate().then((res) => {
+      //     if (res.success) {
+      //       this.logisticsTemplate = res.result;
+      //     }
+      //   });
+      //   this.logisticsTemplateShow = true;
+      // }
       this.baseInfoForm.release = "true";
       this.baseInfoForm.recommend = this.baseInfoForm.recommend
         ? "true"
@@ -1840,9 +1840,9 @@ export default {
             return;
           }
           //如果选择的是卖家承担运费 则运费模板重置为0
-          if (this.baseInfoForm.freightPayer !== "BUYER") {
-            this.baseInfoForm.templateId = 0;
-          }
+          // if (this.baseInfoForm.freightPayer !== "BUYER") {
+          //   this.baseInfoForm.templateId = 0;
+          // }
 
           this.baseInfoForm.skuList = this.skuTableData.map((sku) => {
             delete sku._index;
diff --git a/seller/src/views/shop/ship/shipTemplate.vue b/seller/src/views/shop/ship/shipTemplate.vue
index e86405e8..9e002f58 100644
--- a/seller/src/views/shop/ship/shipTemplate.vue
+++ b/seller/src/views/shop/ship/shipTemplate.vue
@@ -69,9 +69,10 @@
                 <RadioGroup type="button" button-style="solid" v-model="form.pricingMethod">
                   <Radio label="WEIGHT">按重量</Radio>
                   <Radio label="NUM">按件数</Radio>
+                  <Radio label="FREE">包邮</Radio>
                 </RadioGroup>
               </FormItem>
-              <FormItem label="详细设置">
+              <FormItem label="详细设置" v-if="form.pricingMethod !== 'FREE'">
                 <div class="ncsu-trans-type" data-delivery="TRANSTYPE">
                   <div class="entity">
                     <div class="tbl-except">
@@ -101,17 +102,17 @@
                               <Input class="text w40" type="text" v-model="item.firstCompany" maxlength="3" clearable />
                             </td>
                             <td>
-                              <Input class="text w60" type="text" v-model="item.firstPrice" maxlength="6" clearable /><em class="add-on">
-                                元
-                              </em>
+                              <Input class="text w60" type="text" v-model="item.firstPrice" maxlength="6" clearable >
+                                <span slot="append">元</span>
+                              </Input>
                             </td>
                             <td>
                               <Input class="text w40" type="text" v-model="item.continuedCompany" maxlength="6" clearable />
                             </td>
                             <td>
-                              <Input class="text w60" type="text" v-model="item.continuedPrice" maxlength="6" clearable /><em class="add-on">
-                                元
-                              </em>
+                              <Input class="text w60" type="text" v-model="item.continuedPrice" maxlength="6" clearable>
+                                <span slot="append">元</span>
+                              </Input>
                             </td>
                             <td class="nscs-table-handle">
                               <Button @click="editRegion(item,index)" type="info" size="small" style="margin-bottom: 5px">修改
@@ -141,7 +142,7 @@
                 </div>
               </FormItem>
               <Form-item>
-                <Button @click="addShipTemplateChildren(index)" :loading="submitLoading" icon="ios-create-outline" >为指定城市设置运费模板
+                <Button @click="addShipTemplateChildren(index)" v-if="form.pricingMethod !== 'FREE'" icon="ios-create-outline" >为指定城市设置运费模板
                 </Button>
                 <Button @click="handleSubmit" :loading="submitLoading" type="primary" style="margin-right:5px">保存
                 </Button>
@@ -312,6 +313,7 @@ export default {
         const regNumber = /^\+?[1-9][0-9]*$/;
         const regMoney = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
         if (valid) {
+          debugger;
           //校验运费模板详细信息
           for (let i = 0; i < this.form.freightTemplateChildList.length; i++) {
             if (
@@ -341,6 +343,8 @@ export default {
               return;
             }
           }
+          console.log(1111);
+
           if (this.operation == "ADD") {
             API_Shop.addShipTemplate(this.form, headers).then((res) => {
               if (res.success) {
@@ -541,7 +545,8 @@ textarea {
 }
 
 .w60 {
-  width: 80px !important;
+  width: 100px !important;
+  margin: 0 auto;
 }
 
 Input[type="text"],
@@ -555,18 +560,6 @@ Input.password {
   outline: 0 none;
 }
 
-.add-on {
-  line-height: 28px;
-  background-color: #f6f7fb;
-  vertical-align: top;
-  display: inline-block;
-  text-align: center;
-  width: 30px;
-  height: 30px;
-  border: solid #e6e9ee;
-  border-width: 1px 1px 1px 0;
-}
-
 ncsc-default-table {
   line-height: 20px;
   width: 100%;