From c8edf9c1bdf216e80ebc0be8c0d0cc9b82c6c1a2 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Thu, 2 Sep 2021 16:37:46 +0800
Subject: [PATCH 1/2] add goods parameter sort

---
 buyer/src/pages/GoodsList.vue                        | 12 ++++++------
 manager/src/views/goods/goods-manage/parameter.vue   |  6 +++++-
 .../views/goods/goods-seller/goodsOperationSec.vue   |  2 ++
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue
index 31f2b9c3..55fbb20c 100644
--- a/buyer/src/pages/GoodsList.vue
+++ b/buyer/src/pages/GoodsList.vue
@@ -49,27 +49,27 @@
               class="goods-show-info"
               v-for="(item, index) in goodsList"
               :key="index"
-              @click="goGoodsDetail(item.id, item.goodsId)"
+              @click="goGoodsDetail(item.id, item.content.goodsId)"
             >
               <div class="goods-show-img">
-                <img width="220" height="220" :src="item.thumbnail" />
+                <img width="220" height="220" :src="item.content.thumbnail" />
               </div>
               <div class="goods-show-price">
                 <span>
                   <span class="seckill-price text-danger">{{
-                    item.price | unitPrice("￥")
+                    item.content.price | unitPrice("￥")
                   }}</span>
                 </span>
               </div>
               <div class="goods-show-detail">
-                <span>{{ item.goodsName }}</span>
+                <span>{{ item.content.goodsName }}</span>
               </div>
               <div class="goods-show-num">
-                已有<span>{{ item.commentNum || 0 }}</span
+                已有<span>{{ item.content.commentNum || 0 }}</span
                 >人评价
               </div>
               <div class="goods-show-seller">
-                <Tag v-if="item.selfOperated" style="padding:0 4px;" size="default" color="error">自营</Tag><span>{{ item.storeName }}</span>
+                <Tag v-if="item.content.selfOperated" style="padding:0 4px;" size="default" color="error">自营</Tag><span>{{ item.content.storeName }}</span>
               </div>
             </div>
           </div>
diff --git a/manager/src/views/goods/goods-manage/parameter.vue b/manager/src/views/goods/goods-manage/parameter.vue
index dee7a669..bc18a985 100644
--- a/manager/src/views/goods/goods-manage/parameter.vue
+++ b/manager/src/views/goods/goods-manage/parameter.vue
@@ -79,6 +79,9 @@
             <Checkbox label=1 v-model="paramForm.required">必填</Checkbox>
             <Checkbox label=1 v-model="paramForm.isIndex">可索引</Checkbox>
           </FormItem>
+          <FormItem label="排序" prop="specName3">
+            <Input type="number" v-model="paramForm.sort" style="width: 100%" />
+          </FormItem>
         </Form>
 
         <div slot="footer">
@@ -170,6 +173,7 @@ export default {
         options: "",
         required: false,
         isIndex: false,
+        sort: 0,
         groupId: group.groupId,
         categoryId: this.categoryId,
       };
@@ -186,9 +190,9 @@ export default {
         isIndex: param.isIndex==1?true:false,
         groupId: group.groupId,
         categoryId: this.categoryId,
+        sort: param.sort,
         id: param.id,
       };
-      console.warn(this.paramForm.options)
       this.ops = this.paramForm.options
       this.modalType = 1;
       this.modalTitle = "修改参数";
diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
index 91ff8ed0..cddc5413 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@@ -509,6 +509,7 @@ export default {
           isIndex: "",
           required: "",
           paramId: "",
+          sort: ""
         };
       }
       this.baseInfoForm.goodsParamsDTOList[groupIndex].goodsParamsItemDTOList[
@@ -519,6 +520,7 @@ export default {
         isIndex: params.isIndex,
         required: params.required,
         paramId: params.id,
+        sort: params.sort
       };
     },
     // 编辑sku图片

From 647ed90eace0e2c92e3a7fe62398c3c77eb8e500 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Fri, 3 Sep 2021 09:40:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BC=98=E5=8C=96=EF=BC=8C=E6=8B=BC=E5=9B=A2?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=BF=94=E5=9B=9E=E4=B8=8D=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/Cart.vue                      |   4 +-
 buyer/src/pages/payment/Pay.vue               | 158 +++++++++++++-----
 .../views/promotion/pintuan/pintuanGoods.vue  |   7 -
 3 files changed, 117 insertions(+), 52 deletions(-)

