积分商品流程完成，billpirce改为flowprice，必填项提示错误

buyer/src/pages/promotion/PointGoodsDetail.vue

@@ -1,12 +1,12 @@
 <template>
   <div style="background:#fff;">
     <BaseHeader></BaseHeader>
-    <Search></Search>
+    <Search style="border-bottom:2px solid red;"></Search>
     <!-- <drawer></drawer> -->
     <div class="base-width cate-container">
       <Breadcrumb>
         <BreadcrumbItem to="/">首页</BreadcrumbItem>
-        <BreadcrumbItem v-for="(item, index) in categoryBar" :to="goGoodsList(index)" target="_blank" :key="index">{{item.name}}</BreadcrumbItem>
+        <BreadcrumbItem>{{goodsMsg.pointsGoodsCategoryName}}</BreadcrumbItem>
       </Breadcrumb>
     </div>
     <!-- 商品信息展示 -->
@@ -15,87 +15,62 @@
       <div class="item-detail-left">
         <!-- 大图、放大镜 -->
         <div class="item-detail-big-img">
-          <pic-zoom :url="imgList[imgIndex].url" :scale="2"></pic-zoom>
+          <pic-zoom v-if="goodsSku.thumbnail" :url="goodsSku.thumbnail" :scale="2"></pic-zoom>
         </div>
         <div class="item-detail-img-row">
-          <div
-            class="item-detail-img-small"
-            @mouseover="imgIndex = index"
-            v-for="(item, index) in imgList"
-            :key="index"
-          >
-            <img :src="item.url" />
+          <div class="item-detail-img-small">
+            <img :src="goodsSku.thumbnail" />
           </div>
         </div>
-
-        <div class="goodsConfig mt_10">
-          <span @click="collect" ><Icon type="ios-heart" :color="isCollected ? '#ed3f14' : '#666'" />{{isCollected?'已收藏':'收藏'}}</span>
-        </div>
       </div>
       <!-- 右侧商品信息、活动信息、操作展示 -->
       <div class="item-detail-right">
         <div class="item-detail-title">
-          <p>
-            {{ skuDetail.goodsName }}
-          </p>
+          <p>{{ goodsSku.goodsName }}</p>
         </div>
         <div class="sell-point">
-          {{skuDetail.sellingPoint}}
+          {{goodsSku.sellingPoint}}
         </div>
-        <!-- 商品详细 价格、优惠券、促销 -->
+        <!-- 商品详细 -->
         <div class="item-detail-price-row">
           <div class="item-price-left">
             <!-- 商品原价 -->
-            <div class="item-price-row" v-if="!skuDetail.promotionPrice">
+            <div class="item-price-row">
               <p>
-                <span class="item-price-title">价 &nbsp;&nbsp;&nbsp;&nbsp;格</span>
-                <span class="item-price">{{skuDetail.price | unitPrice("￥")}}</span>
+                <span class="item-price-title">积 &nbsp;&nbsp;&nbsp;&nbsp;分</span>
+                <span class="item-price">{{goodsMsg.points}}</span>
               </p>
             </div>
-        </div>
-        <!-- 选择规格 -->
-        <div class="item-select" v-for="(sku, index) in formatList" :key="sku.name">
-          <div class="item-select-title">
-            <p>{{ sku.name }}</p>
-          </div>
-          <div class="item-select-column">
-            <div class="item-select-row" v-for="(item) in sku.values" :key="item.value">
-              <div class="item-select-box" @click="select(index, item.value)"
-                :class="{ 'item-select-box-active': item.value === currentSelceted[index] }"
-              >
-                <div class="item-select-intro">
-                  <p>{{ item.value }}</p>
-                </div>
-              </div>
-            </div>
           </div>
         </div>
-        <br />
         <div class="add-buy-car-box">
           <div class="item-select">
             <div class="item-select-title">
               <p>数量</p>
             </div>
             <div class="item-select-row">
