Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

taiyuan
2 parents 2ea288c2 ec12e1ac
Showing 15 changed files with 91 additions and 40 deletions
components/diy_service/diy_service.js
components/diy_title/diy_title.js
components/diy_title/diy_title.wxml
components/diy_title/diy_title.wxss
components/diy_voice/diy_voice.js
packageA/pages/activity_share/activity_share.js
packageA/pages/goods_share/goods_share.js
packageA/pages/quan_list/filter.wxs
packageA/pages/quan_list/quan_list.wxml
packageA/pages/service_share/service_share.js
pages/goods/goodsInfo/goodsInfo.js
pages/goods/search/search.js
pages/goods/search/search.wxml
pages/store/index.js
pages/user/my_service/i_service.wxml
@@ -26,7 +26,7 @@ Component({
 			 var iurl=getApp().globalData.setting.imghost;
 			 var ob={};
 			 var txt="object.title_img";
-		  	 ob[txt] = iurl +'/miniapp/images/logo.png';
+		  	 ob[txt] = iurl +'/miniapp/images/logo.png?v=1';
 			 this.setData(ob);
 	},
@@ -22,7 +22,7 @@ Component({
 			 var iurl=getApp().globalData.setting.imghost;
 			 var ob={};
 			 var txt="object.title_img";
-		  	ob[txt] = iurl +'/miniapp/images/logo.png';
+		  	ob[txt] = iurl +'/miniapp/images/logo.png?v=1';
 			 this.setData(ob);
 		}
   }
@@ -19,7 +19,7 @@
                 <view class="font_right_rim">
                     <view class="caption" style='color:{{object.title_rightcolor}}'>{{object.title_right}}</view>
                 </view>
-                <view class="aa">></view>
+                <view class="aa"></view>
             </view>
         </view>
     </block>
@@ -5,6 +5,7 @@
   height: auto;
   display: flex;
   padding: 10rpx 0;
+  align-items: center;
 }
 /* 图片边框 */
@@ -43,7 +44,8 @@
 .right_rim {
   min-width: 200rpx;
   width: auto;
-  display: inline-block;
+  display: flex;
+  align-items: center;
 }
 /* 右侧文字边框 */
@@ -75,3 +77,12 @@
   vertical-align: top;
   margin-top: 12rpx
 }
