修改分类显示

components/canvasShow/basics/classifyHeader/app/index.vue

@@ -3,13 +3,59 @@
     <view class="tabs-nav-warp">
       <scroll-view class="tabs-nav" scroll-x="true">
         <view class="ul">
-          <view class="li" :class="{'on':activeTab===0}" @click="tabChange(0)">{{$t('common.own')}}</view>
-          <view class="li" :class="{'on':activeTab===index+1}" v-for="(item,index) in classifyData" :key="index" @click="tabChange(index+1,item.id)">
+          <view class="li" :class="{'on':activeTab===0}" @click="tabChange(0)" v-if="componentContent.firstClassify">
+			{{ componentContent.firstClassify }}
+		  </view>
+          <view class="li" :class="{'on':activeTab===index+beginIndex}" v-for="(item,index) in classifyData" :key="index" @click="tabChange(index+beginIndex,item.id)">
             {{item.categoryName}}
           </view>
         </view>
       </scroll-view>
     </view>
+	<div class="hom-pro-list" v-if="productData.length>0">
+	    <div class="product-swiper">
+	      <div class="product-swiper-box">
+	        <div class="product-swiper-warp" v-for="(item,index) in productData.slice(0, 3)" :key="index">
+	          <div class=" product-swiper-item" @click="jumpProductDetail(item)">
+	            <div class="product-swiper-img">
+	              <img class="img pic-img default-img" :src="item.image" onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null">
+	            </div>
+	            <div class="product-swiper-info">
+	              <label class="product-name">{{item.productName}}</label>
+	              <div class="price-warp">
+	                <!-- #ifdef MP-WEIXIN -->
+	                <img class="iconImg" v-if="item.activityType == 1" src="../../../static/images/groupBuyIcon.png">
+	                <img class="iconImg" v-if="item.activityType == 2" src="../../../static/images/spikeIcon.png">
+	                <img class="iconImg" v-if="item.activityType == 4" src="../../../static/images/spikeIcon.png">
+	                <img class="iconImg" v-if="item.activityType == 3" src="../../../static/images/discountListIcon.png">
+	                <img class="iconImg" v-if="item.activityType == 5" src="../../../static/images/discountListIcon.png">
+	                <img class="iconImg" v-if="item.activityType == 9" src="../../../static/images/memberCenterIcon.png">
+					<img class="iconImg" v-if="item.activityType == 8" src="https://zk-cereshop.oss-cn-shenzhen.aliyuncs.com/zkthink/2022-02-15/d0d8d96f28904167b271de4ae924d1a8_sceneMarketing.png">
+	                <!-- #endif -->
+	                <!-- #ifdef H5 || APP-PLUS -->
+	                <image class="iconImg" v-if="item.activityType == 1" src="../../../static/images/groupBuyIcon.png"></image>
+	                <image class="iconImg" v-if="item.activityType == 2" src="../../../static/images/spikeIcon.png"></image>
+	                <image class="iconImg" v-if="item.activityType == 4" src="../../../static/images/spikeIcon.png"></image>
+	                <image class="iconImg" v-if="item.activityType == 3" src="../../../static/images/discountListIcon.png"></image>
+	                <image class="iconImg" v-if="item.activityType == 5" src="../../../static/images/discountListIcon.png"></image>
+	                <image class="iconImg" v-if="item.activityType == 9" src="../../../static/images/memberCenterIcon.png"></image>
+					<image class="iconImg" v-if="item.activityType == 8" src="https://zk-cereshop.oss-cn-shenzhen.aliyuncs.com/zkthink/2022-02-15/d0d8d96f28904167b271de4ae924d1a8_sceneMarketing.png"></image>
+	                <!-- #endif -->
+	                <div class="price">
+	                  ¥ {{item.price}}
+	                </div>
+	<!--                <div class="original-price">-->
+	<!--                  ¥ {{item.originalPrice}}-->
+	<!--                </div>-->
+	              </div>
+	            </div>
+	          </div>
+	        </div>
+	      </div>
+	      <div class="pagination new-pagination"></div>
+	    </div>
+	    <button v-show="componentContent.showMore" class="btn-more" @click="jumpProList(componentContent.productData)">查看全部 <span class="icon iconfont icon-arrow-right"></span></button>
+	  </div>
   </view>
 </template>
 
@@ -19,17 +65,14 @@ export default {
   mixins: [commonMixin],
   data () {
     return {
-      activeTab: 0
+      
     }
   },
   computed: {
 
   },
   methods:{
-    tabChange (index, id) {
-      this.activeTab = index
-      this.$emit('tabChange', index, id)
-    }
+    
   }
 }
 </script>
@@ -108,4 +151,101 @@ export default {
       }
     }
   }
