Merge branch 'dev' into 'test'

Dev See merge request !17

Merge branch 'dev' into 'test'
Dev See merge request !17
后端研发-苏明海
2 parents e62e8218 20d25ed3
Showing 27 changed files with 146 additions and 69 deletions
app.wxss
pages/cart/cart2/cart2.js
pages/cart/cart2_pt/cart2_pt.js
pages/cart/cart_wk/cart_wk.js
pages/cart/cart_wk/cart_wk.json
pages/cart/cart_wk/cart_wk.wxml
pages/cart/cart_wk/cart_wk.wxss
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/team/team_ping/team_ping.wxss
pages/team/team_show/team_show.wxml
pages/team/team_show/team_show.wxss
pages/team/team_success/team_success.js
pages/team/team_success/team_success.wxml
pages/user/add_address/add_address.js
pages/user/add_address/add_address.json
pages/user/add_address/add_address.wxml
pages/user/express/express.js
pages/user/express/express.wxml
pages/user/express/express.wxss
@@ -12,7 +12,7 @@
     box-sizing: border-box;
 }
 page {
-    /*background-color: #f2f2f2;*/  
+  overflow-x: hidden;
 }
 button {
     border-radius: 0; padding-left: 0;
@@ -158,6 +158,8 @@ align-items:center;
  display:flex;
 justify-content:space-around;
 }
