From a674fcbf331784483065c8589a1c03479aa0c82a Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 4 Sep 2023 09:51:49 +0800
Subject: [PATCH] 重新推送的优化

---
 components/nodata/nodata.js                         | 12 +++++++++++-
 components/nodata/nodata.wxml                       |  2 +-
 packageA/pages/chongzhiDetails/chongzhiDetails.js   | 19 +++++++++++++++----
 packageA/pages/chongzhiDetails/chongzhiDetails.wxml | 32 +++++++++++++++++++++++---------
 packageA/pages/chongzhiDetails/g_filter.wxs         |  7 ++++++-
 5 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/components/nodata/nodata.js b/components/nodata/nodata.js
index 9752283..3c4deb9 100644
--- a/components/nodata/nodata.js
+++ b/components/nodata/nodata.js
@@ -1,5 +1,15 @@
 Component({
-	externalClasses: ['nodata-container'],
+  externalClasses: ['nodata-container'],
+  //在.js文件中
+  properties: {
+    // 简单的定义方式
+    // max:Number
+    // 完整的定义方式
+    title:{
+      type:String,
+      value:10
+    }
+  },
   /*** 页面的初始数据***/
   data: {
 
diff --git a/components/nodata/nodata.wxml b/components/nodata/nodata.wxml
index 536a987..8f008a2 100644
--- a/components/nodata/nodata.wxml
+++ b/components/nodata/nodata.wxml
@@ -1,4 +1,4 @@
 <view class="nodata-container">
 	<view class="nodata-icon iconfont icon-nodata"></view>
-	<view class="nodata-title">暂无数据</view>
+	<view class="nodata-title">{{ftitle?title:'暂无数据'}}</view>
 </view>
diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.js b/packageA/pages/chongzhiDetails/chongzhiDetails.js
index 05ae07f..481ed6a 100644
--- a/packageA/pages/chongzhiDetails/chongzhiDetails.js
+++ b/packageA/pages/chongzhiDetails/chongzhiDetails.js
@@ -23,7 +23,8 @@ Page({
    */
   onLoad: function (options) {
 
-	   const self = this;		
+	   wx.showLoading();
+	   const self = this;
 	   if(options.type)
 	      self.setData({type:options.type});
 	  	   
@@ -50,11 +51,11 @@ Page({
 		
 		   
 	   getApp().request.promiseGet("/api/weshop/ad/page",{
-		 data:{store_id:os.stoid,enabled:1,pid:601}  
+		 data:{store_id:os.stoid,enabled:1,pid:1210}
 	   }).then(res=>{
 		   if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){
 			   var a = res.data.data.pageData;			   
-			   self.setData({show_img:a[0].ad_code,ad_color:a[0].bgcolor});
+			   self.setData({show_img:a[0].ad_code,ad_color:a[0].bgcolor,ad:a[0] });
 		   }
 	   })	
 	   
@@ -94,7 +95,9 @@ Page({
 				self.setData({
 					result: result,
 				});
-			
+
+				wx.hideLoading();
+
 		  },
 		});
 				
@@ -276,4 +279,12 @@ Page({
 	            }
 	        })
 	  },
+
+
+	go_url:function (e){
+        var url=e.currentTarget.dataset.url;
+		if(url){
+           getApp().goto(url);
+		}
+	}
 })
\ No newline at end of file
diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.wxml b/packageA/pages/chongzhiDetails/chongzhiDetails.wxml
index 055d1fe..3b92c0e 100644
--- a/packageA/pages/chongzhiDetails/chongzhiDetails.wxml
+++ b/packageA/pages/chongzhiDetails/chongzhiDetails.wxml
@@ -3,16 +3,30 @@
 <view class="container">
 	<view>
 		<view class="banner-container" wx:if="{{show_img}}">
-			<image class="img-block" src="{{url+show_img}}" mode="widthFix"
-		       lazy-load="true" binderror="bind_err" data-errorimg="show_img" ></image></view>
-					
-		<view class="list">
-			<view class="title-container">
-				<view class="title">
-					<view>女王专享</view>
-					<view>你的美丽我来缔造</view>
-				</view>
+
+			<navigator url="{{item.ad_weapplink}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(ad.ad_weapplink,'plugin')>=0}}">
+		    	<image class="img-block" src="{{url+show_img}}" mode="widthFix"
+		         lazy-load="true" binderror="bind_err" data-errorimg="show_img" ></image>
+			</navigator>
+
+			<block wx:else>
+				<image class="img-block" src="{{url+show_img}}" mode="widthFix" bindtap="go_url"
+					   data-url="{{ad.ad_weapplink}}"
+					   lazy-load="true" binderror="bind_err" data-errorimg="show_img" ></image>
+			</block>
+
+
+		</view>
+
+		<view class="title-container" wx:else>
+			<view class="title">
+				<view>女王专享</view>
+				<view>你的美丽我来缔造</view>
 			</view>
+		</view>
+
+		<view class="list">
+
 			<view >			
 				<view class="list-item flex" wx:for="{{result.givelist}}">									
 					<!-- 左图片 -->
diff --git a/packageA/pages/chongzhiDetails/g_filter.wxs b/packageA/pages/chongzhiDetails/g_filter.wxs
index f9bd741..f924278 100644
--- a/packageA/pages/chongzhiDetails/g_filter.wxs
+++ b/packageA/pages/chongzhiDetails/g_filter.wxs
@@ -6,6 +6,11 @@ var is_acting = function(endtime){
   var bijiao = getDate(endtime) - getDate(); 
   return bijiao > 0 ? true : false;
 }
+var has_char=function(url,key){
+  if(!url)	return -1;
+  return url.indexOf(key);
+}
 module.exports = {
-	is_acting:is_acting  
+	is_acting:is_acting,
+    has_char:has_char,
 }
\ No newline at end of file
--
libgit2 0.21.4