-              <InputNumber :min="1" :disabled="skuDetail.quantity === 0" v-model="count"></InputNumber>
-              <span class="inventory"> 库存{{skuDetail.quantity}}</span>
+              <InputNumber :min="1" :disabled="goodsSku.quantity === 0" v-model="count"></InputNumber>
+              <span class="inventory"> 库存{{goodsSku.quantity}}</span>
             </div>
           </div>
-          <div class="item-select" v-if="skuDetail.goodsType !== 'VIRTUAL_GOODS' && skuDetail.weight !== 0">
+          <div class="item-select" v-if="goodsSku.goodsType !== 'VIRTUAL_GOODS' && goodsSku.weight !== 0">
             <div class="item-select-title">
               <p>重量</p>
             </div>
             <div class="item-select-row">
-              <span class="inventory"> {{skuDetail.weight}}kg</span>
+              <span class="inventory"> {{goodsSku.weight}}kg</span>
             </div>
           </div>
+          <div class="add-buy-car">
+            <Button type="error" :loading="loading" :disabled="goodsSku.quantity === 0" @click="pointBuy">积分购买</Button>
+          </div>
         </div>
       </div>
     </div>
     <!-- 商品详情 -->
     <div class="base-width item-intro" ref="itemIntroGoods">
       <div>商品介绍</div>
-      <div v-html="goodsSku.intro" v-if="goodsSku.intro"></div>
+      <div v-html="goodsSku.intro" class="mt_10 ml_10" v-if="goodsSku.intro"></div>
       <div v-else style="margin:20px;">暂无商品介绍</div>
     </div>
     <Spin size="large" fix v-if="isLoading"></Spin>
@@ -105,7 +80,8 @@
 
 <script>
 import Search from '@/components/Search';
-import PicZoom from 'vue-piczoom'; 
+import PicZoom from 'vue-piczoom';
+import { addCartGoods } from '@/api/cart.js';
 import { pointGoodsDetail } from '@/api/promotion';
 export default {
   name: 'PointGoodsDetail',
@@ -125,7 +101,9 @@ export default {
       goodsSku: {}, // 商品sku
       isLoading: false, // 加载状态
       categoryBar: [], // 分类
-      onceFlag: true // 只调用一次
+      onceFlag: true, // 只调用一次
+      count: 1, // 购买商品数量
+      loading: false // 提交加载状态
     };
   },
   methods: {
@@ -139,28 +117,43 @@ export default {
           this.goodsSku = res.result.goodsSku
         } else {
           this.$Message.error(res.message)
-          // this.$router.push('/')
+          this.$router.push('/')
         }
       }).catch(() => {
-        // this.$router.push('/')
+        this.$router.push('/')
       });
     },