+  .hom-pro-list{
+    ::v-deep .swiper-wrapper{
+      position: static;
+    }
+    /**横向滑动**/
+    .product-swiper{
+      width: 100%;
+      height: auto;
+      padding: 5upx 34upx 0;
+      background-size: 710upx 454upx;
+      box-sizing: border-box;
+      position: relative;
+      
+	  &+.btn-more{
+        margin-top: 20upx;
+      }
+      .title{
+        padding: 22upx 0upx 0 0;
+        label{
+          background-image: none;
+          color: #A56C4C;
+          font-style: italic;
+          padding: 0;
+        }
+      }
+      &-box {
+        padding-bottom: 20upx;
+        display: flex;
+      }
+      &-warp{
+        padding: 0 5upx;
+      }
+      &-item {
+        width: 220upx;
+        position: relative;
+        background-color: #FFFFFF;
+      }
+      &-img {
+        width: 220upx;
+        height: 220upx;
+        position: relative;
+        &:after{
+          content: '';
+          display: block;
+          width: 54upx;
+          height: 54upx;
+          background: url("../../../static/images/newProduct/flag-new.png") no-repeat;
+          background-size: 100% 100%;
+          position: absolute;
+          top: 0;
+          left: 0;
+        }
+        .img {
+          width: 100%;
+          height: 100%;
+          object-fit: contain;
+        }
+      }
+      &-info {
+        background-color: #FFFFFF;
+        padding: 10upx;
+        text-align: center;
+        .product-name{
+          font-size: 20upx;
+          color: #333;
+          display: block;
+          overflow: hidden;
+          text-overflow:ellipsis;
+          white-space: nowrap;
+          margin-bottom: 6upx;
+          line-height: 28upx;
+        }
+        .price-warp{
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          line-height: 28upx;
+          .iconImg {
+            width: 58rpx;
+            height: 36rpx;
+            margin-right: 10rpx;
+          }
+          .price{
+            color: #C83732;
+            font-size: 20upx;
+            margin-right: 10upx;
+          }
+          .original-price{
+            font-size: 16upx;
+            color: #ccc;
+            text-decoration: line-through;
+          }
+        }
+      }
+    }
+  }
+  
 </style>

components/canvasShow/basics/classifyHeader/mixin.js

@@ -24,9 +24,13 @@ export const commonMixin = {
   data() {
     return {
       classifyData: [],
+	  activeTab: 0,
+	  beginIndex: 0,
+	  productData:[]
     }
   },
   mounted() {
+	this.beginIndex = (this.componentContent.firstClassify && this.componentContent.firstClassify.length ) ? 1 : 0
     this.getData()
   },
   methods: {
@@ -39,9 +43,28 @@ export const commonMixin = {
         },
         (res) => {
           _.classifyData = res.data
+		  this.getProducts()
         },
         (err) => {}
       )
     },
+	tabChange (index, id) {
+	  this.activeTab = index
+	  this.getProducts()
+	  this.$emit('tabChange', index, id)
+	},
+	getProducts(){
+		 const _ = this
+		if(this.activeTab >= this.beginIndex) {
+		    _.sendReq({
+		      url: `${api.getProductsV2}?page=1&pageSize=20&classifyId=${_.classifyData[this.activeTab-this.beginIndex].id}`,
+		      method: 'GET'
+		    }, (proRes) => {
+		      _.productData = proRes.data.list
+		    })
+		  } else {
+		    _.productData = []
+		}
+	}
   },
 }

components/canvasShow/basics/newProduct/mixin.js

@@ -81,8 +81,7 @@ export const commonMixin = {
             })
           } else {
             _.productData = []
-
-        }
+		}
       }
     }
   },

components/canvasShow/config/mixin/server.js

@@ -29,6 +29,31 @@ service.interceptors.request.use(config => {
       config.headers['Authorization'] = token
     }
   }
+  
+  var locale =  uni.getLocale() || 'zh'
+    
+  if(locale == 'zh-Hans'){
+  	locale = 'zh'
+  }
+  config.headers['language'] =  locale
+  
+  var fullUrl = window.location.search;
+ 
+   if (fullUrl.indexOf("?") != -1) {
+     fullUrl = fullUrl.substring(1);
+     var paramStrs = fullUrl.split("&");
+     for(let i=0;i<paramStrs.length;i++){
+       const newStrs = paramStrs[i].split("=");
+       if(newStrs[0] === 'project'){
+         config.headers['project'] = newStrs[1]
+         break;
+       }
+     }
+   }
+   if(config.headers['project'] == undefined || config.headers['project']== ''){
+   		config.headers['project'] = '0'
+   }
+   
   return config
 }, error => {
   return Promise.reject(error)

pages/tabbar/category/index.vue

@@ -22,13 +22,13 @@
 				</view>
 				<view v-if="!onlyTwoLayer">
 					<view v-for="item in slist" :key="item.classifyId" class="s-list">
-						<view class="classBox flex-items-plus" v-if="slist.childs.length>0">
+						<view class="classBox flex-items-plus">
 							<image class="emptyOrder-img" src="https://ceres.zkthink.com/static/images/classRight.png"></image>
 							<text class="s-item" >{{item.classifyName}}</text>
 							<image class="emptyOrder-img" src="https://ceres.zkthink.com/static/images/classLeft.png"></image>
 						</view>
 						<view class="t-list">
-							<view @click="navToList(item.classifyId, titem.classifyId)" class="t-item" v-for="titem in slist.childs" :key="titem.classifyId">
+							<view @click="navToList(item.classifyId, titem.classifyId)" class="t-item" v-for="titem in item.childs" :key="titem.classifyId">
 								<image :src="titem.classifyImage" class="pic-img"></image>
 								<text>{{titem.classifyName}}</text>
 							</view>

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>Thee</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.91bbf592.js></script><script src=/h5/static/js/index.31340da6.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.91bbf592.js></script><script src=/h5/static/js/index.d7d07ddd.js></script></body></html>