+.jc_sb{ justify-content: space-between}
+
 /* 相对定位 */
 .rel{
   position: relative;
@@ -683,7 +683,9 @@ Page({
       console.log("buy_new");
       if(th.data.bn_exp_type == 0 && th.data.user_addr==null ){ 
-          ff = false; getApp().confirmBox("请新建收货地址"); }
+          ff = false; getApp().my_warnning("请选择收货地址",0,th); 
+         this.data.is_summit_ing = 0;
+      }
       if (!ff) return false;
       var addr = th.data.user_addr;
       if (th.data.bn_exp_type == 1) addr=null;
@@ -694,7 +696,7 @@ Page({
       if(th.data.bn_exp_type==0)
         if(th.data.wu_arr==null ||  th.data.wu_arr.length<=0){
-          getApp().confirmBox("读取物流失败");
+          getApp().my_warnning("读取物流失败",0,th);
           return false;
         }
@@ -341,7 +341,11 @@ Page({
         //------------立即购买-------------
         console.log("buy_new");
-        if(th.data.bn_exp_type == 0 && th.data.user_addr==null ){ ff = false; confirmBox("请新建收货地址"); }
+        if(th.data.bn_exp_type == 0 && th.data.user_addr==null ){
+           ff = false; 
+           getApp().my_warnning("请选择收货地址",0,this);
+           this.data.is_summit_ing = 0;
+        }
         if (!ff) return false;
         var addr = th.data.user_addr;
         if (th.data.bn_exp_type == 1) addr=null;
@@ -352,7 +356,8 @@ Page({
         if(th.data.bn_exp_type==0) {
           if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) {
-            confirmBox("读取物流失败");
+            getApp().my_warnning("读取物流失败",0,this);
+            this.data.is_summit_ing = 0;
             return false;
           }
         }
@@ -301,6 +301,11 @@ Page({
   },
   //--弹起支付框--
   to_pay(){
+     //--物流支付时要有地址--
+     if (this.data.exp_type == 0 && this.data.user_addr == null) {
+       return getApp().my_warnning("请选择收货地址", 0, this);
+     }
+
       this.setData({show_pay_type:1});
   },
@@ -316,7 +321,7 @@ Page({
       //--物流支付时要有地址--
       if (th.data.exp_type == 0 && th.data.user_addr==null){
-           return getApp().my_warnning("请先建地址",0,th);
+           return getApp().my_warnning("请选择收货地址",0,th);
       }
       //---支付参数--
 {
+  "navigationBarTitleText": "支付尾款",
   "usingComponents": {
     "warn": "/components/long_warn/long_warn"
   }
@@ -73,15 +73,15 @@
 <!--成团人数-->
 <view class='chentuan'>
-  <view class='ct_one'>
+  <view class='ct_one jc_sb'>
     <view class='ct_one_left'>成团人数</view>
     <view class='ct_one_right'><text class='redwz'>1</text>人</view>
   </view>
-  <view class='ct_one'>
+  <view class='ct_one jc_sb'>
     <view class='ct_one_left'>成团单价</view>
     <view class='ct_one_right'>￥<text class='redwz'>{{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money,2)}}</text></view>
   </view>
-  <view class='ct_one'>
+  <view class='ct_one jc_sb'>
     <view class='ct_one_left'>支付定金</view>
     <view class='ct_one_right'>￥<text class='redwz'>{{order.order_amount+order.user_money}}</text>
     </view>
@@ -90,13 +90,13 @@
 <!--尾款-->
 <view class='chentuan'>
-  <view class='ct_one'>
+  <view class='ct_one jc_sb'>
     <view class='ct_one_left'>尾款金额</view>
     <view class='ct_one_right'>￥<text class='redwz'>{{order.pt_tail_money}}</text>
     </view>
   </view>
-  <view class='ct_one'>
+  <view class='ct_one jc_sb'>
     <view class='ct_one_left'>配送费用</view>
     <view class='ct_one_right'>￥<text class='redwz'>{{exp_price}}</text>
     </view>
@@ -3,7 +3,7 @@
 .user-mes {
   position: relative;
   background-color: #fff;
-  font-size: 32rpx;
+  font-size: 30rpx;
   color: #444;
 }
 .user-contact {
@@ -60,13 +60,14 @@
 }
 .top {
-  widows: 100%;
-  background-color: white;
-  min-height: 70rpx;
-  display: flex;
-  padding: 10rpx;
-  border-bottom: 2rpx solid rgb(238, 238, 238);
-  margin-top: 20rpx;
+ 
+ background-color: white;
+height: 40px;
+display: flex;
+padding: 10rpx 0 0 0;
+border-bottom: 2rpx solid rgb(238, 238, 238);
+margin-top: 10rpx;
+
 }
 .t_img image {
@@ -75,7 +76,7 @@
 }
 .t_wz {
-  font-size: 36rpx;
+  font-size: 30rpx;
   font-weight: bold;
   color: rgb(0, 0, 0);
   line-height: 65rpx;
@@ -104,7 +105,7 @@
 .center .cen_name {
   height: 120rpx;
   width: 370rpx;
-  font-size: 36rpx;
+  font-size: 30rpx;
   padding-left: 10rpx;
   overflow:hidden;
   text-overflow:ellipsis;
@@ -113,7 +114,7 @@
 .center .cen_jg {
   color: #c4182e;
-  font-size: 40rpx;
+  font-size: 32rpx;
   width: 200rpx;
   height: 40rpx;
   text-align: right;
@@ -121,8 +122,7 @@
 .center .cen_jg .cen_sl {
   color: black;
-  font-size: 32rpx;
-  font-weight: bold;
+  font-size: 26rpx;
   width: 200rpx;
   height: 38rpx;
 }
@@ -137,20 +137,20 @@
 }
 .quhou .qu_fs {
-  font-size: 38rpx;
+  font-size: 30rpx;
   display: flex;
-  height: 80rpx;
+  height: 60rpx;
   margin-left: 25rpx;
   line-height: 62rpx;
 }
 .quhou .qu_fs image {
-  width: 46rpx;
-  height: 46rpx;
+  width: 34rpx;
+  height: 34rpx;
   margin-right: 18rpx;
   vertical-align: center;
   position: relative;
-  top:8rpx
+  top:14rpx
 }
 .quhou .qu_fs .qu_wz {}
@@ -161,14 +161,14 @@
   background-color: white;
   padding: 20rpx 10rpx;
   margin-top: 20rpx;
-  font-size: 36rpx;
+  font-size: 28rpx;
 }
 .chentuan .ct_one {
   height: 40rpx;
   margin-bottom: 10rpx;
   display: flex;
-  width: 100%;
+  width: 708rpx;
 }
 .chentuan .ct_one .ct_one_left {
@@ -177,7 +177,6 @@
 .chentuan .ct_one .ct_one_right {
   text-align: right;
-  margin-left: 358rpx;
   width: 200rpx;
 }
@@ -190,7 +189,7 @@
   width: 100%;
   min-height: 80rpx;
   line-height: 80rpx;
-  font-size: 38rpx;
+  font-size: 30rpx;
   position: fixed;
   bottom: 0;
   text-align: right;
@@ -208,7 +207,7 @@
 .zf .zf_btn {
   color: white;
   background-color: #c4182e;
-  font-size: 30rpx;
+  font-size: 28rpx;
   width: 170rpx;
   text-align: center;
   line-height: 80rpx;
@@ -1478,8 +1478,6 @@ Page({
                           });
                           th.data.wk_order_id=odr.order_id;
                       }
-
-
                     }
                   },
                 });
@@ -2562,6 +2560,13 @@ Page({
   go_pay_wk:function () {
     var url = "/pages/cart/cart_wk/cart_wk?order_id="+ this.data.wk_order_id;
     getApp().goto(url);
+  },
+
+  pop_err_img:function(e){
+     var txt = e.currentTarget.dataset.errorimg;
+     var ob={};
+     ob[txt] = this.data.iurl + "/miniapp/images/default_g_img.gif";
+     this.setData(ob);
   }
 });
 \ No newline at end of file
@@ -2,9 +2,7 @@
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 <wxs module="" src="filter.wxs"></wxs>
- 
 <block wx:if="{{isshow}}">  
-
   <view class="container">
     <view class="type-navbar">
       <view class="type-box" wx:for="{{categories}}" wx:key="categories">
@@ -712,7 +710,7 @@
     <view class="pding">
       <icon bindtap="closeSpecModal" class="modal-close" color="gray" size="22" type="cancel"></icon>
       <view class="spec-goods">
-        <image class="wh100 spec-img" src="{{data.original_img}}" binderror="" data-errorimg="data.original_img"></image>
+        <image class="wh100 spec-img" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
         <view class="spec-goods-info">
           <view class="spec-goods-name">{{data.goods_name}}</view>
           <view class="spec-goods-price" wx:if="{{prom_price==null}}">￥ {{sele_g.shop_price}}</view>
@@ -797,7 +795,7 @@
     <view class="pding">
       <icon bindtap="closeSpecModal" class="modal-close" color="gray" size="22" type="cancel"></icon>
       <view class="spec-goods">
-        <image class="wh100 spec-img" src="{{data.original_img}}" binderror="" data-errorimg="data.original_img"></image>
+        <image class="wh100 spec-img" src="{{data.original_img}}"  binderror="pop_err_img"  data-errorimg="data.original_img"></image>
         <view class="spec-goods-info">
           <view class="spec-goods-name">{{data.goods_name}}</view>
           <view class="spec-goods-price" wx:if="{{is_normal==1}}">￥ {{sele_g.shop_price}}
@@ -284,7 +284,7 @@ margin-right: 20rpx;
     display: inline-block;
 	width: 33.33%;
 	color: #777777;
-  font-size: 36rpx;
+  font-size: 32rpx;
 }
 .on{ color:#e4374d;
 	border-bottom: 5rpx solid #e4374d;}
@@ -184,11 +184,19 @@
   <view class='buy-option'>
     <!--头部图片-->
     <view class='buy-top'>
-      <view class='buy-image'>
+      <view class='buy-image mimg'>
         <image src='{{image}}'></image>
-        <span class='t1'>¥</span>
-        <text class='t2'>{{teamlist.price}}</text>
+        <view style='float:left'>
+           <view>
+            <span class='t1'>¥</span><text class='t2'>{{teamlist.price}}</text>
+           </view> 
+           <view class="ellipsis-1">
+               {{goods.goods_name}}
+           </view>
+        </view>
+
       </view>
+
       <view class='buy-cou' bindtap='cbcou'>⊗</view>
       <view class='clear'></view>
     </view>
@@ -589,7 +589,6 @@ flex-grow:1.7;
 }
 .buy-image text {
-  float: left;
   margin-left: 10rpx;
   color: red;
 }
@@ -709,7 +708,7 @@ flex-grow:1.7;
 .buy-image {
   margin-right: 20rpx;
-  width: 320rpx;
+  width: 630rpx;
   height: 200rpx;
   float: left;
 }
@@ -722,8 +721,8 @@ flex-grow:1.7;
   margin-right: 16rpx;
 }
+
 .buy-image text {
-  float: left;
   margin-left: 10rpx;
   color: red;
 }
@@ -742,7 +741,6 @@ flex-grow:1.7;
 }
 .t1 {
-  float: left;
   font-size: 28rpx;
   padding-left: 4rpx;
   color: red;
@@ -658,6 +658,14 @@ Page({
     go_pay_wk:function(){
       var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id;
       getApp().goto(url);
+    },
+
+    img_show_err:function(e){
+        var err_img = e.currentTarget.dataset.err;
+        var ob={};
+        ob[err_img] = this.data.iurl + "/miniapp/images/default_g_img.gif";
+        this.setData(ob);
+        
     }
 })
@@ -4,7 +4,7 @@
   <view class='center'>
     <view class='cenleft'>
-      <image src='{{image}}'></image>
+      <image src='{{image}}' binderror='img_show_err' data-err="image"></image>
     </view>
     <view class='cenright'>
       <!----//图片区域---->
@@ -50,9 +50,18 @@ Page({
         var a= this.data.address, b=a,th=this;
         Object.assign(a, s.detail.value), a.is_default = Number(a.is_default);
         a.store_id = os.stoid;
+
+        var ob = ut.check_mobile(a.mobile);
+        if(ob.code!=1){
+         return  getApp().my_warnning(ob.title,0,th);
+        }
+
         if (a.more_address == null || a.more_address == undefined || a.more_address=="" ){
-           wx.showModal({title: "请选择地区"}); return false;
+           getApp().my_warnning("请选择地区",0,th);
+           return false;
         }
+
+        
         //判断是不是空对象
         //--------如果是修改地址----------
         if (!th.data.isnew){
 {
     "navigationBarTitleText": "收货地址",
-    "enablePullDownRefresh": false
+    "enablePullDownRefresh": false,
+    "usingComponents": {
+      "warn": "/components/long_warn/long_warn"
+    }
 }
 \ No newline at end of file
@@ -7,7 +7,7 @@
         </view>
         <view class="item">
             <view class="item-name">手机号码:</view>
-            <input class="item-input" name="mobile" value="{{address.mobile}}"></input>
+            <input type="number" class="item-input" name="mobile" value="{{address.mobile}}"></input>
         </view>
         <view bindtap="openRegionsModal" class="item" data-id="0">
             <view class="item-name">所在地区:</view>
@@ -31,3 +31,5 @@
     </form>
 </view>
 <template is="regions" data="{{regions:regions}}"></template>
+
+<warn id="warn"></warn>
@@ -6,6 +6,7 @@ Page({
         resourceUrl: e.globalData.setting.imghost,
         delivery: null,
         express: null,
+        re_arr:null,//反转后的数组
         error: "快递信息异常"
     },
     onLoad: function(e) {
@@ -27,9 +28,9 @@ Page({
         wx.request({
             url: this.data.url + "/api/weshop/order/wuliu/" + this.data.delivery.shipping_code + "/" + this.data.delivery.invoice_no,                 success: function(e) {
-              console.log("success", e.data.data.data);
+               var re_arr = e.data.data.Traces.reverse();
                 s.setData({
-                    express: e.data.data,
+                  express: e.data.data, re_arr: re_arr,
                 });
             },
             fail: function(s) {
@@ -4,19 +4,30 @@
         <view class="logistics-cont">{{delivery.invoice_no}}</view>
     </view>
     <view class="logistics-num">
-        <view class="logistics-title">国内承运人 : </view>
+        <view class="logistics-title">承运公司 : </view>
         <view class="logistics-cont">{{delivery.shipping_name}}</view>
     </view>
+   
+     <view class="logistics-num">
+        <view  class="logistics-title">物流状态 : </view>
+        <view  wx:if="{{express.State==2}}" class="logistics-cont">在途中</view>
+        <view  wx:if="{{express.State==3}}" class="logistics-cont">已签收</view>
+        <view  wx:if="{{express.State==4}}" class="logistics-cont">问题件</view>
+    </view>
+
 </view>
 <view class="apply-state">
     <view class="state-item">
-        <view class="item-wrap" wx:if="{{express.status!='200'}}">
-            <view class="state-title">{{express.message}}</view>
+        <!-- <view class="item-wrap">
+            <view wx:if="{{express.State==2}}" class="state-title">在途中</view>
+            <view wx:if="{{express.State==3}}" class="state-title">已签收</view>
+            <view wx:if="{{express.State==4}}" class="state-title">问题件</view>
             <view class="state-time">{{'    '}}</view>
-        </view>
-        <view class="item-wrap" wx:for="{{express.data}}" wx:key="{{index}}">
-            <view class="state-title">{{item.context}}</view>
-            <view class="state-time">{{item.time}}</view>
+        </view> -->
+
+        <view class="item-wrap" wx:for="{{re_arr}}" wx:key="{{index}}">
+            <view class="state-title">{{item.AcceptStation}}</view>
+            <view class="state-time">{{item.AcceptTime}}</view>
         </view>
     </view>
 </view>
@@ -27,7 +27,7 @@
 .state-item {
     border-left: 1px solid #ccc;
-    padding-left: 40rpx;
+    padding:0 40rpx;
 }
 .item-wrap {
@@ -57,4 +57,5 @@
     font-weight: bold;
     color: #666;
     padding-bottom: 20rpx;
+    line-height: 40rpx
 }
 \ No newline at end of file
@@ -42,9 +42,9 @@
 }
 .xc-uesr-name{
 	color: #fff;
-	font-size: 35rpx;
+	font-size: 32rpx;
 	margin-top:17rpx;
-    margin-left:20rpx;
+  margin-left:20rpx;
 }
 .xc-user-grade{
@@ -525,6 +525,8 @@ border-radius:20rpx;
 background:#ffbdce;
 padding-left: 16rpx;
 padding-right: 16rpx;padding-bottom: 3rpx;
+margin-right: 5rpx;
+
 }
 .hvip{display: inline-block; font-size: 20rpx; height: 40rpx;line-height: 40rpx; color:#e7bf77; background: #383838; padding: 0 15rpx; border-radius:20rpx; vertical-align: middle }
@@ -137,7 +137,7 @@ Page({
         var t = this, o = this.data.order.order_id,order=this.data.order;
         var is_zsorder=order.is_zsorder;
         wx.showModal({
-            title: "是否确定收货",
+            title: "是否确认收货?",
             success: function(e) {
               e.confirm && r.put("/api/weshop/order/updatebyId", {
                     data: {
@@ -99,7 +99,7 @@
                 <view>￥ {{order.order_prom_amount}}元</view>
             </view>
-            <view class="item" wx:if="{{order.pt_tail_money>0}}">
+            <view class="item">
               <view>订单总价</view>
               <view>￥ {{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money)}}元</view>
             </view>
@@ -234,7 +234,7 @@ Page({
         console.log(is_zsorder);
         wx.showModal({
-            title: "是否确定收货",
+            title: "是否确认收货?",
             success: function(t) {
               t.confirm && rq.put("/api/weshop/order/updatebyId", {
                     data: {
@@ -40,7 +40,7 @@
                         [{{item.GradeName}}]365天累计成长值≥{{item.BuyGradeSum }}可保级
                     </block>
                 </view>
-                <view class=" abs white discounts four-level-word" wx:if="{{gradeId==item.Id}}">会员将在{{filter.replace_time(gradeEndDate)}}到期，<text wx:if="{{need_money>0}}">365天累计成长值≥{{need_money}}可升级[{{ backClass[index+1].GradeName}}]</text><text wx:else >[{{item.GradeName}}]365天累计成长值≥{{item.BuyGradeSum}}可保级</text>
+                <view class=" abs white discounts four-level-word" wx:if="{{gradeId==item.Id}}">会员将在{{filter.replace_time2(gradeEndDate)}}到期，<text wx:if="{{need_money>0}}">365天累计成长值≥{{need_money}}可升级[{{ backClass[index+1].GradeName}}]</text><text wx:else >[{{item.GradeName}}]365天累计成长值≥{{item.BuyGradeSum}}可保级</text>
                 </view>
                 <view class=" abs white discounts four-level-word" wx:if="{{gradeId!=item.Id && cz_val>item.BuyGradeSum }}">
                     [{{item.GradeName}}]365天累计成长值≥{{backClass[index+1].BuyGradeSum }}可升级[{{ backClass[index+1].GradeName}}]
@@ -177,7 +177,7 @@ margin-top:60rpx;
 .li .discounts{
   top:115rpx;
   left: 36rpx;
-  width: 435rpx;
+  width: 440rpx;
 }
  .li .money{
     left: 41rpx;
@@ -230,6 +230,22 @@ function measureText(text, fontSize = 10) {
   return width * fontSize / 10;
 }
+//验证手机号
+function check_mobile(phoneMobile){
+  var myreg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1})|(17[0-9]{1}))+\d{8})$/;
+  var ob={code:1};
+  if (phoneMobile.length === 0) {
+      ob.title='输入的手机号为空';
+      ob.code=-1;   
+  } else if (phoneMobile.length < 11) {
+      ob.title ='手机号长度有误！';
+      ob.code = -1; 
+  } else if (!myreg.test(phoneMobile)) {
+    ob.title = '手机号格式有误！';
+    ob.code = -1; 
+  }
+  return ob;
+}
 module.exports = {
     formatTime: function(e, r) {
@@ -319,4 +335,5 @@ module.exports = {
     isArray: isArray,
     sub_last: sub_last,//去掉末尾一个字符
     measureText: measureText,//画布需要的函数
+    check_mobile: check_mobile,//验证手机
 };