diff --git a/buyer/src/pages/Cart.vue b/buyer/src/pages/Cart.vue
index f46df18b..857a82b8 100644
--- a/buyer/src/pages/Cart.vue
+++ b/buyer/src/pages/Cart.vue
@@ -90,14 +90,14 @@
                 </div>
               </div>
               <div class="width_150">
-                {{ goods.goodsSku.price | unitPrice("￥") }}
+                {{ goods.purchasePrice | unitPrice("￥") }}
               </div>
               <div class="width_100">
                 <InputNumber :min="1" size="small" v-model="goods.num" @on-change="changeNum(goods.num, goods.goodsSku.id)"></InputNumber>
                 <div class="fontsize_12">{{goods.goodsSku.quantity > 0 ? '有货' : '无货'}}</div>
               </div>
               <div class="width_150">
-                {{ goods.num * goods.goodsSku.price | unitPrice("￥") }}
+                {{ goods.subTotal | unitPrice("￥") }}
               </div>
               <div class="width_100">
                 <span class="handle-btn" v-if="!goods.errorMessage" @click="delGoods(goods.goodsSku.id)">删除</span>
diff --git a/buyer/src/pages/payment/Pay.vue b/buyer/src/pages/payment/Pay.vue
index 812806f6..231b45d2 100644
--- a/buyer/src/pages/payment/Pay.vue
+++ b/buyer/src/pages/payment/Pay.vue
@@ -5,7 +5,7 @@
     <div class="width_1200 logo">
       <div>
         <router-link to="/"
-          ><img :src="$store.state.logoImg" alt="lili shop" title="lilishop"
+        ><img :src="$store.state.logoImg" alt="lili shop" title="lilishop"
         /></router-link>
         <div>结算页</div>
       </div>
@@ -23,7 +23,7 @@
         <span :class="stepIndex == 2 ? 'active' : ''">3.成功提交订单</span>
       </div>
     </div>
-    <Divider />
+    <Divider/>
     <div class="content width_1200">
       <!-- 收货地址 -->
       <div class="address">
@@ -46,8 +46,9 @@
               <span>{{ item.name }}</span>
               <Tag class="ml_10" v-if="item.isDefault" color="red">默认</Tag>
               <Tag class="ml_10" v-if="item.alias" color="warning">{{
-                item.alias
-              }}</Tag>
+                  item.alias
+                }}
+              </Tag>
             </div>
             <div>{{ item.mobile }}</div>
             <div>
@@ -59,16 +60,16 @@
                 class="ml_10"
                 v-if="!item.isDefault"
                 @click.stop="delAddress(item)"
-                >删除</span
+              >删除</span
               >
             </div>
             <div class="corner-icon" v-show="selectedAddress.id === item.id">
               <div></div>
-              <Icon type="md-checkmark" />
+              <Icon type="md-checkmark"/>
             </div>
           </div>
           <div class="add-address" @click="editAddress('')">
-            <Icon type="ios-add-circle-outline" />
+            <Icon type="ios-add-circle-outline"/>
             <div>添加新地址</div>
           </div>
         </div>
@@ -79,8 +80,8 @@
           v-if="addressList.length > 3"
         >
           {{ moreAddr ? "收起地址" : "更多地址" }}
-          <Icon v-show="!moreAddr" type="md-arrow-dropdown" />
-          <Icon v-show="moreAddr" type="md-arrow-dropup" />
+          <Icon v-show="!moreAddr" type="md-arrow-dropdown"/>
+          <Icon v-show="moreAddr" type="md-arrow-dropup"/>
         </div>
       </div>
       <!-- 商品信息 -->
@@ -97,8 +98,8 @@
           <div class="shop-name">
             <span>
               <span class="hover-color" @click="goShopPage(shop.storeId)">{{
-                shop.storeName
-              }}</span
+                  shop.storeName
+                }}</span
               >&nbsp;&nbsp;
             </span>
           </div>
@@ -114,19 +115,19 @@
                   goGoodsDetail(goods.goodsSku.id, goods.goodsSku.goodsId)
                 "
               >
-                <img :src="goods.goodsSku.thumbnail" alt="" />
+                <img :src="goods.goodsSku.thumbnail" alt=""/>
                 <span style="vertical-align: top">{{
-                  goods.goodsSku.goodsName
-                }}</span>
+                    goods.goodsSku.goodsName
+                  }}</span>
               </span>
               <span class="goods-price">{{
-                goods.goodsSku.price | unitPrice("￥")
-              }}</span>
+                  goods.purchasePrice | unitPrice("￥")
+                }}</span>
               <span>x{{ goods.num }}</span>
               <span>{{ goods.goodsSku.quantity > 0 ? "有货" : "无货" }}</span>
               <span class="goods-price">{{
-                (goods.goodsSku.price * goods.num) | unitPrice("￥")
-              }}</span>
+                  goods.subTotal | unitPrice("￥")
+                }}</span>
             </div>
           </div>
           <div class="order-mark">
