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

WXD-SEASON\season
2 parents a5119954 7a6db64f
Showing 24 changed files with 57 additions and 36 deletions
components/diy_pregoods/diy_pregoods.js
components/diy_pregoods/diy_pregoods.wxml
components/diy_pregoods/diy_pregoods.wxss
components/diy_searchbox/diy_searchbox.js
components/diy_searchbox/diy_searchbox.wxml
packageA/pages/cardList/cardList.wxml
packageA/pages/distribution/commision/commision.js
packageA/pages/distribution/commision/commision.wxml
packageA/pages/distribution/order/order.wxml
packageA/pages/jfbuy/jfbuy.js
packageC/pages/goods/search/search.wxml
packageC/pages/presell/cart/cart.js
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/goodsInfo/goodsInfo.wxml
packageD/pages/shop/order_detail/order_detail.js
packageE/pages/cart/cart2/cart2.js
pages/cart/cart2_inte/cart2_inte.js
pages/goods/categoryList/categoryList.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsList/goodsList.wxml
@@ -55,7 +55,7 @@ Component({
 			  goodsidlist=ut.sub_last(goodsidlist);
               var user_id=getApp().globalData.user_id;
-              var pre_data={store_id:os.stoid,is_end:0,timetype:1,isuse:1};
+              var pre_data={store_id:os.stoid,is_end:0,timetype:3,isuse:1};
               if(user_id){
                   pre_data.user_id=user_id;
 			  }
@@ -89,7 +89,7 @@ Component({
 	no_gid_set(){
     	var th=this;
         var user_id=getApp().globalData.user_id;
-        var pre_data={store_id:os.stoid,is_end:0,timetype:1,isuse:1,page:1,pageSize:9};
+        var pre_data={store_id:os.stoid,is_end:0,timetype:3,isuse:1,page:1,pageSize:9};
         if(user_id){
             pre_data.user_id=user_id;
         }
@@ -30,6 +30,13 @@
 					     <span class='s_top_kill'>火热进行</span>
 					   </view>
 					 </block>
+
+                    <block wx:if="{{aitem.start_time>newTime}}">
+                        <view class="rob">
+                            <span class='s_top_kill' style="background-color: #ffe718">即将开始</span>
+                        </view>
+                    </block>
+
 					 <block wx:if="{{aitem.buy_goodnum>=aitem.presell_sumqty}}">
 					   <view class="rob">
 					     <span class='s_top_kill gray'>已抢光</span>
@@ -57,6 +57,7 @@ swiper {
 .sp .sp_top {
   height: 220rpx;
   min-width: 30%;
+  position: relative;
 }
 .sp .sp_top .s_img {
@@ -76,7 +77,7 @@ swiper {
   font-size: 24rpx;
   height: 38rpx;
   line-height: 38rpx;
-  left: 6rpx;
+  left: 2rpx;
   padding: 4rpx 10rpx;
   border-radius: 10rpx;
   z-index: 999;
@@ -17,7 +17,7 @@ Component({
     someData: {},
 	first:1,
 	inputShowed:1,
-	inputval:'在店铺内搜索',
+	inputval:'请输入商品关键字',
 	keyword:'',
 	searchRecord: [],
@@ -6,7 +6,7 @@
 		<view bindtap='click_sear'  class="s1_gk_a1" wx:if="{{first}}">
 		   <view class='s_ge'>
 			   <image src='{{imghost}}/miniapp/images/search.png'></image>
-		    	<text>在店铺内搜索</text>
+		    	<text>请输入商品关键字</text>
 		   </view>
 		</view>
 		<!-- 响应搜索事件 -->
@@ -39,7 +39,7 @@
 	    <view class='s2_cen' style='background-color:{{object.inner_bgcolor}}'>
 	        <navigator wx:if="{{first}}" bindtap='click_sear' class="s1_gk_a2 flex" style='height: 100%;color:{{object.word_color?object.word_color:"#fff"}}'>
 	           <text class="iconfont icon-search" style="font-size: 40rpx;"></text>
-	           <text>在店铺内搜索</text>
+	           <text>请输入商品关键字</text>
 	        </navigator>
 			<view wx:else class="s1_gk_a2" style='color:{{object.word_color?object.word_color:"#fff"}}'>
 					<!-- <view class="pr"> -->
@@ -16,7 +16,7 @@
 				<view class="flex fdc space-bt f1 pdl20">
 					<view>
 						<view class="pdv20 fs28"><text class="ellipsis-2">{{item.serviceName}}</text></view>
-						<view class="fs24 c7b">有效天数：{{item.validDays?item.validDays:0}}</view>
+						<view class="fs24 c7b">有效天数：{{item.validDays &&  item.validDays!='0'?item.validDays:'不限'}}</view>
 					</view>
 					<view class="flex space-bt ali-c">
 						<view class="price">{{item.money}}</view>
@@ -40,7 +40,7 @@
 					<view class="flex fdc space-bt f1 pdl20">
 						<view>
 							<view class="pdv20 fs28"><text class="ellipsis-2">{{item.serviceName}}</text></view>
-							<view class="fs24 c7b">有效天数：{{item.validDays?item.validDays:'不限'}}</view>
+							<view class="fs24 c7b">有效天数：{{item.validDays  && item.validDays!='0'?item.validDays:'不限'}}</view>
 						</view>
 						<view class="flex space-bt ali-c">
 							<view class="price">{{item.money}}</view>
@@ -73,7 +73,7 @@
 				<view class="flex fdc space-bt f1 pdl20">
 					<view>
 						<view class="pdv20 fs28"><text class="ellipsis-2">{{item.serviceName}}</text></view>
-						<view class="fs24 c7b">有效天数：{{item.validDays?item.validDays:0}}</view>
+						<view class="fs24 c7b">有效天数：{{item.validDays && item.validDays!='0'?item.validDays:'不限'}}</view>
 					</view>
 					<view class="flex space-bt ali-c">
 						<view class="price">{{item.money}}</view>
@@ -10,7 +10,7 @@ Page({
   data: {
 		isHiddenDropdown: true,//控制下拉菜单显隐
 		dropdownArr: ['综合','未付款','已付款','待分成','已分成','已取消'],
-		statusArr: ['未付款', '已付款', '等待分成', '已分成', '已取消'],
+		statusArr: ['未付款', '已付款', '等待分成', '已分成', '已取消','已退款'],
 		currentSelect: '',//记录当前下拉菜单选中项
 		isInputFocus: false,//记录搜索输入框是否聚焦
 		inputVal: '',//记录搜索输入框的内容
@@ -31,7 +31,7 @@
 		<view class="item fs26" wx:for="{{list.pageData}}">
 			<view class="flex jc_sb pd20 bdb">
 				<view class="time">{{filter.format_time(item.create_time, 1)}}</view>
-				<view class="c-red">{{filter.status(item.status, statusArr)}}</view>
+				<view class="c-red">{{filter.status(item.status, statusArr,item.order_status)}}</view>
 			</view>
 			<view class="pd20"><text class="c-a fs24">订单号：</text>{{item.order_sn}}</view>
 			<view class="flex t-c">
@@ -12,7 +12,7 @@
 					<text class="iconfont icon-ren" wx:else></text>
 					<text class="pdl10">{{item.nickname}}</text>
 				</view>
-				<view class="c-a">{{filter.status(item.status, statusArr)}}</view>
+				<view class="c-a">{{filter.status(item.status, statusArr,item.order_status)}}</view>
 			</view>
 			<view class="flex jc_sb ai-center pd20" wx:for="{{item.goods}}" wx:for-item="it" bindtap="goto" data-url="{{'/pages/goods/goodsInfo/goodsInfo?goods_id=' + it.goods_id}}">
 				<view class="flex pdr20">
@@ -372,7 +372,10 @@ Page({
 		// var req_data = {
 		// 	page:th.data.currentPage2
-		// }
+    // }
+    if (getApp().globalData.user_id) {
+      data.user_id=getApp().globalData.user_id
+    }
 		app.request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList", {	
 			data: data
@@ -3,7 +3,7 @@
   <view class="search-modal">
     <view class="search-bar">
       <form bindsubmit="submitSearch">
-        <input autoFocus class="search-input" name="word" placeholder="搜索商品" bindconfirm="submitSearch" 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>
@@ -2670,7 +2670,7 @@ Page({
                 if (gg.prom_type == 4) {
                     await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1", {
-                        data: { store_id: os.stoid, goods_id: gg.goods_id }
+                        data: { store_id: os.stoid, goods_id: gg.goods_id,user_id: getApp().globalData.user_id, }
                     }).then(res => {
                         if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length) {
                             prom = res.data.data.pageData[0];
@@ -2765,7 +2765,7 @@ Page({
         if (goodsinfo.prom_type == 4 && !good.is_integral_normal) {
             await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1", {
-                data: { store_id: os.stoid, goods_id: goodsinfo.goods_id }
+                data: { store_id: os.stoid, goods_id: goodsinfo.goods_id,user_id: getApp().globalData.user_id, }
             }).then(res => {
                 if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length) {
                     prom = res.data.data.pageData[0];
@@ -255,6 +255,8 @@ Page({
     pre_arr: null,
     hiddenCS: true,
+
+    is_retail_price: 0,
   },
   //------初始化加载----------
@@ -391,7 +393,8 @@ Page({
         store_config: e,
         sys_switch: json_d,
         is_closecoupon: json_d.is_closecoupon,
-        is_newsales_rules: json_d.is_newsales_rules
+        is_newsales_rules: json_d.is_newsales_rules,
+        is_retail_price: json_d.is_retail_price || 0,
       });
       // ee.init(gid);
       //------几人评价-------
@@ -80,10 +80,10 @@
           <!-- <view class="flex" style='height:40rpx; margin-top:5rpx;'> -->
           <view class="abs xc-qt-price fs28 xc-qtsign">预售价</view>
           <view class="abs flex presell_price">
-            <view class="fs28 val" style="margin-right:100rpx">￥{{presellList.presell_price}}</view>
-<!--            <view class="word-line fs26 xc-qtunit-price">-->
-<!--              零售价￥{{filters.toFix(data.market_price,2)}}-->
-<!--            </view>--> 
+            <view class="fs28 val" style="margin-right:60rpx">￥{{presellList.presell_price}}</view>
+            <view wx:if="{{is_retail_price}}" class="word-line fs26 xc-qtunit-price">
+               零售价￥{{filters.toFix(data.market_price,2)}}
+            </view>
           </view>
@@ -535,7 +535,7 @@ Page({
 				  				  if(gg.prom_type==4){
 				  				  			await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2",{
-				  								data:{store_id:os.stoid,goods_id:gg.goods_id}
+				  								data:{store_id:os.stoid,goods_id:gg.goods_id,user_id: getApp().globalData.user_id,}
 				  				  			}).then(res=>{
 				  				  				  if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){
 				  				  					  prom=res.data.data.pageData[0];
@@ -659,7 +659,7 @@ Page({
 			  if(goodsinfo.prom_type==4 && !good.is_integral_normal){
 			  			 await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2",{
-			  			 	data:{store_id:os.stoid,goods_id:goodsinfo.goods_id}
+			  			 	data:{store_id:os.stoid,goods_id:goodsinfo.goods_id,user_id: getApp().globalData.user_id,}
 			  			 }).then(res=>{
 			  			 	  if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){
 			  			 		  prom=res.data.data.pageData[0];
@@ -6797,6 +6797,7 @@ Page({
       item.goods_price = item.price;
       item.is_collocation = 1;
       item.prom_type = 5;
+      item.is_post_temp = 1;
       th.setData({is_coupon:item.is_coupon})
@@ -6914,6 +6915,7 @@ Page({
       item.goods_price = item.price;
       item.prom_type = 5;
       item.is_collocation = 1;
+      item.is_post_temp = 1;
       goods.push(item);
@@ -6946,6 +6948,8 @@ Page({
     var et = 1;
     var distr_t = 0; // 配送方式 0=用户自选 1=自提 2=物流
     for (var hi in narr) {
+
+      narr[hi].is_post_temp=1;  //-- 固定都是参与包邮模板 --
       var dis_t = narr[hi].distr_type;
       if (dis_t == 2) {
         th.setData({ is_all_zt: 0 });
@@ -540,7 +540,7 @@ Page({
               break;
             case 4: //-- 积分购 --
               getApp().request.get("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2", {
-                data: { store_id: os.stoid, goods_id: gg.goods_id },
+                data: { store_id: os.stoid, goods_id: gg.goods_id, user_id: to.globalData.user_id, },
                 success: async function (tt) {
                   if (tt.data.code == 0 && tt.data.data && tt.data.data.pageData) {
                     var inte_data = tt.data.data.pageData[0];
@@ -131,11 +131,11 @@
 					<view class="search-img left">
 						<image class="wh100" src="{{iurl}}/miniapp/images/search.png"></image>
 					</view>
-					<input bindfocus="goseach" class="search-cont" placeholder="搜索店铺商品" type="text"></input>
+					<input bindfocus="goseach" class="search-cont" placeholder="输入商品关键字" type="text"></input>
 				</view> -->
       <!-- 搜索框 -->
       <view class="search-container f1">
-        <view bindtap="goseach"><text class="iconfont icon-sousuo pdr10"></text>搜索店铺商品</view>
+        <view bindtap="goseach"><text class="iconfont icon-sousuo pdr10"></text>输入商品关键字</view>
       </view>
       <view class="pdl30" bindtap="getScancode">
         <image class="scanning_black-img" src="{{iurl}}/miniapp/images/goodscategory/scanning_black.png"></image>
@@ -398,7 +398,7 @@
       <!-- 搜索框 -->
       <view class="search-container f1">
-        <view bindtap="goseach"><text class="iconfont icon-sousuo pdr10"></text>搜索店铺商品</view>
+        <view bindtap="goseach"><text class="iconfont icon-sousuo pdr10"></text>请输入商品关键字</view>
       </view>
       <view class="pdl30" bindtap="getScancode">
         <image class="scanning_black-img" src="{{iurl}}/miniapp/images/goodscategory/scanning_black.png"></image>
@@ -4428,7 +4428,8 @@ Page({
         stype: 1,
         stypeup: 1,
         goods_id: gid,
-        timetype:2
+        timetype:2,
+        user_id:getApp().globalData.user_id,
       }
       var integrals = 0;
@@ -21,7 +21,7 @@
 	<view class="pd20 flex ai-center jc_sb search_fixed">
 		<!-- 搜索框 -->
 		<view class="search-box f1">
-			<view hover-class="none" data-url="/pages/goods/search/search?ladder_id={{ladder_id}}" bindtap="go_url"><text class="iconfont icon-sousuo pdr10"></text>搜索店铺商品</view>
+			<view hover-class="none" data-url="/pages/goods/search/search?ladder_id={{ladder_id}}" bindtap="go_url"><text class="iconfont icon-sousuo pdr10"></text>请输入商品关键字</view>
 		</view>
 		<!-- 单列/双列 显示切换 -->
 		<text class="iconfont {{isToggle ? 'icon-fenlie':'icon-fenxiang'}} pdl30 fs36" bindtap="bindToggleDisplay"></text>
@@ -39,7 +39,7 @@
         <view class="search-img">
           <image class="wh100" src="{{url}}/miniapp/images/search.png"></image>
         </view>
-        <input bindtap="jumpSearch" class="search-cont" placeholder="搜索商品" type="text" disabled />
+        <input bindtap="jumpSearch" class="search-cont" placeholder="请输入商品关键字" type="text" disabled />
       </view>
       <view class="classify-frame t-c" bindtap="getScancode">
         <image class="classify-img" src="{{url}}/miniapp/images/scanning.png"></image>
@@ -585,7 +585,7 @@ Page({
 				  				  if(gg.prom_type==4){
 				  				  			await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2",{
-				  								data:{store_id:os.stoid,goods_id:gg.goods_id}
+				  								data:{store_id:os.stoid,goods_id:gg.goods_id,user_id: getApp().globalData.user_id,}
 				  				  			}).then(res=>{
 				  				  				  if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){
 				  				  					  prom=res.data.data.pageData[0];
@@ -709,7 +709,7 @@ Page({
 			  if(goodsinfo.prom_type==4 && !good.is_integral_normal){
 			  			 await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2",{
-			  			 	data:{store_id:os.stoid,goods_id:goodsinfo.goods_id}
+			  			 	data:{store_id:os.stoid,goods_id:goodsinfo.goods_id,user_id: getApp().globalData.user_id,}
 			  			 }).then(res=>{
 			  			 	  if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){
 			  			 		  prom=res.data.data.pageData[0];
@@ -651,7 +651,7 @@ Page({
     var order = e;
     var order_goods = e.order_goods;
     var user_id = getApp().globalData.userInfo.user_id;
-    
+ 
     //如果使用预存的话，要重新效验下预存金额是否足够
     if(order.pre_cut && order.pre_json){
       let pickup_id=order.pickup_id
@@ -976,7 +976,7 @@ Page({
           if (gg.prom_type == 4) {
             await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2", {
-              data: { store_id: os.stoid, goods_id: gg.goods_id }
+              data: { store_id: os.stoid, goods_id: gg.goods_id,user_id: getApp().globalData.user_id, }
             }).then(res => {
               if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
                 prom = res.data.data.pageData[0];
@@ -1097,7 +1097,7 @@ Page({
       if (goodsinfo.prom_type == 4 && !good.is_integral_normal) {
         await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2", {
-          data: { store_id: os.stoid, goods_id: goodsinfo.goods_id }
+          data: { store_id: os.stoid, goods_id: goodsinfo.goods_id,user_id: getApp().globalData.user_id, }
         }).then(res => {
           if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
             prom = res.data.data.pageData[0];
@@ -115,7 +115,7 @@ var filters = {
 	// num:状态数值,
 	// arr: 状态文字数组,
 	// 文字顺序必须跟状态数值对应
-	status: function (num, arr) {
+	status: function (num, arr,order_status) {
 		// var text = '';
 		// if(num == 0) {
 		// 	text = '未付款';
@@ -126,6 +126,8 @@ var filters = {
 		// } else if(num == 3) {
 		// 	text = '已完成';
 		// };
+
+		if(order_status==6) return '已退款';
 		return arr[num];
 	},