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

后端研发-倪永富
2 parents be1dfe24 f308fbec
Showing 20 changed files with 141 additions and 34 deletions
components/diy_goodsGroup/diy_goodsGroup.wxml
components/diy_goodsGroup/diy_goodsGroup.wxss
components/diy_picMax/diy_picMax.wxss
packageA/pages/prom_list/prom_list.js
packageA/pages/prom_list/prom_list.wxml
pages/cart/cart/cart.wxss
pages/giftpack/giftpacklist/giftpacklist.js
pages/giftpack/giftpacklist/giftpacklist.wxml
pages/giftpack/mygiftpack/mygiftpack.js
pages/goods/categoryList/categoryList.wxss
pages/goods/goodsInfo/goodsInfo.js
pages/index/index/index.wxss
pages/store/index.js
pages/store/index.wxml
pages/store/index.wxss
pages/user/assistance/friend_assistance.js
pages/user/index/index.wxml
pages/user/index/index.wxss
pages/user/userinfo/userinfo.js
utils/auth.js
@@ -149,7 +149,7 @@
                         <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
                                    binderror="bind_bnerr3"></image>
                         <block wx:if="{{object.goodicon==3}}">
-                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.position==1}}"
+                            <image class='{{g_filter.get_class(object.column,object.position)}}'
                                    src='{{object.customicon}}'></image>
                         </block>
                         <block wx:if="{{object.goodicon==1}}">
@@ -285,7 +285,7 @@
                             <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
                                        binderror="bind_bnerr3"></image>
                             <block wx:if="{{object.goodicon==3}}">
-                                <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{ object.position==1}}"
+                                <image class='{{g_filter.get_class(object.column,object.position)}}'
                                        src='{{object.customicon}}'></image>
                             </block>
                             <block wx:if="{{object.goodicon==1}}">
@@ -422,7 +422,7 @@
                     </block>
  
                     <block wx:if="{{object.goodicon==3}}">
-                        <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.position==2}}"
+                        <image class='{{g_filter.get_class(object.column,object.position)}}'
                                src='{{object.customicon}}'></image>
                     </block>
                     <block wx:if="{{object.goodicon==1}}">
@@ -145,6 +145,7 @@
   height: 318rpx;
   margin-top: 20rpx;
   display: flex;
+  position: relative;
 }
  
 .zs_t_img_x {
@@ -236,7 +237,7 @@
   height: 56rpx;
   position: relative;
   right: 56rpx;
-  top: 234rpx;
+  top: 0rpx;
 }
  
 .zs_t1_x3 {
@@ -473,6 +474,13 @@
   left: 0rpx;
   top: 10rpx;
 }
+.zs_t1_x4{
+  width: 56rpx;
+  height: 56rpx;
+  position: absolute;
+  right: 0rpx;
+  bottom: 10rpx;
+}
  
 .zs_t2_3l {
   width: 56rpx;
@@ -562,3 +570,5 @@
   overflow: hidden;
   white-space: nowrap;
 }
+
+
 .picMax{width: 100%;position: relative;}
 .pic_item{display: block; top:0;left:0;float:left}
-.pic_item image{width: 100%; height: 100%}
-.width_1{width: 187.5rpx}.width_2{width: 375rpx;}.width_3{width: 562.5rpx}.width_4{width:748rpx;}
+.pic_item image{width: 100%; height: 100%; vertical-align: bottom;}
+.width_1{width: 187.5rpx}.width_2{width: 375rpx;}.width_3{width: 562.5rpx}.width_4{width:750rpx;}
 /* .height_1{height: 187.5rpx;}.height_2{height: 375rpx;}.height_3{height: 562.5rpx}.height_4{height: 748rpx;} */
 /* .mar_x1{margin-left:187.5rpx;}.mar_x2{margin-left:375rpx;}.mar_x3{margin-left:562.5rpx}.mar_x4{margin-left: 748rpx;}
 .mar_y1{margin-top: 187.5rpx;}.mar_y2{margin-top: 375rpx;}.mar_y3{margin-top:  562.5rpx}.mar_y4{margin-top: 748rpx;} */