@@ -138,7 +139,7 @@
               placeholder="订单备注"
             />
             <span style="font-size: 12px; color: #999"
-              >提示：请勿填写有关支付、收货、发票方面的信息</span
+            >提示：请勿填写有关支付、收货、发票方面的信息</span
             >
           </div>
         </div>
@@ -147,7 +148,7 @@
       <div class="invoice">
         <div class="card-head mt_20 mb_20">
           <span class="relative"
-            >发票信息<span class="inv-tips">
+          >发票信息<span class="inv-tips">
               <Icon
                 type="ios-alert-outline"
               />开企业抬头发票须填写纳税人识别号，以免影响报销
@@ -177,18 +178,18 @@
                 <span
                   v-if="item.couponType === 'PRICE'"
                   class="fontsize_12 global_color"
-                  >￥<span class="price">{{
+                >￥<span class="price">{{
                     item.price | unitPrice
                   }}</span></span
                 >
                 <span
                   v-if="item.couponType === 'DISCOUNT'"
                   class="fontsize_12 global_color"
-                  ><span class="price">{{ item.discount }}</span
-                  >折</span
+                ><span class="price">{{ item.discount }}</span
+                >折</span
                 >
                 <span class="describe"
-                  >满{{ item.consumeThreshold }}元可用</span
+                >满{{ item.consumeThreshold }}元可用</span
                 >
               </div>
               <p>使用范围：{{ useScope(item.scopeType) }}</p>
@@ -206,7 +207,7 @@
               class="c-right"
               v-if="usedCouponId.includes(item.id)"
               @click="useCoupon(item.id, false)"
-              >放弃优惠</a
+            >放弃优惠</a
             >
             <i class="circle-top"></i>
             <i class="circle-bottom"></i>
@@ -219,21 +220,27 @@
           <span>{{ totalNum }}件商品，总商品金额：</span
           ><span>{{ priceDetailDTO.goodsPrice | unitPrice("￥") }}</span>
         </div>
-        <div>
+        <div v-if="priceDetailDTO.freightPrice>0">
           <span>运费：</span
           ><span>{{ priceDetailDTO.freightPrice | unitPrice("￥") }}</span>
         </div>
-        <div>
+        <div v-if="priceDetailDTO.discountPrice>0">
           <span>优惠金额：</span
           ><span
-            >-{{
-              (priceDetailDTO.discountPrice +
-                priceDetailDTO.couponPrice +
-                priceDetailDTO.updatePrice)
-                | unitPrice("￥")
-            }}</span
-          >
+        >-{{
+            priceDetailDTO.discountPrice | unitPrice("￥")
+          }}</span
+        >
         </div>
+        <div v-if="priceDetailDTO.couponPrice>0">
+          <span>优惠券金额：</span
+          ><span
+        >-{{
+            priceDetailDTO.couponPrice | unitPrice("￥")
+          }}</span
+        >
+        </div>
+
         <div v-if="$route.query.way === 'POINTS'">
           <span>应付积分：</span
           ><span class="actrual-price">{{
@@ -277,7 +284,7 @@
 <script>
 import invoiceModal from '@/components/invoiceModal';
 import addressManage from '@/components/addressManage';
-import { memberAddress, delMemberAddress } from '@/api/address';
+import {memberAddress, delMemberAddress} from '@/api/address';
 import {
   cartGoodsPay,
   createTrade,
@@ -285,10 +292,11 @@ import {
   selectCoupon,
   couponNum
 } from '@/api/cart';
-import { canUseCouponList } from '@/api/member.js';
+import {canUseCouponList} from '@/api/member.js';
+
 export default {
   name: 'Pay',
-  components: { invoiceModal, addressManage },
+  components: {invoiceModal, addressManage},
   data () {
     return {
       stepIndex: 1, // 顶部步骤条状态
@@ -341,7 +349,7 @@ export default {
     getGoodsDetail () {
       // 订单商品详情
       this.$Spin.show();
-      cartGoodsPay({ way: this.$route.query.way })
+      cartGoodsPay({way: this.$route.query.way})
         .then((res) => {
           this.$Spin.hide();
           if (res.success) {
@@ -385,7 +393,7 @@ export default {
     },
     getCouponNum () {
       // 获取可用优惠券数量
-      couponNum({ way: this.$route.query.way }).then((res) => {
+      couponNum({way: this.$route.query.way}).then((res) => {
         this.canUseCouponNum = res.result;
         if (res.result) {
           let storeArr = [];
@@ -459,14 +467,15 @@ export default {
             }
           });
         },
-        onCancel: () => {}
+        onCancel: () => {
+        }
       });
     },
     goGoodsDetail (skuId, goodsId) {
       // 跳转商品详情
       let routeUrl = this.$router.resolve({
         path: '/goodsDetail',
-        query: { skuId, goodsId }
+        query: {skuId, goodsId}
       });
       window.open(routeUrl.href, '_blank');
     },
@@ -474,7 +483,7 @@ export default {
     goShopPage (id) {
       let routeUrl = this.$router.resolve({
         path: '/Merchant',
-        query: { id: id }
+        query: {id: id}
       });
       window.open(routeUrl.href, '_blank');
     },
@@ -529,7 +538,7 @@ export default {
             } else {
               this.$router.push({
                 path: '/payment',
-                query: { orderType: 'TRADE', sn: res.result.sn }
+                query: {orderType: 'TRADE', sn: res.result.sn}
               });
             }
           }
@@ -567,30 +576,36 @@ export default {
   justify-content: space-between;
   align-items: center;
   margin: 20px auto 0;
+
   div:nth-child(1) {
     display: flex;
     justify-content: space-between;
     align-items: center;
+
     img {
       width: 150px;
       height: auto;
       cursor: pointer;
     }
+
     div:nth-child(2) {
       width: 200px;
       color: #999;
       font-size: 16px;
       margin: 0 20px;
+
       span {
         color: $theme_color;
       }
     }
   }
 }
+
 .cart-steps {
   height: 30px;
   display: flex;
   align-items: center;
+
   span {
     @include content_color($light_content_color);
     height: 30px;
@@ -616,6 +631,7 @@ export default {
     color: #ff8f23;
   }
 }
+
 /** logo end */
 /** content start */
 .content {
@@ -624,10 +640,12 @@ export default {
   min-height: 200px;
   padding: 15px 25px;
 }
+
 /** 地址管理 */
 .address-manage {
   display: flex;
   flex-wrap: wrap;
+
   > div {
     border: 1px dotted #949494;
     width: 265px;
@@ -637,47 +655,58 @@ export default {
     cursor: pointer;
     color: #999;
   }
+
   .add-address {
     display: flex;
     align-items: center;
     justify-content: center;
     flex-direction: column;
+
     .ivu-icon {
       font-size: 24px;
     }
   }
+
   .address-item {
     position: relative;
     font-size: 12px;
+
     > div:nth-child(1) {
       margin-bottom: 10px;
+
       span {
         margin-right: 10px;
       }
+
       > span:nth-child(1) {
         color: #000000;
         font-size: 14px;
       }
     }
+
     .edit-btn {
       font-size: 12px;
       position: absolute;
       top: 15px;
       right: 20px;
       color: $theme_color;
+
       span:hover {
         border-bottom: 1px solid $theme_color;
       }
     }
+
     .corner-icon {
       position: absolute;
       right: -1px;
       bottom: -1px;
+
       div {
         width: 0;
         border-top: 20px solid transparent;
         border-right: 20px solid $theme_color;
       }
+
       .ivu-icon {
         font-size: 12px;
         position: absolute;
@@ -688,29 +717,36 @@ export default {
       }
     }
   }
+
   .border-red {
     border-color: $theme_color;
   }
 }
+
 /** 购买商品列表 start */
 .shop-name {
   display: flex;
   justify-content: space-between;
+
   > span:nth-child(1) {
     font-weight: bold;
+
     .ivu-icon {
       color: #ff8f23;
+
       &:hover {
         color: $theme_color;
       }
     }
   }
+
   > span:nth-child(2) {
     color: #999;
     position: relative;
     display: flex;
     width: 200px;
   }
+
   .delivery-list {
     position: absolute;
     right: 0;
@@ -722,19 +758,23 @@ export default {
     width: 200px;
     min-height: 100px;
     padding: 10px;
+
     li {
       width: 90px;
       height: 30px;
       text-align: center;
+
       &:hover {
         cursor: pointer;
       }
     }
   }
 }
+
 .goods-list {
   background-color: #f8f8f8;
   margin: 10px 0 20px 0;
+
   .goods-item {
     display: flex;
     align-items: center;
@@ -742,34 +782,42 @@ export default {
     padding: 20px 0;
     margin: 0 20px;
     border-bottom: 1px dotted #999;
+
     &:last-child {
       border: none;
     }
+
     img {
       width: 48px;
       height: 48px;
     }
+
     > span {
       text-align: center;
       width: 100px;
     }
+
     > span:nth-child(1) {
       font-size: 12px;
       flex: 1;
       text-align: left;
     }
+
     > span:last-child {
       color: $theme_color;
       font-weight: bold;
     }
+
     .goods-price {
       font-size: 16px;
     }
   }
 }
+
 .order-mark {
   width: 500px;
 }
+
 /** 购买商品列表 end */
 /** 发票信息 start */
 .invoice {
@@ -781,6 +829,7 @@ export default {
     margin: 0 0 0 10px;
     font-size: 12px !important;
     box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+
     &::before {
       content: "";
       display: inline-block;
@@ -791,6 +840,7 @@ export default {
       position: absolute;
       left: -9px;
     }
+
     .ivu-icon {
       color: #ff8f23;
       margin-right: 3px;
@@ -798,19 +848,23 @@ export default {
       font-weight: bold;
     }
   }
+
   .inovice-content {
     > span {
       margin-right: 10px;
     }
+
     > span:last-child {
       color: $theme_color;
       cursor: pointer;
+
       &:hover {
         border-bottom: 1px solid $theme_color;
       }
     }
   }
 }
+
 /** 发票信息 end */
 
 /** 订单价格 */
@@ -819,18 +873,21 @@ export default {
   margin-top: 30px;
   font-size: 16px;
   color: #999;
+
   > div > span:nth-child(2) {
     width: 130px;
     text-align: right;
     display: inline-block;
     margin-top: 10px;
   }
+
   .actrual-price {
     color: $theme_color;
     font-weight: bold;
     font-size: 20px;
   }
 }
+
 /** content end */
 /** 底部支付栏 */
 .order-footer {
@@ -842,11 +899,14 @@ export default {
   flex-direction: row-reverse;
   border-top: 1px solid #ddd;
   margin: 10px auto;
+
   div {
     text-align: center;
   }
+
   position: sticky;
   bottom: 0;
+
   .pay {
     background-color: $theme_color;
     width: 150px;
@@ -857,6 +917,7 @@ export default {
     cursor: pointer;
   }
 }
+
 /** 公共表头 */
 .card-head {
   display: flex;
@@ -868,44 +929,54 @@ export default {
   span:nth-child(1) {
     font-size: 18px;
   }
+
   span:nth-child(2) {
     font-size: 12px;
     color: #438cde;
     cursor: pointer;
+
     &:hover {
       color: $theme_color;
     }
   }
 }
+
 .ivu-divider {
   background: $theme_color;
   height: 2px;
 }
+
 .pay-address {
   font-size: 12px;
 }
+
 .more-addr {
   cursor: pointer;
   margin-top: 10px;
   display: inline-block;
 }
+
 .coupon-item {
   width: 260px;
   height: 125px;
   margin-right: 10px;
   margin-bottom: 10px;
+
   .c-right {
     width: 30px;
     padding: 10px 7px;
   }
+
   b {
     background: url("../../assets/images/small-circle.png") top left repeat-y;
     right: 28px;
   }
+
   .circle-top,
   .circle-bottom {
     right: 22px;
   }
+
   .used {
     position: absolute;
     top: 60px;
@@ -914,6 +985,7 @@ export default {
     height: 50px;
   }
 }
+
 .coupon-list {
   max-height: 260px;
   overflow: scroll;
diff --git a/seller/src/views/promotion/pintuan/pintuanGoods.vue b/seller/src/views/promotion/pintuan/pintuanGoods.vue
index 74bd01dd..a2165a37 100644
--- a/seller/src/views/promotion/pintuan/pintuanGoods.vue
+++ b/seller/src/views/promotion/pintuan/pintuanGoods.vue
@@ -285,13 +285,6 @@ export default {
   mounted () {
     this.init();
   },
-  // 如果是从详情页返回列表页，修改列表页keepAlive为true，确保不刷新页面
-  beforeRouteLeave(to, from, next){
-    if(to.name === 'pintuan') {
-      to.meta.keepAlive = true
-    }
-    next()
-  }
 };
 </script>
 <style lang="scss" scoped>