From 8971996731ead7f1bf0a7a592b1ed384f85d36b6 Mon Sep 17 00:00:00 2001
From: pikachu <1321288662@qq.com>
Date: Wed, 19 May 2021 19:28:44 +0800
Subject: [PATCH 1/9] chushihua

---
 seller/src/config/index.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/seller/src/config/index.js b/seller/src/config/index.js
index a4549075..c0bcb7f8 100644
--- a/seller/src/config/index.js
+++ b/seller/src/config/index.js
@@ -18,14 +18,14 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    common: 'https://common-api.pickmall.cn',
+    //common: 'https://common-api.pickmall.cn',
     buyer: 'https://buyer-api.pickmall.cn',
-    seller: 'https://store-api.pickmall.cn',
-    manager: 'https://admin-api.pickmall.cn'
-    // common: 'http://192.168.0.100:8890',
+    //seller: 'https://store-api.pickmall.cn',
+    //manager: 'https://admin-api.pickmall.cn'
+     common: 'http://192.168.0.103:8890',
     // buyer: 'http://192.168.0.100:8888',
-    // seller: 'http://192.168.0.100:8889',
-    // manager: 'http://192.168.0.100:8887'
+     seller: 'http://192.168.0.103:8889',
+    manager: 'http://192.168.0.103:8887'
   },
   api_prod: {
     common: 'https://common-api.pickmall.cn',

From 697e4820a45ab61c8359ecafe1474f6ed4c9cc3c Mon Sep 17 00:00:00 2001
From: pikachu <1321288662@qq.com>
Date: Thu, 20 May 2021 08:29:32 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=9A=84=E4=B8=80=E4=BA=9B=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goods/goods-seller/goodsOperation.vue     | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index abd43569..f197a113 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -592,25 +592,15 @@
                     :key="index"
                     :label="`${goodsParamsList.paramName}：`"
                   >
-                    <Input
-                      v-if="goodsParamsList.paramType === 1"
-                      type="text"
-                      v-model="goodsParamsList.paramValue"
-                      placeholder="长度为最多50个字符"
-                      maxlength="50"
-                      clearable
-                      style="width: 260px"
-                    />
                     <Select
                       v-model="goodsParamsList.paramValue"
-                      v-if="goodsParamsList.paramType === 2"
                       placeholder="请选择"
                       style="width: 200px"
                       clearable
                     >
                       <Option
                         v-for="option in goodsParamsList.optionList"
-                        :key="option"
+                        :key="option.paramValue"
                         :label="option"
                         :value="option"
                       ></Option>
@@ -1370,18 +1360,14 @@ export default {
                     (ij) => ij.paramName === elem.paramName
                   )
                 ) {
-                  if (elem.paramType === 2) {
-                    elem.optionList = elem.options.split(",");
-                  }
+                  elem.optionList = elem.options.split(",");
                   this.baseInfoForm.goodsParamsList.push(elem);
                 }
                 if (this.$route.query.id || this.draftId) {
                   this.baseInfoForm.goodsParamsList = this.baseInfoForm.goodsParamsList.map(
                     (i) => {
                       if (i.paramId === elem.id || i.id === elem.id) {
-                        if (elem.paramType === 2) {
-                          elem.optionList = elem.options.split(",");
-                        }
+                        elem.optionList = elem.options.split(",");
                         i = {
                           ...i,
                           ...elem,
@@ -1851,7 +1837,7 @@ export default {
           if (this.baseInfoForm.freightPayer !== "BUYER") {
             this.baseInfoForm.templateId = 0;
           }
-          
+
           this.baseInfoForm.skuList = this.skuTableData.map((sku) => {
             delete sku._index;
             delete sku._rowKey;

From d927eaadf71c60a65791a3dd6fcb78e7e03a8815 Mon Sep 17 00:00:00 2001
From: pikachu <1321288662@qq.com>
Date: Thu, 20 May 2021 08:30:40 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/goods/goods-manage/category.vue |  1 +
 .../views/goods/goods-manage/parameter.vue    | 52 +++++++++++++------
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/manager/src/views/goods/goods-manage/category.vue b/manager/src/views/goods/goods-manage/category.vue
index a975f951..4efb51a1 100644
--- a/manager/src/views/goods/goods-manage/category.vue
+++ b/manager/src/views/goods/goods-manage/category.vue
@@ -244,6 +244,7 @@ export default {
     //弹出品牌关联框
     brandOperation(v) {
       getCategoryBrandListData(v.id).then((res) => {
+        console.warn(res)
         this.categoryId = v.id;
         this.modalBrandTitle = "品牌关联";
         this.brandForm.categoryBrands = res.result.map((item) => item.id);
diff --git a/manager/src/views/goods/goods-manage/parameter.vue b/manager/src/views/goods/goods-manage/parameter.vue
index f0d7534e..373a4041 100644
--- a/manager/src/views/goods/goods-manage/parameter.vue
+++ b/manager/src/views/goods/goods-manage/parameter.vue
@@ -31,9 +31,7 @@
           </p>
           <template v-if="group.params && group.params.length > 0">
             <div v-for="param in group.params" :key="param.param_id" class="params">
-              <span>{{ param.paramName }} 【{{
-                  param.paramType | paramTypeFilter
-                }}】</span>
+              <span>{{ param.paramName }}</span>
 
               <span>
                 <i-button type="text" @click="handleEditParams(group, param)">编辑</i-button>
@@ -56,19 +54,30 @@
           <FormItem label="参数名称" prop="paramName">
             <Input v-model="paramForm.paramName" style="width: 100%" />
           </FormItem>
-          <FormItem label="参数类型" prop="paramType">
-            <Select :loading="userLoading" v-model="paramForm.paramType">
-              <Option :value="1" :key="1">输入项</Option>
-              <Option :value="2" :key="2">选择项</Option>
+          <FormItem label="可选值" prop="options">
+            <Select
+              v-model="paramForm.options"
+              placeholder="输入后回车添加"
+              multiple
+              filterable
+              allow-create
+              :popper-append-to-body="false"
+              popper-class="spec-values-popper"
+              style="width: 100%; text-align: left; margin-right: 10px"
+            >
+              <Option
+                v-for="item in ops"
+                :value="item"
+                :key="item"
+                :label="item"
+              >
+                {{item}}
+              </Option>
             </Select>
           </FormItem>
-          <FormItem label="可选值" prop="options">
-            <i-input v-model="paramForm.options" type="textarea" :rows="3" placeholder="请输入可选值,选择项实用逗号分隔"></i-input>
-          </FormItem>
-
           <FormItem label="选项" prop="specName3">
-            <Checkbox :value="Number" v-model="paramForm.required">必填</Checkbox>
-            <Checkbox v-model="paramForm.isIndex">可索引</Checkbox>
+            <Checkbox :value="Number" v-model="paramForm.required == 1">必填</Checkbox>
+            <Checkbox v-model="paramForm.isIndex == 1">可索引</Checkbox>
           </FormItem>
         </Form>
 
@@ -127,6 +136,10 @@ export default {
       paramId: "",
       //参数表单
       paramForm: {},
+      /** 参数值 **/
+      ops:{
+        options: []
+      },
       paramGroupForm: {},
       /** 添加、编辑参数 规格 */
       formValidate: {
@@ -170,14 +183,16 @@ export default {
     handleEditParams(group, param) {
       this.paramForm = {
         paramName: param.paramName,
-        paramType: param.paramType,
-        options: param.options,
+        options:  param.options,
         required: param.required,
         isIndex: param.isIndex,
         groupId: group.groupId,
         categoryId: this.categoryId,
         id: param.id,
       };
+      console.warn(this.paramForm.isIndex)
+      this.options = this.paramForm.options.split(",")
+      this.ops = this.paramForm.options.split(",")
       this.modalType = 1;
       this.modalTitle = "修改参数";
       this.dialogParamsVisible = true;
@@ -194,7 +209,14 @@ export default {
       this.dialogParamsGroupVisible = true;
     },
     handleAddParamsGroup() {
+      this.paramGroupForm = {
+
+      };
+      this.ops = {
+
+      };
       (this.paramGroupForm.categoryId = this.categoryId), (this.modalType = 0);
+
       this.modalTitle = "添加参数组";
       this.dialogParamsGroupVisible = true;
     },

From 5e52e7f1573ea76ff3ce3a78bf8db127a3d03bba Mon Sep 17 00:00:00 2001
From: pikachu <1321288662@qq.com>
Date: Thu, 20 May 2021 09:23:20 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/goods/goods-manage/parameter.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/manager/src/views/goods/goods-manage/parameter.vue b/manager/src/views/goods/goods-manage/parameter.vue
index 373a4041..f698fd26 100644
--- a/manager/src/views/goods/goods-manage/parameter.vue
+++ b/manager/src/views/goods/goods-manage/parameter.vue
@@ -183,16 +183,15 @@ export default {
     handleEditParams(group, param) {
       this.paramForm = {
         paramName: param.paramName,
-        options:  param.options,
+        options:  param.options.split(","),
         required: param.required,
         isIndex: param.isIndex,
         groupId: group.groupId,
         categoryId: this.categoryId,
         id: param.id,
       };
-      console.warn(this.paramForm.isIndex)
-      this.options = this.paramForm.options.split(",")
-      this.ops = this.paramForm.options.split(",")
+      console.warn(this.paramForm.options)
+      this.ops = this.paramForm.options
       this.modalType = 1;
       this.modalTitle = "修改参数";
       this.dialogParamsVisible = true;

From b190a443be13f8236c4cb07e640e7652dea0f117 Mon Sep 17 00:00:00 2001
From: pikachu <1321288662@qq.com>
Date: Thu, 20 May 2021 09:45:59 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=B8=AD=E6=98=AF=E5=90=A6=E5=BF=85=E5=A1=AB=E5=92=8C=E7=B4=A2?=
 =?UTF-8?q?=E5=BC=95=E9=80=89=E4=B8=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/goods/goods-manage/parameter.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/manager/src/views/goods/goods-manage/parameter.vue b/manager/src/views/goods/goods-manage/parameter.vue
index f698fd26..5291af29 100644
--- a/manager/src/views/goods/goods-manage/parameter.vue
+++ b/manager/src/views/goods/goods-manage/parameter.vue
@@ -76,8 +76,8 @@
             </Select>
           </FormItem>
           <FormItem label="选项" prop="specName3">
-            <Checkbox :value="Number" v-model="paramForm.required == 1">必填</Checkbox>
-            <Checkbox v-model="paramForm.isIndex == 1">可索引</Checkbox>
+            <Checkbox label=1 v-model="paramForm.required">必填</Checkbox>
+            <Checkbox label=1 v-model="paramForm.isIndex">可索引</Checkbox>
           </FormItem>
         </Form>
 
@@ -184,8 +184,8 @@ export default {
       this.paramForm = {
         paramName: param.paramName,
         options:  param.options.split(","),
-        required: param.required,
-        isIndex: param.isIndex,
+        required: param.required==1?true:false,
+        isIndex: param.isIndex==1?true:false,
         groupId: group.groupId,
         categoryId: this.categoryId,
         id: param.id,
@@ -233,6 +233,7 @@ export default {
               }
             });
           } else {
+            console.warn(this.paramGroupForm)
             updateParamsGroup(this.paramGroupForm).then((res) => {
               this.submitLoading = false;
               if (res.success) {
@@ -263,6 +264,7 @@ export default {
               }
             });
           } else {
+            console.warn(this.paramForm.isIndex)
             this.paramForm.isIndex = Number(this.paramForm.isIndex);
             this.paramForm.required = Number(this.paramForm.required);
             updateGoodsParams(this.paramForm).then((res) => {

From 63c559c8beabe52a454aa79817fa2d5d422e0794 Mon Sep 17 00:00:00 2001
From: pikachu <1321288662@qq.com>
Date: Thu, 20 May 2021 09:57:57 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E6=8A=98=E5=8F=A0=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/src/views/goods/goods-seller/goodsOperation.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index f197a113..948b3ae6 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -576,13 +576,13 @@
           </div>
           <div class="form-item-view-bottom">
             <Collapse
-              active-key="1"
+              v-model="show"
               v-for="paramsgroup in goodsParams"
               :title="paramsgroup.groupName"
               style="text-align: left"
               :key="paramsgroup.groupName"
             >
-              <Panel key="1">
+              <Panel key="1" name="1">
                 {{ paramsgroup.groupName }}
                 <p slot="content">
                   <FormItem
@@ -762,6 +762,7 @@ export default {
     };
 
     return {
+      show: '1',
       //提交状态
       submitLoading: false,
       //上传图片路径

From f625a7e056114adc185dd88ee64d2c7b722af492 Mon Sep 17 00:00:00 2001
From: pikachu <1321288662@qq.com>
Date: Thu, 20 May 2021 19:09:21 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goods/goods-seller/goodsOperation.vue     | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index 948b3ae6..dd865821 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -1826,14 +1826,17 @@ export default {
             this.$Message.error("请上传商品图片");
             return;
           }
-          // if (
-          //   !this.baseInfoForm.storeCategoryPath ||
-          //   !this.baseInfoForm.storeCategoryPath.length
-          // ) {
-          //   this.submitLoading = false;
-          //   this.$Message.error("请选择店内分类");
-          //   return;
-          // }
+          let flag = false;
+          this.baseInfoForm.goodsParamsList.forEach((e)=> {
+            if(e.required === 1 && e.paramValue === null){
+              flag = true
+            }
+          });
+          if(flag){
+            this.$Message.error("请填写参数信息 参数不能为空");
+            this.submitLoading = false;
+            return;
+          }
           //如果选择的是卖家承担运费 则运费模板重置为0
           if (this.baseInfoForm.freightPayer !== "BUYER") {
             this.baseInfoForm.templateId = 0;
@@ -1852,6 +1855,12 @@ export default {
               (i) => i.url
             );
           }
+          /** 参数校验 **/
+         /* Object.keys(this.baseInfoForm.goodsParamsList).forEach((item) => {
+            console.warn(item.paramName)
+          });*/
+
+
 
           if (this.goodsId) {
             API_GOODS.editGoods(this.goodsId, this.baseInfoForm).then((res) => {

From 3c0555c815a10cfe823cd84b238cb185e4d5eca9 Mon Sep 17 00:00:00 2001
From: pikachu <1321288662@qq.com>
Date: Thu, 20 May 2021 19:14:38 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/src/views/goods/goods-seller/goodsOperation.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index dd865821..24b6be3f 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -1827,13 +1827,15 @@ export default {
             return;
           }
           let flag = false;
+          let paramValue = "";
           this.baseInfoForm.goodsParamsList.forEach((e)=> {
-            if(e.required === 1 && e.paramValue === null){
+            if(e.required === 1 && e.paramValue === null || e.paramValue === undefined){
               flag = true
+              paramValue = e.paramName
             }
           });
           if(flag){
-            this.$Message.error("请填写参数信息 参数不能为空");
+            this.$Message.error(paramValue +" 参数值不能为空");
             this.submitLoading = false;
             return;
           }

From b1b587a50c08cf5577d129a1336cd6ead1f3f147 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Fri, 21 May 2021 10:24:56 +0800
Subject: [PATCH 9/9] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goodsDetail/ShowGoodsDetail.vue           |  2 +-
 buyer/src/config/index.js                     | 16 +++++------
 buyer/src/pages/Cart.vue                      |  2 +-
 buyer/src/pages/GoodsDetail.vue               |  2 +-
 buyer/src/pages/GoodsList.vue                 |  4 +--
 buyer/src/pages/Merchant.vue                  |  4 +--
 .../pages/home/memberCenter/CommentList.vue   |  4 +--
 .../home/memberCenter/ComplainDetail.vue      |  2 +-
 .../pages/home/memberCenter/ComplainList.vue  |  4 +--
 .../memberCenter/evaluation/EvalDetail.vue    |  4 +--
 manager/src/views/goods/goods-info/goods.vue  | 14 +++++++---
 .../after-order/afterSaleOrderDetail.vue      | 28 +++++++++++++------
 seller/src/config/index.js                    |  8 +++---
 seller/src/views/goods/goods-seller/goods.vue | 26 ++++++++++-------
 .../views/goods/goods-seller/goodsStock.vue   |  4 ---
 seller/src/views/home/home.vue                | 12 ++++----
 seller/src/views/member/memberComment.vue     |  5 ++--
 .../my-components/lili/upload-pic-thumb.vue   |  5 ++++
 seller/src/views/promotion/coupon/coupon.vue  |  4 +--
 .../views/promotion/coupon/couponPublish.vue  |  2 +-
 20 files changed, 89 insertions(+), 63 deletions(-)

diff --git a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
index c2b34e53..99c878ae 100644
--- a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
+++ b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
@@ -56,7 +56,7 @@
                       <Rate disabled :value="Number(item.descriptionScore)" allow-half class="remarks-star"></Rate>
                     </p>
                     <p class="remarks-content">{{item.content}}</p>
-                    <div class="comment-img" v-if="item.haveImage">
+                    <div class="comment-img" v-if="item.image">
                       <div v-for="(img, imgIndex) in item.image.split(',')"
                        @click="previewImg(img, item)"
                        :class="{borderColor:img === item.previewImg}"
diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js
index c3161388..a2cfb5f5 100644
--- a/buyer/src/config/index.js
+++ b/buyer/src/config/index.js
@@ -17,15 +17,15 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    common: 'http://192.168.0.100:8890',
-    buyer: 'http://192.168.0.100:8888',
-    seller: 'http://192.168.0.100:8889',
-    manager: 'http://192.168.0.100:8887'
+    // common: 'http://192.168.0.103:8890',
+    // buyer: 'http://192.168.0.103:8888',
+    // seller: 'http://192.168.0.103:8889',
+    // manager: 'http://192.168.0.103:8887'
 
-    // common: 'https://common-api.pickmall.cn',
-    // buyer: 'https://buyer-api.pickmall.cn',
-    // seller: 'https://store-api.pickmall.cn',
-    // manager: 'https://admin-api.pickmall.cn'
+    common: 'https://common-api.pickmall.cn',
+    buyer: 'https://buyer-api.pickmall.cn',
+    seller: 'https://store-api.pickmall.cn',
+    manager: 'https://admin-api.pickmall.cn'
   },
   api_prod: {
     common: 'https://common-api.pickmall.cn',
diff --git a/buyer/src/pages/Cart.vue b/buyer/src/pages/Cart.vue
index fea3ff18..f7c056a2 100644
--- a/buyer/src/pages/Cart.vue
+++ b/buyer/src/pages/Cart.vue
@@ -119,7 +119,7 @@
             <div class="ml_20 total-price">
               总价（不含运费）:<span>{{ priceDetailDTO.billPrice | unitPrice("￥") }}</span>
             </div>
-            <div class="pay ml_20" @click="pay">去支付</div>
+            <div class="pay ml_20" @click="pay">去结算</div>
           </div>
         </div>
       </div>
diff --git a/buyer/src/pages/GoodsDetail.vue b/buyer/src/pages/GoodsDetail.vue
index 39c67e93..663bd301 100644
--- a/buyer/src/pages/GoodsDetail.vue
+++ b/buyer/src/pages/GoodsDetail.vue
@@ -11,7 +11,7 @@
           <BreadcrumbItem v-for="(item, index) in categoryBar" :to="goGoodsList(index)" target="_blank" :key="index">{{item.name}}</BreadcrumbItem>
         </Breadcrumb>
         <div class="store-collect">
-          <span class="mr_10"><router-link :to="'Merchant?id='+goodsMsg.data.storeId">{{goodsMsg.data.storeName}}</router-link></span>
+          <span class="mr_10"><router-link :to="'Merchant?id=' + goodsMsg.data.storeId">{{goodsMsg.data.storeName}}</router-link></span>
           <span @click="collect" ><Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#666'" />{{storeCollected?'已收藏店铺':'收藏店铺'}}</span>
         </div>
       </div>
diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue
index 99168bcc..718ae499 100644
--- a/buyer/src/pages/GoodsList.vue
+++ b/buyer/src/pages/GoodsList.vue
@@ -157,11 +157,11 @@ export default {
       window.open(routeUrl.href, '_blank');
     },
     changePageNum (val) {
-      this.params.pageNumber = val - 1;
+      this.params.pageNumber = val;
       this.getGoodsList();
     },
     changePageSize (val) {
-      this.params.pageNumber = 0;
+      this.params.pageNumber = 1;
       this.params.pageSize = val;
       this.getGoodsList();
     },
diff --git a/buyer/src/pages/Merchant.vue b/buyer/src/pages/Merchant.vue
index cc1942d5..72cf73ce 100644
--- a/buyer/src/pages/Merchant.vue
+++ b/buyer/src/pages/Merchant.vue
@@ -146,11 +146,11 @@ export default {
       this.getGoodsList()
     },
     changePageNum (val) {
-      this.params.pageNumber = val - 1;
+      this.params.pageNumber = val;
       this.getGoodsList();
     },
     changePageSize (val) {
-      this.params.pageNumber = 0;
+      this.params.pageNumber = 1;
       this.params.pageSize = val;
       this.getGoodsList();
     },
diff --git a/buyer/src/pages/home/memberCenter/CommentList.vue b/buyer/src/pages/home/memberCenter/CommentList.vue
index 5f33c240..661669fe 100644
--- a/buyer/src/pages/home/memberCenter/CommentList.vue
+++ b/buyer/src/pages/home/memberCenter/CommentList.vue
@@ -22,10 +22,10 @@
           </div>
           <Row class="order-item-view">
             <i-col span="12" class="item-view-name">
-              <div class="order-img">
+              <div class="order-img hover-color" @click="linkTo(`/goodsDetail?goodsId=${item.goodsId}&skuId=${item.skuId}`)">
                 <img :src="item.goodsImage" alt="" />
               </div>
-              <div class="order-name">
+              <div class="order-name hover-color" @click="linkTo(`/goodsDetail?goodsId=${item.goodsId}&skuId=${item.skuId}`)">
                 {{item.goodsName}}
               </div>
               <div>
diff --git a/buyer/src/pages/home/memberCenter/ComplainDetail.vue b/buyer/src/pages/home/memberCenter/ComplainDetail.vue
index 682852cf..61db7505 100644
--- a/buyer/src/pages/home/memberCenter/ComplainDetail.vue
+++ b/buyer/src/pages/home/memberCenter/ComplainDetail.vue
@@ -13,7 +13,7 @@
     <table cellspacing="0" cellpadding='0' border="1">
       <tr>
         <td>投诉商品</td>
-        <td><img :src="detail.goodsImage" width="60" alt=""> &nbsp;{{ detail.goodsName }}</td>
+        <td class="hover-color" @click="linkTo(`/goodsDetail?goodsId=${detail.goodsId}&skuId=${detail.skuId}`)"><img :src="detail.goodsImage" width="60" alt=""> &nbsp;{{ detail.goodsName }}</td>
       </tr>
       <tr>
         <td>投诉主题</td>
diff --git a/buyer/src/pages/home/memberCenter/ComplainList.vue b/buyer/src/pages/home/memberCenter/ComplainList.vue
index d4cf694b..c8cdc281 100644
--- a/buyer/src/pages/home/memberCenter/ComplainList.vue
+++ b/buyer/src/pages/home/memberCenter/ComplainList.vue
@@ -23,10 +23,10 @@
           </div>
           <Row class="order-item-view">
             <i-col span="12" class="item-view-name">
-              <div class="order-img">
+              <div class="order-img hover-color" @click="linkTo(`/goodsDetail?goodsId=${item.goodsId}&skuId=${item.skuId}`)">
                 <img :src="item.goodsImage" alt="" />
               </div>
-              <div class="order-name">
+              <div class="order-name hover-color" @click="linkTo(`/goodsDetail?goodsId=${item.goodsId}&skuId=${item.skuId}`)">
                 {{item.goodsName}}
               </div>
               <div>
diff --git a/buyer/src/pages/home/memberCenter/evaluation/EvalDetail.vue b/buyer/src/pages/home/memberCenter/evaluation/EvalDetail.vue
index c3f2d724..b1439cde 100644
--- a/buyer/src/pages/home/memberCenter/evaluation/EvalDetail.vue
+++ b/buyer/src/pages/home/memberCenter/evaluation/EvalDetail.vue
@@ -35,8 +35,8 @@
             <Input type="textarea" maxlength="500" readonly show-word-limit :rows="4" v-model="orderGoods.content" />
           </div>
           <div style="display:flex;align-items:center;">
-            <template v-if="orderGoods.image">
-              <div class="demo-upload-list"  v-for="(img, index) in orderGoods.image.split(',')" :key="index">
+            <template v-if="orderGoods.images">
+              <div class="demo-upload-list"  v-for="(img, index) in orderGoods.images.split(',')" :key="index">
                 <img :src="img">
                 <div class="demo-upload-list-cover">
                   <Icon type="ios-eye-outline" @click.native="handleView(img)"></Icon>
diff --git a/manager/src/views/goods/goods-info/goods.vue b/manager/src/views/goods/goods-info/goods.vue
index bc42e4dc..9ac9e257 100644
--- a/manager/src/views/goods/goods-info/goods.vue
+++ b/manager/src/views/goods/goods-info/goods.vue
@@ -56,16 +56,22 @@
             >
 
               <!-- 商品栏目格式化 -->
-              <template slot="goodsSlot" slot-scope="scope">
+              <template slot="goodsSlot" slot-scope="{row}">
                 <div style="margin: 5px 0px;height: 80px; display: flex;">
                   <div style="">
-                    <img :src="scope.row.original" style="height: 60px;margin-top: 1px;width: 60px">
+                    <img :src="row.original" style="height: 60px;margin-top: 1px;width: 60px">
                   </div>
 
                   <div style="margin-left: 13px;">
-                    <div class="div-zoom" >
-                      <a>{{scope.row.goodsName}}</a>
+                    <div class="div-zoom">
+                      <a @click="linkTo(row.id,row.skuId)">{{row.goodsName}}</a>
                     </div>
+                    <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+                      <div slot="content">
+                        <vue-qr :text="wapLinkTo(row.id,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+                      </div>
+                      <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
+                    </Poptip>
                   </div>
                 </div>
 
diff --git a/manager/src/views/order/after-order/afterSaleOrderDetail.vue b/manager/src/views/order/after-order/afterSaleOrderDetail.vue
index 76bf9190..e53f3ac9 100644
--- a/manager/src/views/order/after-order/afterSaleOrderDetail.vue
+++ b/manager/src/views/order/after-order/afterSaleOrderDetail.vue
@@ -63,14 +63,13 @@
             </div>
 
             <div class="div-form-default" v-if="afterSaleInfo.serviceStatus=='APPLY'">
-              <h3>商家处理意见</h3>
+              <h3>处理意见</h3>
               <dl>
                 <dt>商家</dt>
                 <dd>
                   <div class="div-content">
                     {{afterSaleInfo.storeName}}
                   </div>
-
                 </dd>
               </dl>
               <dl>
@@ -86,9 +85,18 @@
                       </Radio>
                     </RadioGroup>
                   </div>
-
                 </dd>
               </dl>
+              <dl>
+                  <dt>申请退款金额</dt>
+                  <dd>{{ afterSaleInfo.applyRefundPrice | unitPrice('￥') }}</dd>
+                </dl>
+                <dl>
+                  <dt>实际退款金额</dt>
+                  <dd>
+                    <Input v-model="params.actualRefundPrice" style="width:260px"/>
+                  </dd>
+                </dl>
               <dl>
                 <dt>备注信息</dt>
                 <dd>
@@ -169,7 +177,7 @@
 
             </div>
             <!--"-->
-            <div class="div-form-default" v-if="afterSaleInfo.afterSaleAllowOperationVO.refund">
+            <div class="div-form-default" v-if="afterSaleInfo.afterSaleAllowOperationVO && afterSaleInfo.afterSaleAllowOperationVO.refund">
               <h3>平台退款</h3>
 
               <dl>
@@ -438,10 +446,10 @@ export default {
           this.afterSaleInfo = res.result;
           this.afterSaleImage = (res.result.afterSaleImage || "").split(",");
           //退货地址去掉逗号
-          this.afterSaleInfo.mconsigneeAddressPath = this.afterSaleInfo.mconsigneeAddressPath.replaceAll(
-            ",",
-            " "
-          );
+          if (this.afterSaleInfo.mconsigneeAddressPath)
+          this.afterSaleInfo.mconsigneeAddressPath = this.afterSaleInfo.mconsigneeAddressPath.replaceAll(","," ");
+
+          this.$set(this.params,'actualRefundPrice', this.afterSaleInfo.applyRefundPrice)
         }
       });
     },
@@ -538,6 +546,10 @@ export default {
         this.$Message.error("请输入备注信息");
         return;
       }
+      if (this.params.actualRefundPrice == "") {
+        this.$Message.error("请输入退款金额");
+        return;
+      }
       API_Order.afterSaleSellerReview(this.sn, this.params).then((res) => {
         this.submitLoading = false;
         if (res.success) {
diff --git a/seller/src/config/index.js b/seller/src/config/index.js
index a4549075..83dc43fd 100644
--- a/seller/src/config/index.js
+++ b/seller/src/config/index.js
@@ -22,10 +22,10 @@ export default {
     buyer: 'https://buyer-api.pickmall.cn',
     seller: 'https://store-api.pickmall.cn',
     manager: 'https://admin-api.pickmall.cn'
-    // common: 'http://192.168.0.100:8890',
-    // buyer: 'http://192.168.0.100:8888',
-    // seller: 'http://192.168.0.100:8889',
-    // manager: 'http://192.168.0.100:8887'
+    // common: 'http://192.168.0.103:8890',
+    // buyer: 'http://192.168.0.103:8888',
+    // seller: 'http://192.168.0.103:8889',
+    // manager: 'http://192.168.0.103:8887'
   },
   api_prod: {
     common: 'https://common-api.pickmall.cn',
diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue
index 1f6fdc65..165f9944 100644
--- a/seller/src/views/goods/goods-seller/goods.vue
+++ b/seller/src/views/goods/goods-seller/goods.vue
@@ -39,16 +39,22 @@
       <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
 
         <!-- 商品栏目格式化 -->
-        <template slot="goodsSlot" slot-scope="scope">
+        <template slot="goodsSlot" slot-scope="{row}">
           <div style="margin-top: 5px;height: 90px; display: flex;">
             <div style="">
-              <img :src="scope.row.original" style="height: 80px;margin-top: 3px;width: 70px">
+              <img :src="row.original" style="height: 80px;margin-top: 3px;width: 70px">
             </div>
 
             <div style="margin-left: 13px;">
               <div class="div-zoom">
-                <a>{{scope.row.goodsName}}</a>
+                <a @click="linkTo(row.id,row.skuId)">{{row.goodsName}}</a>
               </div>
+              <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+                <div slot="content">
+                  <vue-qr :text="wapLinkTo(row.id,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+                </div>
+                <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
+              </Poptip>
             </div>
           </div>
 
@@ -76,10 +82,10 @@
       <Form ref="shipTemplateForm" :model="shipTemplateForm" :label-width="120">
         <FormItem class="form-item-view-el" label="运费" prop="freightPayer">
           <RadioGroup type="button" button-style="solid" @on-change="logisticsTemplateUndertakerChange" v-model="shipTemplateForm.freightPayer">
-            <Radio label="BUYER">
-              <span>买家承担运费</span>
-            </Radio>
             <Radio label="STORE">
+              <span>卖家承担运费</span>
+            </Radio>
+            <Radio label="BUYER">
               <span>使用物流规则</span>
             </Radio>
           </RadioGroup>
@@ -120,7 +126,7 @@ export default {
       id: "", //要操作的id
       loading: true, // 表单加载状态
       shipTemplateForm: {
-        freightPayer: "BUYER",
+        freightPayer: "STORE",
       },
       shipTemplateShow: false, //物流模板是否显示
       shipTemplateModal: false, // 物流模板是否显示
@@ -515,7 +521,7 @@ export default {
     },
     //保存运费模板信息
     saveShipTemplate () {
-      if (this.shipTemplateForm.freightPayer == "BUYER") {
+      if (this.shipTemplateForm.freightPayer == "STORE") {
         {
           this.shipTemplateForm.templateId = 0;
         }
@@ -559,7 +565,7 @@ export default {
     //运费承担者变化
     logisticsTemplateUndertakerChange(v) {
       //如果是卖家承担运费 需要显示运费模板
-      if (v == "STORE") {
+      if (v == "BUYER") {
         API_Store.getShipTemplate().then((res) => {
           if (res.success) {
             this.logisticsTemplate = res.result;
@@ -567,7 +573,7 @@ export default {
         });
         this.shipTemplateShow = true;
       }
-      if (v == "BUYER") {
+      if (v == "STORE") {
         this.shipTemplateShow = false;
       }
     },
diff --git a/seller/src/views/goods/goods-seller/goodsStock.vue b/seller/src/views/goods/goods-seller/goodsStock.vue
index 2b511436..2b0fb9e4 100644
--- a/seller/src/views/goods/goods-seller/goodsStock.vue
+++ b/seller/src/views/goods/goods-seller/goodsStock.vue
@@ -1,7 +1,5 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
         <Card>
           <Row v-show="openSearch" @keydown.enter.native="handleSearch">
             <Form
@@ -97,8 +95,6 @@
             ></Page>
           </Row>
         </Card>
-      </Col>
-    </Row>
     <Modal
       title="更新库存"
       v-model="updateStockModalVisible"
diff --git a/seller/src/views/home/home.vue b/seller/src/views/home/home.vue
index 0456d3bd..dca6a50e 100644
--- a/seller/src/views/home/home.vue
+++ b/seller/src/views/home/home.vue
@@ -56,7 +56,7 @@
           <h4>待办事项</h4>
 
           <div class="detail-list">
-            <div class="detail-item" @click="navigateTo('order')">
+            <div class="detail-item" @click="navigateTo('orderList')">
               <div>
                 <span>{{homeData.unPaidOrder || 0}}</span>
                 <div>待付款</div>
@@ -66,7 +66,7 @@
               </div>
             </div>
 
-            <div class="detail-item" @click="navigateTo('order')">
+            <div class="detail-item" @click="navigateTo('orderList')">
               <div>
                 <span>{{homeData.unDeliveredOrder || 0}}</span>
                 <div>待发货</div>
@@ -125,7 +125,7 @@
                 <span>{{homeData.seckillNum || 0}}</span>
                 <div>待参加活动</div>
               </div>
-              <div>
+              <div @click="navigateTo('accountStatementBill')">
                 <span>{{homeData.waitPayBill || 0}}</span>
                 <div>待对账</div>
               </div>
@@ -161,7 +161,7 @@
           </div>
 
         </div>
-        <div class="count-item">
+        <div class="count-item" @click="navigateTo('orderStatistics')">
           <div>
             <Icon class="icon" size="31" type="ios-card" />
           </div>
@@ -171,7 +171,7 @@
           </div>
 
         </div>
-        <div class="count-item" @click="navigateTo('order')">
+        <div class="count-item" @click="navigateTo('orderList')">
           <div>
 
             <Icon class="icon" size="31" type="md-list" />
@@ -182,7 +182,7 @@
           </div>
 
         </div>
-        <div class="count-item">
+        <div class="count-item" @click="navigateTo('trafficStatistics')">
           <div>
             <Icon class="icon" size="31" type="md-person" />
           </div>
diff --git a/seller/src/views/member/memberComment.vue b/seller/src/views/member/memberComment.vue
index 9aea4fd2..6e39f8b9 100644
--- a/seller/src/views/member/memberComment.vue
+++ b/seller/src/views/member/memberComment.vue
@@ -102,6 +102,7 @@
             v-model="image"
             :disable="true"
             :remove="false"
+            :isView="true"
           ></upload-pic-thumb>
         </FormItem>
         <FormItem label="回复内容" prop="reply">
@@ -370,8 +371,8 @@ export default {
           this.content = res.result.content
           this.form.reply = res.result.reply
           this.replyStatus = res.result.replyStatus
-          if (res.result.image) {
-            this.image = (res.result.image || "").split(",");
+          if (res.result.images) {
+            this.image = (res.result.images || "").split(",");
           }
           if (res.result.replyImage) {
             this.form.replyImage = (res.result.replyImage || "").split(",");
diff --git a/seller/src/views/my-components/lili/upload-pic-thumb.vue b/seller/src/views/my-components/lili/upload-pic-thumb.vue
index 88979b74..4aa121b1 100644
--- a/seller/src/views/my-components/lili/upload-pic-thumb.vue
+++ b/seller/src/views/my-components/lili/upload-pic-thumb.vue
@@ -37,6 +37,7 @@
       :action="uploadFileUrl"
       :headers="accessToken"
       style="display: inline-block;width:58px;"
+      v-if="!isView"
     >
       <div style="width: 58px;height:58px;line-height: 58px;">
         <Icon type="md-camera" size="20"></Icon>
@@ -87,6 +88,10 @@ export default {
     limit: {
       type: Number,
       default: 10
+    },
+    isView: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
diff --git a/seller/src/views/promotion/coupon/coupon.vue b/seller/src/views/promotion/coupon/coupon.vue
index a97d679f..17de56cc 100644
--- a/seller/src/views/promotion/coupon/coupon.vue
+++ b/seller/src/views/promotion/coupon/coupon.vue
@@ -69,7 +69,7 @@
           <template slot-scope="{ row }" slot="action">
             <Button
               v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'"
-              type="primary"
+              type="info"
               size="small"
               style="margin-right: 10px"
               @click="edit(row)"
@@ -259,7 +259,7 @@ export default {
           slot: "action",
           align: "center",
           fixed: "right",
-          width: 80,
+          minWidth: 80,
         },
       ],
       data: [], // 表单数据
diff --git a/seller/src/views/promotion/coupon/couponPublish.vue b/seller/src/views/promotion/coupon/couponPublish.vue
index 1f051994..013b3424 100644
--- a/seller/src/views/promotion/coupon/couponPublish.vue
+++ b/seller/src/views/promotion/coupon/couponPublish.vue
@@ -511,7 +511,7 @@ export default {
         this.$store.state.app.storeOpenedList
       );
       this.$router.push({
-        path: "promotion/coupon",
+        name: "coupon",
       });
     },
     changeSelect(e) {