Merge branch 'qa' into 'master'

Qa See merge request !5

Merge branch 'qa' into 'master'
Qa See merge request !5
后端研发-田富滉
2 parents 6341715b f7bc46ea
Showing 24 changed files with 140 additions and 106 deletions
app.js
images/add2.png
images/quanyi2.png
pages/goods/categoryList/categoryList.js
pages/goods/categoryList/categoryList.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/goods/goodsInfo/goodsInfo.wxss
pages/goods/goodsList/goodsList.js
pages/goods/goodsList/goodsList.wxml
pages/team/team_ping/team_ping.js
pages/team/team_ping/team_ping.wxml
pages/team/team_show/team_show.js
pages/team/team_show/team_show.json
pages/team/team_show/team_show.wxml
pages/team/team_success/team_success.js
pages/team/team_success/team_success.wxml
pages/user/grow_value/grow_value.json
pages/user/index/index.wxml
pages/user/member/account/account.wxml
@@ -13,7 +13,7 @@ App({
         config2: null,
         code: null,
         heigth:0,
-        user_id: 5682068,// 4379287,//  null,// 5682068,
+      user_id: null,// 4379287,//  null,// 5682068,
         buy_now:null,
         picklist:null,    //门店列表
         wuliuprice: null, //物流价格表
@@ -67,7 +67,7 @@ Page({
         if (e.categoryset.indexOf("," + 1 + ",") != -1) { that.setData({ is_show_pl: 1 }); }
         if (e.categoryset.indexOf("," + 3 + ",") != -1) { that.setData({ is_show_pp: 1 }); }
         if (e.categoryset.indexOf("," + 2 + ",") != -1) { that.setData({ is_show_gb: 1 }); }
-        that.setData({ store_config: e });
+        that.setData({ store_config: e,is_do:1 });
         if (that.data.is_show_pl) that.setData({ currentTab: 0 });
         else if (that.data.is_show_gb){ that.setData({ currentTab: 1 });that.get_nation();  }
@@ -113,7 +113,7 @@ Page({
                      continue;
                   }
                 }
-                t.setData({ catelist: arr});              
+                t.setData({ catelist: arr});
             }
         });
     },
@@ -90,7 +90,7 @@
    </view>
 </block>
-<block wx:else>
+<block wx:elif="{{is_do}}">
     <view class="no-data" >
       <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
       <view class="no-data-title">商家暂未设置分类</view>