@@ -1569,6 +1569,12 @@ Page({
 		 price=price.toFixed(2);		 		 
 		 cut_pirce=cut_pirce.toFixed(2);		 		 
 		 this.setData({dp_price: this.data.dp_price,cut_price:this.data.cut_price});
+	},
+
+	go_goods:function (e) {
+		var gid=e.currentTarget.dataset.gid;
+		var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gid;
+		getApp().goto(url);
 	}
  
  
@@ -6,7 +6,7 @@
 <view class="goods_list" wx:if="{{data && data.goods_name}}">
     <view class="item flex ai-center">
        <view style="width:80rpx;height: 100%" class="flex ai-center jc-center"><icon type="success" size="18"></icon></view>
-       <view  class="r_box flex">
+       <view  class="r_box flex" bindtap="go_goods" data-gid="{{data.goods_id}}">
           <view><image class="r_box_img" src="{{data.original_img}}"></image></view>
           <view class="flex jc_sb">
               <view class="fs30" style="margin: 18rpx">
@@ -26,7 +26,7 @@
               <icon bindtap="set_sele"  wx:else data-ind="{{index}}" data-set="1"  type="success" size="18" color="#adadad"></icon>
  
         </view>
-        <view  class="r_box flex">
+        <view  class="r_box flex" bindtap="go_goods" data-gid="{{item.goods_id}}">
             <view><image class="r_box_img" src="{{iurl+item.original_img}}" binderror="bind_bnerr3" data-errorimg="collocationList[{{index}}].original_img"></image></view>
             <view class="flex jc_sb">
                 <view class="fs30" style="margin: 18rpx">
@@ -346,3 +346,8 @@ radio {
 .title .english .esh {
   margin: 0rpx 15rpx;
 }
+
+page {
+  overflow-x: hidden;
+  padding-bottom: 100rpx;
+}
@@ -28,6 +28,7 @@ Page({
     code: "", //核销码
     c_state: "0", //判断是否已经使用, 0正常  1已使用  2已过期
     is_lb: 0, //是否有礼包
+    default_color:null,
   },
   onLoad: function(options) {
  
@@ -177,7 +178,8 @@ Page({
         if (res.data.code == 0) {
           th.setData({
             giftImage: th.data.iurl + res.data.data.lbUrl,
-            giftTitle: res.data.data.giftTitle
+            giftTitle: res.data.data.giftTitle,
+            default_color:res.data.data.bgcolor
           })
           if (res.data.data.giftRemark == '') {
             th.setData({
@@ -245,7 +247,8 @@ Page({
         if (res.data.code == 0) {
           _this2.setData({
             giftImage: th.iurl + res.data.data.lbUrl,
-            giftTitle: res.data.data.giftTitle
+            giftTitle: res.data.data.giftTitle,
+            default_color:res.data.data.bgcolor
           })
           if (res.data.data.giftRemark == '') {
             _this2.setData({
@@ -346,5 +349,29 @@ Page({
     var nav_b = th.selectComponent("#nav_b"); //组件的id
     nav_b.close_box();
     nav_b.set_name("礼包", "/pages/giftpack/buygiftpack/giftpackbuy");
-  }
+  },
+
+  //--- 分享设置 --
+  onShareAppMessage: function (e) {
+    var curPage=this;
+    var pagePath = curPage.route; //当前页面url
+    if (pagePath.indexOf('/') != 0) {
+      pagePath = '/' + pagePath;
+    }
+
+    pagePath+="?isBuy="+this.data.isBuy;
+    if(this.data.isBuy==0){
+       pagePath+="&lbId="+this.data.getGiftID;
+    }else{
+       pagePath+="&orderSn="+this.data.orderSn;
+    }
+
+    return {
+      title: "礼包详情",
+      path:pagePath,
+    }
+  },
+
+
+
 });
 \ No newline at end of file
-<view class="box data-v-3a5b7e36">
+<view class="box data-v-3a5b7e36" style="background-color:{{default_color?default_color:'#e85f93'}}">
   <view class="box_top data-v-3a5b7e36">
     <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr" data-errorimg="giftImage"></image>
   </view>
-  <view class="box_title data-v-3a5b7e36">
+  <view class="box_title data-v-3a5b7e36" >
     <view class="top_title data-v-3a5b7e36">
       <text class="data-v-3a5b7e36 ellipsis-2">{{giftTitle}}</text>
     </view>
@@ -116,4 +116,19 @@ Page({
  
   },
  
+
+//--- 分享设置 --
+onShareAppMessage: function (e) {
+  var curPage=this;
+  var pagePath = curPage.route; //当前页面url
+  if (pagePath.indexOf('/') != 0) {
+    pagePath = '/' + pagePath;
+  }
+  return {
+    title: "专享礼包",
+    path:pagePath,
+  }
+},
+
+
 });
 \ No newline at end of file
@@ -518,5 +518,10 @@ margin: auto;
  
   }
  
+  page {
+    overflow-x: hidden;
+    padding-bottom: 40rpx;
+  }
+
 /* 风格三商品列表样式引入 */
 @import "../goodsList/goodsList.wxss";
 \ No newline at end of file
@@ -664,6 +664,7 @@ Page({
           if (t.data.data.goods_content == null) t.data.data.goods_content = "";
  
           //-----商品详情---
+          if(!t.data.data.goods_content) t.data.data.goods_content="  ";
           a.wxParse("content", "html", t.data.data.goods_content, ee, 6);
           e.wxParseAddFullImageUrl(ee, "content");
  
@@ -908,4 +908,9 @@
 .swiper{
   height: 250rpx;
   padding-bottom:30rpx;
+}
+
+page {
+  overflow-x: hidden;
+  padding-bottom: 120rpx;
 }
 \ No newline at end of file
@@ -12,6 +12,7 @@ Page({
 	  is_no_more:0,
 	  key_word:'',   //关键字搜索
 	  cat_id:0,      //分类ID
+	  islading:0,
   },	
  
   onShow:function(){
@@ -65,6 +66,8 @@ Page({
  
   get_list:function(){
 	  if(this.data.is_no_more==1) return false;
+	  if(this.data.islading==1) return false;
+	  this.data.islading=1;
 	  var th=this,req = getApp().request;
 	  var  dd = {
 	      store_id: o.stoid,
@@ -84,6 +87,7 @@ Page({
 	  req.promiseGet("/api/weshop/pickup/list", {
 	    data: dd,
 	  }).then(res => {
+		  this.data.islading=0;
 		  wx.hideLoading();
 		  if(res.data.code==0){			  
 			  if(res.data.data.pageData.length<=0){
@@ -132,6 +136,7 @@ Page({
 	      cid: item['cat_id']
 	    })
 		this.data.page=1;
+	    this.data.is_no_more=0;
 		this.setData({ pick_list:null})
 		this.get_list();
  
@@ -139,7 +144,8 @@ Page({
  
 	  //搜索关键字
 	  sear:function(){
-		  this.data.page=1;
+			this.data.page=1;
+			this.data.is_no_more=0;
 		  this.setData({ pick_list:null})
 		  this.get_list();
 	  },
 <view class="bcolor flex jc_sb">
-	<view class="sear_inp">	
+	<view class="sear_inp flex ai-center">
 	    <view class="sear_btn" bindtap='sear'>
 	       <image src="{{url}}/miniapp/images/search.png" style="width: 30rpx; height: 30rpx;  margin-left: 10rpx;"></image>	
-		</view>
+	  	</view>
 		<input bindinput ="lose_focus" class="fs28" value=""/>
 	</view>
 	<view class="select">
@@ -42,7 +42,7 @@ position: relative;
 .bcolor{background-color: #f5f5f5; height: 126rpx;}
  
 .sear_inp{width: 490rpx; background-color:#eaeaea; height: 80rpx; border-radius:5rpx; margin: 25rpx;}
-.sear_inp input{ position: relative; top:10rpx;width: 400rpx; display: inline-block;}
+.sear_inp input{width: 400rpx;}
 .select{height: 80rpx; width: 220rpx;background-color:#eaeaea; margin:25rpx; font-size: 28rpx; line-height: 80rpx;text-align: center }
-.sear_btn{ width: 50rpx; height: 100%; display: inline-block;}
+.sear_btn{ width: 50rpx; height: 100%; display: flex; align-items: center;}
  
@@ -126,7 +126,8 @@ Page({
 			id: this.data.tasking,
 			storeId: os.stoid,
 			userId: this.data.userId,
-			zlUserId: t_user_id
+			zlUserId: t_user_id,
+			isWeappUser:1,   //是不是小程序的入口，不需要判断
 		};
 		console.log(data);
 		getApp().request.json_post("/api/weshop/marketing/help/help/task/involve/insert",
@@ -92,12 +92,33 @@
  
   </view>
   <view class="xc-after-sale rel">
+    <!-- 顶上的一栏 -->
+    <view class="xc-equity-title flex-level" bindtap="go_order"  data-url="/pages/user/order_list/order_list">
+      <view class="xc-title-frame flex-space-between">
+        <view class="flex-vertical xc-title-content">
+          <image class="xc-title-img" src="{{iurl}}/miniapp/images/hdindan.png" style="width: 50rpx; height: 55rpx;margin-right: 5rpx"></image>
+          <view class="three-level-word">我的订单</view>
+        </view>
+      </view>
+      <view class="three-level-word  xc-more-frame flex-vertical">
+        <view class="three-level-word xc-more">更多</view>
+        <view class="bg_right xc-more-click bcolor"></view>
+      </view>
+    </view>
+    <!-- 内容的一栏 -->
     <view class="xc-after-sale-left flex-center-around">
       <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=1">
         <image class="xc-no-money" src="{{iurl}}/miniapp/images/daifuk.png"></image>
         <view class=" xc-word-color four-level-word">待付款</view>
         <text class="order-num" hidden='{{toji.wait_pay>0?"":"true"}}'>{{toji.wait_pay}}</text>
       </view>
+
+      <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=2">
+        <image class="xc-send" src="{{iurl}}/miniapp/images/dfahuo.png?v=1"></image>
+        <view class="xc-word-color four-level-word">待发货</view>
+        <text class="order-num" hidden='{{toji.wait_receive>0?"":"true"}}'>{{toji.wait_send}}</text>
+      </view>
+
       <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=3">
         <image class="xc-await" src="{{iurl}}/miniapp/images/shouhuo1.png"></image>
         <view class="xc-word-color four-level-word">待收货</view>
@@ -115,15 +136,8 @@
         <!--<text class="order-num" hidden='{{toji.wait_return>0>0?"":"true"}}' style="right: -20rpx">{{toji.wait_return}}</text>-->
       </view>
  
-      <view class='xc-hump abs'></view>
-      <view class="flex-verticalr xc-after-sale-right">
-        <view class=" xc-order t-c" bindtap="go_order" data-url="/pages/user/order_list/order_list">
-          <image class="xc-no-money xc-my-order" src="{{iurl}}/miniapp/images/dindan.png"></image>
-          <view class="xc-word-color four-level-word" style='margin-left:20rpx;'>我的订单</view>
-        </view>
-      </view>
-
     </view>
+    <view style="clear: both"></view>
  
   </view>
  
@@ -133,9 +147,7 @@
       <view class="xc-title-frame flex-space-between">
         <view class="flex-vertical xc-title-content">
           <image class="xc-title-img" src="{{iurl}}/miniapp/images/medal.png"></image>
-          <view class="three-level-word">
-            我的权益
-          </view>
+            <view class="three-level-word">我的权益</view>
         </view>
       </view>
       <view class="three-level-word  xc-more-frame flex-vertical">
@@ -143,6 +155,7 @@
         <view class="bg_right xc-more-click bcolor"></view>
       </view>
     </view>
+
     <view class="xc-specific-more-frame flex-vertical">
  
       <view bindtap="click_pre">
@@ -178,14 +191,14 @@
  </block>
  
   <!-- 工具与服务 -->
-  <view class="xc-tool-service">
+  <view class="xc-tool-service" >
     <view class="xc-tool-service-title flex-vertical">
       <image  class="xc-tool-service-img" src="{{iurl}}/miniapp/images/gj.png"></image>
       <view class="three-level-word xc-tool-service-word">工具与服务</view>
     </view>
     <view class="xc-project-frame">
       <!-- 跳转页面 -->
-      <view class="center_v">
+      <view class="center_v" style="display: flex;flex-wrap: wrap;align-items: center;">
         <view class="item t-c" data-url="/pages/team/team_ping/team_ping" bindtap="goto">
           <image class="xc-center-img " src="{{iurl}}/miniapp/images/pindan.png"></image>
           <view class="fs26">我的拼单</view>
@@ -202,13 +202,14 @@
  
 .xc-after-sale {
   width: 100%;
-  height: 160rpx;
   border-bottom: 10px solid #f2f2f2;
 }
  
 .xc-after-sale-left {
-  width: 90%;
+  width: 96%;
   height: 100%;
+  margin-top: 40rpx;
+  margin-bottom: 25rpx;
 }
  
 .xc-no-money {
@@ -300,6 +301,11 @@
   height: 50rpx;
 }
  
+.xc-send{
+  width: 50rpx;
+  height: 50rpx;
+}
+
 .xc-more-click {
   width: 15rpx;
   height: 15rpx;
@@ -639,6 +639,11 @@ Page({
  
         a.reg_time = time;
         a.birthday = birthday
+
+        if(a.address=='null' || !a.address){
+          a.address="";
+        }
+
         e.setData({
           phone: a.mobile,
           user: a,
@@ -51,6 +51,7 @@ module.exports = {
         data: {
           js_code: e,
           store_id: a.globalData.setting.stoid,
+          nickname:a.globalData.getu.nickName,
         },
         success: function (e) {
           console.log("openidandkey");
@@ -90,6 +91,7 @@ module.exports = {
             data: {
               js_code: e,
               store_id: a.globalData.setting.stoid,
+              nickname:a.globalData.getu.nickName,
             },
             success: function (e) {
                 console.log("openidandkey");