From 09e0fd4a9fb7095fd349163f5c1b7e02f9ab6ee1 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Thu, 5 Mar 2020 10:41:16 +0800
Subject: [PATCH] 1.自定义模板  导航要显示背景颜色，显示字体颜色 2.自定义模板  拼团，秒杀要显示活动的名称

---
 components/diy_nav/diy_nav.wxss             |  4 ++--
 components/diy_nav/diy_nav_part1.wxml       |  6 +++---
 components/diy_nav/diy_nav_part2.wxml       |  8 ++++----
 components/diy_pingd_buy/diy_pingd_buy.wxml |  2 +-
 components/diy_seckill/diy_seckill.wxml     |  4 ++--
 components/diy_shopname/diy_shopname.js     | 10 +++++++++-
 components/diy_shopname/diy_shopname.wxml   |  2 +-
 7 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/components/diy_nav/diy_nav.wxss b/components/diy_nav/diy_nav.wxss
index bab1c1d..f8d7573 100644
--- a/components/diy_nav/diy_nav.wxss
+++ b/components/diy_nav/diy_nav.wxss
@@ -134,7 +134,7 @@
 .big_two {
   display: inline-block;
   width: 100%;
-  min-height: 280rpx;
+  /* min-height: 280rpx; */
   /* 先设置最小容器单位，min-height:280rpx;然后再设置auto */
   height: auto;
 }
@@ -163,7 +163,7 @@ image {
 /* 文字1 */
 
 .test {
-  width: 60rpx;
+  /* width: 60rpx; */
   height: 40rpx;
   margin-left: 30rpx;
   font-size: 30rpx;
diff --git a/components/diy_nav/diy_nav_part1.wxml b/components/diy_nav/diy_nav_part1.wxml
index 596ac72..10d7926 100644
--- a/components/diy_nav/diy_nav_part1.wxml
+++ b/components/diy_nav/diy_nav_part1.wxml
@@ -1,10 +1,10 @@
- <view style='width:{{100/nav_list.length}}%'
+ <view style='width:{{100/nav_list.length}}%;background-color: {{item.bgcolor}};'
                     class="{{object.seticon==1?'big_view_one':object.seticon==2?'big_view_two':'bicder_picture'}}">
                     <block wx:if="{{item.navicon==null}}">
                         <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
                                class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}"
                                src="{{imghost}}/miniapp/images/nav-icon.png"></image>
-                        <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}">
+                        <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}" style="color:{{item.txtcolor}};">
                            {{item.title}}
                         </view>
                     </block>
@@ -12,7 +12,7 @@
                         <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
                                class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}"
                                src="{{item.navicon}}"></image>
-                        <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}">
+                        <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}" style="color:{{item.txtcolor}};">
                            {{item.title}}
                         </view>
                     </block>
diff --git a/components/diy_nav/diy_nav_part2.wxml b/components/diy_nav/diy_nav_part2.wxml
index ef8fae0..5bc2d97 100644
--- a/components/diy_nav/diy_nav_part2.wxml
+++ b/components/diy_nav/diy_nav_part2.wxml
@@ -1,17 +1,17 @@
- <view class="one_div">
+ <view class="one_div" style='background-color: {{item.bgcolor}};padding:10rpx 0rpx;border-radius: 5rpx; '>
                     <view class="picture_one">
                         <block wx:if="{{item.navicon!=null}}">
-                            <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
+                            <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;margin-top: 10rpx;'
                                    src="{{item.navicon}}">
                             </image>
                         </block>
 
                         <block wx:if="{{item.navicon==null}}">
-                            <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
+                            <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;margin-top: 10rpx;'
                                  src="{{imghost}}/miniapp/images/nav-icon.png">
                             </image>
                         </block>
 
                     </view>
-                    <view class="test">{{item.title}}</view>
+                    <view class="test" style="color:{{item.txtcolor}};">{{item.title}}</view>
 </view>
diff --git a/components/diy_pingd_buy/diy_pingd_buy.wxml b/components/diy_pingd_buy/diy_pingd_buy.wxml
index 9e9cf15..5564c64 100644
--- a/components/diy_pingd_buy/diy_pingd_buy.wxml
+++ b/components/diy_pingd_buy/diy_pingd_buy.wxml
@@ -45,7 +45,7 @@
               </view>
 
               <view class='sp_wz_p'>
-                <view class='sp_wzi_p'>{{aitem.goods_name}}</view>
+                <view class='sp_wzi_p'>{{aitem.title}}</view>
                 <view class='sp_jg_p'>￥{{aitem.price}}</view>
                 <!--<view class='sp_jgx_p'>￥{{aitem.market_price}}</view>-->
 
diff --git a/components/diy_seckill/diy_seckill.wxml b/components/diy_seckill/diy_seckill.wxml
index 9eac2c0..f5cee6e 100644
--- a/components/diy_seckill/diy_seckill.wxml
+++ b/components/diy_seckill/diy_seckill.wxml
@@ -52,7 +52,7 @@
               </view>
 
               <view class='sp_wz'>
-                <view class='sp_wzi'>{{aitem.goods_name}}</view>
+                <view class='sp_wzi'>{{aitem.title}}</view>
                 <view class='sp_jg'>￥{{aitem.price}}</view>
                 <view class='sp_jgx'>￥{{aitem.market_price}}</view>
               </view>
@@ -75,7 +75,7 @@
             </view>
 
             <view class="o1_right">
-              <view class="sp_wzi">{{aitem.goods_name}}</view>
+              <view class="sp_wzi">{{aitem.title}}</view>
               <view class="o1_sj_kill">
                 <text>{{aitem.djs.day}}</text> 天
                 <text>{{aitem.djs.hou}}</text> :
diff --git a/components/diy_shopname/diy_shopname.js b/components/diy_shopname/diy_shopname.js
index 5cae66a..f794add 100644
--- a/components/diy_shopname/diy_shopname.js
+++ b/components/diy_shopname/diy_shopname.js
@@ -65,7 +65,15 @@ Component({
     go_new_wares:function () {
        var url="/pages/goods/goodsList/goodsList?is_new=1";
       getApp().goto(url);
-    }
+    },
+    //主图的图片显示	
+	berror:function(e){
+		  var err=e.currentTarget.dataset.err;
+		  var url=this.data.imghost+'/public/static/images/model/bg.jpg';
+		  var ob={};
+		  ob[err]=url;
+		  this.setData(ob);
+	}
 
   }
 })
\ No newline at end of file
diff --git a/components/diy_shopname/diy_shopname.wxml b/components/diy_shopname/diy_shopname.wxml
index d128a56..779c337 100644
--- a/components/diy_shopname/diy_shopname.wxml
+++ b/components/diy_shopname/diy_shopname.wxml
@@ -3,7 +3,7 @@
     <view class="big">
 
         <view class="big_picture_border">
-            <image class="big_picture" src='{{object.srcimg}}'></image>
+            <image class="big_picture" src='{{object.srcimg}}' binderror="berror" data-err="object.srcimg"></image>
         </view>
         <block wx:if="{{object.style==1}}">
 
--
libgit2 0.21.4