update

src/api/apiconfig/order.js

@@ -206,7 +206,13 @@ export const transferSubmitOrder = {
 		return { delivery, number, province, tranId, uaddress, uname, uphone }
 	}
 }
-
+//盲盒下单
+export const BlindBoxSubmitOrder = {
+	url: "/order/blindBox/createOrder",
+	dealReqData: ({ delivery=0, province, tranId, uaddress, uname, uphone,goodsId }) => {
+		return { delivery, province, tranId, uaddress, uname, uphone,goodsId }
+	}
+}
 // 转让商品支付
 export const submitTransferPay = {
 	url: "/tran/order/pay",

src/enums/goods.js

@@ -14,7 +14,12 @@ export const GoodsType = {
     // 转让商品
     TRANSFER: 999
 }
-
+export const SalesType={
+    // 普通
+    NORMAL: 1,
+    //盲盒
+    BLINDBOX:4
+}
 export const GoodsTypeObj = {
     [GoodsType.NORMAL]: {
         detailApi: 'getGoodsDetail',

src/enums/order.js

-
+import {SalesType} from "./goods"
 export const OrderType = {
     ORDER: 1,
     DELIVERY: 2,
@@ -272,36 +272,71 @@ export const OrderConfirmType = {
 }
 
 export const OrderConfirmTypeObj = {
-    [OrderConfirmType.NORMAL]: {
-        api: "submitOrder",
-        comm: {
-            coupon: true,
-            promotion: true,
-            integral: true
-        }
-    },
-    [OrderConfirmType.TRANSFER]: {
-        api: "transferSubmitOrder",
-        comm: {
-        }
-    },
-    [OrderConfirmType.PRE_SALE_DEPOSIT]: {
-        api: "submitOrder"
-    },
-    [OrderConfirmType.PRE_SALE_BALANCE]: {
-        api: "submitOrder"
-    },
-    [OrderConfirmType.AUCTION_DEPOSIT]: {
-        api: "submitOrder"
-    },
-    [OrderConfirmType.AUCTION_BALANCE]: {
-        api: "submitOrder"
-    },
-    [OrderConfirmType.NFT]: {
-        api: "submitOrder",
-        comm: {
-        }
+    [SalesType.NORMAL]:{
+        [OrderConfirmType.NORMAL]: {
+            api: "submitOrder",
+            comm: {
+                coupon: true,
+                promotion: true,
+                integral: true
+            }
+        },
+        [OrderConfirmType.TRANSFER]: {
+            api: "transferSubmitOrder",
+            comm: {
+            }
+        },
+        [OrderConfirmType.PRE_SALE_DEPOSIT]: {
+            api: "submitOrder"
+        },
+        [OrderConfirmType.PRE_SALE_BALANCE]: {
+            api: "submitOrder"
+        },
+        [OrderConfirmType.AUCTION_DEPOSIT]: {
+            api: "submitOrder"
+        },
+        [OrderConfirmType.AUCTION_BALANCE]: {
+            api: "submitOrder"
+        },
+        [OrderConfirmType.NFT]: {
+            api: "submitOrder",
+            comm: {
+            }
+        },
     },
+    [SalesType.BLINDBOX]:{
+        [OrderConfirmType.NORMAL]: {
+            api: "BlindBoxSubmitOrder",
+            comm: {
+                coupon: true,
+                promotion: true,
+                integral: true
+            }
+        },
+        [OrderConfirmType.TRANSFER]: {
+            api: "BlindBoxSubmitOrder",
+            comm: {
+            }
+        },
+        [OrderConfirmType.PRE_SALE_DEPOSIT]: {
+            api: "BlindBoxSubmitOrder"
+        },
+        [OrderConfirmType.PRE_SALE_BALANCE]: {
+            api: "BlindBoxSubmitOrder"
+        },
+        [OrderConfirmType.AUCTION_DEPOSIT]: {
+            api: "BlindBoxSubmitOrder"
+        },
+        [OrderConfirmType.AUCTION_BALANCE]: {
+            api: "BlindBoxSubmitOrder"
+        },
+        [OrderConfirmType.NFT]: {
+            api: "BlindBoxSubmitOrder",
+            comm: {
+            }
+        },
+    }
+    
 }
 
 export const PayType = {

src/mixins/global.js

@@ -23,7 +23,7 @@ Vue.mixin({
           },
           openBanner(item) {
             if (item.bannerType == 1) {
-              this.goGoods(item.number, item.goodsType);
+              this.goGoods(item.number, item.goodsType,item.salesType);
             } else {
               this.openUrl(item.url)
             }
@@ -39,10 +39,15 @@ Vue.mixin({
         goHome() {
             this.$router.push({ name: "home" })
         },
-        goGoods(goodsId, type = GoodsType.NORMAL) {
+        goGoods(goodsId, type = GoodsType.NORMAL,salesType) {
             let params = { goodsId }
             let query = { type }
-            this.$router.push({ name: "blind-box", params, query })
+            if(salesType===4){
+                this.$router.push({ name: "blind-box", params, query })
+            }else{
+                this.$router.push({ name: "goods", params, query })
+            }
+            
         },
         goShop(merchantId) {
             let params = { merchantId }

src/mixins/order.js

@@ -152,7 +152,7 @@ export const OrderMixin = {
         },
         handleBuy() {
             if (this.data.orders.length == 1) {
-                this.goGoods(this.data.orders[0].goodsId)
+                this.goGoods(this.data.orders[0].goodsId,this.data.orders[0].type,this.data.orders[0].salesType)
             } else {
                 this.goHome()
             }

src/store/index.js

@@ -110,12 +110,18 @@ export default new Vuex.Store({
     },
 
 
-    setOrderInfo(state, { selectAddrIndex, selectAddr, skuList, fromType, extData, type }) {
+    setOrderInfo(state, { selectAddrIndex, selectAddr, skuList, fromType, extData, type,salesType=1}) {
       let goodsMap = {}
       if (skuList && skuList.length !== 0) {
         skuList.forEach(item => {
           let { merchantId, merchantName, skuProps } = item
-          let skuLabel = skuProps.map((item) => item.propVal).join("+")
+          let skuLabel =""
+          if(salesType===4){
+            skuLabel=""
+          }else{
+            skuLabel=skuProps.map((item) => item.propVal).join("+")
+          }
+           
           if (!goodsMap[merchantId]) {
             goodsMap[merchantId] = { merchantId, merchantName, skuList: [{ ...item, skuLabel }], vnote: "" }
           } else {
@@ -123,7 +129,7 @@ export default new Vuex.Store({
           }
         });
       }
-      let orderInfo = { selectAddrIndex, selectAddr, goodsMap, fromType, extData, type }
+      let orderInfo = { selectAddrIndex, selectAddr, goodsMap, fromType, extData, type,salesType }
       state.orderInfo = orderInfo
       setOrderInfo(orderInfo)
     },

src/views/blind-box/blind-desc.vue

@@ -18,7 +18,7 @@
     </div> -->
     <div class="sales flex-default">
       <div class="label">剩余</div>
-      <div class="stock">8000份</div>
+      <div class="stock">{{getSurplus.stock}}份</div>
     </div>
     <div class="price-con flex-default">
       <div class="price">
@@ -55,6 +55,12 @@ export default {
     goodsId: String,
     goodsTypeMap: Object,
     transferData: Object,
+    skus:{
+      type: Array,
+      default: () => {
+        return [];
+      },
+    }
   },
   computed: {
     ...mapState(["appPlatform"]),
@@ -77,6 +83,18 @@ export default {
       }
       return 0;
     },
+    getSurplus(){
+      let circulation=0
+      let stock=0
+      for(let item of this.skus){
+        circulation+=item.circulation
+        stock+=item.stock
+      }
+      return {
+        circulation,
+        stock
+      }
+    }
   },
   data() {
     return {

src/views/blind-box/blind-detail.vue

@@ -38,7 +38,7 @@
     <van-popup v-model="showPopup" position="bottom" round closeable>
     <div class="blind-rule">
       <div class="title">规则说明</div>
-      <div class="content">盲盒规则，这是盲盒规则，北京2022年冬</div>
+      <div class="content" v-html="data && data.blindBoxRule"></div>
     </div>
   </van-popup>
   </div>
@@ -142,6 +142,7 @@ export default {
       background: #F5F7FB;
       border-radius: 10px 10px 0px 0px;
       padding:15px;
+      overflow: auto;
       font-size: 14px;
     }
   }

src/views/blind-box/blind-sku.vue

@@ -3,10 +3,10 @@
   <div class="blind-sku-scroll">
    <div class="blind-sku-scroll-box flex-default">
       <div class="blind-card" v-for="(prop, index) in skus" :key="index" @click="showDetail(prop)">
-      <img class="thumb" :src="prop.thumb" alt="" />
+      <img class="thumb" :src="prop.thumb" alt=""/>
       <div class="name">{{prop.name}}</div>
       <div class="num">丨限量{{prop.circulation}}份丨</div>
-      <img src="@/assets/img/hide-box.png" class="hide-box" alt="">
+      <img src="@/assets/img/hide-box.png" class="hide-box" alt="" v-show="prop.isHide" >
     </div>
    </div>
   </div>
@@ -99,7 +99,7 @@ export default {
   background: #ffffff;
   border-radius: 6px;
   text-align: center;
-  padding: 10px 6px;
+  padding: 10px 3px;
   margin-left: 12px;
   position: relative;
   .thumb {

src/views/blind-box/index.vue

@@ -22,12 +22,13 @@
       :goodsId="goodsId"
       :goodsTypeMap="goodsTypeMap"
       :transferData="transferData"
+      :skus="goodsDetail.skus"
+
     />
     <blind-sku 
       :skuList="goodsDetail.skuList"
       :skuMap="goodsDetail.skuMap"
       :skus="goodsDetail.skus"
-      
       @buy="confirmBuy"
     />
     <blind-detail ref="goodsDetail" :data="goodsDetail.details" />
@@ -172,6 +173,8 @@ export default {
         shopImage,
         circulation,
         sales,
+        salesType,
+        blindBoxRule
       } = goodsVo;
       imgListJson = JSON.parse(imgList);
 
@@ -197,7 +200,6 @@ export default {
         description,
         nftFile,
       };
-
       let merchant = {
         merchantId,
         merchantName,
@@ -209,7 +211,8 @@ export default {
         detail,
         merchantName,
         merchantId,
-        circulation
+        circulation,
+        blindBoxRule
       };
 
       let { skuList, skuMap } = this.genSku(skus);
@@ -222,8 +225,10 @@ export default {
         merchant,
         details,
         prop,
-        skus
+        skus,
+        salesType
       };
+      console.log(this.goodsDetail)
     },
     genSku(skus) {
       let skuObj = {};
@@ -274,12 +279,14 @@ export default {
       let { selectAddrIndex, selectAddr } = this;
       let thumb =  this.goodsDetail.desc.thumb;
       let goodsName = this.goodsDetail.desc.name;
+      console.log(this.goodsDetail.desc.defaultPrice)
       let skuList = [
         {
           ...this.selectSku,
           ...this.goodsDetail.merchant,
           thumb,
           goodsName,
+          originalPrice:this.goodsDetail.desc.defaultPrice
         },
       ];
       let extData = {},
@@ -302,8 +309,8 @@ export default {
         skuList,
         extData,
         type,
+        salesType:this.goodsDetail.salesType
       });
-
       this.$router.push({ name: "order-confirm" });
     },
   },

src/views/goods/goods-shop.vue

@@ -16,7 +16,7 @@
         class="item"
         v-for="(item, index) in RecommendList"
         :key="index"
-        @click="goGoods(item.goodsId, item.type)"
+        @click="goGoods(item.goodsId, item.type,item.salesType)"
       >
         <img :src="item.thumb" />
       </div>

src/views/goods/index.vue

@@ -342,7 +342,9 @@ export default {
         circulation,
         sales
       }
-
+      for(let item of skus){
+        item.originalPrice=defaultPrice
+      }
       let { skuList, skuMap } = this.genSku(skus);
 
       this.goodsDetail = {

src/views/order/confirm/index.vue

@@ -58,7 +58,7 @@ import AddrSelectPopup from "@/components/addr-select-popup.vue";
 import CouponSelectPopup from "./coupon-select-popup";
 import { mapState, mapGetters, mapMutations } from "vuex";
 import { expressCalc, promotionCalc } from "@/utils/mallCalc.js";
-import { OrderConfirmType, OrderConfirmTypeObj } from "@/enums";
+import { OrderConfirmType, OrderConfirmTypeObj,SalesType } from "@/enums";
 export default {
   components: {
     OrderAddr,
@@ -157,8 +157,9 @@ export default {
       return ret;
     },
     orderTypeObj() {
-      let obj = OrderConfirmTypeObj[this.orderInfo.type];
-      return obj || OrderConfirmTypeObj[OrderConfirmType.NORMAL];
+      let salesType=this.orderInfo.salesType || 1
+      let obj = OrderConfirmTypeObj[salesType][this.orderInfo.type];
+      return obj || OrderConfirmTypeObj[salesType][OrderConfirmType.NORMAL];
     },
     orderTypeMap() {
       let map = {};
@@ -278,20 +279,18 @@ export default {
       if (this.disable) {
         return;
       }
-      // if (!this.orderInfo.selectAddr) {
-      //   this.showAddr = true;
-      //   return;
-      // }
       this.$showLoading();
-
-      let { selectAddr, goodsMap } = this.orderInfo;
-
+      let { selectAddr, goodsMap,salesType } = this.orderInfo;
       let goodsIdCouponVos = this.couponSelectList.map((c) => c.couponId);
       let merchantGoodsVos = [];
+      let goodsId=""
       Object.keys(goodsMap).forEach((shop) => {
         let orderSkuVos = [];
         let { vnote, merchantId } = goodsMap[shop];
         goodsMap[shop].skuList.forEach((sku) => {
+          if(salesType===SalesType.BLINDBOX){
+            goodsId=sku.goodsId
+          }
           let { num, skuId } = sku;
           orderSkuVos.push({
             num,
@@ -307,25 +306,20 @@ export default {
 
       let postData = {
         delivery: this.delivery ? 1 : 0,
-        // address: this.addrLabel + selectAddr.detailAddr,
-        // province: selectAddr.provinceCode,
-        // phone: selectAddr.phone,
-        // uname: selectAddr.name,
         orderType: 1,
         merchantGoodsVos,
         goodsIdCouponVos,
-
-        // transfer
-        // uaddress: this.addrLabel + selectAddr.detailAddr,
-        // uname: selectAddr.name,
-        // uphone: selectAddr.phone,
       };
-      if (this.orderTypeMap.TRANSFER) {
-        let key = Object.keys(this.orderInfo.goodsMap)[0];
-        postData.number = this.orderInfo.goodsMap[key].skuList[0].num;
-        postData.tranId = this.orderInfo.extData.tranId;
+      if(salesType===SalesType.BLINDBOX){
+        postData.goodsId=goodsId
+        postData.delivery=0
+      }else{
+        if (this.orderTypeMap.TRANSFER) {
+          let key = Object.keys(this.orderInfo.goodsMap)[0];
+          postData.number = this.orderInfo.goodsMap[key].skuList[0].num;
+          postData.tranId = this.orderInfo.extData.tranId;
+        }
       }
-
       this.$api({
         apiName: this.orderTypeObj.api,
         postData,

src/views/order/payment/index.vue

@@ -172,8 +172,9 @@ export default {
     ...mapMutations(["clearPickUpGoodsInfo"]),
     confirmSetPwd() {
       if (this.accountInfo.isPayPassword) {
-        return;
+        return true;
       }
+      console.log(this.accountInfo.isPayPassword)
       this.$confirm({
         content: "您当前尚未设置支付密码，是否前往设置？",
         confirm: () => {
@@ -191,7 +192,9 @@ export default {
           this.wxPay()
           break;
         case 4:
-           this.showVerify = true;
+          if(this.confirmSetPwd()){
+            this.showVerify = true;
+          }
            break;
         default:
           this.showVerify = true;

src/views/search/list/list-item.vue

 <template>
   <div
     class="search-list-item-con flex-default"
-    @click="goGoods(data.goodsId, data.type)"
+    @click="goGoods(data.goodsId, data.type,data.salesType,data.salesType)"
   >
     <img class="thumb" :src="data.thumb" />
     <div class="desc flex-default">

src/views/shop/detail/list-item.vue

 <template>
-  <div class="list-item-con" @click="goGoods(itemData.goodsId, itemData.type)">
+  <div class="list-item-con" @click="goGoods(itemData.goodsId, itemData.type,itemData.salesType)">
     <div class="m-icon picture">
       <img :src="itemData.thumb" />
     </div>

src/views/tab-bar/home/goods-list/blind-goods.vue

@@ -8,7 +8,7 @@
         class="item-list-con flex-default"
         v-for="(item, index) of list"
         :key="'goods-item-' + index"
-        @click="goGoods(item.goodsId, item.type)"
+        @click="goGoods(item.goodsId, item.type,item.salesType)"
       >
         <div class="left-img">
           <img class="thumb" :src="item.thumb" />

src/views/tab-bar/home/goods-list/customized-goods.vue

@@ -15,7 +15,7 @@
           v-for="(item, index) of list"
           :key="'goods-item-' + index"
           :itemData="item"
-          @click.native="goGoods(item.goodsId, item.type)"
+          @click.native="goGoods(item.goodsId, item.type,item.salesType)"
         />
       </div>
     </div>

src/views/tab-bar/home/goods-list/hot-goods.vue

@@ -13,7 +13,7 @@
           class="item-con flex-default"
           v-for="(item, index) of list"
           :key="'goods-item-' + index"
-          @click="goGoods(item.goodsId, item.type)"
+          @click="goGoods(item.goodsId, item.type,item.salesType)"
         >
           <div class="goods-item flex-default">
             <img class="thumb" :src="item.thumb" />

src/views/tab-bar/home/goods-list/hot-recommend.vue

@@ -11,7 +11,7 @@
           class="item-con"
           v-for="(item, index) of list"
           :key="'goods-item-' + index"
-          @click="goGoods(item.goodsId, item.type)"
+          @click="goGoods(item.goodsId, item.type,item.salesType)"
         >
           <div class="top">
             <img

src/views/tab-bar/home/goods-list/tail-goods.vue

@@ -13,7 +13,7 @@
           v-for="(item, index) of list"
           :key="'goods-item-' + index"
           :itemData="item"
-          @click.native="goGoods(item.goodsId, item.type)"
+          @click.native="goGoods(item.goodsId, item.type,item.salesType)"
         />
       </div>
     </div>

src/views/tab-bar/home/shop-recommend/goods-item.vue

 <template>
-  <div class="shop-recommend-goods-item" @click="goGoods(data.goodsId)">
+  <div class="shop-recommend-goods-item" @click="goGoods(data.goodsId,data.type,data.salesType)">
     <img class="thumb" :src="data.thumb" />
     <div class="goods-info">
       <div class="name">{{ data.name }}</div>

src/views/tab-bar/shopping-cart/goods-item.vue

 <template>
   <div class="goods-item-con">
-    <div class="item-top flex-default" @click="goGoods(itemData.goodsId, itemData.type)">
+    <div class="item-top flex-default" @click="goGoods(itemData.goodsId, itemData.type,itemData.salesType)">
       <div
         class="flex-default"
         style="padding: 20rpx 0; align-items: center; flex-shrink: 0"
@@ -37,7 +37,7 @@
       </div>
     </div>
     <div class="price_line flex-default">
-      <div class="price" @click="goGoods(itemData.goodsId, itemData.type)">
+      <div class="price" @click="goGoods(itemData.goodsId, itemData.type,itemData.salesType)">
         <m-price :amt="itemData.amount" />
       </div>
       <div class="operation">

src/views/user-center/goods-collection/commodity-list-item.vue

 <template>
-  <div class="collection-item flex-default" @click="goGoods(itemData.goodsId, itemData.type)">
+  <div class="collection-item flex-default" @click="goGoods(itemData.goodsId, itemData.type,itemData.salesType)">
     <div
       class="flex-default"
       style="padding: 20rpx 0; align-items: center; flex-shrink: 0"

src/views/user-center/history/list-item.vue

 <template>
-  <div class="collection-item flex-default" @click="goGoods(itemData.goodsId, itemData.type)">
+  <div class="collection-item flex-default" @click="goGoods(itemData.goodsId, itemData.type,itemData.salesType)">
     <div
       class="flex-default"
       style="padding: 20rpx 0; align-items: center; flex-shrink: 0"

src/views/user-center/order/components/order-list-item.vue

@@ -15,7 +15,7 @@
         <img class="thumb" :src="detail.order1st.thumb" />
         <div class="spu">
           <div class="name">{{ detail.order1st.name }}</div>
-          <div class="sku">{{ detail.order1st.propList | propFilter }}</div>
+          <div class="sku">{{ detail.order1st.propList | propFilter(detail.order1st) }}</div>
         </div>
       </div>
       <div class="info-list" scroll-x v-else>
@@ -121,8 +121,16 @@ export default {
     },
   },
   filters: {
-    propFilter(props) {
-      return props.map((item) => item.value).join("+");
+    propFilter(props,detail) {
+      if(props){
+        return props.map((item) => item.value).join("+");
+      }else{
+        if(detail.salesType===4){
+          return '盲盒'
+        }
+        return ""
+      }
+      
     },
   },
 };

src/views/user-center/order/detail/delivery/goods-list.vue

@@ -5,7 +5,7 @@
       <span class="name">{{ data.enterpriseName }}</span>
       <m-icon icon="icon-more" :size="10" />
     </div>
-    <div class="goods flex-default" @click="goGoods(data.goodsId, data.type)">
+    <div class="goods flex-default" @click="goGoods(data.goodsId, data.type,data.salesType)">
       <img class="thumb" :src="data.thumb" />
       <div class="spu">
         <div class="name">{{ data.name }}</div>

src/views/user-center/order/detail/order/goods-list.vue

@@ -9,12 +9,12 @@
       class="goods flex-default"
       v-for="(item, index) of data.orders"
       :key="`goods-item-${index}`"
-      @click="goGoods(item.goodsId, item.type)"
+      @click="goGoods(item.goodsId, item.type,item.salesType)"
     >
       <img class="thumb" :src="item.thumb" />
       <div class="spu">
         <div class="name">{{ item.name }}</div>
-        <div class="sku">{{ item.propList | propFilter }}</div>
+        <div class="sku">{{ item.propList | propFilter(item) }}</div>
       </div>
       <div class="price">
         <div class="amt">￥{{ item.amount || 0 }}</div>
@@ -73,11 +73,21 @@ export default {
   },
   computed: {},
   filters: {
-    propFilter(val) {
-      if (!val) {
-        return "";
+    // propFilter(val) {
+    //   if (!val) {
+    //     return "";
+    //   }
+    //   return val.map((item) => item.value).join(" + ");
+    // },
+    propFilter(props,detail) {
+      if(props){
+        return props.map((item) => item.value).join("+");
+      }else{
+        if(detail.salesType===4){
+          return '盲盒'
+        }
+        return ""
       }
-      return val.map((item) => item.value).join(" + ");
     },
   },
   methods: {},

vue.config.js

@@ -64,7 +64,8 @@ module.exports = {
         // target: 'http://172.22.20.64:8100/root'
         // target: 'http://172.22.17.176:12008'
         // target: 'http://172.22.17.108:12008'
-        target: 'https://mall.inmvo.com/root'  
+        // target: 'https://mall.inmvo.com/root'  
+        target: 'http://172.22.20.54:9089'  
       },
       '/chat': {
         pathRewrite: {