+.aa::after{
+   content: '';
+   display: inline-block;
+   width: 25rpx;
+   height: 25rpx;
+   border-top:1rpx solid #aaa;
+   border-right: 1rpx solid #aaa;
+   transform: rotate(45deg);
+}
@@ -53,7 +53,7 @@ Component({
       var v_logo=vo.logo;
       if (!(vo.logo.indexOf("/public/static/images/model/logo.png"))){
         this.setData({
-          voice_logo:"https://mshopimg.yolipai.net/miniapp/images/logo.png"
+          voice_logo:"https://mshopimg.yolipai.net/miniapp/images/logo.png?v=1"
         })
       }else{
         this.setData({
@@ -1147,7 +1147,7 @@ Page({
 	 		 var url="/api/weshop/sharetypeList/save";
 	 		 var req_data={
 	 		 	shareActId:actid,
-	 		 	shareActName:title,
+					shareActName:title,
 	 			shareType:ind,
 	 			shareUserId:th.data.first_leader,
 	 			shareStaffId:th.data.StaffId,
@@ -866,7 +866,9 @@ Page({
 		 var url="/api/weshop/sharetypeList/save";
 		 var req_data={
 		 	shareActId:item.goods_id,
-		 	shareActName:item.goods_name,
+			 shareActName:item.goods_name,
+			 ShareActNo:item.goods_sn,
+			 ActMoney:item.shop_price,
 			shareType:2,
 			shareUserId:th.data.first_leader,
 			shareStaffId:th.data.StaffId,
@@ -11,13 +11,16 @@ function get_guige(color,spece){
 	 return "";
 }
-function get_color(index){
-   var i=index%3;
+function get_color(index,list){
+   var i=index+1;
+   var count=list.length;	   
+   var str="purple";	
+   i=index%count;
    switch(i){
-      case 0: return "red";
-      case 1: return "blue";
-      case 2: return "purple";
+      case 1: str="red";
+      case 2: str="blue";    
    }
+   return str;
 }
 module.exports = {
@@ -10,7 +10,7 @@
 <view class="content">
    <view bindtap="go_detail" data-ind="{{index}}" class="quan_item flex fs30" wx:for="{{dataList}}">
         <!-- 左边 -->
-        <view class="left {{tool.get_color(index)}} flex ai-center jc-center co-w">
+        <view class="left {{tool.get_color(index,dataList)}} flex ai-center jc-center co-w">
             <view class="t-c">
                <view class="fs40"><text class="fs24">￥</text>{{filters.toFix(item.money,2)}}</view>
                <view>满{{filters.toFix(item.condition,2)}}可用</view>
@@ -846,7 +846,9 @@ Page({
 		 var item=this.data.share_good;			 
 		 var url="/api/weshop/sharetypeList/save";
 		 var req_data={
-		 	shareActId:item.id,
+			 shareActId:item.id,
+			 ShareActNo:item.service_sn,
+			 ActMoney:item.money,
 		 	shareActName:item.serviceName,
 			shareType:8,
 			shareUserId:th.data.first_leader,
@@ -852,7 +852,7 @@ Page({
               ee.get_sto();
             }
-            ee.get_sku(o.stoid, t.data.data.sku, gid);
+            ee.get_sku(o.stoid, t.data.data, gid);
           }
           else {
             var gg = "", item = t.data.data;
@@ -2070,14 +2070,15 @@ Page({
   },
   //----------装载同一条形码的商品----------
-  async get_sku(stoid, sku, g_id, is_normal, func) {
+  async get_sku(stoid, gd, g_id, is_normal, func) {
     var tt = this,arrdata=null;
     var now=ut.gettimestamp();
     await getApp().request.promiseGet("/api/weshop/goods/page", {
       data: {
         store_id: o.stoid,
-        sku: sku,
+        sku: gd.sku,
+        more_spec:gd.more_spec,
         isonsale: 1,
         is_on_sale: 1,
 		pageSize:500
@@ -2782,7 +2783,7 @@ Page({
                   prom_type: 0,
                   isshow: 1,
                 });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                ee.get_sku(os.stoid, ee.data.data, gid);
                 return false;
               }
               //----已经结束-----
@@ -2791,7 +2792,7 @@ Page({
                   prom_type: 0,
                   isshow: 1,
                 });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                ee.get_sku(os.stoid, ee.data.data, gid);
                 ee.get_sto();
                 return false;
               }
@@ -2802,7 +2803,7 @@ Page({
                   prom_type: 0,
                   isshow: 1,
                 });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                ee.get_sku(os.stoid, ee.data.data, gid);
                 return false;
               }
@@ -2812,7 +2813,7 @@ Page({
                   prom_type: 0,
                   isshow: 1,
                 });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                ee.get_sku(os.stoid, ee.data.data, gid);
                 ee.get_sto();
                 return false;
               }
@@ -2905,7 +2906,7 @@ Page({
 		   }else{
 			   ee.setData({prom_type: 0, isshow: 1,});
-			   ee.get_sku(os.stoid, ee.data.data.sku, gid);
+			   ee.get_sku(os.stoid, ee.data.data, gid);
 			   ee.get_sto();
 			   return false;
 		   }					   
@@ -2936,7 +2937,7 @@ Page({
                   prom_type: 0,
                   isshow: 1,
                 });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                ee.get_sku(os.stoid, ee.data.data, gid);
                 ee.get_sto();
                 return false;
               }
@@ -2946,7 +2947,7 @@ Page({
                   prom_type: 0,
                   isshow: 1,
                 });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                ee.get_sku(os.stoid, ee.data.data, gid);
                 return false;
               }
               //----已经过期-----
@@ -2956,7 +2957,7 @@ Page({
                   prom_type: 0,
                   isshow: 1,
                 });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                ee.get_sku(os.stoid, ee.data.data, gid);
                 ee.get_sto();
                 return false;
               }
@@ -2967,7 +2968,7 @@ Page({
                   prom_type: 0,
                   isshow: 1,
                 });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                ee.get_sku(os.stoid, ee.data.data, gid);
                 ee.get_sto();
                 return false;
               }
@@ -3313,7 +3314,7 @@ Page({
         });
       } else {
 		th.get_sto(1);  		  
-        th.get_sku(o.stoid, th.data.data.sku, th.data.gid, 1, function() {
+        th.get_sku(o.stoid, th.data.data, th.data.gid, 1, function() {
           th.setData({
             is_normal: ind,
             openSpecModal_pt: 1
@@ -101,6 +101,7 @@ Page({
        //扫一扫过来，显示搜索的内容
        var s_key = t.s_key;
        if (s_key){
+		 s_key=s_key.trim();  	   
          this.search(s_key); this.openSearchModal();
          return;
        }
@@ -190,16 +191,24 @@ Page({
         });
     },
     submitSearch: function(t) {
-			console.log(111);
-        this.search(t.detail.value.word);
-				
-				
+		console.log(111,t);
+		var val=t.detail.value.word;
+		if(val==undefined) val=t.detail.value;	
+		val=val?val.trim():'';
+		if(!val){
+			a.showWarning("请输入搜索关键词");
+		}
+			
+        this.search(val);
+							
     },
     //热搜关键字
     searchHotWord: function(t) {
-			this.historyRecord();
-      this.search(t.currentTarget.dataset.word);
+		
+	  var word=	t.currentTarget.dataset.word;
+	  this.historyRecord(word);
+      this.search(word);
     },
     //-----点击搜索按钮----
@@ -280,15 +289,34 @@ Page({
 	 	});
 	 },
-	 historyRecord() {
+	 historyRecord(w) {	 
+		let keyword =w;		
 		let self = this;
-	 	let keyword = this.data.key_str;
-	 	let searchRecord = this.data.searchRecord;	
+		if(!keyword){		 		
+    		keyword = this.data.key_str.trim();
+		}
+		let searchRecord = this.data.searchRecord;
 		if(!searchRecord || searchRecord.length==0) searchRecord=wx.getStorageSync('searchRecord') || [];
 	 	if(keyword) {
-	 		if(searchRecord.indexOf(keyword) > -1) {
+			
+			var index=searchRecord.indexOf(keyword);
+	 		if(index > -1) {
 	 			// 已经存在该值
+				searchRecord.splice(index,1);
+				searchRecord.unshift(keyword);
+				
+				// 将历史记录添加到缓存中
+				 wx.setStorage({
+					 key: 'searchRecord',
+					 data: searchRecord,
+					 success: function(res) {
+						 self.setData({
+							 searchRecord,
+						 })
+					 }
+				 })
+				
 	 			return;
 	 		} else {
 	 			if(searchRecord.length >= 10) {
@@ -162,7 +162,7 @@
   <view class="search-modal">
     <view class="search-bar">
       <form bindsubmit="submitSearch">
-        <input autoFocus class="search-input" name="word" placeholder="搜索商品" bindinput="getInput"></input>
+        <input autoFocus class="search-input" name="word" placeholder="搜索商品" bindconfirm="submitSearch" bindinput="getInput"></input>
         <button class="search-btn" formType="submit">
           <image class="wh100 search-img" src="{{url}}/miniapp/images/sea.png"></image>
         </button>
@@ -81,6 +81,11 @@ Page({
 	  if(th.data.cat_id){
 		  dd.category_id=th.data.cat_id;
 	  }
+	  if(th.data.lat){
+		  dd.lat=th.data.lat;
+		  dd.lon=th.data.lon;
+	  }
+	  
 	  wx.showLoading();
 	  //----------获取门店---------
@@ -98,6 +98,5 @@
 <warn id="warn"></warn>
 <my_confirm id="my_confirm"></my_confirm>
-
 <!-- 批量预约图标 -->
-<view class="icon-container" bindtap="goto" data-url="/packageA/pages/my_service2/appment_main"><text class="iconfont icon-plyy"></text></view>
 \ No newline at end of file
+<!-- <view class="icon-container" bindtap="goto" data-url="/packageA/pages/my_service2/appment_main"><text class="iconfont icon-plyy"></text></view> -->
 \ No newline at end of file