-    goGoodsList (currIndex) { // 跳转商品列表
-      const arr = []
-      this.categoryBar.forEach((e, index) => {
-        if (index <= currIndex) {
-          arr.push(e.id)
+    pointBuy () {
+      const params = {
+        num: this.count,
+        skuId: this.goodsMsg.skuId,
+        cartType: 'POINTS'
+      };
+      this.loading = true;
+      addCartGoods(params).then(res => {
+        this.loading = false;
+        if (res.success) {
+          this.$router.push({path: '/pay', query: {way: params.cartType}});
+        } else {
+          this.$Message.warning(res.message);
         }
-      })
-      return location.origin + '/goodsList?categoryId=' + arr.toString()
+      }).catch(() => {
+        this.loading = false;
+      });
     },
     handleScroll () { // 监听页面滚动
       if (this.onceFlag) {
         this.$nextTick(() => {
-          this.changeHeight('itemIntroGoods')
+          this.changeHeight()
         });
         this.onceFlag = false
       }
+    },
+    changeHeight () { // 设置商品详情高度
+      let goodsDetailCon = document.querySelector('.item-intro')
+      let heightCss = window.getComputedStyle(goodsDetailCon).height;
+      heightCss = parseInt(heightCss.substr(0, heightCss.length - 2)) + 89;
+      this.$refs.itemIntroGoods.style.height = heightCss + 'px';
     }
   },
   components: {
@@ -174,9 +167,178 @@ export default {
   margin: 0 auto;
   position: relative;
 }
-.cate-container {
-  
+.cate-container{
+  background-color: #eee;
+  height: 30px;
+  line-height: 30px;
+  padding-left: 10px;
+  margin-top: 10px;
 }
+// 商品图片，价格等
+.item-detail-show {
+  width: 1200px;
+  margin: 0 auto;
+  padding: 30px;
+  display: flex;
+  flex-direction: row;
+}
+.item-detail-left {
+  width: 350px;
+  margin-right: 30px;
+}
+
+.item-detail-big-img {
+  width: 350px;
+  height: 350px;
+  box-shadow: 0px 0px 8px $border_color;
+  cursor: pointer;
+  img {
+    width: 100%;
+  }
+}
+
+.item-detail-img-row {
+  margin-top: 15px;
+  display: flex;
+}
+
+.item-detail-img-small {
+  width: 68px;
+  height: 68px;
+  box-shadow: 0px 0px 8px #ccc;
+  cursor: pointer;
+  margin-left: 5px;
+  img {
+    height: 100%;
+    width: 100%;
+  }
+}
+/*商品选购详情*/
+.item-detail-right {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+
+.item-detail-title p {
+  @include content_color($light_content_color);
+  font-weight: bold;
+  font-size: 20px;
+  padding: 8px 0;
+}
+
+.item-detail-express {
+  font-size: 14px;
+  padding: 2px 3px;
+  border-radius: 3px;
+  background-color: $theme_color;
+  color: #fff;
+}
+
+/*商品标签*/
+.item-detail-tag {
+  padding: 8px 0;
+  font-size: 12px;
+  color: $theme_color;
+}
+
+/*价格详情等*/
+.item-detail-price-row {
+  padding: 10px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  background: url("../../assets/images/goodsDetail/price-bg.png");
+}
+
+.item-price-left {
+  display: flex;
+  flex-direction: column;
+}
+
+.item-price-title {
+  color: #999999;
+  font-size: 14px;
+  margin-right: 15px;
+}
+
+.item-price-row {
+  margin: 5px 0px;
+}
+
+.item-price {
+  color: $theme_color;
+  font-size: 20px;
+  cursor: pointer;
+}
+.item-price-old {
+  color: gray;
+  text-decoration: line-through;
+  font-size: 14px;
+  margin-left: 5px;
+}
+.add-buy-car-box {
+  width: 100%;
+  margin-top: 15px;
+  border-top: 1px dotted $border_color;
+}
+
+.add-buy-car {
+  margin-top: 15px;
+}
+.item-select {
+  display: flex;
+  flex-direction: row;
+  margin-top: 15px;
+}
+
+.item-select-title {
+  @include content_color($light_content_color);
+  font-size: 14px;
+  margin-right: 15px;
+  width: 60px;
+}
+
+.item-select-column {
+  display: flex;
+  flex-wrap: wrap;
+  flex: 1;
+}
+
+.item-select-row {
+  margin-bottom: 8px;
+}
+
+.item-select-box {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  padding: 5px;
+  margin-right: 8px;
+  @include background_color($light_background_color);
+  border: 0.5px solid $border_color;
+  cursor: pointer;
+  @include content_color($light_content_color);
+}
+
+.item-select-box:hover {
+  border: 0.5px solid $theme_color;
+}
+
+.item-select-box-active {
+  border: 0.5px solid $theme_color;
+}
+
+.item-select-intro p {
+  margin: 0px;
+  padding: 5px;
+}
+.sell-point {
+  font-size: 12px;
+  color: red;
+  margin-bottom: 5px;
+}
+// 商品详情
 .item-intro {
   margin-top: 10px;
   >div:nth-child(1) {

buyer/src/pages/promotion/PointMall.vue

@@ -22,9 +22,7 @@
         </div>
         <div class="goods-show-price">
           <span>
-            <span class="seckill-price text-danger">{{
-              item.settlementPrice | unitPrice("￥")
-            }} + {{item.points}}积分</span>
+            <span class="seckill-price text-danger">{{item.points}}积分</span>
           </span>
         </div>
         <div class="goods-show-detail">