@@ -1349,6 +1349,15 @@ Page({
                   return false;
                 }
+                /*-- 还没有开始预热的也不显示 --*/
+                if (t.data.data.show_time >now) {
+                  ee.setData({
+                    prom_type: 0,isshow:1,
+                  });
+                  ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                  return false;
+                }
+
                 var t_gd = ee.data.data;
                 var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss");
                 var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss");
@@ -1435,6 +1444,15 @@ Page({
                   return false;
                 }
+                /*-- 还没有开始预热的也不显示 --*/
+                if (t.data.data.show_time > now) {
+                  ee.setData({
+                    prom_type: 0,isshow:1,
+                  });
+                  ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                  return false;
+                }
+
                 //-------查看自己是不是有买过该团的商品，并还为支付，或者在进行中-------
                 getApp().request.get("/api/weshop/order/page", {
                   data: {
@@ -2345,33 +2363,35 @@ Page({
           //把画板内容绘制成图片，并回调 画板图片路径
           context.draw(false, function () {
-            console.log('draw callback')
-            wx.canvasToTempFilePath({
-              x: 0, y: 0,
-              width: 750,
-              height: 1217,
-              destWidth: 1.2 * 750 * 750 / that.data.screenWidth,
-              destHeight: 1.2 * 1217 * 750 / that.data.screenWidth,
-              canvasId: 'share',
-              success: function (res) {
-                that.setData({
-                  shareImgPath: res.tempFilePath, canvasHidden: true
-                })
-                if (!res.tempFilePath) {
-                  wx.showModal({
-                    title: '提示',
-                    content: '图片绘制中，请稍后重试',
-                    showCancel: false
-                  })
-                  return false;
-                }
-                wx.previewImage({
-                  //将图片预览出来
-                  urls: [that.data.shareImgPath]
-                });
-                wx.hideLoading();
-              }
-            })
+             setTimeout(function () {
+                 wx.canvasToTempFilePath({
+                 x: 0, y: 0,
+                 width: 750,
+                 height: 1217,
+                 destWidth: 1.2 * 750 * 750 / that.data.screenWidth,
+                 destHeight: 1.2 * 1217 * 750 / that.data.screenWidth,
+                 canvasId: 'share',
+                 success: function (res) {
+                   that.setData({
+                     shareImgPath: res.tempFilePath, canvasHidden: true
+                   })
+                   if (!res.tempFilePath) {
+                     wx.showModal({
+                       title: '提示',
+                       content: '图片绘制中，请稍后重试',
+                       showCancel: false
+                     })
+                     return false;
+                   }
+                   wx.previewImage({
+                     //将图片预览出来
+                     urls: [that.data.shareImgPath]
+                   });
+                   wx.hideLoading();
+                 }
+               })
+             },200)
+
           });
         });
       }
@@ -139,7 +139,7 @@
             <!----显示价格,阶梯团---->
             <block wx:if="{{prom_act.kttype==3}}">
               <view class="jie_price  flex">
-                <view style='margin-right:75rpx' wx:for="{{prom_act.ct_rylist}}">
+                <view style='margin-right:26rpx' wx:for="{{prom_act.ct_rylist}}">
                   <view class="fs35 word-color">
                     <text class="fs24">￥</text>{{item.price}}</view>
                   <view class="fs24 t-c xc-person-number ">满{{item.rynum}}人</view>
@@ -172,11 +172,7 @@
                 <!--//还差几人，剩余时间-->
                 <view class="rel">
                   <view class='ghaicha ellipsis-2 abs'>
-                    <text class='gred' wx:if="{{prom_act.max_ct_num >0}}">
-                                          <text class="flex" wx:if="{{prom_act.max_ct_num - item.open_num>0}}">
-                                          还差<text class="word-color">{{prom_act.max_ct_num - item.open_num}}</text>人享最低优惠</text>
-                    <text wx:else>您已经享最低优惠</text>
-                    </text>
+                    <text class='gred' wx:if="{{prom_act.max_ct_num >0}}"><text class="flex" wx:if="{{prom_act.max_ct_num - item.open_num>0}}">还差<text class="word-color">{{prom_act.max_ct_num - item.open_num}}</text>人享最低优惠</text><text wx:else>您已经享最低优惠</text></text>
                     <text class='gred' wx:else>还差<text style='color:#ff2753'>{{prom_act.ct_num - item.open_num}}</text>人成团 </text>
                     <view class="t_show">
                       剩余
@@ -831,7 +831,7 @@ left:31rpx;}
 .group .group-list .ghaicha {  
   width:300rpx;
     font-size: 27rpx;
-      margin-left:100px;
+    margin-left:180rpx;
      top:13rpx;
     left:-3rpx;
     font-weight:600;
@@ -67,6 +67,7 @@ Page({
         t +="&page=" + e.data.currentPage, 
         a.request(t, 
           function(t) {
+            e.setData({is_go:1});
             e.data.currentPage++, null == e.data.allData && (e.data.allData = Object.assign({}, t.data.result)), 
             wx.stopPullDownRefresh();
          },
@@ -42,7 +42,7 @@
             </view>
         </navigator>
     </view>
-    <view class="no-data" wx:if="{{!requestData||requestData.length==0}}">
+    <view class="no-data" wx:if="{{(!requestData||requestData.length==0) && is_go}}">
         <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
         <view class="no-data-title">没有相关的数据</view>
         <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
@@ -156,7 +156,7 @@ Page({
       })
       //--正在进行中的团，才有时间倒计时--
-      if(teamgroup.state==2) {
+      if(teamgroup &&  teamgroup.state==2) {
           order[i].kt_end_time = teamgroup.kt_end_time;
           //---如果参团的人数没有3个人，则要体现沙发---
           order[i].tg_state = teamgroup.state;
@@ -80,10 +80,9 @@
           </view>
           <view class='C'>
-            <view class='yao' wx:if="{{item.pt_status==1}}">邀请好友</view>
-            
-            <view class='s_and_f' wx:if="{{item.pt_status==2 || item.pt_status==4 || item.pt_status==5 }}">查看详情</view>
-            <view class='s_and_f' wx:if="{{item.pt_status==3}}">查看详情</view>
+             <view class='yao' wx:if="{{item.pt_status==1}}">邀请好友</view>
+             <view class='s_and_f' wx:if="{{item.pt_status==2 || item.pt_status==4 || item.pt_status==5 }}">查看详情</view>
+             <view class='s_and_f' wx:if="{{item.pt_status==3}}">查看详情</view>
           </view>
         </view>
@@ -40,7 +40,7 @@ Page({
     teamgroup: null, //活动从表
     goods: null, //商品数据
     pindGoods: null, //拼单数据
-    imageurl: "https://mshopimg.yolipai.net/", //有礼派图片地址
+    imageurl: os.imghost, //有礼派图片地址
     team_id: 0, //支付是否成功
     listno: "", //订单编号
@@ -156,6 +156,8 @@ Page({
   clist: function(e) {
     var i = e.currentTarget.dataset.end;
     var pick_id = e.currentTarget.dataset.pick_id;
+    var pick_dis = e.currentTarget.dataset.pick_dis;
+
     this.setData({
       end_name: i,
       pick_id: pick_id,
@@ -163,8 +165,10 @@ Page({
       qh: true,
       se: false,
       list: false,
+      pick_dis: pick_dis
     })
   },
+
   //点击第一层
   setchild: function(e) {
     var ind = e.currentTarget.dataset.bindex;
@@ -649,6 +653,8 @@ Page({
   //------去支付，购买-------
   go_pay:function () {
       var th=this;
+      if (th.data.pick_id == 0) return s.my_warnning("请选择门店", 0, th);
+
       //----判断起购数----
       var qnum=parseFloat(th.data.teamlist.minbuynum);
       if(qnum>0 && qnum>th.data.num ){
@@ -703,6 +709,8 @@ Page({
             }
             break;
         }
+        newd['pick_dis'] = th.data.pick_dis;
+
         s.set_b_now(newd);
         wx.navigateTo({
@@ -5,5 +5,8 @@
     "navigationBarTextStyle": "white",
     "navigationBarBackgroundColor": "#ffffff",
     "backgroundColor": "#eeeeee"
+  },
+  "usingComponents": {
+    "warn": "/components/long_warn/long_warn"
   }
 }
 \ No newline at end of file
@@ -136,8 +136,6 @@
       <!----收起拼团列表---->
       <view class='zhangxi' wx:if="{{hiddenName}}">
-    
-
         <view class='zspan' bindtap='click'>收起拼团列表
           <view class='down-arrow1'></view>
         </view>
@@ -222,7 +220,9 @@
       <!--第二层list-->
       <block wx:if="{{list}}">
         <scroll-view scroll-y="true" style="max-height: 460rpx">
-          <view class='xuanze' wx:for="{{ssl_child}}" wx:key bindtap='clist' data-end='{{item.pickup_name}}' data-pick_id='{{item.pickup_id}}'>
+          <view class='xuanze' wx:for="{{ssl_child}}" wx:key bindtap='clist' 
+            data-pick_dis="{{item.distr_type}}" 
+            data-end='{{item.pickup_name}}' data-pick_id='{{item.pickup_id}}'>
             <text decode='true'>{{item.pickup_name}}</text>
           </view>
         </scroll-view>
@@ -281,4 +281,6 @@
       </view>
     </view>
   </view>
-</block>
 \ No newline at end of file
+</block>
+
+<warn id="warn"></warn>
 \ No newline at end of file
@@ -102,7 +102,10 @@ Page({
   },
   async init( order_sn) {
-       var goods_id = 0,//商品ID,
+     
+        wx.showLoading();
+
+        var goods_id = 0,//商品ID,
         pageteam=null,//
         original_img=null ,//商品图片
         order=null,//订单编号
@@ -212,8 +215,10 @@ Page({
       data: { store_id: os.stoid, listno: pt_listno, team_id: pt_prom_id }
     }).then(res => {
         teamgroup = res.data.data.pageData[0];
-			  var buy_start_date = ut.formatTime(teamgroup.buy_start_date, "yyyy-MM-dd hh:mm:ss");
-				teamgroup.buy_start_date=buy_start_date;
+        if (teamgroup){
+			     var buy_start_date = ut.formatTime(teamgroup.buy_start_date, "yyyy-MM-dd hh:mm:ss");
+		    		teamgroup.buy_start_date=buy_start_date;
+        }
     })
@@ -222,7 +227,7 @@ Page({
     if (teamlist.kttype == 3){
         var js_data = JSON.parse(teamlist.ct_rylist);
         js_data.forEach(function (val,ind) {
-            if (num_0<val.rynum && ct_price==0){
+            if (num_0<=val.rynum && ct_price==0){
                 ct_price=val.price;
             }
          })
@@ -260,6 +265,8 @@ Page({
            ct_price: ct_price, p_status: p_status,sf_arr:sf_arr});
     }
+    wx.hideLoading();
+
     wx.setNavigationBarTitle({
       title: "拼团详情",
     })
@@ -505,33 +512,34 @@ Page({
                     //把画板内容绘制成图片，并回调 画板图片路径
                     context.draw(false, function () {
-                        console.log('draw callback')
-                        wx.canvasToTempFilePath({
-                            x: 0, y: 0,
-                            width: 750,
-                            height: 1217,
-                            destWidth: 750 * 750 / that.data.screenWidth,
-                            destHeight: 1217 * 750 / that.data.screenWidth,
-                            canvasId: 'share',
-                            success: function (res) {
-                                that.setData({
-                                    shareImgPath: res.tempFilePath, canvasHidden: false,
-                                })
-                                if (!res.tempFilePath) {
-                                    wx.showModal({
-                                        title: '提示',
-                                        content: '图片绘制中，请稍后重试',
-                                        showCancel: false
+                        setTimeout(function () {
+                            wx.canvasToTempFilePath({
+                                x: 0, y: 0,
+                                width: 750,
+                                height: 1217,
+                                destWidth: 750 * 750 / that.data.screenWidth,
+                                destHeight: 1217 * 750 / that.data.screenWidth,
+                                canvasId: 'share',
+                                success: function (res) {
+                                    that.setData({
+                                        shareImgPath: res.tempFilePath, canvasHidden: false,
                                     })
-                                    return false;
+                                    if (!res.tempFilePath) {
+                                        wx.showModal({
+                                            title: '提示',
+                                            content: '图片绘制中，请稍后重试',
+                                            showCancel: false
+                                        })
+                                        return false;
+                                    }
+                                    wx.previewImage({
+                                        //将图片预览出来
+                                        urls: [that.data.shareImgPath]
+                                    });
+                                    wx.hideLoading();
                                 }
-                                wx.previewImage({
-                                    //将图片预览出来
-                                    urls: [that.data.shareImgPath]
-                                });
-                                wx.hideLoading();
-                            }
-                        })
+                            })
+                        },200)
                     });
                 });
             }
@@ -619,6 +627,7 @@ Page({
             });
         }
     },
+
     //--获取商品图片的本地缓存，回调写法--
     get_goods_temp:function (tt) {
         var ee=this;
@@ -70,12 +70,12 @@
     <view class='bodytop' wx:if="{{(teamlist.kttype==2 || teamlist.kttype==1) && p_status==1}}">
       还差
       <text class="xc-wc">{{teamlist.ct_num-ordertx.length}}</text>人成团,组团成功为您节省
-      <text class="xc-wc">{{goods.market_price-teamlist.price}}</text>元
+      <text class="xc-wc">{{filters.toFix(goods.market_price-teamlist.price,2)}}</text>元
     </view>
     <!-- 拼团成功 -->
     <view class="xc-ptcomplete flex-level fs28" wx:if="{{p_status==2 && (teamlist.kttype==2||teamlist.kttype==1)}}">
       <view class="xc-wc">拼团成功</view>,为您节省
-      <text class="xc-wc">{{goods.market_price-teamlist.price}}</text>元
+      <text class="xc-wc">{{filters.toFix(goods.market_price-teamlist.price,2)}}</text>元
       <view class="xc-img-frame oh">
         <image class="img" src="{{iurl}}/miniapp/images/xc_qtcg.png"></image>
       </view>
@@ -152,7 +152,7 @@
     <!-- <block wx:if="{{pay_f!=1 && order.pt_status<2}}"> -->
       <!----/ // // // //按钮---->
-      <view wx:if="{{teamlist.kttype==3}}" class='bodybutton' bindtap='cmeng'>
+      <view wx:if="{{teamlist.kttype==3}}" style='background-color:#fab55a; color:#fff' class='bodybutton' bindtap='cmeng'>
         <!-- 阶梯团 -->
         <button wx:if="{{p_status==1}}">
           邀请好友参团
 {
-    "navigationBarTitleText": "我的成长值",
+  "navigationBarTitleText": "我的成长值",
   "usingComponents": {
     "timePicker": "/components/timePicker/timePicker",
     "warn": "/components/long_warn/long_warn"
@@ -167,7 +167,7 @@
 					<view class="fs26">秒杀活动</view>
 				</view>
 				<view class="item t-c" bindtap="go_qy" wx:if="{{qy_list!=null && is_init && gradeId}}">
-					<image class="xc-center-img " src="{{iurl}}/miniapp/images/equity.png"></image>
+					<image class="xc-center-img " src="/images/quanyi2.png"></image>
 					<view class="fs26">我的权益</view>
 				</view>
@@ -182,16 +182,16 @@
 					<view class="fs26">收藏夹</view>
 				</view>
-				<!--<view class="item t-c">-->
-					<!--<image class="xc-center-img " src="{{iurl}}/miniapp/images/fuwu.png"></image>-->
-					<!--<view class="four-level-word">我的服务</view>-->
-				<!--</view>-->
-
 				<view class="item t-c" data-url="/pages/user/comment/comment" bindtap="goto" >
 					<image class="xc-center-img " src="{{iurl}}/miniapp/images/evaluate.png"></image>
 					<view class="fs26">我的评价</view>
 				</view>
+        	<view class="item t-c" data-url="/pages/user/address_list/address_list" bindtap="goto" >
+					<image class="xc-center-img " src="/images/add2.png"></image>
+					<view class="four-level-word">我的地址</view>
+				</view>
+
 			</view>
@@ -53,7 +53,7 @@
         <view class="money" 
         style="color:{{details.type==2||details.type==0?'#C4182E':'#6fd137'}}">
-      {{details.type==2||details.type==0?'+':'-'}}{{filter.getNum(details.money)}}</view>
+      {{details.type==1||details.type==3?'-':'+'}}{{filter.getNum(details.money)}}</view>
    </view>
   </block>
@@ -28,7 +28,7 @@
             </navigator>
             <view class="order-num">
                 <view class="goods-price">￥{{item.member_goods_price}}</view>
-                <view class="goods-num">￥{{item.goods_num}}</view>
+                <view class="goods-num">×{{item.goods_num}}</view>
             </view>
         </view>
         <view class="order-operate">
@@ -14,8 +14,8 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.2.4",
-	"appid": "wx2ea7cdd3ef52cdff",
-	"projectname": "miaosha",
+	"appid": "wx7406a86b64b58a1d",
+	"projectname": "QA_MShopWeApp",
 	"debugOptions": {
 		"hidedInDevtools": []
 	},
 module.exports = {
-    appName: "派派通",
-    versionCode: "1.0.0",
-    appLogo: "../../../images/logo.png",
-    url: "https://test-weshop.yolipai.net",
-    //url:"https://weshop.yolipai.net", //外网的网址
-    //url:"http://172.20.3.121:8085", //明海的网址
-    //url:"http://172.20.3.102:8085", //自己的网址
-    banner_err:"../../../images/del/logo.png",
-    imghost: "https://mshopimg.yolipai.net/",
-    share: {},
-    stoid:1,
-    
-};
+  appName: "美得得商户中心",
+  versionCode: "1.3.1",
+  appLogo: "../../../images/logo.png",
+  url: "https://weshop.yolipai.net",
+  banner_err: "../../../images/del/logo.png",
+  imghost: "https://mshopimg.yolipai.net/",
+  share: {},
+  stoid: 197,
+};
 \ No newline at end of file
@@ -18,7 +18,7 @@ var filters = {
            if(isFull==1)
               fm=fm + ' '+ [d.getHours(), d.getMinutes(), d.getSeconds()].join(':')
            return fm;
-        }
+        },
         pInt:function(t) {
             var d = parseInt(t); return d;