商品列表

htmldev/cps/src/api/request.js

@@ -55,7 +55,7 @@ request.interceptors.request.use(request => {
 
   // 因为微信开发者工具重复授权，本地开发时写死
   if (/^(0|192|10|localhost)/.test(domain)) {
-    request.headers.wechatToken = 'e369797599f47e9cdbbcb100559f7d15'
+    request.headers.wechatToken = '1ba0a97c52bcd02b03ab8e4d55e14740'
   } else {
     request.headers.wechatToken = getCookieValue('fanbutingwechatToken')
   }

htmldev/cps/src/router/index.js

@@ -157,13 +157,17 @@ const routes = [
         }
       },
       {
-        path: '/detail',
+        path: '/detail/:source/:goodsId',
         name: 'CategoryDetail',
         component: _import('views/category/detail/index'),
         meta: {
           isUseCache: false,
           keepAlive: true
-        }
+        },
+        props: (route) => ({
+          source: route.params.source,
+          goodsId: route.params.goodsId
+        })
       }
     ]
   }

htmldev/cps/src/views/bill/child/main.vue

@@ -175,9 +175,9 @@ export default {
   beforeDestroy () {
     this.scroll && this.scroll.destroy()
   },
-  beforeRouteLeave (to, form, next) {
+  beforeRouteLeave (to, from, next) {
     if (['Mine', 'OrderDetail'].findIndex(item => item === to.name) > -1) {
-      form.meta.isUseCache = true
+      from.meta.isUseCache = true
     }
     next()
   }

htmldev/cps/src/views/category/index/api/api.js

@@ -1,9 +1,22 @@
 import request from '@/api/request'
 
 /**
- * 类目/活动/频道接口
+ * 获取电商平台分类
  */
-export const apiCateList = () => request({
+export const apiCateList = (source) => request({
   method: 'GET',
-  url: '/api/pdd/cate/list'
+  url: '/api/buy/cate/list',
+  params: {
+    source: source
+  }
+})
+
+/**
+ * 获取商品列表
+ * @param obj
+ */
+export const apiGoodsList = (obj) => request({
+  method: 'POST',
+  url: '/api/buy/goods/list',
+  data: obj
 })

htmldev/cps/src/views/category/index/child/main.vue

@@ -22,43 +22,46 @@
         v-for="(item, index) in list"
         :key="index"
         class="list-item border-bottom-1px"
-        @click="getOrderDetail(item.id)">
+        @click="getOrderDetail(item.goods_id)">
         <div class="photo">
-          <img src="" alt="">
+          <img
+            :src="item.goods_thumb_url"
+            alt="">
         </div>
         <div class="info">
           <div
             class="top">
-            <img src="" alt="">
-            <p>这是名字这是名字这是名字这是名字这是名字这是名</p>
+            <p>{{ item.goods_name }}</p>
           </div>
           <div class="middle">
             <div class="price-wrap">
               <p class="price">
                 <span>￥</span>
-                <span>129</span>
+                <span>{{ item.price.toFixed(2) }}</span>
               </p>
-              <p class="origin">¥599</p>
-            </div>
-            <div class="sale-count">
-              <span>已售</span>
-              <span>0</span>
+              <p class="origin">¥{{ item.market_price.toFixed(2) }}</p>
             </div>
+            <!--暂时不用这个字段-->
+            <!--<div class="sale-count">-->
+            <!--<span>已售</span>-->
+            <!--<span>0</span>-->
+            <!--</div>-->
           </div>
-          <div class="card">
-            <p class="coupon">
+          <div class="card" v-show="item.discount > 0 && item.commission > 0">
+            <p class="coupon" v-show="item.discount > 0">
               <span>券</span>
-              <span>¥470</span>
+              <span>¥{{ item.discount }}</span>
             </p>
-            <p class="profit">
+            <p class="profit" v-show="item.commission > 0">
               <span>分享赚</span>
-              <span>¥&nbsp;42.77</span>
+              <span>¥&nbsp;{{ item.commission | fen2Yuan }}</span>
             </p>
           </div>
-          <div class="shop">
-            <img src="" alt="">
-            <p>店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名</p>
-          </div>
+          <!--暂时不用这个字段-->
+          <!--<div class="shop">-->
+          <!--<img src="" alt="">-->
+          <!--<p>店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名店名</p>-->
+          <!--</div>-->
         </div>
       </li>
       <li class="pullup-wrapper">
@@ -80,20 +83,20 @@
 <script>
 import BScroll from 'better-scroll'
 import { Toast, Loading } from 'vant'
-import { apiOrderList } from '../../../order/api/api'
+import { apiGoodsList } from '../api/api'
 
 export default {
   components: {
     'van-loading': Loading
   },
   props: {
-    orderPlatformSonType: {
-      type: Number,
-      default: 0
+    source: {
+      type: String,
+      default: ''
     },
-    orderStatus: {
-      type: Number,
-      default: 0
+    catId: {
+      type: [String, Number],
+      default: ''
     }
   },
   data () {
@@ -107,8 +110,8 @@ export default {
       scroll: null
     }
   },
-  activated () {
-    if (!this.$route.meta.isUseCache) {
+  methods: {
+    init () {
       this.finished = false
       this.isRefresh = false
       this.isFetchLock = false
@@ -117,12 +120,7 @@ export default {
       this.list = []
       this.scroll = null
       this.getList()
-    } else {
-      this.scroll && this.scroll.refresh()
-    }
-    this.$route.meta.isUseCache = false
-  },
-  methods: {
+    },
     onRefresh () {
       this.pagenum = 0
       this.pagesize = 20
@@ -140,17 +138,14 @@ export default {
       this.isFetchLock = true
       this.pagenum++
       try {
-        const { status, data, msg } = await apiOrderList({
+        const { status, data, msg } = await apiGoodsList({
           page: this.pagenum,
           page_size: this.pagesize,
-          order_platform_son_type: this.orderPlatformSonType,
-          order_status: this.orderStatus
+          source: this.source,
+          cat_id: this.catId
         })
         if (status) {
-          // const { list } = data
-          // todo
-          console.log(data)
-          const list = [1, 2, 3, 4, 5]
+          const { list } = data
           // 下拉刷新数据清空
           if (this.isRefresh) {
             this.isRefresh = false
@@ -205,18 +200,18 @@ export default {
         this.isFetchLock = false
       }
     },
-    async getOrderDetail (id) {
-      this.$router.push({ name: 'CategoryDetail' })
+    getOrderDetail (id) {
+      this.$router.push({
+        name: 'CategoryDetail',
+        params: {
+          source: this.source,
+          goodsId: id
+        }
+      })
     }
   },
   beforeDestroy () {
     this.scroll && this.scroll.destroy()
-  },
-  beforeRouteLeave (to, form, next) {
-    if (['Mine', 'OrderDetail'].findIndex(item => item === to.name) > -1) {
-      form.meta.isUseCache = true
-    }
-    next()
   }
 }
 </script>
@@ -279,7 +274,6 @@ export default {
   margin-right: 10px;
   border-radius: 6px;
   overflow: hidden;
-  background: pink;
 
   img {
     display: block;
@@ -293,20 +287,15 @@ export default {
 }
 
 .top {
-  overflow: hidden;
-
-  img {
-    width: 30px;
-    height: 16px;
-    margin-right: 4px;
-    float: left;
-  }
-
   p {
+    display: -webkit-box;
     font-size: 14px;
     font-weight: bold;
     color: #333333;
     line-height: 18px;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
   }
 }
 
@@ -423,7 +412,6 @@ export default {
     width: 12px;
     height: 11px;
     margin-right: 6px;
-    background: pink;
   }
 
   p {

htmldev/cps/src/views/category/index/index.vue

@@ -9,13 +9,14 @@
         :title-active-color="'#FFF'"
         :title-inactive-color="'#8A8A8A'"
         :background="'#fff'"
+        @click="fetchCateList"
         ref="fbtBusinessList">
         <van-tab
-          v-for="index in 10"
-          :key="index">
+          :name="item.value"
+          v-for="item in sourceList"
+          :key="item.value">
           <template #title>
-            <img src="" alt="">
-            <i>选项</i>
+            <i>{{ item.name }}</i>
           </template>
         </van-tab>
       </van-tabs>
@@ -24,18 +25,18 @@
     <div
       class="cate-header">
       <van-tabs
-        v-model="cateValue"
+        v-model="catId"
         :color="'#F09E38'"
         :title-active-color="'#333333'"
         :title-inactive-color="'#515151'"
         :background="'#fff'"
+        @click="selectCateId"
         ref="fbtCateList">
         <van-tab
-          v-for="index in 10"
-          :key="index">
-          <template #title>
-            {{ index % 2 === 0 ? '选项选项' : '选项' }}
-          </template>
+          :name="item.id"
+          v-for="item in cateList"
+          :key="item.id">
+          <template #title>{{ item.name }}</template>
         </van-tab>
       </van-tabs>
       <van-dropdown-menu
@@ -47,10 +48,10 @@
           </template>
           <ul>
             <li
-              :class="{'active': i === cateValue}"
-              v-for="i in 10"
-              :key="i"
-              @click="onConfirm(i)">选项选项{{ i }}
+              :class="{'active': item.id === catId}"
+              v-for="item in cateList"
+              :key="item.id"
+              @click="onConfirm(item)">{{ item.name }}
             </li>
           </ul>
         </van-dropdown-item>
@@ -58,9 +59,8 @@
     </div>
     <!--商品列表-->
     <Main
-      :orderPlatformSonType="orderPlatformSonType"
-      :orderStatus="orderStatus"
-      @setOrderDetail="setOrderDetail"
+      :source="this.businessValue"
+      :catId="catId"
       ref="myMain"/>
   </div>
 </template>
@@ -82,45 +82,82 @@ export default {
   },
   data () {
     return {
+      sourceList: [
+        {
+          name: '京东',
+          value: 'jd'
+        },
+        {
+          name: '唯品会',
+          value: 'vip'
+        },
+        {
+          name: '拼多多',
+          value: 'pdd'
+        },
+        {
+          name: '考拉',
+          value: 'kaola'
+        },
+        {
+          name: '淘宝',
+          value: 'taobao'
+        }
+      ], // 商家列表
       businessValue: 'jd',
-      cateValue: 0,
-      orderPlatformSonType: 0,
-      orderStatus: 0
+      catId: '',
+      cateList: [] // 分类列表
     }
   },
   activated () {
     if (!this.$route.meta.isUseCache) {
+      this.businessValue = this.sourceList[0].value
+      this.catId = ''
       this.fetchCateList()
+    } else {
+      if (this.$refs.myMain && this.$refs.myMain.scroll) {
+        this.$refs.myMain.scroll.refresh()
+      }
     }
     setTimeout(() => {
       this.$refs.fbtBusinessList.resize()
-      this.$refs.fbtCateList.resize()
     }, 500)
     this.$route.meta.isUseCache = false
   },
   methods: {
     async fetchCateList () {
       try {
-        const { status, data, msg } = await apiCateList()
+        const { status, data, msg } = await apiCateList(this.businessValue)
         if (status) {
-          console.log(data)
+          this.cateList = data
+
+          setTimeout(() => {
+            this.$refs.fbtCateList.resize()
+            this.$refs.myMain.init()
+          }, 500)
         } else {
           Toast(msg)
         }
       } catch (e) {}
     },
-    onConfirm (val) {
-      this.cateValue = val
+    selectCateId () {
       this.$nextTick(() => {
-        this.$refs.fbtCateDropdownMenu.toggle()
+        this.$refs.myMain.init()
       })
     },
-    setOrderDetail (obj) {
-      if (Object.prototype.toString.call(obj) === '[object Object]') {
-        this.orderDetail = obj
-        this.showDetail = true
-      }
+    onConfirm (obj) {
+      this.catId = obj.id
+      this.$nextTick(() => {
+        this.$refs.fbtCateDropdownMenu.toggle()
+        this.$refs.myMain.init()
+      })
+    }
+  },
+  beforeRouteLeave (to, from, next) {
+    if (['CategoryDetail'].findIndex(item => item === to.name) > -1) {
+      from.meta.isUseCache = true
     }
+    next()
   }
 }
 </script>
@@ -156,6 +193,7 @@ export default {
       .van-tab__text {
         display: flex;
         align-items: center;
+        justify-content: center;
         width: 67px;
         height: 23px;
         padding: 0 12px;
@@ -166,7 +204,6 @@ export default {
           width: 16px;
           height: 16px;
           margin-right: 3px;
-          background: pink;
         }
 
         i {

htmldev/cps/src/views/fans/child/main.vue

@@ -179,9 +179,9 @@ export default {
   beforeDestroy () {
     this.scroll && this.scroll.destroy()
   },
-  beforeRouteLeave (to, form, next) {
+  beforeRouteLeave (to, from, next) {
     if (['Mine', 'OrderDetail'].findIndex(item => item === to.name) > -1) {
-      form.meta.isUseCache = true
+      from.meta.isUseCache = true
     }
     next()
   }

htmldev/cps/src/views/invite/index.vue

@@ -63,9 +63,9 @@ export default {
       this.booShareTip = true
     }
   },
-  beforeRouteLeave (to, form, next) {
+  beforeRouteLeave (to, from, next) {
     if (['Mine', 'MarketingSave'].findIndex(item => item === to.name) > -1) {
-      form.meta.isUseCache = true
+      from.meta.isUseCache = true
     }
     this.$store.dispatch('common/getUserInfo')
     next()

htmldev/cps/src/views/marketing/index.vue

@@ -136,9 +136,9 @@ export default {
       this.scroll.scrollTo(this.initTranslate(tabId), 0, 300)
     }
   },
-  beforeRouteLeave (to, form, next) {
+  beforeRouteLeave (to, from, next) {
     if (['Mine'].findIndex(item => item === to.name) > -1) {
-      form.meta.isUseCache = true
+      from.meta.isUseCache = true
     }
     next()
   }

htmldev/cps/src/views/marketing/make/index.vue

@@ -170,9 +170,9 @@ export default {
   beforeDestroy () {
     this.scroll && this.scroll.destroy()
   },
-  beforeRouteLeave (to, form, next) {
+  beforeRouteLeave (to, from, next) {
     if (['MarketingSave', 'MarketingReturn'].findIndex(item => item === to.name) > -1) {
-      form.meta.isUseCache = true
+      from.meta.isUseCache = true
     }
     next()
   }

htmldev/cps/src/views/marketing/return/index.vue

@@ -162,9 +162,9 @@ export default {
   beforeDestroy () {
     this.scroll && this.scroll.destroy()
   },
-  beforeRouteLeave (to, form, next) {
+  beforeRouteLeave (to, from, next) {
     if (['MarketingSave', 'MarketingMake'].findIndex(item => item === to.name) > -1) {
-      form.meta.isUseCache = true
+      from.meta.isUseCache = true
     }
     next()
   }

htmldev/cps/src/views/marketing/save/index.vue

@@ -129,9 +129,9 @@ export default {
   beforeDestroy () {
     this.shopsScroll && this.shopsScroll.destroy()
   },
-  beforeRouteLeave (to, form, next) {
+  beforeRouteLeave (to, from, next) {
     if (['MarketingReturn', 'MarketingMake'].findIndex(item => item === to.name) > -1) {
-      form.meta.isUseCache = true
+      from.meta.isUseCache = true
     }
     next()
   }

htmldev/cps/src/views/order/child/main.vue

@@ -207,9 +207,9 @@ export default {
   beforeDestroy () {
     this.scroll && this.scroll.destroy()
   },
-  beforeRouteLeave (to, form, next) {
+  beforeRouteLeave (to, from, next) {
     if (['Mine', 'OrderDetail'].findIndex(item => item === to.name) > -1) {
-      form.meta.isUseCache = true
+      from.meta.isUseCache = true
     }
     next()
   }