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

buyer/src/components/Search.vue

@@ -97,13 +97,11 @@ export default {
       const time = new Date().getTime() - 5 * 60 * 1000
       if (!reloadTime) {
         hotWords({count: 5}).then(res => {
-          console.log(res);
           if (res.success && res.result) storage.setItem('hotWordsList', res.result)
         })
         storage.setItem('hotWordsReloadTime', new Date().getTime())
       } else if (reloadTime && time > reloadTime) {
         hotWords({count: 5}).then(res => {
-          console.log(res);
           if (res.success && res.result) storage.setItem('hotWordsList', res.result)
         })
         storage.setItem('hotWordsReloadTime', new Date().getTime())

buyer/src/components/goodsDetail/ShowGoods.vue

@@ -556,9 +556,6 @@ export default {
 }
 
 .item-select-row {
-  // display: flex;
-  // flex-direction: row;
-  // flex-wrap: wrap;
   margin-bottom: 8px;
 }
 
@@ -568,10 +565,6 @@ export default {
   align-items: center;
 }
 
-.item-select-img {
-  width: 36px;
-}
-
 .item-select-box {
   padding: 5px;
   margin-right: 8px;
@@ -589,31 +582,11 @@ export default {
   border: 0.5px solid $theme_color;
 }
 
-.item-select-box-disabled {
-  background-color: gray;
-}
-
-.item-select-img img {
-  width: 100%;
-}
-
 .item-select-intro p {
   margin: 0px;
   padding: 5px;
 }
 
-.item-select-class {
-  padding: 5px;
-  margin-right: 8px;
-  @include sub_background_color($light_background_color);
-  border: 0.5px solid #ccc;
-  cursor: pointer;
-}
-
-.item-select-class:hover {
-  border: 0.5px solid $theme_color;
-}
-
 .add-buy-car-box {
   width: 100%;
   margin-top: 15px;

buyer/src/config/index.js

@@ -17,10 +17,10 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    // common: 'http://192.168.0.101:8890',
+    // common: 'http://192.168.0.100:8890',
-    // buyer: 'http://192.168.0.101:8888',
+    // buyer: 'http://192.168.0.100:8888',
-    // seller: 'http://192.168.0.101:8889',
+    // seller: 'http://192.168.0.100:8889',
-    // manager: 'http://192.168.0.101:8887'
+    // manager: 'http://192.168.0.100:8887'
 
     common: 'https://common-api.pickmall.cn',
     buyer: 'https://buyer-api.pickmall.cn',

buyer/src/pages/Cart.vue

@@ -117,7 +117,7 @@
               已节省<span>{{ priceDetailDTO.discountPrice | unitPrice("￥") }}</span>
             </div>
             <div class="ml_20 total-price">
-              总价（不含运费）:<div>{{ priceDetailDTO.billPrice | unitPrice("￥") }}</div>
+              总价（不含运费）:<div>{{ priceDetailDTO.flowPrice | unitPrice("￥") }}</div>
             </div>
             <div class="pay ml_20" @click="pay">去结算</div>
           </div>

buyer/src/pages/home/memberCenter/Point.vue

@@ -8,7 +8,7 @@
     <h3>积分日志</h3>
     <Table :columns="logColumns" :data="logData.records">
       <template slot-scope="{ row }" slot="point">
-        <div><span>{{row.pointType == "INCREASE" ? '+' : '-'}}</span>{{ row.variablePoint }}</div>
+        <div :style="{color:row.pointType === 'INCREASE' ? 'green' : 'red'}"><span>{{row.pointType === "INCREASE" ? '+' : ''}}</span>{{ row.variablePoint }}</div>
       </template>
     </Table>
     <!-- 分页 -->

buyer/src/pages/home/orderCenter/AfterSale.vue

@@ -50,10 +50,12 @@
             </div>
             <div>
               <!-- 订单基础操作 -->
-              <Button @click="goDetail(order.sn)" size="small">售后详情</Button>
+              <Button @click="goDetail(order.sn)" type="info" size="small">售后详情</Button>
-              <Button @click="openModal(order)" v-if="order.serviceStatus == 'PASS' &&
+              <Button @click="openModal(order)"
-                  order.serviceType != 'RETURN_MONEY'" size="small">提交物流</Button>
+                v-if="order.serviceStatus == 'PASS' &&
-              <Button @click="cancel(order.sn)" v-if="order.afterSaleAllowOperationVO.cancel" size="small">取消售后</Button>
+                order.serviceType != 'RETURN_MONEY'"
+                type="warning" size="small">提交物流</Button>
+              <Button @click="cancel(order.sn)" type="error" v-if="order.afterSaleAllowOperationVO.cancel" size="small">取消售后</Button>
             </div>
           </div>
         </div>

buyer/src/pages/home/orderCenter/MyOrder.vue

@@ -65,10 +65,10 @@
           </div>
           <div>
             <!-- 订单基础操作 -->
-            <Button @click="orderDetail(order.sn)" size="small">订单详情</Button>
+            <Button @click="orderDetail(order.sn)" type="info" size="small">订单详情</Button>
-            <Button @click="handleCancelOrder(order.sn)" v-if="order.allowOperationVO.cancel" size="small">取消订单</Button>
+            <Button @click="handleCancelOrder(order.sn)" type="error" v-if="order.allowOperationVO.cancel" size="small">取消订单</Button>
-            <Button @click="goPay(order.sn)" size="small" v-if="order.allowOperationVO.pay">去支付</Button>
+            <Button @click="goPay(order.sn)" size="small" type="success" v-if="order.allowOperationVO.pay">去支付</Button>
-            <Button @click="received(order.sn)" size="small" v-if="order.allowOperationVO.rog">确认收货</Button>
+            <Button @click="received(order.sn)" size="small" type="warning" v-if="order.allowOperationVO.rog">确认收货</Button>
             <!-- 售后 -->
             <Button v-if="order.groupAfterSaleStatus.includes('NOT_APPLIED')" @click="applyAfterSale(order.orderItems)" size="small">申请售后</Button>
           </div>

buyer/src/pages/payment/Pay.vue

@@ -213,29 +213,6 @@
           </li>
         </ul>
       </div>
-      <!-- 其他信息 -->
-      <div class="other" v-if="$route.query.way === 'POINT'">
-        <div class="card-head mt_20 mb_20">
-          <span>其他信息</span>
-        </div>
-        <div>
-          <div>
-            <span>使用积分：</span
-            ><Input
-              type="text"
-              style="width: 100px"
-              v-model.number="otherMsgForm.point"
-              placeholder="请输入使用积分"
-            />
-            <span style="color: #999"
-              >您当前的可用积分为
-              {{ otherMsgForm.totalPoint }} ，本订单最多可以使用{{
-                otherMsgForm.availablePoint
-              }}</span
-            >
-          </div>
-        </div>
-      </div>
       <!-- 订单价格 -->
       <div class="order-price">
         <div>
@@ -257,7 +234,13 @@
             }}</span
           >
         </div>
-        <div>
+        <div v-if="$route.query.way === 'POINTS'">
+          <span>应付积分：</span
+          ><span class="actrual-price">{{
+            priceDetailDTO.payPoint
+          }}</span>
+        </div>
+        <div v-else>
           <span>应付金额：</span
           ><span class="actrual-price">{{
             priceDetailDTO.flowPrice | unitPrice("￥")
@@ -299,7 +282,6 @@ import {
   cartGoodsPay,
   createTrade,
   selectAddr,
-  shippingMethod,
   selectCoupon,
   couponNum
 } from '@/api/cart';
@@ -318,13 +300,6 @@ export default {
         receiptTitle: '个人',
         receiptContent: '不开发票'
       },
-      otherMsgForm: {
-        // 其他信息模块数据
-        point: 0,
-        availablePoint: 10,
-        totalPoint: 100,
-        noGoods: 0
-      },
       addressList: [], // 地址列表
       selectedAddress: {}, // 所选地址
       goodsList: [], // 商品列表
@@ -549,11 +524,15 @@ export default {
         .then((res) => {
           this.$Spin.hide();
           if (res.success) {
+            if (params.way === 'POINTS') { // 积分支付不需要跳转支付页面
+              this.$router.push('/payDone')
+            } else {
               this.$router.push({
                 path: '/payment',
                 query: { orderType: 'TRADE', sn: res.result.sn }
               });
             }
+          }
         })
         .catch(() => {
           this.$Spin.hide();

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
+          <div class="item-detail-img-small">
-            class="item-detail-img-small"
+            <img :src="goodsSku.thumbnail" />
-            @mouseover="imgIndex = index"
-            v-for="(item, index) in imgList"
-            :key="index"
-          >
-            <img :src="item.url" />
           </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>
+          <p>{{ goodsSku.goodsName }}</p>
-            {{ skuDetail.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-title">积 &nbsp;&nbsp;&nbsp;&nbsp;分</span>
-                <span class="item-price">{{skuDetail.price | unitPrice("￥")}}</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>
+              <InputNumber :min="1" :disabled="goodsSku.quantity === 0" v-model="count"></InputNumber>
-              <span class="inventory"> 库存{{skuDetail.quantity}}</span>
+              <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>
@@ -106,6 +81,7 @@
 <script>
 import Search from '@/components/Search';
 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) { // 跳转商品列表
+    pointBuy () {
-      const arr = []
+      const params = {
-      this.categoryBar.forEach((e, index) => {
+        num: this.count,
-        if (index <= currIndex) {
+        skuId: this.goodsMsg.skuId,
-          arr.push(e.id)
+        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);
         }
-      })
+      }).catch(() => {
-      return location.origin + '/goodsList?categoryId=' + arr.toString()
+        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">{{
+            <span class="seckill-price text-danger">{{item.points}}积分</span>
-              item.settlementPrice | unitPrice("￥")
-            }} + {{item.points}}积分</span>
           </span>
         </div>
         <div class="goods-show-detail">

buyer/src/pages/shopEntry/FirstApply.vue

@@ -229,8 +229,8 @@ export default {
         ],
         linkName: [{ required: true, message: '请填写联系人姓名' }],
         linkPhone: [
-          { required: true, message: '请填写联系人姓名' },
+          { required: true, message: '请填写公司电话' },
-          { pattern: RegExp.mobile, message: '请填写正确手机号' }
+          { pattern: RegExp.mobile, message: '请填写正确的号码' }
         ],
         companyEmail: [
           { required: true, message: '请填写电子邮箱' },

manager/src/config/index.js

@@ -17,14 +17,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",
+    buyer: "https://buyer-api.pickmall.cn",
-    // seller: "https://store-api.pickmall.cn",
+    seller: "https://store-api.pickmall.cn",
-    // manager: "https://admin-api.pickmall.cn"
+    manager: "https://admin-api.pickmall.cn"
-    common: 'http://192.168.0.100:8890',
+    // common: 'http://192.168.0.100:8890',
-    buyer: 'http://192.168.0.100:8888',
+    // buyer: 'http://192.168.0.100:8888',
-    seller: 'http://192.168.0.100:8889',
+    // seller: 'http://192.168.0.100:8889',
-    manager: 'http://192.168.0.100:8887'
+    // manager: 'http://192.168.0.100:8887'
   },
   api_prod: {
     common: "https://common-api.pickmall.cn",

manager/src/views/member/list/memberDetail.vue

@@ -42,7 +42,7 @@
           </p>
           <p class="item">
             <span class="label">性别：</span>
-            <span v-if="memberInfo.sex==1" class="info">男</span>
+            <span v-if="memberInfo.sex===1" class="info">男</span>
             <span v-else class="info">女</span>
           </p>
           <p class="item">
@@ -414,7 +414,6 @@
             key: "beforePoint",
             width: 150,
           },
-
           {
             title: "变动积分",
             key: "variablePoint",
@@ -434,10 +433,9 @@
                     style: {
                       color: 'red'
                     }
-                  }, "-" + params.row.variablePoint),
+                  }, params.row.variablePoint),
                 ]);
               }
-
             }
           },
           {
@@ -483,7 +481,6 @@
               } else if (params.row.orderType == "PINTUAN") {
                 return h('div', [h('span', {}, '拼团订单'),]);
               }
-
             }
           },
           {
@@ -538,7 +535,6 @@
               }
             }
           },
-
           {
             title: "售后状态",
             key: "groupAfterSaleStatus",

manager/src/views/member/point/point.vue

@@ -106,7 +106,7 @@
                     style: {
                       color: 'red'
                     }
-                  }, "-" + params.row.variablePoint),
+                  }, params.row.variablePoint),
                 ]);
               }
 

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",
+    // buyer: "https://buyer-api.pickmall.cn",
-    seller: "https://store-api.pickmall.cn",
+    // seller: "https://store-api.pickmall.cn",
-    manager: "https://admin-api.pickmall.cn"
+    // manager: "https://admin-api.pickmall.cn"
-    // common: 'http://192.168.0.100:8890',
+    common: 'http://192.168.0.100:8890',
-    // buyer: 'http://192.168.0.100:8888',
+    buyer: 'http://192.168.0.100:8888',
-    // seller: 'http://192.168.0.100:8889',
+    seller: 'http://192.168.0.100:8889',
-    // manager: 'http://192.168.0.100:8887'
+    manager: 'http://192.168.0.100:8887'
   },
   api_prod: {
     common: "https://common-api.pickmall.cn",