From 9daf44392ca9e4bd636569afaf2aaf2f540b12e1 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 20 Apr 2021 17:34:15 +0800
Subject: [PATCH] 1. 价格排序 2、 弹窗

---
 pages/goods/goodsList/goodsList.js   |  4 ++++
 pages/goods/goodsList/goodsList.wxml |  2 +-
 pages/goods/search/search.js         |  5 +++++
 pages/goods/search/search.wxml       |  2 +-
 pages/index/index/index.wxml         |  9 ++++-----
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index 4786d3d..4984781 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -66,6 +66,10 @@ Page({
      
 	  if (0 != t.is_new && t.is_new != undefined) { url += "&is_new=" + t.is_new; }
 	  if (0 != t.is_hot && t.is_hot != undefined) { url += "&is_hot=" + t.is_hot; }
+	  
+	  if(getApp().globalData.userInfo){
+		  url += "&user_id=" + getApp().globalData.userInfo.user_id;
+	  }
 
 	  //优惠活动的凑单
 	  if(t.prom_type==3){
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index 1f086fb..7b04967 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -28,7 +28,7 @@
       </view>
 
     </navigator>
-    <navigator bindtap="changeTab" class="nav-item" data-href="prom_price" data-ad="{{adname}}">
+    <navigator bindtap="changeTab" class="nav-item" data-href="final_price" data-ad="{{adname}}">
       价格
       <view class="ico-dg" wx:if="{{tabname=='final_price'}}">
         <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js
index 12f178a..7e1a067 100644
--- a/pages/goods/search/search.js
+++ b/pages/goods/search/search.js
@@ -107,6 +107,7 @@ Page({
        if (0 != t.brand_id && t.brand_id!=undefined){ url += "&brand_id=" + t.brand_id;}
        if (0 != t.nation_id && t.nation_id!=undefined) { url += "&nation_id=" + t.nation_id;}
        if (0 != t.max_price && t.max_price!=undefined) { url += "&min_pirce=" + t.min_pirce + "&max_price=" + t.max_price;}
+	      
        if (url != this.data.baseUrl) return this.requestSearch(url);
        this.openSearchModal();
 			 
@@ -132,6 +133,10 @@ Page({
     //-----------真的调用地址进行搜索------------
     requestSearch: function(t) {
         var a = this;
+	
+		if(getApp().globalData.userInfo){
+			t += "&user_id=" + getApp().globalData.userInfo.user_id;
+		}
 
         this.data.requestUrl = t, 
         //t += "&orderField=" + a.data.tabname;
diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml
index 9841727..8bdaf46 100644
--- a/pages/goods/search/search.wxml
+++ b/pages/goods/search/search.wxml
@@ -13,7 +13,7 @@
         <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
       </view>
     </navigator>
-    <navigator bindtap="changeTab" class="nav-item" data-href="prom_price" data-ad="{{adname}}">价格
+    <navigator bindtap="changeTab" class="nav-item" data-href="final_price" data-ad="{{adname}}">价格
       <view class="ico-dg" wx:if="{{tabname=='final_price'}}">
         <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
         <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index c88fe7b..8ec31dd 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -397,13 +397,12 @@
     <view class="newreceive flex-center">
       <view>
         <navigator bindtap="new_nav">
-          <view class="flex-level">
-            <image class="receive" src="{{url}}{{new_image==''?'/miniapp/images/newpeople/newreceive.png':new_image}}"></image>
+          <view class="flex-level" style="position: relative;">
+             <image class="receive" src="{{url}}{{new_image==''?'/miniapp/images/newpeople/newreceive.png':new_image}}"></image>
+			 <image class="close" src="{{url}}/miniapp/images/plus/Close.png" catchtap="close_disgraceful" style="margin-top: -70rpx; right: -60rpx;"></image>
           </view>
         </navigator>
-        <view class="flex-level">
-          <image class="close" src="{{url}}/miniapp/images/plus/Close.png" bindtap="close_disgraceful"></image>
-        </view>
+        <view class="flex-level"></view>
       </view>
     </view>
   </view>
--
libgit2 0.21.4